From 9a26afa4ea408432ef03dbce41acfad5d697994f Mon Sep 17 00:00:00 2001 From: eap Date: Fri, 7 Aug 2015 14:36:26 +0300 Subject: [PATCH] Simplify code as SMESHDS_SubMesh::IsQuadratic() added --- src/NETGENPlugin/NETGENPlugin_Mesher.cxx | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/NETGENPlugin/NETGENPlugin_Mesher.cxx b/src/NETGENPlugin/NETGENPlugin_Mesher.cxx index c37ebfa..b822d1d 100644 --- a/src/NETGENPlugin/NETGENPlugin_Mesher.cxx +++ b/src/NETGENPlugin/NETGENPlugin_Mesher.cxx @@ -787,10 +787,11 @@ bool NETGENPlugin_Mesher::FillNgMesh(netgen::OCCGeometry& occgeom, bool isForwad = ( fOri == eNotSeam.Orientation() || fOri >= TopAbs_INTERNAL ); // get all nodes from connected - bool isQuad = smDS->NbElements() ? smDS->GetElements()->next()->IsQuadratic() : false; + const bool isQuad = smDS->IsQuadratic(); StdMeshers_FaceSide fSide( face, edges, _mesh, isForwad, isQuad ); const vector& points = fSide.GetUVPtStruct(); - if ( points.empty() ) return false; // invalid node params? + if ( points.empty() ) + return false; // invalid node params? int i, nbSeg = fSide.NbSegments(); // remember EDGEs of fSide to treat only once @@ -3607,7 +3608,7 @@ void NETGENPlugin_Internals::findBorderElements( TIDSortedElemSet & borderElems while ( fIt->more() ) { const SMDS_MeshElement* f = fIt->next(); - int nbNodes = f->NbNodes() / ( f->IsQuadratic() ? 2 : 1 ); + const int nbNodes = f->NbCornerNodes(); if ( intFaceSM->Contains( f )) { for ( int i = 0; i < nbNodes; ++i ) @@ -3638,7 +3639,7 @@ void NETGENPlugin_Internals::findBorderElements( TIDSortedElemSet & borderElems const SMDS_MeshElement* f = *fIt; bool isBorder = false, linkFound = false, borderLinkFound = false; list< SMESH_OrientedLink > faceLinks; - int nbNodes = f->NbNodes() / ( f->IsQuadratic() ? 2 : 1 ); + int nbNodes = f->NbCornerNodes(); for ( int i = 0; i < nbNodes; ++i ) { SMESH_OrientedLink link( f->GetNode(i), f->GetNode((i+1)%nbNodes)); -- 2.39.2