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

Fix regression of test grid 2d_mesh_NETGEN/D2

Browse Source 
fix restricting local H, which was broken by a defaut netgen::mparam.minh

+  static void RestrictLocalSize(netgen::Mesh& ngMesh, const gp_XYZ& p, const double  size);
This commit is contained in:
eap 2011-11-02 08:56:51 +00:00
parent 54164acc79
commit 997b0b500d
2 changed files with 25 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/NETGENPlugin/NETGENPlugin_Mesher.cxx
View File

@ -579,6 +579,23 @@ double NETGENPlugin_Mesher::GetDefaultMinSize(const TopoDS_Shape& geom,
return minh; return minh;
} }
//================================================================================
/*!
* \brief Restrict size of elements at a given point
*/
//================================================================================
void NETGENPlugin_Mesher::RestrictLocalSize(netgen::Mesh& ngMesh, const gp_XYZ& p, const double size)
{
if ( netgen::mparam.minh > size )
{
ngMesh.SetMinimalH( size );
netgen::mparam.minh = size;
}
netgen::Point3d pi(p.X(), p.Y(), p.Z());
ngMesh.RestrictLocalH( pi, size );
}
//================================================================================ //================================================================================
/*! /*!
* \brief fill ngMesh with nodes and elements of computed submeshes * \brief fill ngMesh with nodes and elements of computed submeshes
@ -712,9 +729,8 @@ bool NETGENPlugin_Mesher::fillNgMesh(const netgen::OCCGeometry& occgeom,
seg.edgenr = ngMesh.GetNSeg() + 1; // segment id seg.edgenr = ngMesh.GetNSeg() + 1; // segment id
ngMesh.AddSegment (seg); ngMesh.AddSegment (seg);
netgen::Point3d ngP1(p1.node->X(), p1.node->Y(), p1.node->Z()); SMESH_TNodeXYZ np1( p1.node ), np2( p2.node );
netgen::Point3d ngP2(p2.node->X(), p2.node->Y(), p2.node->Z()); RestrictLocalSize( ngMesh, 0.5*(np1+np2), (np1-np2).Modulus() );
ngMesh.RestrictLocalH( netgen::Center( ngP1,ngP2), Dist(ngP1,ngP2));
#ifdef DUMP_SEGMENTS #ifdef DUMP_SEGMENTS
cout << "Segment: " << seg.edgenr << " on SMESH face " << helper.GetMeshDS()->ShapeToIndex( face ) << endl cout << "Segment: " << seg.edgenr << " on SMESH face " << helper.GetMeshDS()->ShapeToIndex( face ) << endl
@ -1676,8 +1692,7 @@ namespace
TopoDS_Iterator vIt( edge ); TopoDS_Iterator vIt( edge );
if ( !vIt.More() ) return; if ( !vIt.More() ) return;
gp_Pnt p = BRep_Tool::Pnt( TopoDS::Vertex( vIt.Value() )); gp_Pnt p = BRep_Tool::Pnt( TopoDS::Vertex( vIt.Value() ));
netgen::Point3d pi(p.X(), p.Y(), p.Z()); NETGENPlugin_Mesher::RestrictLocalSize( mesh, p.XYZ(), size );
mesh.RestrictLocalH(pi, size);
} }
else else
{ {
@ -1686,12 +1701,12 @@ namespace
{ {
Standard_Real u = u1 + delta*i; Standard_Real u = u1 + delta*i;
gp_Pnt p = curve->Value(u); gp_Pnt p = curve->Value(u);
NETGENPlugin_Mesher::RestrictLocalSize( mesh, p.XYZ(), size );
netgen::Point3d pi(p.X(), p.Y(), p.Z()); netgen::Point3d pi(p.X(), p.Y(), p.Z());
mesh.RestrictLocalH(pi, size);
double resultSize = mesh.GetH(pi); double resultSize = mesh.GetH(pi);
if ( resultSize - size > 0.1*size ) if ( resultSize - size > 0.1*size )
// netgen does restriction iff oldH/newH > 1.2 (localh.cpp:136) // netgen does restriction iff oldH/newH > 1.2 (localh.cpp:136)
mesh.RestrictLocalH(pi, resultSize/1.201); NETGENPlugin_Mesher::RestrictLocalSize( mesh, p.XYZ(), resultSize/1.201 );
} }
} }
} }
@ -1884,8 +1899,7 @@ bool NETGENPlugin_Mesher::Compute()
const TopoDS_Shape& shape = ShapesWithLocalSize.FindKey(key); const TopoDS_Shape& shape = ShapesWithLocalSize.FindKey(key);
const TopoDS_Vertex& v = TopoDS::Vertex(shape); const TopoDS_Vertex& v = TopoDS::Vertex(shape);
gp_Pnt p = BRep_Tool::Pnt(v); gp_Pnt p = BRep_Tool::Pnt(v);
netgen::Point3d pi(p.X(), p.Y(), p.Z()); NETGENPlugin_Mesher::RestrictLocalSize( *ngMesh, p.XYZ(), hi );
ngMesh->RestrictLocalH(pi, hi);
} }
} }

2
src/NETGENPlugin/NETGENPlugin_Mesher.hxx
View File

@ -97,6 +97,8 @@ class NETGENPLUGIN_EXPORT NETGENPlugin_Mesher
static double GetDefaultMinSize(const TopoDS_Shape& shape, static double GetDefaultMinSize(const TopoDS_Shape& shape,
const double maxSize); const double maxSize);
static void RestrictLocalSize(netgen::Mesh& ngMesh, const gp_XYZ& p, const double size);
static int FillSMesh(const netgen::OCCGeometry& occgeom, static int FillSMesh(const netgen::OCCGeometry& occgeom,
const netgen::Mesh& ngMesh, const netgen::Mesh& ngMesh,
const NETGENPlugin_ngMeshInfo& initState, const NETGENPlugin_ngMeshInfo& initState,