ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2025-02-21 04:29:41 +05:00
Code Issues Packages Projects Releases Wiki Activity

0021257: Rollback the medGeometryElement names MEDMEM_ --> MED_

Browse Source
This commit is contained in:
eap 2011-05-04 13:06:27 +00:00
parent 8d68a5ae9a
commit e06a1de08f
2 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/SMESH_I/SMESH_MEDMesh_i.cxx
View File

@ -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 * implemented for MED_ALL_ENTITIES
* *
* Dans cette implementation, il n est pas prevu de tenir compte du entity * 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) if (_mesh_i == 0)
THROW_SALOME_CORBA_EXCEPTION("No associated Mesh", THROW_SALOME_CORBA_EXCEPTION("No associated Mesh",
SALOME::INTERNAL_ERROR); SALOME::INTERNAL_ERROR);
if (geomElement == SALOME_MED::MEDMEM_ALL_ELEMENTS) if (geomElement == SALOME_MED::MED_ALL_ELEMENTS)
THROW_SALOME_CORBA_EXCEPTION("Not implemented for MEDMEM_ALL_ELEMENTS", THROW_SALOME_CORBA_EXCEPTION("Not implemented for MED_ALL_ELEMENTS",
SALOME::BAD_PARAM); SALOME::BAD_PARAM);
if (!_compte) if (!_compte)
calculeNbElts(); calculeNbElts();
@ -962,11 +962,11 @@ void SMESH_MEDMesh_i::calculeNbElts() throw(SALOME::SALOME_Exception)
_compte = true; _compte = true;
_mapNbTypes[SALOME_MED::MED_NODE] = 1; _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::MED_SEG2] = _indexElts++;
_mapIndToSeqElts[SALOME_MED::MEDMEM_SEG3] = _indexElts++; _mapIndToSeqElts[SALOME_MED::MED_SEG3] = _indexElts++;
_mapIndToVectTypes[SALOME_MED::MED_EDGE] = _indexEnts++; _mapIndToVectTypes[SALOME_MED::MED_EDGE] = _indexEnts++;
int trouveSeg2 = 0; 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) if (trouveSeg2 == 0)
{ {
trouveSeg2 = 1; trouveSeg2 = 1;
_TypesId[SALOME_MED::MED_EDGE]. _TypesId[SALOME_MED::MED_EDGE].
push_back(SALOME_MED::MEDMEM_SEG2); push_back(SALOME_MED::MED_SEG2);
} }
break; break;
} }
case 3: case 3:
{ {
medElement = SALOME_MED::MEDMEM_SEG3; medElement = SALOME_MED::MED_SEG3;
if (trouveSeg3 == 0) if (trouveSeg3 == 0)
{ {
trouveSeg3 = 1; trouveSeg3 = 1;
_TypesId[SALOME_MED::MED_EDGE]. _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 // On range les elements dans les vecteurs correspondants
int trouveTria3 = 0; int trouveTria3 = 0;
int trouveTria6 = 0; int trouveTria6 = 0;
int trouveQuad4 = 0; int trouveQuad4 = 0;
_mapIndToSeqElts[SALOME_MED::MEDMEM_TRIA3] = _indexElts++; _mapIndToSeqElts[SALOME_MED::MED_TRIA3] = _indexElts++;
_mapIndToSeqElts[SALOME_MED::MEDMEM_TRIA6] = _indexElts++; _mapIndToSeqElts[SALOME_MED::MED_TRIA6] = _indexElts++;
_mapIndToSeqElts[SALOME_MED::MEDMEM_QUAD4] = _indexElts++; _mapIndToSeqElts[SALOME_MED::MED_QUAD4] = _indexElts++;
_mapIndToVectTypes[SALOME_MED::MED_FACE] = _indexEnts++; _mapIndToVectTypes[SALOME_MED::MED_FACE] = _indexEnts++;
SMDS_FaceIteratorPtr itFaces=_meshDS->facesIterator(); 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) if (trouveTria3 == 0)
{ {
trouveTria3 = 1; trouveTria3 = 1;
_TypesId[SALOME_MED::MED_FACE]. _TypesId[SALOME_MED::MED_FACE].
push_back(SALOME_MED::MEDMEM_TRIA3); push_back(SALOME_MED::MED_TRIA3);
} }
break; break;
} }
case 4: case 4:
{ {
medElement = SALOME_MED::MEDMEM_QUAD4; medElement = SALOME_MED::MED_QUAD4;
if (trouveQuad4 == 0) if (trouveQuad4 == 0)
{ {
trouveQuad4 = 1; trouveQuad4 = 1;
_TypesId[SALOME_MED::MED_FACE]. _TypesId[SALOME_MED::MED_FACE].
push_back(SALOME_MED::MEDMEM_QUAD4); push_back(SALOME_MED::MED_QUAD4);
} }
break; break;
} }
case 6: case 6:
{ {
medElement = SALOME_MED::MEDMEM_TRIA6; medElement = SALOME_MED::MED_TRIA6;
if (trouveTria6 == 0) if (trouveTria6 == 0)
{ {
trouveTria6 = 1; trouveTria6 = 1;
_TypesId[SALOME_MED::MED_FACE]. _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] = _mapNbTypes[SALOME_MED::MED_FACE] =
trouveTria3 + trouveTria6 + trouveQuad4; trouveTria3 + trouveTria6 + trouveQuad4;
_mapIndToSeqElts[SALOME_MED::MEDMEM_HEXA8] = _indexElts++; _mapIndToSeqElts[SALOME_MED::MED_HEXA8] = _indexElts++;
_mapIndToVectTypes[SALOME_MED::MED_CELL] = _indexEnts++; _mapIndToVectTypes[SALOME_MED::MED_CELL] = _indexEnts++;
int index = _mapIndToSeqElts[medElement]; int index = _mapIndToSeqElts[medElement];
@ -1102,13 +1102,13 @@ void SMESH_MEDMesh_i::calculeNbElts() throw(SALOME::SALOME_Exception)
const SMDS_MeshVolume * elem = itVolumes->next(); const SMDS_MeshVolume * elem = itVolumes->next();
int nb_of_nodes = elem->NbNodes(); int nb_of_nodes = elem->NbNodes();
medElement = SALOME_MED::MEDMEM_HEXA8; medElement = SALOME_MED::MED_HEXA8;
ASSERT(nb_of_nodes == 8); ASSERT(nb_of_nodes == 8);
if (trouveHexa8 == 0) if (trouveHexa8 == 0)
{ {
trouveHexa8 = 1; 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 // Traitement de la maille
int longueur = _seq_elemId[index]->length(); int longueur = _seq_elemId[index]->length();

6
src/SMESH_I/SMESH_MEDSupport_i.cxx
View File

@ -79,7 +79,7 @@ SMESH_MEDSupport_i::SMESH_MEDSupport_i(SMESH_subMesh_i * sm, string name,
{ {
_numberOfGeometricType = 1; _numberOfGeometricType = 1;
_geometricType = new SALOME_MED::medGeometryElement[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); SALOME::INTERNAL_ERROR);
if (_seqNumber == false) if (_seqNumber == false)
{ {
if (_entity != SALOME_MED::MEDMEM_NONE) if (_entity != SALOME_MED::MED_NONE)
{ {
_seqLength = _subMeshDS->NbNodes(); _seqLength = _subMeshDS->NbNodes();
_seqNumber = true; _seqNumber = true;
@ -305,7 +305,7 @@ SALOME_TYPES::ListOfLong * SMESH_MEDSupport_i::getNumber(
SALOME::INTERNAL_ERROR); SALOME::INTERNAL_ERROR);
// A changer s'il ne s agit plus seulement de famille de noeuds // 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); THROW_SALOME_CORBA_EXCEPTION("Not implemented", SALOME::BAD_PARAM);
SALOME_TYPES::ListOfLong_var myseq = new SALOME_TYPES::ListOfLong; SALOME_TYPES::ListOfLong_var myseq = new SALOME_TYPES::ListOfLong;