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

Simplify code as SMESHDS_SubMesh::IsQuadratic() added

Browse Source
This commit is contained in:
eap 2015-08-07 14:36:26 +03:00
parent e7d8354cb4
commit 9a26afa4ea
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/NETGENPlugin/NETGENPlugin_Mesher.cxx
View File

@ -787,10 +787,11 @@ bool NETGENPlugin_Mesher::FillNgMesh(netgen::OCCGeometry& occgeom,
bool isForwad = ( fOri == eNotSeam.Orientation() || fOri >= TopAbs_INTERNAL ); bool isForwad = ( fOri == eNotSeam.Orientation() || fOri >= TopAbs_INTERNAL );
// get all nodes from connected <edges> // get all nodes from connected <edges>
bool isQuad = smDS->NbElements() ? smDS->GetElements()->next()->IsQuadratic() : false; const bool isQuad = smDS->IsQuadratic();
StdMeshers_FaceSide fSide( face, edges, _mesh, isForwad, isQuad ); StdMeshers_FaceSide fSide( face, edges, _mesh, isForwad, isQuad );
const vector<UVPtStruct>& points = fSide.GetUVPtStruct(); const vector<UVPtStruct>& points = fSide.GetUVPtStruct();
if ( points.empty() ) return false; // invalid node params? if ( points.empty() )
return false; // invalid node params?
int i, nbSeg = fSide.NbSegments(); int i, nbSeg = fSide.NbSegments();
// remember EDGEs of fSide to treat only once // remember EDGEs of fSide to treat only once
@ -3607,7 +3608,7 @@ void NETGENPlugin_Internals::findBorderElements( TIDSortedElemSet & borderElems
while ( fIt->more() ) while ( fIt->more() )
{ {
const SMDS_MeshElement* f = fIt->next(); const SMDS_MeshElement* f = fIt->next();
int nbNodes = f->NbNodes() / ( f->IsQuadratic() ? 2 : 1 ); const int nbNodes = f->NbCornerNodes();
if ( intFaceSM->Contains( f )) if ( intFaceSM->Contains( f ))
{ {
for ( int i = 0; i < nbNodes; ++i ) for ( int i = 0; i < nbNodes; ++i )
@ -3638,7 +3639,7 @@ void NETGENPlugin_Internals::findBorderElements( TIDSortedElemSet & borderElems
const SMDS_MeshElement* f = *fIt; const SMDS_MeshElement* f = *fIt;
bool isBorder = false, linkFound = false, borderLinkFound = false; bool isBorder = false, linkFound = false, borderLinkFound = false;
list< SMESH_OrientedLink > faceLinks; list< SMESH_OrientedLink > faceLinks;
int nbNodes = f->NbNodes() / ( f->IsQuadratic() ? 2 : 1 ); int nbNodes = f->NbCornerNodes();
for ( int i = 0; i < nbNodes; ++i ) for ( int i = 0; i < nbNodes; ++i )
{ {
SMESH_OrientedLink link( f->GetNode(i), f->GetNode((i+1)%nbNodes)); SMESH_OrientedLink link( f->GetNode(i), f->GetNode((i+1)%nbNodes));