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

regression of smesh/imps/B6

Browse Source 
Do not limit the min size if fineness is defined by user

+  int                  _fineness;
This commit is contained in:
eap 2011-11-21 12:54:53 +00:00
parent fc381bae17
commit 92ea8bd266
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/NETGENPlugin/NETGENPlugin_Mesher.cxx
View File

@ -119,6 +119,7 @@ NETGENPlugin_Mesher::NETGENPlugin_Mesher (SMESH_Mesh* mesh,
_shape (aShape), _shape (aShape),
_isVolume(isVolume), _isVolume(isVolume),
_optimize(true), _optimize(true),
_fineness(NETGENPlugin_Hypothesis::GetDefaultFineness()),
_simpleHyp(NULL) _simpleHyp(NULL)
{ {
defaultParameters(); defaultParameters();
@ -153,6 +154,7 @@ void NETGENPlugin_Mesher::defaultParameters()
mparams.quad = 0; mparams.quad = 0;
else else
mparams.quad = NETGENPlugin_Hypothesis_2D::GetDefaultQuadAllowed() ? 1 : 0; mparams.quad = NETGENPlugin_Hypothesis_2D::GetDefaultQuadAllowed() ? 1 : 0;
_fineness = NETGENPlugin_Hypothesis::GetDefaultFineness();
} }
//============================================================================= //=============================================================================
@ -212,6 +214,7 @@ void NETGENPlugin_Mesher::SetParameters(const NETGENPlugin_Hypothesis* hyp)
mparams.quad = static_cast<const NETGENPlugin_Hypothesis_2D*> mparams.quad = static_cast<const NETGENPlugin_Hypothesis_2D*>
(hyp)->GetQuadAllowed() ? 1 : 0; (hyp)->GetQuadAllowed() ? 1 : 0;
_optimize = hyp->GetOptimize(); _optimize = hyp->GetOptimize();
_fineness = hyp->GetFineness();
_simpleHyp = NULL; _simpleHyp = NULL;
SMESH_Gen_i* smeshGen_i = SMESH_Gen_i::GetSMESHGen(); SMESH_Gen_i* smeshGen_i = SMESH_Gen_i::GetSMESHGen();
@ -1842,7 +1845,7 @@ bool NETGENPlugin_Mesher::Compute()
if ( mparams.maxh == 0.0 ) if ( mparams.maxh == 0.0 )
mparams.maxh = occgeo.boundingbox.Diam(); mparams.maxh = occgeo.boundingbox.Diam();
if ( _simpleHyp || mparams.minh == 0.0 ) if ( _simpleHyp || ( mparams.minh == 0.0 && _fineness != NETGENPlugin_Hypothesis::UserDefined))
mparams.minh = GetDefaultMinSize( _shape, mparams.maxh ); mparams.minh = GetDefaultMinSize( _shape, mparams.maxh );
#ifdef NETGEN_NEW #ifdef NETGEN_NEW
occgeo.face_maxh = mparams.maxh; occgeo.face_maxh = mparams.maxh;

1
src/NETGENPlugin/NETGENPlugin_Mesher.hxx
View File

@ -136,6 +136,7 @@ class NETGENPLUGIN_EXPORT NETGENPlugin_Mesher
const TopoDS_Shape& _shape; const TopoDS_Shape& _shape;
bool _isVolume; bool _isVolume;
bool _optimize; bool _optimize;
int _fineness;
const NETGENPlugin_SimpleHypothesis_2D * _simpleHyp; const NETGENPlugin_SimpleHypothesis_2D * _simpleHyp;
std::map< int, std::pair<int,int> > _faceDescriptors; std::map< int, std::pair<int,int> > _faceDescriptors;