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

Avoid infinite loop, found with test NRT_GRIDS_GEOM_BUG15_R7

Browse Source
This commit is contained in:
jfa 2022-06-23 15:08:30 +03:00
parent 678de41423
commit bdf698e60b
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/SMESHUtils/SMESH_Delaunay.cxx
View File

@ -191,6 +191,11 @@ const BRepMesh_Triangle* SMESH_Delaunay::FindTriangle( const gp_XY&
gp_XY uv = UV.Multiplied( _scale ); gp_XY uv = UV.Multiplied( _scale );
// prevent infinite loop in case of numerical instability
// test case NRT_GRIDS_GEOM_BUGS_15_R7
const BRepMesh_Triangle* tria1 = 0;
const BRepMesh_Triangle* tria2 = tria;
while ( tria ) while ( tria )
{ {
// check if the uv is in tria // check if the uv is in tria
@ -203,7 +208,9 @@ const BRepMesh_Triangle* SMESH_Delaunay::FindTriangle( const gp_XY&
SMESH_MeshAlgos::GetBarycentricCoords( uv, SMESH_MeshAlgos::GetBarycentricCoords( uv,
nodeUVs[0], nodeUVs[1], nodeUVs[2], nodeUVs[0], nodeUVs[1], nodeUVs[2],
bc[0], bc[1] ); bc[0], bc[1] );
if ( bc[0] >= 0 && bc[1] >= 0 && bc[0] + bc[1] <= 1 ) if ( (bc[0] >= 0 && bc[1] >= 0 && bc[0] + bc[1] <= 1) ||
(tria == tria1 &&
bc[0] >= -1e-14 && bc[1] >= -1e-14 && bc[0] + bc[1] <= 1 + 1e-14) )
{ {
if ( _triaDS->GetNode( nodeIDs[0] ).Movability() != BRepMesh_Frontier || if ( _triaDS->GetNode( nodeIDs[0] ).Movability() != BRepMesh_Frontier ||
_triaDS->GetNode( nodeIDs[1] ).Movability() != BRepMesh_Frontier || _triaDS->GetNode( nodeIDs[1] ).Movability() != BRepMesh_Frontier ||
@ -218,6 +225,10 @@ const BRepMesh_Triangle* SMESH_Delaunay::FindTriangle( const gp_XY&
return tria; return tria;
} }
if (tria == tria1) return 0;
tria1 = tria2;
tria2 = tria;
// look for a neighbor triangle, which is adjacent to a link intersected // look for a neighbor triangle, which is adjacent to a link intersected
// by a segment( triangle center -> uv ) // by a segment( triangle center -> uv )