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

0020832: EDF 1359 SMESH : Automatic meshing of boundary layers

Browse Source 
Assure stability
This commit is contained in:
eap 2011-01-24 09:17:26 +00:00
parent 80ac3613f8
commit ae954579c5
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/StdMeshers/StdMeshers_ViscousLayers.cxx
View File

@ -322,6 +322,14 @@ namespace VISCOUS
void Copy( _LayerEdge& other, SMESH_MesherHelper& helper ); void Copy( _LayerEdge& other, SMESH_MesherHelper& helper );
void SetCosin( double cosin ); void SetCosin( double cosin );
}; };
struct _LayerEdgeCmp
{
bool operator () (const _LayerEdge* e1, const _LayerEdge* e2) const
{
const bool cmpNodes = ( e1 && e2 && e1->_nodes.size() && e2->_nodes.size() );
return cmpNodes ? ( e1->_nodes[0]->GetID() < e2->_nodes[0]->GetID()) : ( e1 < e2 );
}
};
//-------------------------------------------------------------------------------- //--------------------------------------------------------------------------------
typedef map< const SMDS_MeshNode*, _LayerEdge*, TIDCompare > TNode2Edge; typedef map< const SMDS_MeshNode*, _LayerEdge*, TIDCompare > TNode2Edge;
@ -2178,7 +2186,8 @@ bool _ViscousBuilder::updateNormals( _SolidData& data,
// 1) Find intersections // 1) Find intersections
double dist; double dist;
const SMDS_MeshElement* face; const SMDS_MeshElement* face;
map< _LayerEdge*, set< _LayerEdge* > > edge2CloseEdge; typedef map< _LayerEdge*, set< _LayerEdge*, _LayerEdgeCmp >, _LayerEdgeCmp > TLEdge2LEdgeSet;
TLEdge2LEdgeSet edge2CloseEdge;
const double eps = data._epsilon * data._epsilon; const double eps = data._epsilon * data._epsilon;
for ( unsigned i = 0; i < data._edges.size(); ++i ) for ( unsigned i = 0; i < data._edges.size(); ++i )
@ -2188,7 +2197,7 @@ bool _ViscousBuilder::updateNormals( _SolidData& data,
if ( edge->FindIntersection( *searcher, dist, eps, &face )) if ( edge->FindIntersection( *searcher, dist, eps, &face ))
{ {
const TmpMeshFaceOnEdge* f = (const TmpMeshFaceOnEdge*) face; const TmpMeshFaceOnEdge* f = (const TmpMeshFaceOnEdge*) face;
set< _LayerEdge* > & ee = edge2CloseEdge[ edge ]; set< _LayerEdge*, _LayerEdgeCmp > & ee = edge2CloseEdge[ edge ];
ee.insert( f->_le1 ); ee.insert( f->_le1 );
ee.insert( f->_le2 ); ee.insert( f->_le2 );
if ( f->_le1->IsOnEdge() && f->_le1->_sWOL.IsNull() ) if ( f->_le1->IsOnEdge() && f->_le1->_sWOL.IsNull() )
@ -2204,12 +2213,12 @@ bool _ViscousBuilder::updateNormals( _SolidData& data,
{ {
dumpFunction(SMESH_Comment("updateNormals")<<data._index); dumpFunction(SMESH_Comment("updateNormals")<<data._index);
map< _LayerEdge*, set< _LayerEdge* > >::iterator e2ee = edge2CloseEdge.begin(); TLEdge2LEdgeSet::iterator e2ee = edge2CloseEdge.begin();
for ( ; e2ee != edge2CloseEdge.end(); ++e2ee ) for ( ; e2ee != edge2CloseEdge.end(); ++e2ee )
{ {
_LayerEdge* edge1 = e2ee->first; _LayerEdge* edge1 = e2ee->first;
_LayerEdge* edge2 = 0; _LayerEdge* edge2 = 0;
set< _LayerEdge* >& ee = e2ee->second; set< _LayerEdge*, _LayerEdgeCmp >& ee = e2ee->second;
// find EDGEs the edges reside // find EDGEs the edges reside
TopoDS_Edge E1, E2; TopoDS_Edge E1, E2;