ForkMaster/netgenplugin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

IPAL22804 TC6.4.0: Netgen1D-2D performance regression

Browse Source 
1) prevent GetDefaultMinSize() from returning zero
   2) in updateTriangulation(), rely on BRepMesh_IncrementalMesh to
   update triangulation only if necessary
This commit is contained in:
eap 2011-11-15 07:52:00 +00:00
parent fdc7146da3
commit 6690066958
1 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/NETGENPlugin/NETGENPlugin_Mesher.cxx
View File

@ -413,30 +413,33 @@ namespace
void updateTriangulation( const TopoDS_Shape& shape ) void updateTriangulation( const TopoDS_Shape& shape )
{ {
static set< Poly_Triangulation* > updated; // static set< Poly_Triangulation* > updated;
TopLoc_Location loc; // TopLoc_Location loc;
TopExp_Explorer fExp( shape, TopAbs_FACE ); // TopExp_Explorer fExp( shape, TopAbs_FACE );
for ( ; fExp.More(); fExp.Next() ) // for ( ; fExp.More(); fExp.Next() )
{ // {
Handle(Poly_Triangulation) triangulation = // Handle(Poly_Triangulation) triangulation =
BRep_Tool::Triangulation ( TopoDS::Face( fExp.Current() ), loc); // BRep_Tool::Triangulation ( TopoDS::Face( fExp.Current() ), loc);
if ( triangulation.IsNull() || // if ( triangulation.IsNull() ||
updated.insert( triangulation.operator->() ).second ) // updated.insert( triangulation.operator->() ).second )
{ // {
BRepTools::Clean (shape); // BRepTools::Clean (shape);
try { try {
#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100 #if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
OCC_CATCH_SIGNALS; OCC_CATCH_SIGNALS;
#endif #endif
BRepMesh_IncrementalMesh e(shape, 0.01, true); BRepMesh_IncrementalMesh e(shape, 0.01, true);
} }
catch (Standard_Failure) catch (Standard_Failure)
{ {
updated.erase( triangulation.operator->() );
} }
} // updated.erase( triangulation.operator->() );
} // triangulation = BRep_Tool::Triangulation ( TopoDS::Face( fExp.Current() ), loc);
// updated.insert( triangulation.operator->() );
// }
// }
} }
} }
@ -549,6 +552,7 @@ double NETGENPlugin_Mesher::GetDefaultMinSize(const TopoDS_Shape& geom,
Handle(Poly_Triangulation) triangulation = Handle(Poly_Triangulation) triangulation =
BRep_Tool::Triangulation ( TopoDS::Face( fExp.Current() ), loc); BRep_Tool::Triangulation ( TopoDS::Face( fExp.Current() ), loc);
if ( triangulation.IsNull() ) continue; if ( triangulation.IsNull() ) continue;
const double fTol = BRep_Tool::Tolerance( TopoDS::Face( fExp.Current() ));
const TColgp_Array1OfPnt& points = triangulation->Nodes(); const TColgp_Array1OfPnt& points = triangulation->Nodes();
const Poly_Array1OfTriangle& trias = triangulation->Triangles(); const Poly_Array1OfTriangle& trias = triangulation->Triangles();
for ( int iT = trias.Lower(); iT <= trias.Upper(); ++iT ) for ( int iT = trias.Lower(); iT <= trias.Upper(); ++iT )
@ -557,7 +561,7 @@ double NETGENPlugin_Mesher::GetDefaultMinSize(const TopoDS_Shape& geom,
for ( int j = 0; j < 3; ++j ) for ( int j = 0; j < 3; ++j )
{ {
double dist2 = points(*pi[j]).SquareDistance( points( *pi[j+1] )); double dist2 = points(*pi[j]).SquareDistance( points( *pi[j+1] ));
if ( dist2 < minh ) if ( dist2 < minh && fTol*fTol < dist2 )
minh = dist2; minh = dist2;
bb.Add( points(*pi[j])); bb.Add( points(*pi[j]));
} }