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

PAL18920: 2 Meshes with the same hypothesis : one compute well but the other not !?!

Browse Source 
remove all new nodes and elements if algo fails
This commit is contained in:
eap 2008-02-11 11:14:47 +00:00
parent 441f1e7dca
commit e2cfeef800
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/StdMeshers/StdMeshers_Projection_2D.cxx
View File

@ -191,10 +191,8 @@ namespace {
{ {
// old nodes are shared by edges and new ones are shared // old nodes are shared by edges and new ones are shared
// only by faces created by mapper // only by faces created by mapper
bool isOld = false; SMDS_ElemIteratorPtr invEdge = node->GetInverseElementIterator(SMDSAbs_Edge);
SMDS_ElemIteratorPtr invElem = node->GetInverseElementIterator(); bool isOld = invEdge->more();
while ( !isOld && invElem->more() )
isOld = ( invElem->next()->GetType() == SMDSAbs_Edge );
return isOld; return isOld;
} }
@ -212,12 +210,13 @@ namespace {
MeshCleaner( SMESH_subMesh* faceSubMesh ): sm(faceSubMesh) {} MeshCleaner( SMESH_subMesh* faceSubMesh ): sm(faceSubMesh) {}
~MeshCleaner() { Clean(sm); } ~MeshCleaner() { Clean(sm); }
void Release() { sm = 0; } // mesh will not be removed void Release() { sm = 0; } // mesh will not be removed
static void Clean( SMESH_subMesh* sm ) static void Clean( SMESH_subMesh* sm, bool withSub=true )
{ {
if ( !sm ) return; if ( !sm ) return;
switch ( sm->GetSubShape().ShapeType() ) { // PAL16567, 18920. Remove face nodes as well
case TopAbs_VERTEX: // switch ( sm->GetSubShape().ShapeType() ) {
case TopAbs_EDGE: { // case TopAbs_VERTEX:
// case TopAbs_EDGE: {
SMDS_NodeIteratorPtr nIt = sm->GetSubMeshDS()->GetNodes(); SMDS_NodeIteratorPtr nIt = sm->GetSubMeshDS()->GetNodes();
SMESHDS_Mesh* mesh = sm->GetFather()->GetMeshDS(); SMESHDS_Mesh* mesh = sm->GetFather()->GetMeshDS();
while ( nIt->more() ) { while ( nIt->more() ) {
@ -226,12 +225,13 @@ namespace {
mesh->RemoveNode( node ); mesh->RemoveNode( node );
} }
// do not break but iterate over DependsOn() // do not break but iterate over DependsOn()
} // }
default: // default:
if ( !withSub ) return;
SMESH_subMeshIteratorPtr smIt = sm->getDependsOnIterator(false,false); SMESH_subMeshIteratorPtr smIt = sm->getDependsOnIterator(false,false);
while ( smIt->more() ) while ( smIt->more() )
Clean( smIt->next() ); Clean( smIt->next(), false );
} // }
} }
}; };
@ -474,7 +474,7 @@ bool StdMeshers_Projection_2D::Compute(SMESH_Mesh& theMesh, const TopoDS_Shape&
// it will remove mesh built by pattern mapper on edges and vertices // it will remove mesh built by pattern mapper on edges and vertices
// in failure case // in failure case
// MeshCleaner cleaner( tgtSubMesh ); MeshCleaner cleaner( tgtSubMesh );
// ------------------------------------------------------------------------- // -------------------------------------------------------------------------
// mapper doesn't take care of nodes already existing on edges and vertices, // mapper doesn't take care of nodes already existing on edges and vertices,
@ -617,7 +617,7 @@ bool StdMeshers_Projection_2D::Compute(SMESH_Mesh& theMesh, const TopoDS_Shape&
} }
} }
//cleaner.Release(); // do not remove mesh cleaner.Release(); // do not remove mesh
return true; return true;
} }