ForkMaster/netgenplugin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

0020279: [CEA 334] control the "random" use when using mesh algorithms

Browse Source 
sort faces by IDs
This commit is contained in:
eap 2009-05-19 15:44:24 +00:00
parent 4db4ace92a
commit 46adf58292
1 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/NETGENPlugin/NETGENPlugin_NETGEN_3D.cxx
View File

@ -174,7 +174,7 @@ bool NETGENPlugin_NETGEN_3D::Compute(SMESH_Mesh& aMesh,
SMESH_MesherHelper* myTool = &helper; SMESH_MesherHelper* myTool = &helper;
bool _quadraticMesh = myTool->IsQuadraticSubMesh(aShape); bool _quadraticMesh = myTool->IsQuadraticSubMesh(aShape);
typedef map< const SMDS_MeshNode*, int, TIDCompare< SMDS_MeshNode> > TNodeToIDMap; typedef map< const SMDS_MeshNode*, int, TIDCompare > TNodeToIDMap;
TNodeToIDMap nodeToNetgenID; TNodeToIDMap nodeToNetgenID;
list< const SMDS_MeshElement* > triangles; list< const SMDS_MeshElement* > triangles;
list< bool > isReversed; // orientation of triangles list< bool > isReversed; // orientation of triangles
@ -215,13 +215,13 @@ bool NETGENPlugin_NETGEN_3D::Compute(SMESH_Mesh& aMesh,
//return error( COMPERR_BAD_INPUT_MESH, //return error( COMPERR_BAD_INPUT_MESH,
// SMESH_Comment("Not triangle element ")<<elem->GetID()); // SMESH_Comment("Not triangle element ")<<elem->GetID());
// using adaptor // using adaptor
std::list<const SMDS_FaceOfNodes*> faces = Adaptor.GetTriangles(elem); const list<const SMDS_FaceOfNodes*>* faces = Adaptor.GetTriangles(elem);
if(faces.size()==0) { if(faces==0) {
return error( COMPERR_BAD_INPUT_MESH, return error( COMPERR_BAD_INPUT_MESH,
SMESH_Comment("Not triangles in adaptor for element ")<<elem->GetID()); SMESH_Comment("Not triangles in adaptor for element ")<<elem->GetID());
} }
std::list<const SMDS_FaceOfNodes*>::iterator itf = faces.begin(); list<const SMDS_FaceOfNodes*>::const_iterator itf = faces->begin();
for(; itf!=faces.end(); itf++ ) { for(; itf!=faces->end(); itf++ ) {
triangles.push_back( (*itf) ); triangles.push_back( (*itf) );
isReversed.push_back( isRev ); isReversed.push_back( isRev );
// put triange's nodes to nodeToNetgenID map // put triange's nodes to nodeToNetgenID map
@ -441,7 +441,7 @@ bool NETGENPlugin_NETGEN_3D::Compute(SMESH_Mesh& aMesh,
MESSAGE("NETGENPlugin_NETGEN_3D::Compute with maxElmentsize = " << _maxElementVolume); MESSAGE("NETGENPlugin_NETGEN_3D::Compute with maxElmentsize = " << _maxElementVolume);
const int invalid_ID = -1; const int invalid_ID = -1;
bool _quadraticMesh = false; bool _quadraticMesh = false;
typedef map< const SMDS_MeshNode*, int> TNodeToIDMap; typedef map< const SMDS_MeshNode*, int, TIDCompare > TNodeToIDMap;
TNodeToIDMap nodeToNetgenID; TNodeToIDMap nodeToNetgenID;
list< const SMDS_MeshElement* > triangles; list< const SMDS_MeshElement* > triangles;
SMESHDS_Mesh* MeshDS = aHelper->GetMeshDS(); SMESHDS_Mesh* MeshDS = aHelper->GetMeshDS();
@ -457,10 +457,14 @@ bool NETGENPlugin_NETGEN_3D::Compute(SMESH_Mesh& aMesh,
StdMeshers_QuadToTriaAdaptor Adaptor; StdMeshers_QuadToTriaAdaptor Adaptor;
Adaptor.Compute(aMesh); Adaptor.Compute(aMesh);
SMDS_FaceIteratorPtr iteratorFace = MeshDS->facesIterator(); SMDS_FaceIteratorPtr fIt = MeshDS->facesIterator();
while(iteratorFace->more()) { TIDSortedElemSet sortedFaces; // 0020279: control the "random" use when using mesh algorithms
while( fIt->more()) sortedFaces.insert( fIt->next() );
TIDSortedElemSet::iterator itFace = sortedFaces.begin(), fEnd = sortedFaces.end();
for ( ; itFace != fEnd; ++itFace ) {
// check element // check element
const SMDS_MeshElement* elem = iteratorFace->next(); const SMDS_MeshElement* elem = *itFace;
if ( !elem ) if ( !elem )
return error( COMPERR_BAD_INPUT_MESH, "Null element encounters"); return error( COMPERR_BAD_INPUT_MESH, "Null element encounters");
bool isTraingle = ( elem->NbNodes()==3 || (_quadraticMesh && elem->NbNodes()==6 )); bool isTraingle = ( elem->NbNodes()==3 || (_quadraticMesh && elem->NbNodes()==6 ));
@ -468,13 +472,13 @@ bool NETGENPlugin_NETGEN_3D::Compute(SMESH_Mesh& aMesh,
//return error( COMPERR_BAD_INPUT_MESH, //return error( COMPERR_BAD_INPUT_MESH,
// SMESH_Comment("Not triangle element ")<<elem->GetID()); // SMESH_Comment("Not triangle element ")<<elem->GetID());
// using adaptor // using adaptor
std::list<const SMDS_FaceOfNodes*> faces = Adaptor.GetTriangles(elem); const list<const SMDS_FaceOfNodes*>* faces = Adaptor.GetTriangles(elem);
if(faces.size()==0) { if(faces==0) {
return error( COMPERR_BAD_INPUT_MESH, return error( COMPERR_BAD_INPUT_MESH,
SMESH_Comment("Not triangles in adaptor for element ")<<elem->GetID()); SMESH_Comment("Not triangles in adaptor for element ")<<elem->GetID());
} }
std::list<const SMDS_FaceOfNodes*>::iterator itf = faces.begin(); list<const SMDS_FaceOfNodes*>::const_iterator itf = faces->begin();
for(; itf!=faces.end(); itf++ ) { for(; itf!=faces->end(); itf++ ) {
triangles.push_back( (*itf) ); triangles.push_back( (*itf) );
// put triange's nodes to nodeToNetgenID map // put triange's nodes to nodeToNetgenID map
SMDS_ElemIteratorPtr triangleNodesIt = (*itf)->nodesIterator(); SMDS_ElemIteratorPtr triangleNodesIt = (*itf)->nodesIterator();