0021257: Rollback the medGeometryElement names MEDMEM_ --> MED_

diff --git a/src/SMESH_I/SMESH_MEDMesh_i.cxx b/src/SMESH_I/SMESH_MEDMesh_i.cxx
index ac16b41861673838c048cf0bd7631edde63e5e4d..156bfbc69e60e46e247d4280a425fdc3fc555cb2 100644 (file)
--- a/src/SMESH_I/SMESH_MEDMesh_i.cxx
+++ b/src/SMESH_I/SMESH_MEDMesh_i.cxx
@@ -465,7 +465,7 @@ SMESH_MEDMesh_i::getTypes(SALOME_MED::medEntityMesh entity) throw(SALOME::
 //=============================================================================
 /*!
  * CORBA: Returns number of elements of type medGeometryElement
 //=============================================================================
 /*!
  * CORBA: Returns number of elements of type medGeometryElement

- *        Not implemented for MEDMEM_ALL_ELEMENTS 
+ *        Not implemented for MED_ALL_ELEMENTS 

  *        implemented for MED_ALL_ENTITIES
  *
  * Dans cette implementation, il n est pas prevu de tenir compte du entity
  *        implemented for MED_ALL_ENTITIES
  *
  * Dans cette implementation, il n est pas prevu de tenir compte du entity


@@ -479,8 +479,8 @@ CORBA::Long SMESH_MEDMesh_i::getNumberOfElements(SALOME_MED::
   if (_mesh_i == 0)
     THROW_SALOME_CORBA_EXCEPTION("No associated Mesh",
                                  SALOME::INTERNAL_ERROR);
   if (_mesh_i == 0)
     THROW_SALOME_CORBA_EXCEPTION("No associated Mesh",
                                  SALOME::INTERNAL_ERROR);

-  if (geomElement == SALOME_MED::MEDMEM_ALL_ELEMENTS)
-    THROW_SALOME_CORBA_EXCEPTION("Not implemented for MEDMEM_ALL_ELEMENTS",
+  if (geomElement == SALOME_MED::MED_ALL_ELEMENTS)
+    THROW_SALOME_CORBA_EXCEPTION("Not implemented for MED_ALL_ELEMENTS",

                                  SALOME::BAD_PARAM);
   if (!_compte)
     calculeNbElts();
                                  SALOME::BAD_PARAM);
   if (!_compte)
     calculeNbElts();


@@ -962,11 +962,11 @@ void SMESH_MEDMesh_i::calculeNbElts() throw(SALOME::SALOME_Exception)
     _compte = true;
 
     _mapNbTypes[SALOME_MED::MED_NODE] = 1;
     _compte = true;
 
     _mapNbTypes[SALOME_MED::MED_NODE] = 1;

-    // On compte les aretes MEDMEM_SEG2 ou MEDMEM_SEG3
+    // On compte les aretes MED_SEG2 ou MED_SEG3

     // On range les elements dans  les vecteurs correspondants 
 
     // On range les elements dans  les vecteurs correspondants 
 

-    _mapIndToSeqElts[SALOME_MED::MEDMEM_SEG2] = _indexElts++;
-    _mapIndToSeqElts[SALOME_MED::MEDMEM_SEG3] = _indexElts++;
+    _mapIndToSeqElts[SALOME_MED::MED_SEG2] = _indexElts++;
+    _mapIndToSeqElts[SALOME_MED::MED_SEG3] = _indexElts++;

     _mapIndToVectTypes[SALOME_MED::MED_EDGE] = _indexEnts++;
 
     int trouveSeg2 = 0;
     _mapIndToVectTypes[SALOME_MED::MED_EDGE] = _indexEnts++;
 
     int trouveSeg2 = 0;


@@ -983,23 +983,23 @@ void SMESH_MEDMesh_i::calculeNbElts() throw(SALOME::SALOME_Exception)
       {
       case 2:
         {
       {
       case 2:
         {

-          medElement = SALOME_MED::MEDMEM_SEG2;
+          medElement = SALOME_MED::MED_SEG2;

           if (trouveSeg2 == 0)
           {
             trouveSeg2 = 1;
             _TypesId[SALOME_MED::MED_EDGE].
           if (trouveSeg2 == 0)
           {
             trouveSeg2 = 1;
             _TypesId[SALOME_MED::MED_EDGE].

-              push_back(SALOME_MED::MEDMEM_SEG2);
+              push_back(SALOME_MED::MED_SEG2);

           }
           break;
         }
       case 3:
         {
           }
           break;
         }
       case 3:
         {

-          medElement = SALOME_MED::MEDMEM_SEG3;
+          medElement = SALOME_MED::MED_SEG3;

           if (trouveSeg3 == 0)
           {
             trouveSeg3 = 1;
             _TypesId[SALOME_MED::MED_EDGE].
           if (trouveSeg3 == 0)
           {
             trouveSeg3 = 1;
             _TypesId[SALOME_MED::MED_EDGE].

-              push_back(SALOME_MED::MEDMEM_SEG3);
+              push_back(SALOME_MED::MED_SEG3);

           }
           break;
         }
           }
           break;
         }


@@ -1019,15 +1019,15 @@ void SMESH_MEDMesh_i::calculeNbElts() throw(SALOME::SALOME_Exception)
 
     _mapNbTypes[SALOME_MED::MED_EDGE] = trouveSeg2 + trouveSeg3;
 
 
     _mapNbTypes[SALOME_MED::MED_EDGE] = trouveSeg2 + trouveSeg3;
 

-    // On compte les faces MEDMEM_TRIA3, MEDMEM_HEXA8, MEDMEM_TRIA6
+    // On compte les faces MED_TRIA3, MED_HEXA8, MED_TRIA6

     // On range les elements dans  les vecteurs correspondants 
     int trouveTria3 = 0;
     int trouveTria6 = 0;
     int trouveQuad4 = 0;
 
     // On range les elements dans  les vecteurs correspondants 
     int trouveTria3 = 0;
     int trouveTria6 = 0;
     int trouveQuad4 = 0;
 

-    _mapIndToSeqElts[SALOME_MED::MEDMEM_TRIA3] = _indexElts++;
-    _mapIndToSeqElts[SALOME_MED::MEDMEM_TRIA6] = _indexElts++;
-    _mapIndToSeqElts[SALOME_MED::MEDMEM_QUAD4] = _indexElts++;
+    _mapIndToSeqElts[SALOME_MED::MED_TRIA3] = _indexElts++;
+    _mapIndToSeqElts[SALOME_MED::MED_TRIA6] = _indexElts++;
+    _mapIndToSeqElts[SALOME_MED::MED_QUAD4] = _indexElts++;

     _mapIndToVectTypes[SALOME_MED::MED_FACE] = _indexEnts++;
 
     SMDS_FaceIteratorPtr itFaces=_meshDS->facesIterator();
     _mapIndToVectTypes[SALOME_MED::MED_FACE] = _indexEnts++;
 
     SMDS_FaceIteratorPtr itFaces=_meshDS->facesIterator();


@@ -1040,34 +1040,34 @@ void SMESH_MEDMesh_i::calculeNbElts() throw(SALOME::SALOME_Exception)
       {
       case 3:
         {
       {
       case 3:
         {

-          medElement = SALOME_MED::MEDMEM_TRIA3;
+          medElement = SALOME_MED::MED_TRIA3;

           if (trouveTria3 == 0)
           {
             trouveTria3 = 1;
             _TypesId[SALOME_MED::MED_FACE].
           if (trouveTria3 == 0)
           {
             trouveTria3 = 1;
             _TypesId[SALOME_MED::MED_FACE].

-              push_back(SALOME_MED::MEDMEM_TRIA3);
+              push_back(SALOME_MED::MED_TRIA3);

           }
           break;
         }
       case 4:
         {
           }
           break;
         }
       case 4:
         {

-          medElement = SALOME_MED::MEDMEM_QUAD4;
+          medElement = SALOME_MED::MED_QUAD4;

           if (trouveQuad4 == 0)
           {
             trouveQuad4 = 1;
             _TypesId[SALOME_MED::MED_FACE].
           if (trouveQuad4 == 0)
           {
             trouveQuad4 = 1;
             _TypesId[SALOME_MED::MED_FACE].

-              push_back(SALOME_MED::MEDMEM_QUAD4);
+              push_back(SALOME_MED::MED_QUAD4);

           }
           break;
         }
       case 6:
         {
           }
           break;
         }
       case 6:
         {

-          medElement = SALOME_MED::MEDMEM_TRIA6;
+          medElement = SALOME_MED::MED_TRIA6;

           if (trouveTria6 == 0)
           {
             trouveTria6 = 1;
             _TypesId[SALOME_MED::MED_FACE].
           if (trouveTria6 == 0)
           {
             trouveTria6 = 1;
             _TypesId[SALOME_MED::MED_FACE].

-              push_back(SALOME_MED::MEDMEM_TRIA6);
+              push_back(SALOME_MED::MED_TRIA6);

           }
           break;
         }
           }
           break;
         }


@@ -1090,7 +1090,7 @@ void SMESH_MEDMesh_i::calculeNbElts() throw(SALOME::SALOME_Exception)
     _mapNbTypes[SALOME_MED::MED_FACE] =
       trouveTria3 + trouveTria6 + trouveQuad4;
 
     _mapNbTypes[SALOME_MED::MED_FACE] =
       trouveTria3 + trouveTria6 + trouveQuad4;
 

-    _mapIndToSeqElts[SALOME_MED::MEDMEM_HEXA8] = _indexElts++;
+    _mapIndToSeqElts[SALOME_MED::MED_HEXA8] = _indexElts++;

     _mapIndToVectTypes[SALOME_MED::MED_CELL] = _indexEnts++;
     int index = _mapIndToSeqElts[medElement];
 
     _mapIndToVectTypes[SALOME_MED::MED_CELL] = _indexEnts++;
     int index = _mapIndToSeqElts[medElement];
 


@@ -1102,13 +1102,13 @@ void SMESH_MEDMesh_i::calculeNbElts() throw(SALOME::SALOME_Exception)
       const SMDS_MeshVolume * elem = itVolumes->next();
 
       int nb_of_nodes = elem->NbNodes();
       const SMDS_MeshVolume * elem = itVolumes->next();
 
       int nb_of_nodes = elem->NbNodes();

-      medElement = SALOME_MED::MEDMEM_HEXA8;
+      medElement = SALOME_MED::MED_HEXA8;

       ASSERT(nb_of_nodes == 8);
 
       if (trouveHexa8 == 0)
       {
         trouveHexa8 = 1;
       ASSERT(nb_of_nodes == 8);
 
       if (trouveHexa8 == 0)
       {
         trouveHexa8 = 1;

-        _TypesId[SALOME_MED::MED_CELL].push_back(SALOME_MED::MEDMEM_HEXA8);
+        _TypesId[SALOME_MED::MED_CELL].push_back(SALOME_MED::MED_HEXA8);

       };
       // Traitement de la maille
       int longueur = _seq_elemId[index]->length();
       };
       // Traitement de la maille
       int longueur = _seq_elemId[index]->length();

diff --git a/src/SMESH_I/SMESH_MEDSupport_i.cxx b/src/SMESH_I/SMESH_MEDSupport_i.cxx
index fd116b2910e692dad2b98b97c6583928f127d5b6..5ec6b5a7edab712adc83b80f9e8d2d56c09efe4e 100644 (file)
--- a/src/SMESH_I/SMESH_MEDSupport_i.cxx
+++ b/src/SMESH_I/SMESH_MEDSupport_i.cxx
@@ -79,7 +79,7 @@ SMESH_MEDSupport_i::SMESH_MEDSupport_i(SMESH_subMesh_i * sm, string name,
         {
                 _numberOfGeometricType = 1;
                 _geometricType = new SALOME_MED::medGeometryElement[1];
         {
                 _numberOfGeometricType = 1;
                 _geometricType = new SALOME_MED::medGeometryElement[1];

-                _geometricType[0] = SALOME_MED::MEDMEM_NONE;
+                _geometricType[0] = SALOME_MED::MED_NONE;

         }
         else
         {
         }
         else
         {


@@ -202,7 +202,7 @@ CORBA::Boolean SMESH_MEDSupport_i::isOnAllElements()throw(SALOME::
                         SALOME::INTERNAL_ERROR);
         if (_seqNumber == false)
         {
                         SALOME::INTERNAL_ERROR);
         if (_seqNumber == false)
         {

-                if (_entity != SALOME_MED::MEDMEM_NONE)
+                if (_entity != SALOME_MED::MED_NONE)

                 {
                         _seqLength = _subMeshDS->NbNodes();
                         _seqNumber = true;
                 {
                         _seqLength = _subMeshDS->NbNodes();
                         _seqNumber = true;


@@ -305,7 +305,7 @@ SALOME_TYPES::ListOfLong * SMESH_MEDSupport_i::getNumber(
                         SALOME::INTERNAL_ERROR);
 
         // A changer s'il ne s agit plus seulement de famille de noeuds
                         SALOME::INTERNAL_ERROR);
 
         // A changer s'il ne s agit plus seulement de famille de noeuds

-        if (geomElement != SALOME_MED::MEDMEM_NONE)
+        if (geomElement != SALOME_MED::MED_NONE)

                 THROW_SALOME_CORBA_EXCEPTION("Not implemented", SALOME::BAD_PARAM);
 
         SALOME_TYPES::ListOfLong_var myseq = new SALOME_TYPES::ListOfLong;
                 THROW_SALOME_CORBA_EXCEPTION("Not implemented", SALOME::BAD_PARAM);
 
         SALOME_TYPES::ListOfLong_var myseq = new SALOME_TYPES::ListOfLong;