0021100: [CEA 438] Porting of MEDMEM on MEDfile3 alpha2

diff --git a/doc/MEDMEM/FIELDcreate.cxx b/doc/MEDMEM/FIELDcreate.cxx
index 30451bab76f76d2f0ed2c5ca0746adb791ea710b..a579b80a74588dbac217bed114bca8e3ddf892d8 100644 (file)
--- a/doc/MEDMEM/FIELDcreate.cxx
+++ b/doc/MEDMEM/FIELDcreate.cxx
@@ -74,7 +74,7 @@ int main (int argc, char ** argv) {
   myField.setTime(Time) ;
 
   // Value :
-  int NumberOfValue = mySupport->getNumberOfElements(MED_ALL_ELEMENTS);
+  int NumberOfValue = mySupport->getNumberOfElements(MEDMEM_ALL_ELEMENTS);
   for(int i=1; i<=NumberOfValue; i++) // i^th element
     for (int j=1; j<=NumberOfCompoennts; j++) { // j^th component
       double myValue = (i+j) * 0.1 ;

diff --git a/doc/MEDMEM/FIELDcreate.py b/doc/MEDMEM/FIELDcreate.py
index 0eb5801d76b7235e5ae0cc530e0ed5cd192a8cb8..c2dc59c3773793c5ca2351c64745e80e76841cad 100644 (file)
--- a/doc/MEDMEM/FIELDcreate.py
+++ b/doc/MEDMEM/FIELDcreate.py
@@ -66,7 +66,7 @@ myField.setOrderNumber(orderNumber)
 time = 3.435678
 myField.setTime(time)
 
-numberOfValue = mySupport.getNumberOfElements(MED_ALL_ELEMENTS)
+numberOfValue = mySupport.getNumberOfElements(MEDMEM_ALL_ELEMENTS)
 
 for i in range(numberOfValue):
     ip1 = i+1

diff --git a/doc/MEDMEM/FIELDgeneral.cxx b/doc/MEDMEM/FIELDgeneral.cxx
index 06bf41a89d2238d29b7f993c20b724698579e9b6..0b9178de45170abb5e594f4ae88822e4eef81f52 100644 (file)
--- a/doc/MEDMEM/FIELDgeneral.cxx
+++ b/doc/MEDMEM/FIELDgeneral.cxx
@@ -68,7 +68,7 @@ int main (int argc, char ** argv) {
     " (and order number " << OrderNumber << ")" << endl ;
 
   // How many Value :
-  int NumberOfValue = mySupport->getNumberOfElements(MED_ALL_ELEMENTS);
+  int NumberOfValue = mySupport->getNumberOfElements(MEDMEM_ALL_ELEMENTS);
   // Value
   const double * Value = myField.getValue();
   for(int i=0; i<NumberOfValue; i++) {

diff --git a/doc/MEDMEM/FIELDgeneral.py b/doc/MEDMEM/FIELDgeneral.py
index bb97017565efbd3267256ab6c333feab67388ee0..c2bd995a89628972709cdc901d001e5873edf63f 100644 (file)
--- a/doc/MEDMEM/FIELDgeneral.py
+++ b/doc/MEDMEM/FIELDgeneral.py
@@ -58,7 +58,7 @@ time = myField.getTime()
 print "Iteration ",iterationNumber,"  at time ",time,\
       " (and order number ",orderNumber,")"
 
-numberOfValue = mySupport.getNumberOfElements(MED_ALL_ELEMENTS)
+numberOfValue = mySupport.getNumberOfElements(MEDMEM_ALL_ELEMENTS)
 value = myField.getValue()
 
 for i in range(numberOfValue):

diff --git a/doc/MEDMEM/MEDMEM_Content.tex.in b/doc/MEDMEM/MEDMEM_Content.tex.in
index f171e248c0235f6530bcb46a4d80906a96373c89..db50cff9a6cd7ccd8ffab158074042f642310242 100644 (file)
--- a/doc/MEDMEM/MEDMEM_Content.tex.in
+++ b/doc/MEDMEM/MEDMEM_Content.tex.in
@@ -220,25 +220,25 @@ available types are linear and quadratic elements (consult
 \cite{RefManualMedMemory}). The entries of the enum are quite
 self-explanatory~:
 \begin{itemize}
-\item \verb+MED_NONE+
-\item \verb+MED_POINT1+
-\item \verb+MED_SEG2+
-\item \verb+MED_SEG3+
-\item \verb+MED_TRIA3+
-\item \verb+MED_QUAD4+
-\item \verb+MED_TRIA6+
-\item \verb+MED_QUAD8+
-\item \verb+MED_TETRA4+
-\item \verb+MED_PYRA5+
-\item \verb+MED_PENTA6+
-\item \verb+MED_HEXA8+
-\item \verb+MED_TETRA10+
-\item \verb+MED_PYRA13+
-\item \verb+MED_PENTA15+
-\item \verb+MED_HEXA20+
-\item \verb+MED_POLYGON+
-\item \verb+MED_POLYHEDRA+
-\item \verb+MED_ALL_ELEMENTS+
+\item \verb+MEDMEM_NONE+
+\item \verb+MEDMEM_POINT1+
+\item \verb+MEDMEM_SEG2+
+\item \verb+MEDMEM_SEG3+
+\item \verb+MEDMEM_TRIA3+
+\item \verb+MEDMEM_QUAD4+
+\item \verb+MEDMEM_TRIA6+
+\item \verb+MEDMEM_QUAD8+
+\item \verb+MEDMEM_TETRA4+
+\item \verb+MEDMEM_PYRA5+
+\item \verb+MEDMEM_PENTA6+
+\item \verb+MEDMEM_HEXA8+
+\item \verb+MEDMEM_TETRA10+
+\item \verb+MEDMEM_PYRA13+
+\item \verb+MEDMEM_PENTA15+
+\item \verb+MEDMEM_HEXA20+
+\item \verb+MEDMEM_POLYGON+
+\item \verb+MEDMEM_POLYHEDRA+
+\item \verb+MEDMEM_ALL_ELEMENTS+
 \end{itemize}
 \item
 an enum which contains the different mesh entities, \verb+medEntityMesh+, the
@@ -385,7 +385,7 @@ type of this entity.
 
 \textbf{C++ Example~:}
 
-\verb+int NumberOfTriangle = myMesh.getNumberOfElements(MED_FACE,MED_TRIA3);+
+\verb+int NumberOfTriangle = myMesh.getNumberOfElements(MED_FACE,MEDMEM_TRIA3);+
 
 \verb+int NumberOfFace = myMesh.getNumberOfElements(MED_FACE,MED_ALL_ELEMENT);+
 
@@ -408,18 +408,18 @@ return an array with connectivity values.
 \textbf{C++ Example~:}
 
 \begin{verbatim}
-int NumberOfTetrahedron = myMesh.getNumberOfElements(MED_CELL,MED_TETRA4);
+int NumberOfTetrahedron = myMesh.getNumberOfElements(MED_CELL,MEDMEM_TETRA4);
 const int * TetrahedronConnectivity =
          myMesh.getConnectivity(MED_FULL_ENTERLACE,
                                 MED_NODAL,
                                 MED_CELL,
-                                MED_TETRA4);
+                                MEDMEM_TETRA4);
 \end{verbatim}
 \verb+TetrahedronConnectivity+ contain nodal connectivity
 of tetrahedron in mesh. It is arranged in full enterlace mode and
 its size is \verb+NumberOfTetrahedron x 4+.
 
-If you want to get connectivity of all elements (with \verb+Type=MED_ALL_ELEMENTS+),
+If you want to get connectivity of all elements (with \verb+Type=MEDMEM_ALL_ELEMENTS+),
 you must use the index array (return by \method{getConnectivityIndex})
 to get connectivity for each elements (see example \myref{MESHconnectivities.cxx}).
 
@@ -685,10 +685,10 @@ MESHING myMeshing ;
 myMeshing.setCoordinates(SpaceDimension,NumberOfNodes,Coordinates,System,Mode);
 
 myMeshing.setNumberOfTypes(2,MED_CELL);
-myMeshing.setTypes({MED_TRIA3,MED_QUAD4},MED_CELL);
-myMeshing.setNumberOfElements({3,2},MED_CELL); // 3 MED_TRIA3 and 2 MED_QUAD4
-myMeshing.setConnectivity({1,2,3,6,8,9,4,5,6},MED_CELL,MED_TRIA3);
-myMeshing.setConnectivity({1,3,4,5,4,5,7,8},MED_CELL,MED_QUAD4);
+myMeshing.setTypes({MEDMEM_TRIA3,MEDMEM_QUAD4},MED_CELL);
+myMeshing.setNumberOfElements({3,2},MED_CELL); // 3 MEDMEM_TRIA3 and 2 MEDMEM_QUAD4
+myMeshing.setConnectivity({1,2,3,6,8,9,4,5,6},MED_CELL,MEDMEM_TRIA3);
+myMeshing.setConnectivity({1,3,4,5,4,5,7,8},MED_CELL,MEDMEM_QUAD4);
 \end{verbatim}
 
 

diff --git a/doc/MEDMEM/MEDMEM_UsersGuide.lyx b/doc/MEDMEM/MEDMEM_UsersGuide.lyx
index e0008ba8c579fcc67a1cd75e900048cc4d41debd..77a677e17f9e47c7a2fab4c91a81350789d9c44c 100644 (file)
--- a/doc/MEDMEM/MEDMEM_UsersGuide.lyx
+++ b/doc/MEDMEM/MEDMEM_UsersGuide.lyx
@@ -488,7 +488,7 @@ C++ Example\SpecialChar ~
 \latex latex 
 
 \backslash 
-verb+int NumberOfTriangle = myMesh.getNumberOfElements(MED_FACE,MED_TRIA3);+
+verb+int NumberOfTriangle = myMesh.getNumberOfElements(MED_FACE,MEDMEM_TRIA3);+
 \layout Standard
 
 
@@ -574,7 +574,7 @@ C++ Example\SpecialChar ~
 \backslash 
 begin{verbatim}
 \newline 
-int NumberOfTetrahedron = myMesh.getNumberOfElements(MED_CELL,MED_TETRA4);
+int NumberOfTetrahedron = myMesh.getNumberOfElements(MED_CELL,MEDMEM_TETRA4);
 \newline 
 int * TetrahedronConnectivity =
 \newline 
@@ -584,7 +584,7 @@ int * TetrahedronConnectivity =
 \newline 
                                 MED_CELL,
 \newline 
-                                MED_TETRA4);
+                                MEDMEM_TETRA4);
 \newline 
 
 \backslash 
@@ -606,7 +606,7 @@ If you want to get connectivity of all elements (with
 \latex latex 
 
 \backslash 
-verb+Type=MED_ALL_ELEMENTS+
+verb+Type=MEDMEM_ALL_ELEMENTS+
 \latex default 
 ), you must use the index array (return by 
 \latex latex 

diff --git a/doc/MEDMEM/MESHINGexample.cxx b/doc/MEDMEM/MESHINGexample.cxx
index ee702fa6c793edc43c74c1badac9eda3d2abe11e..3c85ce73ef558a0f0ab96e3f07d1d656c86a73c4 100644 (file)
--- a/doc/MEDMEM/MESHINGexample.cxx
+++ b/doc/MEDMEM/MESHINGexample.cxx
@@ -75,7 +75,7 @@ int main (int argc, char ** argv) {
   // cell part
   
   const int NumberOfTypes = 3 ;
-  medGeometryElement Types[NumberOfTypes] = {MED_TETRA4,MED_PYRA5,MED_HEXA8} ;
+  medGeometryElement Types[NumberOfTypes] = {MEDMEM_TETRA4,MEDMEM_PYRA5,MEDMEM_HEXA8} ;
   const int NumberOfElements[NumberOfTypes] = {12,2,2} ;
 
   myMeshing->setNumberOfTypes(NumberOfTypes,MED_CELL);
@@ -99,7 +99,7 @@ int main (int argc, char ** argv) {
     2,10,6,9
   };
   
-  myMeshing->setConnectivity(MED_CELL,MED_TETRA4,ConnectivityTetra);
+  myMeshing->setConnectivity(MED_CELL,MEDMEM_TETRA4,ConnectivityTetra);
 
   int ConnectivityPyra[2*5]=
   {
@@ -107,7 +107,7 @@ int main (int argc, char ** argv) {
     15,18,17,16,19
   };
 
-  myMeshing->setConnectivity(MED_CELL,MED_PYRA5,ConnectivityPyra);
+  myMeshing->setConnectivity(MED_CELL,MEDMEM_PYRA5,ConnectivityPyra);
 
   int ConnectivityHexa[2*8]=
   {
@@ -115,12 +115,12 @@ int main (int argc, char ** argv) {
     15,16,17,18,11,12,13,14
   };
 
-  myMeshing->setConnectivity(MED_CELL,MED_HEXA8,ConnectivityHexa);
+  myMeshing->setConnectivity(MED_CELL,MEDMEM_HEXA8,ConnectivityHexa);
 
   // face part
 
   const int NumberOfFacesTypes = 2 ;
-  medGeometryElement FacesTypes[NumberOfFacesTypes] = {MED_TRIA3,MED_QUAD4} ;
+  medGeometryElement FacesTypes[NumberOfFacesTypes] = {MEDMEM_TRIA3,MEDMEM_QUAD4} ;
   const int NumberOfFacesElements[NumberOfFacesTypes] = {4,4} ;
 
   myMeshing->setNumberOfTypes(NumberOfFacesTypes,MED_FACE);
@@ -136,7 +136,7 @@ int main (int argc, char ** argv) {
     1,3,6
   };
   
-  myMeshing->setConnectivity(MED_FACE,MED_TRIA3,ConnectivityTria);
+  myMeshing->setConnectivity(MED_FACE,MEDMEM_TRIA3,ConnectivityTria);
 
   int ConnectivityQua[4*4]=
   {
@@ -146,7 +146,7 @@ int main (int argc, char ** argv) {
     12,8,9,13
   };
 
-  myMeshing->setConnectivity(MED_FACE,MED_QUAD4,ConnectivityQua);
+  myMeshing->setConnectivity(MED_FACE,MEDMEM_QUAD4,ConnectivityQua);
 
   // edge part
 
@@ -161,7 +161,7 @@ int main (int argc, char ** argv) {
     myGroup->setMesh(myMeshing);
     myGroup->setEntity(MED_NODE);
     myGroup->setNumberOfGeometricType(1);
-    medGeometryElement myTypes[1] = {MED_NONE};
+    medGeometryElement myTypes[1] = {MEDMEM_NONE};
     myGroup->setGeometricType(myTypes);
     const int myNumberOfElements[1] = {4} ;
     myGroup->setNumberOfElements(myNumberOfElements);
@@ -178,7 +178,7 @@ int main (int argc, char ** argv) {
     myGroup->setMesh(myMeshing);
     myGroup->setEntity(MED_NODE);
     myGroup->setNumberOfGeometricType(1);
-    medGeometryElement myTypes[1] = {MED_NONE};
+    medGeometryElement myTypes[1] = {MEDMEM_NONE};
     myGroup->setGeometricType(myTypes);
     const int myNumberOfElements[1] = {3} ;
     myGroup->setNumberOfElements(myNumberOfElements);
@@ -197,7 +197,7 @@ int main (int argc, char ** argv) {
     myGroup->setMesh(myMeshing);
     myGroup->setEntity(MED_CELL);
     myGroup->setNumberOfGeometricType(3);
-    medGeometryElement myTypes[3] = {MED_TETRA4,MED_PYRA5,MED_HEXA8};
+    medGeometryElement myTypes[3] = {MEDMEM_TETRA4,MEDMEM_PYRA5,MEDMEM_HEXA8};
     myGroup->setGeometricType(myTypes);
     const int myNumberOfElements[3] = {4,1,2} ;
     myGroup->setNumberOfElements(myNumberOfElements);
@@ -219,7 +219,7 @@ int main (int argc, char ** argv) {
     myGroup->setMesh(myMeshing);
     myGroup->setEntity(MED_CELL);
     myGroup->setNumberOfGeometricType(2);
-    medGeometryElement myTypes[] = {MED_TETRA4,MED_PYRA5};
+    medGeometryElement myTypes[] = {MEDMEM_TETRA4,MEDMEM_PYRA5};
     myGroup->setGeometricType(myTypes);
     const int myNumberOfElements[] = {4,1} ;
     myGroup->setNumberOfElements(myNumberOfElements);
@@ -242,7 +242,7 @@ int main (int argc, char ** argv) {
     myGroup->setMesh(myMeshing);
     myGroup->setEntity(MED_FACE);
     myGroup->setNumberOfGeometricType(2);
-    medGeometryElement myTypes[2] = {MED_TRIA3,MED_QUAD4};
+    medGeometryElement myTypes[2] = {MEDMEM_TRIA3,MEDMEM_QUAD4};
     myGroup->setGeometricType(myTypes);
     const int myNumberOfElements[2] = {2,3} ;
     myGroup->setNumberOfElements(myNumberOfElements);
@@ -263,7 +263,7 @@ int main (int argc, char ** argv) {
     myGroup->setMesh(myMeshing);
     myGroup->setEntity(MED_FACE);
     myGroup->setNumberOfGeometricType(1);
-    medGeometryElement myTypes[1] = {MED_TRIA3};
+    medGeometryElement myTypes[1] = {MEDMEM_TRIA3};
     myGroup->setGeometricType(myTypes);
     const int myNumberOfElements[1] = {2} ;
     myGroup->setNumberOfElements(myNumberOfElements);

diff --git a/doc/MEDMEM/MESHINGexample.py b/doc/MEDMEM/MESHINGexample.py
index dd18d2ff9d0855b3885091464fcf46950c4ca545..a05a00319c6fbd0ad0c35c873870c7f13ae785e4 100644 (file)
--- a/doc/MEDMEM/MESHINGexample.py
+++ b/doc/MEDMEM/MESHINGexample.py
@@ -93,13 +93,13 @@ entity = MED_CELL
 types = []
 numberOfElements = []
 
-types.append(MED_TETRA4)
+types.append(MEDMEM_TETRA4)
 numberOfElements.append(12)
 
-types.append(MED_PYRA5)
+types.append(MEDMEM_PYRA5)
 numberOfElements.append(2)
 
-types.append(MED_HEXA8)
+types.append(MEDMEM_HEXA8)
 numberOfElements.append(2)
 
 myMeshing.setNumberOfTypes(numberOfTypes,entity)
@@ -142,10 +142,10 @@ entity = MED_FACE
 types = []
 numberOfElements = []
 
-types.append(MED_TRIA3)
+types.append(MEDMEM_TRIA3)
 numberOfElements.append(4)
 
-types.append(MED_QUAD4)
+types.append(MEDMEM_QUAD4)
 numberOfElements.append(4)
 
 myMeshing.setNumberOfTypes(numberOfTypes,entity)
@@ -179,7 +179,7 @@ myGroup.setMesh(myMeshing)
 myGroup.setEntity(MED_NODE)
 myGroup.setNumberOfGeometricType(1)
 
-myTypes = [MED_NONE]
+myTypes = [MEDMEM_NONE]
 myGroup.setGeometricType(myTypes)
 
 myNumberOfElements = [4]
@@ -197,7 +197,7 @@ myGroup.setMesh(myMeshing)
 myGroup.setEntity(MED_NODE)
 myGroup.setNumberOfGeometricType(1)
 
-myTypes = [MED_NONE]
+myTypes = [MEDMEM_NONE]
 myGroup.setGeometricType(myTypes)
 
 myNumberOfElements = [3]
@@ -217,7 +217,7 @@ myGroup.setMesh(myMeshing)
 myGroup.setEntity(MED_CELL)
 myGroup.setNumberOfGeometricType(3)
 
-myTypes = [MED_TETRA4,MED_PYRA5,MED_HEXA8]
+myTypes = [MEDMEM_TETRA4,MEDMEM_PYRA5,MEDMEM_HEXA8]
 myGroup.setGeometricType(myTypes)
 
 myNumberOfElements = [4,1,2]
@@ -239,7 +239,7 @@ myGroup.setMesh(myMeshing)
 myGroup.setEntity(MED_CELL)
 myGroup.setNumberOfGeometricType(2)
 
-myTypes = [MED_TETRA4,MED_PYRA5]
+myTypes = [MEDMEM_TETRA4,MEDMEM_PYRA5]
 myGroup.setGeometricType(myTypes)
 
 myNumberOfElements = [4,1]
@@ -262,7 +262,7 @@ myGroup.setMesh(myMeshing)
 myGroup.setEntity(MED_FACE)
 myGroup.setNumberOfGeometricType(2)
 
-myTypes = [MED_TRIA3,MED_QUAD4]
+myTypes = [MEDMEM_TRIA3,MEDMEM_QUAD4]
 myGroup.setGeometricType(myTypes)
 
 myNumberOfElements = [2,3]
@@ -283,7 +283,7 @@ myGroup.setMesh(myMeshing)
 myGroup.setEntity(MED_FACE)
 myGroup.setNumberOfGeometricType(1)
 
-myTypes = [MED_TRIA3]
+myTypes = [MEDMEM_TRIA3]
 myGroup.setGeometricType(myTypes)
 
 myNumberOfElements = [2]
@@ -308,10 +308,10 @@ myMeshing.write(VTK_DRIVER,vtkFileName)
 #                         1 scalar (vector)
 
 supportOnNodes = SUPPORT(myMeshing,"On_All_Nodes",MED_NODE)
-numberOfNodes = supportOnNodes.getNumberOfElements(MED_ALL_ELEMENTS)
+numberOfNodes = supportOnNodes.getNumberOfElements(MEDMEM_ALL_ELEMENTS)
 
 supportOnCells = SUPPORT(myMeshing,"On_All_Cells",MED_CELL)
-numberOfCells = supportOnCells.getNumberOfElements(MED_ALL_ELEMENTS)
+numberOfCells = supportOnCells.getNumberOfElements(MEDMEM_ALL_ELEMENTS)
 
 fieldDoubleScalarOnNodes = FIELDDOUBLE(supportOnNodes,1)
 fieldDoubleScalarOnNodes.setName("fieldScalarDoubleNode")

diff --git a/doc/MEDMEM/MESHconnectivities.cxx b/doc/MEDMEM/MESHconnectivities.cxx
index 5e34bccf446c387e18c29c460e6fcfb290b1e1dc..8edffe2a2a33e4950aeb2c034a46df6b52c289c2 100644 (file)
--- a/doc/MEDMEM/MESHconnectivities.cxx
+++ b/doc/MEDMEM/MESHconnectivities.cxx
@@ -75,9 +75,9 @@ int main (int argc, char ** argv)
 
   cout << "Show Connectivity (Descending) :" << endl ;
   // this example use global access with index array
-  int NumberOfElements = myMesh.getNumberOfElements(MED_CELL,MED_ALL_ELEMENTS);
+  int NumberOfElements = myMesh.getNumberOfElements(MED_CELL,MEDMEM_ALL_ELEMENTS);
   const int * DescendingConnectivity =  
-    myMesh.getConnectivity(MED_DESCENDING,MED_CELL,MED_ALL_ELEMENTS);
+    myMesh.getConnectivity(MED_DESCENDING,MED_CELL,MEDMEM_ALL_ELEMENTS);
   const int * DescendingConnectivityIndex =
     myMesh.getConnectivityIndex(MED_DESCENDING,MED_CELL);
   for (int i=0; i<NumberOfElements; i++) {
@@ -112,7 +112,7 @@ int main (int argc, char ** argv)
   }
 
   NumberOfConstituents = 
-    myMesh.getNumberOfElements(ConstituentEntity,MED_ALL_ELEMENTS);
+    myMesh.getNumberOfElements(ConstituentEntity,MEDMEM_ALL_ELEMENTS);
 
   if (MeshDimension==1) {
     MESSAGE_MED("ERROR : MeshDimension = 1 !");
@@ -131,7 +131,7 @@ int main (int argc, char ** argv)
   cout << "Show "<< Constituent <<" Connectivity (Nodal) :" << endl ;
   // this example use global access with index array
   const int * ConstituentConnectivity =  
-    myMesh.getConnectivity(MED_NODAL,ConstituentEntity,MED_ALL_ELEMENTS);
+    myMesh.getConnectivity(MED_NODAL,ConstituentEntity,MEDMEM_ALL_ELEMENTS);
   const int * ConstituentConnectivityIndex =
     myMesh.getConnectivityIndex(MED_NODAL,ConstituentEntity);
   for (int i=0; i<NumberOfConstituents; i++) {

diff --git a/doc/MEDMEM/MESHconnectivities.py b/doc/MEDMEM/MESHconnectivities.py
index 9a07816270f8588fe6a7e6be861386e8c94ab5cd..ae889917230dca437c67f31aa0be73568223e937 100644 (file)
--- a/doc/MEDMEM/MESHconnectivities.py
+++ b/doc/MEDMEM/MESHconnectivities.py
@@ -79,8 +79,8 @@ print "Show Connectivity (Descending) :"
 
 # This example use global access with index array
 
-numberOfElements = myMesh.getNumberOfElements(MED_CELL,MED_ALL_ELEMENTS)
-descendingConnectivity = myMesh.getConnectivity(MED_DESCENDING,MED_CELL,MED_ALL_ELEMENTS)
+numberOfElements = myMesh.getNumberOfElements(MED_CELL,MEDMEM_ALL_ELEMENTS)
+descendingConnectivity = myMesh.getConnectivity(MED_DESCENDING,MED_CELL,MEDMEM_ALL_ELEMENTS)
 descendingConnectivityIndex = myMesh.getConnectivityIndex(MED_DESCENDING,MED_CELL)
 
 for i in range(numberOfElements):
@@ -111,7 +111,7 @@ else:
         constituentEntity = MED_FACE
 
     numberOfConstituents = myMesh.getNumberOfElements(constituentEntity,
-                                                      MED_ALL_ELEMENTS)
+                                                      MEDMEM_ALL_ELEMENTS)
     reverseDescendingConnectivity = myMesh.getReverseConnectivity(
         MED_DESCENDING)
     reverseDescendingConnectivityIndex = myMesh.getReverseConnectivityIndex(
@@ -128,7 +128,7 @@ else:
 
     print "Show ",constituent," Connectivity (Nodal) :"
 
-    constituentConnectivity = myMesh.getConnectivity(MED_NODAL,constituentEntity,MED_ALL_ELEMENTS)
+    constituentConnectivity = myMesh.getConnectivity(MED_NODAL,constituentEntity,MEDMEM_ALL_ELEMENTS)
     constituentConnectivityIndex = myMesh.getConnectivityIndex(MED_NODAL,constituentEntity)
 
     for i in range(numberOfConstituents):

diff --git a/doc/doxygen/medmem.dox b/doc/doxygen/medmem.dox
index 95b9d72e1d2403c6e0134c07c226bccbc63293c4..b149c39be4ce628691bf1a50e94052e66633a2aa 100644 (file)
--- a/doc/doxygen/medmem.dox
+++ b/doc/doxygen/medmem.dox
@@ -195,25 +195,25 @@ only \b node and \b cell are considered. In 2D mesh, only \b node,
 available types are linear and quadratic elements (consult
 \ref RefManualMedMemory). The entries of this enum are quite
 self-explanatory :
-  - \c MED_NONE
-  - \c MED_POINT1
-  - \c MED_SEG2
-  - \c MED_SEG3
-  - \c MED_TRIA3
-  - \c MED_QUAD4
-  - \c MED_TRIA6
-  - \c MED_QUAD8
-  - \c MED_TETRA4
-  - \c MED_PYRA5
-  - \c MED_PENTA6
-  - \c MED_HEXA8
-  - \c MED_TETRA10
-  - \c MED_PYRA13
-  - \c MED_PENTA15
-  - \c MED_HEXA20
-  - \c MED_POLYGON
-  - \c MED_POLYHEDRA
-  - \c MED_ALL_ELEMENTS
+  - \c MEDMEM_NONE
+  - \c MEDMEM_POINT1
+  - \c MEDMEM_SEG2
+  - \c MEDMEM_SEG3
+  - \c MEDMEM_TRIA3
+  - \c MEDMEM_QUAD4
+  - \c MEDMEM_TRIA6
+  - \c MEDMEM_QUAD8
+  - \c MEDMEM_TETRA4
+  - \c MEDMEM_PYRA5
+  - \c MEDMEM_PENTA6
+  - \c MEDMEM_HEXA8
+  - \c MEDMEM_TETRA10
+  - \c MEDMEM_PYRA13
+  - \c MEDMEM_PENTA15
+  - \c MEDMEM_HEXA20
+  - \c MEDMEM_POLYGON
+  - \c MEDMEM_POLYHEDRA
+  - \c MEDMEM_ALL_ELEMENTS
   .
 The connectivity of all these elements is defined in MED project Web page
 http://hammi.extra.cea.fr/static/MED/web_med/logiciels/med-2.3.1/doc/ .

diff --git a/doc/doxygen/mesh.dox b/doc/doxygen/mesh.dox
index 93a51d30f3f59845572e1432f4abeae548785de8..52ff8f25cb00ab038739cbe2b8d5d28be31a7776 100644 (file)
--- a/doc/doxygen/mesh.dox
+++ b/doc/doxygen/mesh.dox
@@ -7,7 +7,7 @@ The MESH class is dedicated to the handling of unstructured
 meshes. Class MESHING  deriving from it supplies functions for creating meshes from scratch (c.f. \ref meshing).
 
 \section mesh_connectivity Content of the connectivity array
-Underlying the unstructured meshes is the notion of connectivity. This section only covers meshes made out of standard elements, the \c MED_POLYGON and \c MED_POLYHEDRA case being detailed in section \ref polygon .
+Underlying the unstructured meshes is the notion of connectivity. This section only covers meshes made out of standard elements, the \c MEDMEM_POLYGON and \c MEDMEM_POLYHEDRA case being detailed in section \ref polygon .
 
 \anchor medmemConnArrays
 \image html connectivity_arrays_small.png "Nodal connectivity storage scheme"
@@ -18,8 +18,8 @@ In MEDMEM, an unstructured mesh nodal connectivity is defined with these arrays:
 - the nodal connectivity array containing the connectivity of each cell, all cells being sorted by type;
 - the connectivity index array, which indicates the beginning of each cell in the connectivity array.
 
-The cell types are ordered by their number of nodes; MED_POLYGON and
-MED_POLYHEDRA is always the last type, if present.
+The cell types are ordered by their number of nodes; MEDMEM_POLYGON and
+MEDMEM_POLYHEDRA is always the last type, if present.
 
 As an example, let us consider a mesh made out of a linear triangle, two linear quadrangles and a quadratic triangle (c.f. figure \ref fig_connectivity_example ).
 \image html connectivity_example_small.png "Example for mesh connectivity"
@@ -27,7 +27,7 @@ As an example, let us consider a mesh made out of a linear triangle, two linear
 The number of types is :  3
 
 The type array writes :
-\{ \a MED_TRIA3, \a MED_QUAD4, \a MED_TRIA6 \} 
+\{ \a MEDMEM_TRIA3, \a MEDMEM_QUAD4, \a MEDMEM_TRIA6 \} 
 
 The global numbering index is :  \{ 1,2,4,5 \} }. Its dimension is \f$ n_{types}+1 \f$
 so that elements of type \f$ type[i] \f$ are stored between element \f$ index[i] \f$ and 

diff --git a/doc/doxygen/meshing.dox b/doc/doxygen/meshing.dox
index 0b97eb4dbe6d978bb4a15dfba7ba4160961190b4..20d87bfdd1a83dfd9550d5fd5a248107edcb1ec7 100644 (file)
--- a/doc/doxygen/meshing.dox
+++ b/doc/doxygen/meshing.dox
@@ -19,7 +19,7 @@ The creation of a mesh should respect the following sequence :
 
 The following paragraphs describe the methods that must be called 
 when creating a mesh. An example illustrates the general procedure.
-The specific case of \c MED_POLYGON and \c MED_POLYHEDRA
+The specific case of \c MEDMEM_POLYGON and \c MEDMEM_POLYHEDRA
 elements requires some methods that are described in \ref polygon.
 
 \section outline_meshing Outline

diff --git a/doc/doxygen/polygon.dox b/doc/doxygen/polygon.dox
index 45d4cb5a75806eafc173020d59f67a4803a65d20..ea5121a1c4bd26b32486ce523556c512add2160b 100644 (file)
--- a/doc/doxygen/polygon.dox
+++ b/doc/doxygen/polygon.dox
@@ -37,8 +37,8 @@ all faces with -1 as separator between faces.
 
 Let us consider an example with the two tetrahedra represented on
 figure \ref fig_polyhedron_connectivity , the left one
-being stored as a \c MED_TETRA4 element, the right one being stored
-as a \c MED_POLYHEDRA element.
+being stored as a \c MEDMEM_TETRA4 element, the right one being stored
+as a \c MEDMEM_POLYHEDRA element.
 
 \anchor fig_polyhedron_connectivity
 \image html polyhedron_connectivity_small.png "Example for polyhedron connectivity. Node numbers are written with a normal font, while face numbers are written in italic font."
@@ -47,7 +47,7 @@ as a \c MED_POLYHEDRA element.
 - The connectivity table writes : {1, 2, 3, 4, 2, 5, 3, -1, 2, 4, 5, -1, 4, 3, 5, -1, 2, 3, 4}
 - The index connectivity table writes : {1, 5, 20 }
 
-If there are two \c MED_POLYHEDRA elements that share a common face, 
+If there are two \c MEDMEM_POLYHEDRA elements that share a common face, 
 the list of nodes is repeated twice in the polyhedron connectivity
 array but with reversed order.
 

diff --git a/src/INTERP_KERNELTest/Interpolation3DTest.cxx b/src/INTERP_KERNELTest/Interpolation3DTest.cxx
index aa08ee06d458d7988f72ee301333b851511de075..ff0718f571204854c65bf4cb7ab97b4f9e00d069 100644 (file)
--- a/src/INTERP_KERNELTest/Interpolation3DTest.cxx
+++ b/src/INTERP_KERNELTest/Interpolation3DTest.cxx
@@ -77,7 +77,7 @@ void Interpolation3DTest::getVolumes(MESH& mesh, double* tab) const
   SUPPORT *sup=new SUPPORT(&mesh,"dummy",MED_CELL);
   FIELD<double>* f=mesh.getVolume(sup);
   const double *tabS=f->getValue();
-  std::copy(tabS,tabS+mesh.getNumberOfElements(MED_CELL,MED_ALL_ELEMENTS),tab)
+  std::copy(tabS,tabS+mesh.getNumberOfElements(MED_CELL,MEDMEM_ALL_ELEMENTS),tab)
     delete sup;
 }
 
@@ -107,10 +107,10 @@ bool Interpolation3DTest::testVolumes(const IntersectionMatrix& m,  MESH& sMesh,
   bool ok = true;
 
   // source elements
-  double* sVol = new double[sMesh.getNumberOfElements(MED_CELL,MED_ALL_ELEMENTS)];
+  double* sVol = new double[sMesh.getNumberOfElements(MED_CELL,MEDMEM_ALL_ELEMENTS)];
   getVolumes(sMesh, sVol);
 
-  for(int i = 0; i < sMesh.getNumberOfElements(MED_CELL,MED_ALL_ELEMENTS); ++i)
+  for(int i = 0; i < sMesh.getNumberOfElements(MED_CELL,MEDMEM_ALL_ELEMENTS); ++i)
     {
       const double sum_row = sumRow(m, i+1);
       if(!epsilonEqualRelative(sum_row, sVol[i], VOL_PREC))
@@ -122,9 +122,9 @@ bool Interpolation3DTest::testVolumes(const IntersectionMatrix& m,  MESH& sMesh,
     }
 
   // target elements
-  double* tVol = new double[tMesh.getNumberOfElements(MED_CELL,MED_ALL_ELEMENTS)];
+  double* tVol = new double[tMesh.getNumberOfElements(MED_CELL,MEDMEM_ALL_ELEMENTS)];
   getVolumes(tMesh, tVol);
-  for(int i = 0; i < tMesh.getNumberOfElements(MED_CELL,MED_ALL_ELEMENTS); ++i)
+  for(int i = 0; i < tMesh.getNumberOfElements(MED_CELL,MEDMEM_ALL_ELEMENTS); ++i)
     {
       const double sum_col = sumCol(m, i);
       if(!epsilonEqualRelative(sum_col, tVol[i], VOL_PREC))

diff --git a/src/INTERP_KERNELTest/InterpolationOptionsTest.cxx b/src/INTERP_KERNELTest/InterpolationOptionsTest.cxx
index 4db3c7b2f247d3abd6a02b303f89f0c278d39cfe..5314228d078a6401a2c431eeb258fe736289467a 100644 (file)
--- a/src/INTERP_KERNELTest/InterpolationOptionsTest.cxx
+++ b/src/INTERP_KERNELTest/InterpolationOptionsTest.cxx
@@ -55,13 +55,13 @@ namespace INTERP_TEST
     MEDMEM::SUPPORT *source_support=new SUPPORT(source_mesh,"on All support");
     MEDMEM::FIELD<double> *source_field=new FIELD<double>(source_support,1);
     double* value=const_cast<double*>(source_field->getValue());
-    for (int i=0; i<source_support->getNumberOfElements(MED_EN::MED_ALL_ELEMENTS); i++)
+    for (int i=0; i<source_support->getNumberOfElements(MED_EN::MEDMEM_ALL_ELEMENTS); i++)
       value[i]=1.0;
     source_support->removeReference();
     MEDMEM::SUPPORT *target_support=new MEDMEM::SUPPORT(target_mesh,"on All support");
     MEDMEM::FIELD<double> *target_field=new FIELD<double>(target_support,1);
     double* targetvalue=const_cast<double*>(target_field->getValue());
-    for (int i=0; i<target_support->getNumberOfElements(MED_EN::MED_ALL_ELEMENTS); i++)
+    for (int i=0; i<target_support->getNumberOfElements(MED_EN::MEDMEM_ALL_ELEMENTS); i++)
       targetvalue[i]=0.0;
     target_support->removeReference();
     // Ok at this point we have our mesh in MED-Memory format.

diff --git a/src/INTERP_KERNELTest/MEDMeshMaker.cxx b/src/INTERP_KERNELTest/MEDMeshMaker.cxx
index df0926bdb463ee3a65eac15e6f1ff30a7a04c757..4f9df9e0a7eae6a965f08f4932ce5fa804850749 100644 (file)
--- a/src/INTERP_KERNELTest/MEDMeshMaker.cxx
+++ b/src/INTERP_KERNELTest/MEDMeshMaker.cxx
@@ -31,14 +31,14 @@ MEDMEM::MESH* MEDMeshMaker(int dim, int nbedge, MED_EN::medGeometryElement type)
     {
     case 2: 
       nbnodes=(nbedge+1)*(nbedge+1);
-      if(type==MED_EN::MED_QUAD4)
+      if(type==MED_EN::MEDMEM_QUAD4)
         nbelems=(nbedge*nbedge);
       else
         throw MEDMEM::MEDEXCEPTION("MEDMeshMaker: type not impletmented");
       break;
     case 3:
       nbnodes=(nbedge+1)*(nbedge+1)*(nbedge+1);
-      if (type==MED_EN::MED_HEXA8)
+      if (type==MED_EN::MEDMEM_HEXA8)
         nbelems= nbedge*nbedge*nbedge;
       else
         throw MEDMEM::MEDEXCEPTION("MEDMeshMaker: type not impletmented");

diff --git a/src/INTERP_KERNELTest/MeshTestToolkit.txx b/src/INTERP_KERNELTest/MeshTestToolkit.txx
index 3c7e2c997a47c5521cbfdb55f9586d73f812c23e..267ce59356729b15bf7804cdc1456f67341d53d0 100644 (file)
--- a/src/INTERP_KERNELTest/MeshTestToolkit.txx
+++ b/src/INTERP_KERNELTest/MeshTestToolkit.txx
@@ -122,7 +122,7 @@ namespace INTERP_TEST
         break;
       }
     const double *tabS = f->getValue();
-    std::copy(tabS,tabS+mesh.getNumberOfElements(MED_CELL,MED_ALL_ELEMENTS),tab);
+    std::copy(tabS,tabS+mesh.getNumberOfElements(MED_CELL,MEDMEM_ALL_ELEMENTS),tab);
     sup->removeReference();
     f->removeReference();
   }
@@ -173,10 +173,10 @@ namespace INTERP_TEST
     bool ok = true;
 
     // source elements
-    double* sVol = new double[sMesh.getNumberOfElements(MED_CELL,MED_ALL_ELEMENTS)];
+    double* sVol = new double[sMesh.getNumberOfElements(MED_CELL,MEDMEM_ALL_ELEMENTS)];
     getVolumes(sMesh, sVol);
 
-    for(int i = 0; i < sMesh.getNumberOfElements(MED_CELL,MED_ALL_ELEMENTS); ++i)
+    for(int i = 0; i < sMesh.getNumberOfElements(MED_CELL,MEDMEM_ALL_ELEMENTS); ++i)
       {
         const double sum_row = sumRow(m, i+1);
         if(!epsilonEqualRelative(sum_row, fabs(sVol[i]), _precision))
@@ -188,9 +188,9 @@ namespace INTERP_TEST
       }
 
     // target elements
-    double* tVol = new double[tMesh.getNumberOfElements(MED_CELL,MED_ALL_ELEMENTS)];
+    double* tVol = new double[tMesh.getNumberOfElements(MED_CELL,MEDMEM_ALL_ELEMENTS)];
     getVolumes(tMesh, tVol);
-    for(int i = 0; i < tMesh.getNumberOfElements(MED_CELL,MED_ALL_ELEMENTS); ++i)
+    for(int i = 0; i < tMesh.getNumberOfElements(MED_CELL,MEDMEM_ALL_ELEMENTS); ++i)
       {
         const double sum_col = sumCol(m, i);
         if(!epsilonEqualRelative(sum_col,fabs(tVol[i]), _precision))

diff --git a/src/INTERP_KERNELTest/PointLocatorTest.cxx b/src/INTERP_KERNELTest/PointLocatorTest.cxx
index 7262908c30cfe1b2d75d629a69ceb6cd4e27c2e1..d2bf2243a3d3d68cccfb6dde707be23edc93959a 100644 (file)
--- a/src/INTERP_KERNELTest/PointLocatorTest.cxx
+++ b/src/INTERP_KERNELTest/PointLocatorTest.cxx
@@ -47,7 +47,7 @@ namespace INTERP_TEST
    * a bbox overlapping the bboxes of the tree
    */
   void PointLocatorTest::test_PointLocator() {
-    MEDMEM::MESH* mesh2D= MEDMeshMaker(2,2,MED_EN::MED_QUAD4);
+    MEDMEM::MESH* mesh2D= MEDMeshMaker(2,2,MED_EN::MEDMEM_QUAD4);
     MEDMEM::PointLocator pl(*mesh2D) ;
     double x[2]={0.0,0.0};
     std::list<int> elems = pl.locate(x);
@@ -72,7 +72,7 @@ namespace INTERP_TEST
     elems.clear();
     delete mesh2D;
 
-    MEDMEM::MESH* mesh3D= MEDMeshMaker(3,2,MED_EN::MED_HEXA8);
+    MEDMEM::MESH* mesh3D= MEDMeshMaker(3,2,MED_EN::MEDMEM_HEXA8);
     MEDMEM::PointLocator pl3(*mesh3D);
     double xx[3]={0.0,0.0,0.0};
     elems = pl3.locate(xx);

diff --git a/src/INTERP_KERNELTest/RemapperTest.cxx b/src/INTERP_KERNELTest/RemapperTest.cxx
index d2876d9a6bc15ecb381d2c5fe73bc4170d99988b..eba2c35ef35fffa60c5b7731ec40ec7cd7aee1b5 100644 (file)
--- a/src/INTERP_KERNELTest/RemapperTest.cxx
+++ b/src/INTERP_KERNELTest/RemapperTest.cxx
@@ -55,13 +55,13 @@ namespace INTERP_TEST
     MEDMEM::SUPPORT source_support(&source_mesh,"on All support");
     MEDMEM::FIELD<double> source_field(&source_support,1);
     double* value=const_cast<double*>(source_field.getValue());
-    for (int i=0; i<source_support.getNumberOfElements(MED_EN::MED_ALL_ELEMENTS); i++)
+    for (int i=0; i<source_support.getNumberOfElements(MED_EN::MEDMEM_ALL_ELEMENTS); i++)
       value[i]=1.0;
     
     MEDMEM::SUPPORT target_support(&target_mesh,"on All support");
     MEDMEM::FIELD<double> target_field(&target_support,1);
     double* targetvalue=const_cast<double*>(target_field.getValue());
-    for (int i=0; i<target_support.getNumberOfElements(MED_EN::MED_ALL_ELEMENTS); i++)
+    for (int i=0; i<target_support.getNumberOfElements(MED_EN::MEDMEM_ALL_ELEMENTS); i++)
       targetvalue[i]=0.0;
 
 

diff --git a/src/INTERP_KERNELTest/TestingUtils.hxx b/src/INTERP_KERNELTest/TestingUtils.hxx
index 0ba2707980124a3e2ad7299743a481d857f2797f..1f912192ad06a9940c6fdd601aac248e129c1991 100644 (file)
--- a/src/INTERP_KERNELTest/TestingUtils.hxx
+++ b/src/INTERP_KERNELTest/TestingUtils.hxx
@@ -213,13 +213,13 @@ void calcIntersectionMatrix(const char* mesh1path, const char* mesh1, const char
 
   LOG(5, "Loading " << mesh1 << " from " << mesh1path);
   const MESH sMesh(MED_DRIVER, dataDir+mesh1path, mesh1);
-  const int numSrcElems = sMesh.getNumberOfElements(MED_CELL, MED_ALL_ELEMENTS);
+  const int numSrcElems = sMesh.getNumberOfElements(MED_CELL, MEDMEM_ALL_ELEMENTS);
   LOG(1, "Source mesh has " << numSrcElems << " elements");
 
 
   LOG(5, "Loading " << mesh2 << " from " << mesh2path);
   const MESH tMesh(MED_DRIVER, dataDir+mesh2path, mesh2);
-  const int numTargetElems = tMesh.getNumberOfElements(MED_CELL, MED_ALL_ELEMENTS);
+  const int numTargetElems = tMesh.getNumberOfElements(MED_CELL, MEDMEM_ALL_ELEMENTS);
 
   LOG(1, "Target mesh has " << numTargetElems << " elements");
 

diff --git a/src/ParaMEDMEM/NonCoincidentDEC.cxx b/src/ParaMEDMEM/NonCoincidentDEC.cxx
index 2ff66ca3cb011767c665979bac47094e34563c16..fdfbf001ba2fa2133c3be5027873d982382b1c19 100644 (file)
--- a/src/ParaMEDMEM/NonCoincidentDEC.cxx
+++ b/src/ParaMEDMEM/NonCoincidentDEC.cxx
@@ -109,16 +109,16 @@ namespace ParaMEDMEM
         fvm_element_t fvm_type;
         switch (types[itype]) 
           {
-          case MED_EN::MED_TRIA3 :
+          case MED_EN::MEDMEM_TRIA3 :
             fvm_type=FVM_FACE_TRIA;
             break;
-          case MED_EN::MED_QUAD4 :
+          case MED_EN::MEDMEM_QUAD4 :
             fvm_type=FVM_FACE_QUAD;
             break;
-          case MED_EN::MED_TETRA4 :
+          case MED_EN::MEDMEM_TETRA4 :
             fvm_type=FVM_CELL_TETRA;
             break;
-          case MED_EN::MED_HEXA8 :
+          case MED_EN::MEDMEM_HEXA8 :
             fvm_type=FVM_CELL_HEXA;
             break;
           default:
@@ -133,7 +133,7 @@ namespace ParaMEDMEM
         for (int i=0; i<nbelems*(types[itype]%100); i++)
           conn[i]=mesh_conn[i]; 
         //swapping trias
-        if (types[itype]==MED_EN::MED_TRIA3)
+        if (types[itype]==MED_EN::MEDMEM_TRIA3)
           {
             for (int i=0; i<nbelems;i++)
               {
@@ -143,7 +143,7 @@ namespace ParaMEDMEM
               }
           }
         //swapping tetras
-        if (types[itype]==MED_EN::MED_TETRA4)
+        if (types[itype]==MED_EN::MEDMEM_TETRA4)
           {
             for (int i=0; i<nbelems;i++)
               {
@@ -187,16 +187,16 @@ namespace ParaMEDMEM
         fvm_element_t fvm_type;
         switch (types[itype]) 
           {
-          case MED_EN::MED_TRIA3 :
+          case MED_EN::MEDMEM_TRIA3 :
             fvm_type=FVM_FACE_TRIA;
             break;
-          case MED_EN::MED_QUAD4 :
+          case MED_EN::MEDMEM_QUAD4 :
             fvm_type=FVM_FACE_QUAD;
             break;
-          case MED_EN::MED_TETRA4 :
+          case MED_EN::MEDMEM_TETRA4 :
             fvm_type=FVM_CELL_TETRA;
             break;
-          case MED_EN::MED_HEXA8 :
+          case MED_EN::MEDMEM_HEXA8 :
             fvm_type=FVM_CELL_HEXA;
             break;
           default:
@@ -324,7 +324,7 @@ namespace ParaMEDMEM
                                       *comm,
                                       source_size,
                                       start_rank);
-        int nbcells = mesh->getNumberOfElements(MED_EN::MED_CELL,MED_EN::MED_ALL_ELEMENTS);
+        int nbcells = mesh->getNumberOfElements(MED_EN::MED_CELL,MED_EN::MEDMEM_ALL_ELEMENTS);
         const MEDMEM::SUPPORT* support=_local_field->getField()->getSupport();
         MEDMEM::FIELD<double>* barycenter_coords = mesh->getBarycenter(support);
         const double* coords = barycenter_coords->getValue();
@@ -346,7 +346,7 @@ namespace ParaMEDMEM
    */
   void NonCoincidentDEC::recvData()
   {
-    int nbelems = _local_field->getField()->getSupport()->getMesh()->getNumberOfElements(MED_EN::MED_CELL, MED_EN::MED_ALL_ELEMENTS);
+    int nbelems = _local_field->getField()->getSupport()->getMesh()->getNumberOfElements(MED_EN::MED_CELL, MED_EN::MEDMEM_ALL_ELEMENTS);
     int nbcomp =  _local_field->getField()->getNumberOfComponents();
     double* values = new double [nbelems*nbcomp];
     fvm_locator_exchange_point_var(_locator,

diff --git a/src/ParaMEDMEMTest/ParaMEDMEMTest_NonCoincidentDEC.cxx b/src/ParaMEDMEMTest/ParaMEDMEMTest_NonCoincidentDEC.cxx
index 8911fba39324697ae7b19f513aac8b8f9d35dd51..fd1226747ceb0a06da5baf64c2565d59c4101e16 100644 (file)
--- a/src/ParaMEDMEMTest/ParaMEDMEMTest_NonCoincidentDEC.cxx
+++ b/src/ParaMEDMEMTest/ParaMEDMEMTest_NonCoincidentDEC.cxx
@@ -162,7 +162,7 @@ void ParaMEDMEMTest::testNonCoincidentDEC(const string& filename1,
       parafield = new ParaFIELD(parasupport, comptopo);
 
       
-      int nb_local=support->getNumberOfElements(MED_EN::MED_ALL_ELEMENTS);
+      int nb_local=support->getNumberOfElements(MED_EN::MEDMEM_ALL_ELEMENTS);
       double * value= new double[nb_local];
       for(int ielem=0; ielem<nb_local;ielem++)
         value[ielem]=1.0;
@@ -192,7 +192,7 @@ void ParaMEDMEMTest::testNonCoincidentDEC(const string& filename1,
       parafield = new ParaFIELD(parasupport, comptopo);
 
       
-      int nb_local=support->getNumberOfElements(MED_EN::MED_ALL_ELEMENTS);
+      int nb_local=support->getNumberOfElements(MED_EN::MEDMEM_ALL_ELEMENTS);
       double * value= new double[nb_local];
       for(int ielem=0; ielem<nb_local;ielem++)
         value[ielem]=0.0;

diff --git a/src/ParaMEDMEM_Swig/test_NonCoincidentDEC.py b/src/ParaMEDMEM_Swig/test_NonCoincidentDEC.py
index 256a0a3cedd130b04996e0e3918432c6243793bf..d171321fccf2a08dff0b4b040e6a56b168c56b59 100755 (executable)
--- a/src/ParaMEDMEM_Swig/test_NonCoincidentDEC.py
+++ b/src/ParaMEDMEM_Swig/test_NonCoincidentDEC.py
@@ -75,7 +75,7 @@ if source_group.containsMyRank():
 
     parafield = ParaFIELD(parasupport, comptopo)
 
-    nb_local = support.getNumberOfElements(MED_ALL_ELEMENTS);
+    nb_local = support.getNumberOfElements(MEDMEM_ALL_ELEMENTS);
 
     value = [1.0]*nb_local
 
@@ -97,7 +97,7 @@ if target_group.containsMyRank():
     comptopo = ComponentTopology()
     parafield = ParaFIELD(parasupport, comptopo)
 
-    nb_local = support.getNumberOfElements(MED_ALL_ELEMENTS)
+    nb_local = support.getNumberOfElements(MEDMEM_ALL_ELEMENTS)
     value = [0.0]*nb_local
 
     parafield.getField().setValue(value)

diff --git a/src/RENUMBER/renumbering.cxx b/src/RENUMBER/renumbering.cxx
index d5ef000c780bae9971cfadb1c44b316fcaac926a..d3d038876c355cfae12d1590e10f010130e17aa4 100644 (file)
--- a/src/RENUMBER/renumbering.cxx
+++ b/src/RENUMBER/renumbering.cxx
@@ -48,8 +48,8 @@ void computeNeighbour(const MESH* mesh,const medGeometryElement& Type, vector<li
   conn->calculateFullDescendingConnectivity(MED_CELL);
   const int* rev_conn=mesh->getReverseConnectivity(MED_EN::MED_DESCENDING, MED_EN::MED_CELL);
   const int* rev_conn_index=mesh->getReverseConnectivityIndex(MED_EN::MED_DESCENDING, MED_EN::MED_CELL);
-  int nb_face= mesh->getNumberOfElements(MED_FACE,MED_ALL_ELEMENTS);
-  int nb_edge = mesh->getNumberOfElements(MED_EDGE,MED_ALL_ELEMENTS);
+  int nb_face= mesh->getNumberOfElements(MED_FACE,MEDMEM_ALL_ELEMENTS);
+  int nb_edge = mesh->getNumberOfElements(MED_EDGE,MEDMEM_ALL_ELEMENTS);
   nb_cell= mesh->getNumberOfElements(MED_CELL,Type);
 
   int nb_constituent;

diff --git a/src/RENUMBER/testRenumbering.py b/src/RENUMBER/testRenumbering.py
index f075ce8267872a195f339b9d32c2ab0de55a973e..ce5da11282dea11aba337fa4fa5c02f57583c94d 100755 (executable)
--- a/src/RENUMBER/testRenumbering.py
+++ b/src/RENUMBER/testRenumbering.py
@@ -61,10 +61,10 @@ for i in range(9):
     field=field&(f.getValueIJ(i+1,2)==field_ini[i*2+1])
 f.rmDriver(id)
 
-nbcell2dboost=m.getNumberOfElementsWithPoly(MED_CELL,MED_ALL_ELEMENTS)
+nbcell2dboost=m.getNumberOfElementsWithPoly(MED_CELL,MEDMEM_ALL_ELEMENTS)
 connectivite=[2,6,13,11,11,13,14,12,6,5,15,13,12,14,10,4,13,15,16,14,5,1,7,15,14,16,9,10,15,7,8,16,16,8,3,9]
 connectivite_index=[1,5,9,13,17,21,25,29,33,37]
-conn=m.getConnectivity(MED_NODAL,MED_CELL,MED_QUAD4)
+conn=m.getConnectivity(MED_NODAL,MED_CELL,MEDMEM_QUAD4)
 conn_index=m.getConnectivityIndex(MED_NODAL,MED_CELL);
 conn2dboost=(len(conn)==len(connectivite))
 if conn2dboost:
@@ -83,10 +83,10 @@ method="METIS"
 string_to_execute="'"+dir_renumber+" "+dir_mesh+"/"+filename+" "+meshname+" "+method+" "+dir_mesh+"/out_"+filename+"'"
 eval("os.system("+string_to_execute+")")
 m = MESH(MED_DRIVER,dir_mesh+"/out_"+filename,meshname)
-nbcell2dmetis=m.getNumberOfElementsWithPoly(MED_CELL,MED_ALL_ELEMENTS)
+nbcell2dmetis=m.getNumberOfElementsWithPoly(MED_CELL,MEDMEM_ALL_ELEMENTS)
 connectivite=[12,14,10,4,2,6,13,11,11,13,14,12,16,8,3,9,5,1,7,15,15,7,8,16,14,16,9,10,6,5,15,13,13,15,16,14]
 connectivite_index=[1,5,9,13,17,21,25,29,33,37]
-conn=m.getConnectivity(MED_NODAL,MED_CELL,MED_QUAD4)
+conn=m.getConnectivity(MED_NODAL,MED_CELL,MEDMEM_QUAD4)
 conn_index=m.getConnectivityIndex(MED_NODAL,MED_CELL);
 conn2dmetis=(len(conn)==len(connectivite))
 if conn2dmetis:
@@ -110,7 +110,7 @@ method="BOOST"
 string_to_execute="'"+dir_renumber+" "+dir_mesh+"/"+filename+" "+meshname+" "+method+" "+dir_mesh+"/out_"+filename+"'"
 eval("os.system("+string_to_execute+")")
 m = MESH(MED_DRIVER,dir_mesh+"/out_"+filename,meshname)
-nbcell2dpolyboost=m.getNumberOfElementsWithPoly(MED_CELL,MED_ALL_ELEMENTS)
+nbcell2dpolyboost=m.getNumberOfElementsWithPoly(MED_CELL,MEDMEM_ALL_ELEMENTS)
 connectivite=[2,5,9,10,11,10,9,12,5,6,8,9,4,11,12,16,12,9,8,13,6,1,7,8,16,12,13,15,13,8,7,14,15,13,14,3]
 connectivite_index=[1,5,9,13,17,21,25,29,33,37]
 conn=m.getPolygonsConnectivity(MED_CELL)
@@ -131,7 +131,7 @@ method="METIS"
 string_to_execute="'"+dir_renumber+" "+dir_mesh+"/"+filename+" "+meshname+" "+method+" "+dir_mesh+"/out_"+filename+"'"
 eval("os.system("+string_to_execute+")")
 m = MESH(MED_DRIVER,dir_mesh+"/out_"+filename,meshname)
-nbcell2dpolymetis=m.getNumberOfElementsWithPoly(MED_CELL,MED_ALL_ELEMENTS)
+nbcell2dpolymetis=m.getNumberOfElementsWithPoly(MED_CELL,MEDMEM_ALL_ELEMENTS)
 connectivite=[6,1,7,8,2,5,9,10,5,6,8,9,15,13,14,3,4,11,12,16,16,12,13,15,11,10,9,12,12,9,8,13,13,8,7,14]
 connectivite_index=[1,5,9,13,17,21,25,29,33,37]
 conn=m.getPolygonsConnectivity(MED_CELL)
@@ -162,10 +162,10 @@ method="BOOST"
 string_to_execute="'"+dir_renumber+" "+dir_mesh+"/"+filename+" "+meshname+" "+method+" "+dir_mesh+"/out_"+filename+"'"
 eval("os.system("+string_to_execute+")")
 m = MESH(MED_DRIVER,dir_mesh+"/out_"+filename,meshname)
-nbcell3dboost=m.getNumberOfElementsWithPoly(MED_CELL,MED_ALL_ELEMENTS)
+nbcell3dboost=m.getNumberOfElementsWithPoly(MED_CELL,MEDMEM_ALL_ELEMENTS)
 connectivite=[23,13,5,18,27,22,14,26,17,6,13,23,25,16,22,27,27,22,14,26,24,15,7,20,9,23,18,1,21,27,26,10,25,16,22,27,19,8,15,24,2,17,23,9,12,25,27,21,21,27,26,10,11,24,20,3,12,25,27,21,4,19,24,11]
 connectivite_index=[1,9,17,25,33,41,49,57,65]
-conn=m.getConnectivity(MED_NODAL,MED_CELL,MED_HEXA8)
+conn=m.getConnectivity(MED_NODAL,MED_CELL,MEDMEM_HEXA8)
 conn_index=m.getConnectivityIndex(MED_NODAL,MED_CELL);
 conn3dboost=(len(conn)==len(connectivite))
 if conn3dboost:
@@ -184,10 +184,10 @@ method="METIS"
 string_to_execute="'"+dir_renumber+" "+dir_mesh+"/"+filename+" "+meshname+" "+method+" "+dir_mesh+"/out_"+filename+"'"
 eval("os.system("+string_to_execute+")")
 m = MESH(MED_DRIVER,dir_mesh+"/out_"+filename,meshname)
-nbcell3dmetis=m.getNumberOfElementsWithPoly(MED_CELL,MED_ALL_ELEMENTS)
+nbcell3dmetis=m.getNumberOfElementsWithPoly(MED_CELL,MEDMEM_ALL_ELEMENTS)
 connectivite=[12,25,27,21,4,19,24,11,27,22,14,26,24,15,7,20,17,6,13,23,25,16,22,27,9,23,18,1,21,27,26,10,23,13,5,18,27,22,14,26,25,16,22,27,19,8,15,24,2,17,23,9,12,25,27,21,21,27,26,10,11,24,20,3]
 connectivite_index=[1,9,17,25,33,41,49,57,65]
-conn=m.getConnectivity(MED_NODAL,MED_CELL,MED_HEXA8)
+conn=m.getConnectivity(MED_NODAL,MED_CELL,MEDMEM_HEXA8)
 conn_index=m.getConnectivityIndex(MED_NODAL,MED_CELL);
 conn3dmetis=(len(conn)==len(connectivite))
 if conn3dmetis:
@@ -222,7 +222,7 @@ method="BOOST"
 string_to_execute="'"+dir_renumber+" "+dir_mesh+"/"+filename+" "+meshname+" "+method+" "+dir_mesh+"/out_"+filename+"'"
 eval("os.system("+string_to_execute+")")
 m = MESH(MED_DRIVER,dir_mesh+"/out_"+filename,meshname)
-nbcell3dpolyboost=m.getNumberOfElementsWithPoly(MED_CELL,MED_ALL_ELEMENTS)
+nbcell3dpolyboost=m.getNumberOfElementsWithPoly(MED_CELL,MEDMEM_ALL_ELEMENTS)
 connectivite=[23,13,5,18,27,26,14,22,23,27,22,13,13,22,14,5,5,14,26,18,18,26,27,23,17,6,13,23,25,27,22,16,17,25,16,6,6,16,22,13,13,22,27,23,23,27,25,17,27,22,14,26,24,20,7,15,27,24,15,22,22,15,7,14,14,7,20,26,26,20,24,27,9,23,18,1,21,10,26,27,9,21,27,23,23,27,26,18,18,26,10,1,1,10,21,9,25,16,22,27,19,24,15,8,25,19,8,16,16,8,15,22,22,15,24,27,27,24,19,25,2,17,23,9,12,21,27,25,2,12,25,17,17,25,27,23,23,27,21,9,9,21,12,2,21,27,26,10,11,3,20,24,21,11,24,27,27,24,20,26,26,20,3,10,10,3,11,21,12,25,27,21,4,11,24,19,12,4,19,25,25,19,24,27,27,24,11,21,21,11,4,12]
 connectivite_face_index=[1,5,9,13,17,21,25,29,33,37,41,45,49,53,57,61,65,69,73,77,81,85,89,93,97,101,105,109,113,117,121,125,129,133,137,141,145,149,153,157,161,165,169,173,177,181,185,189,193]
 connectivite_index=[1,7,13,19,25,31,37,43,49]
@@ -250,7 +250,7 @@ method="METIS"
 string_to_execute="'"+dir_renumber+" "+dir_mesh+"/"+filename+" "+meshname+" "+method+" "+dir_mesh+"/out_"+filename+"'"
 eval("os.system("+string_to_execute+")")
 m = MESH(MED_DRIVER,dir_mesh+"/out_"+filename,meshname)
-nbcell3dpolymetis=m.getNumberOfElementsWithPoly(MED_CELL,MED_ALL_ELEMENTS)
+nbcell3dpolymetis=m.getNumberOfElementsWithPoly(MED_CELL,MEDMEM_ALL_ELEMENTS)
 connectivite=[12,25,27,21,4,11,24,19,12,4,19,25,25,19,24,27,27,24,11,21,21,11,4,12,27,22,14,26,24,20,7,15,27,24,15,22,22,15,7,14,14,7,20,26,26,20,24,27,17,6,13,23,25,27,22,16,17,25,16,6,6,16,22,13,13,22,27,23,23,27,25,17,9,23,18,1,21,10,26,27,9,21,27,23,23,27,26,18,18,26,10,1,1,10,21,9,23,13,5,18,27,26,14,22,23,27,22,13,13,22,14,5,5,14,26,18,18,26,27,23,25,16,22,27,19,24,15,8,25,19,8,16,16,8,15,22,22,15,24,27,27,24,19,25,2,17,23,9,12,21,27,25,2,12,25,17,17,25,27,23,23,27,21,9,9,21,12,2,21,27,26,10,11,3,20,24,21,11,24,27,27,24,20,26,26,20,3,10,10,3,11,21]
 connectivite_face_index=[1,5,9,13,17,21,25,29,33,37,41,45,49,53,57,61,65,69,73,77,81,85,89,93,97,101,105,109,113,117,121,125,129,133,137,141,145,149,153,157,161,165,169,173,177,181,185,189,193]
 connectivite_index=[1,7,13,19,25,31,37,43,49]