Salome HOME
Updated copyright comment
[tools/medcoupling.git] / src / MEDCoupling / Test / MEDCouplingExamplesTest.cxx
index b474692675a9ff9909184b05672062e740b2086d..f75dc967e8acd9f74772047d495d60facf4b25dd 100644 (file)
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2015  CEA/DEN, EDF R&D
+// Copyright (C) 2007-2024  CEA, EDF
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-// Author : Anthony Geay (CEA/DEN)
+// Author : Anthony Geay (EDF R&D)
 
 #include "MEDCouplingBasicsTest.hxx"
 #include "MEDCouplingUMesh.hxx"
 #include "MEDCouplingCMesh.hxx"
-#include "MEDCouplingExtrudedMesh.hxx"
+#include "MEDCouplingMappedExtrudedMesh.hxx"
 #include "MEDCouplingFieldDouble.hxx"
 #include "MEDCouplingMemArray.hxx"
+#include "MEDCouplingMemArray.txx"
 #include "MEDCouplingMultiFields.hxx"
 
 
@@ -33,17 +34,17 @@ void CppExample_MEDCouplingFieldDouble_WriteVTK()
   //! [CppSnippet_MEDCouplingFieldDouble_WriteVTK_1]
   // mesh1
   const double coords[3] = {0.,2.,4.};
-  MEDCouplingAutoRefCountObjectPtr<DataArrayDouble> coordsArr = DataArrayDouble::New();
+  MCAuto<DataArrayDouble> coordsArr = DataArrayDouble::New();
   coordsArr->useExternalArrayWithRWAccess( coords, 3, 1 );
-  MEDCouplingAutoRefCountObjectPtr<MEDCouplingCMesh> mesh1 = MEDCouplingCMesh::New();
+  MCAuto<MEDCouplingCMesh> mesh1 = MEDCouplingCMesh::New();
   mesh1->setCoords(coordsArr,coordsArr); // mesh becomes a 2D one
 
   // 3 fields (lying on the same mesh!)
-  MEDCouplingAutoRefCountObjectPtr<MEDCouplingFieldDouble> field1 =
+  MCAuto<MEDCouplingFieldDouble> field1 =
     mesh1->getMeasureField( true );
-  MEDCouplingAutoRefCountObjectPtr<MEDCouplingFieldDouble> field2 =
+  MCAuto<MEDCouplingFieldDouble> field2 =
     mesh1->buildOrthogonalField();
-  MEDCouplingAutoRefCountObjectPtr<MEDCouplingFieldDouble> field3 =
+  MCAuto<MEDCouplingFieldDouble> field3 =
     mesh1->fillFromAnalytic( ON_CELLS, 1, "x");
   field2->setName( "Normal" ); //  name is necessary!
   field3->setName( "Barycenter" ); //  name is necessary!
@@ -68,20 +69,20 @@ void CppExample_MEDCouplingFieldDouble_MaxFields()
   const double valsMax[4] = {2.,2., 6.,6.}; // expected max field
   const double valsMin[4] = {0.,0., 4.,4.}; // expected min field
   // field 1
-  MEDCouplingAutoRefCountObjectPtr<DataArrayDouble> valsArr1 = DataArrayDouble::New();
+  MCAuto<DataArrayDouble> valsArr1 = DataArrayDouble::New();
   valsArr1->useExternalArrayWithRWAccess( vals1, 2,2 ); // 2 tuples per 2 components
-  MEDCouplingAutoRefCountObjectPtr<MEDCouplingFieldDouble> field1 = MEDCouplingFieldDouble::New( ON_NODES );
+  MCAuto<MEDCouplingFieldDouble> field1 = MEDCouplingFieldDouble::New( ON_NODES );
   field1->setArray( valsArr1 );
   // field 2
-  MEDCouplingAutoRefCountObjectPtr<DataArrayDouble> valsArr2 = DataArrayDouble::New();
+  MCAuto<DataArrayDouble> valsArr2 = DataArrayDouble::New();
   valsArr2->useExternalArrayWithRWAccess( vals2, 2,2 ); // 2 tuples per 2 components
-  MEDCouplingAutoRefCountObjectPtr<MEDCouplingFieldDouble> field2 = MEDCouplingFieldDouble::New( ON_NODES );
+  MCAuto<MEDCouplingFieldDouble> field2 = MEDCouplingFieldDouble::New( ON_NODES );
   field2->setArray( valsArr2 );
   // max field 
-  MEDCouplingAutoRefCountObjectPtr<MEDCouplingFieldDouble> fieldMax = MEDCouplingFieldDouble::MaxFields( field1, field2 );
+  MCAuto<MEDCouplingFieldDouble> fieldMax = MEDCouplingFieldDouble::MaxFields( field1, field2 );
   CPPUNIT_ASSERT( std::equal( valsMax, valsMax+4, fieldMax->getArray()->getConstPointer() )); // fieldMax == valsMax
   // min field 
-  MEDCouplingAutoRefCountObjectPtr<MEDCouplingFieldDouble> fieldMin = MEDCouplingFieldDouble::MinFields( field1, field2 );
+  MCAuto<MEDCouplingFieldDouble> fieldMin = MEDCouplingFieldDouble::MinFields( field1, field2 );
   CPPUNIT_ASSERT( std::equal( valsMin, valsMin+4, fieldMin->getArray()->getConstPointer() )); // fieldMin == valsMin
   //! [CppSnippet_MEDCouplingFieldDouble_MaxFields_1]
 }
@@ -92,28 +93,28 @@ void CppExample_MEDCouplingFieldDouble_MergeFields()
   //! [CppSnippet_MEDCouplingFieldDouble_MergeFields_1]
   // mesh1
   const double coords[3] = {0.,2.,4.};
-  MEDCouplingAutoRefCountObjectPtr<DataArrayDouble> coordsArr = DataArrayDouble::New();
+  MCAuto<DataArrayDouble> coordsArr = DataArrayDouble::New();
   coordsArr->useExternalArrayWithRWAccess( coords, 3, 1 );
-  MEDCouplingAutoRefCountObjectPtr<MEDCouplingCMesh> mesh1 = MEDCouplingCMesh::New();
+  MCAuto<MEDCouplingCMesh> mesh1 = MEDCouplingCMesh::New();
   mesh1->setCoords(coordsArr); // mesh becomes a 1D
   // field1
-  MEDCouplingAutoRefCountObjectPtr<MEDCouplingFieldDouble> field1 =
+  MCAuto<MEDCouplingFieldDouble> field1 =
     mesh1->fillFromAnalytic( ON_CELLS, 1, "x");
 
   // mesh2 and field2
-  MEDCouplingAutoRefCountObjectPtr<MEDCouplingFieldDouble> field2 =
+  MCAuto<MEDCouplingFieldDouble> field2 =
     field1->cloneWithMesh( true );
   double vec[1] = { 5. };
   (const_cast<MEDCoupling::MEDCouplingMesh *>(field2->getMesh()))->translate(vec); // translate mesh2
   field2->applyFunc("x + 5"); // "translate" field2
 
   // concatenate field1 and field2
-  MEDCouplingAutoRefCountObjectPtr<MEDCouplingFieldDouble> field3 =
+  MCAuto<MEDCouplingFieldDouble> field3 =
     MEDCouplingFieldDouble::MergeFields( field1, field2 );
   std::vector<const MEDCouplingFieldDouble *> fields( 2 );
   fields[0] = field1;
   fields[1] = field2;
-  MEDCouplingAutoRefCountObjectPtr<MEDCouplingFieldDouble> field4 =
+  MCAuto<MEDCouplingFieldDouble> field4 =
     MEDCouplingFieldDouble::MergeFields( fields );
   //! [CppSnippet_MEDCouplingFieldDouble_MergeFields_1]
 }
@@ -125,24 +126,24 @@ void CppExample_MEDCouplingFieldDouble_substractInPlaceDM()
   const double coords1[4] = {0.,1.,2.,3.};
   const double coords2[4] = {2.,1.,0.,3.}; //  #0 <==> #2
   // mesh 1
-  MEDCouplingAutoRefCountObjectPtr<MEDCouplingUMesh> mesh1 = MEDCouplingUMesh::New();
-  MEDCouplingAutoRefCountObjectPtr<DataArrayDouble> coordsArr = DataArrayDouble::New();
+  MCAuto<MEDCouplingUMesh> mesh1 = MEDCouplingUMesh::New();
+  MCAuto<DataArrayDouble> coordsArr = DataArrayDouble::New();
   coordsArr->useExternalArrayWithRWAccess( coords1, 4, 1 );
   mesh1->setCoords(coordsArr);
   mesh1->setMeshDimension(0);
   mesh1->allocateCells(0);
   mesh1->finishInsertingCells();
   // mesh 2
-  MEDCouplingAutoRefCountObjectPtr<MEDCouplingUMesh> mesh2 =
-    (MEDCouplingUMesh*) mesh1->deepCpy();
+  MCAuto<MEDCouplingUMesh> mesh2 =
+    (MEDCouplingUMesh*) mesh1->deepCopy();
   mesh2->getCoords()->useExternalArrayWithRWAccess( coords2, 4, 1 );
   //! [CppSnippet_MEDCouplingFieldDouble_substractInPlaceDM_1]
   //! [CppSnippet_MEDCouplingFieldDouble_substractInPlaceDM_2]
-  MEDCouplingAutoRefCountObjectPtr<MEDCouplingFieldDouble> field1 =
+  MCAuto<MEDCouplingFieldDouble> field1 =
     mesh1->fillFromAnalytic( MEDCoupling::ON_NODES,1,"x"); // field1 values == coords1
-  MEDCouplingAutoRefCountObjectPtr<MEDCouplingFieldDouble> field2 =
+  MCAuto<MEDCouplingFieldDouble> field2 =
     mesh2->fillFromAnalytic( MEDCoupling::ON_NODES,1,"x"); // field2 values == coords2
-  const double levOfCheck = 10; // nodes can be permuted
+  const int levOfCheck = 10; // nodes can be permuted
   field1->substractInPlaceDM( field2, levOfCheck, 1e-13, 0 ); // values #0 and #2 must swap
   //! [CppSnippet_MEDCouplingFieldDouble_substractInPlaceDM_2]
   //! [CppSnippet_MEDCouplingFieldDouble_substractInPlaceDM_3]
@@ -158,22 +159,22 @@ void CppExample_MEDCouplingFieldDouble_changeUnderlyingMesh()
   const double coords1[4] = {0.,1.,2.,3.};
   const double coords2[4] = {2.,1.,0.,3.}; //  #0 <==> #2
   // mesh 1
-  MEDCouplingAutoRefCountObjectPtr<MEDCouplingUMesh> mesh1 = MEDCouplingUMesh::New();
-  MEDCouplingAutoRefCountObjectPtr<DataArrayDouble> coordsArr = DataArrayDouble::New();
+  MCAuto<MEDCouplingUMesh> mesh1 = MEDCouplingUMesh::New();
+  MCAuto<DataArrayDouble> coordsArr = DataArrayDouble::New();
   coordsArr->useExternalArrayWithRWAccess( coords1, 4, 1 );
   mesh1->setCoords(coordsArr);
   mesh1->setMeshDimension(0);
   mesh1->allocateCells(0);
   mesh1->finishInsertingCells();
   // mesh 2
-  MEDCouplingAutoRefCountObjectPtr<MEDCouplingUMesh> mesh2 =
-    (MEDCouplingUMesh*) mesh1->deepCpy();
+  MCAuto<MEDCouplingUMesh> mesh2 =
+    (MEDCouplingUMesh*) mesh1->deepCopy();
   mesh2->getCoords()->useExternalArrayWithRWAccess( coords2, 4, 1 );
   //! [CppSnippet_MEDCouplingFieldDouble_changeUnderlyingMesh_1]
   //! [CppSnippet_MEDCouplingFieldDouble_changeUnderlyingMesh_2]
-  MEDCouplingAutoRefCountObjectPtr<MEDCouplingFieldDouble> field =
+  MCAuto<MEDCouplingFieldDouble> field =
     mesh1->fillFromAnalytic( MEDCoupling::ON_NODES,1,"x"); // field values == coords1
-  const double levOfCheck = 10; // nodes can be permuted
+  const int levOfCheck = 10; // nodes can be permuted
   field->changeUnderlyingMesh( mesh2, levOfCheck, 1e-13, 0 ); // values #0 and #2 must swap
   CPPUNIT_ASSERT( std::equal( coords2, coords2+4, field->getArray()->getConstPointer() ));
   //! [CppSnippet_MEDCouplingFieldDouble_changeUnderlyingMesh_2]
@@ -184,9 +185,9 @@ void CppExample_MEDCouplingFieldDouble_applyFunc_same_nb_comp()
   using namespace MEDCoupling;
   //! [CppSnippet_MEDCouplingFieldDouble_applyFunc_same_nb_comp_1]
   const double v[4] = {1.,2., 3.,4.};
-  MEDCouplingAutoRefCountObjectPtr<DataArrayDouble> array = DataArrayDouble::New();
+  MCAuto<DataArrayDouble> array = DataArrayDouble::New();
   array->useExternalArrayWithRWAccess( v, 2, 2 ); // 2 tuples per 2 components
-  MEDCouplingAutoRefCountObjectPtr<MEDCouplingFieldDouble> field =
+  MCAuto<MEDCouplingFieldDouble> field =
     MEDCouplingFieldDouble::New( MEDCoupling::ON_CELLS );
   field->setArray( array );
   const char func[] = "IVec * v + JVec * w*w + 10";
@@ -208,16 +209,16 @@ void CppExample_MEDCouplingFieldDouble_applyFunc3()
   //! [CppSnippet_MEDCouplingFieldDouble_applyFunc3_1]
   // create a 2D vector field
   const double values[4] = {1.,1., 2.,1.};
-  MEDCouplingAutoRefCountObjectPtr<DataArrayDouble> array = DataArrayDouble::New();
+  MCAuto<DataArrayDouble> array = DataArrayDouble::New();
   array->useExternalArrayWithRWAccess( values, 2, 2 ); // 2 tuples per 2 components
-  MEDCouplingAutoRefCountObjectPtr<MEDCouplingFieldDouble> field =
+  MCAuto<MEDCouplingFieldDouble> field =
     MEDCouplingFieldDouble::New( MEDCoupling::ON_CELLS );
   field->setArray( array );
   // transform the field to a 3D vector field
   const char func[] = "IVec * b + JVec * a + KVec * sqrt( a*a + b*b ) + 10";
   const char* varNames[2] = { "a", "b" }; // names used to refer to X and Y components
   std::vector<std::string> varNamesVec( varNames, varNames+2 );
-  field->applyFunc3( 3, varNamesVec, func ); // require 3 components 
+  field->applyFuncNamedCompo( 3, varNamesVec, func ); // require 3 components 
   CPPUNIT_ASSERT( field->getNumberOfComponents() == 3 ); // 3 components as required
   //! [CppSnippet_MEDCouplingFieldDouble_applyFunc3_1]
   //! [CppSnippet_MEDCouplingFieldDouble_applyFunc3_2]
@@ -236,16 +237,16 @@ void CppExample_MEDCouplingFieldDouble_applyFunc2()
   //! [CppSnippet_MEDCouplingFieldDouble_applyFunc2_1]
   // create a 2D vector field
   const double values[4] = {1.,1., 2.,1.};
-  MEDCouplingAutoRefCountObjectPtr<DataArrayDouble> array = DataArrayDouble::New();
+  MCAuto<DataArrayDouble> array = DataArrayDouble::New();
   array->useExternalArrayWithRWAccess( values, 2, 2 ); // 2 tuples per 2 components
   array->setInfoOnComponent(0,"a"); // name used to refer to X component within a function
   array->setInfoOnComponent(1,"b"); // name used to refer to Y component within a function
-  MEDCouplingAutoRefCountObjectPtr<MEDCouplingFieldDouble> field =
+  MCAuto<MEDCouplingFieldDouble> field =
     MEDCouplingFieldDouble::New( MEDCoupling::ON_CELLS );
   field->setArray( array );
   // transform the field to a 3D vector field
   const char func[] = "IVec * b + JVec * a + KVec * sqrt( a*a + b*b ) + 10";
-  field->applyFunc2( 3, func ); // require 3 components 
+  field->applyFuncCompo( 3, func ); // require 3 components 
   CPPUNIT_ASSERT( field->getNumberOfComponents() == 3 ); // 3 components as required
   //! [CppSnippet_MEDCouplingFieldDouble_applyFunc2_1]
   //! [CppSnippet_MEDCouplingFieldDouble_applyFunc2_2]
@@ -264,9 +265,9 @@ void CppExample_MEDCouplingFieldDouble_applyFunc()
   //! [CppSnippet_MEDCouplingFieldDouble_applyFunc_1]
   // create a 2D vector field
   const double values[4] = {1.,1., 2.,1.};
-  MEDCouplingAutoRefCountObjectPtr<DataArrayDouble> array = DataArrayDouble::New();
+  MCAuto<DataArrayDouble> array = DataArrayDouble::New();
   array->useExternalArrayWithRWAccess( values, 2, 2 ); // 2 tuples per 2 components
-  MEDCouplingAutoRefCountObjectPtr<MEDCouplingFieldDouble> field =
+  MCAuto<MEDCouplingFieldDouble> field =
     MEDCouplingFieldDouble::New( MEDCoupling::ON_CELLS );
   field->setArray( array );
   // transform the field to a 3D vector field
@@ -290,12 +291,12 @@ void CppExample_MEDCouplingFieldDouble_applyFunc_val()
   //! [Snippet_MEDCouplingFieldDouble_applyFunc_val_1]
   // mesh
   const double coords[4] = {0.,2.,4.};
-  MEDCouplingAutoRefCountObjectPtr<DataArrayDouble> coordsArr = DataArrayDouble::New();
+  MCAuto<DataArrayDouble> coordsArr = DataArrayDouble::New();
   coordsArr->useExternalArrayWithRWAccess( coords, 3, 1 );
-  MEDCouplingAutoRefCountObjectPtr<MEDCouplingCMesh> mesh = MEDCouplingCMesh::New();
+  MCAuto<MEDCouplingCMesh> mesh = MEDCouplingCMesh::New();
   mesh->setCoords(coordsArr,coordsArr); // mesh becomes a 2D structured mesh
   // field
-  MEDCouplingAutoRefCountObjectPtr<MEDCouplingFieldDouble> field =
+  MCAuto<MEDCouplingFieldDouble> field =
     MEDCouplingFieldDouble::New( MEDCoupling::ON_CELLS );
   field->setMesh( mesh );
   field->fillFromAnalytic(2,"IVec * x + JVec * y"); // 2 components
@@ -314,29 +315,29 @@ void CppExample_MEDCouplingFieldDouble_fillFromAnalytic3()
   using namespace MEDCoupling;
   //! [CppSnippet_MEDCouplingFieldDouble_fillFromAnalytic3_1]
   const double coords[4] = {0.,2.,4.,6.}; // 6. is not used
-  MEDCouplingAutoRefCountObjectPtr<DataArrayDouble> x = DataArrayDouble::New();
+  MCAuto<DataArrayDouble> x = DataArrayDouble::New();
   x->useExternalArrayWithRWAccess( coords, 3, 1 );
-  MEDCouplingAutoRefCountObjectPtr<DataArrayDouble> y = DataArrayDouble::New();
+  MCAuto<DataArrayDouble> y = DataArrayDouble::New();
   y->useExternalArrayWithRWAccess( coords, 2, 1 );
-  MEDCouplingAutoRefCountObjectPtr<MEDCouplingCMesh> mesh=MEDCouplingCMesh::New();
+  MCAuto<MEDCouplingCMesh> mesh=MEDCouplingCMesh::New();
   mesh->setCoords(x,y);
   //! [CppSnippet_MEDCouplingFieldDouble_fillFromAnalytic3_1]
   //! [CppSnippet_MEDCouplingFieldDouble_fillFromAnalytic3_2]
-  MEDCouplingAutoRefCountObjectPtr<MEDCouplingFieldDouble> field =
+  MCAuto<MEDCouplingFieldDouble> field =
     MEDCouplingFieldDouble::New( MEDCoupling::ON_CELLS );
   field->setMesh( mesh );
   const char func[] = "IVec * b + JVec * a + KVec * sqrt( a*a + b*b ) + 10";
   const char* varNames[2] = { "a", "b" }; // names used to refer to X and Y coord components
   std::vector<std::string> varNamesVec( varNames, varNames+2 );
-  field->fillFromAnalytic3( 3, varNamesVec, func );
+  field->fillFromAnalyticNamedCompo( 3, varNamesVec, func );
   //! [CppSnippet_MEDCouplingFieldDouble_fillFromAnalytic3_2]
   //! [CppSnippet_MEDCouplingFieldDouble_fillFromAnalytic3_3]
   double val1[3]; // a value (vector) of the cell #1
   CPPUNIT_ASSERT( field->getNumberOfComponents() == 3 ); // 3 components in the field
   field->getArray()->getTuple( 1, val1 );
   //
-  MEDCouplingAutoRefCountObjectPtr<DataArrayDouble> bc =
-    mesh->getBarycenterAndOwner(); // func is applied to barycenters of cells
+  MCAuto<DataArrayDouble> bc =
+    mesh->computeCellCenterOfMass(); // func is applied to barycenters of cells
   double bc1[2]; // coordinates of the second point
   bc->getTuple( 1, bc1 );
   //
@@ -352,17 +353,17 @@ void CppExample_MEDCouplingFieldDouble_fillFromAnalytic2()
   using namespace MEDCoupling;
   //! [CppSnippet_MEDCouplingFieldDouble_fillFromAnalytic2_1]
   const double coords[4] = {0.,2.,4.};
-  MEDCouplingAutoRefCountObjectPtr<DataArrayDouble> x = DataArrayDouble::New();
+  MCAuto<DataArrayDouble> x = DataArrayDouble::New();
   x->useExternalArrayWithRWAccess( coords, 3, 1 );
-  MEDCouplingAutoRefCountObjectPtr<DataArrayDouble> y = DataArrayDouble::New();
+  MCAuto<DataArrayDouble> y = DataArrayDouble::New();
   y->useExternalArrayWithRWAccess( coords, 2, 1 );
   x->setInfoOnComponent(0,"a"); //  name used to refer to X coordinate within a function
   y->setInfoOnComponent(0,"b"); //  name used to refer to Y coordinate within a function
-  MEDCouplingAutoRefCountObjectPtr<MEDCouplingCMesh> mesh=MEDCouplingCMesh::New();
+  MCAuto<MEDCouplingCMesh> mesh=MEDCouplingCMesh::New();
   mesh->setCoords(x,y);
   //! [CppSnippet_MEDCouplingFieldDouble_fillFromAnalytic2_1]
   //! [CppSnippet_MEDCouplingFieldDouble_fillFromAnalytic2_2]
-  MEDCouplingAutoRefCountObjectPtr<MEDCouplingFieldDouble> field =
+  MCAuto<MEDCouplingFieldDouble> field =
     MEDCouplingFieldDouble::New( MEDCoupling::ON_CELLS );
   field->setMesh( mesh );
   const char func[] = "IVec * b + JVec * a + KVec * sqrt( a*a + b*b ) + 10";
@@ -373,8 +374,8 @@ void CppExample_MEDCouplingFieldDouble_fillFromAnalytic2()
   CPPUNIT_ASSERT( field->getNumberOfComponents() == 3 ); // 3 components in the field
   field->getArray()->getTuple( 1, val1 );
   //
-  MEDCouplingAutoRefCountObjectPtr<DataArrayDouble> bc =
-    mesh->getBarycenterAndOwner(); // func is applied to barycenters of cells
+  MCAuto<DataArrayDouble> bc =
+    mesh->computeCellCenterOfMass(); // func is applied to barycenters of cells
   double bc1[2]; // coordinates of the second point
   bc->getTuple( 1, bc1 );
   //
@@ -390,16 +391,16 @@ void CppExample_MEDCouplingFieldDouble_fillFromAnalytic()
   using namespace MEDCoupling;
   //! [CppSnippet_MEDCouplingFieldDouble_fillFromAnalytic_1]
   const double coords[3] = {0.,2.,4};
-  MEDCouplingAutoRefCountObjectPtr<DataArrayDouble> x = DataArrayDouble::New();
+  MCAuto<DataArrayDouble> x = DataArrayDouble::New();
   x->useExternalArrayWithRWAccess( coords, 3, 1 );
-  MEDCouplingAutoRefCountObjectPtr<DataArrayDouble> y = DataArrayDouble::New();
+  MCAuto<DataArrayDouble> y = DataArrayDouble::New();
   y->useExternalArrayWithRWAccess( coords, 2, 1 );
-  MEDCouplingAutoRefCountObjectPtr<MEDCouplingCMesh> mesh=MEDCouplingCMesh::New();
+  MCAuto<MEDCouplingCMesh> mesh=MEDCouplingCMesh::New();
   mesh->setCoords(x,y);
   //! [CppSnippet_MEDCouplingFieldDouble_fillFromAnalytic_1]
   //! [CppSnippet_MEDCouplingFieldDouble_fillFromAnalytic_2]
   const char func[] = "IVec * b + JVec * a + KVec * sqrt( a*a + b*b ) + 10";
-  MEDCouplingAutoRefCountObjectPtr<MEDCouplingFieldDouble> field =
+  MCAuto<MEDCouplingFieldDouble> field =
     MEDCouplingFieldDouble::New( MEDCoupling::ON_CELLS );
   field->setMesh( mesh );
   field->fillFromAnalytic( 3, func );
@@ -409,8 +410,8 @@ void CppExample_MEDCouplingFieldDouble_fillFromAnalytic()
   CPPUNIT_ASSERT( field->getNumberOfComponents() == 3 ); // 3 components in the field
   field->getArray()->getTuple( 1, val1 );
   //
-  MEDCouplingAutoRefCountObjectPtr<DataArrayDouble> bc =
-    mesh->getBarycenterAndOwner(); // func is applied to barycenters of cells
+  MCAuto<DataArrayDouble> bc =
+    mesh->computeCellCenterOfMass(); // func is applied to barycenters of cells
   double bc1[2]; // coordinates of the second point
   bc->getTuple( 1, bc1 );
   //
@@ -437,12 +438,12 @@ void CppExample_MEDCouplingFieldDouble_fillFromAnalytic_c_func()
   //! [Snippet_MEDCouplingFieldDouble_fillFromAnalytic_c_func_1]
   // mesh
   const double coords[4] = {0.,2.,4.};
-  MEDCouplingAutoRefCountObjectPtr<DataArrayDouble> coordsArr = DataArrayDouble::New();
+  MCAuto<DataArrayDouble> coordsArr = DataArrayDouble::New();
   coordsArr->useExternalArrayWithRWAccess( coords, 3, 1 );
-  MEDCouplingAutoRefCountObjectPtr<MEDCouplingCMesh> mesh = MEDCouplingCMesh::New();
+  MCAuto<MEDCouplingCMesh> mesh = MEDCouplingCMesh::New();
   mesh->setCoords(coordsArr,coordsArr); // mesh becomes a 2D structured mesh
   // field
-  MEDCouplingAutoRefCountObjectPtr<MEDCouplingFieldDouble> field =
+  MCAuto<MEDCouplingFieldDouble> field =
     MEDCouplingFieldDouble::New( MEDCoupling::ON_CELLS );
   field->setMesh( mesh );
   field->fillFromAnalytic( 3, &getNewValue ); // 3 components are required
@@ -457,15 +458,15 @@ void CppExample_MEDCouplingFieldDouble_applyFunc_c_func()
   //! [Snippet_MEDCouplingFieldDouble_applyFunc_c_func_1]
   // mesh
   const double coords[4] = {0.,2.,4.};
-  MEDCouplingAutoRefCountObjectPtr<DataArrayDouble> coordsArr = DataArrayDouble::New();
+  MCAuto<DataArrayDouble> coordsArr = DataArrayDouble::New();
   coordsArr->useExternalArrayWithRWAccess( coords, 3, 1 );
-  MEDCouplingAutoRefCountObjectPtr<MEDCouplingCMesh> mesh = MEDCouplingCMesh::New();
+  MCAuto<MEDCouplingCMesh> mesh = MEDCouplingCMesh::New();
   mesh->setCoords(coordsArr,coordsArr); // mesh becomes a 2D structured mesh
   // field
-  MEDCouplingAutoRefCountObjectPtr<MEDCouplingFieldDouble> field =
+  MCAuto<MEDCouplingFieldDouble> field =
     MEDCouplingFieldDouble::New( MEDCoupling::ON_CELLS );
   field->setMesh( mesh );
-  MEDCouplingAutoRefCountObjectPtr<DataArrayDouble> bc = mesh->getBarycenterAndOwner();
+  MCAuto<DataArrayDouble> bc = mesh->computeCellCenterOfMass();
   field->setArray( bc ); // 2 components here as the mesh is 2D
   //! [Snippet_MEDCouplingFieldDouble_applyFunc_c_func_1]
   //! [Snippet_MEDCouplingFieldDouble_applyFunc_c_func_2]
@@ -480,17 +481,17 @@ void CppExample_MEDCouplingFieldDouble_getValueOn_time()
   using namespace MEDCoupling;
   //! [CppSnippet_MEDCouplingFieldDouble_getValueOn_time_1]
   const double coords[4] = {0.,2.,4.};
-  MEDCouplingAutoRefCountObjectPtr<DataArrayDouble> coordsArr = DataArrayDouble::New();
+  MCAuto<DataArrayDouble> coordsArr = DataArrayDouble::New();
   coordsArr->useExternalArrayWithRWAccess( coords, 3, 1 );
-  MEDCouplingAutoRefCountObjectPtr<MEDCouplingCMesh> mesh = MEDCouplingCMesh::New();
+  MCAuto<MEDCouplingCMesh> mesh = MEDCouplingCMesh::New();
   mesh->setCoords(coordsArr,coordsArr);
   //! [CppSnippet_MEDCouplingFieldDouble_getValueOn_time_1]
   //! [CppSnippet_MEDCouplingFieldDouble_getValueOn_time_2]
-  MEDCouplingAutoRefCountObjectPtr<MEDCouplingFieldDouble> field =
+  MCAuto<MEDCouplingFieldDouble> field =
     MEDCouplingFieldDouble::New( MEDCoupling::ON_CELLS, MEDCoupling::LINEAR_TIME );
   field->setMesh( mesh );
   field->fillFromAnalytic( 1,"10"); // all values == 10.
-  MEDCouplingAutoRefCountObjectPtr<DataArrayDouble> array2 =
+  MCAuto<DataArrayDouble> array2 =
     DataArrayDouble::Add( field->getArray(), field->getArray() ); // == 2 * field->getArray()
   field->setEndArray( array2 ); // all values == 20.
   const double time1 = 1.1, time2 = 22.;
@@ -510,17 +511,17 @@ void CppExample_MEDCouplingFieldDouble_getValueOnMulti()
   using namespace MEDCoupling;
   //! [CppSnippet_MEDCouplingFieldDouble_getValueOnMulti_1]
   const double coords[4] = {0.,2.,4.};
-  MEDCouplingAutoRefCountObjectPtr<DataArrayDouble> coordsArr = DataArrayDouble::New();
+  MCAuto<DataArrayDouble> coordsArr = DataArrayDouble::New();
   coordsArr->useExternalArrayWithRWAccess( coords, 3, 1 );
-  MEDCouplingAutoRefCountObjectPtr<MEDCouplingCMesh> mesh = MEDCouplingCMesh::New();
+  MCAuto<MEDCouplingCMesh> mesh = MEDCouplingCMesh::New();
   mesh->setCoords(coordsArr,coordsArr);
-  MEDCouplingAutoRefCountObjectPtr<MEDCouplingFieldDouble> field =
+  MCAuto<MEDCouplingFieldDouble> field =
     mesh->fillFromAnalytic( MEDCoupling::ON_CELLS,1,"x+y");
   //! [CppSnippet_MEDCouplingFieldDouble_getValueOnMulti_1]
   //! [CppSnippet_MEDCouplingFieldDouble_getValueOnMulti_2]
   // field values are located at cell barycenters
-  MEDCouplingAutoRefCountObjectPtr<DataArrayDouble> bc = mesh->getBarycenterAndOwner();
-  MEDCouplingAutoRefCountObjectPtr<DataArrayDouble> valArray =
+  MCAuto<DataArrayDouble> bc = mesh->computeCellCenterOfMass();
+  MCAuto<DataArrayDouble> valArray =
     field->getValueOnMulti( bc->getConstPointer(), bc->getNumberOfTuples() );
   CPPUNIT_ASSERT( valArray->isEqual( * field->getArray(), 1e-13 ));
   //! [CppSnippet_MEDCouplingFieldDouble_getValueOnMulti_2]
@@ -531,16 +532,16 @@ void CppExample_MEDCouplingFieldDouble_getValueOn()
   using namespace MEDCoupling;
   //! [CppSnippet_MEDCouplingFieldDouble_getValueOn_1]
   const double coords[4] = {0.,2.,4.};
-  MEDCouplingAutoRefCountObjectPtr<DataArrayDouble> coordsArr = DataArrayDouble::New();
+  MCAuto<DataArrayDouble> coordsArr = DataArrayDouble::New();
   coordsArr->useExternalArrayWithRWAccess( coords, 3, 1 );
-  MEDCouplingAutoRefCountObjectPtr<MEDCouplingCMesh> mesh = MEDCouplingCMesh::New();
+  MCAuto<MEDCouplingCMesh> mesh = MEDCouplingCMesh::New();
   mesh->setCoords(coordsArr,coordsArr);
-  MEDCouplingAutoRefCountObjectPtr<MEDCouplingFieldDouble> field =
+  MCAuto<MEDCouplingFieldDouble> field =
     mesh->fillFromAnalytic( MEDCoupling::ON_CELLS,1,"x+y");
   //! [CppSnippet_MEDCouplingFieldDouble_getValueOn_1]
   //! [CppSnippet_MEDCouplingFieldDouble_getValueOn_2]
   // field values are located at cell barycenters
-  MEDCouplingAutoRefCountObjectPtr<DataArrayDouble> bc = mesh->getBarycenterAndOwner();
+  MCAuto<DataArrayDouble> bc = mesh->computeCellCenterOfMass();
   std::vector<double> vals( field->getNumberOfTuples() ); // array to collect values returned by getValueOn()
   double cellBC[2]; // we are in 2D space
   for ( int i = 0; i < bc->getNumberOfTuples(); ++i )
@@ -557,18 +558,18 @@ void CppExample_MEDCouplingFieldDouble_getValueOnPos()
   using namespace MEDCoupling;
   //! [CppSnippet_MEDCouplingFieldDouble_getValueOnPos_1]
   const double coords[4] = {0.,2.,4.};
-  MEDCouplingAutoRefCountObjectPtr<DataArrayDouble> coordsArr = DataArrayDouble::New();
+  MCAuto<DataArrayDouble> coordsArr = DataArrayDouble::New();
   coordsArr->useExternalArrayWithRWAccess( coords, 3, 1 );
-  MEDCouplingAutoRefCountObjectPtr<MEDCouplingCMesh> mesh = MEDCouplingCMesh::New();
+  MCAuto<MEDCouplingCMesh> mesh = MEDCouplingCMesh::New();
   mesh->setCoords(coordsArr,coordsArr);
-  MEDCouplingAutoRefCountObjectPtr<MEDCouplingFieldDouble> field =
+  MCAuto<MEDCouplingFieldDouble> field =
     mesh->fillFromAnalytic( MEDCoupling::ON_CELLS,1,"x+y");
   //! [CppSnippet_MEDCouplingFieldDouble_getValueOnPos_1]
   //! [CppSnippet_MEDCouplingFieldDouble_getValueOnPos_2]
   double val11[1]; // 1 == field->getNumberOfComponents()
   field->getValueOnPos( 1,1,-1, val11 );
   // field values are located at cell barycenters
-  MEDCouplingAutoRefCountObjectPtr<DataArrayDouble> bc = mesh->getBarycenterAndOwner();
+  MCAuto<DataArrayDouble> bc = mesh->computeCellCenterOfMass();
   CPPUNIT_ASSERT( val11[0] == bc->getIJ(3,0) + bc->getIJ(3,1) );
   //! [CppSnippet_MEDCouplingFieldDouble_getValueOnPos_2]
 }
@@ -578,21 +579,21 @@ void CppExample_MEDCouplingFieldDouble_renumberNodes()
   using namespace MEDCoupling;
   //! [CppSnippet_MEDCouplingFieldDouble_renumberNodes_1]
   const double coords[4] = {0.,2.,4.};
-  MEDCouplingAutoRefCountObjectPtr<DataArrayDouble> coordsArr = DataArrayDouble::New();
+  MCAuto<DataArrayDouble> coordsArr = DataArrayDouble::New();
   coordsArr->useExternalArrayWithRWAccess( coords, 3, 1 );
-  MEDCouplingAutoRefCountObjectPtr<MEDCouplingCMesh> cmesh = MEDCouplingCMesh::New();
+  MCAuto<MEDCouplingCMesh> cmesh = MEDCouplingCMesh::New();
   cmesh->setCoords(coordsArr,coordsArr);
-  MEDCouplingAutoRefCountObjectPtr<MEDCouplingUMesh> mesh = cmesh->buildUnstructured();
+  MCAuto<MEDCouplingUMesh> mesh = cmesh->buildUnstructured();
   //! [CppSnippet_MEDCouplingFieldDouble_renumberNodes_1]
   //! [CppSnippet_MEDCouplingFieldDouble_renumberNodes_2]
-  MEDCouplingAutoRefCountObjectPtr<MEDCouplingFieldDouble> field =
+  MCAuto<MEDCouplingFieldDouble> field =
     mesh->fillFromAnalytic( MEDCoupling::ON_NODES,2,"IVec*x+JVec*y");
   const DataArrayDouble* values = field->getArray();
   const DataArrayDouble* nodeCoords = mesh->getCoords();
   CPPUNIT_ASSERT( values->isEqualWithoutConsideringStr( *nodeCoords, 1e-13 ));
   //! [CppSnippet_MEDCouplingFieldDouble_renumberNodes_2]
   //! [CppSnippet_MEDCouplingFieldDouble_renumberNodes_3]
-  const int renumber[9] = { 8, 7, 6, 5, 4, 3, 2, 1, 0 };
+  const mcIdType renumber[9] = { 8, 7, 6, 5, 4, 3, 2, 1, 0 };
   field->renumberNodes(renumber,false);
   const MEDCouplingMesh* mesh2 = field->getMesh(); // field now refers to another mesh
   values = field->getArray();
@@ -606,25 +607,25 @@ void CppExample_MEDCouplingFieldDouble_renumberCells()
   using namespace MEDCoupling;
   //! [CppSnippet_MEDCouplingFieldDouble_renumberCells_1]
   const double coords[4] = {0.,2.,4.};
-  MEDCouplingAutoRefCountObjectPtr<DataArrayDouble> coordsArr = DataArrayDouble::New();
+  MCAuto<DataArrayDouble> coordsArr = DataArrayDouble::New();
   coordsArr->useExternalArrayWithRWAccess( coords, 3, 1 );
-  MEDCouplingAutoRefCountObjectPtr<MEDCouplingCMesh> cmesh = MEDCouplingCMesh::New();
+  MCAuto<MEDCouplingCMesh> cmesh = MEDCouplingCMesh::New();
   cmesh->setCoords(coordsArr,coordsArr);
-  MEDCouplingAutoRefCountObjectPtr<MEDCouplingUMesh> mesh = cmesh->buildUnstructured();
+  MCAuto<MEDCouplingUMesh> mesh = cmesh->buildUnstructured();
   //! [CppSnippet_MEDCouplingFieldDouble_renumberCells_1]
   //! [CppSnippet_MEDCouplingFieldDouble_renumberCells_2]
-  MEDCouplingAutoRefCountObjectPtr<MEDCouplingFieldDouble> field =
+  MCAuto<MEDCouplingFieldDouble> field =
     mesh->fillFromAnalytic( MEDCoupling::ON_CELLS,2,"IVec*x+JVec*y");
   const DataArrayDouble* values = field->getArray();
-  MEDCouplingAutoRefCountObjectPtr<DataArrayDouble> bc = mesh->getBarycenterAndOwner();
+  MCAuto<DataArrayDouble> bc = mesh->computeCellCenterOfMass();
   CPPUNIT_ASSERT( values->isEqualWithoutConsideringStr( *bc, 1e-13 ));
   //! [CppSnippet_MEDCouplingFieldDouble_renumberCells_2]
   //! [CppSnippet_MEDCouplingFieldDouble_renumberCells_3]
-  const int renumber[4] = { 3, 2, 1, 0 };
+  const mcIdType renumber[4] = { 3, 2, 1, 0 };
   field->renumberCells(renumber,false);
   const MEDCouplingMesh* mesh2 = field->getMesh(); // field now refers to another mesh
   values = field->getArray();
-  bc = mesh2->getBarycenterAndOwner();
+  bc = mesh2->computeCellCenterOfMass();
   CPPUNIT_ASSERT( values->isEqualWithoutConsideringStr( *bc, 1e-13 ));
   //! [CppSnippet_MEDCouplingFieldDouble_renumberCells_3]
 }
@@ -634,16 +635,16 @@ void CppExample_MEDCouplingFieldDouble_buildNewTimeReprFromThis()
   using namespace MEDCoupling;
   //! [CppSnippet_MEDCouplingFieldDouble_buildNewTimeReprFromThis_1]
   const double coords[4] = {0.,2.,4.};
-  MEDCouplingAutoRefCountObjectPtr<DataArrayDouble> coordsArr = DataArrayDouble::New();
+  MCAuto<DataArrayDouble> coordsArr = DataArrayDouble::New();
   coordsArr->useExternalArrayWithRWAccess( coords, 3, 1 );
-  MEDCouplingAutoRefCountObjectPtr<MEDCouplingCMesh> mesh = MEDCouplingCMesh::New();
+  MCAuto<MEDCouplingCMesh> mesh = MEDCouplingCMesh::New();
   mesh->setCoords(coordsArr,coordsArr);
-  MEDCouplingAutoRefCountObjectPtr<MEDCouplingFieldDouble> field1 =
+  MCAuto<MEDCouplingFieldDouble> field1 =
     mesh->fillFromAnalytic( MEDCoupling::ON_NODES,1,"x+y");
   CPPUNIT_ASSERT( field1->getTimeDiscretization() == MEDCoupling::ONE_TIME );
   //! [CppSnippet_MEDCouplingFieldDouble_buildNewTimeReprFromThis_1]
   //! [CppSnippet_MEDCouplingFieldDouble_buildNewTimeReprFromThis_2]
-  MEDCouplingAutoRefCountObjectPtr<MEDCouplingFieldDouble> field2 =
+  MCAuto<MEDCouplingFieldDouble> field2 =
     field1->buildNewTimeReprFromThis( MEDCoupling::NO_TIME, false );
   CPPUNIT_ASSERT( field2->getTimeDiscretization() == MEDCoupling::NO_TIME );
   //! [CppSnippet_MEDCouplingFieldDouble_buildNewTimeReprFromThis_2]
@@ -654,27 +655,27 @@ void CppExample_MEDCouplingMesh_fillFromAnalytic3()
   using namespace MEDCoupling;
   //! [CppSnippet_MEDCouplingMesh_fillFromAnalytic3_1]
   const double coords[4] = {0.,2.,4.,6.}; // 6. is not used
-  MEDCouplingAutoRefCountObjectPtr<DataArrayDouble> x = DataArrayDouble::New();
+  MCAuto<DataArrayDouble> x = DataArrayDouble::New();
   x->useExternalArrayWithRWAccess( coords, 3, 1 );
-  MEDCouplingAutoRefCountObjectPtr<DataArrayDouble> y = DataArrayDouble::New();
+  MCAuto<DataArrayDouble> y = DataArrayDouble::New();
   y->useExternalArrayWithRWAccess( coords, 2, 1 );
-  MEDCouplingAutoRefCountObjectPtr<MEDCouplingCMesh> mesh=MEDCouplingCMesh::New();
+  MCAuto<MEDCouplingCMesh> mesh=MEDCouplingCMesh::New();
   mesh->setCoords(x,y);
   //! [CppSnippet_MEDCouplingMesh_fillFromAnalytic3_1]
   //! [CppSnippet_MEDCouplingMesh_fillFromAnalytic3_2]
   const char func[] = "IVec * b + JVec * a + KVec * sqrt( a*a + b*b ) + 10";
   const char* varNames[2] = { "a", "b" }; // names used to refer to X and Y coord components
   std::vector<std::string> varNamesVec( varNames, varNames+2 );
-  MEDCouplingAutoRefCountObjectPtr<MEDCouplingFieldDouble> field =
-    mesh->fillFromAnalytic3( MEDCoupling::ON_CELLS, 3, varNamesVec, func );
+  MCAuto<MEDCouplingFieldDouble> field =
+    mesh->fillFromAnalyticNamedCompo( MEDCoupling::ON_CELLS, 3, varNamesVec, func );
   //! [CppSnippet_MEDCouplingMesh_fillFromAnalytic3_2]
   //! [CppSnippet_MEDCouplingMesh_fillFromAnalytic3_3]
   double val1[3]; // a value (vector) of the cell #1
   CPPUNIT_ASSERT( field->getNumberOfComponents() == 3 ); // 3 components in the field
   field->getArray()->getTuple( 1, val1 );
   //
-  MEDCouplingAutoRefCountObjectPtr<DataArrayDouble> bc =
-    mesh->getBarycenterAndOwner(); // func is applied to barycenters of cells
+  MCAuto<DataArrayDouble> bc =
+    mesh->computeCellCenterOfMass(); // func is applied to barycenters of cells
   double bc1[2]; // coordinates of the second point
   bc->getTuple( 1, bc1 );
   //
@@ -690,27 +691,27 @@ void CppExample_MEDCouplingMesh_fillFromAnalytic2()
   using namespace MEDCoupling;
   //! [CppSnippet_MEDCouplingMesh_fillFromAnalytic2_1]
   const double coords[4] = {0.,2.,4.,6.}; // 6. is not used
-  MEDCouplingAutoRefCountObjectPtr<DataArrayDouble> x = DataArrayDouble::New();
+  MCAuto<DataArrayDouble> x = DataArrayDouble::New();
   x->useExternalArrayWithRWAccess( coords, 3, 1 );
-  MEDCouplingAutoRefCountObjectPtr<DataArrayDouble> y = DataArrayDouble::New();
+  MCAuto<DataArrayDouble> y = DataArrayDouble::New();
   y->useExternalArrayWithRWAccess( coords, 2, 1 );
   x->setInfoOnComponent(0,"a"); //  name used to refer to X coordinate within a function
   y->setInfoOnComponent(0,"b"); //  name used to refer to Y coordinate within a function
-  MEDCouplingAutoRefCountObjectPtr<MEDCouplingCMesh> mesh=MEDCouplingCMesh::New();
+  MCAuto<MEDCouplingCMesh> mesh=MEDCouplingCMesh::New();
   mesh->setCoords(x,y);
   //! [CppSnippet_MEDCouplingMesh_fillFromAnalytic2_1]
   //! [CppSnippet_MEDCouplingMesh_fillFromAnalytic2_2]
   const char func[] = "IVec * b + JVec * a + KVec * sqrt( a*a + b*b ) + 10";
-  MEDCouplingAutoRefCountObjectPtr<MEDCouplingFieldDouble> field =
-    mesh->fillFromAnalytic2( MEDCoupling::ON_CELLS, 3, func );
+  MCAuto<MEDCouplingFieldDouble> field =
+    mesh->fillFromAnalyticCompo( MEDCoupling::ON_CELLS, 3, func );
   //! [CppSnippet_MEDCouplingMesh_fillFromAnalytic2_2]
   //! [CppSnippet_MEDCouplingMesh_fillFromAnalytic2_3]
   double val1[3]; // a value (vector) of the cell #1
   CPPUNIT_ASSERT( field->getNumberOfComponents() == 3 ); // 3 components in the field
   field->getArray()->getTuple( 1, val1 );
   //
-  MEDCouplingAutoRefCountObjectPtr<DataArrayDouble> bc =
-    mesh->getBarycenterAndOwner(); // func is applied to barycenters of cells
+  MCAuto<DataArrayDouble> bc =
+    mesh->computeCellCenterOfMass(); // func is applied to barycenters of cells
   double bc1[2]; // coordinates of the second point
   bc->getTuple( 1, bc1 );
   //
@@ -726,16 +727,16 @@ void CppExample_MEDCouplingMesh_fillFromAnalytic()
   using namespace MEDCoupling;
   //! [CppSnippet_MEDCouplingMesh_fillFromAnalytic_1]
   const double coords[4] = {0.,2.,4.,6.}; // 6. is not used
-  MEDCouplingAutoRefCountObjectPtr<DataArrayDouble> x = DataArrayDouble::New();
+  MCAuto<DataArrayDouble> x = DataArrayDouble::New();
   x->useExternalArrayWithRWAccess( coords, 3, 1 );
-  MEDCouplingAutoRefCountObjectPtr<DataArrayDouble> y = DataArrayDouble::New();
+  MCAuto<DataArrayDouble> y = DataArrayDouble::New();
   y->useExternalArrayWithRWAccess( coords, 2, 1 );
-  MEDCouplingAutoRefCountObjectPtr<MEDCouplingCMesh> mesh=MEDCouplingCMesh::New();
+  MCAuto<MEDCouplingCMesh> mesh=MEDCouplingCMesh::New();
   mesh->setCoords(x,y);
   //! [CppSnippet_MEDCouplingMesh_fillFromAnalytic_1]
   //! [CppSnippet_MEDCouplingMesh_fillFromAnalytic_2]
   const char func[] = "IVec * b + JVec * a + KVec * sqrt( a*a + b*b ) + 10";
-  MEDCouplingAutoRefCountObjectPtr<MEDCouplingFieldDouble> field =
+  MCAuto<MEDCouplingFieldDouble> field =
     mesh->fillFromAnalytic( MEDCoupling::ON_CELLS, 3, func );
   //! [CppSnippet_MEDCouplingMesh_fillFromAnalytic_2]
   //! [CppSnippet_MEDCouplingMesh_fillFromAnalytic_3]
@@ -743,8 +744,8 @@ void CppExample_MEDCouplingMesh_fillFromAnalytic()
   CPPUNIT_ASSERT( field->getNumberOfComponents() == 3 ); // 3 components in the field
   field->getArray()->getTuple( 1, val1 );
   //
-  MEDCouplingAutoRefCountObjectPtr<DataArrayDouble> bc =
-    mesh->getBarycenterAndOwner(); // func is applied to barycenters of cells
+  MCAuto<DataArrayDouble> bc =
+    mesh->computeCellCenterOfMass(); // func is applied to barycenters of cells
   double bc1[2]; // coordinates of the second point
   bc->getTuple( 1, bc1 );
   //
@@ -760,9 +761,9 @@ void CppExample_MEDCouplingCMesh_getCoordsAt()
   using namespace MEDCoupling;
   //! [CppSnippet_MEDCouplingCMesh_getCoordsAt_1]
   const double coords[3] = {1.,2.,4.};
-  MEDCouplingAutoRefCountObjectPtr<DataArrayDouble> x = DataArrayDouble::New();
+  MCAuto<DataArrayDouble> x = DataArrayDouble::New();
   x->useExternalArrayWithRWAccess( coords, 3, 1 );
-  MEDCouplingAutoRefCountObjectPtr<MEDCouplingCMesh> mesh=MEDCouplingCMesh::New();
+  MCAuto<MEDCouplingCMesh> mesh=MEDCouplingCMesh::New();
   mesh->setCoordsAt(0,x);
   const DataArrayDouble* x2=mesh->getCoordsAt(0);
   CPPUNIT_ASSERT( x2->isEqual( *x, 1e-13 ));
@@ -773,30 +774,30 @@ void CppExample_MEDCouplingUMesh_areCellsIncludedIn()
 {
   using namespace MEDCoupling;
   //! [CppSnippet_MEDCouplingUMesh_areCellsIncludedIn_1]
-  MEDCouplingAutoRefCountObjectPtr<MEDCouplingUMesh> mesh1=MEDCouplingUMesh::New();
+  MCAuto<MEDCouplingUMesh> mesh1=MEDCouplingUMesh::New();
   mesh1->setMeshDimension(2);
   mesh1->allocateCells(5);
-  const int conn[18]={0,3,4,1, 1,4,2, 4,5,2, 6,7,4,3, 7,8,5,4};
+  const mcIdType conn[18]={0,3,4,1, 1,4,2, 4,5,2, 6,7,4,3, 7,8,5,4};
   mesh1->insertNextCell(INTERP_KERNEL::NORM_QUAD4,4,conn);    // #0
   mesh1->insertNextCell(INTERP_KERNEL::NORM_TRI3,3, conn+4);  // #1
   mesh1->insertNextCell(INTERP_KERNEL::NORM_TRI3,3, conn+7);  // #2
   mesh1->insertNextCell(INTERP_KERNEL::NORM_QUAD4,4,conn+10); // #3
   mesh1->insertNextCell(INTERP_KERNEL::NORM_QUAD4,4,conn+14); // #4
   mesh1->finishInsertingCells();
-  MEDCouplingAutoRefCountObjectPtr<DataArrayDouble> coordsArr=DataArrayDouble::New();
+  MCAuto<DataArrayDouble> coordsArr=DataArrayDouble::New();
   coordsArr->alloc(9,2);
   const double coords[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 };
   std::copy(coords,coords+18,coordsArr->getPointer());
   mesh1->setCoords(coordsArr);
   //! [CppSnippet_MEDCouplingUMesh_areCellsIncludedIn_1]
   //! [CppSnippet_MEDCouplingUMesh_areCellsIncludedIn_2]
-  const int cells2[3] = { 4,2,0 }; // even cells selected
-  MEDCouplingAutoRefCountObjectPtr<MEDCouplingUMesh> mesh2 =
+  const mcIdType cells2[3] = { 4,2,0 }; // even cells selected
+  MCAuto<MEDCouplingUMesh> mesh2 =
     (MEDCouplingUMesh*) mesh1->buildPartOfMySelf( cells2, cells2+3, true );
   //! [CppSnippet_MEDCouplingUMesh_areCellsIncludedIn_2]
   //! [CppSnippet_MEDCouplingUMesh_areCellsIncludedIn_3]
   int compType = 0; // the strongest policy
-  DataArrayInt *corr2to1, *corr1to2;
+  DataArrayIdType *corr2to1, *corr1to2;
   // a larger mesh1 includes a smaller mesh2
   CPPUNIT_ASSERT( mesh1->areCellsIncludedIn( mesh2, compType, corr2to1 ));
   CPPUNIT_ASSERT( std::equal( cells2, cells2+3, corr2to1->getConstPointer() ));
@@ -804,7 +805,7 @@ void CppExample_MEDCouplingUMesh_areCellsIncludedIn()
   //! [CppSnippet_MEDCouplingUMesh_areCellsIncludedIn_4]
   // the smaller mesh2 does NOT include the larger mesh1
   CPPUNIT_ASSERT( ! mesh2->areCellsIncludedIn( mesh1, compType, corr1to2 ));
-  const int corr1to2Expected[5] = {2, 3, 1, 4, 0};
+  const mcIdType corr1to2Expected[5] = {2, 3, 1, 4, 0};
   CPPUNIT_ASSERT(std::equal( corr1to2Expected, corr1to2Expected+5, corr1to2->getConstPointer() ));
   //! [CppSnippet_MEDCouplingUMesh_areCellsIncludedIn_4]
   corr2to1->decrRef();
@@ -817,27 +818,27 @@ void CppExample_MEDCouplingUMesh_findAndCorrectBadOriented3DExtrudedCells()
   //! [CppSnippet_MEDCouplingUMesh_findAndCorrectBadOriented3DExtrudedCells_1]
   // 2D coordinates of 5 base nodes
   const double coords[5*2]={-0.3,-0.3, 0.2,-0.3, 0.7,-0.3, -0.3,0.2, 0.2,0.2 };
-  MEDCouplingAutoRefCountObjectPtr<DataArrayDouble> coordsArr=DataArrayDouble::New();
+  MCAuto<DataArrayDouble> coordsArr=DataArrayDouble::New();
   coordsArr->useExternalArrayWithRWAccess( coords, 5, 2 );
   // coordinates of 5 top nodes
-  MEDCouplingAutoRefCountObjectPtr<DataArrayDouble> coordsArr2 = coordsArr->deepCpy();
+  MCAuto<DataArrayDouble> coordsArr2 = coordsArr->deepCopy();
   // 3D coordinates of base + top nodes
   coordsArr  = coordsArr-> changeNbOfComponents( 3, 0 );
   coordsArr2 = coordsArr2->changeNbOfComponents( 3, 1 );
   coordsArr = DataArrayDouble::Aggregate( coordsArr, coordsArr2 );
   // mesh
-  MEDCouplingAutoRefCountObjectPtr<MEDCouplingUMesh> mesh=MEDCouplingUMesh::New();
+  MCAuto<MEDCouplingUMesh> mesh=MEDCouplingUMesh::New();
   mesh->setCoords(coordsArr);
   mesh->setMeshDimension(3);
   mesh->allocateCells(2);
   // connectivity of reversed HEXA8 and PENTA6
-  const int conn[8+6]={0,1,4,3, 5,6,9,8, 1,2,4, 6,7,9};
+  const mcIdType conn[8+6]={0,1,4,3, 5,6,9,8, 1,2,4, 6,7,9};
   mesh->insertNextCell(INTERP_KERNEL::NORM_HEXA8, 8,conn+0);
   mesh->insertNextCell(INTERP_KERNEL::NORM_PENTA6,6,conn+8);
   mesh->finishInsertingCells();
   //! [CppSnippet_MEDCouplingUMesh_findAndCorrectBadOriented3DExtrudedCells_1]
   //! [CppSnippet_MEDCouplingUMesh_findAndCorrectBadOriented3DExtrudedCells_2]
-  MEDCouplingAutoRefCountObjectPtr<DataArrayInt> fixedCells =
+  MCAuto<DataArrayIdType> fixedCells =
     mesh->findAndCorrectBadOriented3DExtrudedCells();
   CPPUNIT_ASSERT( fixedCells->getNumberOfTuples() == 2 ); // 2 cells fixed
   fixedCells = mesh->findAndCorrectBadOriented3DExtrudedCells();
@@ -851,21 +852,21 @@ void CppExample_MEDCouplingUMesh_arePolyhedronsNotCorrectlyOriented()
   //! [CppSnippet_MEDCouplingUMesh_arePolyhedronsNotCorrectlyOriented_1]
   // 2D coordinates of 5 base nodes
   const double coords[5*2]={-0.3,-0.3, 0.2,-0.3, 0.7,-0.3, -0.3,0.2, 0.2,0.2 };
-  MEDCouplingAutoRefCountObjectPtr<DataArrayDouble> coordsArr=DataArrayDouble::New();
+  MCAuto<DataArrayDouble> coordsArr=DataArrayDouble::New();
   coordsArr->useExternalArrayWithRWAccess( coords, 5, 2 );
   // coordinates of 5 top nodes
-  MEDCouplingAutoRefCountObjectPtr<DataArrayDouble> coordsArr2 = coordsArr->deepCpy();
+  MCAuto<DataArrayDouble> coordsArr2 = coordsArr->deepCopy();
   // 3D coordinates of base + top nodes
   coordsArr  = coordsArr-> changeNbOfComponents( 3, 0 );
   coordsArr2 = coordsArr2->changeNbOfComponents( 3, 1 );
   coordsArr = DataArrayDouble::Aggregate( coordsArr, coordsArr2 );
   // mesh
-  MEDCouplingAutoRefCountObjectPtr<MEDCouplingUMesh> mesh=MEDCouplingUMesh::New();
+  MCAuto<MEDCouplingUMesh> mesh=MEDCouplingUMesh::New();
   mesh->setCoords(coordsArr);
   mesh->setMeshDimension(3);
   mesh->allocateCells(2);
   // connectivity of a HEXA8 + a reversed PENTA6
-  const int conn[8+6]={0,3,4,1, 5,8,9,6, 1,2,4, 6,7,9};
+  const mcIdType conn[8+6]={0,3,4,1, 5,8,9,6, 1,2,4, 6,7,9};
   mesh->insertNextCell(INTERP_KERNEL::NORM_POLYHED,8,conn); //  "extruded" polyhedron
   mesh->insertNextCell(INTERP_KERNEL::NORM_POLYHED,6,conn+8);
   mesh->finishInsertingCells();
@@ -873,7 +874,7 @@ void CppExample_MEDCouplingUMesh_arePolyhedronsNotCorrectlyOriented()
   mesh->convertExtrudedPolyhedra();
   //! [CppSnippet_MEDCouplingUMesh_arePolyhedronsNotCorrectlyOriented_1]
   //! [CppSnippet_MEDCouplingUMesh_arePolyhedronsNotCorrectlyOriented_2]
-  std::vector<int> badCellIds;
+  std::vector<mcIdType> badCellIds;
   mesh->arePolyhedronsNotCorrectlyOriented( badCellIds );
   CPPUNIT_ASSERT( badCellIds.size() == 1 ); //  one polyhedron is KO
   // fix invalid rolyherdons
@@ -889,17 +890,17 @@ void CppExample_MEDCouplingUMesh_are2DCellsNotCorrectlyOriented()
 {
   using namespace MEDCoupling;
   //! [CppSnippet_MEDCouplingUMesh_are2DCellsNotCorrectlyOriented_1]
-  MEDCouplingAutoRefCountObjectPtr<MEDCouplingUMesh> mesh=MEDCouplingUMesh::New();
+  MCAuto<MEDCouplingUMesh> mesh=MEDCouplingUMesh::New();
   mesh->setMeshDimension(2);
   mesh->allocateCells(5);
-  const int conn[18]={0,3,4,1, 1,2,4, 4,5,2, 6,7,4,3, 7,8,5,4};
+  const mcIdType conn[18]={0,3,4,1, 1,2,4, 4,5,2, 6,7,4,3, 7,8,5,4};
   mesh->insertNextCell(INTERP_KERNEL::NORM_QUAD4,4,conn);    // 0
   mesh->insertNextCell(INTERP_KERNEL::NORM_TRI3,3, conn+4);  // 1
   mesh->insertNextCell(INTERP_KERNEL::NORM_TRI3,3, conn+7);  // 2
   mesh->insertNextCell(INTERP_KERNEL::NORM_QUAD4,4,conn+10); // 3
   mesh->insertNextCell(INTERP_KERNEL::NORM_QUAD4,4,conn+14); // 4
   mesh->finishInsertingCells();
-  MEDCouplingAutoRefCountObjectPtr<DataArrayDouble> coordsArr=DataArrayDouble::New();
+  MCAuto<DataArrayDouble> coordsArr=DataArrayDouble::New();
   coordsArr->alloc(9,2);
   const double coords[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 };
   std::copy(coords,coords+18,coordsArr->getPointer());
@@ -908,7 +909,7 @@ void CppExample_MEDCouplingUMesh_are2DCellsNotCorrectlyOriented()
   //! [CppSnippet_MEDCouplingUMesh_are2DCellsNotCorrectlyOriented_1]
   //! [CppSnippet_MEDCouplingUMesh_are2DCellsNotCorrectlyOriented_2]
   const double vec[3] = {0.,0.,-1.};
-  std::vector<int> badCellIds;
+  std::vector<mcIdType> badCellIds;
   mesh->are2DCellsNotCorrectlyOriented( vec, false, badCellIds );
   CPPUNIT_ASSERT( badCellIds.size() == 1 ); //  one cell is reversed
   // fix orientation
@@ -918,23 +919,34 @@ void CppExample_MEDCouplingUMesh_are2DCellsNotCorrectlyOriented()
   mesh->are2DCellsNotCorrectlyOriented( vec, false, badCellIds );
   CPPUNIT_ASSERT( badCellIds.size() == 0 ); // the orientation is OK
   //! [CppSnippet_MEDCouplingUMesh_are2DCellsNotCorrectlyOriented_2]
+  //! [CppSnippet_MEDCouplingUMesh_are2DCellsNotCorrectlyOriented_3]
+  mesh->orientCorrectly2DCells();
+  //! [CppSnippet_MEDCouplingUMesh_are2DCellsNotCorrectlyOriented_3]
+  //! [CppSnippet_MEDCouplingUMesh_are2DCellsNotCorrectlyOriented_4]
+  const mcIdType refCells[] = { 0,2 };
+  const mcIdType objCells[] = { 1,3 };
+  MCAuto<MEDCouplingUMesh> refGroup = mesh->buildPartOfMySelf( refCells, refCells + 2 );
+  MCAuto<MEDCouplingUMesh> objGroup = mesh->buildPartOfMySelf( objCells, objCells + 2 );
+  objGroup->orientCorrectly2DCells( refGroup );
+  mesh->setPartOfMySelf( objCells, objCells + 2, *objGroup );
+  //! [CppSnippet_MEDCouplingUMesh_are2DCellsNotCorrectlyOriented_4]
 }
 
 void CppExample_MEDCouplingUMesh_getCellsContainingPoints()
 {
   using namespace MEDCoupling;
   //! [CppSnippet_MEDCouplingUMesh_getCellsContainingPoints_1]
-  MEDCouplingAutoRefCountObjectPtr<MEDCouplingUMesh> mesh=MEDCouplingUMesh::New();
+  MCAuto<MEDCouplingUMesh> mesh=MEDCouplingUMesh::New();
   mesh->setMeshDimension(2);
   mesh->allocateCells(5);
-  const int conn[18]={0,3,4,1, 1,4,2, 4,5,2, 6,7,4,3, 7,8,5,4};
+  const mcIdType conn[18]={0,3,4,1, 1,4,2, 4,5,2, 6,7,4,3, 7,8,5,4};
   mesh->insertNextCell(INTERP_KERNEL::NORM_QUAD4,4,conn);   
   mesh->insertNextCell(INTERP_KERNEL::NORM_TRI3,3, conn+4); 
   mesh->insertNextCell(INTERP_KERNEL::NORM_TRI3,3, conn+7); 
   mesh->insertNextCell(INTERP_KERNEL::NORM_QUAD4,4,conn+10);
   mesh->insertNextCell(INTERP_KERNEL::NORM_QUAD4,4,conn+14);
   mesh->finishInsertingCells();
-  MEDCouplingAutoRefCountObjectPtr<DataArrayDouble> coordsArr=DataArrayDouble::New();
+  MCAuto<DataArrayDouble> coordsArr=DataArrayDouble::New();
   coordsArr->alloc(9,2);
   const double coords[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 };
   std::copy(coords,coords+18,coordsArr->getPointer());
@@ -945,10 +957,10 @@ void CppExample_MEDCouplingUMesh_getCellsContainingPoints()
                             0.3, 0.3,              // point located somewhere inside the mesh
                             coords[2], coords[3]}; // point at the node #1
   const double eps = 1e-4; // ball radius
-  MEDCouplingAutoRefCountObjectPtr<DataArrayInt> cells, cellsIndex;
+  MCAuto<DataArrayIdType> cells, cellsIndex;
   mesh->getCellsContainingPoints( pos, 3, eps, cells, cellsIndex );
-  const int cellsExpected[3]={4, 0, 1};
-  const int cellsIndexExpected[4]={0, 0, 1, 3};
+  const mcIdType cellsExpected[3]={4, 0, 1};
+  const mcIdType cellsIndexExpected[4]={0, 0, 1, 3};
   CPPUNIT_ASSERT(std::equal( cellsExpected,      cellsExpected+3,      cells->begin()));
   CPPUNIT_ASSERT(std::equal( cellsIndexExpected, cellsIndexExpected+4, cellsIndex->begin()));
   //! [CppSnippet_MEDCouplingUMesh_getCellsContainingPoints_2]
@@ -958,17 +970,17 @@ void CppExample_MEDCouplingUMesh_getCellsContainingPoint()
 {
   using namespace MEDCoupling;
   //! [CppSnippet_MEDCouplingUMesh_getCellsContainingPoint_1]
-  MEDCouplingAutoRefCountObjectPtr<MEDCouplingUMesh> mesh=MEDCouplingUMesh::New();
+  MCAuto<MEDCouplingUMesh> mesh=MEDCouplingUMesh::New();
   mesh->setMeshDimension(2);
   mesh->allocateCells(5);
-  const int conn[18]={0,3,4,1, 1,4,2, 4,5,2, 6,7,4,3, 7,8,5,4};
+  const mcIdType conn[18]={0,3,4,1, 1,4,2, 4,5,2, 6,7,4,3, 7,8,5,4};
   mesh->insertNextCell(INTERP_KERNEL::NORM_QUAD4,4,conn);    // 0
   mesh->insertNextCell(INTERP_KERNEL::NORM_TRI3,3, conn+4);  // 1
   mesh->insertNextCell(INTERP_KERNEL::NORM_TRI3,3, conn+7);  // 2
   mesh->insertNextCell(INTERP_KERNEL::NORM_QUAD4,4,conn+10); // 3
   mesh->insertNextCell(INTERP_KERNEL::NORM_QUAD4,4,conn+14); // 4
   mesh->finishInsertingCells();
-  MEDCouplingAutoRefCountObjectPtr<DataArrayDouble> coordsArr=DataArrayDouble::New();
+  MCAuto<DataArrayDouble> coordsArr=DataArrayDouble::New();
   coordsArr->alloc(9,2);
   const double coords[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 };
   std::copy(coords,coords+18,coordsArr->getPointer());
@@ -978,9 +990,9 @@ void CppExample_MEDCouplingUMesh_getCellsContainingPoint()
   const double* coords4  = coords + 4*2; // coordinates of the node #4
   const double eps = 1e-4; // ball radius
   const double pos[2] = { coords4[0] + eps, coords4[1] - eps }; // ball center
-  std::vector<int> cellIds;
+  std::vector<mcIdType> cellIds;
   mesh->getCellsContainingPoint( pos, eps, cellIds );
-  CPPUNIT_ASSERT ( (int)cellIds.size() == mesh->getNumberOfCells() );
+  CPPUNIT_ASSERT ( ToIdType(cellIds.size()) == mesh->getNumberOfCells() );
   //! [CppSnippet_MEDCouplingUMesh_getCellsContainingPoint_2]
 }
 
@@ -988,25 +1000,25 @@ void CppExample_MEDCouplingUMesh_buildPartOrthogonalField()
 {
   using namespace MEDCoupling;
   //! [CppSnippet_MEDCouplingUMesh_buildPartOrthogonalField_1]
-  MEDCouplingAutoRefCountObjectPtr<MEDCouplingUMesh> mesh=MEDCouplingUMesh::New();
+  MCAuto<MEDCouplingUMesh> mesh=MEDCouplingUMesh::New();
   mesh->setMeshDimension(2);
   mesh->allocateCells(5);
-  const int conn[18]={0,3,4,1, 1,4,2, 4,5,2, 6,7,4,3, 7,8,5,4};
+  const mcIdType conn[18]={0,3,4,1, 1,4,2, 4,5,2, 6,7,4,3, 7,8,5,4};
   mesh->insertNextCell(INTERP_KERNEL::NORM_QUAD4,4,conn);    // 0
   mesh->insertNextCell(INTERP_KERNEL::NORM_TRI3,3, conn+4);  // 1
   mesh->insertNextCell(INTERP_KERNEL::NORM_TRI3,3, conn+7);  // 2
   mesh->insertNextCell(INTERP_KERNEL::NORM_QUAD4,4,conn+10); // 3
   mesh->insertNextCell(INTERP_KERNEL::NORM_QUAD4,4,conn+14); // 4
   mesh->finishInsertingCells();
-  MEDCouplingAutoRefCountObjectPtr<DataArrayDouble> coordsArr=DataArrayDouble::New();
+  MCAuto<DataArrayDouble> coordsArr=DataArrayDouble::New();
   coordsArr->alloc(9,2);
   const double coords[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 };
   std::copy(coords,coords+18,coordsArr->getPointer());
   mesh->setCoords(coordsArr);
   //! [CppSnippet_MEDCouplingUMesh_buildPartOrthogonalField_1]
   //! [CppSnippet_MEDCouplingUMesh_buildPartOrthogonalField_2]
-  const int part[4] = {1,2,3,4}; // cell #0 is omitted
-  MEDCouplingAutoRefCountObjectPtr<MEDCouplingFieldDouble> vecField=
+  const mcIdType part[4] = {1,2,3,4}; // cell #0 is omitted
+  MCAuto<MEDCouplingFieldDouble> vecField=
     mesh->buildPartOrthogonalField( part, part+4 );
   CPPUNIT_ASSERT ( vecField->getArray()->getNumberOfTuples() == 4 );
   CPPUNIT_ASSERT ( vecField->getArray()->getNumberOfComponents() == 3 );
@@ -1017,17 +1029,17 @@ void CppExample_MEDCouplingUMesh_getPartMeasureField()
 {
   using namespace MEDCoupling;
   //! [CppSnippet_MEDCouplingUMesh_getPartMeasureField_1]
-  MEDCouplingAutoRefCountObjectPtr<MEDCouplingUMesh> mesh=MEDCouplingUMesh::New();
+  MCAuto<MEDCouplingUMesh> mesh=MEDCouplingUMesh::New();
   mesh->setMeshDimension(2);
   mesh->allocateCells(5);
-  const int conn[18]={0,3,4,1, 1,2,4, 4,5,2, 6,7,4,3, 7,8,5,4};
+  const mcIdType conn[18]={0,3,4,1, 1,2,4, 4,5,2, 6,7,4,3, 7,8,5,4};
   mesh->insertNextCell(INTERP_KERNEL::NORM_QUAD4,4,conn);    // 0
   mesh->insertNextCell(INTERP_KERNEL::NORM_TRI3,3, conn+4);  // 1
   mesh->insertNextCell(INTERP_KERNEL::NORM_TRI3,3, conn+7);  // 2
   mesh->insertNextCell(INTERP_KERNEL::NORM_QUAD4,4,conn+10); // 3
   mesh->insertNextCell(INTERP_KERNEL::NORM_QUAD4,4,conn+14); // 4
   mesh->finishInsertingCells();
-  MEDCouplingAutoRefCountObjectPtr<DataArrayDouble> coordsArr=DataArrayDouble::New();
+  MCAuto<DataArrayDouble> coordsArr=DataArrayDouble::New();
   coordsArr->alloc(9,2);
   const double coords[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 };
   std::copy(coords,coords+18,coordsArr->getPointer());
@@ -1035,8 +1047,8 @@ void CppExample_MEDCouplingUMesh_getPartMeasureField()
   //! [CppSnippet_MEDCouplingUMesh_getPartMeasureField_1]
   //! [CppSnippet_MEDCouplingUMesh_getPartMeasureField_2]
   const bool isAbs = true;
-  const int part[4] = {1,2,3,4}; // cell #0 is omitted
-  MEDCouplingAutoRefCountObjectPtr<DataArrayDouble> areaArr=
+  const mcIdType part[4] = {1,2,3,4}; // cell #0 is omitted
+  MCAuto<DataArrayDouble> areaArr=
     mesh->getPartMeasureField( isAbs, part, part+4 );
   CPPUNIT_ASSERT( areaArr->getIJ(0,0) > 0 ); // orientation ignored
   areaArr=mesh->getPartMeasureField( !isAbs, part, part+4 );
@@ -1044,11 +1056,11 @@ void CppExample_MEDCouplingUMesh_getPartMeasureField()
   CPPUNIT_ASSERT ( areaArr->getNumberOfTuples() == 4 );
   //! [CppSnippet_MEDCouplingUMesh_getPartMeasureField_2]
   //! [CppSnippet_MEDCouplingUMesh_getPartMeasureField_3]
-  const int cellIds[4] = {1,2,3,4}; // cell #0 is omitted
-  MEDCouplingAutoRefCountObjectPtr<DataArrayDouble> baryCenters=
+  const mcIdType cellIds[4] = {1,2,3,4}; // cell #0 is omitted
+  MCAuto<DataArrayDouble> baryCenters=
     mesh->getPartBarycenterAndOwner( cellIds, cellIds+4 );
   CPPUNIT_ASSERT( baryCenters->getNumberOfTuples() == 4 );
-  CPPUNIT_ASSERT( baryCenters->getNumberOfComponents() == mesh->getSpaceDimension() );
+  CPPUNIT_ASSERT( (int)baryCenters->getNumberOfComponents() == mesh->getSpaceDimension() );
   //! [CppSnippet_MEDCouplingUMesh_getPartMeasureField_3]
 }
 
@@ -1056,21 +1068,21 @@ void CppExample_MEDCouplingUMesh_getCellsInBoundingBox()
 {
   using namespace MEDCoupling;
   //! [CppSnippet_MEDCouplingUMesh_getCellsInBoundingBox_1]
-  MEDCouplingAutoRefCountObjectPtr<MEDCouplingUMesh> mesh=MEDCouplingUMesh::New();
+  MCAuto<MEDCouplingUMesh> mesh=MEDCouplingUMesh::New();
   mesh->setMeshDimension(2);
   mesh->allocateCells(1);
   const double coords[3*2]={0.,0., 0.,1., 1.,1};
-  MEDCouplingAutoRefCountObjectPtr<DataArrayDouble> coordsArr=DataArrayDouble::New();
+  MCAuto<DataArrayDouble> coordsArr=DataArrayDouble::New();
   coordsArr->useExternalArrayWithRWAccess(coords, 3,2);
   mesh->setCoords(coordsArr);
   mesh->allocateCells(1);
-  const int conn[3]={0,1,2};
+  const mcIdType conn[3]={0,1,2};
   mesh->insertNextCell(INTERP_KERNEL::NORM_TRI3,3,conn);
   mesh->finishInsertingCells();
   //! [CppSnippet_MEDCouplingUMesh_getCellsInBoundingBox_1]
   //! [CppSnippet_MEDCouplingUMesh_getCellsInBoundingBox_2]
   const double bbox[] = {1., 1., 1.001,1.001}; // xMin, xMax, yMin, yMax
-  MEDCouplingAutoRefCountObjectPtr<DataArrayInt> cellIdsArr =
+  MCAuto<DataArrayIdType> cellIdsArr =
     mesh->getCellsInBoundingBox( bbox, 0.0 );
   CPPUNIT_ASSERT( cellIdsArr->getNumberOfTuples() == 0 );
   cellIdsArr = mesh->getCellsInBoundingBox( bbox, 0.1 );
@@ -1082,18 +1094,18 @@ void CppExample_MEDCouplingUMesh_renumberNodesInConn()
 {
   using namespace MEDCoupling;
   //! [CppSnippet_MEDCouplingUMesh_renumberNodesInConn_1]
-  MEDCouplingAutoRefCountObjectPtr<MEDCouplingUMesh> mesh=MEDCouplingUMesh::New();
+  MCAuto<MEDCouplingUMesh> mesh=MEDCouplingUMesh::New();
   mesh->setMeshDimension(2);
   mesh->allocateCells(1);
-  const int conn[4]={4,3,2,1};
+  const mcIdType conn[4]={4,3,2,1};
   mesh->insertNextCell(INTERP_KERNEL::NORM_QUAD4,4,conn);
   mesh->finishInsertingCells();
   //! [CppSnippet_MEDCouplingUMesh_renumberNodesInConn_1]
   //! [CppSnippet_MEDCouplingUMesh_renumberNodesInConn_2]
-  const int old2newIds[] = {-1,3,2,1,0};
+  const mcIdType old2newIds[] = {-1,3,2,1,0};
   mesh->renumberNodesInConn( old2newIds );
-  const int nodes0Expected[] = {0,1,2,3};
-  std::vector<int> nodes0;
+  const mcIdType nodes0Expected[] = {0,1,2,3};
+  std::vector<mcIdType> nodes0;
   mesh->getNodeIdsOfCell( 0, nodes0 );
   CPPUNIT_ASSERT(std::equal( nodes0Expected, nodes0Expected+4, &nodes0[0] ));
   //! [CppSnippet_MEDCouplingUMesh_renumberNodesInConn_2]
@@ -1103,31 +1115,31 @@ void CppExample_MEDCouplingUMesh_renumberNodes()
 {
   using namespace MEDCoupling;
   //! [CppSnippet_MEDCouplingUMesh_renumberNodes_1]
-  MEDCouplingAutoRefCountObjectPtr<MEDCouplingUMesh> mesh=MEDCouplingUMesh::New();
+  MCAuto<MEDCouplingUMesh> mesh=MEDCouplingUMesh::New();
   mesh->setMeshDimension(2);
   const double coords[4*2]={-0.3,-0.3, 0.2,-0.3, 0.7,-0.3, -0.3,0.3};
-  MEDCouplingAutoRefCountObjectPtr<DataArrayDouble> coordsArr=DataArrayDouble::New();
+  MCAuto<DataArrayDouble> coordsArr=DataArrayDouble::New();
   coordsArr->useExternalArrayWithRWAccess(coords, 4,2);
   mesh->setCoords(coordsArr);
   mesh->allocateCells(0);
   mesh->finishInsertingCells();
   //! [CppSnippet_MEDCouplingUMesh_renumberNodes_1]
   //! [CppSnippet_MEDCouplingUMesh_renumberNodes_2]
-  const int newIds[] = { 2,1,0,-1 };
+  const mcIdType newIds[] = { 2,1,0,-1 };
   mesh->renumberNodes(newIds, 3);
   coordsArr = mesh->getCoordinatesAndOwner(); // get a shorten array
   const double coordsExpected[3*2]={0.7,-0.3, 0.2,-0.3, -0.3,-0.3};
-  MEDCouplingAutoRefCountObjectPtr<DataArrayDouble> coordsExpectedArr=DataArrayDouble::New();
+  MCAuto<DataArrayDouble> coordsExpectedArr=DataArrayDouble::New();
   coordsExpectedArr->useExternalArrayWithRWAccess(coordsExpected, 3,2);
   CPPUNIT_ASSERT( coordsExpectedArr->isEqual( *coordsArr, 1e-13 ));
   //! [CppSnippet_MEDCouplingUMesh_renumberNodes_2]
   //! [CppSnippet_MEDCouplingUMesh_renumberNodes_3]
   coordsArr->useExternalArrayWithRWAccess(coords, 4,2); // restore old nodes
-  const int newIds2[] = { 2,1,0,2 };
-  mesh->renumberNodes2(newIds2, 3);
+  const mcIdType newIds2[] = { 2,1,0,2 };
+  mesh->renumberNodesCenter(newIds2, 3);
   coordsArr = mesh->getCoordinatesAndOwner(); // get a shorten array
   const double coordsExpected2[3*2]={0.7,-0.3, 0.2,-0.3, -0.3, 0.0};
-  MEDCouplingAutoRefCountObjectPtr<DataArrayDouble> coordsExpectedArr2=DataArrayDouble::New();
+  MCAuto<DataArrayDouble> coordsExpectedArr2=DataArrayDouble::New();
   coordsExpectedArr2->useExternalArrayWithRWAccess(coordsExpected2, 3,2);
   CPPUNIT_ASSERT( coordsExpectedArr2->isEqual( *coordsArr, 1e-13 ));
   //! [CppSnippet_MEDCouplingUMesh_renumberNodes_3]
@@ -1137,24 +1149,24 @@ void CppExample_MEDCouplingUMesh_findBoundaryNodes()
 {
   using namespace MEDCoupling;
   //! [CppSnippet_MEDCouplingUMesh_findBoundaryNodes_1]
-  MEDCouplingAutoRefCountObjectPtr<MEDCouplingUMesh> mesh=MEDCouplingUMesh::New();
+  MCAuto<MEDCouplingUMesh> mesh=MEDCouplingUMesh::New();
   mesh->setMeshDimension(2);
   mesh->allocateCells(5);
-  const int conn[18]={0,3,4,1, 1,4,2, 4,5,2, 6,7,4,3, 7,8,5,4};
+  const mcIdType conn[18]={0,3,4,1, 1,4,2, 4,5,2, 6,7,4,3, 7,8,5,4};
   mesh->insertNextCell(INTERP_KERNEL::NORM_QUAD4,4,conn);   
   mesh->insertNextCell(INTERP_KERNEL::NORM_TRI3,3, conn+4); 
   mesh->insertNextCell(INTERP_KERNEL::NORM_TRI3,3, conn+7); 
   mesh->insertNextCell(INTERP_KERNEL::NORM_QUAD4,4,conn+10);
   mesh->insertNextCell(INTERP_KERNEL::NORM_QUAD4,4,conn+14);
   mesh->finishInsertingCells();
-  MEDCouplingAutoRefCountObjectPtr<DataArrayDouble> coordsArr=DataArrayDouble::New();
+  MCAuto<DataArrayDouble> coordsArr=DataArrayDouble::New();
   coordsArr->alloc(9,2);
   const double coords[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 };
   std::copy(coords,coords+18,coordsArr->getPointer());
   mesh->setCoords(coordsArr);
   //! [CppSnippet_MEDCouplingUMesh_findBoundaryNodes_1]
   //! [CppSnippet_MEDCouplingUMesh_findBoundaryNodes_2]
-  MEDCouplingAutoRefCountObjectPtr<DataArrayInt> nodeIdsArr=mesh->findBoundaryNodes();
+  MCAuto<DataArrayIdType> nodeIdsArr=mesh->findBoundaryNodes();
   CPPUNIT_ASSERT( nodeIdsArr->getNumberOfTuples() == mesh->getNumberOfNodes() - 1 );
   //! [CppSnippet_MEDCouplingUMesh_findBoundaryNodes_2]
 }
@@ -1163,25 +1175,25 @@ void CppExample_MEDCouplingUMesh_buildBoundaryMesh()
 {
   using namespace MEDCoupling;
   //! [CppSnippet_MEDCouplingUMesh_buildBoundaryMesh_1]
-  MEDCouplingAutoRefCountObjectPtr<MEDCouplingUMesh> mesh=MEDCouplingUMesh::New();
+  MCAuto<MEDCouplingUMesh> mesh=MEDCouplingUMesh::New();
   mesh->setMeshDimension(2);
   mesh->allocateCells(5);
-  const int conn[18]={0,3,4,1, 1,4,2, 4,5,2, 6,7,4,3, 7,8,5,4};
+  const mcIdType conn[18]={0,3,4,1, 1,4,2, 4,5,2, 6,7,4,3, 7,8,5,4};
   mesh->insertNextCell(INTERP_KERNEL::NORM_QUAD4,4,conn);   
   mesh->insertNextCell(INTERP_KERNEL::NORM_TRI3,3, conn+4); 
   mesh->insertNextCell(INTERP_KERNEL::NORM_TRI3,3, conn+7); 
   mesh->insertNextCell(INTERP_KERNEL::NORM_QUAD4,4,conn+10);
   mesh->insertNextCell(INTERP_KERNEL::NORM_QUAD4,4,conn+14);
   mesh->finishInsertingCells();
-  MEDCouplingAutoRefCountObjectPtr<DataArrayDouble> coordsArr=DataArrayDouble::New();
+  MCAuto<DataArrayDouble> coordsArr=DataArrayDouble::New();
   coordsArr->alloc(9,2);
   const double coords[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 };
   std::copy(coords,coords+18,coordsArr->getPointer());
   mesh->setCoords(coordsArr);
   //! [CppSnippet_MEDCouplingUMesh_buildBoundaryMesh_1]
   //! [CppSnippet_MEDCouplingUMesh_buildBoundaryMesh_2]
-  MEDCouplingAutoRefCountObjectPtr<MEDCouplingPointSet> mesh1=mesh->buildBoundaryMesh(true);
-  MEDCouplingAutoRefCountObjectPtr<MEDCouplingPointSet> mesh2=mesh->buildBoundaryMesh(false);
+  MCAuto<MEDCouplingPointSet> mesh1=mesh->buildBoundaryMesh(true);
+  MCAuto<MEDCouplingPointSet> mesh2=mesh->buildBoundaryMesh(false);
   CPPUNIT_ASSERT(  coordsArr->isEqual( *mesh1->getCoords(), 1e-13 )); // same nodes
   CPPUNIT_ASSERT( !coordsArr->isEqual( *mesh2->getCoords(), 1e-13 )); // different nodes
   //! [CppSnippet_MEDCouplingUMesh_buildBoundaryMesh_2]
@@ -1191,30 +1203,30 @@ void CppExample_MEDCouplingUMesh_buildFacePartOfMySelfNode()
 {
   using namespace MEDCoupling;
   //! [CppSnippet_MEDCouplingUMesh_buildFacePartOfMySelfNode_1]
-  MEDCouplingAutoRefCountObjectPtr<MEDCouplingUMesh> mesh=MEDCouplingUMesh::New();
+  MCAuto<MEDCouplingUMesh> mesh=MEDCouplingUMesh::New();
   mesh->setMeshDimension(2);
   mesh->allocateCells(5);
-  const int conn[18]={0,3,4,1, 1,4,2, 4,5,2, 6,7,4,3, 7,8,5,4};
+  const mcIdType conn[18]={0,3,4,1, 1,4,2, 4,5,2, 6,7,4,3, 7,8,5,4};
   mesh->insertNextCell(INTERP_KERNEL::NORM_QUAD4,4,conn);    // 0
   mesh->insertNextCell(INTERP_KERNEL::NORM_TRI3,3, conn+4);  // 1
   mesh->insertNextCell(INTERP_KERNEL::NORM_TRI3,3, conn+7);  // 2
   mesh->insertNextCell(INTERP_KERNEL::NORM_QUAD4,4,conn+10); // 3
   mesh->insertNextCell(INTERP_KERNEL::NORM_QUAD4,4,conn+14); // 4
   mesh->finishInsertingCells();
-  MEDCouplingAutoRefCountObjectPtr<DataArrayDouble> coordsArr=DataArrayDouble::New();
+  MCAuto<DataArrayDouble> coordsArr=DataArrayDouble::New();
   coordsArr->alloc(9,2);
   const double coords[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 };
   std::copy(coords,coords+18,coordsArr->getPointer());
   mesh->setCoords(coordsArr);
   //! [CppSnippet_MEDCouplingUMesh_buildFacePartOfMySelfNode_1]
   //! [CppSnippet_MEDCouplingUMesh_buildFacePartOfMySelfNode_2]
-  std::vector<int> nodes;
+  std::vector<mcIdType> nodes;
   mesh->getNodeIdsOfCell( 0, nodes );
   const bool allNodes = true;
-  MEDCouplingAutoRefCountObjectPtr<MEDCouplingUMesh> mesh1 =
+  MCAuto<MEDCouplingUMesh> mesh1 =
     (MEDCouplingUMesh*)mesh->buildFacePartOfMySelfNode( &nodes[0],&nodes[0]+nodes.size(),allNodes);
   CPPUNIT_ASSERT( mesh1->getNumberOfCells() == 4 ); // 4 segments bounding QUAD4 #0 only
-  MEDCouplingAutoRefCountObjectPtr<MEDCouplingUMesh> mesh2 =
+  MCAuto<MEDCouplingUMesh> mesh2 =
     (MEDCouplingUMesh*)mesh->buildFacePartOfMySelfNode( &nodes[0],&nodes[0]+nodes.size(),!allNodes);
   CPPUNIT_ASSERT( mesh2->getNumberOfCells() == 9 ); // more segments added
   //! [CppSnippet_MEDCouplingUMesh_buildFacePartOfMySelfNode_2]
@@ -1224,31 +1236,31 @@ void CppExample_MEDCouplingUMesh_buildPartOfMySelfNode()
 {
   using namespace MEDCoupling;
   //! [CppSnippet_MEDCouplingUMesh_buildPartOfMySelfNode_1]
-  MEDCouplingAutoRefCountObjectPtr<MEDCouplingUMesh> mesh=MEDCouplingUMesh::New();
+  MCAuto<MEDCouplingUMesh> mesh=MEDCouplingUMesh::New();
   mesh->setMeshDimension(2);
   mesh->allocateCells(5);
-  const int conn[18]={0,3,4,1, 1,4,2, 4,5,2, 6,7,4,3, 7,8,5,4};
+  const mcIdType conn[18]={0,3,4,1, 1,4,2, 4,5,2, 6,7,4,3, 7,8,5,4};
   mesh->insertNextCell(INTERP_KERNEL::NORM_QUAD4,4,conn);    // 0
   mesh->insertNextCell(INTERP_KERNEL::NORM_TRI3,3, conn+4);  // 1
   mesh->insertNextCell(INTERP_KERNEL::NORM_TRI3,3, conn+7);  // 2
   mesh->insertNextCell(INTERP_KERNEL::NORM_QUAD4,4,conn+10); // 3
   mesh->insertNextCell(INTERP_KERNEL::NORM_QUAD4,4,conn+14); // 4
   mesh->finishInsertingCells();
-  MEDCouplingAutoRefCountObjectPtr<DataArrayDouble> coordsArr=DataArrayDouble::New();
+  MCAuto<DataArrayDouble> coordsArr=DataArrayDouble::New();
   coordsArr->alloc(9,2);
   const double coords[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 };
   std::copy(coords,coords+18,coordsArr->getPointer());
   mesh->setCoords(coordsArr);
   //! [CppSnippet_MEDCouplingUMesh_buildPartOfMySelfNode_1]
   //! [CppSnippet_MEDCouplingUMesh_buildPartOfMySelfNode_2]
-  std::vector<int> nodes;
+  std::vector<mcIdType> nodes;
   mesh->getNodeIdsOfCell( 0, nodes );
   const bool allNodes = true;
-  MEDCouplingAutoRefCountObjectPtr<MEDCouplingUMesh> mesh1 =
+  MCAuto<MEDCouplingUMesh> mesh1 =
     (MEDCouplingUMesh*)mesh->buildPartOfMySelfNode( &nodes[0], &nodes[0]+nodes.size(), allNodes);
-  MEDCouplingAutoRefCountObjectPtr<MEDCouplingUMesh> mesh2 =
+  MCAuto<MEDCouplingUMesh> mesh2 =
     (MEDCouplingUMesh*)mesh->buildPartOfMySelfNode( &nodes[0], &nodes[0]+nodes.size(),!allNodes);
-  CPPUNIT_ASSERT_EQUAL( mesh1->getNumberOfCells(), );
+  CPPUNIT_ASSERT_EQUAL( mesh1->getNumberOfCells(), ToIdType( 1 ));
   CPPUNIT_ASSERT_EQUAL( mesh2->getNumberOfCells(), mesh->getNumberOfCells() );
   //! [CppSnippet_MEDCouplingUMesh_buildPartOfMySelfNode_2]
 }
@@ -1257,29 +1269,29 @@ void CppExample_MEDCouplingUMesh_getCellIdsLyingOnNodes()
 {
   using namespace MEDCoupling;
   //! [CppSnippet_MEDCouplingUMesh_getCellIdsLyingOnNodes_1]
-  MEDCouplingAutoRefCountObjectPtr<MEDCouplingUMesh> mesh=MEDCouplingUMesh::New();
+  MCAuto<MEDCouplingUMesh> mesh=MEDCouplingUMesh::New();
   mesh->setMeshDimension(2);
   mesh->allocateCells(5);
-  const int conn[18]={0,3,4,1, 1,4,2, 4,5,2, 6,7,4,3, 7,8,5,4};
+  const mcIdType conn[18]={0,3,4,1, 1,4,2, 4,5,2, 6,7,4,3, 7,8,5,4};
   mesh->insertNextCell(INTERP_KERNEL::NORM_QUAD4,4,conn);    // 0
   mesh->insertNextCell(INTERP_KERNEL::NORM_TRI3,3, conn+4);  // 1
   mesh->insertNextCell(INTERP_KERNEL::NORM_TRI3,3, conn+7);  // 2
   mesh->insertNextCell(INTERP_KERNEL::NORM_QUAD4,4,conn+10); // 3
   mesh->insertNextCell(INTERP_KERNEL::NORM_QUAD4,4,conn+14); // 4
   mesh->finishInsertingCells();
-  MEDCouplingAutoRefCountObjectPtr<DataArrayDouble> coordsArr=DataArrayDouble::New();
+  MCAuto<DataArrayDouble> coordsArr=DataArrayDouble::New();
   coordsArr->alloc(9,2);
   const double coords[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 };
   std::copy(coords,coords+18,coordsArr->getPointer());
   mesh->setCoords(coordsArr);
   //! [CppSnippet_MEDCouplingUMesh_getCellIdsLyingOnNodes_1]
   //! [CppSnippet_MEDCouplingUMesh_getCellIdsLyingOnNodes_2]
-  std::vector<int> nodes;
+  std::vector<mcIdType> nodes;
   mesh->getNodeIdsOfCell( 0, nodes );
   const bool allNodes = true;
-  DataArrayInt* cellIdsArr1 = mesh->getCellIdsLyingOnNodes( &nodes[0], &nodes[0]+nodes.size(), allNodes);
-  DataArrayInt* cellIdsArr2 = mesh->getCellIdsLyingOnNodes( &nodes[0], &nodes[0]+nodes.size(),!allNodes);
-  CPPUNIT_ASSERT_EQUAL( cellIdsArr1->getNumberOfTuples(), );
+  DataArrayIdType* cellIdsArr1 = mesh->getCellIdsLyingOnNodes( &nodes[0], &nodes[0]+nodes.size(), allNodes);
+  DataArrayIdType* cellIdsArr2 = mesh->getCellIdsLyingOnNodes( &nodes[0], &nodes[0]+nodes.size(),!allNodes);
+  CPPUNIT_ASSERT_EQUAL( cellIdsArr1->getNumberOfTuples(), ToIdType( 1 ));
   CPPUNIT_ASSERT_EQUAL( cellIdsArr2->getNumberOfTuples(), mesh->getNumberOfCells() );
   //! [CppSnippet_MEDCouplingUMesh_getCellIdsLyingOnNodes_2]
   cellIdsArr1->decrRef();
@@ -1290,28 +1302,28 @@ void CppExample_MEDCouplingUMesh_getCellIdsFullyIncludedInNodeIds()
 {
   using namespace MEDCoupling;
   //! [CppSnippet_MEDCouplingUMesh_getCellIdsFullyIncludedInNodeIds_1]
-  MEDCouplingAutoRefCountObjectPtr<MEDCouplingUMesh> mesh=MEDCouplingUMesh::New();
+  MCAuto<MEDCouplingUMesh> mesh=MEDCouplingUMesh::New();
   mesh->setMeshDimension(2);
   mesh->allocateCells(5);
-  const int conn[18]={0,3,4,1, 1,4,2, 4,5,2, 6,7,4,3, 7,8,5,4};
+  const mcIdType conn[18]={0,3,4,1, 1,4,2, 4,5,2, 6,7,4,3, 7,8,5,4};
   mesh->insertNextCell(INTERP_KERNEL::NORM_QUAD4,4,conn);   
   mesh->insertNextCell(INTERP_KERNEL::NORM_TRI3,3, conn+4); 
   mesh->insertNextCell(INTERP_KERNEL::NORM_TRI3,3, conn+7); 
   mesh->insertNextCell(INTERP_KERNEL::NORM_QUAD4,4,conn+10);
   mesh->insertNextCell(INTERP_KERNEL::NORM_QUAD4,4,conn+14);
   mesh->finishInsertingCells();
-  MEDCouplingAutoRefCountObjectPtr<DataArrayDouble> coordsArr=DataArrayDouble::New();
+  MCAuto<DataArrayDouble> coordsArr=DataArrayDouble::New();
   coordsArr->alloc(9,2);
   const double coords[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 };
   std::copy(coords,coords+18,coordsArr->getPointer());
   mesh->setCoords(coordsArr);
   //! [CppSnippet_MEDCouplingUMesh_getCellIdsFullyIncludedInNodeIds_1]
   //! [CppSnippet_MEDCouplingUMesh_getCellIdsFullyIncludedInNodeIds_2]
-  const int cellIds[2]={1,2};
-  std::vector<int> nodes;
+  const mcIdType cellIds[2]={1,2};
+  std::vector<mcIdType> nodes;
   mesh->getNodeIdsOfCell( cellIds[0], nodes );
   mesh->getNodeIdsOfCell( cellIds[1], nodes );
-  DataArrayInt* cellIdsArr = mesh->getCellIdsFullyIncludedInNodeIds( &nodes[0], &nodes[0]+nodes.size());
+  DataArrayIdType* cellIdsArr = mesh->getCellIdsFullyIncludedInNodeIds( &nodes[0], &nodes[0]+nodes.size());
   CPPUNIT_ASSERT(std::equal( cellIds, cellIds+2, cellIdsArr->getPointer() ));
   //! [CppSnippet_MEDCouplingUMesh_getCellIdsFullyIncludedInNodeIds_2]
   cellIdsArr->decrRef();
@@ -1321,31 +1333,31 @@ void CppExample_MEDCouplingUMesh_buildPartOfMySelf()
 {
   using namespace MEDCoupling;
   //! [CppSnippet_MEDCouplingUMesh_buildPartOfMySelf_1]
-  MEDCouplingAutoRefCountObjectPtr<MEDCouplingUMesh> mesh=MEDCouplingUMesh::New();
+  MCAuto<MEDCouplingUMesh> mesh=MEDCouplingUMesh::New();
   mesh->setMeshDimension(2);
   mesh->allocateCells(5);
-  const int conn[18]={0,3,4,1, 1,4,2, 4,5,2, 6,7,4,3, 7,8,5,4};
+  const mcIdType conn[18]={0,3,4,1, 1,4,2, 4,5,2, 6,7,4,3, 7,8,5,4};
   mesh->insertNextCell(INTERP_KERNEL::NORM_QUAD4,4,conn);    // 0
   mesh->insertNextCell(INTERP_KERNEL::NORM_TRI3,3, conn+4);  // 1
   mesh->insertNextCell(INTERP_KERNEL::NORM_TRI3,3, conn+7);  // 2
   mesh->insertNextCell(INTERP_KERNEL::NORM_QUAD4,4,conn+10); // 3
   mesh->insertNextCell(INTERP_KERNEL::NORM_QUAD4,4,conn+14); // 4
   mesh->finishInsertingCells();
-  MEDCouplingAutoRefCountObjectPtr<DataArrayDouble> coordsArr=DataArrayDouble::New();
+  MCAuto<DataArrayDouble> coordsArr=DataArrayDouble::New();
   coordsArr->alloc(9,2);
   const double coords[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 };
   std::copy(coords,coords+18,coordsArr->getPointer());
   mesh->setCoords(coordsArr);
   //! [CppSnippet_MEDCouplingUMesh_buildPartOfMySelf_1]
   //! [CppSnippet_MEDCouplingUMesh_buildPartOfMySelf_2]
-  const int cellIds[2]={1,2};
+  const mcIdType cellIds[2]={1,2};
   MEDCouplingUMesh* mesh2=(MEDCouplingUMesh*)mesh->buildPartOfMySelf(cellIds,cellIds+2,true);
   MEDCouplingUMesh* mesh3=(MEDCouplingUMesh*)mesh->buildPartOfMySelf(cellIds,cellIds+2,false);
   CPPUNIT_ASSERT(  coordsArr->isEqual( *mesh2->getCoords(), 1e-13 )); // same nodes
   CPPUNIT_ASSERT( !coordsArr->isEqual( *mesh3->getCoords(), 1e-13 )); // different nodes
-  for ( int i = 0; i < 2; ++i )
+  for ( mcIdType i = 0; i < 2; ++i )
     {
-      std::vector<int> nodes1, nodes2;
+      std::vector<mcIdType> nodes1, nodes2;
       mesh ->getNodeIdsOfCell(cellIds[i], nodes1);
       mesh2->getNodeIdsOfCell(i, nodes2);
       CPPUNIT_ASSERT( nodes1 == nodes2 ); // cell #cellIds[i] was copied
@@ -1359,10 +1371,10 @@ void CppExample_MEDCouplingUMesh_mergeNodes()
 {
   using namespace MEDCoupling;
   //! [CppSnippet_MEDCouplingUMesh_mergeNodes_1]
-  MEDCouplingAutoRefCountObjectPtr<MEDCouplingUMesh> mesh=MEDCouplingUMesh::New();
+  MCAuto<MEDCouplingUMesh> mesh=MEDCouplingUMesh::New();
   mesh->setMeshDimension(2);
   mesh->allocateCells(5);
-  const int conn[18]={0,3,4,1, 1,4,2, 4,5,2};
+  const mcIdType conn[18]={0,3,4,1, 1,4,2, 4,5,2};
   mesh->insertNextCell(INTERP_KERNEL::NORM_QUAD4,4,conn);
   mesh->insertNextCell(INTERP_KERNEL::NORM_TRI3,3, conn+4);
   mesh->insertNextCell(INTERP_KERNEL::NORM_TRI3,3, conn+7);
@@ -1373,19 +1385,19 @@ void CppExample_MEDCouplingUMesh_mergeNodes()
                             1.1,0.0,     // #3
                             1.1,0.0,     // #4 == #3
                             0.3,-0.303}; // #5 ~~ #0
-  MEDCouplingAutoRefCountObjectPtr<DataArrayDouble> coordsArr=DataArrayDouble::New();
+  MCAuto<DataArrayDouble> coordsArr=DataArrayDouble::New();
   coordsArr->alloc(6,2);
   std::copy(coords,coords+6*2,coordsArr->getPointer());
   mesh->setCoords(coordsArr);
   //! [CppSnippet_MEDCouplingUMesh_mergeNodes_1]
   //! [CppSnippet_MEDCouplingUMesh_mergeNodes_2]
-  bool areNodesMerged; int newNbOfNodes;
-  MEDCouplingAutoRefCountObjectPtr<DataArrayInt> arr=
+  bool areNodesMerged; mcIdType newNbOfNodes;
+  MCAuto<DataArrayIdType> arr=
     mesh->mergeNodes(0.004,areNodesMerged,newNbOfNodes);
-  const int idsExpected[6] = {0, 1, 0, 2, 2, 0};
+  const mcIdType idsExpected[6] = {0, 1, 0, 2, 2, 0};
   CPPUNIT_ASSERT(std::equal(idsExpected,idsExpected+6,arr->getPointer()));
   CPPUNIT_ASSERT( areNodesMerged );
-  CPPUNIT_ASSERT_EQUAL( 3, newNbOfNodes );
+  CPPUNIT_ASSERT_EQUAL( ToIdType( 3 ), newNbOfNodes );
   //! [CppSnippet_MEDCouplingUMesh_mergeNodes_2]
   //! [CppSnippet_MEDCouplingUMesh_mergeNodes_3]
   const double* baryCoords2 = coords + 2*2; // initial coordinates of node #2
@@ -1395,8 +1407,8 @@ void CppExample_MEDCouplingUMesh_mergeNodes()
   coordsArr->alloc(6,2);
   std::copy(coords,coords+6*2,coordsArr->getPointer());
   mesh->setCoords(coordsArr);
-  // call mergeNodes2()
-  arr = mesh->mergeNodes2(0.004,areNodesMerged,newNbOfNodes);
+  // call mergeNodesCenter()
+  arr = mesh->mergeNodesCenter(0.004,areNodesMerged,newNbOfNodes);
   coordsArr=mesh->getCoordinatesAndOwner(); // retrieve a new shorten coord array
   CPPUNIT_ASSERT_DOUBLES_EQUAL( baryCoords2[1], coordsArr->getIJ(0,1), 13 ); // Y of node #0 equals to that of baryCoords2
   //! [CppSnippet_MEDCouplingUMesh_mergeNodes_3]
@@ -1406,27 +1418,27 @@ void CppExample_MEDCouplingUMesh_zipConnectivityTraducer()
 {
   using namespace MEDCoupling;
   //! [CppSnippet_MEDCouplingUMesh_zipConnectivityTraducer_1]
-  MEDCouplingAutoRefCountObjectPtr<MEDCouplingUMesh> mesh=MEDCouplingUMesh::New();
+  MCAuto<MEDCouplingUMesh> mesh=MEDCouplingUMesh::New();
   mesh->setMeshDimension(2);
   mesh->allocateCells(5);
-  const int conn[11]={0,3,4,1, 1,4,2, 4,1,0,3};
+  const mcIdType conn[11]={0,3,4,1, 1,4,2, 4,1,0,3};
   mesh->insertNextCell(INTERP_KERNEL::NORM_QUAD4,4,conn+0); // 0     
   mesh->insertNextCell(INTERP_KERNEL::NORM_TRI3,3, conn+4); // 1     
   mesh->insertNextCell(INTERP_KERNEL::NORM_TRI3,3, conn+4); // 2 == 1
   mesh->insertNextCell(INTERP_KERNEL::NORM_QUAD4,4,conn+0); // 3 == 0
   mesh->insertNextCell(INTERP_KERNEL::NORM_QUAD4,4,conn+7); // 4 ~~ 0
   mesh->finishInsertingCells();
-  MEDCouplingAutoRefCountObjectPtr<DataArrayDouble> coordsArr=DataArrayDouble::New();
+  MCAuto<DataArrayDouble> coordsArr=DataArrayDouble::New();
   coordsArr->alloc(9,2);
   const double coords[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 };
   std::copy(coords,coords+18,coordsArr->getPointer());
   mesh->setCoords(coordsArr);
   //! [CppSnippet_MEDCouplingUMesh_zipConnectivityTraducer_1]
   //! [CppSnippet_MEDCouplingUMesh_zipConnectivityTraducer_2]
-  const int oldNbCells = mesh->getNumberOfCells();
-  DataArrayInt *arr = mesh->zipConnectivityTraducer(0);
+  const mcIdType oldNbCells = mesh->getNumberOfCells();
+  DataArrayIdType *arr = mesh->zipConnectivityTraducer(0);
   CPPUNIT_ASSERT_EQUAL( oldNbCells-2, mesh->getNumberOfCells() );
-  const int idsExpected[5] = {0, 1, 1, 0, 2};
+  const mcIdType idsExpected[5] = {0, 1, 1, 0, 2};
   CPPUNIT_ASSERT(std::equal(idsExpected,idsExpected+5,arr->getPointer()));
   //! [CppSnippet_MEDCouplingUMesh_zipConnectivityTraducer_2]
   arr->decrRef();
@@ -1436,29 +1448,29 @@ void CppExample_MEDCouplingUMesh_zipCoordsTraducer()
 {
   using namespace MEDCoupling;
   //! [CppSnippet_MEDCouplingUMesh_zipCoordsTraducer_1]
-  MEDCouplingAutoRefCountObjectPtr<MEDCouplingUMesh> mesh=MEDCouplingUMesh::New();
+  MCAuto<MEDCouplingUMesh> mesh=MEDCouplingUMesh::New();
   mesh->setMeshDimension(2);
   mesh->allocateCells(5);
-  const int conn[18]={0,3,4,1, 1,4,2, 4,5,2, 6,7,4,3, 7,8,5,4};
+  const mcIdType conn[18]={0,3,4,1, 1,4,2, 4,5,2, 6,7,4,3, 7,8,5,4};
   mesh->insertNextCell(INTERP_KERNEL::NORM_QUAD4,4,conn);   
   mesh->insertNextCell(INTERP_KERNEL::NORM_TRI3,3, conn+4); 
   mesh->insertNextCell(INTERP_KERNEL::NORM_TRI3,3, conn+7); 
   mesh->insertNextCell(INTERP_KERNEL::NORM_QUAD4,4,conn+10);
   mesh->insertNextCell(INTERP_KERNEL::NORM_QUAD4,4,conn+14);
   mesh->finishInsertingCells();
-  MEDCouplingAutoRefCountObjectPtr<DataArrayDouble> coordsArr=DataArrayDouble::New();
+  MCAuto<DataArrayDouble> coordsArr=DataArrayDouble::New();
   coordsArr->alloc(9,2);
   const double coords[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 };
   std::copy(coords,coords+18,coordsArr->getPointer());
   mesh->setCoords(coordsArr);
   //! [CppSnippet_MEDCouplingUMesh_zipCoordsTraducer_1]
   //! [CppSnippet_MEDCouplingUMesh_zipCoordsTraducer_2]
-  const int cellIds[2]={1,2};
+  const mcIdType cellIds[2]={1,2};
   MEDCouplingUMesh* mesh2=(MEDCouplingUMesh*)mesh->buildPartOfMySelf(cellIds,cellIds+2,true);
-  DataArrayInt *arr=mesh2->zipCoordsTraducer();
-  CPPUNIT_ASSERT_EQUAL( 4, mesh2->getNumberOfNodes() ); // nb of nodes decreased
+  DataArrayIdType *arr=mesh2->zipCoordsTraducer();
+  CPPUNIT_ASSERT_EQUAL( ToIdType(4), mesh2->getNumberOfNodes() ); // nb of nodes decreased
   CPPUNIT_ASSERT_EQUAL( mesh->getNumberOfNodes(), arr->getNumberOfTuples() );
-  const int idsExpected[9] = {-1,0,1,-1,2,3,-1,-1,-1}; // -1 for unused nodes
+  const mcIdType idsExpected[9] = {-1,0,1,-1,2,3,-1,-1,-1}; // -1 for unused nodes
   CPPUNIT_ASSERT(std::equal(idsExpected,idsExpected+9,arr->getPointer()));
   //! [CppSnippet_MEDCouplingUMesh_zipCoordsTraducer_2]
   mesh2->decrRef();
@@ -1469,33 +1481,33 @@ void CppExample_MEDCouplingUMesh_getNodeIdsInUse()
 {
   using namespace MEDCoupling;
   //! [CppSnippet_MEDCouplingUMesh_getNodeIdsInUse_1]
-  MEDCouplingAutoRefCountObjectPtr<MEDCouplingUMesh> mesh=MEDCouplingUMesh::New();
+  MCAuto<MEDCouplingUMesh> mesh=MEDCouplingUMesh::New();
   mesh->setMeshDimension(2);
   mesh->allocateCells(5);
-  const int conn[18]={0,3,4,1, 1,4,2, 4,5,2, 6,7,4,3, 7,8,5,4};
+  const mcIdType conn[18]={0,3,4,1, 1,4,2, 4,5,2, 6,7,4,3, 7,8,5,4};
   mesh->insertNextCell(INTERP_KERNEL::NORM_QUAD4,4,conn);   
   mesh->insertNextCell(INTERP_KERNEL::NORM_TRI3,3, conn+4); 
   mesh->insertNextCell(INTERP_KERNEL::NORM_TRI3,3, conn+7); 
   mesh->insertNextCell(INTERP_KERNEL::NORM_QUAD4,4,conn+10);
   mesh->insertNextCell(INTERP_KERNEL::NORM_QUAD4,4,conn+14);
   mesh->finishInsertingCells();
-  MEDCouplingAutoRefCountObjectPtr<DataArrayDouble> coordsArr=DataArrayDouble::New();
+  MCAuto<DataArrayDouble> coordsArr=DataArrayDouble::New();
   coordsArr->alloc(9,2);
   const double coords[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 };
   std::copy(coords,coords+18,coordsArr->getPointer());
   mesh->setCoords(coordsArr);
   //! [CppSnippet_MEDCouplingUMesh_getNodeIdsInUse_1]
   //! [CppSnippet_MEDCouplingUMesh_getNodeIdsInUse_2]
-  const int cellIds[2]={1,2};
+  const mcIdType cellIds[2]={1,2};
   MEDCouplingUMesh* mesh2=(MEDCouplingUMesh*)mesh->buildPartOfMySelf(cellIds,cellIds+2,true);
-  int newNbOfNodes = 0;
-  DataArrayInt *arr=mesh2->getNodeIdsInUse( newNbOfNodes );
-  const int idsExpected[9] = {-1,0,1,-1,2,3,-1,-1,-1};
+  mcIdType newNbOfNodes = 0;
+  DataArrayIdType *arr=mesh2->getNodeIdsInUse( newNbOfNodes );
+  const mcIdType idsExpected[9] = {-1,0,1,-1,2,3,-1,-1,-1};
   CPPUNIT_ASSERT(std::equal(idsExpected,idsExpected+9,arr->getPointer()));
   //! [CppSnippet_MEDCouplingUMesh_getNodeIdsInUse_2]
   //! [CppSnippet_MEDCouplingUMesh_getNodeIdsInUse_3]
-  DataArrayInt *arr2=arr->invertArrayO2N2N2O(newNbOfNodes);
-  const int idsExpected2[4] = {1,2,4,5};
+  DataArrayIdType *arr2=arr->invertArrayO2N2N2O(newNbOfNodes);
+  const mcIdType idsExpected2[4] = {1,2,4,5};
   CPPUNIT_ASSERT(std::equal(idsExpected2,idsExpected2+4,arr2->getPointer()));
   //! [CppSnippet_MEDCouplingUMesh_getNodeIdsInUse_3]
   mesh2->decrRef();
@@ -1507,24 +1519,24 @@ void CppExample_MEDCouplingUMesh_convertToPolyTypes()
 {
   using namespace MEDCoupling;
   //! [CppSnippet_MEDCouplingUMesh_convertToPolyTypes_1]
-  MEDCouplingAutoRefCountObjectPtr<MEDCouplingUMesh> mesh=MEDCouplingUMesh::New();
+  MCAuto<MEDCouplingUMesh> mesh=MEDCouplingUMesh::New();
   mesh->setMeshDimension(2);
   mesh->allocateCells(5);
-  const int conn[18]={0,3,4,1, 1,4,2, 4,5,2, 6,7,4,3, 7,8,5,4};
+  const mcIdType conn[18]={0,3,4,1, 1,4,2, 4,5,2, 6,7,4,3, 7,8,5,4};
   mesh->insertNextCell(INTERP_KERNEL::NORM_QUAD4,4,conn);    // 0
   mesh->insertNextCell(INTERP_KERNEL::NORM_TRI3,3, conn+4);  // 1
   mesh->insertNextCell(INTERP_KERNEL::NORM_TRI3,3, conn+7);  // 2
   mesh->insertNextCell(INTERP_KERNEL::NORM_QUAD4,4,conn+10); // 3
   mesh->insertNextCell(INTERP_KERNEL::NORM_QUAD4,4,conn+14); // 4
   mesh->finishInsertingCells();
-  MEDCouplingAutoRefCountObjectPtr<DataArrayDouble> coordsArr=DataArrayDouble::New();
+  MCAuto<DataArrayDouble> coordsArr=DataArrayDouble::New();
   coordsArr->alloc(9,2);
   const double coords[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 };
   std::copy(coords,coords+18,coordsArr->getPointer());
   mesh->setCoords(coordsArr);
   //! [CppSnippet_MEDCouplingUMesh_convertToPolyTypes_1]
   //! [CppSnippet_MEDCouplingUMesh_convertToPolyTypes_2]
-  const int cells[2]={1,3};
+  const mcIdType cells[2]={1,3};
   mesh->convertToPolyTypes(cells, cells+2);
   CPPUNIT_ASSERT( mesh->getTypeOfCell(0) == INTERP_KERNEL::NORM_QUAD4 );
   CPPUNIT_ASSERT( mesh->getTypeOfCell(1) == INTERP_KERNEL::NORM_POLYGON );
@@ -1537,40 +1549,40 @@ void CppExample_MEDCouplingUMesh_buildDescendingConnectivity2()
 {
   using namespace MEDCoupling;
   //! [CppSnippet_MEDCouplingUMesh_buildDescendingConnectivity2_1]
-  MEDCouplingAutoRefCountObjectPtr<MEDCouplingUMesh> mesh=MEDCouplingUMesh::New();
+  MCAuto<MEDCouplingUMesh> mesh=MEDCouplingUMesh::New();
   mesh->setMeshDimension(2);
   mesh->allocateCells(5);
-  const int conn[18]={0,3,4,1, 1,4,2, 4,5,2, 6,7,4,3, 7,8,5,4};
+  const mcIdType conn[18]={0,3,4,1, 1,4,2, 4,5,2, 6,7,4,3, 7,8,5,4};
   mesh->insertNextCell(INTERP_KERNEL::NORM_QUAD4,4,conn);    // 0
   mesh->insertNextCell(INTERP_KERNEL::NORM_TRI3,3, conn+4);  // 1
   mesh->insertNextCell(INTERP_KERNEL::NORM_TRI3,3, conn+7);  // 2
   mesh->insertNextCell(INTERP_KERNEL::NORM_QUAD4,4,conn+10); // 3
   mesh->insertNextCell(INTERP_KERNEL::NORM_QUAD4,4,conn+14); // 4
   mesh->finishInsertingCells();
-  MEDCouplingAutoRefCountObjectPtr<DataArrayDouble> coordsArr=DataArrayDouble::New();
+  MCAuto<DataArrayDouble> coordsArr=DataArrayDouble::New();
   coordsArr->alloc(9,2);
   const double coords[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 };
   std::copy(coords,coords+18,coordsArr->getPointer());
   mesh->setCoords(coordsArr);
   //! [CppSnippet_MEDCouplingUMesh_buildDescendingConnectivity2_1]
   //! [CppSnippet_MEDCouplingUMesh_buildDescendingConnectivity2_2]
-  DataArrayInt *desc       =DataArrayInt::New();
-  DataArrayInt *descIndx   =DataArrayInt::New();
-  DataArrayInt *revDesc    =DataArrayInt::New();
-  DataArrayInt *revDescIndx=DataArrayInt::New();
+  DataArrayIdType *desc       =DataArrayIdType::New();
+  DataArrayIdType *descIndx   =DataArrayIdType::New();
+  DataArrayIdType *revDesc    =DataArrayIdType::New();
+  DataArrayIdType *revDescIndx=DataArrayIdType::New();
   MEDCouplingUMesh * mesh2 = mesh->buildDescendingConnectivity2(desc,descIndx,revDesc,revDescIndx);
-  const int descExpected[]        = {1,2,3,4,-3,5,6,7,8,-5,9,10,-2,11,12,13,-7,-10};
-  const int descIndxExpected[]    = {0,4,7,10,14,18};
-  const int revDescExpected[]     = {0, 0,3, 0,1, 0, 1,2, 1, 2,4, 2, 3, 3,4, 3, 4, 4};
-  const int revDescIndxExpected[] = {0,1,3,5,6,8,9,11,12,13,15,16,17,18};
+  const mcIdType descExpected[]        = {1,2,3,4,-3,5,6,7,8,-5,9,10,-2,11,12,13,-7,-10};
+  const mcIdType descIndxExpected[]    = {0,4,7,10,14,18};
+  const mcIdType revDescExpected[]     = {0, 0,3, 0,1, 0, 1,2, 1, 2,4, 2, 3, 3,4, 3, 4, 4};
+  const mcIdType revDescIndxExpected[] = {0,1,3,5,6,8,9,11,12,13,15,16,17,18};
   CPPUNIT_ASSERT(std::equal(descExpected,descExpected+18,desc->getPointer()));
   CPPUNIT_ASSERT(std::equal(descIndxExpected,descIndxExpected+6,descIndx->getPointer()));
   CPPUNIT_ASSERT(std::equal(revDescExpected,revDescExpected+18,revDesc->getPointer()));
   CPPUNIT_ASSERT(std::equal(revDescIndxExpected,revDescIndxExpected+14,revDescIndx->getPointer()));
   //! [CppSnippet_MEDCouplingUMesh_buildDescendingConnectivity2_2]
   //! [CppSnippet_MEDCouplingUMesh_buildDescendingConnectivity2_3]
-  const int cell2ConnExpect[] = {4,1};
-  std::vector<int> cell2Conn;
+  const mcIdType cell2ConnExpect[] = {4,1};
+  std::vector<mcIdType> cell2Conn;
   mesh2->getNodeIdsOfCell( 3-1, cell2Conn ); // cell #3 in FORTRAN mode
   CPPUNIT_ASSERT(std::equal(cell2ConnExpect,cell2ConnExpect+2,&cell2Conn[0]));
   //! [CppSnippet_MEDCouplingUMesh_buildDescendingConnectivity2_3]
@@ -1585,32 +1597,32 @@ void CppExample_MEDCouplingUMesh_buildDescendingConnectivity()
 {
   using namespace MEDCoupling;
   //! [CppSnippet_MEDCouplingUMesh_buildDescendingConnectivity_1]
-  MEDCouplingAutoRefCountObjectPtr<MEDCouplingUMesh> mesh=MEDCouplingUMesh::New();
+  MCAuto<MEDCouplingUMesh> mesh=MEDCouplingUMesh::New();
   mesh->setMeshDimension(2);
   mesh->allocateCells(5);
-  const int conn[18]={0,3,4,1, 1,4,2, 4,5,2, 6,7,4,3, 7,8,5,4};
+  const mcIdType conn[18]={0,3,4,1, 1,4,2, 4,5,2, 6,7,4,3, 7,8,5,4};
   mesh->insertNextCell(INTERP_KERNEL::NORM_QUAD4,4,conn);    // 0
   mesh->insertNextCell(INTERP_KERNEL::NORM_TRI3,3, conn+4);  // 1
   mesh->insertNextCell(INTERP_KERNEL::NORM_TRI3,3, conn+7);  // 2
   mesh->insertNextCell(INTERP_KERNEL::NORM_QUAD4,4,conn+10); // 3
   mesh->insertNextCell(INTERP_KERNEL::NORM_QUAD4,4,conn+14); // 4
   mesh->finishInsertingCells();
-  MEDCouplingAutoRefCountObjectPtr<DataArrayDouble> coordsArr=DataArrayDouble::New();
+  MCAuto<DataArrayDouble> coordsArr=DataArrayDouble::New();
   coordsArr->alloc(9,2);
   const double coords[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 };
   std::copy(coords,coords+18,coordsArr->getPointer());
   mesh->setCoords(coordsArr);
   //! [CppSnippet_MEDCouplingUMesh_buildDescendingConnectivity_1]
   //! [CppSnippet_MEDCouplingUMesh_buildDescendingConnectivity_2]
-  DataArrayInt *desc       =DataArrayInt::New();
-  DataArrayInt *descIndx   =DataArrayInt::New();
-  DataArrayInt *revDesc    =DataArrayInt::New();
-  DataArrayInt *revDescIndx=DataArrayInt::New();
+  DataArrayIdType *desc       =DataArrayIdType::New();
+  DataArrayIdType *descIndx   =DataArrayIdType::New();
+  DataArrayIdType *revDesc    =DataArrayIdType::New();
+  DataArrayIdType *revDescIndx=DataArrayIdType::New();
   MEDCouplingUMesh * mesh2 = mesh->buildDescendingConnectivity(desc,descIndx,revDesc,revDescIndx);
-  const int descExpected[]        = {0,1,2,3, 2,4,5, 6,7,4, 8,9,1,10, 11,12,6,9};
-  const int descIndxExpected[]    = {0,4,7,10,14,18};
-  const int revDescExpected[]     = {0, 0,3, 0,1, 0, 1,2, 1, 2,4, 2, 3, 3,4, 3, 4, 4};
-  const int revDescIndxExpected[] = {0,1,3,5,6,8,9,11,12,13,15,16,17,18};
+  const mcIdType descExpected[]        = {0,1,2,3, 2,4,5, 6,7,4, 8,9,1,10, 11,12,6,9};
+  const mcIdType descIndxExpected[]    = {0,4,7,10,14,18};
+  const mcIdType revDescExpected[]     = {0, 0,3, 0,1, 0, 1,2, 1, 2,4, 2, 3, 3,4, 3, 4, 4};
+  const mcIdType revDescIndxExpected[] = {0,1,3,5,6,8,9,11,12,13,15,16,17,18};
   CPPUNIT_ASSERT(std::equal(descExpected,descExpected+18,desc->getPointer()));
   CPPUNIT_ASSERT(std::equal(descIndxExpected,descIndxExpected+6,descIndx->getPointer()));
   CPPUNIT_ASSERT(std::equal(revDescExpected,revDescExpected+18,revDesc->getPointer()));
@@ -1627,28 +1639,28 @@ void CppExample_MEDCouplingUMesh_getReverseNodalConnectivity()
 {
   using namespace MEDCoupling;
   //! [CppSnippet_MEDCouplingUMesh_getReverseNodalConnectivity_1]
-  MEDCouplingAutoRefCountObjectPtr<MEDCouplingUMesh> mesh=MEDCouplingUMesh::New();
+  MCAuto<MEDCouplingUMesh> mesh=MEDCouplingUMesh::New();
   mesh->setMeshDimension(2);
   mesh->allocateCells(5);
-  const int conn[18]={0,3,4,1, 1,4,2, 4,5,2, 6,7,4,3, 7,8,5,4};
+  const mcIdType conn[18]={0,3,4,1, 1,4,2, 4,5,2, 6,7,4,3, 7,8,5,4};
   mesh->insertNextCell(INTERP_KERNEL::NORM_QUAD4,4,conn);    // 0
   mesh->insertNextCell(INTERP_KERNEL::NORM_TRI3,3, conn+4);  // 1
   mesh->insertNextCell(INTERP_KERNEL::NORM_TRI3,3, conn+7);  // 2
   mesh->insertNextCell(INTERP_KERNEL::NORM_QUAD4,4,conn+10); // 3
   mesh->insertNextCell(INTERP_KERNEL::NORM_QUAD4,4,conn+14); // 4
   mesh->finishInsertingCells();
-  MEDCouplingAutoRefCountObjectPtr<DataArrayDouble> coordsArr=DataArrayDouble::New();
+  MCAuto<DataArrayDouble> coordsArr=DataArrayDouble::New();
   coordsArr->alloc(9,2);
   const double coords[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 };
   std::copy(coords,coords+18,coordsArr->getPointer());
   mesh->setCoords(coordsArr);
   //! [CppSnippet_MEDCouplingUMesh_getReverseNodalConnectivity_1]
   //! [CppSnippet_MEDCouplingUMesh_getReverseNodalConnectivity_2]
-  DataArrayInt *revNodal=DataArrayInt::New();
-  DataArrayInt *revNodalIndx=DataArrayInt::New();
+  DataArrayIdType *revNodal=DataArrayIdType::New();
+  DataArrayIdType *revNodalIndx=DataArrayIdType::New();
   mesh->getReverseNodalConnectivity(revNodal,revNodalIndx);
-  const int revNodalExpected[18]={0,0,1,1,2,0,3,0,1,2,3,4,2,4,3,3,4,4};
-  const int revNodalIndexExpected[10]={0,1,3,5,7,12,14,15,17,18};
+  const mcIdType revNodalExpected[18]={0,0,1,1,2,0,3,0,1,2,3,4,2,4,3,3,4,4};
+  const mcIdType revNodalIndexExpected[10]={0,1,3,5,7,12,14,15,17,18};
   CPPUNIT_ASSERT(std::equal(revNodalExpected,revNodalExpected+18,revNodal->getPointer()));
   CPPUNIT_ASSERT(std::equal(revNodalIndexExpected,revNodalIndexExpected+10,revNodalIndx->getPointer()));
   //! [CppSnippet_MEDCouplingUMesh_getReverseNodalConnectivity_2]
@@ -1668,11 +1680,11 @@ void CppExample_MEDCouplingUMesh_checkDeepEquivalWith()
                             0.0,1.0}; // #3
   {
     mesh1->setMeshDimension(2);
-    MEDCouplingAutoRefCountObjectPtr<DataArrayDouble> coordsArr=DataArrayDouble::New();
+    MCAuto<DataArrayDouble> coordsArr=DataArrayDouble::New();
     coordsArr->useExternalArrayWithRWAccess( coords, 4, 2 );
     mesh1->setCoords(coordsArr);
     mesh1->allocateCells(2);
-    const int conn[6]={0,1,2, 1,2,3};
+    const mcIdType conn[6]={0,1,2, 1,2,3};
     mesh1->insertNextCell(INTERP_KERNEL::NORM_TRI3,3, conn+0);  // #0
     mesh1->insertNextCell(INTERP_KERNEL::NORM_TRI3,3, conn+3);  // #1
     mesh1->finishInsertingCells();
@@ -1685,11 +1697,11 @@ void CppExample_MEDCouplingUMesh_checkDeepEquivalWith()
                              1.0,1.001}; // #3 ~ #2
   {
     mesh2->setMeshDimension(2);
-    MEDCouplingAutoRefCountObjectPtr<DataArrayDouble> coordsArr=DataArrayDouble::New();
+    MCAuto<DataArrayDouble> coordsArr=DataArrayDouble::New();
     coordsArr->useExternalArrayWithRWAccess( coords2, 4, 2 );
     mesh2->setCoords(coordsArr);
     mesh2->allocateCells(2);
-    const int conn[6]={2,3,0, 3,1,2};
+    const mcIdType conn[6]={2,3,0, 3,1,2};
     mesh2->insertNextCell(INTERP_KERNEL::NORM_TRI3,3, conn+0);  // #0 = #1
     mesh2->insertNextCell(INTERP_KERNEL::NORM_TRI3,3, conn+3);  // #1 ~ #0
     mesh2->finishInsertingCells();
@@ -1697,10 +1709,10 @@ void CppExample_MEDCouplingUMesh_checkDeepEquivalWith()
   //! [CppSnippet_MEDCouplingUMesh_checkDeepEquivalWith_1]
   //! [CppSnippet_MEDCouplingUMesh_checkDeepEquivalWith_2]
   int cellCompPol = 1; // "permuted same orientation" - policy of medium severity
-  DataArrayInt *nOld2New, *cOld2New;
+  DataArrayIdType *nOld2New, *cOld2New;
   mesh1->checkDeepEquivalWith( mesh2, cellCompPol, 0.002, cOld2New, nOld2New );
-  const int nOld2NewExpected[4] = { 3, 0, 1, 2 };
-  const int cOld2NewExpected[2] = { 1, 0 };
+  const mcIdType nOld2NewExpected[4] = { 3, 0, 1, 2 };
+  const mcIdType cOld2NewExpected[2] = { 1, 0 };
   CPPUNIT_ASSERT(std::equal(nOld2NewExpected,nOld2NewExpected+4,nOld2New->getConstPointer()));
   CPPUNIT_ASSERT(std::equal(cOld2NewExpected,cOld2NewExpected+2,cOld2New->getConstPointer()));
   //! [CppSnippet_MEDCouplingUMesh_checkDeepEquivalWith_2]
@@ -1709,7 +1721,7 @@ void CppExample_MEDCouplingUMesh_checkDeepEquivalWith()
   CPPUNIT_ASSERT_THROW ( mesh1->checkDeepEquivalOnSameNodesWith( mesh2, cellCompPol, 0.002, cOld2New ), INTERP_KERNEL::Exception );
   mesh2->setCoords( mesh1->getCoords() ); // make meshes share the same coordinates array
   mesh2->allocateCells(2);
-  const int conn[6]={1,2,3, 1,0,2};
+  const mcIdType conn[6]={1,2,3, 1,0,2};
   mesh2->insertNextCell(INTERP_KERNEL::NORM_TRI3,3,conn+0); // #0 = #1
   mesh2->insertNextCell(INTERP_KERNEL::NORM_TRI3,3,conn+3); // #1 ~ #0
   mesh2->finishInsertingCells();
@@ -1727,11 +1739,11 @@ void CppExample_MEDCouplingPointSet_scale()
   using namespace MEDCoupling;
   //! [CppSnippet_MEDCouplingPointSet_scale_1]
   double coords[4*2]={0.0,0.0, 1.0,0.0, 1.0,1.0, 0.0,1.0}; // 2D coordinates of 4 nodes
-  MEDCouplingAutoRefCountObjectPtr<DataArrayDouble> coordsArr=DataArrayDouble::New();
+  MCAuto<DataArrayDouble> coordsArr=DataArrayDouble::New();
   coordsArr->useExternalArrayWithRWAccess(coords, 4,2);
-  MEDCouplingAutoRefCountObjectPtr<MEDCouplingUMesh> mesh=MEDCouplingUMesh::New();
+  MCAuto<MEDCouplingUMesh> mesh=MEDCouplingUMesh::New();
   mesh->setCoords(coordsArr);
-  DataArrayDouble *initCoords = coordsArr->deepCpy();
+  DataArrayDouble *initCoords = coordsArr->deepCopy();
   //! [CppSnippet_MEDCouplingPointSet_scale_1]
   //! [CppSnippet_MEDCouplingPointSet_scale_2]
   const double center[2] = {0.,0.};
@@ -1752,11 +1764,11 @@ void CppExample_MEDCouplingPointSet_translate()
   using namespace MEDCoupling;
   //! [CppSnippet_MEDCouplingPointSet_translate_1]
   double coords[4*2]={0.0,0.0, 1.0,0.0, 1.0,1.0, 0.0,1.0}; // 2D coordinates of 4 nodes
-  MEDCouplingAutoRefCountObjectPtr<DataArrayDouble> coordsArr=DataArrayDouble::New();
+  MCAuto<DataArrayDouble> coordsArr=DataArrayDouble::New();
   coordsArr->useExternalArrayWithRWAccess(coords, 4,2);
-  MEDCouplingAutoRefCountObjectPtr<MEDCouplingUMesh> mesh=MEDCouplingUMesh::New();
+  MCAuto<MEDCouplingUMesh> mesh=MEDCouplingUMesh::New();
   mesh->setCoords(coordsArr);
-  DataArrayDouble *initCoords = coordsArr->deepCpy();
+  DataArrayDouble *initCoords = coordsArr->deepCopy();
   //! [CppSnippet_MEDCouplingPointSet_translate_1]
   //! [CppSnippet_MEDCouplingPointSet_translate_2]
   double vector[2] = {1.,1.};
@@ -1778,9 +1790,9 @@ void CppExample_MEDCouplingPointSet_rotate()
   double coords[4*2]={0.0,0.0, 0.1,0.0, 0.1,0.1, 0.0,0.1}; // 2D coordinates of 4 nodes
   double coordsOrig[4*2];
   std::copy(coords,coords+sizeof(coords)/sizeof(double),coordsOrig);//keep tracks of initial values
-  MEDCouplingAutoRefCountObjectPtr<DataArrayDouble> coordsArr=DataArrayDouble::New();
+  MCAuto<DataArrayDouble> coordsArr=DataArrayDouble::New();
   coordsArr->useExternalArrayWithRWAccess(coords, 4,2);
-  MEDCouplingAutoRefCountObjectPtr<MEDCouplingUMesh> mesh=MEDCouplingUMesh::New();
+  MCAuto<MEDCouplingUMesh> mesh=MEDCouplingUMesh::New();
   mesh->setCoords(coordsArr);
   //! [CppSnippet_MEDCouplingPointSet_rotate_1]
   //! [CppSnippet_MEDCouplingPointSet_rotate_2]
@@ -1806,9 +1818,9 @@ void CppExample_MEDCouplingPointSet_getBoundingBox()
   //! [CppSnippet_MEDCouplingPointSet_getBoundingBox_1]
   double cc[2*3]={0.0, 0.1, 0.2, // 3D coordinates of 2 nodes
                   2.0, 2.1, 2.2};
-  MEDCouplingAutoRefCountObjectPtr<DataArrayDouble> coordsArr=DataArrayDouble::New();
+  MCAuto<DataArrayDouble> coordsArr=DataArrayDouble::New();
   coordsArr->useExternalArrayWithRWAccess(cc, 2,3);
-  MEDCouplingAutoRefCountObjectPtr<MEDCouplingUMesh> mesh=MEDCouplingUMesh::New();
+  MCAuto<MEDCouplingUMesh> mesh=MEDCouplingUMesh::New();
   mesh->setCoords(coordsArr);
   //! [CppSnippet_MEDCouplingPointSet_getBoundingBox_1]
   //! [CppSnippet_MEDCouplingPointSet_getBoundingBox_2]
@@ -1816,8 +1828,8 @@ void CppExample_MEDCouplingPointSet_getBoundingBox()
   mesh->getBoundingBox( (double*) bbox );
 
   // check the returned coordinates of extremum points of the bounding box
-  for ( int i = 0; i < 2; ++i )   // point id
-    for ( int j = 0; j < 3; ++j ) // component
+  for ( mcIdType i = 0; i < 2; ++i )   // point id
+    for ( mcIdType j = 0; j < 3; ++j ) // component
       CPPUNIT_ASSERT_DOUBLES_EQUAL( cc[ i*3 + j ], bbox[j][i], 1e-13);
   //! [CppSnippet_MEDCouplingPointSet_getBoundingBox_2]
 }
@@ -1832,19 +1844,19 @@ void CppExample_MEDCouplingPointSet_getNodeIdsNearPoint()
                       0.3,-0.30002, // #2
                       1.1,0.0,    // #3
                       0.3,-0.30003};// #4
-  MEDCouplingAutoRefCountObjectPtr<DataArrayDouble> coordsArr=DataArrayDouble::New();
+  MCAuto<DataArrayDouble> coordsArr=DataArrayDouble::New();
   coordsArr->useExternalArrayWithRWAccess(coords, 5,2);
-  MEDCouplingAutoRefCountObjectPtr<MEDCouplingUMesh> mesh=MEDCouplingUMesh::New();
+  MCAuto<MEDCouplingUMesh> mesh=MEDCouplingUMesh::New();
   mesh->setCoords(coordsArr);
   //! [CppSnippet_MEDCouplingPointSet_getNodeIdsNearPoint_1]
   //! [CppSnippet_MEDCouplingPointSet_getNodeIdsNearPoint_2]
   double point [2]={0.3, -0.3}; // point close to nodes #0, #2 and #4
-  DataArrayInt *ids = mesh->getNodeIdsNearPoint(point, 1e-2);
+  DataArrayIdType *ids = mesh->getNodeIdsNearPoint(point, 1e-2);
 
   // check found ids
-  const int expectedIDs[3] = {0,2,4};
-  DataArrayInt * okIDs = ids->getIdsEqualList ( expectedIDs, expectedIDs+3 );
-  CPPUNIT_ASSERT_EQUAL(3, okIDs->getNumberOfTuples());
+  const mcIdType expectedIDs[3] = {0,2,4};
+  DataArrayIdType * okIDs = ids->findIdsEqualList ( expectedIDs, expectedIDs+3 );
+  CPPUNIT_ASSERT_EQUAL(ToIdType(3), okIDs->getNumberOfTuples());
 
   // release data
   ids->decrRef();
@@ -1863,23 +1875,23 @@ void CppExample_MEDCouplingPointSet_getNodeIdsNearPoints()
                       1.1,0.0,    // #4
                       1.1,0.002,  // #5
                       0.3,-0.303};// #6
-  MEDCouplingAutoRefCountObjectPtr<DataArrayDouble> coordsArr=DataArrayDouble::New();
+  MCAuto<DataArrayDouble> coordsArr=DataArrayDouble::New();
   coordsArr->useExternalArrayWithRWAccess(coords, 7,2);
-  MEDCouplingAutoRefCountObjectPtr<MEDCouplingUMesh> mesh=MEDCouplingUMesh::New();
+  MCAuto<MEDCouplingUMesh> mesh=MEDCouplingUMesh::New();
   mesh->setCoords(coordsArr);
   //! [CppSnippet_MEDCouplingPointSet_getNodeIdsNearPoints_1]
   //! [CppSnippet_MEDCouplingPointSet_getNodeIdsNearPoints_2]
-  const int nbOfPoints = 3;
+  const mcIdType nbOfPoints = 3;
   double points [nbOfPoints*2]={0.2,-0.30001,  // ~ node #1
                                 0.0, 0.0,
                                 1.1, 0.002}; // ~ nodes #3, #4 and #5
-  DataArrayInt *ids, *idsIndex;
+  DataArrayIdType *ids, *idsIndex;
   mesh->getNodeIdsNearPoints(points, nbOfPoints, 1e-1,ids,idsIndex);
 
   // check found ids (i.e. contents of 'ids' array)
-  const int expectedIDs[4] = {1, 3, 4, 5};
-  DataArrayInt * okIDs = ids->getIdsEqualList ( expectedIDs, expectedIDs+4 );
-  CPPUNIT_ASSERT_EQUAL(4, okIDs->getNumberOfTuples());
+  const mcIdType expectedIDs[4] = {1, 3, 4, 5};
+  DataArrayIdType * okIDs = ids->findIdsEqualList ( expectedIDs, expectedIDs+4 );
+  CPPUNIT_ASSERT_EQUAL(ToIdType(4), okIDs->getNumberOfTuples());
 
   // release data
   ids->decrRef();
@@ -1898,18 +1910,18 @@ void CppExample_MEDCouplingPointSet_findCommonNodes()
                       1.1,0.0,    // 3
                       1.1,0.0,    // 4
                       0.3,-0.303};// 5
-  MEDCouplingAutoRefCountObjectPtr<DataArrayDouble> coordsArr=DataArrayDouble::New();
+  MCAuto<DataArrayDouble> coordsArr=DataArrayDouble::New();
   coordsArr->useExternalArrayWithRWAccess(coords, 6,2);
-  MEDCouplingAutoRefCountObjectPtr<MEDCouplingUMesh> mesh=MEDCouplingUMesh::New();
+  MCAuto<MEDCouplingUMesh> mesh=MEDCouplingUMesh::New();
   mesh->setCoords(coordsArr);
   //! [CppSnippet_MEDCouplingPointSet_findCommonNodes_1]
   //! [CppSnippet_MEDCouplingPointSet_findCommonNodes_2]
-  DataArrayInt *com, *comI;
+  DataArrayIdType *com, *comI;
   mesh->findCommonNodes(1e-13,-1,com,comI);
-  CPPUNIT_ASSERT_EQUAL(2, com->getNumberOfTuples());
+  CPPUNIT_ASSERT_EQUAL(ToIdType(2),com->getNumberOfTuples());
   com->decrRef(); comI->decrRef();
   mesh->findCommonNodes(0.004,-1,com,comI);
-  CPPUNIT_ASSERT_EQUAL(5, com->getNumberOfTuples());
+  CPPUNIT_ASSERT_EQUAL(ToIdType(5), com->getNumberOfTuples());
   //! [CppSnippet_MEDCouplingPointSet_findCommonNodes_2]
   com->decrRef(); comI->decrRef();
 }
@@ -1919,9 +1931,9 @@ void CppExample_MEDCouplingPointSet_getCoordinatesOfNode()
   using namespace MEDCoupling;
   //! [CppSnippet_MEDCouplingPointSet_getCoordinatesOfNode_1]
   double coords[18]={-0.3,-0.3, 0.2,-0.3, 0.7,-0.3};
-  MEDCouplingAutoRefCountObjectPtr<DataArrayDouble> coordsArr=DataArrayDouble::New();
+  MCAuto<DataArrayDouble> coordsArr=DataArrayDouble::New();
   coordsArr->useExternalArrayWithRWAccess(coords, 3,2);
-  MEDCouplingAutoRefCountObjectPtr<MEDCouplingUMesh> mesh=MEDCouplingUMesh::New();
+  MCAuto<MEDCouplingUMesh> mesh=MEDCouplingUMesh::New();
   mesh->setCoords(coordsArr);
   //! [CppSnippet_MEDCouplingPointSet_getCoordinatesOfNode_1]
   //! [CppSnippet_MEDCouplingPointSet_getCoordinatesOfNode_2]
@@ -1937,18 +1949,18 @@ void CppExample_DataArrayInt_buildPermutationArr()
   using namespace MEDCoupling;
   //! [CppSnippet_DataArrayInt_buildPermutationArr_1]
   DataArrayInt *a=DataArrayInt::New();
-  const int vala[5]={4,5,6,7,8};
+  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};
+  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);
+  DataArrayIdType *c=a->buildPermutationArr(*b);
   //! [CppSnippet_DataArrayInt_buildPermutationArr_1]
-  const int expect1[5]={1,0,4,2,3};
-  CPPUNIT_ASSERT_EQUAL(5,c->getNumberOfTuples());
-  CPPUNIT_ASSERT_EQUAL(1,c->getNumberOfComponents());
+  const mcIdType expect1[5]={1,0,4,2,3};
+  CPPUNIT_ASSERT_EQUAL(ToIdType(5),c->getNumberOfTuples());
+  CPPUNIT_ASSERT_EQUAL(1,(int)c->getNumberOfComponents());
   CPPUNIT_ASSERT(std::equal(expect1,expect1+5,c->getConstPointer()));
   CPPUNIT_ASSERT(a->isEqualWithoutConsideringStrAndOrder(*b));
   a->decrRef();
@@ -1960,13 +1972,13 @@ void CppExample_DataArrayInt_invertArrayO2N2N2O()
 {
   using namespace MEDCoupling;
   //! [CppSnippet_DataArrayInt_invertArrayO2N2N2O_1]
-  const int arr1[6]={2,0,4,1,5,3};
+  const mcIdType arr1[6]={2,0,4,1,5,3};
   DataArrayInt *da=DataArrayInt::New();
   da->alloc(6,1);
   std::copy(arr1,arr1+6,da->getPointer());
-  DataArrayInt *da2=da->invertArrayO2N2N2O(6);
-  const int expected1[6]={1,3,0,5,2,4};
-  for(int i=0;i<6;i++)
+  DataArrayIdType *da2=da->invertArrayO2N2N2O(6);
+  const mcIdType expected1[6]={1,3,0,5,2,4};
+  for(mcIdType i=0;i<6;i++)
     CPPUNIT_ASSERT_EQUAL(expected1[i],da2->getIJ(i,0));
   //! [CppSnippet_DataArrayInt_invertArrayO2N2N2O_1]
   da->decrRef();
@@ -1977,13 +1989,13 @@ void CppExample_DataArrayInt_invertArrayN2O2O2N()
 {
   using namespace MEDCoupling;
   //! [CppSnippet_DataArrayInt_invertArrayN2O2O2N_1]
-  const int arr1[6]={2,0,4,1,5,3};
+  const mcIdType arr1[6]={2,0,4,1,5,3};
   DataArrayInt *da=DataArrayInt::New();
   da->alloc(6,1);
   std::copy(arr1,arr1+6,da->getPointer());
-  DataArrayInt *da2=da->invertArrayN2O2O2N(6);
-  const int expected1[6]={1,3,0,5,2,4};
-  for(int i=0;i<6;i++)
+  DataArrayIdType *da2=da->invertArrayN2O2O2N(6);
+  const mcIdType expected1[6]={1,3,0,5,2,4};
+  for(mcIdType i=0;i<6;i++)
     CPPUNIT_ASSERT_EQUAL(expected1[i],da2->getIJ(i,0));
   //! [CppSnippet_DataArrayInt_invertArrayN2O2O2N_1]
   da->decrRef();
@@ -1998,7 +2010,7 @@ void CppExample_DataArrayDouble_getIdsInRange()
   da->alloc(10,1);
   da->iota();
 
-  DataArrayInt* da2 = da->getIdsInRange( 2.5, 6 );
+  DataArrayIdType* da2 = da->findIdsInRange( 2.5, 6 );
   //! [CppSnippet_DataArrayDouble_getIdsInRange_1]
   da->decrRef();
   da2->decrRef();
@@ -2020,11 +2032,11 @@ void CppExample_DataArrayDouble_findCommonTuples()
   std::copy(array2,array2+12,da->getPointer());
   //! [CppSnippet_DataArrayDouble_findCommonTuples1]
   //! [CppSnippet_DataArrayDouble_findCommonTuples2]
-  DataArrayInt *c=0,*cI=0;
+  DataArrayIdType *c=0,*cI=0;
   da->findCommonTuples(1.01e-1,-1,c,cI);
 
-  const int expected3[5]={0,3,4,1,2};
-  const int expected4[3]={0,3,5};
+  const mcIdType expected3[5]={0,3,4,1,2};
+  const mcIdType expected4[3]={0,3,5};
   CPPUNIT_ASSERT(std::equal(expected3,expected3+5,c->getConstPointer()));
   CPPUNIT_ASSERT(std::equal(expected4,expected4+3,cI->getConstPointer()));
   c->decrRef();
@@ -2037,7 +2049,7 @@ void CppExample_DataArrayDouble_Meld1()
 {
   using namespace MEDCoupling;
   //! [CppSnippet_DataArrayDouble_Meld1_1]
-  const int sameNbTuples = 7;
+  const mcIdType sameNbTuples = 7;
 
   DataArrayDouble *da1=DataArrayDouble::New();
   da1->alloc(sameNbTuples,2);
@@ -2062,7 +2074,7 @@ void CppExample_DataArrayInt_Meld1()
 {
   using namespace MEDCoupling;
   //! [CppSnippet_DataArrayInt_Meld1_1]
-  const int sameNbTuples = 7;
+  const mcIdType sameNbTuples = 7;
 
   DataArrayInt *da1=DataArrayInt::New();
   da1->alloc(sameNbTuples,2);
@@ -2098,18 +2110,18 @@ void CppExampleFieldDoubleBuildSubPart1()
   array->decrRef();
   //! [CppSnippetFieldDoubleBuildSubPart1_1]
   //! [CppSnippetFieldDoubleBuildSubPart1_2]
-  const int part1[3]={2,1,4};
+  const mcIdType part1[3]={2,1,4};
   MEDCoupling::MEDCouplingFieldDouble *f2=f1->buildSubPart(part1,part1+3);
   //! [CppSnippetFieldDoubleBuildSubPart1_2]
   f2->zipCoords();
-  CPPUNIT_ASSERT_EQUAL(3,f2->getMesh()->getNumberOfCells());
-  CPPUNIT_ASSERT_EQUAL(6,f2->getMesh()->getNumberOfNodes());
+  CPPUNIT_ASSERT_EQUAL(ToIdType(3),f2->getMesh()->getNumberOfCells());
+  CPPUNIT_ASSERT_EQUAL(ToIdType(6),f2->getMesh()->getNumberOfNodes());
   CPPUNIT_ASSERT_EQUAL(2,f2->getMesh()->getSpaceDimension());
   CPPUNIT_ASSERT_EQUAL(2,f2->getMesh()->getMeshDimension());
   MEDCoupling::MEDCouplingUMesh *m2C=dynamic_cast<MEDCoupling::MEDCouplingUMesh *>(const_cast<MEDCoupling::MEDCouplingMesh *>(f2->getMesh()));
-  CPPUNIT_ASSERT_EQUAL(13,m2C->getMeshLength());
+  CPPUNIT_ASSERT_EQUAL(ToIdType(13),m2C->getNodalConnectivityArrayLen());
   const double expected2[12]={0.2, -0.3, 0.7, -0.3, 0.2, 0.2, 0.7, 0.2, 0.2, 0.7, 0.7, 0.7};
-  for(int i=0;i<12;i++)
+  for(mcIdType i=0;i<12;i++)
     CPPUNIT_ASSERT_DOUBLES_EQUAL(expected2[i],m2C->getCoords()->getIJ(0,i),1.e-12);
   const double expected3[13]={3,2,3,1,3,0,2,1,4,4,5,3,2};
   CPPUNIT_ASSERT(std::equal(expected3,expected3+13,m2C->getNodalConnectivity()->getConstPointer()));
@@ -2129,20 +2141,20 @@ void CppExampleFieldDoubleBuildSubPart1()
   array->decrRef();
   //! [CppSnippetFieldDoubleBuildSubPart1_3]
   //! [CppSnippetFieldDoubleBuildSubPart1_4]
-  const int part2[2]={1,2};
+  const mcIdType part2[2]={1,2};
   f2=f1->buildSubPart(part2,part2+2);
   //! [CppSnippetFieldDoubleBuildSubPart1_4]
   f2->decrRef();
   //idem previous because nodes of cell#4 are not fully present in part3 
-  const int part3[2]={1,2};
-  MEDCoupling::DataArrayInt *arrr=MEDCoupling::DataArrayInt::New();
+  const mcIdType part3[2]={1,2};
+  MEDCoupling::DataArrayIdType *arrr=MEDCoupling::DataArrayIdType::New();
   arrr->alloc(2,1);
   std::copy(part3,part3+2,arrr->getPointer());
   f2=f1->buildSubPart(arrr);
   arrr->decrRef();
   f2->decrRef();
   //
-  const int part4[3]={1,2,4};
+  const mcIdType part4[3]={1,2,4};
   f2=f1->buildSubPart(part4,part4+3);
   f2->decrRef();
   //
@@ -2156,7 +2168,7 @@ void CppSnippetUMeshStdBuild1()
   //! [CppSnippetUMeshStdBuild1_1]
   double coords[27]={-0.3,-0.3,0.,   0.2,-0.3,0.,   0.7,-0.3,0.,   -0.3,0.2,0.,   0.2,0.2,0., 
                      0.7,0.2,0.,    -0.3,0.7,0.,    0.2,0.7,0.,     0.7,0.7,0. };
-  int nodalConnPerCell[18]={0,3,4,1, 1,4,2, 4,5,2, 6,7,4,3, 7,8,5,4};
+  mcIdType nodalConnPerCell[18]={0,3,4,1, 1,4,2, 4,5,2, 6,7,4,3, 7,8,5,4};
   //! [CppSnippetUMeshStdBuild1_1]
   //! [CppSnippetUMeshStdBuild1_2]
   MEDCoupling::MEDCouplingUMesh *mesh=MEDCoupling::MEDCouplingUMesh::New("My2DMesh",2);
@@ -2177,7 +2189,7 @@ void CppSnippetUMeshStdBuild1()
   mesh->setCoords(coordsArr);//coordsArr contains 9 tuples, that is to say mesh contains 9 nodes.
   coordsArr->decrRef();
   //! [CppSnippetUMeshStdBuild1_4]
-  mesh->checkCoherency();
+  mesh->checkConsistencyLight();
   //! [CppSnippetUMeshStdBuild1_5]
   mesh->decrRef();
   //! [CppSnippetUMeshStdBuild1_5]
@@ -2204,8 +2216,8 @@ void CppSnippetCMeshStdBuild1()
   arrY->decrRef();
   //! [CppSnippetCMeshStdBuild1_2]
   //! [CppSnippetCMeshStdBuild1_3]
-  CPPUNIT_ASSERT_EQUAL(8*6,mesh->getNumberOfCells());
-  CPPUNIT_ASSERT_EQUAL(9*7,mesh->getNumberOfNodes());
+  CPPUNIT_ASSERT_EQUAL(ToIdType(8*6),mesh->getNumberOfCells());
+  CPPUNIT_ASSERT_EQUAL(ToIdType(9*7),mesh->getNumberOfNodes());
   CPPUNIT_ASSERT_EQUAL(2,mesh->getSpaceDimension());
   CPPUNIT_ASSERT_EQUAL(2,mesh->getMeshDimension());
   //! [CppSnippetCMeshStdBuild1_3]
@@ -2219,8 +2231,8 @@ void CppSnippetCMeshStdBuild1()
   mesh->setCoordsAt(1,arrY);
   arrY->decrRef();
   //! [CppSnippetCMeshStdBuild1_2bis]
-  CPPUNIT_ASSERT_EQUAL(8*6,mesh->getNumberOfCells());
-  CPPUNIT_ASSERT_EQUAL(9*7,mesh->getNumberOfNodes());
+  CPPUNIT_ASSERT_EQUAL(ToIdType(8*6),mesh->getNumberOfCells());
+  CPPUNIT_ASSERT_EQUAL(ToIdType(9*7),mesh->getNumberOfNodes());
   CPPUNIT_ASSERT_EQUAL(2,mesh->getSpaceDimension());
   CPPUNIT_ASSERT_EQUAL(2,mesh->getMeshDimension());
   //! [CppSnippetCMeshStdBuild1_4]
@@ -2233,22 +2245,22 @@ void CppSnippetUMeshAdvBuild1()
   //! [CppSnippetUMeshAdvBuild1_1]
   double coords[27]={-0.3,-0.3,0.,   0.2,-0.3,0.,   0.7,-0.3,0.,   -0.3,0.2,0.,   0.2,0.2,0., 
                      0.7,0.2,0.,    -0.3,0.7,0.,    0.2,0.7,0.,     0.7,0.7,0. };
-  int nodalConnPerCell[23]={4,0,3,4,1, 3,1,4,2, 3,4,5,2, 4,6,7,4,3, 4,7,8,5,4};
-  int nodalConnPerCellIndex[6]={0,5,9,13,18,23};
+  mcIdType nodalConnPerCell[23]={4,0,3,4,1, 3,1,4,2, 3,4,5,2, 4,6,7,4,3, 4,7,8,5,4};
+  mcIdType nodalConnPerCellIndex[6]={0,5,9,13,18,23};
   //! [CppSnippetUMeshAdvBuild1_1]
   //! [CppSnippetUMeshAdvBuild1_2]
   MEDCoupling::MEDCouplingUMesh *mesh=MEDCoupling::MEDCouplingUMesh::New("My2DMesh",2);
   //! [CppSnippetUMeshAdvBuild1_2]
   //! [CppSnippetUMeshAdvBuild1_3]
-  MEDCoupling::DataArrayInt *nodalConn=MEDCoupling::DataArrayInt::New();
+  MEDCoupling::DataArrayIdType *nodalConn=MEDCoupling::DataArrayIdType::New();
   nodalConn->alloc(23,1);
   std::copy(nodalConnPerCell,nodalConnPerCell+23,nodalConn->getPointer());
-  MEDCoupling::DataArrayInt *nodalConnI=MEDCoupling::DataArrayInt::New();
+  MEDCoupling::DataArrayIdType *nodalConnI=MEDCoupling::DataArrayIdType::New();
   nodalConnI->alloc(6,1);
   std::copy(nodalConnPerCellIndex,nodalConnPerCellIndex+6,nodalConnI->getPointer());
   mesh->setConnectivity(nodalConn,nodalConnI,true);
-  nodalConn->decrRef();// nodalConn DataArrayInt instance is owned by mesh after call to setConnectivity method. No more need here -> decrRef()
-  nodalConnI->decrRef();// nodalConnI DataArrayInt instance is owned by mesh after call to setConnectivity method. No more need here -> decrRef()
+  nodalConn->decrRef();// nodalConn DataArrayIdType instance is owned by mesh after call to setConnectivity method. No more need here -> decrRef()
+  nodalConnI->decrRef();// nodalConnI DataArrayIdType instance is owned by mesh after call to setConnectivity method. No more need here -> decrRef()
   //! [CppSnippetUMeshAdvBuild1_3]
   //! [CppSnippetUMeshAdvBuild1_4]
   MEDCoupling::DataArrayDouble *coordsArr=MEDCoupling::DataArrayDouble::New();
@@ -2257,7 +2269,7 @@ void CppSnippetUMeshAdvBuild1()
   mesh->setCoords(coordsArr);//coordsArr contains 9 tuples, that is to say mesh contains 9 nodes.
   coordsArr->decrRef();
   //! [CppSnippetUMeshAdvBuild1_4]
-  mesh->checkCoherency();
+  mesh->checkConsistencyLight();
   //! [CppSnippetUMeshAdvBuild1_5]
   mesh->decrRef();
   //! [CppSnippetUMeshAdvBuild1_5]
@@ -2266,7 +2278,7 @@ void CppSnippetUMeshAdvBuild1()
 void CppSnippetDataArrayBuild1()
 {
   //! [CppSnippetDataArrayBuild1_0]
-  const int nbOfNodes=12;
+  const mcIdType nbOfNodes=12;
   double coords[3*nbOfNodes]={2.,3.,4.,3.,4.,5.,4.,5.,6.,5.,6.,7.,6.,7.,8.,7.,8.,9.,8.,9.,10.,9.,10.,11.,10.,11.,12.,11.,12.,13.,12.,13.,14.,13.,14.,15.};
   //
   MEDCoupling::DataArrayDouble *coordsArr=0;
@@ -2275,7 +2287,7 @@ void CppSnippetDataArrayBuild1()
   //
   //! [CppSnippetDataArrayBuild1_1]
   coordsArr=MEDCoupling::DataArrayDouble::New();
-  coordsArr->useArray(coords,false,MEDCoupling::CPP_DEALLOC,nbOfNodes,3);
+  coordsArr->useArray(coords,false,MEDCoupling::DeallocType::CPP_DEALLOC,nbOfNodes,3);
   //now use coordsArr as you need
   //...
   //coordsArr is no more useful here : release it
@@ -2285,7 +2297,7 @@ void CppSnippetDataArrayBuild1()
   coordsArr=MEDCoupling::DataArrayDouble::New();
   tmp=new double[3*nbOfNodes];
   std::copy(coords,coords+3*nbOfNodes,tmp);
-  coordsArr->useArray(tmp,true,MEDCoupling::CPP_DEALLOC,nbOfNodes,3);
+  coordsArr->useArray(tmp,true,MEDCoupling::DeallocType::CPP_DEALLOC,nbOfNodes,3);
   //now use coordsArr as you need
   //...
   //coordsArr is no more useful, release it
@@ -2295,7 +2307,7 @@ void CppSnippetDataArrayBuild1()
   coordsArr=MEDCoupling::DataArrayDouble::New();
   tmp=(double *)malloc(3*nbOfNodes*sizeof(double));
   std::copy(coords,coords+3*nbOfNodes,tmp);
-  coordsArr->useArray(tmp,true,MEDCoupling::C_DEALLOC,nbOfNodes,3);
+  coordsArr->useArray(tmp,true,MEDCoupling::DeallocType::C_DEALLOC,nbOfNodes,3);
   //now use coordsArr as you need
   //...
   //coordsArr is no more useful here : release it
@@ -2318,7 +2330,7 @@ void CppSnippetDataArrayBuild1()
   std::copy(coords,coords+3*nbOfNodes,tmp);
   MEDCoupling::DataArrayDouble *coordsArrCpy=0;
   //! [CppSnippetDataArrayBuild1_5]
-  coordsArrCpy=coordsArr->deepCpy();
+  coordsArrCpy=coordsArr->deepCopy();
   //! [CppSnippetDataArrayBuild1_5]
   //! [CppSnippetDataArrayBuild1_6]
   CPPUNIT_ASSERT(coordsArrCpy->isEqual(*coordsArr,1e-12));
@@ -2329,14 +2341,14 @@ void CppSnippetDataArrayBuild1()
   coordsArrCpy->decrRef();
   //! [CppSnippetDataArrayBuild1_7]
   //! [CppSnippetDataArrayBuild1_5bis]
-  coordsArrCpy=coordsArr->performCpy(true);
+  coordsArrCpy=coordsArr->performCopyOrIncrRef(true);
   //! [CppSnippetDataArrayBuild1_5bis]
   CPPUNIT_ASSERT(coordsArrCpy->isEqual(*coordsArr,1e-12));
   coordsArrCpy->setIJ(0,0,1000.);
   CPPUNIT_ASSERT(!coordsArrCpy->isEqual(*coordsArr,1e-12));//coordsArrCpy only has been modified
   coordsArrCpy->decrRef();
   //! [CppSnippetDataArrayBuild1_8]
-  coordsArrCpy=coordsArr->performCpy(false);
+  coordsArrCpy=coordsArr->performCopyOrIncrRef(false);
   //! [CppSnippetDataArrayBuild1_8]
   //! [CppSnippetDataArrayBuild1_9]
   CPPUNIT_ASSERT(coordsArrCpy->isEqual(*coordsArr,1e-12));
@@ -2350,7 +2362,7 @@ void CppSnippetDataArrayBuild1()
   coordsArrCpy=MEDCoupling::DataArrayDouble::New();
   //! [CppSnippetDataArrayBuild1_11]
   //! [CppSnippetDataArrayBuild1_12]
-  coordsArrCpy->cpyFrom(*coordsArr);
+  coordsArrCpy->deepCopyFrom(*coordsArr);
   //! [CppSnippetDataArrayBuild1_12]
   //! [CppSnippetDataArrayBuild1_13]
   CPPUNIT_ASSERT(coordsArrCpy->isEqual(*coordsArr,1e-12));
@@ -2378,7 +2390,7 @@ void CppSnippetFieldDoubleBuild1()
   fieldOnCells->setMesh(mesh);
   mesh->decrRef(); // no more need of mesh because mesh has been attached to fieldOnCells
   MEDCoupling::DataArrayDouble *array=MEDCoupling::DataArrayDouble::New();
-  array->alloc(fieldOnCells->getMesh()->getNumberOfCells(),9);//Implicitely fieldOnCells will be a 9 components field.
+  array->alloc(fieldOnCells->getMesh()->getNumberOfCells(),9);//Implicitly fieldOnCells will be a 9 components field.
   array->fillWithValue(7.);
   fieldOnCells->setArray(array);
   array->decrRef();
@@ -2430,7 +2442,7 @@ void CppSnippetFieldDoubleBuild2()
   fieldOnNodes->setMesh(mesh);
   mesh->decrRef(); // no more need of mesh because mesh has been attached to fieldOnNodes
   MEDCoupling::DataArrayDouble *array=MEDCoupling::DataArrayDouble::New();
-  array->alloc(fieldOnNodes->getMesh()->getNumberOfNodes(),1);//Implicitely fieldOnNodes will be a 1 component field.
+  array->alloc(fieldOnNodes->getMesh()->getNumberOfNodes(),1);//Implicitly fieldOnNodes will be a 1 component field.
   array->fillWithValue(8.);
   fieldOnNodes->setArray(array);
   array->decrRef();
@@ -2457,7 +2469,7 @@ void CppSnippetFieldDoubleBuild3()
   fieldOnCells->setMesh(mesh);
   mesh->decrRef(); // no more need of mesh because mesh has been attached to fieldOnCells
   MEDCoupling::DataArrayDouble *array=MEDCoupling::DataArrayDouble::New();
-  array->alloc(fieldOnCells->getMesh()->getNumberOfCells(),2);//Implicitely fieldOnCells will be a 2 components field.
+  array->alloc(fieldOnCells->getMesh()->getNumberOfCells(),2);//Implicitly fieldOnCells will be a 2 components field.
   array->fillWithValue(7.);
   fieldOnCells->setArray(array);
   array->decrRef();
@@ -2485,7 +2497,7 @@ void CppSnippetFieldDoubleBuild4()
   fieldOnNodes->setMesh(mesh);
   mesh->decrRef(); // no more need of mesh because mesh has been attached to fieldOnNodes
   MEDCoupling::DataArrayDouble *array=MEDCoupling::DataArrayDouble::New();
-  array->alloc(fieldOnNodes->getMesh()->getNumberOfNodes(),3);//Implicitely fieldOnNodes will be a 3 components field.
+  array->alloc(fieldOnNodes->getMesh()->getNumberOfNodes(),3);//Implicitly fieldOnNodes will be a 3 components field.
   array->fillWithValue(8.);
   fieldOnNodes->setArray(array);
   array->decrRef();