ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2025-05-12 05:40:47 +05:00
Code Issues Packages Projects Releases Wiki Activity

Finishing improvement IPAL12061: rename element order from Square to Quadratic

Browse Source
This commit is contained in:
msv 2006-04-11 07:24:27 +00:00
parent 6b5e44e4d8
commit 9af675c36d
5 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
idl/SMESH_Mesh.idl
View File

@ -118,7 +118,7 @@ module SMESH
enum ElementOrder { enum ElementOrder {
ORDER_ANY, /*! entities of any order */ ORDER_ANY, /*! entities of any order */
ORDER_LINEAR, /*! entities of 1st order */ ORDER_LINEAR, /*! entities of 1st order */
ORDER_SQUARE /*! entities of 2nd order */ ORDER_QUADRATIC /*! entities of 2nd order */
}; };
/*! /*!

18
src/SMESH/SMESH_Mesh.cxx
View File

@ -1000,7 +1000,7 @@ int SMESH_Mesh::NbEdges(ElementOrder order) throw(SALOME_Exception)
while (it->more()) { while (it->more()) {
const SMDS_MeshEdge* cur = it->next(); const SMDS_MeshEdge* cur = it->next();
if ( order == ORDER_LINEAR && !cur->IsQuadratic() || if ( order == ORDER_LINEAR && !cur->IsQuadratic() ||
order == ORDER_SQUARE && cur->IsQuadratic() ) order == ORDER_QUADRATIC && cur->IsQuadratic() )
Nb++; Nb++;
} }
return Nb; return Nb;
@ -1022,7 +1022,7 @@ int SMESH_Mesh::NbFaces(ElementOrder order) throw(SALOME_Exception)
while (it->more()) { while (it->more()) {
const SMDS_MeshFace* cur = it->next(); const SMDS_MeshFace* cur = it->next();
if ( order == ORDER_LINEAR && !cur->IsQuadratic() || if ( order == ORDER_LINEAR && !cur->IsQuadratic() ||
order == ORDER_SQUARE && cur->IsQuadratic() ) order == ORDER_QUADRATIC && cur->IsQuadratic() )
Nb++; Nb++;
} }
return Nb; return Nb;
@ -1043,7 +1043,7 @@ int SMESH_Mesh::NbTriangles(ElementOrder order) throw(SALOME_Exception)
if ( !curFace->IsPoly() && if ( !curFace->IsPoly() &&
( order == ORDER_ANY && (nbnod==3 || nbnod==6) || ( order == ORDER_ANY && (nbnod==3 || nbnod==6) ||
order == ORDER_LINEAR && nbnod==3 || order == ORDER_LINEAR && nbnod==3 ||
order == ORDER_SQUARE && nbnod==6 ) ) order == ORDER_QUADRATIC && nbnod==6 ) )
Nb++; Nb++;
} }
return Nb; return Nb;
@ -1064,7 +1064,7 @@ int SMESH_Mesh::NbQuadrangles(ElementOrder order) throw(SALOME_Exception)
if ( !curFace->IsPoly() && if ( !curFace->IsPoly() &&
( order == ORDER_ANY && (nbnod==4 || nbnod==8) || ( order == ORDER_ANY && (nbnod==4 || nbnod==8) ||
order == ORDER_LINEAR && nbnod==4 || order == ORDER_LINEAR && nbnod==4 ||
order == ORDER_SQUARE && nbnod==8 ) ) order == ORDER_QUADRATIC && nbnod==8 ) )
Nb++; Nb++;
} }
return Nb; return Nb;
@ -1099,7 +1099,7 @@ int SMESH_Mesh::NbVolumes(ElementOrder order) throw(SALOME_Exception)
while (it->more()) { while (it->more()) {
const SMDS_MeshVolume* cur = it->next(); const SMDS_MeshVolume* cur = it->next();
if ( order == ORDER_LINEAR && !cur->IsQuadratic() || if ( order == ORDER_LINEAR && !cur->IsQuadratic() ||
order == ORDER_SQUARE && cur->IsQuadratic() ) order == ORDER_QUADRATIC && cur->IsQuadratic() )
Nb++; Nb++;
} }
return Nb; return Nb;
@ -1116,7 +1116,7 @@ int SMESH_Mesh::NbTetras(ElementOrder order) throw(SALOME_Exception)
if ( !curVolume->IsPoly() && if ( !curVolume->IsPoly() &&
( order == ORDER_ANY && (nbnod==4 || nbnod==10) || ( order == ORDER_ANY && (nbnod==4 || nbnod==10) ||
order == ORDER_LINEAR && nbnod==4 || order == ORDER_LINEAR && nbnod==4 ||
order == ORDER_SQUARE && nbnod==10 ) ) order == ORDER_QUADRATIC && nbnod==10 ) )
Nb++; Nb++;
} }
return Nb; return Nb;
@ -1133,7 +1133,7 @@ int SMESH_Mesh::NbHexas(ElementOrder order) throw(SALOME_Exception)
if ( !curVolume->IsPoly() && if ( !curVolume->IsPoly() &&
( order == ORDER_ANY && (nbnod==8 || nbnod==20) || ( order == ORDER_ANY && (nbnod==8 || nbnod==20) ||
order == ORDER_LINEAR && nbnod==8 || order == ORDER_LINEAR && nbnod==8 ||
order == ORDER_SQUARE && nbnod==20 ) ) order == ORDER_QUADRATIC && nbnod==20 ) )
Nb++; Nb++;
} }
return Nb; return Nb;
@ -1150,7 +1150,7 @@ int SMESH_Mesh::NbPyramids(ElementOrder order) throw(SALOME_Exception)
if ( !curVolume->IsPoly() && if ( !curVolume->IsPoly() &&
( order == ORDER_ANY && (nbnod==5 || nbnod==13) || ( order == ORDER_ANY && (nbnod==5 || nbnod==13) ||
order == ORDER_LINEAR && nbnod==5 || order == ORDER_LINEAR && nbnod==5 ||
order == ORDER_SQUARE && nbnod==13 ) ) order == ORDER_QUADRATIC && nbnod==13 ) )
Nb++; Nb++;
} }
return Nb; return Nb;
@ -1167,7 +1167,7 @@ int SMESH_Mesh::NbPrisms(ElementOrder order) throw(SALOME_Exception)
if ( !curVolume->IsPoly() && if ( !curVolume->IsPoly() &&
( order == ORDER_ANY && (nbnod==6 || nbnod==15) || ( order == ORDER_ANY && (nbnod==6 || nbnod==15) ||
order == ORDER_LINEAR && nbnod==6 || order == ORDER_LINEAR && nbnod==6 ||
order == ORDER_SQUARE && nbnod==15 ) ) order == ORDER_QUADRATIC && nbnod==15 ) )
Nb++; Nb++;
} }
return Nb; return Nb;

2
src/SMESH/SMESH_Mesh.hxx
View File

@ -180,7 +180,7 @@ public:
enum ElementOrder { enum ElementOrder {
ORDER_ANY, /*! entities of any order */ ORDER_ANY, /*! entities of any order */
ORDER_LINEAR, /*! entities of 1st order */ ORDER_LINEAR, /*! entities of 1st order */
ORDER_SQUARE /*! entities of 2nd order */ ORDER_QUADRATIC /*! entities of 2nd order */
}; };
int NbEdges(ElementOrder order = ORDER_ANY) throw(SALOME_Exception); int NbEdges(ElementOrder order = ORDER_ANY) throw(SALOME_Exception);

18
src/SMESHGUI/SMESHGUI_MeshInfosDlg.cxx
View File

@ -486,32 +486,32 @@ void SMESHGUI_MeshInfosDlg::DumpMeshInfos()
myMeshNbNodes->setNum((int)aMesh->NbNodes()); myMeshNbNodes->setNum((int)aMesh->NbNodes());
myMeshNbEdges->setNum((int)aMesh->NbEdges()); myMeshNbEdges->setNum((int)aMesh->NbEdges());
myMeshNbEdges1->setNum((int)aMesh->NbEdgesOfOrder(SMESH::ORDER_LINEAR)); myMeshNbEdges1->setNum((int)aMesh->NbEdgesOfOrder(SMESH::ORDER_LINEAR));
myMeshNbEdges2->setNum((int)aMesh->NbEdgesOfOrder(SMESH::ORDER_SQUARE)); myMeshNbEdges2->setNum((int)aMesh->NbEdgesOfOrder(SMESH::ORDER_QUADRATIC));
myMeshNbFaces->setNum((int)aMesh->NbFaces()); myMeshNbFaces->setNum((int)aMesh->NbFaces());
myMeshNbFaces1->setNum((int)aMesh->NbFacesOfOrder(SMESH::ORDER_LINEAR)); myMeshNbFaces1->setNum((int)aMesh->NbFacesOfOrder(SMESH::ORDER_LINEAR));
myMeshNbFaces2->setNum((int)aMesh->NbFacesOfOrder(SMESH::ORDER_SQUARE)); myMeshNbFaces2->setNum((int)aMesh->NbFacesOfOrder(SMESH::ORDER_QUADRATIC));
myMeshNbTriangles->setNum((int)aMesh->NbTriangles()); myMeshNbTriangles->setNum((int)aMesh->NbTriangles());
myMeshNbTriangles1->setNum((int)aMesh->NbTrianglesOfOrder(SMESH::ORDER_LINEAR)); myMeshNbTriangles1->setNum((int)aMesh->NbTrianglesOfOrder(SMESH::ORDER_LINEAR));
myMeshNbTriangles2->setNum((int)aMesh->NbTrianglesOfOrder(SMESH::ORDER_SQUARE)); myMeshNbTriangles2->setNum((int)aMesh->NbTrianglesOfOrder(SMESH::ORDER_QUADRATIC));
myMeshNbQuadrangles->setNum((int)aMesh->NbQuadrangles()); myMeshNbQuadrangles->setNum((int)aMesh->NbQuadrangles());
myMeshNbQuadrangles1->setNum((int)aMesh->NbQuadranglesOfOrder(SMESH::ORDER_LINEAR)); myMeshNbQuadrangles1->setNum((int)aMesh->NbQuadranglesOfOrder(SMESH::ORDER_LINEAR));
myMeshNbQuadrangles2->setNum((int)aMesh->NbQuadranglesOfOrder(SMESH::ORDER_SQUARE)); myMeshNbQuadrangles2->setNum((int)aMesh->NbQuadranglesOfOrder(SMESH::ORDER_QUADRATIC));
myMeshNbPolygones->setNum( (int)aMesh->NbPolygons() ); myMeshNbPolygones->setNum( (int)aMesh->NbPolygons() );
myMeshNbVolumes->setNum((int)aMesh->NbVolumes()); myMeshNbVolumes->setNum((int)aMesh->NbVolumes());
myMeshNbVolumes1->setNum((int)aMesh->NbVolumesOfOrder(SMESH::ORDER_LINEAR)); myMeshNbVolumes1->setNum((int)aMesh->NbVolumesOfOrder(SMESH::ORDER_LINEAR));
myMeshNbVolumes2->setNum((int)aMesh->NbVolumesOfOrder(SMESH::ORDER_SQUARE)); myMeshNbVolumes2->setNum((int)aMesh->NbVolumesOfOrder(SMESH::ORDER_QUADRATIC));
myMeshNbTetra->setNum((int)aMesh->NbTetras()); myMeshNbTetra->setNum((int)aMesh->NbTetras());
myMeshNbTetra1->setNum((int)aMesh->NbTetrasOfOrder(SMESH::ORDER_LINEAR)); myMeshNbTetra1->setNum((int)aMesh->NbTetrasOfOrder(SMESH::ORDER_LINEAR));
myMeshNbTetra2->setNum((int)aMesh->NbTetrasOfOrder(SMESH::ORDER_SQUARE)); myMeshNbTetra2->setNum((int)aMesh->NbTetrasOfOrder(SMESH::ORDER_QUADRATIC));
myMeshNbHexa->setNum((int)aMesh->NbHexas()); myMeshNbHexa->setNum((int)aMesh->NbHexas());
myMeshNbHexa1->setNum((int)aMesh->NbHexasOfOrder(SMESH::ORDER_LINEAR)); myMeshNbHexa1->setNum((int)aMesh->NbHexasOfOrder(SMESH::ORDER_LINEAR));
myMeshNbHexa2->setNum((int)aMesh->NbHexasOfOrder(SMESH::ORDER_SQUARE)); myMeshNbHexa2->setNum((int)aMesh->NbHexasOfOrder(SMESH::ORDER_QUADRATIC));
myMeshNbPrism->setNum((int)aMesh->NbPrisms()); myMeshNbPrism->setNum((int)aMesh->NbPrisms());
myMeshNbPrism1->setNum((int)aMesh->NbPrismsOfOrder(SMESH::ORDER_LINEAR)); myMeshNbPrism1->setNum((int)aMesh->NbPrismsOfOrder(SMESH::ORDER_LINEAR));
myMeshNbPrism2->setNum((int)aMesh->NbPrismsOfOrder(SMESH::ORDER_SQUARE)); myMeshNbPrism2->setNum((int)aMesh->NbPrismsOfOrder(SMESH::ORDER_QUADRATIC));
myMeshNbPyra->setNum((int)aMesh->NbPyramids()); myMeshNbPyra->setNum((int)aMesh->NbPyramids());
myMeshNbPyra1->setNum((int)aMesh->NbPyramidsOfOrder(SMESH::ORDER_LINEAR)); myMeshNbPyra1->setNum((int)aMesh->NbPyramidsOfOrder(SMESH::ORDER_LINEAR));
myMeshNbPyra2->setNum((int)aMesh->NbPyramidsOfOrder(SMESH::ORDER_SQUARE)); myMeshNbPyra2->setNum((int)aMesh->NbPyramidsOfOrder(SMESH::ORDER_QUADRATIC));
myMeshNbPolyhedrones->setNum( (int)aMesh->NbPolyhedrons() ); myMeshNbPolyhedrones->setNum( (int)aMesh->NbPolyhedrons() );
return; return;
} }

2
src/SMESHGUI/SMESH_msg_en.po
View File

@ -772,7 +772,7 @@ msgid "SMESH_MESHINFO_ORDER1"
msgstr "Linear" msgstr "Linear"
msgid "SMESH_MESHINFO_ORDER2" msgid "SMESH_MESHINFO_ORDER2"
msgstr "Square" msgstr "Quadratic"
#Elements : #Elements :
msgid "SMESH_MESHINFO_ELEMENTS" msgid "SMESH_MESHINFO_ELEMENTS"