X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FMEDCoupling%2FTest%2FMEDCouplingBasicsTest3.cxx;h=2acec0f5b949bbe6d5424bcb0bb2feacd72842bb;hb=e4063d87dbb8dad309dc1880af096d521934cf24;hp=ca9a609326a561c1adc90dabd00593cf3857df09;hpb=79386ac5c73f8365c428b8ef595c4ef004959667;p=tools%2Fmedcoupling.git diff --git a/src/MEDCoupling/Test/MEDCouplingBasicsTest3.cxx b/src/MEDCoupling/Test/MEDCouplingBasicsTest3.cxx index ca9a60932..2acec0f5b 100644 --- a/src/MEDCoupling/Test/MEDCouplingBasicsTest3.cxx +++ b/src/MEDCoupling/Test/MEDCouplingBasicsTest3.cxx @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2016 CEA/DEN, EDF R&D +// Copyright (C) 2007-2020 CEA/DEN, EDF R&D // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public @@ -24,6 +24,7 @@ #include "MEDCouplingMappedExtrudedMesh.hxx" #include "MEDCouplingFieldDouble.hxx" #include "MEDCouplingMemArray.hxx" +#include "MEDCouplingMemArray.txx" #include "MEDCouplingGaussLocalization.hxx" #include @@ -44,25 +45,25 @@ void MEDCouplingBasicsTest3::testGetMeasureFieldCMesh1() m->setCoordsAt(0,da); da->decrRef(); m->checkConsistencyLight(); - CPPUNIT_ASSERT_EQUAL(4,m->getNumberOfNodes()); - CPPUNIT_ASSERT_EQUAL(3,m->getNumberOfCells()); + CPPUNIT_ASSERT_EQUAL(4,(int)m->getNumberOfNodes()); + CPPUNIT_ASSERT_EQUAL(3,(int)m->getNumberOfCells()); CPPUNIT_ASSERT_EQUAL(1,m->getSpaceDimension()); MEDCouplingFieldDouble *f=m->getMeasureField(true); - CPPUNIT_ASSERT_EQUAL(3,f->getNumberOfTuples()); - CPPUNIT_ASSERT_EQUAL(1,f->getNumberOfComponents()); + CPPUNIT_ASSERT_EQUAL(3,(int)f->getNumberOfTuples()); + CPPUNIT_ASSERT_EQUAL(1,(int)f->getNumberOfComponents()); const double expected1[3]={1.1,2.4,4.4}; for(int i=0;i<3;i++) CPPUNIT_ASSERT_DOUBLES_EQUAL(expected1[i],f->getIJ(i,0),1e-12); f->decrRef(); DataArrayDouble *coords=m->getCoordinatesAndOwner(); - CPPUNIT_ASSERT_EQUAL(4,coords->getNumberOfTuples()); - CPPUNIT_ASSERT_EQUAL(1,coords->getNumberOfComponents()); + CPPUNIT_ASSERT_EQUAL(4,(int)coords->getNumberOfTuples()); + CPPUNIT_ASSERT_EQUAL(1,(int)coords->getNumberOfComponents()); for(int i=0;i<4;i++) CPPUNIT_ASSERT_DOUBLES_EQUAL(discX[i],coords->getIJ(i,0),1e-12); coords->decrRef(); coords=m->computeCellCenterOfMass(); - CPPUNIT_ASSERT_EQUAL(3,coords->getNumberOfTuples()); - CPPUNIT_ASSERT_EQUAL(1,coords->getNumberOfComponents()); + CPPUNIT_ASSERT_EQUAL(3,(int)coords->getNumberOfTuples()); + CPPUNIT_ASSERT_EQUAL(1,(int)coords->getNumberOfComponents()); const double expected1_3[3]={2.85,4.6,8.}; for(int i=0;i<3;i++) CPPUNIT_ASSERT_DOUBLES_EQUAL(expected1_3[i],coords->getIJ(i,0),1e-12); @@ -74,26 +75,26 @@ void MEDCouplingBasicsTest3::testGetMeasureFieldCMesh1() m->setCoordsAt(1,da); da->decrRef(); m->checkConsistencyLight(); - CPPUNIT_ASSERT_EQUAL(12,m->getNumberOfNodes()); - CPPUNIT_ASSERT_EQUAL(6,m->getNumberOfCells()); + CPPUNIT_ASSERT_EQUAL(12,(int)m->getNumberOfNodes()); + CPPUNIT_ASSERT_EQUAL(6,(int)m->getNumberOfCells()); CPPUNIT_ASSERT_EQUAL(2,m->getSpaceDimension()); f=m->getMeasureField(true); - CPPUNIT_ASSERT_EQUAL(6,f->getNumberOfTuples()); - CPPUNIT_ASSERT_EQUAL(1,f->getNumberOfComponents()); + CPPUNIT_ASSERT_EQUAL(6,(int)f->getNumberOfTuples()); + CPPUNIT_ASSERT_EQUAL(1,(int)f->getNumberOfComponents()); const double expected2[6]={12.21,26.64,48.84,24.64,53.76,98.56}; for(int i=0;i<6;i++) CPPUNIT_ASSERT_DOUBLES_EQUAL(expected2[i],f->getIJ(i,0),1e-12); f->decrRef(); coords=m->getCoordinatesAndOwner(); - CPPUNIT_ASSERT_EQUAL(12,coords->getNumberOfTuples()); - CPPUNIT_ASSERT_EQUAL(2,coords->getNumberOfComponents()); + CPPUNIT_ASSERT_EQUAL(12,(int)coords->getNumberOfTuples()); + CPPUNIT_ASSERT_EQUAL(2,(int)coords->getNumberOfComponents()); const double expected2_2[24]={2.3,12.3,3.4,12.3,5.8,12.3,10.2,12.3, 2.3,23.4,3.4,23.4,5.8,23.4,10.2,23.4, 2.3,45.8,3.4,45.8,5.8,45.8,10.2,45.8}; for(int i=0;i<24;i++) CPPUNIT_ASSERT_DOUBLES_EQUAL(expected2_2[i],coords->getIJ(0,i),1e-12); coords->decrRef(); coords=m->computeCellCenterOfMass(); - CPPUNIT_ASSERT_EQUAL(6,coords->getNumberOfTuples()); - CPPUNIT_ASSERT_EQUAL(2,coords->getNumberOfComponents()); + CPPUNIT_ASSERT_EQUAL(6,(int)coords->getNumberOfTuples()); + CPPUNIT_ASSERT_EQUAL(2,(int)coords->getNumberOfComponents()); const double expected2_3[12]={2.85,17.85,4.6,17.85,8.,17.85, 2.85,34.6,4.6,34.6,8.,34.6}; for(int i=0;i<12;i++) CPPUNIT_ASSERT_DOUBLES_EQUAL(expected2_3[i],coords->getIJ(0,i),1e-12); @@ -105,19 +106,19 @@ void MEDCouplingBasicsTest3::testGetMeasureFieldCMesh1() m->setCoordsAt(2,da); da->decrRef(); m->checkConsistencyLight(); - CPPUNIT_ASSERT_EQUAL(60,m->getNumberOfNodes()); - CPPUNIT_ASSERT_EQUAL(24,m->getNumberOfCells()); + CPPUNIT_ASSERT_EQUAL(60,(int)m->getNumberOfNodes()); + CPPUNIT_ASSERT_EQUAL(24,(int)m->getNumberOfCells()); CPPUNIT_ASSERT_EQUAL(3,m->getSpaceDimension()); f=m->getMeasureField(true); - CPPUNIT_ASSERT_EQUAL(24,f->getNumberOfTuples()); - CPPUNIT_ASSERT_EQUAL(1,f->getNumberOfComponents()); + CPPUNIT_ASSERT_EQUAL(24,(int)f->getNumberOfTuples()); + CPPUNIT_ASSERT_EQUAL(1,(int)f->getNumberOfComponents()); const double expected3[24]={23.199, 50.616, 92.796, 46.816, 102.144, 187.264, 0.6105, 1.332, 2.442, 1.232, 2.688, 4.928, 10.7448, 23.4432, 42.9792, 21.6832, 47.3088, 86.7328, 6.5934, 14.3856, 26.3736, 13.3056, 29.0304, 53.2224}; for(int i=0;i<24;i++) CPPUNIT_ASSERT_DOUBLES_EQUAL(expected3[i],f->getIJ(i,0),1e-12); f->decrRef(); coords=m->getCoordinatesAndOwner(); - CPPUNIT_ASSERT_EQUAL(60,coords->getNumberOfTuples()); - CPPUNIT_ASSERT_EQUAL(3,coords->getNumberOfComponents()); + CPPUNIT_ASSERT_EQUAL(60,(int)coords->getNumberOfTuples()); + CPPUNIT_ASSERT_EQUAL(3,(int)coords->getNumberOfComponents()); const double expected3_2[180]={ 2.3,12.3,-0.7, 3.4,12.3,-0.7, 5.8,12.3,-0.7, 10.2,12.3,-0.7, 2.3,23.4,-0.7, 3.4,23.4,-0.7, 5.8,23.4,-0.7, 10.2,23.4,-0.7, 2.3,45.8,-0.7, 3.4,45.8,-0.7, 5.8,45.8,-0.7, 10.2,45.8,-0.7, 2.3,12.3,1.2, 3.4,12.3,1.2, 5.8,12.3,1.2, 10.2,12.3,1.2, 2.3,23.4,1.2, 3.4,23.4,1.2, 5.8,23.4,1.2, 10.2,23.4,1.2, 2.3,45.8,1.2, 3.4,45.8,1.2, 5.8,45.8,1.2, 10.2,45.8,1.2, @@ -129,8 +130,8 @@ void MEDCouplingBasicsTest3::testGetMeasureFieldCMesh1() CPPUNIT_ASSERT_DOUBLES_EQUAL(expected3_2[i],coords->getIJ(0,i),1e-12); coords->decrRef(); coords=m->computeCellCenterOfMass(); - CPPUNIT_ASSERT_EQUAL(24,coords->getNumberOfTuples()); - CPPUNIT_ASSERT_EQUAL(3,coords->getNumberOfComponents()); + CPPUNIT_ASSERT_EQUAL(24,(int)coords->getNumberOfTuples()); + CPPUNIT_ASSERT_EQUAL(3,(int)coords->getNumberOfComponents()); const double expected3_3[72]={ 2.85,17.85,0.25,4.6,17.85,0.25,8.,17.85,0.25, 2.85,34.6,0.25,4.6,34.6,0.25,8.,34.6,0.25, 2.85,17.85,1.225,4.6,17.85,1.225,8.,17.85,1.225, 2.85,34.6,1.225,4.6,34.6,1.225,8.,34.6,1.225, @@ -151,8 +152,8 @@ void MEDCouplingBasicsTest3::testFieldDoubleZipCoords1() f->getArray()->setInfoOnComponent(0,"titi"); f->getArray()->setInfoOnComponent(1,"tutu"); f->checkConsistencyLight(); - CPPUNIT_ASSERT_EQUAL(18,f->getNumberOfTuples()); - CPPUNIT_ASSERT_EQUAL(2,f->getNumberOfComponents()); + CPPUNIT_ASSERT_EQUAL(18,(int)f->getNumberOfTuples()); + CPPUNIT_ASSERT_EQUAL(2,(int)f->getNumberOfComponents()); const double expected1[36]={-0.6, -0.6, 0.4, 0.4, 1.4, 1.4, -0.6, -0.6, 0.4, 0.4, 0.4, 0.4, 0.4, 0.4, 0.4, 0.4, 1.4, 1.4, -0.6, -0.6, 0.4, 0.4, 1.4, 1.4, -0.6, -0.6, 1.4, 1.4, -0.6, -0.6, 0.4, 0.4, 1.4, 1.4, 0.4, 0.4}; for(int i=0;i<36;i++) CPPUNIT_ASSERT_DOUBLES_EQUAL(expected1[i],f->getIJ(0,i),1e-12); @@ -175,7 +176,7 @@ void MEDCouplingBasicsTest3::testFieldDoubleZipConnectivity1() { MEDCouplingUMesh *m1=build2DTargetMesh_1(); MEDCouplingUMesh *m2=build2DTargetMesh_1(); - const int cells1[3]={2,3,4}; + const mcIdType cells1[3]={2,3,4}; MEDCouplingPointSet *m3_1=m2->buildPartOfMySelf(cells1,cells1+3,true); MEDCouplingUMesh *m3=dynamic_cast(m3_1); CPPUNIT_ASSERT(m3); @@ -188,17 +189,17 @@ void MEDCouplingBasicsTest3::testFieldDoubleZipConnectivity1() m4->decrRef(); m5->decrRef(); // - CPPUNIT_ASSERT_EQUAL(10,m6->getNumberOfCells()); - CPPUNIT_ASSERT_EQUAL(22,m6->getNumberOfNodes()); + CPPUNIT_ASSERT_EQUAL(10,(int)m6->getNumberOfCells()); + CPPUNIT_ASSERT_EQUAL(22,(int)m6->getNumberOfNodes()); bool areNodesMerged; - int newNbOfNodes; - DataArrayInt *arr=m6->mergeNodes(1e-13,areNodesMerged,newNbOfNodes); - CPPUNIT_ASSERT_EQUAL(9,m6->getNumberOfNodes()); + mcIdType newNbOfNodes; + DataArrayIdType *arr=m6->mergeNodes(1e-13,areNodesMerged,newNbOfNodes); + CPPUNIT_ASSERT_EQUAL(9,(int)m6->getNumberOfNodes()); arr->decrRef(); MEDCouplingFieldDouble *f=m6->fillFromAnalytic(ON_CELLS,2,"x"); MEDCouplingFieldDouble *f2=m6->fillFromAnalytic(ON_NODES,2,"x"); - CPPUNIT_ASSERT_EQUAL(10,f->getNumberOfTuples()); - CPPUNIT_ASSERT_EQUAL(2,f->getNumberOfComponents()); + CPPUNIT_ASSERT_EQUAL(10,(int)f->getNumberOfTuples()); + CPPUNIT_ASSERT_EQUAL(2,(int)f->getNumberOfComponents()); const double expected1[20]={-0.05, -0.05, 0.3666666666666667, 0.3666666666666667, 0.53333333333333321, 0.53333333333333321, -0.05, -0.05, 0.45, 0.45, 0.53333333333333321, 0.53333333333333321, -0.05, -0.05, 0.45, 0.45, 0.36666666666666659, 0.36666666666666659, 0.033333333333333326, 0.033333333333333326}; @@ -210,8 +211,8 @@ void MEDCouplingBasicsTest3::testFieldDoubleZipConnectivity1() CPPUNIT_ASSERT(f->zipConnectivity(0)); const double expected2[14]={-0.05, -0.05, 0.3666666666666667, 0.3666666666666667, 0.53333333333333321, 0.53333333333333321, -0.05, -0.05, 0.45, 0.45, 0.36666666666666659, 0.36666666666666659, 0.033333333333333326, 0.033333333333333326}; - CPPUNIT_ASSERT_EQUAL(7,f->getNumberOfTuples()); - CPPUNIT_ASSERT_EQUAL(2,f->getNumberOfComponents()); + CPPUNIT_ASSERT_EQUAL(7,(int)f->getNumberOfTuples()); + CPPUNIT_ASSERT_EQUAL(2,(int)f->getNumberOfComponents()); for(int i=0;i<14;i++) CPPUNIT_ASSERT_DOUBLES_EQUAL(expected2[i],f->getIJ(0,i),1e-12); CPPUNIT_ASSERT(std::string(f->getArray()->getInfoOnComponent(0))=="titi"); @@ -221,13 +222,13 @@ void MEDCouplingBasicsTest3::testFieldDoubleZipConnectivity1() // const double expected3[18]={-0.3, -0.3, 0.2, 0.2, 0.7, 0.7, -0.3, -0.3, 0.2, 0.2, 0.7, 0.7, -0.3, -0.3, 0.2, 0.2, 0.7, 0.7}; - CPPUNIT_ASSERT_EQUAL(9,f2->getNumberOfTuples()); - CPPUNIT_ASSERT_EQUAL(2,f2->getNumberOfComponents()); + CPPUNIT_ASSERT_EQUAL(9,(int)f2->getNumberOfTuples()); + CPPUNIT_ASSERT_EQUAL(2,(int)f2->getNumberOfComponents()); for(int i=0;i<18;i++) CPPUNIT_ASSERT_DOUBLES_EQUAL(expected3[i],f2->getIJ(0,i),1e-12); CPPUNIT_ASSERT(f2->zipConnectivity(0)); - CPPUNIT_ASSERT_EQUAL(9,f2->getNumberOfTuples()); - CPPUNIT_ASSERT_EQUAL(2,f2->getNumberOfComponents()); + CPPUNIT_ASSERT_EQUAL(9,(int)f2->getNumberOfTuples()); + CPPUNIT_ASSERT_EQUAL(2,(int)f2->getNumberOfComponents()); for(int i=0;i<18;i++) CPPUNIT_ASSERT_DOUBLES_EQUAL(expected3[i],f2->getIJ(0,i),1e-12); f2->decrRef(); @@ -244,10 +245,10 @@ void MEDCouplingBasicsTest3::testDaDoubleRenumber1() const double arr1[14]={1.1,11.1,2.1,12.1,3.1,13.1,4.1,14.1,5.1,15.1,6.1,16.1,7.1,17.1}; std::copy(arr1,arr1+14,a->getPointer()); // - const int arr2[7]={3,1,0,6,5,4,2}; + const mcIdType arr2[7]={3,1,0,6,5,4,2}; DataArrayDouble *b=a->renumber(arr2); - CPPUNIT_ASSERT_EQUAL(7,b->getNumberOfTuples()); - CPPUNIT_ASSERT_EQUAL(2,b->getNumberOfComponents()); + CPPUNIT_ASSERT_EQUAL(7,(int)b->getNumberOfTuples()); + CPPUNIT_ASSERT_EQUAL(2,(int)b->getNumberOfComponents()); CPPUNIT_ASSERT(std::string(b->getInfoOnComponent(0))=="toto"); CPPUNIT_ASSERT(std::string(b->getInfoOnComponent(1))=="tata"); const double expected1[14]={3.1, 13.1, 2.1, 12.1, 7.1, 17.1, 1.1, 11.1, 6.1, 16.1, 5.1, 15.1, 4.1, 14.1}; @@ -256,18 +257,18 @@ void MEDCouplingBasicsTest3::testDaDoubleRenumber1() b->decrRef(); a->decrRef(); // - DataArrayInt *c=DataArrayInt::New(); + DataArrayIdType *c=DataArrayIdType::New(); c->alloc(7,2); c->setInfoOnComponent(0,"toto"); c->setInfoOnComponent(1,"tata"); - const int arr3[14]={1,11,2,12,3,13,4,14,5,15,6,16,7,17}; + const mcIdType arr3[14]={1,11,2,12,3,13,4,14,5,15,6,16,7,17}; std::copy(arr3,arr3+14,c->getPointer()); - DataArrayInt *d=c->renumber(arr2); - CPPUNIT_ASSERT_EQUAL(7,d->getNumberOfTuples()); - CPPUNIT_ASSERT_EQUAL(2,d->getNumberOfComponents()); + DataArrayIdType *d=c->renumber(arr2); + CPPUNIT_ASSERT_EQUAL(7,(int)d->getNumberOfTuples()); + CPPUNIT_ASSERT_EQUAL(2,(int)d->getNumberOfComponents()); CPPUNIT_ASSERT(std::string(d->getInfoOnComponent(0))=="toto"); CPPUNIT_ASSERT(std::string(d->getInfoOnComponent(1))=="tata"); - const int expected2[14]={3, 13, 2, 12, 7, 17, 1, 11, 6, 16, 5, 15, 4, 14}; + const mcIdType expected2[14]={3, 13, 2, 12, 7, 17, 1, 11, 6, 16, 5, 15, 4, 14}; for(int i=0;i<14;i++) CPPUNIT_ASSERT_EQUAL(expected2[i],d->getIJ(0,i)); c->decrRef(); @@ -283,10 +284,10 @@ void MEDCouplingBasicsTest3::testDaDoubleRenumberAndReduce1() const double arr1[14]={1.1,11.1,2.1,12.1,3.1,13.1,4.1,14.1,5.1,15.1,6.1,16.1,7.1,17.1}; std::copy(arr1,arr1+14,a->getPointer()); // - const int arr2[7]={2,-1,1,-1,0,4,3}; + const mcIdType arr2[7]={2,-1,1,-1,0,4,3}; DataArrayDouble *b=a->renumberAndReduce(arr2,5); - CPPUNIT_ASSERT_EQUAL(5,b->getNumberOfTuples()); - CPPUNIT_ASSERT_EQUAL(2,b->getNumberOfComponents()); + CPPUNIT_ASSERT_EQUAL(5,(int)b->getNumberOfTuples()); + CPPUNIT_ASSERT_EQUAL(2,(int)b->getNumberOfComponents()); CPPUNIT_ASSERT(std::string(b->getInfoOnComponent(0))=="toto"); CPPUNIT_ASSERT(std::string(b->getInfoOnComponent(1))=="tata"); const double expected1[10]={5.1,15.1,3.1,13.1,1.1,11.1,7.1,17.1,6.1,16.1}; @@ -295,18 +296,18 @@ void MEDCouplingBasicsTest3::testDaDoubleRenumberAndReduce1() b->decrRef(); a->decrRef(); // - DataArrayInt *c=DataArrayInt::New(); + DataArrayIdType *c=DataArrayIdType::New(); c->alloc(7,2); c->setInfoOnComponent(0,"toto"); c->setInfoOnComponent(1,"tata"); - const int arr3[14]={1,11,2,12,3,13,4,14,5,15,6,16,7,17}; + const mcIdType arr3[14]={1,11,2,12,3,13,4,14,5,15,6,16,7,17}; std::copy(arr3,arr3+14,c->getPointer()); - DataArrayInt *d=c->renumberAndReduce(arr2,5); - CPPUNIT_ASSERT_EQUAL(5,d->getNumberOfTuples()); - CPPUNIT_ASSERT_EQUAL(2,d->getNumberOfComponents()); + DataArrayIdType *d=c->renumberAndReduce(arr2,5); + CPPUNIT_ASSERT_EQUAL(5,(int)d->getNumberOfTuples()); + CPPUNIT_ASSERT_EQUAL(2,(int)d->getNumberOfComponents()); CPPUNIT_ASSERT(std::string(d->getInfoOnComponent(0))=="toto"); CPPUNIT_ASSERT(std::string(d->getInfoOnComponent(1))=="tata"); - const int expected2[10]={5,15,3,13,1,11,7,17,6,16}; + const mcIdType expected2[10]={5,15,3,13,1,11,7,17,6,16}; for(int i=0;i<10;i++) CPPUNIT_ASSERT_EQUAL(expected2[i],d->getIJ(0,i)); c->decrRef(); @@ -320,23 +321,23 @@ void MEDCouplingBasicsTest3::testDaDoubleRenumberInPlace1() const double arr1[14]={1.1,11.1,2.1,12.1,3.1,13.1,4.1,14.1,5.1,15.1,6.1,16.1,7.1,17.1}; std::copy(arr1,arr1+14,a->getPointer()); // - const int arr2[7]={3,1,0,6,5,4,2}; + const mcIdType arr2[7]={3,1,0,6,5,4,2}; a->renumberInPlace(arr2); - CPPUNIT_ASSERT_EQUAL(7,a->getNumberOfTuples()); - CPPUNIT_ASSERT_EQUAL(2,a->getNumberOfComponents()); + CPPUNIT_ASSERT_EQUAL(7,(int)a->getNumberOfTuples()); + CPPUNIT_ASSERT_EQUAL(2,(int)a->getNumberOfComponents()); const double expected1[14]={3.1, 13.1, 2.1, 12.1, 7.1, 17.1, 1.1, 11.1, 6.1, 16.1, 5.1, 15.1, 4.1, 14.1}; for(int i=0;i<14;i++) CPPUNIT_ASSERT_DOUBLES_EQUAL(expected1[i],a->getIJ(0,i),1e-14); a->decrRef(); // - DataArrayInt *c=DataArrayInt::New(); + DataArrayIdType *c=DataArrayIdType::New(); c->alloc(7,2); - const int arr3[14]={1,11,2,12,3,13,4,14,5,15,6,16,7,17}; + const mcIdType arr3[14]={1,11,2,12,3,13,4,14,5,15,6,16,7,17}; std::copy(arr3,arr3+14,c->getPointer()); c->renumberInPlace(arr2); - CPPUNIT_ASSERT_EQUAL(7,c->getNumberOfTuples()); - CPPUNIT_ASSERT_EQUAL(2,c->getNumberOfComponents()); - const int expected2[14]={3, 13, 2, 12, 7, 17, 1, 11, 6, 16, 5, 15, 4, 14}; + CPPUNIT_ASSERT_EQUAL(7,(int)c->getNumberOfTuples()); + CPPUNIT_ASSERT_EQUAL(2,(int)c->getNumberOfComponents()); + const mcIdType expected2[14]={3, 13, 2, 12, 7, 17, 1, 11, 6, 16, 5, 15, 4, 14}; for(int i=0;i<14;i++) CPPUNIT_ASSERT_EQUAL(expected2[i],c->getIJ(0,i)); c->decrRef(); @@ -351,10 +352,10 @@ void MEDCouplingBasicsTest3::testDaDoubleRenumberR1() const double arr1[14]={1.1,11.1,2.1,12.1,3.1,13.1,4.1,14.1,5.1,15.1,6.1,16.1,7.1,17.1}; std::copy(arr1,arr1+14,a->getPointer()); // - const int arr2[7]={3,1,0,6,5,4,2}; + const mcIdType arr2[7]={3,1,0,6,5,4,2}; DataArrayDouble *b=a->renumberR(arr2); - CPPUNIT_ASSERT_EQUAL(7,b->getNumberOfTuples()); - CPPUNIT_ASSERT_EQUAL(2,b->getNumberOfComponents()); + CPPUNIT_ASSERT_EQUAL(7,(int)b->getNumberOfTuples()); + CPPUNIT_ASSERT_EQUAL(2,(int)b->getNumberOfComponents()); CPPUNIT_ASSERT(std::string(b->getInfoOnComponent(0))=="toto"); CPPUNIT_ASSERT(std::string(b->getInfoOnComponent(1))=="tata"); const double expected1[14]={4.1, 14.1, 2.1, 12.1, 1.1, 11.1, 7.1, 17.1, 6.1, 16.1, 5.1, 15.1, 3.1, 13.1}; @@ -363,18 +364,18 @@ void MEDCouplingBasicsTest3::testDaDoubleRenumberR1() b->decrRef(); a->decrRef(); // - DataArrayInt *c=DataArrayInt::New(); + DataArrayIdType *c=DataArrayIdType::New(); c->alloc(7,2); c->setInfoOnComponent(0,"toto"); c->setInfoOnComponent(1,"tata"); - const int arr3[14]={1,11,2,12,3,13,4,14,5,15,6,16,7,17}; + const mcIdType arr3[14]={1,11,2,12,3,13,4,14,5,15,6,16,7,17}; std::copy(arr3,arr3+14,c->getPointer()); - DataArrayInt *d=c->renumberR(arr2); - CPPUNIT_ASSERT_EQUAL(7,d->getNumberOfTuples()); - CPPUNIT_ASSERT_EQUAL(2,d->getNumberOfComponents()); + DataArrayIdType *d=c->renumberR(arr2); + CPPUNIT_ASSERT_EQUAL(7,(int)d->getNumberOfTuples()); + CPPUNIT_ASSERT_EQUAL(2,(int)d->getNumberOfComponents()); CPPUNIT_ASSERT(std::string(d->getInfoOnComponent(0))=="toto"); CPPUNIT_ASSERT(std::string(d->getInfoOnComponent(1))=="tata"); - const int expected2[14]={4, 14, 2, 12, 1, 11, 7, 17, 6, 16, 5, 15, 3, 13}; + const mcIdType expected2[14]={4, 14, 2, 12, 1, 11, 7, 17, 6, 16, 5, 15, 3, 13}; for(int i=0;i<14;i++) CPPUNIT_ASSERT_EQUAL(expected2[i],d->getIJ(0,i)); c->decrRef(); @@ -388,23 +389,23 @@ void MEDCouplingBasicsTest3::testDaDoubleRenumberInPlaceR1() const double arr1[14]={1.1,11.1,2.1,12.1,3.1,13.1,4.1,14.1,5.1,15.1,6.1,16.1,7.1,17.1}; std::copy(arr1,arr1+14,a->getPointer()); // - const int arr2[7]={3,1,0,6,5,4,2}; + const mcIdType arr2[7]={3,1,0,6,5,4,2}; a->renumberInPlaceR(arr2); - CPPUNIT_ASSERT_EQUAL(7,a->getNumberOfTuples()); - CPPUNIT_ASSERT_EQUAL(2,a->getNumberOfComponents()); + CPPUNIT_ASSERT_EQUAL(7,(int)a->getNumberOfTuples()); + CPPUNIT_ASSERT_EQUAL(2,(int)a->getNumberOfComponents()); const double expected1[14]={4.1, 14.1, 2.1, 12.1, 1.1, 11.1, 7.1, 17.1, 6.1, 16.1, 5.1, 15.1, 3.1, 13.1}; for(int i=0;i<14;i++) CPPUNIT_ASSERT_DOUBLES_EQUAL(expected1[i],a->getIJ(0,i),1e-14); a->decrRef(); // - DataArrayInt *c=DataArrayInt::New(); + DataArrayIdType *c=DataArrayIdType::New(); c->alloc(7,2); - const int arr3[14]={1,11,2,12,3,13,4,14,5,15,6,16,7,17}; + const mcIdType arr3[14]={1,11,2,12,3,13,4,14,5,15,6,16,7,17}; std::copy(arr3,arr3+14,c->getPointer()); c->renumberInPlaceR(arr2); - CPPUNIT_ASSERT_EQUAL(7,c->getNumberOfTuples()); - CPPUNIT_ASSERT_EQUAL(2,c->getNumberOfComponents()); - const int expected2[14]={4, 14, 2, 12, 1, 11, 7, 17, 6, 16, 5, 15, 3, 13}; + CPPUNIT_ASSERT_EQUAL(7,(int)c->getNumberOfTuples()); + CPPUNIT_ASSERT_EQUAL(2,(int)c->getNumberOfComponents()); + const mcIdType expected2[14]={4, 14, 2, 12, 1, 11, 7, 17, 6, 16, 5, 15, 3, 13}; for(int i=0;i<14;i++) CPPUNIT_ASSERT_EQUAL(expected2[i],c->getIJ(0,i)); c->decrRef(); @@ -419,10 +420,10 @@ void MEDCouplingBasicsTest3::testDaDoubleSelectByTupleId1() const double arr1[14]={1.1,11.1,2.1,12.1,3.1,13.1,4.1,14.1,5.1,15.1,6.1,16.1,7.1,17.1}; std::copy(arr1,arr1+14,a->getPointer()); // - const int arr2[7]={4,2,0,6,5}; + const mcIdType arr2[7]={4,2,0,6,5}; DataArrayDouble *b=a->selectByTupleId(arr2,arr2+5); - CPPUNIT_ASSERT_EQUAL(5,b->getNumberOfTuples()); - CPPUNIT_ASSERT_EQUAL(2,b->getNumberOfComponents()); + CPPUNIT_ASSERT_EQUAL(5,(int)b->getNumberOfTuples()); + CPPUNIT_ASSERT_EQUAL(2,(int)b->getNumberOfComponents()); CPPUNIT_ASSERT(std::string(b->getInfoOnComponent(0))=="toto"); CPPUNIT_ASSERT(std::string(b->getInfoOnComponent(1))=="tata"); const double expected1[10]={5.1,15.1,3.1,13.1,1.1,11.1,7.1,17.1,6.1,16.1}; @@ -431,18 +432,18 @@ void MEDCouplingBasicsTest3::testDaDoubleSelectByTupleId1() b->decrRef(); a->decrRef(); // - DataArrayInt *c=DataArrayInt::New(); + DataArrayIdType *c=DataArrayIdType::New(); c->alloc(7,2); c->setInfoOnComponent(0,"toto"); c->setInfoOnComponent(1,"tata"); - const int arr3[14]={1,11,2,12,3,13,4,14,5,15,6,16,7,17}; + const mcIdType arr3[14]={1,11,2,12,3,13,4,14,5,15,6,16,7,17}; std::copy(arr3,arr3+14,c->getPointer()); - DataArrayInt *d=c->selectByTupleId(arr2,arr2+5); - CPPUNIT_ASSERT_EQUAL(5,d->getNumberOfTuples()); - CPPUNIT_ASSERT_EQUAL(2,d->getNumberOfComponents()); + DataArrayIdType *d=c->selectByTupleId(arr2,arr2+5); + CPPUNIT_ASSERT_EQUAL(5,(int)d->getNumberOfTuples()); + CPPUNIT_ASSERT_EQUAL(2,(int)d->getNumberOfComponents()); CPPUNIT_ASSERT(std::string(d->getInfoOnComponent(0))=="toto"); CPPUNIT_ASSERT(std::string(d->getInfoOnComponent(1))=="tata"); - const int expected2[10]={5,15,3,13,1,11,7,17,6,16}; + const mcIdType expected2[10]={5,15,3,13,1,11,7,17,6,16}; for(int i=0;i<10;i++) CPPUNIT_ASSERT_EQUAL(expected2[i],d->getIJ(0,i)); c->decrRef(); @@ -455,16 +456,16 @@ void MEDCouplingBasicsTest3::testDaDoubleGetMinMaxValues1() a->alloc(9,1); const double arr1[9]={2.34,4.56,-6.77,4.55,4.56,2.24,2.34,1.02,4.56}; std::copy(arr1,arr1+9,a->getPointer()); - int where; + mcIdType where; double m=a->getMaxValue(where); - CPPUNIT_ASSERT_EQUAL(1,where); + CPPUNIT_ASSERT_EQUAL(ToIdType(1),where); CPPUNIT_ASSERT_DOUBLES_EQUAL(4.56,m,1e-12); - DataArrayInt *ws; + DataArrayIdType *ws; m=a->getMaxValue2(ws); CPPUNIT_ASSERT_DOUBLES_EQUAL(4.56,m,1e-12); - CPPUNIT_ASSERT_EQUAL(3,ws->getNumberOfTuples()); - CPPUNIT_ASSERT_EQUAL(1,ws->getNumberOfComponents()); - const int expected1[3]={1,4,8}; + CPPUNIT_ASSERT_EQUAL(3,(int)ws->getNumberOfTuples()); + CPPUNIT_ASSERT_EQUAL(1,(int)ws->getNumberOfComponents()); + const mcIdType expected1[3]={1,4,8}; for(int i=0;i<3;i++) CPPUNIT_ASSERT_EQUAL(expected1[i],ws->getIJ(i,0)); ws->decrRef(); @@ -475,12 +476,12 @@ void MEDCouplingBasicsTest3::testDaDoubleGetMinMaxValues1() std::copy(arr2,arr2+9,a->getPointer()); where=-2; m=a->getMinValue(where); - CPPUNIT_ASSERT_EQUAL(1,where); + CPPUNIT_ASSERT_EQUAL(ToIdType(1),where); CPPUNIT_ASSERT_DOUBLES_EQUAL(-4.56,m,1e-12); m=a->getMinValue2(ws); CPPUNIT_ASSERT_DOUBLES_EQUAL(-4.56,m,1e-12); - CPPUNIT_ASSERT_EQUAL(3,ws->getNumberOfTuples()); - CPPUNIT_ASSERT_EQUAL(1,ws->getNumberOfComponents()); + CPPUNIT_ASSERT_EQUAL(3,(int)ws->getNumberOfTuples()); + CPPUNIT_ASSERT_EQUAL(1,(int)ws->getNumberOfComponents()); for(int i=0;i<3;i++) CPPUNIT_ASSERT_EQUAL(expected1[i],ws->getIJ(i,0)); ws->decrRef(); @@ -492,7 +493,7 @@ void MEDCouplingBasicsTest3::testFieldDoubleGetMinMaxValues2() MEDCouplingUMesh *m1=0; MEDCouplingUMesh *m2=build3DExtrudedUMesh_1(m1); m1->decrRef(); - CPPUNIT_ASSERT_EQUAL(18,m2->getNumberOfCells()); + CPPUNIT_ASSERT_EQUAL(18,(int)m2->getNumberOfCells()); const double arr1[18]={8.71,4.53,-12.41,8.71,-8.71,8.7099,4.55,8.71,5.55,6.77,-1e-200,4.55,8.7099,0.,1.23,0.,2.22,8.71}; MEDCouplingFieldDouble *f=MEDCouplingFieldDouble::New(ON_CELLS,NO_TIME); DataArrayDouble *a=DataArrayDouble::New(); @@ -505,12 +506,12 @@ void MEDCouplingBasicsTest3::testFieldDoubleGetMinMaxValues2() f->checkConsistencyLight(); double m=f->getMaxValue(); CPPUNIT_ASSERT_DOUBLES_EQUAL(8.71,m,1e-12); - DataArrayInt *ws; + DataArrayIdType *ws; m=f->getMaxValue2(ws); CPPUNIT_ASSERT_DOUBLES_EQUAL(8.71,m,1e-12); - CPPUNIT_ASSERT_EQUAL(4,ws->getNumberOfTuples()); - CPPUNIT_ASSERT_EQUAL(1,ws->getNumberOfComponents()); - const int expected1[4]={0,3,7,17}; + CPPUNIT_ASSERT_EQUAL(4,(int)ws->getNumberOfTuples()); + CPPUNIT_ASSERT_EQUAL(1,(int)ws->getNumberOfComponents()); + const mcIdType expected1[4]={0,3,7,17}; for(int i=0;i<4;i++) CPPUNIT_ASSERT_EQUAL(expected1[i],ws->getIJ(i,0)); ws->decrRef(); @@ -522,8 +523,8 @@ void MEDCouplingBasicsTest3::testFieldDoubleGetMinMaxValues2() CPPUNIT_ASSERT_DOUBLES_EQUAL(-8.71,m,1e-12); m=f->getMinValue2(ws); CPPUNIT_ASSERT_DOUBLES_EQUAL(-8.71,m,1e-12); - CPPUNIT_ASSERT_EQUAL(4,ws->getNumberOfTuples()); - CPPUNIT_ASSERT_EQUAL(1,ws->getNumberOfComponents()); + CPPUNIT_ASSERT_EQUAL(4,(int)ws->getNumberOfTuples()); + CPPUNIT_ASSERT_EQUAL(1,(int)ws->getNumberOfComponents()); for(int i=0;i<4;i++) CPPUNIT_ASSERT_EQUAL(expected1[i],ws->getIJ(i,0)); ws->decrRef(); @@ -545,22 +546,22 @@ void MEDCouplingBasicsTest3::testBuildUnstructuredCMesh1() da->decrRef(); m->checkConsistencyLight(); double pos=2.4; - CPPUNIT_ASSERT_EQUAL(0,m->getCellContainingPoint(&pos,1e-12)); + CPPUNIT_ASSERT_EQUAL(ToIdType(0),m->getCellContainingPoint(&pos,1e-12)); pos=3.7; - CPPUNIT_ASSERT_EQUAL(1,m->getCellContainingPoint(&pos,1e-12)); + CPPUNIT_ASSERT_EQUAL(ToIdType(1),m->getCellContainingPoint(&pos,1e-12)); pos=5.9; - CPPUNIT_ASSERT_EQUAL(2,m->getCellContainingPoint(&pos,1e-12)); + CPPUNIT_ASSERT_EQUAL(ToIdType(2),m->getCellContainingPoint(&pos,1e-12)); pos=10.3; - CPPUNIT_ASSERT_EQUAL(-1,m->getCellContainingPoint(&pos,1e-12)); + CPPUNIT_ASSERT_EQUAL(ToIdType(-1),m->getCellContainingPoint(&pos,1e-12)); pos=1.3; - CPPUNIT_ASSERT_EQUAL(-1,m->getCellContainingPoint(&pos,1e-12)); + CPPUNIT_ASSERT_EQUAL(ToIdType(-1),m->getCellContainingPoint(&pos,1e-12)); // MEDCouplingUMesh *m2=m->buildUnstructured(); m2->checkConsistencyLight(); MEDCouplingFieldDouble *f1=m->getMeasureField(false); MEDCouplingFieldDouble *f2=m2->getMeasureField(false); - CPPUNIT_ASSERT_EQUAL(f1->getNumberOfTuples(),3); - CPPUNIT_ASSERT_EQUAL(f2->getNumberOfTuples(),3); + CPPUNIT_ASSERT_EQUAL((int)f1->getNumberOfTuples(),3); + CPPUNIT_ASSERT_EQUAL((int)f2->getNumberOfTuples(),3); CPPUNIT_ASSERT_EQUAL(1,m2->getMeshDimension()); CPPUNIT_ASSERT_EQUAL(1,m2->getSpaceDimension()); for(int i=0;i<3;i++) @@ -578,8 +579,8 @@ void MEDCouplingBasicsTest3::testBuildUnstructuredCMesh1() m2->checkConsistencyLight(); f1=m->getMeasureField(false); f2=m2->getMeasureField(false); - CPPUNIT_ASSERT_EQUAL(f1->getNumberOfTuples(),6); - CPPUNIT_ASSERT_EQUAL(f2->getNumberOfTuples(),6); + CPPUNIT_ASSERT_EQUAL((int)f1->getNumberOfTuples(),6); + CPPUNIT_ASSERT_EQUAL((int)f2->getNumberOfTuples(),6); CPPUNIT_ASSERT_EQUAL(2,m2->getMeshDimension()); CPPUNIT_ASSERT_EQUAL(2,m2->getSpaceDimension()); for(int i=0;i<6;i++) @@ -597,8 +598,8 @@ void MEDCouplingBasicsTest3::testBuildUnstructuredCMesh1() m2->checkConsistencyLight(); f1=m->getMeasureField(false); f2=m2->getMeasureField(false); - CPPUNIT_ASSERT_EQUAL(f1->getNumberOfTuples(),24); - CPPUNIT_ASSERT_EQUAL(f2->getNumberOfTuples(),24); + CPPUNIT_ASSERT_EQUAL((int)f1->getNumberOfTuples(),24); + CPPUNIT_ASSERT_EQUAL((int)f2->getNumberOfTuples(),24); CPPUNIT_ASSERT_EQUAL(3,m2->getMeshDimension()); CPPUNIT_ASSERT_EQUAL(3,m2->getSpaceDimension()); for(int i=0;i<24;i++) @@ -607,7 +608,7 @@ void MEDCouplingBasicsTest3::testBuildUnstructuredCMesh1() f2->decrRef(); // double pos1[3]={5.,30.,2.}; - CPPUNIT_ASSERT_EQUAL(16,m->getCellContainingPoint(pos1,1e-12)); + CPPUNIT_ASSERT_EQUAL(ToIdType(16),m->getCellContainingPoint(pos1,1e-12)); // const double pt[3]={2.4,12.7,-3.4}; m->scale(pt,3.7); @@ -622,31 +623,31 @@ void MEDCouplingBasicsTest3::testBuildUnstructuredCMesh1() void MEDCouplingBasicsTest3::testDataArrayIntInvertO2NNO21() { - const int arr1[6]={2,0,4,1,5,3}; - DataArrayInt *da=DataArrayInt::New(); + const mcIdType arr1[6]={2,0,4,1,5,3}; + DataArrayIdType *da=DataArrayIdType::New(); da->alloc(6,1); std::copy(arr1,arr1+6,da->getPointer()); - DataArrayInt *da2=da->invertArrayO2N2N2O(6); - CPPUNIT_ASSERT_EQUAL(6,da2->getNumberOfTuples()); - CPPUNIT_ASSERT_EQUAL(1,da2->getNumberOfComponents()); - const int expected1[6]={1,3,0,5,2,4}; + DataArrayIdType *da2=da->invertArrayO2N2N2O(6); + CPPUNIT_ASSERT_EQUAL(6,(int)da2->getNumberOfTuples()); + CPPUNIT_ASSERT_EQUAL(1,(int)da2->getNumberOfComponents()); + const mcIdType expected1[6]={1,3,0,5,2,4}; for(int i=0;i<6;i++) CPPUNIT_ASSERT_EQUAL(expected1[i],da2->getIJ(i,0)); - DataArrayInt *da3=da2->invertArrayN2O2O2N(6); + DataArrayIdType *da3=da2->invertArrayN2O2O2N(6); for(int i=0;i<6;i++) CPPUNIT_ASSERT_EQUAL(arr1[i],da3->getIJ(i,0)); da3->decrRef(); da2->decrRef(); da->decrRef(); // - const int arr2[10]={3,-1,5,4,-1,0,-1,1,2,-1}; - da=DataArrayInt::New(); + const mcIdType arr2[10]={3,-1,5,4,-1,0,-1,1,2,-1}; + da=DataArrayIdType::New(); da->alloc(10,1); std::copy(arr2,arr2+10,da->getPointer()); da2=da->invertArrayO2N2N2O(6); - CPPUNIT_ASSERT_EQUAL(6,da2->getNumberOfTuples()); - CPPUNIT_ASSERT_EQUAL(1,da2->getNumberOfComponents()); - const int expected2[10]={5,7,8,0,3,2}; + CPPUNIT_ASSERT_EQUAL(6,(int)da2->getNumberOfTuples()); + CPPUNIT_ASSERT_EQUAL(1,(int)da2->getNumberOfComponents()); + const mcIdType expected2[10]={5,7,8,0,3,2}; for(int i=0;i<6;i++) CPPUNIT_ASSERT_EQUAL(expected2[i],da2->getIJ(i,0)); da3=da2->invertArrayN2O2O2N(10); @@ -667,11 +668,11 @@ void MEDCouplingBasicsTest3::testKeepSetSelectedComponent1() a1->setInfoOnComponent(1,"bbbb"); a1->setInfoOnComponent(2,"cccc"); a1->setInfoOnComponent(3,"dddd"); - const int arr2[6]={1,2,1,2,0,0}; - std::vector arr2V(arr2,arr2+6); + const mcIdType arr2[6]={1,2,1,2,0,0}; + std::vector arr2V(arr2,arr2+6); DataArrayDouble *a2=static_cast(a1->keepSelectedComponents(arr2V)); - CPPUNIT_ASSERT_EQUAL(6,a2->getNumberOfComponents()); - CPPUNIT_ASSERT_EQUAL(5,a2->getNumberOfTuples()); + CPPUNIT_ASSERT_EQUAL(6,(int)a2->getNumberOfComponents()); + CPPUNIT_ASSERT_EQUAL(5,(int)a2->getNumberOfTuples()); CPPUNIT_ASSERT(std::string(a2->getInfoOnComponent(0))=="bbbb"); CPPUNIT_ASSERT(std::string(a2->getInfoOnComponent(1))=="cccc"); CPPUNIT_ASSERT(std::string(a2->getInfoOnComponent(2))=="bbbb"); @@ -681,10 +682,10 @@ void MEDCouplingBasicsTest3::testKeepSetSelectedComponent1() const double expected1[30]={2.,3.,2.,3.,1.,1., 12.,13.,12.,13.,11.,11., 22.,23.,22.,23.,21.,21., 32.,33.,32.,33.,31.,31., 42.,43.,42.,43.,41.,41.}; for(int i=0;i<30;i++) CPPUNIT_ASSERT_DOUBLES_EQUAL(expected1[i],a2->getIJ(0,i),1e-14); - DataArrayInt *a3=a1->convertToIntArr(); + MCAuto a3(a1->convertToIntArr()); DataArrayInt *a4=static_cast(a3->keepSelectedComponents(arr2V)); - CPPUNIT_ASSERT_EQUAL(6,a4->getNumberOfComponents()); - CPPUNIT_ASSERT_EQUAL(5,a4->getNumberOfTuples()); + CPPUNIT_ASSERT_EQUAL(6,(int)a4->getNumberOfComponents()); + CPPUNIT_ASSERT_EQUAL(5,(int)a4->getNumberOfTuples()); CPPUNIT_ASSERT(std::string(a4->getInfoOnComponent(0))=="bbbb"); CPPUNIT_ASSERT(std::string(a4->getInfoOnComponent(1))=="cccc"); CPPUNIT_ASSERT(std::string(a4->getInfoOnComponent(2))=="bbbb"); @@ -692,18 +693,18 @@ void MEDCouplingBasicsTest3::testKeepSetSelectedComponent1() CPPUNIT_ASSERT(std::string(a4->getInfoOnComponent(4))=="aaaa"); CPPUNIT_ASSERT(std::string(a4->getInfoOnComponent(5))=="aaaa"); for(int i=0;i<30;i++) - CPPUNIT_ASSERT_EQUAL(int(expected1[i]),a4->getIJ(0,i)); + CPPUNIT_ASSERT_EQUAL((int)expected1[i],a4->getIJ(0,i)); // setSelectedComponents - const int arr3[2]={3,2}; - std::vector arr3V(arr3,arr3+2); + const mcIdType arr3[2]={3,2}; + std::vector arr3V(arr3,arr3+2); DataArrayDouble *a5=static_cast(a1->keepSelectedComponents(arr3V)); a5->setInfoOnComponent(0,"eeee"); a5->setInfoOnComponent(1,"ffff"); - const int arr4[2]={1,2}; - std::vector arr4V(arr4,arr4+2); + const mcIdType arr4[2]={1,2}; + std::vector arr4V(arr4,arr4+2); a2->setSelectedComponents(a5,arr4V); - CPPUNIT_ASSERT_EQUAL(6,a2->getNumberOfComponents()); - CPPUNIT_ASSERT_EQUAL(5,a2->getNumberOfTuples()); + CPPUNIT_ASSERT_EQUAL(6,(int)a2->getNumberOfComponents()); + CPPUNIT_ASSERT_EQUAL(5,(int)a2->getNumberOfTuples()); CPPUNIT_ASSERT(std::string(a2->getInfoOnComponent(0))=="bbbb"); CPPUNIT_ASSERT(std::string(a2->getInfoOnComponent(1))=="eeee"); CPPUNIT_ASSERT(std::string(a2->getInfoOnComponent(2))=="ffff"); @@ -713,12 +714,12 @@ void MEDCouplingBasicsTest3::testKeepSetSelectedComponent1() const double expected2[30]={2.,4.,3.,3.,1.,1., 12.,14.,13.,13.,11.,11., 22.,24.,23.,23.,21.,21., 32.,34.,33.,33.,31.,31., 42.,44.,43.,43.,41.,41.}; for(int i=0;i<30;i++) CPPUNIT_ASSERT_DOUBLES_EQUAL(expected2[i],a2->getIJ(0,i),1e-14); - DataArrayInt *a6=a5->convertToIntArr(); + MCAuto a6=a5->convertToIntArr(); a6->setInfoOnComponent(0,"eeee"); a6->setInfoOnComponent(1,"ffff"); a4->setSelectedComponents(a6,arr4V); - CPPUNIT_ASSERT_EQUAL(6,a4->getNumberOfComponents()); - CPPUNIT_ASSERT_EQUAL(5,a4->getNumberOfTuples()); + CPPUNIT_ASSERT_EQUAL(6,(int)a4->getNumberOfComponents()); + CPPUNIT_ASSERT_EQUAL(5,(int)a4->getNumberOfTuples()); CPPUNIT_ASSERT(std::string(a4->getInfoOnComponent(0))=="bbbb"); CPPUNIT_ASSERT(std::string(a4->getInfoOnComponent(1))=="eeee"); CPPUNIT_ASSERT(std::string(a4->getInfoOnComponent(2))=="ffff"); @@ -726,24 +727,22 @@ void MEDCouplingBasicsTest3::testKeepSetSelectedComponent1() CPPUNIT_ASSERT(std::string(a4->getInfoOnComponent(4))=="aaaa"); CPPUNIT_ASSERT(std::string(a4->getInfoOnComponent(5))=="aaaa"); for(int i=0;i<30;i++) - CPPUNIT_ASSERT_EQUAL(int(expected2[i]),a4->getIJ(0,i)); + CPPUNIT_ASSERT_EQUAL(expected2[i],(double)a4->getIJ(0,i)); // test of throw - const int arr5[3]={2,3,6}; - const int arr6[3]={2,7,5}; - const int arr7[4]={2,1,4,6}; - std::vector arr5V(arr5,arr5+3); - std::vector arr6V(arr6,arr6+3); - std::vector arr7V(arr7,arr7+4); + const mcIdType arr5[3]={2,3,6}; + const mcIdType arr6[3]={2,7,5}; + const mcIdType arr7[4]={2,1,4,6}; + std::vector arr5V(arr5,arr5+3); + std::vector arr6V(arr6,arr6+3); + std::vector arr7V(arr7,arr7+4); CPPUNIT_ASSERT_THROW(a2->keepSelectedComponents(arr5V),INTERP_KERNEL::Exception); CPPUNIT_ASSERT_THROW(a2->keepSelectedComponents(arr6V),INTERP_KERNEL::Exception); CPPUNIT_ASSERT_THROW(a2->setSelectedComponents(a1,arr7V),INTERP_KERNEL::Exception); arr7V.resize(3); CPPUNIT_ASSERT_THROW(a2->setSelectedComponents(a1,arr7V),INTERP_KERNEL::Exception); // - a6->decrRef(); a5->decrRef(); a4->decrRef(); - a3->decrRef(); a2->decrRef(); a1->decrRef(); } @@ -766,8 +765,8 @@ void MEDCouplingBasicsTest3::testKeepSetSelectedComponent2() f1->setArray(a1); f1->checkConsistencyLight(); // - const int arr2[6]={1,2,1,2,0,0}; - std::vector arr2V(arr2,arr2+6); + const mcIdType arr2[6]={1,2,1,2,0,0}; + std::vector arr2V(arr2,arr2+6); MEDCouplingFieldDouble *f2=f1->keepSelectedComponents(arr2V); CPPUNIT_ASSERT(f2->getMesh()==f1->getMesh()); CPPUNIT_ASSERT(f2->getTimeDiscretization()==ONE_TIME); @@ -776,8 +775,8 @@ void MEDCouplingBasicsTest3::testKeepSetSelectedComponent2() CPPUNIT_ASSERT_EQUAL(4,dt); CPPUNIT_ASSERT_EQUAL(5,it); f2->checkConsistencyLight(); - CPPUNIT_ASSERT_EQUAL(6,f2->getNumberOfComponents()); - CPPUNIT_ASSERT_EQUAL(5,f2->getNumberOfTuples()); + CPPUNIT_ASSERT_EQUAL(6,(int)f2->getNumberOfComponents()); + CPPUNIT_ASSERT_EQUAL(5,(int)f2->getNumberOfTuples()); CPPUNIT_ASSERT(std::string(f2->getArray()->getInfoOnComponent(0))=="bbbb"); CPPUNIT_ASSERT(std::string(f2->getArray()->getInfoOnComponent(1))=="cccc"); CPPUNIT_ASSERT(std::string(f2->getArray()->getInfoOnComponent(2))=="bbbb"); @@ -788,18 +787,18 @@ void MEDCouplingBasicsTest3::testKeepSetSelectedComponent2() for(int i=0;i<30;i++) CPPUNIT_ASSERT_DOUBLES_EQUAL(expected1[i],f2->getIJ(0,i),1e-14); //setSelectedComponents - const int arr3[2]={3,2}; - std::vector arr3V(arr3,arr3+2); + const mcIdType arr3[2]={3,2}; + std::vector arr3V(arr3,arr3+2); MEDCouplingFieldDouble *f5=f1->keepSelectedComponents(arr3V); f5->setTime(6.7,8,9); f5->getArray()->setInfoOnComponent(0,"eeee"); f5->getArray()->setInfoOnComponent(1,"ffff"); f5->checkConsistencyLight(); - const int arr4[2]={1,2}; - std::vector arr4V(arr4,arr4+2); + const mcIdType arr4[2]={1,2}; + std::vector arr4V(arr4,arr4+2); f2->setSelectedComponents(f5,arr4V); - CPPUNIT_ASSERT_EQUAL(6,f2->getNumberOfComponents()); - CPPUNIT_ASSERT_EQUAL(5,f2->getNumberOfTuples()); + CPPUNIT_ASSERT_EQUAL(6,(int)f2->getNumberOfComponents()); + CPPUNIT_ASSERT_EQUAL(5,(int)f2->getNumberOfTuples()); f2->checkConsistencyLight(); CPPUNIT_ASSERT_DOUBLES_EQUAL(2.3,f2->getTime(dt,it),1e-13); CPPUNIT_ASSERT_EQUAL(4,dt); @@ -822,7 +821,7 @@ void MEDCouplingBasicsTest3::testKeepSetSelectedComponent2() void MEDCouplingBasicsTest3::testElementaryDAThrowAndSpecialCases() { - DataArrayInt *da=DataArrayInt::New(); + DataArrayIdType *da=DataArrayIdType::New(); CPPUNIT_ASSERT_THROW(da->checkAllocated(),INTERP_KERNEL::Exception); CPPUNIT_ASSERT_THROW(da->fillWithValue(1),INTERP_KERNEL::Exception); CPPUNIT_ASSERT_THROW(da->iota(1),INTERP_KERNEL::Exception); @@ -830,7 +829,7 @@ void MEDCouplingBasicsTest3::testElementaryDAThrowAndSpecialCases() da->fillWithValue(11); //11,11,11,11... da->iota(10); //10,11,12,13... - DataArrayInt *db=DataArrayInt::New(); + DataArrayIdType *db=DataArrayIdType::New(); db->alloc(7,2); DataArrayDouble *dbl2=DataArrayDouble::New(); @@ -861,7 +860,7 @@ void MEDCouplingBasicsTest3::testElementaryDAThrowAndSpecialCases() CPPUNIT_ASSERT(!dbl->isMonotonic(false, 1.1)); CPPUNIT_ASSERT(!dbl->isMonotonic(false, -1.1)); - DataArrayInt *dc=DataArrayInt::New(); + DataArrayIdType *dc=DataArrayIdType::New(); dc->alloc(14,1); DataArrayDouble *dd=DataArrayDouble::New(); @@ -880,7 +879,7 @@ void MEDCouplingBasicsTest3::testElementaryDAThrowAndSpecialCases() CPPUNIT_ASSERT_THROW(db->copyStringInfoFrom(*da),INTERP_KERNEL::Exception); CPPUNIT_ASSERT_THROW(db->copyStringInfoFrom(*da),INTERP_KERNEL::Exception); - std::vector cIds(2,2); + std::vector cIds(2,2); CPPUNIT_ASSERT_THROW(da->copyPartOfStringInfoFrom(*db,cIds),INTERP_KERNEL::Exception); cIds[0]=1; cIds[0]=-1; @@ -921,9 +920,9 @@ void MEDCouplingBasicsTest3::testElementaryDAThrowAndSpecialCases() CPPUNIT_ASSERT_THROW(db->GetNumberOfItemGivenBES(10,9,1,"theMessageInThrow"),INTERP_KERNEL::Exception); CPPUNIT_ASSERT_THROW(db->GetNumberOfItemGivenBES(0,1,-1,"theMessageInThrow"),INTERP_KERNEL::Exception); - CPPUNIT_ASSERT_EQUAL(10,db->GetNumberOfItemGivenBES(0,10,1,"theMessageInThrow")); - CPPUNIT_ASSERT_EQUAL(5,db->GetNumberOfItemGivenBES(0,10,2,"theMessageInThrow")); - CPPUNIT_ASSERT_EQUAL(6,db->GetNumberOfItemGivenBES(0,11,2,"theMessageInThrow")); + CPPUNIT_ASSERT_EQUAL(ToIdType(10),db->GetNumberOfItemGivenBES(0,10,1,"theMessageInThrow")); + CPPUNIT_ASSERT_EQUAL(ToIdType(5),db->GetNumberOfItemGivenBES(0,10,2,"theMessageInThrow")); + CPPUNIT_ASSERT_EQUAL(ToIdType(6),db->GetNumberOfItemGivenBES(0,11,2,"theMessageInThrow")); //std::cout<<"\n!!!!!!!!!\n"<repr()<<"\n!!!!!!!!!\n"; CPPUNIT_ASSERT(!((da->repr().find("Number of components : 1"))==std::string::npos)); @@ -947,12 +946,12 @@ void MEDCouplingBasicsTest3::testElementaryDAThrowAndSpecialCases() CPPUNIT_ASSERT_THROW(dbl->meldWith(dd),INTERP_KERNEL::Exception); CPPUNIT_ASSERT_THROW(dbl->setPartOfValuesAdv(dbl2,da),INTERP_KERNEL::Exception); //dbl dbl2 not have the same number of components - CPPUNIT_ASSERT_THROW(dbl->setPartOfValuesAdv(dd,da),INTERP_KERNEL::Exception); //da tuple selector DataArrayInt instance not have exactly 2 components + CPPUNIT_ASSERT_THROW(dbl->setPartOfValuesAdv(dd,da),INTERP_KERNEL::Exception); //da tuple selector DataArrayIdType instance not have exactly 2 components DataArrayDouble *dbl3=DataArrayDouble::New(); dbl3->alloc(6,2); dbl3->fillWithValue(11.); - int tupleId; + mcIdType tupleId; //bad number of components CPPUNIT_ASSERT_THROW(dbl3->getMaxValue(tupleId),INTERP_KERNEL::Exception); CPPUNIT_ASSERT_THROW(dd->getMaxValue(tupleId),INTERP_KERNEL::Exception); @@ -1025,14 +1024,14 @@ void MEDCouplingBasicsTest3::testElementaryDAThrowAndSpecialCases() void MEDCouplingBasicsTest3::testDAIGetIdsEqual1() { - const int tab1[7]={5,-2,-4,-2,3,2,-2}; - DataArrayInt *da=DataArrayInt::New(); + const mcIdType tab1[7]={5,-2,-4,-2,3,2,-2}; + DataArrayIdType *da=DataArrayIdType::New(); da->alloc(7,1); std::copy(tab1,tab1+7,da->getPointer()); - DataArrayInt *da2=da->findIdsEqual(-2); - CPPUNIT_ASSERT_EQUAL(3,da2->getNumberOfTuples()); - CPPUNIT_ASSERT_EQUAL(1,da2->getNumberOfComponents()); - const int expected1[3]={1,3,6}; + DataArrayIdType *da2=da->findIdsEqual(-2); + CPPUNIT_ASSERT_EQUAL(3,(int)da2->getNumberOfTuples()); + CPPUNIT_ASSERT_EQUAL(1,(int)da2->getNumberOfComponents()); + const mcIdType expected1[3]={1,3,6}; CPPUNIT_ASSERT(std::equal(expected1,expected1+3,da2->getConstPointer())); da2->decrRef(); da->decrRef(); @@ -1040,16 +1039,16 @@ void MEDCouplingBasicsTest3::testDAIGetIdsEqual1() void MEDCouplingBasicsTest3::testDAIGetIdsEqualList1() { - const int tab1[7]={5,-2,-4,-2,3,2,-2}; - DataArrayInt *da=DataArrayInt::New(); + const mcIdType tab1[7]={5,-2,-4,-2,3,2,-2}; + DataArrayIdType *da=DataArrayIdType::New(); da->alloc(7,1); std::copy(tab1,tab1+7,da->getPointer()); - const int tab2[3]={3,-2,0}; - std::vector tab2V(tab2,tab2+3); - DataArrayInt *da2=da->findIdsEqualList(&tab2V[0],&tab2V[0]+tab2V.size()); - CPPUNIT_ASSERT_EQUAL(4,da2->getNumberOfTuples()); - CPPUNIT_ASSERT_EQUAL(1,da2->getNumberOfComponents()); - const int expected1[4]={1,3,4,6}; + const mcIdType tab2[3]={3,-2,0}; + std::vector tab2V(tab2,tab2+3); + DataArrayIdType *da2=da->findIdsEqualList(&tab2V[0],&tab2V[0]+tab2V.size()); + CPPUNIT_ASSERT_EQUAL(4,(int)da2->getNumberOfTuples()); + CPPUNIT_ASSERT_EQUAL(1,(int)da2->getNumberOfComponents()); + const mcIdType expected1[4]={1,3,4,6}; CPPUNIT_ASSERT(std::equal(expected1,expected1+4,da2->getConstPointer())); da2->decrRef(); da->decrRef(); @@ -1057,54 +1056,52 @@ void MEDCouplingBasicsTest3::testDAIGetIdsEqualList1() void MEDCouplingBasicsTest3::testDAFromNoInterlace1() { - const int tab1[15]={1,11,21,31,41,2,12,22,32,42,3,13,23,33,43}; - DataArrayInt *da=DataArrayInt::New(); + const mcIdType tab1[15]={1,11,21,31,41,2,12,22,32,42,3,13,23,33,43}; + DataArrayIdType *da=DataArrayIdType::New(); da->alloc(5,3); std::copy(tab1,tab1+15,da->getPointer()); - DataArrayInt *da2=da->fromNoInterlace(); - const int expected1[15]={1,2,3,11,12,13,21,22,23,31,32,33,41,42,43}; - CPPUNIT_ASSERT_EQUAL(5,da2->getNumberOfTuples()); - CPPUNIT_ASSERT_EQUAL(3,da2->getNumberOfComponents());// it's not a bug. Avoid to have 1 million components ! + DataArrayIdType *da2=da->fromNoInterlace(); + const mcIdType expected1[15]={1,2,3,11,12,13,21,22,23,31,32,33,41,42,43}; + CPPUNIT_ASSERT_EQUAL(5,(int)da2->getNumberOfTuples()); + CPPUNIT_ASSERT_EQUAL(3,(int)da2->getNumberOfComponents());// it's not a bug. Avoid to have 1 million components ! CPPUNIT_ASSERT(std::equal(expected1,expected1+15,da2->getConstPointer())); - DataArrayDouble *da3=da->convertToDblArr(); + MCAuto da3=da->convertToDblArr(); DataArrayDouble *da4=da3->fromNoInterlace(); - CPPUNIT_ASSERT_EQUAL(5,da4->getNumberOfTuples()); - CPPUNIT_ASSERT_EQUAL(3,da4->getNumberOfComponents());// it's not a bug. Avoid to have 1 million components ! + CPPUNIT_ASSERT_EQUAL(5,(int)da4->getNumberOfTuples()); + CPPUNIT_ASSERT_EQUAL(3,(int)da4->getNumberOfComponents());// it's not a bug. Avoid to have 1 million components ! for(int i=0;i<15;i++) CPPUNIT_ASSERT_DOUBLES_EQUAL((double)expected1[i],da4->getIJ(0,i),1e-14); da4->decrRef(); - da3->decrRef(); da2->decrRef(); da->decrRef(); } void MEDCouplingBasicsTest3::testDAToNoInterlace1() { - const int tab1[15]={1,2,3,11,12,13,21,22,23,31,32,33,41,42,43}; - DataArrayInt *da=DataArrayInt::New(); + const mcIdType tab1[15]={1,2,3,11,12,13,21,22,23,31,32,33,41,42,43}; + DataArrayIdType *da=DataArrayIdType::New(); da->alloc(5,3); std::copy(tab1,tab1+15,da->getPointer()); - DataArrayInt *da2=da->toNoInterlace(); - const int expected1[15]={1,11,21,31,41,2,12,22,32,42,3,13,23,33,43}; - CPPUNIT_ASSERT_EQUAL(5,da2->getNumberOfTuples()); - CPPUNIT_ASSERT_EQUAL(3,da2->getNumberOfComponents());// it's not a bug. Avoid to have 1 million components ! + DataArrayIdType *da2=da->toNoInterlace(); + const mcIdType expected1[15]={1,11,21,31,41,2,12,22,32,42,3,13,23,33,43}; + CPPUNIT_ASSERT_EQUAL(5,(int)da2->getNumberOfTuples()); + CPPUNIT_ASSERT_EQUAL(3,(int)da2->getNumberOfComponents());// it's not a bug. Avoid to have 1 million components ! CPPUNIT_ASSERT(std::equal(expected1,expected1+15,da2->getConstPointer())); - DataArrayDouble *da3=da->convertToDblArr(); + MCAuto da3=da->convertToDblArr(); DataArrayDouble *da4=da3->toNoInterlace(); - CPPUNIT_ASSERT_EQUAL(5,da4->getNumberOfTuples()); - CPPUNIT_ASSERT_EQUAL(3,da4->getNumberOfComponents());// it's not a bug. Avoid to have 1 million components ! + CPPUNIT_ASSERT_EQUAL(5,(int)da4->getNumberOfTuples()); + CPPUNIT_ASSERT_EQUAL(3,(int)da4->getNumberOfComponents());// it's not a bug. Avoid to have 1 million components ! for(int i=0;i<15;i++) CPPUNIT_ASSERT_DOUBLES_EQUAL((double)expected1[i],da4->getIJ(0,i),1e-14); da4->decrRef(); - da3->decrRef(); da2->decrRef(); da->decrRef(); } void MEDCouplingBasicsTest3::testDAIsUniform1() { - const int tab1[5]={1,1,1,1,1}; - DataArrayInt *da=DataArrayInt::New(); + const mcIdType tab1[5]={1,1,1,1,1}; + DataArrayIdType *da=DataArrayIdType::New(); da->alloc(5,1); std::copy(tab1,tab1+5,da->getPointer()); CPPUNIT_ASSERT(da->isUniform(1)); @@ -1112,13 +1109,12 @@ void MEDCouplingBasicsTest3::testDAIsUniform1() CPPUNIT_ASSERT(!da->isUniform(1)); da->setIJ(2,0,1); CPPUNIT_ASSERT(da->isUniform(1)); - DataArrayDouble *da2=da->convertToDblArr(); + MCAuto da2=da->convertToDblArr(); CPPUNIT_ASSERT(da2->isUniform(1.,1e-12)); da2->setIJ(1,0,1.+1.e-13); CPPUNIT_ASSERT(da2->isUniform(1.,1e-12)); da2->setIJ(1,0,1.+1.e-11); CPPUNIT_ASSERT(!da2->isUniform(1.,1e-12)); - da2->decrRef(); da->decrRef(); } @@ -1166,8 +1162,8 @@ void MEDCouplingBasicsTest3::testDADFromSpherToCart1() void MEDCouplingBasicsTest3::testUnPolyze1() { - const int elts[8]={0,1,2,3,4,5,6,7}; - std::vector eltsV(elts,elts+8); + const mcIdType elts[8]={0,1,2,3,4,5,6,7}; + std::vector eltsV(elts,elts+8); MEDCouplingUMesh *mesh=build3DTargetMesh_1(); mesh->convertToPolyTypes(&eltsV[0],&eltsV[0]+eltsV.size()); mesh->unPolyze(); @@ -1213,7 +1209,7 @@ void MEDCouplingBasicsTest3::testUnPolyze1() void MEDCouplingBasicsTest3::testConvertDegeneratedCells1() { MEDCouplingUMesh *mesh=build3DTargetMesh_1(); - int conn[32]={0,1,3,3,9,10,12,12, 0,1,3,4,9,9,9,9, 1,1,1,1,10,12,9,10, 10,11,12,9,1,1,1,1}; + mcIdType conn[32]={0,1,3,3,9,10,12,12, 0,1,3,4,9,9,9,9, 1,1,1,1,10,12,9,10, 10,11,12,9,1,1,1,1}; mesh->allocateCells(4); mesh->insertNextCell(INTERP_KERNEL::NORM_HEXA8,8,conn); mesh->insertNextCell(INTERP_KERNEL::NORM_HEXA8,8,conn+8); @@ -1221,7 +1217,7 @@ void MEDCouplingBasicsTest3::testConvertDegeneratedCells1() mesh->insertNextCell(INTERP_KERNEL::NORM_HEXA8,8,conn+24); mesh->finishInsertingCells(); mesh->checkConsistencyLight(); - CPPUNIT_ASSERT_EQUAL(4,mesh->getNumberOfCells()); + CPPUNIT_ASSERT_EQUAL(4,(int)mesh->getNumberOfCells()); CPPUNIT_ASSERT_EQUAL(INTERP_KERNEL::NORM_HEXA8,mesh->getTypeOfCell(0)); CPPUNIT_ASSERT_EQUAL(INTERP_KERNEL::NORM_HEXA8,mesh->getTypeOfCell(1)); CPPUNIT_ASSERT_EQUAL(INTERP_KERNEL::NORM_HEXA8,mesh->getTypeOfCell(2)); @@ -1230,7 +1226,7 @@ void MEDCouplingBasicsTest3::testConvertDegeneratedCells1() mesh->convertDegeneratedCells(); mesh->checkConsistencyLight(); MEDCouplingFieldDouble *f2=mesh->getMeasureField(true); - CPPUNIT_ASSERT_EQUAL(4,mesh->getNumberOfCells()); + CPPUNIT_ASSERT_EQUAL(4,(int)mesh->getNumberOfCells()); CPPUNIT_ASSERT_EQUAL(INTERP_KERNEL::NORM_PENTA6,mesh->getTypeOfCell(0)); CPPUNIT_ASSERT_EQUAL(INTERP_KERNEL::NORM_PYRA5,mesh->getTypeOfCell(1)); CPPUNIT_ASSERT_EQUAL(INTERP_KERNEL::NORM_TETRA4,mesh->getTypeOfCell(2)); @@ -1255,24 +1251,24 @@ void MEDCouplingBasicsTest3::testGetNodeIdsNearPoints1() mesh->setCoords(tmp2); tmp2->decrRef(); const double pts[6]={0.2,0.2,0.1,0.3,-0.3,0.7}; - DataArrayInt *c=mesh->getNodeIdsNearPoint(pts,1e-7); - CPPUNIT_ASSERT_EQUAL(3,c->getNumberOfTuples()); - CPPUNIT_ASSERT_EQUAL(4,c->getIJ(0,0)); - CPPUNIT_ASSERT_EQUAL(9,c->getIJ(1,0)); - CPPUNIT_ASSERT_EQUAL(11,c->getIJ(2,0)); + DataArrayIdType *c=mesh->getNodeIdsNearPoint(pts,1e-7); + CPPUNIT_ASSERT_EQUAL(3,(int)c->getNumberOfTuples()); + CPPUNIT_ASSERT_EQUAL(ToIdType(4),c->getIJ(0,0)); + CPPUNIT_ASSERT_EQUAL(ToIdType(9),c->getIJ(1,0)); + CPPUNIT_ASSERT_EQUAL(ToIdType(11),c->getIJ(2,0)); c->decrRef(); - DataArrayInt *cI=0; + DataArrayIdType *cI=0; mesh->getNodeIdsNearPoints(pts,3,1e-7,c,cI); - CPPUNIT_ASSERT_EQUAL(4,cI->getNumberOfTuples()); - CPPUNIT_ASSERT_EQUAL(4,c->getNumberOfTuples()); - CPPUNIT_ASSERT_EQUAL(4,c->getIJ(0,0)); - CPPUNIT_ASSERT_EQUAL(9,c->getIJ(1,0)); - CPPUNIT_ASSERT_EQUAL(11,c->getIJ(2,0)); - CPPUNIT_ASSERT_EQUAL(6,c->getIJ(3,0)); - CPPUNIT_ASSERT_EQUAL(0,cI->getIJ(0,0)); - CPPUNIT_ASSERT_EQUAL(3,cI->getIJ(1,0)); - CPPUNIT_ASSERT_EQUAL(3,cI->getIJ(2,0)); - CPPUNIT_ASSERT_EQUAL(4,cI->getIJ(3,0)); + CPPUNIT_ASSERT_EQUAL(ToIdType(4),cI->getNumberOfTuples()); + CPPUNIT_ASSERT_EQUAL(ToIdType(4),c->getNumberOfTuples()); + CPPUNIT_ASSERT_EQUAL(ToIdType(4),c->getIJ(0,0)); + CPPUNIT_ASSERT_EQUAL(ToIdType(9),c->getIJ(1,0)); + CPPUNIT_ASSERT_EQUAL(ToIdType(11),c->getIJ(2,0)); + CPPUNIT_ASSERT_EQUAL(ToIdType(6),c->getIJ(3,0)); + CPPUNIT_ASSERT_EQUAL(ToIdType(0),cI->getIJ(0,0)); + CPPUNIT_ASSERT_EQUAL(ToIdType(3),cI->getIJ(1,0)); + CPPUNIT_ASSERT_EQUAL(ToIdType(3),cI->getIJ(2,0)); + CPPUNIT_ASSERT_EQUAL(ToIdType(4),cI->getIJ(3,0)); c->decrRef(); cI->decrRef(); mesh->decrRef(); @@ -1397,19 +1393,19 @@ void MEDCouplingBasicsTest3::testExtrudedMesh5() DataArrayDouble *h=g->fromPolarToCart(); f->setCoords(h); MEDCouplingUMesh *i=c->buildExtrudedMesh(f,1); - CPPUNIT_ASSERT_EQUAL(52,i->getNumberOfNodes()); + CPPUNIT_ASSERT_EQUAL(52,(int)i->getNumberOfNodes()); bool tmp2; - int tmp3; - DataArrayInt *tmp=i->mergeNodes(1e-9,tmp2,tmp3); + mcIdType tmp3; + DataArrayIdType *tmp=i->mergeNodes(1e-9,tmp2,tmp3); CPPUNIT_ASSERT(tmp2); - CPPUNIT_ASSERT_EQUAL(37,tmp3); + CPPUNIT_ASSERT_EQUAL(ToIdType(37),tmp3); tmp->decrRef(); i->convertDegeneratedCells(); i->checkConsistencyLight(); - CPPUNIT_ASSERT_EQUAL(36,i->getNumberOfCells()); - CPPUNIT_ASSERT_EQUAL(37,i->getNumberOfNodes()); - CPPUNIT_ASSERT_EQUAL(12,i->getNumberOfCellsWithType(INTERP_KERNEL::NORM_TRI3)); - CPPUNIT_ASSERT_EQUAL(24,i->getNumberOfCellsWithType(INTERP_KERNEL::NORM_QUAD4)); + CPPUNIT_ASSERT_EQUAL(36,(int)i->getNumberOfCells()); + CPPUNIT_ASSERT_EQUAL(37,(int)i->getNumberOfNodes()); + CPPUNIT_ASSERT_EQUAL(12,(int)i->getNumberOfCellsWithType(INTERP_KERNEL::NORM_TRI3)); + CPPUNIT_ASSERT_EQUAL(24,(int)i->getNumberOfCellsWithType(INTERP_KERNEL::NORM_QUAD4)); const double expected1[3]={0.25,0.75,2.0625}; MEDCouplingFieldDouble *j=i->getMeasureField(true); for(int ii=0;ii<12;ii++) @@ -1509,12 +1505,12 @@ void MEDCouplingBasicsTest3::testExtrudedMesh7() DataArrayDouble *h=g->fromPolarToCart(); f->setCoords(h); MEDCouplingUMesh *i=c->buildExtrudedMesh(f,1); - CPPUNIT_ASSERT_EQUAL(52,i->getNumberOfNodes()); + CPPUNIT_ASSERT_EQUAL(52,(int)i->getNumberOfNodes()); bool tmp2; - int tmp3; - DataArrayInt *tmp=i->mergeNodes(1e-9,tmp2,tmp3); + mcIdType tmp3; + DataArrayIdType *tmp=i->mergeNodes(1e-9,tmp2,tmp3); CPPUNIT_ASSERT(tmp2); - CPPUNIT_ASSERT_EQUAL(37,tmp3); + CPPUNIT_ASSERT_EQUAL(ToIdType(37),tmp3); tmp->decrRef(); i->convertDegeneratedCells(); const double vec1[3]={10.,0.,0.}; @@ -1526,7 +1522,7 @@ void MEDCouplingBasicsTest3::testExtrudedMesh7() MEDCouplingFieldDouble *f2=i3->getMeasureField(true); tmp=i->mergeNodes(1e-9,tmp2,tmp3); CPPUNIT_ASSERT(tmp2); - CPPUNIT_ASSERT_EQUAL(444,tmp3); + CPPUNIT_ASSERT_EQUAL(ToIdType(444),tmp3); tmp->decrRef(); const double expected1[36]={1.327751058489274, 4.2942574094314701, 13.024068164857139, 1.3069177251569044, 4.1484240761012954, 12.297505664866796, 1.270833333332571, 3.8958333333309674, 11.039062499993179, 1.2291666666659207, 3.6041666666644425, 9.585937499993932, 1.1930822748415895, 3.3515759238941376, 8.3274943351204556, 1.1722489415082769, 3.2057425905609289, 7.6009318351210622, 1.1722489415082862, 3.2057425905609884, 7.6009318351213713, 1.1930822748416161, 3.3515759238943001, 8.3274943351212727, 1.2291666666659564, 3.6041666666646734, 9.5859374999950777, 1.2708333333326081, 3.8958333333311868, 11.039062499994293, 1.3069177251569224, 4.1484240761014384, 12.297505664867627, 1.3277510584902354, 4.2942574094346071, 13.024068164866796}; int kk=0; @@ -1551,17 +1547,17 @@ void MEDCouplingBasicsTest3::testExtrudedMesh7() void MEDCouplingBasicsTest3::testSimplexize1() { MEDCouplingUMesh *m=build3DSurfTargetMesh_1(); - std::vector v(1); + std::vector v(1); v[0]=3; m->convertToPolyTypes(&v[0],&v[0]+v.size()); - DataArrayInt *da=m->simplexize(0); - CPPUNIT_ASSERT_EQUAL(7,da->getNumberOfTuples()); - CPPUNIT_ASSERT_EQUAL(1,da->getNumberOfComponents()); - const int expected2[7]={0,0,1,2,3,4,4}; + DataArrayIdType *da=m->simplexize(0); + CPPUNIT_ASSERT_EQUAL(7,(int)da->getNumberOfTuples()); + CPPUNIT_ASSERT_EQUAL(1,(int)da->getNumberOfComponents()); + const mcIdType expected2[7]={0,0,1,2,3,4,4}; for(int i=0;i<7;i++) CPPUNIT_ASSERT_EQUAL(expected2[i],da->getIJ(i,0)); m->checkConsistencyLight(); - CPPUNIT_ASSERT_EQUAL(7,m->getNumberOfCells()); + CPPUNIT_ASSERT_EQUAL(7,(int)m->getNumberOfCells()); CPPUNIT_ASSERT_EQUAL(INTERP_KERNEL::NORM_TRI3,m->getTypeOfCell(0)); CPPUNIT_ASSERT_EQUAL(INTERP_KERNEL::NORM_TRI3,m->getTypeOfCell(1)); CPPUNIT_ASSERT_EQUAL(INTERP_KERNEL::NORM_TRI3,m->getTypeOfCell(2)); @@ -1585,8 +1581,8 @@ void MEDCouplingBasicsTest3::testSimplexize1() v[0]=3; m->convertToPolyTypes(&v[0],&v[0]+v.size()); da=m->simplexize(1); - CPPUNIT_ASSERT_EQUAL(7,da->getNumberOfTuples()); - CPPUNIT_ASSERT_EQUAL(1,da->getNumberOfComponents()); + CPPUNIT_ASSERT_EQUAL(7,(int)da->getNumberOfTuples()); + CPPUNIT_ASSERT_EQUAL(1,(int)da->getNumberOfComponents()); for(int i=0;i<7;i++) CPPUNIT_ASSERT_EQUAL(expected2[i],da->getIJ(i,0)); m->checkConsistencyLight(); @@ -1594,7 +1590,7 @@ void MEDCouplingBasicsTest3::testSimplexize1() CPPUNIT_ASSERT_EQUAL(2,(int)types.size()); CPPUNIT_ASSERT_EQUAL(INTERP_KERNEL::NORM_TRI3,*(types.begin())); CPPUNIT_ASSERT_EQUAL(INTERP_KERNEL::NORM_POLYGON,*(++(types.begin()))); - CPPUNIT_ASSERT_EQUAL(7,m->getNumberOfCells()); + CPPUNIT_ASSERT_EQUAL(7,(int)m->getNumberOfCells()); CPPUNIT_ASSERT_EQUAL(INTERP_KERNEL::NORM_TRI3,m->getTypeOfCell(0)); CPPUNIT_ASSERT_EQUAL(INTERP_KERNEL::NORM_TRI3,m->getTypeOfCell(1)); CPPUNIT_ASSERT_EQUAL(INTERP_KERNEL::NORM_TRI3,m->getTypeOfCell(2)); @@ -1613,7 +1609,7 @@ void MEDCouplingBasicsTest3::testSimplexize1() void MEDCouplingBasicsTest3::testSimplexize2() { MEDCouplingUMesh *m=build3DSurfTargetMesh_1(); - std::vector v(1); + std::vector v(1); v[0]=3; m->convertToPolyTypes(&v[0],&v[0]+v.size()); MEDCouplingFieldDouble *f1=MEDCouplingFieldDouble::New(ON_CELLS,ONE_TIME); @@ -1648,7 +1644,7 @@ void MEDCouplingBasicsTest3::testDAMeld1() // da1->fillWithValue(7.); da2->iota(0.); - DataArrayDouble *da3=da2->applyFunc(3,"10*x*IVec+100*x*JVec+1000*x*KVec"); + MCAuto da3=da2->applyFunc(3,"10*x*IVec+100*x*JVec+1000*x*KVec"); // da1->setInfoOnComponent(0,"c0da1"); da1->setInfoOnComponent(1,"c1da1"); @@ -1658,8 +1654,8 @@ void MEDCouplingBasicsTest3::testDAMeld1() // DataArrayDouble *da1C=da1->deepCopy(); da1->meldWith(da3); - CPPUNIT_ASSERT_EQUAL(5,da1->getNumberOfComponents()); - CPPUNIT_ASSERT_EQUAL(7,da1->getNumberOfTuples()); + CPPUNIT_ASSERT_EQUAL(5,(int)da1->getNumberOfComponents()); + CPPUNIT_ASSERT_EQUAL(7,(int)da1->getNumberOfTuples()); CPPUNIT_ASSERT(da1->getInfoOnComponent(0)=="c0da1"); CPPUNIT_ASSERT(da1->getInfoOnComponent(1)=="c1da1"); CPPUNIT_ASSERT(da1->getInfoOnComponent(2)=="c0da3"); @@ -1670,11 +1666,11 @@ void MEDCouplingBasicsTest3::testDAMeld1() for(int i=0;i<35;i++) CPPUNIT_ASSERT_DOUBLES_EQUAL(expected1[i],da1->getIJ(0,i),1e-10); // - DataArrayInt *dai1=da1C->convertToIntArr(); - DataArrayInt *dai3=da3->convertToIntArr(); + MCAuto dai1=da1C->convertToIntArr(); + MCAuto dai3=da3->convertToIntArr(); dai1->meldWith(dai3); - CPPUNIT_ASSERT_EQUAL(5,dai1->getNumberOfComponents()); - CPPUNIT_ASSERT_EQUAL(7,dai1->getNumberOfTuples()); + CPPUNIT_ASSERT_EQUAL(5,(int)dai1->getNumberOfComponents()); + CPPUNIT_ASSERT_EQUAL(7,(int)dai1->getNumberOfTuples()); CPPUNIT_ASSERT(dai1->getInfoOnComponent(0)=="c0da1"); CPPUNIT_ASSERT(dai1->getInfoOnComponent(1)=="c1da1"); CPPUNIT_ASSERT(dai1->getInfoOnComponent(2)=="c0da3"); @@ -1684,8 +1680,8 @@ void MEDCouplingBasicsTest3::testDAMeld1() CPPUNIT_ASSERT_EQUAL((int)expected1[i],dai1->getIJ(0,i)); // test of static method DataArrayDouble::meld DataArrayDouble *da4=DataArrayDouble::Meld(da1C,da3); - CPPUNIT_ASSERT_EQUAL(5,da4->getNumberOfComponents()); - CPPUNIT_ASSERT_EQUAL(7,da4->getNumberOfTuples()); + CPPUNIT_ASSERT_EQUAL(5,(int)da4->getNumberOfComponents()); + CPPUNIT_ASSERT_EQUAL(7,(int)da4->getNumberOfTuples()); CPPUNIT_ASSERT(da4->getInfoOnComponent(0)=="c0da1"); CPPUNIT_ASSERT(da4->getInfoOnComponent(1)=="c1da1"); CPPUNIT_ASSERT(da4->getInfoOnComponent(2)=="c0da3"); @@ -1693,28 +1689,24 @@ void MEDCouplingBasicsTest3::testDAMeld1() CPPUNIT_ASSERT(da4->getInfoOnComponent(4)=="c2da3"); for(int i=0;i<35;i++) CPPUNIT_ASSERT_DOUBLES_EQUAL(expected1[i],da4->getIJ(0,i),1e-10); - // test of static method DataArrayInt::meld - dai1->decrRef(); + // test of static method DataArrayIdType::meld dai1=da1C->convertToIntArr(); DataArrayInt *dai4=DataArrayInt::Meld(dai1,dai3); - CPPUNIT_ASSERT_EQUAL(5,dai4->getNumberOfComponents()); - CPPUNIT_ASSERT_EQUAL(7,dai4->getNumberOfTuples()); + CPPUNIT_ASSERT_EQUAL(5,(int)dai4->getNumberOfComponents()); + CPPUNIT_ASSERT_EQUAL(7,(int)dai4->getNumberOfTuples()); CPPUNIT_ASSERT(dai4->getInfoOnComponent(0)=="c0da1"); CPPUNIT_ASSERT(dai4->getInfoOnComponent(1)=="c1da1"); CPPUNIT_ASSERT(dai4->getInfoOnComponent(2)=="c0da3"); CPPUNIT_ASSERT(dai4->getInfoOnComponent(3)=="c1da3"); CPPUNIT_ASSERT(dai4->getInfoOnComponent(4)=="c2da3"); for(int i=0;i<35;i++) - CPPUNIT_ASSERT_EQUAL((int)expected1[i],dai4->getIJ(0,i)); + CPPUNIT_ASSERT_EQUAL(expected1[i],(double)dai4->getIJ(0,i)); // dai4->decrRef(); da4->decrRef(); - dai3->decrRef(); - dai1->decrRef(); da1C->decrRef(); da1->decrRef(); da2->decrRef(); - da3->decrRef(); } void MEDCouplingBasicsTest3::testFieldMeld1() @@ -1742,8 +1734,8 @@ void MEDCouplingBasicsTest3::testFieldMeld1() // MEDCouplingFieldDouble *f3=MEDCouplingFieldDouble::MeldFields(f2,f1); f3->checkConsistencyLight(); - CPPUNIT_ASSERT_EQUAL(5,f3->getNumberOfTuples()); - CPPUNIT_ASSERT_EQUAL(3,f3->getNumberOfComponents()); + CPPUNIT_ASSERT_EQUAL(5,(int)f3->getNumberOfTuples()); + CPPUNIT_ASSERT_EQUAL(3,(int)f3->getNumberOfComponents()); CPPUNIT_ASSERT(f3->getArray()->getInfoOnComponent(0)=="bbb"); CPPUNIT_ASSERT(f3->getArray()->getInfoOnComponent(1)=="ccc"); CPPUNIT_ASSERT(f3->getArray()->getInfoOnComponent(2)=="aaa"); @@ -1760,8 +1752,8 @@ void MEDCouplingBasicsTest3::testFieldMeld1() MEDCouplingFieldDouble *f5=f1->buildNewTimeReprFromThis(NO_TIME,false); MEDCouplingFieldDouble *f6=MEDCouplingFieldDouble::MeldFields(f4,f5); f6->checkConsistencyLight(); - CPPUNIT_ASSERT_EQUAL(5,f6->getNumberOfTuples()); - CPPUNIT_ASSERT_EQUAL(3,f6->getNumberOfComponents()); + CPPUNIT_ASSERT_EQUAL(5,(int)f6->getNumberOfTuples()); + CPPUNIT_ASSERT_EQUAL(3,(int)f6->getNumberOfComponents()); CPPUNIT_ASSERT(f6->getArray()->getInfoOnComponent(0)=="bbb"); CPPUNIT_ASSERT(f6->getArray()->getInfoOnComponent(1)=="ccc"); CPPUNIT_ASSERT(f6->getArray()->getInfoOnComponent(2)=="aaa"); @@ -1790,9 +1782,9 @@ void MEDCouplingBasicsTest3::testMergeNodes2() tmp[1]=m2; MEDCouplingUMesh *m3=MEDCouplingUMesh::MergeUMeshes(tmp); bool b; - int newNbOfNodes; - DataArrayInt *da=m3->mergeNodesCenter(0.01,b,newNbOfNodes); - CPPUNIT_ASSERT_EQUAL(9,m3->getNumberOfNodes()); + mcIdType newNbOfNodes; + DataArrayIdType *da=m3->mergeNodesCenter(0.01,b,newNbOfNodes); + CPPUNIT_ASSERT_EQUAL(9,(int)m3->getNumberOfNodes()); const double expected1[18]={-0.299,-0.3, 0.201,-0.3, 0.701,-0.3, -0.299,0.2, 0.201,0.2, 0.701,0.2, -0.299,0.7, 0.201,0.7, 0.701,0.7}; for(int i=0;i<18;i++) CPPUNIT_ASSERT_DOUBLES_EQUAL(expected1[i],m3->getCoords()->getIJ(0,i),1e-13); @@ -1831,7 +1823,7 @@ void MEDCouplingBasicsTest3::testMergeField2() std::vector tmp(3); tmp[0]=f1; tmp[1]=f2; tmp[2]=f3; MEDCouplingFieldDouble *f4=MEDCouplingFieldDouble::MergeFields(tmp); - CPPUNIT_ASSERT_EQUAL(15,f4->getMesh()->getNumberOfCells()); + CPPUNIT_ASSERT_EQUAL(15,(int)f4->getMesh()->getNumberOfCells()); const double expected1[30]={2.,2.,2.,2.,2.,2.,2.,2.,2.,2., 5.,5.,5.,5.,5.,5.,5.,5.,5.,5., 7.,7.,7.,7.,7.,7.,7.,7.,7.,7.}; for(int i=0;i<30;i++) CPPUNIT_ASSERT_DOUBLES_EQUAL(expected1[i],f4->getIJ(0,i),1.e-13); @@ -1845,14 +1837,14 @@ void MEDCouplingBasicsTest3::testMergeField2() void MEDCouplingBasicsTest3::testDAIBuildComplement1() { - DataArrayInt *a=DataArrayInt::New(); - const int tab[4]={3,1,7,8}; + DataArrayIdType *a=DataArrayIdType::New(); + const mcIdType tab[4]={3,1,7,8}; a->alloc(4,1); std::copy(tab,tab+4,a->getPointer()); - DataArrayInt *b=a->buildComplement(12); - CPPUNIT_ASSERT_EQUAL(8,b->getNumberOfTuples()); - CPPUNIT_ASSERT_EQUAL(1,b->getNumberOfComponents()); - const int expected1[8]={0,2,4,5,6,9,10,11}; + DataArrayIdType *b=a->buildComplement(12); + CPPUNIT_ASSERT_EQUAL(8,(int)b->getNumberOfTuples()); + CPPUNIT_ASSERT_EQUAL(1,(int)b->getNumberOfComponents()); + const mcIdType expected1[8]={0,2,4,5,6,9,10,11}; for(int i=0;i<8;i++) CPPUNIT_ASSERT_EQUAL(expected1[i],b->getIJ(0,i)); b->decrRef(); @@ -1861,18 +1853,18 @@ void MEDCouplingBasicsTest3::testDAIBuildComplement1() void MEDCouplingBasicsTest3::testDAIBuildUnion1() { - DataArrayInt *a=DataArrayInt::New(); - const int tab1[4]={3,1,7,8}; + DataArrayIdType *a=DataArrayIdType::New(); + const mcIdType tab1[4]={3,1,7,8}; a->alloc(4,1); std::copy(tab1,tab1+4,a->getPointer()); - DataArrayInt *c=DataArrayInt::New(); - const int tab2[5]={5,3,0,18,8}; + DataArrayIdType *c=DataArrayIdType::New(); + const mcIdType tab2[5]={5,3,0,18,8}; c->alloc(5,1); std::copy(tab2,tab2+5,c->getPointer()); - DataArrayInt *b=a->buildUnion(c); - CPPUNIT_ASSERT_EQUAL(7,b->getNumberOfTuples()); - CPPUNIT_ASSERT_EQUAL(1,b->getNumberOfComponents()); - const int expected1[7]={0,1,3,5,7,8,18}; + DataArrayIdType *b=a->buildUnion(c); + CPPUNIT_ASSERT_EQUAL(7,(int)b->getNumberOfTuples()); + CPPUNIT_ASSERT_EQUAL(1,(int)b->getNumberOfComponents()); + const mcIdType expected1[7]={0,1,3,5,7,8,18}; for(int i=0;i<7;i++) CPPUNIT_ASSERT_EQUAL(expected1[i],b->getIJ(0,i)); c->decrRef(); @@ -1882,18 +1874,18 @@ void MEDCouplingBasicsTest3::testDAIBuildUnion1() void MEDCouplingBasicsTest3::testDAIBuildIntersection1() { - DataArrayInt *a=DataArrayInt::New(); - const int tab1[4]={3,1,7,8}; + DataArrayIdType *a=DataArrayIdType::New(); + const mcIdType tab1[4]={3,1,7,8}; a->alloc(4,1); std::copy(tab1,tab1+4,a->getPointer()); - DataArrayInt *c=DataArrayInt::New(); - const int tab2[5]={5,3,0,18,8}; + DataArrayIdType *c=DataArrayIdType::New(); + const mcIdType tab2[5]={5,3,0,18,8}; c->alloc(5,1); std::copy(tab2,tab2+5,c->getPointer()); - DataArrayInt *b=a->buildIntersection(c); - CPPUNIT_ASSERT_EQUAL(2,b->getNumberOfTuples()); - CPPUNIT_ASSERT_EQUAL(1,b->getNumberOfComponents()); - const int expected1[2]={3,8}; + DataArrayIdType *b=a->buildIntersection(c); + CPPUNIT_ASSERT_EQUAL(2,(int)b->getNumberOfTuples()); + CPPUNIT_ASSERT_EQUAL(1,(int)b->getNumberOfComponents()); + const mcIdType expected1[2]={3,8}; for(int i=0;i<2;i++) CPPUNIT_ASSERT_EQUAL(expected1[i],b->getIJ(0,i)); c->decrRef(); @@ -1903,14 +1895,14 @@ void MEDCouplingBasicsTest3::testDAIBuildIntersection1() void MEDCouplingBasicsTest3::testDAIDeltaShiftIndex1() { - DataArrayInt *a=DataArrayInt::New(); - const int tab[7]={1,3,6,7,7,9,15}; + DataArrayIdType *a=DataArrayIdType::New(); + const mcIdType tab[7]={1,3,6,7,7,9,15}; a->alloc(7,1); std::copy(tab,tab+7,a->getPointer()); - DataArrayInt *b=a->deltaShiftIndex(); - CPPUNIT_ASSERT_EQUAL(6,b->getNumberOfTuples()); - CPPUNIT_ASSERT_EQUAL(1,b->getNumberOfComponents()); - const int expected1[6]={2,3,1,0,2,6}; + DataArrayIdType *b=a->deltaShiftIndex(); + CPPUNIT_ASSERT_EQUAL(6,(int)b->getNumberOfTuples()); + CPPUNIT_ASSERT_EQUAL(1,(int)b->getNumberOfComponents()); + const mcIdType expected1[6]={2,3,1,0,2,6}; for(int i=0;i<6;i++) CPPUNIT_ASSERT_EQUAL(expected1[i],b->getIJ(0,i)); b->decrRef(); @@ -1926,34 +1918,34 @@ void MEDCouplingBasicsTest3::testDaDoubleSelectByTupleIdSafe1() const double arr1[14]={1.1,11.1,2.1,12.1,3.1,13.1,4.1,14.1,5.1,15.1,6.1,16.1,7.1,17.1}; std::copy(arr1,arr1+14,a->getPointer()); // - const int arr2[7]={4,2,0,6,5}; + const mcIdType arr2[7]={4,2,0,6,5}; DataArrayDouble *b=a->selectByTupleIdSafe(arr2,arr2+5); - CPPUNIT_ASSERT_EQUAL(5,b->getNumberOfTuples()); - CPPUNIT_ASSERT_EQUAL(2,b->getNumberOfComponents()); + CPPUNIT_ASSERT_EQUAL(5,(int)b->getNumberOfTuples()); + CPPUNIT_ASSERT_EQUAL(2,(int)b->getNumberOfComponents()); CPPUNIT_ASSERT(std::string(b->getInfoOnComponent(0))=="toto"); CPPUNIT_ASSERT(std::string(b->getInfoOnComponent(1))=="tata"); const double expected1[10]={5.1,15.1,3.1,13.1,1.1,11.1,7.1,17.1,6.1,16.1}; for(int i=0;i<10;i++) CPPUNIT_ASSERT_DOUBLES_EQUAL(expected1[i],b->getIJ(0,i),1e-14); - const int arr4[5]={4,-1,0,6,5}; + const mcIdType arr4[5]={4,-1,0,6,5}; CPPUNIT_ASSERT_THROW(a->selectByTupleIdSafe(arr4,arr4+5),INTERP_KERNEL::Exception); - const int arr5[5]={4,2,0,6,7}; + const mcIdType arr5[5]={4,2,0,6,7}; CPPUNIT_ASSERT_THROW(a->selectByTupleIdSafe(arr5,arr5+5),INTERP_KERNEL::Exception); b->decrRef(); a->decrRef(); // - DataArrayInt *c=DataArrayInt::New(); + DataArrayIdType *c=DataArrayIdType::New(); c->alloc(7,2); c->setInfoOnComponent(0,"toto"); c->setInfoOnComponent(1,"tata"); - const int arr3[14]={1,11,2,12,3,13,4,14,5,15,6,16,7,17}; + const mcIdType arr3[14]={1,11,2,12,3,13,4,14,5,15,6,16,7,17}; std::copy(arr3,arr3+14,c->getPointer()); - DataArrayInt *d=c->selectByTupleIdSafe(arr2,arr2+5); - CPPUNIT_ASSERT_EQUAL(5,d->getNumberOfTuples()); - CPPUNIT_ASSERT_EQUAL(2,d->getNumberOfComponents()); + DataArrayIdType *d=c->selectByTupleIdSafe(arr2,arr2+5); + CPPUNIT_ASSERT_EQUAL(5,(int)d->getNumberOfTuples()); + CPPUNIT_ASSERT_EQUAL(2,(int)d->getNumberOfComponents()); CPPUNIT_ASSERT(std::string(d->getInfoOnComponent(0))=="toto"); CPPUNIT_ASSERT(std::string(d->getInfoOnComponent(1))=="tata"); - const int expected2[10]={5,15,3,13,1,11,7,17,6,16}; + const mcIdType expected2[10]={5,15,3,13,1,11,7,17,6,16}; for(int i=0;i<10;i++) CPPUNIT_ASSERT_EQUAL(expected2[i],d->getIJ(0,i)); CPPUNIT_ASSERT_THROW(c->selectByTupleIdSafe(arr4,arr4+5),INTERP_KERNEL::Exception); @@ -1965,12 +1957,12 @@ void MEDCouplingBasicsTest3::testDaDoubleSelectByTupleIdSafe1() void MEDCouplingBasicsTest3::testAreCellsIncludedIn1() { MEDCouplingUMesh *m=build3DSurfTargetMesh_1(); - const int pt[2]={1,3}; + const mcIdType pt[2]={1,3}; MEDCouplingUMesh *m2=(MEDCouplingUMesh *)m->buildPartOfMySelf(pt,pt+2,true); - DataArrayInt *tmp; + DataArrayIdType *tmp; CPPUNIT_ASSERT(m->areCellsIncludedIn(m2,0,tmp)); - CPPUNIT_ASSERT_EQUAL(2,tmp->getNumberOfTuples()); - CPPUNIT_ASSERT_EQUAL(1,tmp->getNumberOfComponents()); + CPPUNIT_ASSERT_EQUAL(2,(int)tmp->getNumberOfTuples()); + CPPUNIT_ASSERT_EQUAL(1,(int)tmp->getNumberOfComponents()); CPPUNIT_ASSERT_EQUAL(pt[0],tmp->getIJ(0,0)); CPPUNIT_ASSERT_EQUAL(pt[1],tmp->getIJ(0,1)); tmp->decrRef(); @@ -1982,19 +1974,19 @@ void MEDCouplingBasicsTest3::testAreCellsIncludedIn1() void MEDCouplingBasicsTest3::testDAIBuildSubstraction1() { - DataArrayInt *a=DataArrayInt::New(); - const int aa[]={2,3,6,8,9}; + DataArrayIdType *a=DataArrayIdType::New(); + const mcIdType aa[]={2,3,6,8,9}; a->alloc(5,1); std::copy(aa,aa+5,a->getPointer()); - DataArrayInt *b=DataArrayInt::New(); - const int bb[]={1,3,5,9,11}; + DataArrayIdType *b=DataArrayIdType::New(); + const mcIdType bb[]={1,3,5,9,11}; b->alloc(5,1); std::copy(bb,bb+5,b->getPointer()); // - DataArrayInt *c=a->buildSubstraction(b); - CPPUNIT_ASSERT_EQUAL(3,c->getNumberOfTuples()); - CPPUNIT_ASSERT_EQUAL(1,c->getNumberOfComponents()); - const int expected1[3]={2,6,8}; + DataArrayIdType *c=a->buildSubstraction(b); + CPPUNIT_ASSERT_EQUAL(3,(int)c->getNumberOfTuples()); + CPPUNIT_ASSERT_EQUAL(1,(int)c->getNumberOfComponents()); + const mcIdType expected1[3]={2,6,8}; CPPUNIT_ASSERT(std::equal(expected1,expected1+3,c->getConstPointer())); // c->decrRef(); @@ -2005,16 +1997,16 @@ void MEDCouplingBasicsTest3::testDAIBuildSubstraction1() void MEDCouplingBasicsTest3::testBuildOrthogonalField2() { MEDCouplingUMesh *m=build2DTargetMesh_1(); - DataArrayInt *d1=DataArrayInt::New(); - DataArrayInt *d2=DataArrayInt::New(); - DataArrayInt *d3=DataArrayInt::New(); - DataArrayInt *d4=DataArrayInt::New(); + DataArrayIdType *d1=DataArrayIdType::New(); + DataArrayIdType *d2=DataArrayIdType::New(); + DataArrayIdType *d3=DataArrayIdType::New(); + DataArrayIdType *d4=DataArrayIdType::New(); MEDCouplingUMesh *m1=m->buildDescendingConnectivity(d1,d2,d3,d4); // MEDCouplingFieldDouble *f1=m1->buildOrthogonalField(); DataArrayDouble *da1=f1->getArray(); - CPPUNIT_ASSERT_EQUAL(2,da1->getNumberOfComponents()); - CPPUNIT_ASSERT_EQUAL(13,da1->getNumberOfTuples()); + CPPUNIT_ASSERT_EQUAL(2,(int)da1->getNumberOfComponents()); + CPPUNIT_ASSERT_EQUAL(13,(int)da1->getNumberOfTuples()); // const double expected1[26]={-1.,0.,0.,1.,1.,0.,0.,-1.,0.707106781186548,0.707106781186548,0.,-1.,0.,1.,1.,0.,0.,1.,1.,0.,-1.,0.,0.,1.,1.,0.}; for(int i=0;i<26;i++) @@ -2032,7 +2024,7 @@ void MEDCouplingBasicsTest3::testBuildOrthogonalField2() void MEDCouplingBasicsTest3::testUMInsertNextCell1() { double targetCoords[18]={-0.3,-0.3, 0.2,-0.3, 0.7,-0.3, -0.3,0.2, 0.2,0.2, 0.7,0.2, -0.3,0.7, 0.2,0.7, 0.7,0.7 }; - int targetConn[18]={0,3,4,1, 1,4,2, 4,5,2, 6,7,4,3, 7,8,5,4}; + mcIdType targetConn[18]={0,3,4,1, 1,4,2, 4,5,2, 6,7,4,3, 7,8,5,4}; MEDCouplingUMesh *targetMesh=MEDCouplingUMesh::New(); targetMesh->allocateCells(5); CPPUNIT_ASSERT_THROW(targetMesh->insertNextCell(INTERP_KERNEL::NORM_QUAD4,4,targetConn),INTERP_KERNEL::Exception); @@ -2058,10 +2050,10 @@ void MEDCouplingBasicsTest3::testUMInsertNextCell1() void MEDCouplingBasicsTest3::testFieldOperatorDivDiffComp1() { MEDCouplingUMesh *m=build2DTargetMesh_1(); - DataArrayInt *d1=DataArrayInt::New(); - DataArrayInt *d2=DataArrayInt::New(); - DataArrayInt *d3=DataArrayInt::New(); - DataArrayInt *d4=DataArrayInt::New(); + DataArrayIdType *d1=DataArrayIdType::New(); + DataArrayIdType *d2=DataArrayIdType::New(); + DataArrayIdType *d3=DataArrayIdType::New(); + DataArrayIdType *d4=DataArrayIdType::New(); MEDCouplingUMesh *m1=m->buildDescendingConnectivity(d1,d2,d3,d4); // MEDCouplingFieldDouble *f1=m1->buildOrthogonalField(); @@ -2098,68 +2090,68 @@ void MEDCouplingBasicsTest3::testFieldOperatorDivDiffComp1() void MEDCouplingBasicsTest3::testDARearrange1() { - DataArrayInt *da1=DataArrayInt::New(); + DataArrayIdType *da1=DataArrayIdType::New(); da1->alloc(12,1); da1->iota(0); - const int *ptr=da1->getConstPointer(); + const mcIdType *ptr=da1->getConstPointer(); // - CPPUNIT_ASSERT_EQUAL((std::size_t)12,da1->getNbOfElems()); - CPPUNIT_ASSERT_EQUAL(1,da1->getNumberOfComponents()); - CPPUNIT_ASSERT_EQUAL(12,da1->getNumberOfTuples()); + CPPUNIT_ASSERT_EQUAL(ToIdType(12),da1->getNbOfElems()); + CPPUNIT_ASSERT_EQUAL(1,(int)da1->getNumberOfComponents()); + CPPUNIT_ASSERT_EQUAL(12,(int)da1->getNumberOfTuples()); da1->rearrange(4); CPPUNIT_ASSERT(ptr==da1->getConstPointer()); - CPPUNIT_ASSERT_EQUAL((std::size_t)12,da1->getNbOfElems()); - CPPUNIT_ASSERT_EQUAL(4,da1->getNumberOfComponents()); - CPPUNIT_ASSERT_EQUAL(3,da1->getNumberOfTuples()); - for(int i=0;i<12;i++) + CPPUNIT_ASSERT_EQUAL(ToIdType(12),da1->getNbOfElems()); + CPPUNIT_ASSERT_EQUAL(4,(int)da1->getNumberOfComponents()); + CPPUNIT_ASSERT_EQUAL(3,(int)da1->getNumberOfTuples()); + for(mcIdType i=0;i<12;i++) CPPUNIT_ASSERT_EQUAL(i,da1->getIJ(0,i)); // da1->rearrange(6); CPPUNIT_ASSERT(ptr==da1->getConstPointer()); - CPPUNIT_ASSERT_EQUAL((std::size_t)12,da1->getNbOfElems()); - CPPUNIT_ASSERT_EQUAL(6,da1->getNumberOfComponents()); - CPPUNIT_ASSERT_EQUAL(2,da1->getNumberOfTuples()); - for(int i=0;i<12;i++) + CPPUNIT_ASSERT_EQUAL(ToIdType(12),da1->getNbOfElems()); + CPPUNIT_ASSERT_EQUAL(6,(int)da1->getNumberOfComponents()); + CPPUNIT_ASSERT_EQUAL(2,(int)da1->getNumberOfTuples()); + for(mcIdType i=0;i<12;i++) CPPUNIT_ASSERT_EQUAL(i,da1->getIJ(0,i)); // CPPUNIT_ASSERT_THROW(da1->rearrange(7),INTERP_KERNEL::Exception); // da1->rearrange(12); CPPUNIT_ASSERT(ptr==da1->getConstPointer()); - CPPUNIT_ASSERT_EQUAL((std::size_t)12,da1->getNbOfElems()); - CPPUNIT_ASSERT_EQUAL(12,da1->getNumberOfComponents()); - CPPUNIT_ASSERT_EQUAL(1,da1->getNumberOfTuples()); - for(int i=0;i<12;i++) + CPPUNIT_ASSERT_EQUAL(ToIdType(12),da1->getNbOfElems()); + CPPUNIT_ASSERT_EQUAL(12,(int)da1->getNumberOfComponents()); + CPPUNIT_ASSERT_EQUAL(1,(int)da1->getNumberOfTuples()); + for(mcIdType i=0;i<12;i++) CPPUNIT_ASSERT_EQUAL(i,da1->getIJ(0,i)); // da1->rearrange(3); CPPUNIT_ASSERT(ptr==da1->getConstPointer()); - CPPUNIT_ASSERT_EQUAL((std::size_t)12,da1->getNbOfElems()); - CPPUNIT_ASSERT_EQUAL(3,da1->getNumberOfComponents()); - CPPUNIT_ASSERT_EQUAL(4,da1->getNumberOfTuples()); - for(int i=0;i<12;i++) + CPPUNIT_ASSERT_EQUAL(ToIdType(12),da1->getNbOfElems()); + CPPUNIT_ASSERT_EQUAL(3,(int)da1->getNumberOfComponents()); + CPPUNIT_ASSERT_EQUAL(4,(int)da1->getNumberOfTuples()); + for(mcIdType i=0;i<12;i++) CPPUNIT_ASSERT_EQUAL(i,da1->getIJ(0,i)); //double - DataArrayDouble *da2=da1->convertToDblArr(); + MCAuto da2=da1->convertToDblArr(); da1->decrRef(); const double *ptr2=da2->getConstPointer(); // - CPPUNIT_ASSERT_EQUAL((std::size_t)12,da2->getNbOfElems()); - CPPUNIT_ASSERT_EQUAL(3,da2->getNumberOfComponents()); - CPPUNIT_ASSERT_EQUAL(4,da2->getNumberOfTuples()); + CPPUNIT_ASSERT_EQUAL(ToIdType(12),da2->getNbOfElems()); + CPPUNIT_ASSERT_EQUAL(3,(int)da2->getNumberOfComponents()); + CPPUNIT_ASSERT_EQUAL(4,(int)da2->getNumberOfTuples()); da2->rearrange(4); CPPUNIT_ASSERT(ptr2==da2->getConstPointer()); - CPPUNIT_ASSERT_EQUAL((std::size_t)12,da2->getNbOfElems()); - CPPUNIT_ASSERT_EQUAL(4,da2->getNumberOfComponents()); - CPPUNIT_ASSERT_EQUAL(3,da2->getNumberOfTuples()); + CPPUNIT_ASSERT_EQUAL(ToIdType(12),da2->getNbOfElems()); + CPPUNIT_ASSERT_EQUAL(4,(int)da2->getNumberOfComponents()); + CPPUNIT_ASSERT_EQUAL(3,(int)da2->getNumberOfTuples()); for(int i=0;i<12;i++) CPPUNIT_ASSERT_DOUBLES_EQUAL((double)i,da2->getIJ(0,i),1e-14); // da2->rearrange(6); CPPUNIT_ASSERT(ptr2==da2->getConstPointer()); - CPPUNIT_ASSERT_EQUAL((std::size_t)12,da2->getNbOfElems()); - CPPUNIT_ASSERT_EQUAL(6,da2->getNumberOfComponents()); - CPPUNIT_ASSERT_EQUAL(2,da2->getNumberOfTuples()); + CPPUNIT_ASSERT_EQUAL(ToIdType(12),da2->getNbOfElems()); + CPPUNIT_ASSERT_EQUAL(6,(int)da2->getNumberOfComponents()); + CPPUNIT_ASSERT_EQUAL(2,(int)da2->getNumberOfTuples()); for(int i=0;i<12;i++) CPPUNIT_ASSERT_DOUBLES_EQUAL((double)i,da2->getIJ(0,i),1e-14); // @@ -2167,31 +2159,30 @@ void MEDCouplingBasicsTest3::testDARearrange1() // da2->rearrange(1); CPPUNIT_ASSERT(ptr2==da2->getConstPointer()); - CPPUNIT_ASSERT_EQUAL((std::size_t)12,da2->getNbOfElems()); - CPPUNIT_ASSERT_EQUAL(1,da2->getNumberOfComponents()); - CPPUNIT_ASSERT_EQUAL(12,da2->getNumberOfTuples()); + CPPUNIT_ASSERT_EQUAL(ToIdType(12),da2->getNbOfElems()); + CPPUNIT_ASSERT_EQUAL(1,(int)da2->getNumberOfComponents()); + CPPUNIT_ASSERT_EQUAL(12,(int)da2->getNumberOfTuples()); for(int i=0;i<12;i++) CPPUNIT_ASSERT_DOUBLES_EQUAL((double)i,da2->getIJ(0,i),1e-14); // da2->rearrange(3); CPPUNIT_ASSERT(ptr2==da2->getConstPointer()); - CPPUNIT_ASSERT_EQUAL((std::size_t)12,da2->getNbOfElems()); - CPPUNIT_ASSERT_EQUAL(3,da2->getNumberOfComponents()); - CPPUNIT_ASSERT_EQUAL(4,da2->getNumberOfTuples()); + CPPUNIT_ASSERT_EQUAL(ToIdType(12),da2->getNbOfElems()); + CPPUNIT_ASSERT_EQUAL(3,(int)da2->getNumberOfComponents()); + CPPUNIT_ASSERT_EQUAL(4,(int)da2->getNumberOfTuples()); for(int i=0;i<12;i++) CPPUNIT_ASSERT_DOUBLES_EQUAL((double)i,da2->getIJ(0,i),1e-14); - da2->decrRef(); } void MEDCouplingBasicsTest3::testGetDifferentValues1() { - DataArrayInt *da1=DataArrayInt::New(); - const int arr[12]={1,2,3,2,2,3,5,1,5,5,2,2}; + DataArrayIdType *da1=DataArrayIdType::New(); + const mcIdType arr[12]={1,2,3,2,2,3,5,1,5,5,2,2}; da1->alloc(4,3); std::copy(arr,arr+12,da1->getPointer()); - DataArrayInt *s=da1->getDifferentValues(); - const int expected1[4]={1,2,3,5}; - CPPUNIT_ASSERT_EQUAL(4,s->getNumberOfTuples()); + DataArrayIdType *s=da1->getDifferentValues(); + const mcIdType expected1[4]={1,2,3,5}; + CPPUNIT_ASSERT_EQUAL(4,(int)s->getNumberOfTuples()); CPPUNIT_ASSERT(std::equal(expected1,expected1+4,s->begin())); da1->decrRef(); s->decrRef(); @@ -2199,18 +2190,18 @@ void MEDCouplingBasicsTest3::testGetDifferentValues1() void MEDCouplingBasicsTest3::testDAIBuildPermutationArr1() { - DataArrayInt *a=DataArrayInt::New(); - const int vala[5]={4,5,6,7,8}; + DataArrayIdType *a=DataArrayIdType::New(); + const mcIdType vala[5]={4,5,6,7,8}; a->alloc(5,1); std::copy(vala,vala+5,a->getPointer()); - DataArrayInt *b=DataArrayInt::New(); - const int valb[5]={5,4,8,6,7}; + DataArrayIdType *b=DataArrayIdType::New(); + const mcIdType valb[5]={5,4,8,6,7}; b->alloc(5,1); std::copy(valb,valb+5,b->getPointer()); - DataArrayInt *c=a->buildPermutationArr(*b); - const int expect1[5]={1,0,4,2,3}; - CPPUNIT_ASSERT_EQUAL(5,c->getNumberOfTuples()); - CPPUNIT_ASSERT_EQUAL(1,c->getNumberOfComponents()); + DataArrayIdType *c=a->buildPermutationArr(*b); + const mcIdType expect1[5]={1,0,4,2,3}; + CPPUNIT_ASSERT_EQUAL(5,(int)c->getNumberOfTuples()); + CPPUNIT_ASSERT_EQUAL(1,(int)c->getNumberOfComponents()); CPPUNIT_ASSERT(std::equal(expect1,expect1+5,c->getConstPointer())); CPPUNIT_ASSERT(a->isEqualWithoutConsideringStrAndOrder(*b)); b->setIJ(0,0,9); @@ -2222,22 +2213,21 @@ void MEDCouplingBasicsTest3::testDAIBuildPermutationArr1() CPPUNIT_ASSERT(a->isEqualWithoutConsideringStrAndOrder(*b)); c->decrRef(); c=a->buildPermutationArr(*b); - const int expect2[5]={1,3,4,2,3}; + const mcIdType expect2[5]={1,3,4,2,3}; CPPUNIT_ASSERT(std::equal(expect2,expect2+5,c->getConstPointer())); - DataArrayDouble *d=b->convertToDblArr(); + MCAuto d=b->convertToDblArr(); b->sort(); - const int expect3[5]={4,4,5,6,8}; + const mcIdType expect3[5]={4,4,5,6,8}; CPPUNIT_ASSERT(std::equal(expect3,expect3+5,b->getConstPointer())); d->sort(); - CPPUNIT_ASSERT_EQUAL(5,d->getNumberOfTuples()); - CPPUNIT_ASSERT_EQUAL(1,d->getNumberOfComponents()); + CPPUNIT_ASSERT_EQUAL(5,(int)d->getNumberOfTuples()); + CPPUNIT_ASSERT_EQUAL(1,(int)d->getNumberOfComponents()); for(int i=0;i<5;i++) CPPUNIT_ASSERT_DOUBLES_EQUAL(double(expect3[i]),d->getIJ(i,0),1e-14); // - d->decrRef(); + b->decrRef(); c->decrRef(); a->decrRef(); - b->decrRef(); } void MEDCouplingBasicsTest3::testAreCellsIncludedIn2() @@ -2245,15 +2235,15 @@ void MEDCouplingBasicsTest3::testAreCellsIncludedIn2() const char myName[]="Vitoo"; MEDCouplingUMesh *m=build3DSurfTargetMesh_1(); MEDCouplingUMesh *m2=(MEDCouplingUMesh *)m->buildPartOfMySelf(0,0,true); - CPPUNIT_ASSERT_EQUAL(0,m2->getNumberOfCells()); + CPPUNIT_ASSERT_EQUAL(0,(int)m2->getNumberOfCells()); CPPUNIT_ASSERT_EQUAL(3,m2->getSpaceDimension()); CPPUNIT_ASSERT_EQUAL(2,m2->getMeshDimension()); m2->setName(myName); - DataArrayInt *tmp; + DataArrayIdType *tmp; CPPUNIT_ASSERT(m->areCellsIncludedIn(m2,0,tmp)); CPPUNIT_ASSERT(std::string(myName)==tmp->getName()); - CPPUNIT_ASSERT_EQUAL(0,tmp->getNumberOfTuples()); - CPPUNIT_ASSERT_EQUAL(1,tmp->getNumberOfComponents()); + CPPUNIT_ASSERT_EQUAL(0,(int)tmp->getNumberOfTuples()); + CPPUNIT_ASSERT_EQUAL(1,(int)tmp->getNumberOfComponents()); m->decrRef(); m2->decrRef(); tmp->decrRef(); @@ -2262,10 +2252,10 @@ void MEDCouplingBasicsTest3::testAreCellsIncludedIn2() void MEDCouplingBasicsTest3::testUMeshGetPartBarycenterAndOwner1() { MEDCouplingUMesh *m1=build2DTargetMesh_1(); - const int part[3]={1,0,4}; + const mcIdType part[3]={1,0,4}; DataArrayDouble *b=m1->getPartBarycenterAndOwner(part,part+3); - CPPUNIT_ASSERT_EQUAL(2,b->getNumberOfComponents()); - CPPUNIT_ASSERT_EQUAL(3,b->getNumberOfTuples()); + CPPUNIT_ASSERT_EQUAL(2,(int)b->getNumberOfComponents()); + CPPUNIT_ASSERT_EQUAL(3,(int)b->getNumberOfTuples()); const double expected1[6]={0.36666666666666665,-0.13333333333333333,-0.05,-0.05,0.45,0.45}; for(int i=0;i<6;i++) CPPUNIT_ASSERT_DOUBLES_EQUAL(expected1[i],b->getIJ(0,i),1e-14); @@ -2276,10 +2266,10 @@ void MEDCouplingBasicsTest3::testUMeshGetPartBarycenterAndOwner1() void MEDCouplingBasicsTest3::testUMeshGetPartMeasureField1() { MEDCouplingUMesh *m1=build2DTargetMesh_1(); - const int part[3]={1,0,4}; + const mcIdType part[3]={1,0,4}; DataArrayDouble *b=m1->getPartMeasureField(true,part,part+3); - CPPUNIT_ASSERT_EQUAL(1,b->getNumberOfComponents()); - CPPUNIT_ASSERT_EQUAL(3,b->getNumberOfTuples()); + CPPUNIT_ASSERT_EQUAL(1,(int)b->getNumberOfComponents()); + CPPUNIT_ASSERT_EQUAL(3,(int)b->getNumberOfTuples()); const double expected1[3]={0.125,0.25,0.25}; for(int i=0;i<3;i++) CPPUNIT_ASSERT_DOUBLES_EQUAL(expected1[i],b->getIJ(0,i),1e-14); @@ -2291,10 +2281,10 @@ void MEDCouplingBasicsTest3::testUMeshBuildPartOrthogonalField1() { MEDCouplingUMesh *m1=build2DTargetMesh_1(); m1->changeSpaceDimension(3); - const int part[3]={1,0,4}; + const mcIdType part[3]={1,0,4}; MEDCouplingFieldDouble *b=m1->buildPartOrthogonalField(part,part+3); - CPPUNIT_ASSERT_EQUAL(3,b->getArray()->getNumberOfComponents()); - CPPUNIT_ASSERT_EQUAL(3,b->getArray()->getNumberOfTuples()); + CPPUNIT_ASSERT_EQUAL(3,(int)b->getArray()->getNumberOfComponents()); + CPPUNIT_ASSERT_EQUAL(3,(int)b->getArray()->getNumberOfTuples()); const double expected1[9]={0.,0.,-1.,0.,0.,-1.,0.,0.,-1.}; for(int i=0;i<9;i++) CPPUNIT_ASSERT_DOUBLES_EQUAL(expected1[i],b->getArray()->getIJ(0,i),1e-14); @@ -2305,16 +2295,16 @@ void MEDCouplingBasicsTest3::testUMeshBuildPartOrthogonalField1() void MEDCouplingBasicsTest3::testUMeshGetTypesOfPart1() { MEDCouplingUMesh *m1=build2DTargetMesh_1(); - const int part1[]={0,3,4}; + const mcIdType part1[]={0,3,4}; std::set s; s=m1->getTypesOfPart(part1,part1+3); CPPUNIT_ASSERT(s.size()==1); CPPUNIT_ASSERT(*s.begin()==INTERP_KERNEL::NORM_QUAD4); - const int part2[]={2,2,2,1}; + const mcIdType part2[]={2,2,2,1}; s=m1->getTypesOfPart(part2,part2+4); CPPUNIT_ASSERT(s.size()==1); CPPUNIT_ASSERT(*s.begin()==INTERP_KERNEL::NORM_TRI3); - const int part3[]={3,2,1}; + const mcIdType part3[]={3,2,1}; s=m1->getTypesOfPart(part3,part3+3); CPPUNIT_ASSERT(s.size()==2); CPPUNIT_ASSERT(*s.begin()==INTERP_KERNEL::NORM_TRI3); @@ -2325,26 +2315,26 @@ void MEDCouplingBasicsTest3::testUMeshGetTypesOfPart1() void MEDCouplingBasicsTest3::testUMeshKeepCellIdsByType1() { MEDCouplingUMesh *m1=build2DTargetMesh_1(); - const int part1[3]={0,3,4}; - DataArrayInt *a=m1->keepCellIdsByType(INTERP_KERNEL::NORM_TRI3,part1,part1+3); - CPPUNIT_ASSERT_EQUAL(1,a->getNumberOfComponents()); - CPPUNIT_ASSERT_EQUAL(0,a->getNumberOfTuples()); + const mcIdType part1[3]={0,3,4}; + DataArrayIdType *a=m1->keepCellIdsByType(INTERP_KERNEL::NORM_TRI3,part1,part1+3); + CPPUNIT_ASSERT_EQUAL(1,(int)a->getNumberOfComponents()); + CPPUNIT_ASSERT_EQUAL(0,(int)a->getNumberOfTuples()); a->decrRef(); // - const int part2[5]={3,2,0,2,4}; + const mcIdType part2[5]={3,2,0,2,4}; a=m1->keepCellIdsByType(INTERP_KERNEL::NORM_TRI3,part2,part2+5); - CPPUNIT_ASSERT_EQUAL(1,a->getNumberOfComponents()); - CPPUNIT_ASSERT_EQUAL(2,a->getNumberOfTuples()); - CPPUNIT_ASSERT_EQUAL(2,a->getIJ(0,0)); - CPPUNIT_ASSERT_EQUAL(2,a->getIJ(1,0)); + CPPUNIT_ASSERT_EQUAL(1,(int)a->getNumberOfComponents()); + CPPUNIT_ASSERT_EQUAL(2,(int)a->getNumberOfTuples()); + CPPUNIT_ASSERT_EQUAL(2,(int)a->getIJ(0,0)); + CPPUNIT_ASSERT_EQUAL(2,(int)a->getIJ(1,0)); a->decrRef(); // a=m1->keepCellIdsByType(INTERP_KERNEL::NORM_QUAD4,part2,part2+5); - CPPUNIT_ASSERT_EQUAL(1,a->getNumberOfComponents()); - CPPUNIT_ASSERT_EQUAL(3,a->getNumberOfTuples()); - CPPUNIT_ASSERT_EQUAL(3,a->getIJ(0,0)); - CPPUNIT_ASSERT_EQUAL(0,a->getIJ(1,0)); - CPPUNIT_ASSERT_EQUAL(4,a->getIJ(2,0)); + CPPUNIT_ASSERT_EQUAL(1,(int)a->getNumberOfComponents()); + CPPUNIT_ASSERT_EQUAL(3,(int)a->getNumberOfTuples()); + CPPUNIT_ASSERT_EQUAL(3,(int)a->getIJ(0,0)); + CPPUNIT_ASSERT_EQUAL(0,(int)a->getIJ(1,0)); + CPPUNIT_ASSERT_EQUAL(4,(int)a->getIJ(2,0)); // a->decrRef(); m1->decrRef(); @@ -2352,24 +2342,24 @@ void MEDCouplingBasicsTest3::testUMeshKeepCellIdsByType1() void MEDCouplingBasicsTest3::testDAIAggregateMulti1() { - DataArrayInt *a=DataArrayInt::New(); + DataArrayIdType *a=DataArrayIdType::New(); a->setName("aa"); a->alloc(4,1); a->iota(0); a->rearrange(2); - DataArrayInt *b=DataArrayInt::New(); + DataArrayIdType *b=DataArrayIdType::New(); b->setName("bb"); b->alloc(6,1); b->iota(0); b->rearrange(2); // - std::vector v(2); + std::vector v(2); v[0]=a; v[1]=b; - DataArrayInt *c=DataArrayInt::Aggregate(v); - CPPUNIT_ASSERT_EQUAL(5,c->getNumberOfTuples()); - CPPUNIT_ASSERT_EQUAL(2,c->getNumberOfComponents()); + DataArrayIdType *c=DataArrayIdType::Aggregate(v); + CPPUNIT_ASSERT_EQUAL(5,(int)c->getNumberOfTuples()); + CPPUNIT_ASSERT_EQUAL(2,(int)c->getNumberOfComponents()); CPPUNIT_ASSERT(c->getName()=="aa"); - const int expect1[10]={0,1,2,3,0,1,2,3,4,5}; + const mcIdType expect1[10]={0,1,2,3,0,1,2,3,4,5}; for(int i=0;i<10;i++) CPPUNIT_ASSERT_EQUAL(expect1[i],c->getIJ(0,i)); // @@ -2384,9 +2374,9 @@ void MEDCouplingBasicsTest3::testMergeUMeshes2() MEDCouplingUMesh *m2=build3DSurfTargetMesh_1(); MEDCouplingUMesh *m3=build3DSurfTargetMesh_1(); // - const int vec1[3]={0,2,3}; + const mcIdType vec1[3]={0,2,3}; MEDCouplingUMesh *m2_2=(MEDCouplingUMesh *)m2->buildPartOfMySelf(vec1,vec1+3,false); - const int vec2[2]={1,1}; + const mcIdType vec2[2]={1,1}; MEDCouplingUMesh *m3_2=(MEDCouplingUMesh *)m3->buildPartOfMySelf(vec2,vec2+2,false); // std::vector ms(3); @@ -2396,33 +2386,33 @@ void MEDCouplingBasicsTest3::testMergeUMeshes2() // MEDCouplingUMesh *m4=MEDCouplingUMesh::MergeUMeshes(ms); m4->checkConsistencyLight(); - CPPUNIT_ASSERT_EQUAL(10,m4->getNumberOfCells()); - CPPUNIT_ASSERT_EQUAL(20,m4->getNumberOfNodes()); - CPPUNIT_ASSERT_EQUAL(45,m4->getNodalConnectivityArrayLen()); + CPPUNIT_ASSERT_EQUAL(10,(int)m4->getNumberOfCells()); + CPPUNIT_ASSERT_EQUAL(20,(int)m4->getNumberOfNodes()); + CPPUNIT_ASSERT_EQUAL(45,(int)m4->getNodalConnectivityArrayLen()); // MEDCouplingMesh *m4bis=MEDCouplingMesh::MergeMeshes(ms2); CPPUNIT_ASSERT(m4->isEqual(m4bis,1e-12)); m4bis->decrRef(); // - const int vec3[5]={0,1,2,3,4}; + const mcIdType vec3[5]={0,1,2,3,4}; MEDCouplingUMesh *m4_1=(MEDCouplingUMesh *)m4->buildPartOfMySelf(vec3,vec3+5,false); m4_1->setName(m1->getName().c_str()); CPPUNIT_ASSERT(m4_1->isEqual(m1,1e-12)); m4_1->decrRef(); // - const int vec4[3]={5,6,7}; + const mcIdType vec4[3]={5,6,7}; MEDCouplingUMesh *m4_2=(MEDCouplingUMesh *)m4->buildPartOfMySelf(vec4,vec4+3,false); - DataArrayInt *cellCor=0; - DataArrayInt *nodeCor=0; + DataArrayIdType *cellCor=0; + DataArrayIdType *nodeCor=0; m4_2->checkGeoEquivalWith(m2_2,10,1e-12,cellCor,nodeCor); CPPUNIT_ASSERT(cellCor==0); CPPUNIT_ASSERT(nodeCor==0); m4_2->decrRef(); // - const int vec5[2]={8,9}; + const mcIdType vec5[2]={8,9}; MEDCouplingUMesh *m4_3=(MEDCouplingUMesh *)m4->buildPartOfMySelf(vec5,vec5+2,false); - CPPUNIT_ASSERT_EQUAL(2,m4_3->getNumberOfCells()); - CPPUNIT_ASSERT_EQUAL(3,m4_3->getNumberOfNodes()); + CPPUNIT_ASSERT_EQUAL(2,(int)m4_3->getNumberOfCells()); + CPPUNIT_ASSERT_EQUAL(3,(int)m4_3->getNumberOfNodes()); m3_2->zipCoords(); m4_3->setName(m3_2->getName().c_str()); CPPUNIT_ASSERT(m4_3->isEqual(m3_2,1e-12)); @@ -2445,8 +2435,8 @@ void MEDCouplingBasicsTest3::testBuild0DMeshFromCoords1() std::copy(sourceCoords,sourceCoords+12,coo->getPointer()); MEDCouplingUMesh *m=MEDCouplingUMesh::Build0DMeshFromCoords(coo); m->checkConsistencyLight(); - CPPUNIT_ASSERT_EQUAL(4,m->getNumberOfNodes()); - CPPUNIT_ASSERT_EQUAL(4,m->getNumberOfCells()); + CPPUNIT_ASSERT_EQUAL(4,(int)m->getNumberOfNodes()); + CPPUNIT_ASSERT_EQUAL(4,(int)m->getNumberOfCells()); CPPUNIT_ASSERT_EQUAL(3,m->getSpaceDimension()); CPPUNIT_ASSERT_EQUAL(0,m->getMeshDimension()); std::set types=m->getAllGeoTypes(); @@ -2454,10 +2444,10 @@ void MEDCouplingBasicsTest3::testBuild0DMeshFromCoords1() CPPUNIT_ASSERT_EQUAL(INTERP_KERNEL::NORM_POINT1,*types.begin()); for(int i=0;i<4;i++) { - std::vector conn; + std::vector conn; m->getNodeIdsOfCell(i,conn); CPPUNIT_ASSERT_EQUAL(1,(int)conn.size()); - CPPUNIT_ASSERT_EQUAL(i,conn[0]); + CPPUNIT_ASSERT_EQUAL(i,(int)conn[0]); CPPUNIT_ASSERT(INTERP_KERNEL::NORM_POINT1==m->getTypeOfCell(i)); } CPPUNIT_ASSERT(std::string(m->getName())=="My0D");