ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2024-12-26 17:30:35 +05:00
Code Issues Packages Projects Releases Wiki Activity

SALOME Forum bug: http://www.salome-platform.org/forum/forum_10/967838025

Browse Source 
Use SMESH_OctreeNode to sew imported elements to pre-existing ones
This commit is contained in:
eap 2013-08-23 13:38:12 +00:00
parent dd67430f66
commit cc817cd04f
1 changed files with 29 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/StdMeshers/StdMeshers_Import_1D2D.cxx
View File

@ -38,6 +38,7 @@
#include "SMESH_Group.hxx" #include "SMESH_Group.hxx"
#include "SMESH_Mesh.hxx" #include "SMESH_Mesh.hxx"
#include "SMESH_MesherHelper.hxx" #include "SMESH_MesherHelper.hxx"
#include "SMESH_OctreeNode.hxx"
#include "SMESH_subMesh.hxx" #include "SMESH_subMesh.hxx"
#include "Utils_SALOME_Exception.hxx" #include "Utils_SALOME_Exception.hxx"
@ -191,9 +192,10 @@ bool StdMeshers_Import_1D2D::Compute(SMESH_Mesh & theMesh, const TopoDS_Shape &
set<int> subShapeIDs; set<int> subShapeIDs;
subShapeIDs.insert( shapeID ); subShapeIDs.insert( shapeID );
// get nodes on vertices // nodes already existing on sub-shapes of the FACE
list < SMESH_TNodeXYZ > vertexNodes; TIDSortedNodeSet existingNodes;
list < SMESH_TNodeXYZ >::iterator vNIt;
// get/make nodes on vertices and add them to existingNodes
TopExp_Explorer exp( theShape, TopAbs_VERTEX ); TopExp_Explorer exp( theShape, TopAbs_VERTEX );
for ( ; exp.More(); exp.Next() ) for ( ; exp.More(); exp.Next() )
{ {
@ -207,14 +209,28 @@ bool StdMeshers_Import_1D2D::Compute(SMESH_Mesh & theMesh, const TopoDS_Shape &
n = SMESH_Algo::VertexNode( v, tgtMesh ); n = SMESH_Algo::VertexNode( v, tgtMesh );
if ( !n ) return false; // very strange if ( !n ) return false; // very strange
} }
vertexNodes.push_back( SMESH_TNodeXYZ( n )); existingNodes.insert( n );
} }
// get EDGESs and their ids // get EDGESs and their ids and get existing nodes on EDGEs
vector< TopoDS_Edge > edges; vector< TopoDS_Edge > edges;
for ( exp.Init( theShape, TopAbs_EDGE ); exp.More(); exp.Next() ) for ( exp.Init( theShape, TopAbs_EDGE ); exp.More(); exp.Next() )
if ( subShapeIDs.insert( tgtMesh->ShapeToIndex( exp.Current() )).second ) {
edges.push_back( TopoDS::Edge( exp.Current() )); const TopoDS_Edge & edge = TopoDS::Edge( exp.Current() );
if ( !SMESH_Algo::isDegenerated( edge ))
if ( subShapeIDs.insert( tgtMesh->ShapeToIndex( edge )).second )
{
edges.push_back( edge );
if ( SMESHDS_SubMesh* eSM = tgtMesh->MeshElements( edge ))
{
typedef SMDS_StdIterator< const SMDS_MeshNode*, SMDS_NodeIteratorPtr > iterator;
existingNodes.insert( iterator( eSM->GetNodes() ), iterator() );
}
}
}
// octree to find existing nodes
SMESH_OctreeNode existingNodeOcTr( existingNodes );
std::map<double, const SMDS_MeshNode*> dist2foundNodes;
// to count now many times a link between nodes encounters // to count now many times a link between nodes encounters
map<TLink, int> linkCount; map<TLink, int> linkCount;
@ -262,14 +278,10 @@ bool StdMeshers_Import_1D2D::Compute(SMESH_Mesh & theMesh, const TopoDS_Shape &
} }
else else
{ {
// find an existing vertex node // find a pre-existing node
for ( vNIt = vertexNodes.begin(); vNIt != vertexNodes.end(); ++vNIt) dist2foundNodes.clear();
if ( vNIt->SquareDistance( *node ) < groupTol * groupTol) if ( existingNodeOcTr.NodesAround( SMESH_TNodeXYZ( *node ), dist2foundNodes, groupTol ))
{ (*n2nIt).second = dist2foundNodes.begin()->second;
(*n2nIt).second = vNIt->_node;
vertexNodes.erase( vNIt );
break;
}
} }
if ( !n2nIt->second ) if ( !n2nIt->second )
{ {
@ -412,7 +424,7 @@ bool StdMeshers_Import_1D2D::Compute(SMESH_Mesh & theMesh, const TopoDS_Shape &
// duplicated node on vertex // duplicated node on vertex
return error("Source elements overlap one another"); return error("Source elements overlap one another");
tgtFaceSM->RemoveNode( n, /*isNodeDeleted=*/false ); tgtFaceSM->RemoveNode( n, /*isNodeDeleted=*/false );
tgtMesh->SetNodeOnEdge( (SMDS_MeshNode*)n, edges[iE], u ); tgtMesh->SetNodeOnEdge( n, edges[iE], u );
break; break;
} }
nodesOnBoundary = subShapeIDs.count( n->getshapeId()); nodesOnBoundary = subShapeIDs.count( n->getshapeId());
@ -589,7 +601,7 @@ bool StdMeshers_Import_1D2D::Compute(SMESH_Mesh & theMesh, const TopoDS_Shape &
for ( size_t iE = 0; iE < edges.size(); ++iE ) for ( size_t iE = 0; iE < edges.size(); ++iE )
{ {
SMESH_subMesh * sm = theMesh.GetSubMesh( edges[iE] ); SMESH_subMesh * sm = theMesh.GetSubMesh( edges[iE] );
if ( BRep_Tool::Degenerated( edges[iE] )) if ( SMESH_Algo::isDegenerated( edges[iE] ))
sm->SetIsAlwaysComputed( true ); sm->SetIsAlwaysComputed( true );
sm->ComputeStateEngine(SMESH_subMesh::CHECK_COMPUTE_STATE); sm->ComputeStateEngine(SMESH_subMesh::CHECK_COMPUTE_STATE);
if ( sm->GetComputeState() != SMESH_subMesh::COMPUTE_OK ) if ( sm->GetComputeState() != SMESH_subMesh::COMPUTE_OK )