ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2024-11-15 10:08:34 +05:00
Code Issues Packages Projects Releases Wiki Activity

0021468]: EDF 2073 SMESH: Body-fitting algo creates elements in hole

Browse Source 
1)   re-fix after optimization (attempt #2)
2)   fix protection from not thread safe shapes
This commit is contained in:
eap 2012-03-22 11:54:46 +00:00
parent 16042a8750
commit c20e5a3b8e
1 changed files with 30 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/StdMeshers/StdMeshers_Cartesian_3D.cxx
View File

@ -283,7 +283,7 @@ namespace
} }
return _surfaceInt; return _surfaceInt;
} }
bool IsThreadSafe() const; bool IsThreadSafe(set< const Standard_Transient* >& noSafeTShapes) const;
}; };
// -------------------------------------------------------------------------- // --------------------------------------------------------------------------
/*! /*!
@ -1060,8 +1060,10 @@ namespace
/* /*
* check if its face can be safely intersected in a thread * check if its face can be safely intersected in a thread
*/ */
bool FaceGridIntersector::IsThreadSafe() const bool FaceGridIntersector::IsThreadSafe(set< const Standard_Transient* >& noSafeTShapes) const
{ {
bool isSafe = true;
// check surface // check surface
TopLoc_Location loc; TopLoc_Location loc;
Handle(Geom_Surface) surf = BRep_Tool::Surface( _face, loc ); Handle(Geom_Surface) surf = BRep_Tool::Surface( _face, loc );
@ -1073,12 +1075,14 @@ namespace
} }
if ( surf->IsKind( STANDARD_TYPE(Geom_BSplineSurface )) || if ( surf->IsKind( STANDARD_TYPE(Geom_BSplineSurface )) ||
surf->IsKind( STANDARD_TYPE(Geom_BezierSurface ))) surf->IsKind( STANDARD_TYPE(Geom_BezierSurface )))
return false; if ( !noSafeTShapes.insert((const Standard_Transient*) _face.TShape() ).second )
isSafe = false;
double f, l; double f, l;
TopExp_Explorer exp( _face, TopAbs_EDGE ); TopExp_Explorer exp( _face, TopAbs_EDGE );
for ( ; exp.More(); exp.Next() ) for ( ; exp.More(); exp.Next() )
{ {
bool edgeIsSafe = true;
const TopoDS_Edge& e = TopoDS::Edge( exp.Current() ); const TopoDS_Edge& e = TopoDS::Edge( exp.Current() );
// check 3d curve // check 3d curve
{ {
@ -1092,10 +1096,11 @@ namespace
} }
if ( c->IsKind( STANDARD_TYPE(Geom_BSplineCurve )) || if ( c->IsKind( STANDARD_TYPE(Geom_BSplineCurve )) ||
c->IsKind( STANDARD_TYPE(Geom_BezierCurve ))) c->IsKind( STANDARD_TYPE(Geom_BezierCurve )))
return false; edgeIsSafe = false;
} }
} }
// check 2d curve // check 2d curve
if ( edgeIsSafe )
{ {
Handle(Geom2d_Curve) c2 = BRep_Tool::CurveOnSurface( e, surf, loc, f, l); Handle(Geom2d_Curve) c2 = BRep_Tool::CurveOnSurface( e, surf, loc, f, l);
if ( !c2.IsNull() ) if ( !c2.IsNull() )
@ -1107,11 +1112,13 @@ namespace
} }
if ( c2->IsKind( STANDARD_TYPE(Geom2d_BSplineCurve )) || if ( c2->IsKind( STANDARD_TYPE(Geom2d_BSplineCurve )) ||
c2->IsKind( STANDARD_TYPE(Geom2d_BezierCurve ))) c2->IsKind( STANDARD_TYPE(Geom2d_BezierCurve )))
return false; edgeIsSafe = false;
} }
} }
if ( !edgeIsSafe && !noSafeTShapes.insert((const Standard_Transient*) e.TShape() ).second )
isSafe = false;
} }
return true; return isSafe;
} }
//================================================================================ //================================================================================
/*! /*!
@ -1510,7 +1517,7 @@ namespace
nbIntHex = 0; nbIntHex = 0;
for ( size_t i = 0; i < intersectedHex.size(); ++i ) for ( size_t i = 0; i < intersectedHex.size(); ++i )
{ {
Hexahedron * hex = intersectedHex[ i ]; Hexahedron * & hex = intersectedHex[ i ];
if ( hex ) if ( hex )
{ {
intHexInd[ nbIntHex++ ] = i; intHexInd[ nbIntHex++ ] = i;
@ -1538,6 +1545,14 @@ namespace
--nbIntHex; --nbIntHex;
} }
} }
else if ( _nbCornerNodes > 3 && !hex )
{
// all intersection of hex with geometry are at grid nodes
hex = new Hexahedron( *this );
hex->init( i );
intHexInd.push_back(0);
intHexInd[ nbIntHex++ ] = i;
}
} }
// add elements resulted from hexadron intersection // add elements resulted from hexadron intersection
@ -1620,7 +1635,7 @@ namespace
li.LineIndex10(), li.LineIndex10(),
li.LineIndex01(), li.LineIndex01(),
li.LineIndex11() }; li.LineIndex11() };
bool allLinksOut = true; bool allLinksOut = true, hasLinks = false;
for ( int iL = 0; iL < 4 && allLinksOut; ++iL ) // loop on 4 links parallel to iDir for ( int iL = 0; iL < 4 && allLinksOut; ++iL ) // loop on 4 links parallel to iDir
{ {
const _Link& link = _hexLinks[ iL + 4*iDir ]; const _Link& link = _hexLinks[ iL + 4*iDir ];
@ -1640,10 +1655,13 @@ namespace
firstIntPnt = link._intNodes[0]._intPoint; firstIntPnt = link._intNodes[0]._intPoint;
} }
if ( firstIntPnt && firstIntPnt->_transition == Trans_IN ) if ( firstIntPnt )
allLinksOut = false; {
hasLinks = true;
allLinksOut = ( firstIntPnt->_transition == Trans_OUT );
}
} }
if ( allLinksOut ) if ( hasLinks && allLinksOut )
return true; return true;
} }
return false; return false;
@ -1894,8 +1912,7 @@ bool StdMeshers_Cartesian_3D::Compute(SMESH_Mesh & theMesh,
BRepBuilderAPI_Copy copier; BRepBuilderAPI_Copy copier;
for ( size_t i = 0; i < facesItersectors.size(); ++i ) for ( size_t i = 0; i < facesItersectors.size(); ++i )
{ {
if ( !facesItersectors[i].IsThreadSafe() && if ( !facesItersectors[i].IsThreadSafe(tshapes) )
!tshapes.insert((const Standard_Transient*) facesItersectors[i]._face.TShape() ).second )
{ {
copier.Perform( facesItersectors[i]._face ); copier.Perform( facesItersectors[i]._face );
facesItersectors[i]._face = TopoDS::Face( copier ); facesItersectors[i]._face = TopoDS::Face( copier );