ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2024-12-27 09:50:34 +05:00
Code Issues Packages Projects Releases Wiki Activity

PR: relax constraints on node distances on StdMeshers_import_1D

Browse Source
This commit is contained in:
prascle 2013-04-16 16:47:43 +00:00
parent be61d6322e
commit bb5c11a5ed
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/StdMeshers/StdMeshers_Import_1D.cxx
View File

@ -693,9 +693,11 @@ bool StdMeshers_Import_1D::Compute(SMESH_Mesh & theMesh, const TopoDS_Shape & th
else else
{ {
// find an existing vertex node // find an existing vertex node
double checktol = max(1.E-10, 10*edgeTol*edgeTol);
for ( vNIt = vertexNodes.begin(); vNIt != vertexNodes.end(); ++vNIt) for ( vNIt = vertexNodes.begin(); vNIt != vertexNodes.end(); ++vNIt)
if ( vNIt->SquareDistance( *node ) < 10 * edgeTol * edgeTol) if ( vNIt->SquareDistance( *node ) < checktol)
{ {
//MESSAGE("SquareDistance " << vNIt->SquareDistance( *node ) << " checktol " << checktol);
(*n2nIt).second = vNIt->_node; (*n2nIt).second = vNIt->_node;
vertexNodes.erase( vNIt ); vertexNodes.erase( vNIt );
break; break;
@ -710,13 +712,17 @@ bool StdMeshers_Import_1D::Compute(SMESH_Mesh & theMesh, const TopoDS_Shape & th
SMDS_MeshNode* newNode = tgtMesh->AddNode( (*node)->X(), (*node)->Y(), (*node)->Z()); SMDS_MeshNode* newNode = tgtMesh->AddNode( (*node)->X(), (*node)->Y(), (*node)->Z());
n2nIt->second = newNode; n2nIt->second = newNode;
tgtMesh->SetNodeOnEdge( newNode, shapeID, u ); tgtMesh->SetNodeOnEdge( newNode, shapeID, u );
//MESSAGE("u=" << u);
} }
} }
if ( !(newNodes[i] = n2nIt->second )) if ( !(newNodes[i] = n2nIt->second ))
break; break;
} }
if ( !newNodes.back() ) if ( !newNodes.back() )
{
//MESSAGE("not all nodes of edge lie on theShape");
continue; // not all nodes of edge lie on theShape continue; // not all nodes of edge lie on theShape
}
// make a new edge // make a new edge
SMDS_MeshElement * newEdge; SMDS_MeshElement * newEdge;
@ -724,6 +730,7 @@ bool StdMeshers_Import_1D::Compute(SMESH_Mesh & theMesh, const TopoDS_Shape & th
newEdge = tgtMesh->AddEdge( newNodes[0], newNodes[1], newNodes[2] ); newEdge = tgtMesh->AddEdge( newNodes[0], newNodes[1], newNodes[2] );
else else
newEdge = tgtMesh->AddEdge( newNodes[0], newNodes[1]); newEdge = tgtMesh->AddEdge( newNodes[0], newNodes[1]);
//MESSAGE("add Edge");
tgtMesh->SetMeshElementOnShape( newEdge, shapeID ); tgtMesh->SetMeshElementOnShape( newEdge, shapeID );
e2e->insert( make_pair( edge, newEdge )); e2e->insert( make_pair( edge, newEdge ));
} }