number of tuples and components are now std::size_t no more int.

[tools/medcoupling.git] / src / MEDCoupling / Test / MEDCouplingBasicsTest3.cxx

diff --git a/src/MEDCoupling/Test/MEDCouplingBasicsTest3.cxx b/src/MEDCoupling/Test/MEDCouplingBasicsTest3.cxx
index 230547686bb0e39cdb12e928ff563ad09aeb1cc8..a6e7075caeff5d0985ba041a72d774012b86fe0b 100644 (file)
--- a/src/MEDCoupling/Test/MEDCouplingBasicsTest3.cxx
+++ b/src/MEDCoupling/Test/MEDCouplingBasicsTest3.cxx
@@ -1,9 +1,9 @@
-// Copyright (C) 2007-2012  CEA/DEN, EDF R&D
+// Copyright (C) 2007-2016  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
 // License as published by the Free Software Foundation; either
-// version 2.1 of the License.
+// version 2.1 of the License, or (at your option) any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -21,7 +21,7 @@
 #include "MEDCouplingBasicsTest3.hxx"
 #include "MEDCouplingUMesh.hxx"
 #include "MEDCouplingCMesh.hxx"
-#include "MEDCouplingExtrudedMesh.hxx"
+#include "MEDCouplingMappedExtrudedMesh.hxx"
 #include "MEDCouplingFieldDouble.hxx"
 #include "MEDCouplingMemArray.hxx"
 #include "MEDCouplingGaussLocalization.hxx"
@@ -30,7 +30,7 @@
 #include <functional>
 #include <iterator>
 
-using namespace ParaMEDMEM;
+using namespace MEDCoupling;
 
 void MEDCouplingBasicsTest3::testGetMeasureFieldCMesh1()
 {
@@ -43,26 +43,26 @@ void MEDCouplingBasicsTest3::testGetMeasureFieldCMesh1()
   std::copy(discX,discX+4,da->getPointer());
   m->setCoordsAt(0,da);
   da->decrRef();
-  m->checkCoherency();
+  m->checkConsistencyLight();
   CPPUNIT_ASSERT_EQUAL(4,m->getNumberOfNodes());
   CPPUNIT_ASSERT_EQUAL(3,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->getBarycenterAndOwner();
-  CPPUNIT_ASSERT_EQUAL(3,coords->getNumberOfTuples());
-  CPPUNIT_ASSERT_EQUAL(1,coords->getNumberOfComponents());
+  coords=m->computeCellCenterOfMass();
+  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);
@@ -73,27 +73,27 @@ void MEDCouplingBasicsTest3::testGetMeasureFieldCMesh1()
   std::copy(discY,discY+3,da->getPointer());
   m->setCoordsAt(1,da);
   da->decrRef();
-  m->checkCoherency();
+  m->checkConsistencyLight();
   CPPUNIT_ASSERT_EQUAL(12,m->getNumberOfNodes());
   CPPUNIT_ASSERT_EQUAL(6,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->getBarycenterAndOwner();
-  CPPUNIT_ASSERT_EQUAL(6,coords->getNumberOfTuples());
-  CPPUNIT_ASSERT_EQUAL(2,coords->getNumberOfComponents());
+  coords=m->computeCellCenterOfMass();
+  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);
@@ -104,20 +104,20 @@ void MEDCouplingBasicsTest3::testGetMeasureFieldCMesh1()
   std::copy(discZ,discZ+5,da->getPointer());
   m->setCoordsAt(2,da);
   da->decrRef();
-  m->checkCoherency();
+  m->checkConsistencyLight();
   CPPUNIT_ASSERT_EQUAL(60,m->getNumberOfNodes());
   CPPUNIT_ASSERT_EQUAL(24,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,
@@ -128,9 +128,9 @@ void MEDCouplingBasicsTest3::testGetMeasureFieldCMesh1()
   for(int i=0;i<180;i++)
     CPPUNIT_ASSERT_DOUBLES_EQUAL(expected3_2[i],coords->getIJ(0,i),1e-12);
   coords->decrRef();
-  coords=m->getBarycenterAndOwner();
-  CPPUNIT_ASSERT_EQUAL(24,coords->getNumberOfTuples());
-  CPPUNIT_ASSERT_EQUAL(3,coords->getNumberOfComponents());
+  coords=m->computeCellCenterOfMass();
+  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,
@@ -150,19 +150,19 @@ void MEDCouplingBasicsTest3::testFieldDoubleZipCoords1()
   MEDCouplingFieldDouble *f=m->fillFromAnalytic(ON_NODES,2,"x*2.");
   f->getArray()->setInfoOnComponent(0,"titi");
   f->getArray()->setInfoOnComponent(1,"tutu");
-  f->checkCoherency();
-  CPPUNIT_ASSERT_EQUAL(18,f->getNumberOfTuples());
-  CPPUNIT_ASSERT_EQUAL(2,f->getNumberOfComponents());
+  f->checkConsistencyLight();
+  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);
   CPPUNIT_ASSERT(f->zipCoords());
-  f->checkCoherency();
+  f->checkConsistencyLight();
   const double expected2[30]={-0.6, -0.6, 1.4, 1.4, 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, 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<30;i++)
     CPPUNIT_ASSERT_DOUBLES_EQUAL(expected2[i],f->getIJ(0,i),1e-12);
   CPPUNIT_ASSERT(!f->zipCoords());
-  f->checkCoherency();
+  f->checkConsistencyLight();
   for(int i=0;i<30;i++)
     CPPUNIT_ASSERT_DOUBLES_EQUAL(expected2[i],f->getIJ(0,i),1e-12);
   CPPUNIT_ASSERT(std::string(f->getArray()->getInfoOnComponent(0))=="titi");
@@ -197,8 +197,8 @@ void MEDCouplingBasicsTest3::testFieldDoubleZipConnectivity1()
   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};
@@ -206,12 +206,12 @@ void MEDCouplingBasicsTest3::testFieldDoubleZipConnectivity1()
     CPPUNIT_ASSERT_DOUBLES_EQUAL(expected1[i],f->getIJ(0,i),1e-12);
   f->getArray()->setInfoOnComponent(0,"titi");
   f->getArray()->setInfoOnComponent(1,"tutu");
-  f->checkCoherency();
+  f->checkConsistencyLight();
   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 +221,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();
@@ -246,8 +246,8 @@ void MEDCouplingBasicsTest3::testDaDoubleRenumber1()
   //
   const int 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};
@@ -263,8 +263,8 @@ void MEDCouplingBasicsTest3::testDaDoubleRenumber1()
   const int 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());
+  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};
@@ -285,8 +285,8 @@ void MEDCouplingBasicsTest3::testDaDoubleRenumberAndReduce1()
   //
   const int 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};
@@ -302,8 +302,8 @@ void MEDCouplingBasicsTest3::testDaDoubleRenumberAndReduce1()
   const int 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());
+  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};
@@ -322,8 +322,8 @@ void MEDCouplingBasicsTest3::testDaDoubleRenumberInPlace1()
   //
   const int 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);
@@ -334,8 +334,8 @@ void MEDCouplingBasicsTest3::testDaDoubleRenumberInPlace1()
   const int 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());
+  CPPUNIT_ASSERT_EQUAL(7,(int)c->getNumberOfTuples());
+  CPPUNIT_ASSERT_EQUAL(2,(int)c->getNumberOfComponents());
   const int 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));
@@ -353,8 +353,8 @@ void MEDCouplingBasicsTest3::testDaDoubleRenumberR1()
   //
   const int 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};
@@ -370,8 +370,8 @@ void MEDCouplingBasicsTest3::testDaDoubleRenumberR1()
   const int 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());
+  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};
@@ -390,8 +390,8 @@ void MEDCouplingBasicsTest3::testDaDoubleRenumberInPlaceR1()
   //
   const int 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);
@@ -402,8 +402,8 @@ void MEDCouplingBasicsTest3::testDaDoubleRenumberInPlaceR1()
   const int 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());
+  CPPUNIT_ASSERT_EQUAL(7,(int)c->getNumberOfTuples());
+  CPPUNIT_ASSERT_EQUAL(2,(int)c->getNumberOfComponents());
   const int 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));
@@ -421,8 +421,8 @@ void MEDCouplingBasicsTest3::testDaDoubleSelectByTupleId1()
   //
   const int 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};
@@ -438,8 +438,8 @@ void MEDCouplingBasicsTest3::testDaDoubleSelectByTupleId1()
   const int 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());
+  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};
@@ -462,8 +462,8 @@ void MEDCouplingBasicsTest3::testDaDoubleGetMinMaxValues1()
   DataArrayInt *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());
+  CPPUNIT_ASSERT_EQUAL(3,(int)ws->getNumberOfTuples());
+  CPPUNIT_ASSERT_EQUAL(1,(int)ws->getNumberOfComponents());
   const int expected1[3]={1,4,8};
   for(int i=0;i<3;i++)
     CPPUNIT_ASSERT_EQUAL(expected1[i],ws->getIJ(i,0));
@@ -479,8 +479,8 @@ void MEDCouplingBasicsTest3::testDaDoubleGetMinMaxValues1()
   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();
@@ -502,14 +502,14 @@ void MEDCouplingBasicsTest3::testFieldDoubleGetMinMaxValues2()
   a->decrRef();
   f->setMesh(m2);
   //
-  f->checkCoherency();
+  f->checkConsistencyLight();
   double m=f->getMaxValue();
   CPPUNIT_ASSERT_DOUBLES_EQUAL(8.71,m,1e-12);
   DataArrayInt *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());
+  CPPUNIT_ASSERT_EQUAL(4,(int)ws->getNumberOfTuples());
+  CPPUNIT_ASSERT_EQUAL(1,(int)ws->getNumberOfComponents());
   const int expected1[4]={0,3,7,17};
   for(int i=0;i<4;i++)
     CPPUNIT_ASSERT_EQUAL(expected1[i],ws->getIJ(i,0));
@@ -517,13 +517,13 @@ void MEDCouplingBasicsTest3::testFieldDoubleGetMinMaxValues2()
   //
   const double arr2[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};
   std::copy(arr2,arr2+18,a->getPointer());
-  f->checkCoherency();
+  f->checkConsistencyLight();
   m=f->getMinValue();
   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();
@@ -543,7 +543,7 @@ void MEDCouplingBasicsTest3::testBuildUnstructuredCMesh1()
   std::copy(discX,discX+4,da->getPointer());
   m->setCoordsAt(0,da);
   da->decrRef();
-  m->checkCoherency();
+  m->checkConsistencyLight();
   double pos=2.4;
   CPPUNIT_ASSERT_EQUAL(0,m->getCellContainingPoint(&pos,1e-12));
   pos=3.7;
@@ -556,11 +556,11 @@ void MEDCouplingBasicsTest3::testBuildUnstructuredCMesh1()
   CPPUNIT_ASSERT_EQUAL(-1,m->getCellContainingPoint(&pos,1e-12));
   //
   MEDCouplingUMesh *m2=m->buildUnstructured();
-  m2->checkCoherency();
+  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++)
@@ -575,11 +575,11 @@ void MEDCouplingBasicsTest3::testBuildUnstructuredCMesh1()
   f2->decrRef();
   //
   m2=m->buildUnstructured();
-  m2->checkCoherency();
+  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++)
@@ -594,11 +594,11 @@ void MEDCouplingBasicsTest3::testBuildUnstructuredCMesh1()
   m->setCoordsAt(2,da);
   da->decrRef();
   m2=m->buildUnstructured();
-  m2->checkCoherency();
+  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++)
@@ -627,8 +627,8 @@ void MEDCouplingBasicsTest3::testDataArrayIntInvertO2NNO21()
   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());
+  CPPUNIT_ASSERT_EQUAL(6,(int)da2->getNumberOfTuples());
+  CPPUNIT_ASSERT_EQUAL(1,(int)da2->getNumberOfComponents());
   const int expected1[6]={1,3,0,5,2,4};
   for(int i=0;i<6;i++)
     CPPUNIT_ASSERT_EQUAL(expected1[i],da2->getIJ(i,0));
@@ -644,8 +644,8 @@ void MEDCouplingBasicsTest3::testDataArrayIntInvertO2NNO21()
   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());
+  CPPUNIT_ASSERT_EQUAL(6,(int)da2->getNumberOfTuples());
+  CPPUNIT_ASSERT_EQUAL(1,(int)da2->getNumberOfComponents());
   const int expected2[10]={5,7,8,0,3,2};
   for(int i=0;i<6;i++)
     CPPUNIT_ASSERT_EQUAL(expected2[i],da2->getIJ(i,0));
@@ -669,9 +669,9 @@ void MEDCouplingBasicsTest3::testKeepSetSelectedComponent1()
   a1->setInfoOnComponent(3,"dddd");
   const int arr2[6]={1,2,1,2,0,0};
   std::vector<int> arr2V(arr2,arr2+6);
-  DataArrayDouble *a2=a1->keepSelectedComponents(arr2V);
-  CPPUNIT_ASSERT_EQUAL(6,a2->getNumberOfComponents());
-  CPPUNIT_ASSERT_EQUAL(5,a2->getNumberOfTuples());
+  DataArrayDouble *a2=static_cast<DataArrayDouble *>(a1->keepSelectedComponents(arr2V));
+  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");
@@ -682,9 +682,9 @@ void MEDCouplingBasicsTest3::testKeepSetSelectedComponent1()
   for(int i=0;i<30;i++)
     CPPUNIT_ASSERT_DOUBLES_EQUAL(expected1[i],a2->getIJ(0,i),1e-14);
   DataArrayInt *a3=a1->convertToIntArr();
-  DataArrayInt *a4=a3->keepSelectedComponents(arr2V);
-  CPPUNIT_ASSERT_EQUAL(6,a4->getNumberOfComponents());
-  CPPUNIT_ASSERT_EQUAL(5,a4->getNumberOfTuples());
+  DataArrayInt *a4=static_cast<DataArrayInt *>(a3->keepSelectedComponents(arr2V));
+  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");
@@ -696,14 +696,14 @@ void MEDCouplingBasicsTest3::testKeepSetSelectedComponent1()
   // setSelectedComponents
   const int arr3[2]={3,2};
   std::vector<int> arr3V(arr3,arr3+2);
-  DataArrayDouble *a5=a1->keepSelectedComponents(arr3V);
+  DataArrayDouble *a5=static_cast<DataArrayDouble *>(a1->keepSelectedComponents(arr3V));
   a5->setInfoOnComponent(0,"eeee");
   a5->setInfoOnComponent(1,"ffff");
   const int arr4[2]={1,2};
   std::vector<int> 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");
@@ -717,8 +717,8 @@ void MEDCouplingBasicsTest3::testKeepSetSelectedComponent1()
   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");
@@ -764,7 +764,7 @@ void MEDCouplingBasicsTest3::testKeepSetSelectedComponent2()
   f1->setMesh(m1);
   f1->setName("f1");
   f1->setArray(a1);
-  f1->checkCoherency();
+  f1->checkConsistencyLight();
   //
   const int arr2[6]={1,2,1,2,0,0};
   std::vector<int> arr2V(arr2,arr2+6);
@@ -775,9 +775,9 @@ void MEDCouplingBasicsTest3::testKeepSetSelectedComponent2()
   CPPUNIT_ASSERT_DOUBLES_EQUAL(2.3,f2->getTime(dt,it),1e-13);
   CPPUNIT_ASSERT_EQUAL(4,dt);
   CPPUNIT_ASSERT_EQUAL(5,it);
-  f2->checkCoherency();
-  CPPUNIT_ASSERT_EQUAL(6,f2->getNumberOfComponents());
-  CPPUNIT_ASSERT_EQUAL(5,f2->getNumberOfTuples());
+  f2->checkConsistencyLight();
+  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");
@@ -794,13 +794,13 @@ void MEDCouplingBasicsTest3::testKeepSetSelectedComponent2()
   f5->setTime(6.7,8,9);
   f5->getArray()->setInfoOnComponent(0,"eeee");
   f5->getArray()->setInfoOnComponent(1,"ffff");
-  f5->checkCoherency();
+  f5->checkConsistencyLight();
   const int arr4[2]={1,2};
   std::vector<int> arr4V(arr4,arr4+2);
   f2->setSelectedComponents(f5,arr4V);
-  CPPUNIT_ASSERT_EQUAL(6,f2->getNumberOfComponents());
-  CPPUNIT_ASSERT_EQUAL(5,f2->getNumberOfTuples());
-  f2->checkCoherency();
+  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);
   CPPUNIT_ASSERT_EQUAL(5,it);
@@ -837,7 +837,6 @@ void MEDCouplingBasicsTest3::testElementaryDAThrowAndSpecialCases()
   dbl2->alloc(7,2);
   CPPUNIT_ASSERT_THROW(dbl2->isUniform(10.,1e-15),INTERP_KERNEL::Exception);
   CPPUNIT_ASSERT_THROW(dbl2->sort(),INTERP_KERNEL::Exception);
-  CPPUNIT_ASSERT_THROW(dbl2->reverse(),INTERP_KERNEL::Exception);
   CPPUNIT_ASSERT_THROW(dbl2->iota(10.),INTERP_KERNEL::Exception);
   
   DataArrayDouble *dbl=DataArrayDouble::New();
@@ -936,15 +935,15 @@ void MEDCouplingBasicsTest3::testElementaryDAThrowAndSpecialCases()
   CPPUNIT_ASSERT(!((dbl->reprZip().find("Number of components : 1"))==std::string::npos));
   
   std::ostringstream ret;
-  dbl->writeVTK(ret,2,"file.tmp");
+  dbl->writeVTK(ret,2,"file.tmp",0);
   CPPUNIT_ASSERT(!((ret.str().find("<DataArray"))==std::string::npos));
   CPPUNIT_ASSERT(!((ret.str().find("Float32"))==std::string::npos));
   CPPUNIT_ASSERT(!((ret.str().find("16 15 14 13 12 11 10"))==std::string::npos));
   
-  CPPUNIT_ASSERT_THROW(dbl->selectByTupleId2(0,1,-1),INTERP_KERNEL::Exception);
-  CPPUNIT_ASSERT_THROW(dbl->substr(-1,1),INTERP_KERNEL::Exception);
-  CPPUNIT_ASSERT_THROW(dbl->substr(8,1),INTERP_KERNEL::Exception);
-  CPPUNIT_ASSERT_THROW(dbl->substr(0,8),INTERP_KERNEL::Exception);
+  CPPUNIT_ASSERT_THROW(dbl->selectByTupleIdSafeSlice(0,1,-1),INTERP_KERNEL::Exception);
+  CPPUNIT_ASSERT_THROW(dbl->subArray(-1,1),INTERP_KERNEL::Exception);
+  CPPUNIT_ASSERT_THROW(dbl->subArray(8,1),INTERP_KERNEL::Exception);
+  CPPUNIT_ASSERT_THROW(dbl->subArray(0,8),INTERP_KERNEL::Exception);
   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
@@ -989,7 +988,7 @@ void MEDCouplingBasicsTest3::testElementaryDAThrowAndSpecialCases()
   dbl3->setIJ(6,0,0.);
   CPPUNIT_ASSERT_THROW(dbl3->checkNoNullValues(),INTERP_KERNEL::Exception);
   CPPUNIT_ASSERT_THROW(dbl3->applyInv(1.),INTERP_KERNEL::Exception);  //div by zero
-  CPPUNIT_ASSERT_THROW(dbl2->getIdsInRange(1.,2.),INTERP_KERNEL::Exception);
+  CPPUNIT_ASSERT_THROW(dbl2->findIdsInRange(1.,2.),INTERP_KERNEL::Exception);
   std::vector<const DataArrayDouble *> a(0); //input list must be NON EMPTY
   CPPUNIT_ASSERT_THROW(DataArrayDouble::Aggregate(a),INTERP_KERNEL::Exception);
   CPPUNIT_ASSERT_THROW(DataArrayDouble::Meld(a),INTERP_KERNEL::Exception);
@@ -1030,9 +1029,9 @@ void MEDCouplingBasicsTest3::testDAIGetIdsEqual1()
   DataArrayInt *da=DataArrayInt::New();
   da->alloc(7,1);
   std::copy(tab1,tab1+7,da->getPointer());
-  DataArrayInt *da2=da->getIdsEqual(-2);
-  CPPUNIT_ASSERT_EQUAL(3,da2->getNumberOfTuples());
-  CPPUNIT_ASSERT_EQUAL(1,da2->getNumberOfComponents());
+  DataArrayInt *da2=da->findIdsEqual(-2);
+  CPPUNIT_ASSERT_EQUAL(3,(int)da2->getNumberOfTuples());
+  CPPUNIT_ASSERT_EQUAL(1,(int)da2->getNumberOfComponents());
   const int expected1[3]={1,3,6};
   CPPUNIT_ASSERT(std::equal(expected1,expected1+3,da2->getConstPointer()));
   da2->decrRef();
@@ -1047,9 +1046,9 @@ void MEDCouplingBasicsTest3::testDAIGetIdsEqualList1()
   std::copy(tab1,tab1+7,da->getPointer());
   const int tab2[3]={3,-2,0};
   std::vector<int> tab2V(tab2,tab2+3);
-  DataArrayInt *da2=da->getIdsEqualList(&tab2V[0],&tab2V[0]+tab2V.size());
-  CPPUNIT_ASSERT_EQUAL(4,da2->getNumberOfTuples());
-  CPPUNIT_ASSERT_EQUAL(1,da2->getNumberOfComponents());
+  DataArrayInt *da2=da->findIdsEqualList(&tab2V[0],&tab2V[0]+tab2V.size());
+  CPPUNIT_ASSERT_EQUAL(4,(int)da2->getNumberOfTuples());
+  CPPUNIT_ASSERT_EQUAL(1,(int)da2->getNumberOfComponents());
   const int expected1[4]={1,3,4,6};
   CPPUNIT_ASSERT(std::equal(expected1,expected1+4,da2->getConstPointer()));
   da2->decrRef();
@@ -1064,13 +1063,13 @@ void MEDCouplingBasicsTest3::testDAFromNoInterlace1()
   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 !
+  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();
   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();
@@ -1087,13 +1086,13 @@ void MEDCouplingBasicsTest3::testDAToNoInterlace1()
   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 !
+  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();
   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();
@@ -1173,7 +1172,7 @@ void MEDCouplingBasicsTest3::testUnPolyze1()
   mesh->convertToPolyTypes(&eltsV[0],&eltsV[0]+eltsV.size());
   mesh->unPolyze();
   MEDCouplingUMesh *mesh2=build3DTargetMesh_1();
-  mesh->checkCoherency();
+  mesh->checkConsistencyLight();
   CPPUNIT_ASSERT(mesh->isEqual(mesh2,1e-12));
   mesh->convertToPolyTypes(&eltsV[0],&eltsV[0]+eltsV.size());
   CPPUNIT_ASSERT(!mesh->isEqual(mesh2,1e-12));
@@ -1221,7 +1220,7 @@ void MEDCouplingBasicsTest3::testConvertDegeneratedCells1()
   mesh->insertNextCell(INTERP_KERNEL::NORM_HEXA8,8,conn+16);
   mesh->insertNextCell(INTERP_KERNEL::NORM_HEXA8,8,conn+24);
   mesh->finishInsertingCells();
-  mesh->checkCoherency();
+  mesh->checkConsistencyLight();
   CPPUNIT_ASSERT_EQUAL(4,mesh->getNumberOfCells());
   CPPUNIT_ASSERT_EQUAL(INTERP_KERNEL::NORM_HEXA8,mesh->getTypeOfCell(0));
   CPPUNIT_ASSERT_EQUAL(INTERP_KERNEL::NORM_HEXA8,mesh->getTypeOfCell(1));
@@ -1229,7 +1228,7 @@ void MEDCouplingBasicsTest3::testConvertDegeneratedCells1()
   CPPUNIT_ASSERT_EQUAL(INTERP_KERNEL::NORM_HEXA8,mesh->getTypeOfCell(3));
   MEDCouplingFieldDouble *f1=mesh->getMeasureField(true);
   mesh->convertDegeneratedCells();
-  mesh->checkCoherency();
+  mesh->checkConsistencyLight();
   MEDCouplingFieldDouble *f2=mesh->getMeasureField(true);
   CPPUNIT_ASSERT_EQUAL(4,mesh->getNumberOfCells());
   CPPUNIT_ASSERT_EQUAL(INTERP_KERNEL::NORM_PENTA6,mesh->getTypeOfCell(0));
@@ -1257,15 +1256,15 @@ void MEDCouplingBasicsTest3::testGetNodeIdsNearPoints1()
   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(3,(int)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));
   c->decrRef();
   DataArrayInt *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,(int)cI->getNumberOfTuples());
+  CPPUNIT_ASSERT_EQUAL(4,(int)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));
@@ -1406,7 +1405,7 @@ void MEDCouplingBasicsTest3::testExtrudedMesh5()
   CPPUNIT_ASSERT_EQUAL(37,tmp3);
   tmp->decrRef();
   i->convertDegeneratedCells();
-  i->checkCoherency();
+  i->checkConsistencyLight();
   CPPUNIT_ASSERT_EQUAL(36,i->getNumberOfCells());
   CPPUNIT_ASSERT_EQUAL(37,i->getNumberOfNodes());
   CPPUNIT_ASSERT_EQUAL(12,i->getNumberOfCellsWithType(INTERP_KERNEL::NORM_TRI3));
@@ -1417,7 +1416,7 @@ void MEDCouplingBasicsTest3::testExtrudedMesh5()
     for(int k=0;k<3;k++)
       CPPUNIT_ASSERT_DOUBLES_EQUAL(expected1[k],j->getIJ(0,ii*3+k),1e-10);
   const double expected2[72]={0.62200846792814113, 0.16666666666681595, 1.4513530918323276, 0.38888888888923495, 2.6293994326053212, 0.7045454545460802, 0.45534180126145435, 0.45534180126150181, 1.0624642029433926, 1.0624642029435025, 1.9248539780597826, 1.9248539780599816, 0.16666666666661334, 0.62200846792815856, 0.38888888888876294, 1.4513530918323678, 0.70454545454522521, 2.629399432605394, -0.16666666666674007, 0.62200846792812436, -0.38888888888906142, 1.4513530918322881, -0.70454545454576778, 2.6293994326052488, -0.45534180126154766, 0.45534180126140844, -1.0624642029436118, 1.0624642029432834, -1.9248539780601803, 1.9248539780595841, -0.62200846792817499, 0.1666666666665495, -1.451353091832408, 0.388888888888613, -2.6293994326054668, 0.70454545454495332, -0.62200846792810593, -0.16666666666680507, -1.451353091832247, -0.38888888888921297, -2.6293994326051746, -0.70454545454604123, -0.45534180126135926, -0.45534180126159562, -1.0624642029431723, -1.0624642029437235, -1.9248539780593836, -1.9248539780603811, -0.1666666666664828, -0.62200846792819242, -0.38888888888846079, -1.4513530918324489, -0.70454545454467987, -2.6293994326055397, 0.16666666666687083, -0.62200846792808862, 0.38888888888936374, -1.4513530918322073, 0.70454545454631357, -2.6293994326051022, 0.45534180126164348, -0.45534180126131207, 1.0624642029438327, -1.0624642029430627, 1.9248539780605791, -1.9248539780591853, 0.62200846792821063, -0.16666666666641802, 1.4513530918324888, -0.38888888888831086, 2.6293994326056125, -0.70454545454440853};
-  DataArrayDouble *m=i->getBarycenterAndOwner();
+  DataArrayDouble *m=i->computeCellCenterOfMass();
   for(int ii=0;ii<72;ii++)
     CPPUNIT_ASSERT_DOUBLES_EQUAL(expected2[ii],m->getIJ(0,ii),1e-10);
   //
@@ -1462,14 +1461,14 @@ void MEDCouplingBasicsTest3::testExtrudedMesh6()
   const double center[2]={0.,0.};
   f->rotate(center,0,M_PI/3);
   MEDCouplingUMesh *g=c->buildExtrudedMesh(f,0);
-  g->checkCoherency();
+  g->checkConsistencyLight();
   const double expected1[]={ 0.4330127018922193, 0.4330127018922193, 0.649519052838329, 1.2990381056766578, 1.299038105676658, 1.948557158514987, 2.1650635094610955, 2.1650635094610964, 3.2475952641916446, 3.031088913245533, 3.0310889132455352, 4.546633369868303 };
   MEDCouplingFieldDouble *f1=g->getMeasureField(true);
   for(int i=0;i<12;i++)
     CPPUNIT_ASSERT_DOUBLES_EQUAL(expected1[i],f1->getIJ(0,i),1e-12);
   
   const double expected2[]={0.625, 0.21650635094610962, 1.625, 0.21650635094610959, 2.8750000000000004, 0.21650635094610965, 1.1250000000000002, 1.0825317547305482, 2.125, 1.0825317547305482, 3.3750000000000004, 1.0825317547305484, 2.125, 2.8145825622994254, 3.125, 2.8145825622994254, 4.375, 2.8145825622994254, 3.6250000000000009, 5.4126587736527414, 4.625, 5.4126587736527414, 5.875, 5.4126587736527414};
-  DataArrayDouble *f2=g->getBarycenterAndOwner();
+  DataArrayDouble *f2=g->computeCellCenterOfMass();
   for(int i=0;i<24;i++)
     CPPUNIT_ASSERT_DOUBLES_EQUAL(expected2[i],f2->getIJ(0,i),1e-12);
   //
@@ -1556,12 +1555,12 @@ void MEDCouplingBasicsTest3::testSimplexize1()
   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());
+  CPPUNIT_ASSERT_EQUAL(7,(int)da->getNumberOfTuples());
+  CPPUNIT_ASSERT_EQUAL(1,(int)da->getNumberOfComponents());
   const int 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->checkCoherency();
+  m->checkConsistencyLight();
   CPPUNIT_ASSERT_EQUAL(7,m->getNumberOfCells());
   CPPUNIT_ASSERT_EQUAL(INTERP_KERNEL::NORM_TRI3,m->getTypeOfCell(0));
   CPPUNIT_ASSERT_EQUAL(INTERP_KERNEL::NORM_TRI3,m->getTypeOfCell(1));
@@ -1574,7 +1573,7 @@ void MEDCouplingBasicsTest3::testSimplexize1()
   MEDCouplingFieldDouble *f=m->getMeasureField(false);
   for(int i=0;i<7;i++)
     CPPUNIT_ASSERT_DOUBLES_EQUAL(expected1[i]*sqrt(2.),f->getIJ(i,0),1e-10);
-  std::set<INTERP_KERNEL::NormalizedCellType> types=m->getAllTypes();
+  std::set<INTERP_KERNEL::NormalizedCellType> types=m->getAllGeoTypes();
   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())));
@@ -1586,12 +1585,12 @@ 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->checkCoherency();
-  types=m->getAllTypes();
+  m->checkConsistencyLight();
+  types=m->getAllGeoTypes();
   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())));
@@ -1626,9 +1625,9 @@ void MEDCouplingBasicsTest3::testSimplexize2()
   f1->setArray(arr);
   arr->decrRef();
   //
-  f1->checkCoherency();
+  f1->checkConsistencyLight();
   CPPUNIT_ASSERT(f1->simplexize(0));
-  f1->checkCoherency();
+  f1->checkConsistencyLight();
   const double expected1[14]={10.,110.,10.,110.,20.,120.,30.,130.,40.,140.,50.,150.,50.,150.};
   for(int i=0;i<14;i++)
     CPPUNIT_ASSERT_DOUBLES_EQUAL(expected1[i],f1->getIJ(0,i),1e-10);
@@ -1657,10 +1656,10 @@ void MEDCouplingBasicsTest3::testDAMeld1()
   da3->setInfoOnComponent(1,"c1da3");
   da3->setInfoOnComponent(2,"c2da3");
   //
-  DataArrayDouble *da1C=da1->deepCpy();
+  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");
@@ -1674,8 +1673,8 @@ void MEDCouplingBasicsTest3::testDAMeld1()
   DataArrayInt *dai1=da1C->convertToIntArr();
   DataArrayInt *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");
@@ -1685,8 +1684,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");
@@ -1698,8 +1697,8 @@ void MEDCouplingBasicsTest3::testDAMeld1()
   dai1->decrRef();
   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");
@@ -1730,21 +1729,21 @@ void MEDCouplingBasicsTest3::testFieldMeld1()
   da1->setInfoOnComponent(0,"aaa");
   f1->setArray(da1);
   f1->setTime(3.4,2,1);
-  f1->checkCoherency();
+  f1->checkConsistencyLight();
   //
-  MEDCouplingFieldDouble *f2=f1->deepCpy();
+  MEDCouplingFieldDouble *f2=f1->deepCopy();
   f2->setMesh(f1->getMesh());
-  f2->checkCoherency();
+  f2->checkConsistencyLight();
   f2->changeNbOfComponents(2,5.);
   (*f2)=5.;
   f2->getArray()->setInfoOnComponent(0,"bbb");
   f2->getArray()->setInfoOnComponent(1,"ccc");
-  f2->checkCoherency();
+  f2->checkConsistencyLight();
   //
   MEDCouplingFieldDouble *f3=MEDCouplingFieldDouble::MeldFields(f2,f1);
-  f3->checkCoherency();
-  CPPUNIT_ASSERT_EQUAL(5,f3->getNumberOfTuples());
-  CPPUNIT_ASSERT_EQUAL(3,f3->getNumberOfComponents());
+  f3->checkConsistencyLight();
+  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,9 +1759,9 @@ void MEDCouplingBasicsTest3::testFieldMeld1()
   MEDCouplingFieldDouble *f4=f2->buildNewTimeReprFromThis(NO_TIME,false);
   MEDCouplingFieldDouble *f5=f1->buildNewTimeReprFromThis(NO_TIME,false);
   MEDCouplingFieldDouble *f6=MEDCouplingFieldDouble::MeldFields(f4,f5);
-  f6->checkCoherency();
-  CPPUNIT_ASSERT_EQUAL(5,f6->getNumberOfTuples());
-  CPPUNIT_ASSERT_EQUAL(3,f6->getNumberOfComponents());
+  f6->checkConsistencyLight();
+  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");
@@ -1792,7 +1791,7 @@ void MEDCouplingBasicsTest3::testMergeNodes2()
   MEDCouplingUMesh *m3=MEDCouplingUMesh::MergeUMeshes(tmp);
   bool b;
   int newNbOfNodes;
-  DataArrayInt *da=m3->mergeNodes2(0.01,b,newNbOfNodes);
+  DataArrayInt *da=m3->mergeNodesCenter(0.01,b,newNbOfNodes);
   CPPUNIT_ASSERT_EQUAL(9,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++)
@@ -1851,8 +1850,8 @@ void MEDCouplingBasicsTest3::testDAIBuildComplement1()
   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());
+  CPPUNIT_ASSERT_EQUAL(8,(int)b->getNumberOfTuples());
+  CPPUNIT_ASSERT_EQUAL(1,(int)b->getNumberOfComponents());
   const int 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));
@@ -1871,8 +1870,8 @@ void MEDCouplingBasicsTest3::testDAIBuildUnion1()
   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());
+  CPPUNIT_ASSERT_EQUAL(7,(int)b->getNumberOfTuples());
+  CPPUNIT_ASSERT_EQUAL(1,(int)b->getNumberOfComponents());
   const int 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));
@@ -1892,8 +1891,8 @@ void MEDCouplingBasicsTest3::testDAIBuildIntersection1()
   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());
+  CPPUNIT_ASSERT_EQUAL(2,(int)b->getNumberOfTuples());
+  CPPUNIT_ASSERT_EQUAL(1,(int)b->getNumberOfComponents());
   const int expected1[2]={3,8};
   for(int i=0;i<2;i++)
     CPPUNIT_ASSERT_EQUAL(expected1[i],b->getIJ(0,i));
@@ -1909,8 +1908,8 @@ void MEDCouplingBasicsTest3::testDAIDeltaShiftIndex1()
   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());
+  CPPUNIT_ASSERT_EQUAL(6,(int)b->getNumberOfTuples());
+  CPPUNIT_ASSERT_EQUAL(1,(int)b->getNumberOfComponents());
   const int expected1[6]={2,3,1,0,2,6};
   for(int i=0;i<6;i++)
     CPPUNIT_ASSERT_EQUAL(expected1[i],b->getIJ(0,i));
@@ -1929,8 +1928,8 @@ void MEDCouplingBasicsTest3::testDaDoubleSelectByTupleIdSafe1()
   //
   const int 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};
@@ -1950,8 +1949,8 @@ void MEDCouplingBasicsTest3::testDaDoubleSelectByTupleIdSafe1()
   const int 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());
+  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};
@@ -1970,8 +1969,8 @@ void MEDCouplingBasicsTest3::testAreCellsIncludedIn1()
   MEDCouplingUMesh *m2=(MEDCouplingUMesh *)m->buildPartOfMySelf(pt,pt+2,true);
   DataArrayInt *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();
@@ -1993,8 +1992,8 @@ void MEDCouplingBasicsTest3::testDAIBuildSubstraction1()
   std::copy(bb,bb+5,b->getPointer());
   //
   DataArrayInt *c=a->buildSubstraction(b);
-  CPPUNIT_ASSERT_EQUAL(3,c->getNumberOfTuples());
-  CPPUNIT_ASSERT_EQUAL(1,c->getNumberOfComponents());
+  CPPUNIT_ASSERT_EQUAL(3,(int)c->getNumberOfTuples());
+  CPPUNIT_ASSERT_EQUAL(1,(int)c->getNumberOfComponents());
   const int expected1[3]={2,6,8};
   CPPUNIT_ASSERT(std::equal(expected1,expected1+3,c->getConstPointer()));
   //
@@ -2014,8 +2013,8 @@ void MEDCouplingBasicsTest3::testBuildOrthogonalField2()
   //
   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++)
@@ -2052,7 +2051,7 @@ void MEDCouplingBasicsTest3::testUMInsertNextCell1()
   std::copy(targetCoords,targetCoords+18,myCoords->getPointer());
   targetMesh->setCoords(myCoords);
   myCoords->decrRef();
-  targetMesh->checkCoherency();
+  targetMesh->checkConsistencyLight();
   targetMesh->decrRef();
 }
 
@@ -2073,11 +2072,11 @@ void MEDCouplingBasicsTest3::testFieldOperatorDivDiffComp1()
   MEDCouplingFieldDouble *f2=MEDCouplingFieldDouble::New(ON_CELLS);
   f2->setArray(arr);
   f2->setMesh(m1);
-  f2->checkCoherency();
+  f2->checkConsistencyLight();
   //
   MEDCouplingFieldDouble *f3=(*f1)/(*f2);
   CPPUNIT_ASSERT_THROW((*f2)/(*f1),INTERP_KERNEL::Exception);
-  f3->checkCoherency();
+  f3->checkConsistencyLight();
   (*f1)/=(*f2);
   CPPUNIT_ASSERT(f1->isEqual(f3,1e-10,1e-10));
   CPPUNIT_ASSERT_THROW((*f2)/=(*f1),INTERP_KERNEL::Exception);
@@ -2104,22 +2103,22 @@ void MEDCouplingBasicsTest3::testDARearrange1()
   da1->iota(0);
   const int *ptr=da1->getConstPointer();
   //
-  CPPUNIT_ASSERT_EQUAL(12,da1->getNbOfElems());
-  CPPUNIT_ASSERT_EQUAL(1,da1->getNumberOfComponents());
-  CPPUNIT_ASSERT_EQUAL(12,da1->getNumberOfTuples());
+  CPPUNIT_ASSERT_EQUAL((std::size_t)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(12,da1->getNbOfElems());
-  CPPUNIT_ASSERT_EQUAL(4,da1->getNumberOfComponents());
-  CPPUNIT_ASSERT_EQUAL(3,da1->getNumberOfTuples());
+  CPPUNIT_ASSERT_EQUAL((std::size_t)12,da1->getNbOfElems());
+  CPPUNIT_ASSERT_EQUAL(4,(int)da1->getNumberOfComponents());
+  CPPUNIT_ASSERT_EQUAL(3,(int)da1->getNumberOfTuples());
   for(int i=0;i<12;i++)
     CPPUNIT_ASSERT_EQUAL(i,da1->getIJ(0,i));
   //
   da1->rearrange(6);
   CPPUNIT_ASSERT(ptr==da1->getConstPointer());
-  CPPUNIT_ASSERT_EQUAL(12,da1->getNbOfElems());
-  CPPUNIT_ASSERT_EQUAL(6,da1->getNumberOfComponents());
-  CPPUNIT_ASSERT_EQUAL(2,da1->getNumberOfTuples());
+  CPPUNIT_ASSERT_EQUAL((std::size_t)12,da1->getNbOfElems());
+  CPPUNIT_ASSERT_EQUAL(6,(int)da1->getNumberOfComponents());
+  CPPUNIT_ASSERT_EQUAL(2,(int)da1->getNumberOfTuples());
   for(int i=0;i<12;i++)
     CPPUNIT_ASSERT_EQUAL(i,da1->getIJ(0,i));
   //
@@ -2127,17 +2126,17 @@ void MEDCouplingBasicsTest3::testDARearrange1()
   //
   da1->rearrange(12);
   CPPUNIT_ASSERT(ptr==da1->getConstPointer());
-  CPPUNIT_ASSERT_EQUAL(12,da1->getNbOfElems());
-  CPPUNIT_ASSERT_EQUAL(12,da1->getNumberOfComponents());
-  CPPUNIT_ASSERT_EQUAL(1,da1->getNumberOfTuples());
+  CPPUNIT_ASSERT_EQUAL((std::size_t)12,da1->getNbOfElems());
+  CPPUNIT_ASSERT_EQUAL(12,(int)da1->getNumberOfComponents());
+  CPPUNIT_ASSERT_EQUAL(1,(int)da1->getNumberOfTuples());
   for(int i=0;i<12;i++)
     CPPUNIT_ASSERT_EQUAL(i,da1->getIJ(0,i));
   //
   da1->rearrange(3);
   CPPUNIT_ASSERT(ptr==da1->getConstPointer());
-  CPPUNIT_ASSERT_EQUAL(12,da1->getNbOfElems());
-  CPPUNIT_ASSERT_EQUAL(3,da1->getNumberOfComponents());
-  CPPUNIT_ASSERT_EQUAL(4,da1->getNumberOfTuples());
+  CPPUNIT_ASSERT_EQUAL((std::size_t)12,da1->getNbOfElems());
+  CPPUNIT_ASSERT_EQUAL(3,(int)da1->getNumberOfComponents());
+  CPPUNIT_ASSERT_EQUAL(4,(int)da1->getNumberOfTuples());
   for(int i=0;i<12;i++)
     CPPUNIT_ASSERT_EQUAL(i,da1->getIJ(0,i));
   //double
@@ -2145,22 +2144,22 @@ void MEDCouplingBasicsTest3::testDARearrange1()
   da1->decrRef();
   const double *ptr2=da2->getConstPointer();
   //
-  CPPUNIT_ASSERT_EQUAL(12,da2->getNbOfElems());
-  CPPUNIT_ASSERT_EQUAL(3,da2->getNumberOfComponents());
-  CPPUNIT_ASSERT_EQUAL(4,da2->getNumberOfTuples());
+  CPPUNIT_ASSERT_EQUAL((std::size_t)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(12,da2->getNbOfElems());
-  CPPUNIT_ASSERT_EQUAL(4,da2->getNumberOfComponents());
-  CPPUNIT_ASSERT_EQUAL(3,da2->getNumberOfTuples());
+  CPPUNIT_ASSERT_EQUAL((std::size_t)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(12,da2->getNbOfElems());
-  CPPUNIT_ASSERT_EQUAL(6,da2->getNumberOfComponents());
-  CPPUNIT_ASSERT_EQUAL(2,da2->getNumberOfTuples());
+  CPPUNIT_ASSERT_EQUAL((std::size_t)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);
   //
@@ -2168,17 +2167,17 @@ void MEDCouplingBasicsTest3::testDARearrange1()
   //
   da2->rearrange(1);
   CPPUNIT_ASSERT(ptr2==da2->getConstPointer());
-  CPPUNIT_ASSERT_EQUAL(12,da2->getNbOfElems());
-  CPPUNIT_ASSERT_EQUAL(1,da2->getNumberOfComponents());
-  CPPUNIT_ASSERT_EQUAL(12,da2->getNumberOfTuples());
+  CPPUNIT_ASSERT_EQUAL((std::size_t)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(12,da2->getNbOfElems());
-  CPPUNIT_ASSERT_EQUAL(3,da2->getNumberOfComponents());
-  CPPUNIT_ASSERT_EQUAL(4,da2->getNumberOfTuples());
+  CPPUNIT_ASSERT_EQUAL((std::size_t)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();
@@ -2190,11 +2189,12 @@ void MEDCouplingBasicsTest3::testGetDifferentValues1()
   const int 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());
-  std::set<int> s=da1->getDifferentValues();
+  DataArrayInt *s=da1->getDifferentValues();
   const int expected1[4]={1,2,3,5};
-  CPPUNIT_ASSERT_EQUAL(4,(int)s.size());
-  CPPUNIT_ASSERT(std::equal(expected1,expected1+4,s.begin()));
+  CPPUNIT_ASSERT_EQUAL(4,s->getNumberOfTuples());
+  CPPUNIT_ASSERT(std::equal(expected1,expected1+4,s->begin()));
   da1->decrRef();
+  s->decrRef();
 }
 
 void MEDCouplingBasicsTest3::testDAIBuildPermutationArr1()
@@ -2209,8 +2209,8 @@ void MEDCouplingBasicsTest3::testDAIBuildPermutationArr1()
   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());
+  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);
@@ -2229,8 +2229,8 @@ void MEDCouplingBasicsTest3::testDAIBuildPermutationArr1()
   const int 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);
   //
@@ -2252,8 +2252,8 @@ void MEDCouplingBasicsTest3::testAreCellsIncludedIn2()
   DataArrayInt *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();
@@ -2264,8 +2264,8 @@ void MEDCouplingBasicsTest3::testUMeshGetPartBarycenterAndOwner1()
   MEDCouplingUMesh *m1=build2DTargetMesh_1();
   const int 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);
@@ -2278,8 +2278,8 @@ void MEDCouplingBasicsTest3::testUMeshGetPartMeasureField1()
   MEDCouplingUMesh *m1=build2DTargetMesh_1();
   const int 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);
@@ -2293,8 +2293,8 @@ void MEDCouplingBasicsTest3::testUMeshBuildPartOrthogonalField1()
   m1->changeSpaceDimension(3);
   const int 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);
@@ -2327,21 +2327,21 @@ 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());
+  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};
   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(1,(int)a->getNumberOfComponents());
+  CPPUNIT_ASSERT_EQUAL(2,(int)a->getNumberOfTuples());
   CPPUNIT_ASSERT_EQUAL(2,a->getIJ(0,0));
   CPPUNIT_ASSERT_EQUAL(2,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(1,(int)a->getNumberOfComponents());
+  CPPUNIT_ASSERT_EQUAL(3,(int)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));
@@ -2366,8 +2366,8 @@ void MEDCouplingBasicsTest3::testDAIAggregateMulti1()
   std::vector<const DataArrayInt *> 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());
+  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};
   for(int i=0;i<10;i++)
@@ -2395,10 +2395,10 @@ void MEDCouplingBasicsTest3::testMergeUMeshes2()
   ms2[0]=m1; ms2[1]=m2_2; ms2[2]=m3_2;
   //
   MEDCouplingUMesh *m4=MEDCouplingUMesh::MergeUMeshes(ms);
-  m4->checkCoherency();
+  m4->checkConsistencyLight();
   CPPUNIT_ASSERT_EQUAL(10,m4->getNumberOfCells());
   CPPUNIT_ASSERT_EQUAL(20,m4->getNumberOfNodes());
-  CPPUNIT_ASSERT_EQUAL(45,m4->getMeshLength());
+  CPPUNIT_ASSERT_EQUAL(45,m4->getNodalConnectivityArrayLen());
   //
   MEDCouplingMesh *m4bis=MEDCouplingMesh::MergeMeshes(ms2);
   CPPUNIT_ASSERT(m4->isEqual(m4bis,1e-12));
@@ -2406,7 +2406,7 @@ void MEDCouplingBasicsTest3::testMergeUMeshes2()
   //
   const int vec3[5]={0,1,2,3,4};
   MEDCouplingUMesh *m4_1=(MEDCouplingUMesh *)m4->buildPartOfMySelf(vec3,vec3+5,false);
-  m4_1->setName(m1->getName());
+  m4_1->setName(m1->getName().c_str());
   CPPUNIT_ASSERT(m4_1->isEqual(m1,1e-12));
   m4_1->decrRef();
   //
@@ -2424,7 +2424,7 @@ void MEDCouplingBasicsTest3::testMergeUMeshes2()
   CPPUNIT_ASSERT_EQUAL(2,m4_3->getNumberOfCells());
   CPPUNIT_ASSERT_EQUAL(3,m4_3->getNumberOfNodes());
   m3_2->zipCoords();
-  m4_3->setName(m3_2->getName());
+  m4_3->setName(m3_2->getName().c_str());
   CPPUNIT_ASSERT(m4_3->isEqual(m3_2,1e-12));
   m4_3->decrRef();
   //
@@ -2444,12 +2444,12 @@ void MEDCouplingBasicsTest3::testBuild0DMeshFromCoords1()
   coo->setName("My0D");
   std::copy(sourceCoords,sourceCoords+12,coo->getPointer());
   MEDCouplingUMesh *m=MEDCouplingUMesh::Build0DMeshFromCoords(coo);
-  m->checkCoherency();
+  m->checkConsistencyLight();
   CPPUNIT_ASSERT_EQUAL(4,m->getNumberOfNodes());
   CPPUNIT_ASSERT_EQUAL(4,m->getNumberOfCells());
   CPPUNIT_ASSERT_EQUAL(3,m->getSpaceDimension());
   CPPUNIT_ASSERT_EQUAL(0,m->getMeshDimension());
-  const std::set<INTERP_KERNEL::NormalizedCellType>& types=m->getAllTypes();
+  std::set<INTERP_KERNEL::NormalizedCellType> types=m->getAllGeoTypes();
   CPPUNIT_ASSERT_EQUAL(1,(int)types.size());
   CPPUNIT_ASSERT_EQUAL(INTERP_KERNEL::NORM_POINT1,*types.begin());
   for(int i=0;i<4;i++)