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

fix failure of non-regression test SMESH_TEST/Grids/smesh/mesh_Projection_2D/A0

Browse Source 
Fix IsStructured( SMESH_subMesh* faceSM ) for a cylindrical FACE
This commit is contained in:
eap 2013-03-01 11:10:18 +00:00
parent 54cd5176e8
commit 3fa0d8a978
1 changed files with 24 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/SMESH/SMESH_MesherHelper.cxx
View File

@ -1720,10 +1720,11 @@ bool SMESH_MesherHelper::IsSameElemGeometry(const SMESHDS_SubMesh* smDS,
if ( !smDS ) return nullSubMeshRes; if ( !smDS ) return nullSubMeshRes;
SMDS_ElemIteratorPtr elemIt = smDS->GetElements(); SMDS_ElemIteratorPtr elemIt = smDS->GetElements();
while ( elemIt->more() ) while ( elemIt->more() ) {
if ( elemIt->next()->GetGeomType() != shape ) const SMDS_MeshElement* e = elemIt->next();
if ( e->GetGeomType() != shape )
return false; return false;
}
return true; return true;
} }
@ -1898,7 +1899,8 @@ namespace
//================================================================================ //================================================================================
bool isCornerOfStructure( const SMDS_MeshNode* n, bool isCornerOfStructure( const SMDS_MeshNode* n,
const SMESHDS_SubMesh* faceSM ) const SMESHDS_SubMesh* faceSM,
SMESH_MesherHelper& faceAnalyser )
{ {
int nbFacesInSM = 0; int nbFacesInSM = 0;
if ( n ) { if ( n ) {
@ -1906,7 +1908,14 @@ namespace
while ( fIt->more() ) while ( fIt->more() )
nbFacesInSM += faceSM->Contains( fIt->next() ); nbFacesInSM += faceSM->Contains( fIt->next() );
} }
return ( nbFacesInSM == 1 ); if ( nbFacesInSM == 1 )
return true;
if ( nbFacesInSM == 2 && n->GetPosition()->GetTypeOfPosition() == SMDS_TOP_VERTEX )
{
return faceAnalyser.IsRealSeam( n->getshapeId() );
}
return false;
} }
} }
@ -1925,13 +1934,15 @@ bool SMESH_MesherHelper::IsStructured( SMESH_subMesh* faceSM )
list< int > nbEdgesInWires; list< int > nbEdgesInWires;
int nbWires = SMESH_Block::GetOrderedEdges( TopoDS::Face( faceSM->GetSubShape() ), int nbWires = SMESH_Block::GetOrderedEdges( TopoDS::Face( faceSM->GetSubShape() ),
edges, nbEdgesInWires ); edges, nbEdgesInWires );
if ( nbWires != 1 ) if ( nbWires != 1 || nbEdgesInWires.front() != 4 )
return false; return false;
// algo: find corners of a structure and then analyze nb of faces and // algo: find corners of a structure and then analyze nb of faces and
// length of structure sides // length of structure sides
SMESHDS_Mesh* meshDS = faceSM->GetFather()->GetMeshDS(); SMESHDS_Mesh* meshDS = faceSM->GetFather()->GetMeshDS();
SMESH_MesherHelper faceAnalyser( *faceSM->GetFather() );
faceAnalyser.SetSubShape( faceSM->GetSubShape() );
// rotate edges to get the first node being at corner // rotate edges to get the first node being at corner
// (in principle it's not necessary but so far none SALOME algo can make // (in principle it's not necessary but so far none SALOME algo can make
@ -1940,7 +1951,8 @@ bool SMESH_MesherHelper::IsStructured( SMESH_subMesh* faceSM )
int nbRemainEdges = nbEdgesInWires.front(); int nbRemainEdges = nbEdgesInWires.front();
do { do {
TopoDS_Vertex V = IthVertex( 0, edges.front() ); TopoDS_Vertex V = IthVertex( 0, edges.front() );
isCorner = isCornerOfStructure( SMESH_Algo::VertexNode( V, meshDS ), fSM); isCorner = isCornerOfStructure( SMESH_Algo::VertexNode( V, meshDS ),
fSM, faceAnalyser);
if ( !isCorner ) { if ( !isCorner ) {
edges.splice( edges.end(), edges, edges.begin() ); edges.splice( edges.end(), edges, edges.begin() );
--nbRemainEdges; --nbRemainEdges;
@ -1963,16 +1975,13 @@ bool SMESH_MesherHelper::IsStructured( SMESH_subMesh* faceSM )
list< const SMDS_MeshNode* > edgeNodes; list< const SMDS_MeshNode* > edgeNodes;
map< double, const SMDS_MeshNode* >::iterator u2n = u2Nodes.begin(); map< double, const SMDS_MeshNode* >::iterator u2n = u2Nodes.begin();
if ( !nodes.empty() && nodes.back() == u2n->second ) for ( ; u2n != u2Nodes.end(); ++u2n )
++u2n;
map< double, const SMDS_MeshNode* >::iterator u2nEnd = --u2Nodes.end();
if ( nodes.empty() || nodes.back() != u2nEnd->second )
++u2nEnd;
for ( ; u2n != u2nEnd; ++u2n )
edgeNodes.push_back( u2n->second ); edgeNodes.push_back( u2n->second );
if ( edge->Orientation() == TopAbs_REVERSED ) if ( edge->Orientation() == TopAbs_REVERSED )
edgeNodes.reverse(); edgeNodes.reverse();
if ( !nodes.empty() && nodes.back() == edgeNodes.front() )
edgeNodes.pop_front();
nodes.splice( nodes.end(), edgeNodes, edgeNodes.begin(), edgeNodes.end() ); nodes.splice( nodes.end(), edgeNodes, edgeNodes.begin(), edgeNodes.end() );
} }
@ -1983,7 +1992,7 @@ bool SMESH_MesherHelper::IsStructured( SMESH_subMesh* faceSM )
for ( ; n != nodes.end(); ++n ) for ( ; n != nodes.end(); ++n )
{ {
++nbEdges; ++nbEdges;
if ( isCornerOfStructure( *n, fSM )) { if ( isCornerOfStructure( *n, fSM, faceAnalyser )) {
nbEdgesInSide.push_back( nbEdges ); nbEdgesInSide.push_back( nbEdges );
nbEdges = 0; nbEdges = 0;
} }