From 8735b17bdc73f6d2855744eea268eb82e431a13d Mon Sep 17 00:00:00 2001 From: eap Date: Thu, 18 Jun 2009 12:44:50 +0000 Subject: [PATCH] 0020128: EDF SMESH 926 : Quadratic conversion of BLSURF mesh /*! + * \brief Move medium nodes of faces and volumes to fix distorted elements + * \param volumeOnly - fix nodes on faces or not if the shape is solid + */ + void FixQuadraticElements(bool volumeOnly=true); --- src/SMESH/SMESH_MesherHelper.cxx | 1581 +++++++++++++++++++++++++++--- src/SMESH/SMESH_MesherHelper.hxx | 59 +- 2 files changed, 1462 insertions(+), 178 deletions(-) diff --git a/src/SMESH/SMESH_MesherHelper.cxx b/src/SMESH/SMESH_MesherHelper.cxx index dd0eabb69..06a528ebb 100644 --- a/src/SMESH/SMESH_MesherHelper.cxx +++ b/src/SMESH/SMESH_MesherHelper.cxx @@ -27,21 +27,27 @@ #include "SMDS_FacePosition.hxx" #include "SMDS_EdgePosition.hxx" +#include "SMDS_VolumeTool.hxx" +#include "SMESH_subMesh.hxx" #include #include -#include #include +#include #include +#include #include #include #include #include #include #include +#include #include #include +#include #include +#include #include #include @@ -50,6 +56,12 @@ #define RETURN_BAD_RESULT(msg) { MESSAGE(msg); return false; } +namespace { + + gp_XYZ XYZ(const SMDS_MeshNode* n) { return gp_XYZ(n->X(), n->Y(), n->Z()); } + +} + //================================================================================ /*! * \brief Constructor @@ -57,7 +69,7 @@ //================================================================================ SMESH_MesherHelper::SMESH_MesherHelper(SMESH_Mesh& theMesh) - : myMesh(&theMesh), myShapeID(-1), myCreateQuadratic(false) + : myMesh(&theMesh), myShapeID(0), myCreateQuadratic(false), myCheckNodePos(false) { mySetElemOnShape = ( ! myMesh->HasShapeToMesh() ); } @@ -72,14 +84,14 @@ bool SMESH_MesherHelper::IsQuadraticSubMesh(const TopoDS_Shape& aSh) SMESHDS_Mesh* meshDS = GetMeshDS(); // we can create quadratic elements only if all elements // created on subshapes of given shape are quadratic - // also we have to fill myNLinkNodeMap + // also we have to fill myTLinkNodeMap myCreateQuadratic = true; mySeamShapeIds.clear(); myDegenShapeIds.clear(); TopAbs_ShapeEnum subType( aSh.ShapeType()==TopAbs_FACE ? TopAbs_EDGE : TopAbs_FACE ); SMDSAbs_ElementType elemType( subType==TopAbs_FACE ? SMDSAbs_Face : SMDSAbs_Edge ); - int nbOldLinks = myNLinkNodeMap.size(); + int nbOldLinks = myTLinkNodeMap.size(); TopExp_Explorer exp( aSh, subType ); for (; exp.More() && myCreateQuadratic; exp.Next()) { @@ -92,19 +104,19 @@ bool SMESH_MesherHelper::IsQuadraticSubMesh(const TopoDS_Shape& aSh) break; } else { - // fill NLinkNodeMap + // fill TLinkNodeMap switch ( e->NbNodes() ) { case 3: - AddNLinkNode(e->GetNode(0),e->GetNode(1),e->GetNode(2)); break; + AddTLinkNode(e->GetNode(0),e->GetNode(1),e->GetNode(2)); break; case 6: - AddNLinkNode(e->GetNode(0),e->GetNode(1),e->GetNode(3)); - AddNLinkNode(e->GetNode(1),e->GetNode(2),e->GetNode(4)); - AddNLinkNode(e->GetNode(2),e->GetNode(0),e->GetNode(5)); break; + AddTLinkNode(e->GetNode(0),e->GetNode(1),e->GetNode(3)); + AddTLinkNode(e->GetNode(1),e->GetNode(2),e->GetNode(4)); + AddTLinkNode(e->GetNode(2),e->GetNode(0),e->GetNode(5)); break; case 8: - AddNLinkNode(e->GetNode(0),e->GetNode(1),e->GetNode(4)); - AddNLinkNode(e->GetNode(1),e->GetNode(2),e->GetNode(5)); - AddNLinkNode(e->GetNode(2),e->GetNode(3),e->GetNode(6)); - AddNLinkNode(e->GetNode(3),e->GetNode(0),e->GetNode(7)); + AddTLinkNode(e->GetNode(0),e->GetNode(1),e->GetNode(4)); + AddTLinkNode(e->GetNode(1),e->GetNode(2),e->GetNode(5)); + AddTLinkNode(e->GetNode(2),e->GetNode(3),e->GetNode(6)); + AddTLinkNode(e->GetNode(3),e->GetNode(0),e->GetNode(7)); break; default: myCreateQuadratic = false; @@ -116,11 +128,11 @@ bool SMESH_MesherHelper::IsQuadraticSubMesh(const TopoDS_Shape& aSh) } } - if ( nbOldLinks == myNLinkNodeMap.size() ) + if ( nbOldLinks == myTLinkNodeMap.size() ) myCreateQuadratic = false; if(!myCreateQuadratic) { - myNLinkNodeMap.clear(); + myTLinkNodeMap.clear(); } SetSubShape( aSh ); @@ -161,7 +173,7 @@ void SMESH_MesherHelper::SetSubShape(const TopoDS_Shape& aSh) myDegenShapeIds.clear(); if ( myShape.IsNull() ) { - myShapeID = -1; + myShapeID = 0; return; } SMESHDS_Mesh* meshDS = GetMeshDS(); @@ -230,7 +242,8 @@ bool SMESH_MesherHelper::GetNodeUVneedInFaceNode(const TopoDS_Face& F) const if ( !F.IsNull() && !myShape.IsNull() && myShape.IsSame( F )) return !mySeamShapeIds.empty(); - Handle(Geom_Surface) aSurface = BRep_Tool::Surface( F ); + TopLoc_Location loc; + Handle(Geom_Surface) aSurface = BRep_Tool::Surface( F,loc ); if ( !aSurface.IsNull() ) return ( aSurface->IsUPeriodic() || aSurface->IsVPeriodic() ); @@ -243,26 +256,45 @@ bool SMESH_MesherHelper::GetNodeUVneedInFaceNode(const TopoDS_Face& F) const //======================================================================= bool SMESH_MesherHelper::IsMedium(const SMDS_MeshNode* node, - const SMDSAbs_ElementType typeToCheck) + const SMDSAbs_ElementType typeToCheck) { return SMESH_MeshEditor::IsMedium( node, typeToCheck ); } //======================================================================= -//function : AddNLinkNode +/*! + * \brief Return support shape of a node + * \param node - the node + * \param meshDS - mesh DS + * \retval TopoDS_Shape - found support shape + */ +//======================================================================= + +TopoDS_Shape SMESH_MesherHelper::GetSubShapeByNode(const SMDS_MeshNode* node, + SMESHDS_Mesh* meshDS) +{ + int shapeID = node->GetPosition()->GetShapeId(); + if ( 0 < shapeID && shapeID <= meshDS->MaxShapeIndex() ) + return meshDS->IndexToShape( shapeID ); + else + return TopoDS_Shape(); +} + + +//======================================================================= +//function : AddTLinkNode //purpose : //======================================================================= /*! - * Auxilary function for filling myNLinkNodeMap + * Auxilary function for filling myTLinkNodeMap */ -void SMESH_MesherHelper::AddNLinkNode(const SMDS_MeshNode* n1, - const SMDS_MeshNode* n2, - const SMDS_MeshNode* n12) +void SMESH_MesherHelper::AddTLinkNode(const SMDS_MeshNode* n1, + const SMDS_MeshNode* n2, + const SMDS_MeshNode* n12) { - NLink link( n1, n2 ); - if ( n1 > n2 ) link = NLink( n2, n1 ); // add new record to map - myNLinkNodeMap.insert( make_pair(link,n12)); + SMESH_TLink link( n1, n2 ); + myTLinkNodeMap.insert( make_pair(link,n12)); } //======================================================================= @@ -300,7 +332,8 @@ gp_Pnt2d SMESH_MesherHelper::GetUVOnSeam( const gp_Pnt2d& uv1, const gp_Pnt2d& u gp_XY SMESH_MesherHelper::GetNodeUV(const TopoDS_Face& F, const SMDS_MeshNode* n, - const SMDS_MeshNode* n2) const + const SMDS_MeshNode* n2, + bool* check) const { gp_Pnt2d uv( 1e100, 1e100 ); const SMDS_PositionPtr Pos = n->GetPosition(); @@ -309,24 +342,62 @@ gp_XY SMESH_MesherHelper::GetNodeUV(const TopoDS_Face& F, // node has position on face const SMDS_FacePosition* fpos = static_cast(n->GetPosition().get()); - uv = gp_Pnt2d(fpos->GetUParameter(),fpos->GetVParameter()); + uv.SetCoord(fpos->GetUParameter(),fpos->GetVParameter()); + if ( check && *check ) + { + // check that uv is correct + TopLoc_Location loc; + Handle(Geom_Surface) surface = BRep_Tool::Surface( F,loc ); + double tol = 2 * BRep_Tool::Tolerance( F ); + gp_Pnt nodePnt = XYZ( n ); + if ( !loc.IsIdentity() ) nodePnt.Transform( loc.Transformation().Inverted() ); + if ( nodePnt.Distance( surface->Value( uv.X(), uv.Y() )) > tol ) { + // uv incorrect, project the node to surface + GeomAPI_ProjectPointOnSurf projector( nodePnt, surface, tol ); + if ( !projector.IsDone() || projector.NbPoints() < 1 ) { + MESSAGE( "SMESH_MesherHelper::GetNodeUV() failed to project" ) + return uv.XY(); + } + Quantity_Parameter U,V; + projector.LowerDistanceParameters(U,V); + if ( nodePnt.Distance( surface->Value( U, V )) > tol ) + MESSAGE( "SMESH_MesherHelper::GetNodeUV(), invalid projection" ); + uv.SetCoord( U,V ); + } + else if ( uv.XY().Modulus() > numeric_limits::min() ) { + *check = false; // parameters are OK, do not check further more + } + } } else if(Pos->GetTypeOfPosition()==SMDS_TOP_EDGE) { // node has position on edge => it is needed to find // corresponding edge from face, get pcurve for this - // edge and recieve value from this pcurve + // edge and retrieve value from this pcurve const SMDS_EdgePosition* epos = static_cast(n->GetPosition().get()); - SMESHDS_Mesh* meshDS = GetMeshDS(); int edgeID = Pos->GetShapeId(); - TopoDS_Edge E = TopoDS::Edge(meshDS->IndexToShape(edgeID)); + TopoDS_Edge E = TopoDS::Edge(GetMeshDS()->IndexToShape(edgeID)); double f, l; Handle(Geom2d_Curve) C2d = BRep_Tool::CurveOnSurface(E, F, f, l); uv = C2d->Value( epos->GetUParameter() ); // for a node on a seam edge select one of UVs on 2 pcurves if ( n2 && IsSeamShape( edgeID ) ) uv = GetUVOnSeam( uv, GetNodeUV( F, n2, 0 )); + + // adjust uv to period + TopLoc_Location loc; + Handle(Geom_Surface) S = BRep_Tool::Surface(F,loc); + Standard_Boolean isUPeriodic = S->IsUPeriodic(); + Standard_Boolean isVPeriodic = S->IsVPeriodic(); + if ( isUPeriodic || isVPeriodic ) { + Standard_Real UF,UL,VF,VL; + S->Bounds(UF,UL,VF,VL); + if(isUPeriodic) + uv.SetX( uv.X() + ShapeAnalysis::AdjustToPeriod(uv.X(),UF,UL)); + if(isVPeriodic) + uv.SetY( uv.Y() + ShapeAnalysis::AdjustToPeriod(uv.Y(),VF,VL)); + } } else if(Pos->GetTypeOfPosition()==SMDS_TOP_VERTEX) { @@ -349,7 +420,7 @@ gp_XY SMESH_MesherHelper::GetNodeUV(const TopoDS_Face& F, #endif // get UV of a vertex closest to the node double dist = 1e100; - gp_Pnt pn ( n->X(),n->Y(),n->Z() ); + gp_Pnt pn = XYZ( n ); for ( TopExp_Explorer vert(F,TopAbs_VERTEX); !ok && vert.More(); vert.Next() ) { TopoDS_Vertex curV = TopoDS::Vertex( vert.Current() ); gp_Pnt p = BRep_Tool::Pnt( curV ); @@ -384,6 +455,46 @@ gp_XY SMESH_MesherHelper::GetNodeUV(const TopoDS_Face& F, return uv.XY(); } +//======================================================================= +/*! + * \brief Return middle UV taking in account surface period + */ +//======================================================================= + +gp_XY SMESH_MesherHelper::GetMiddleUV(const Handle(Geom_Surface)& surface, + const gp_XY& p1, + const gp_XY& p2) +{ + if ( surface.IsNull() ) + return 0.5 * ( p1 + p2 ); + //checking if surface is periodic + Standard_Real UF,UL,VF,VL; + surface->Bounds(UF,UL,VF,VL); + + Standard_Real u,v; + Standard_Boolean isUPeriodic = surface->IsUPeriodic(); + if(isUPeriodic) { + Standard_Real UPeriod = surface->UPeriod(); + Standard_Real p2x = p2.X()+ShapeAnalysis::AdjustByPeriod(p2.X(),p1.X(),UPeriod); + Standard_Real pmid = (p1.X()+p2x)/2.; + u = pmid+ShapeAnalysis::AdjustToPeriod(pmid,UF,UL); + } + else { + u= (p1.X()+p2.X())/2.; + } + Standard_Boolean isVPeriodic = surface->IsVPeriodic(); + if(isVPeriodic) { + Standard_Real VPeriod = surface->VPeriod(); + Standard_Real p2y = p2.Y()+ShapeAnalysis::AdjustByPeriod(p2.Y(),p1.Y(),VPeriod); + Standard_Real pmid = (p1.Y()+p2y)/2.; + v = pmid+ShapeAnalysis::AdjustToPeriod(pmid,VF,VL); + } + else { + v = (p1.Y()+p2.Y())/2.; + } + return gp_XY( u,v ); +} + //======================================================================= /*! * \brief Return node U on edge @@ -396,7 +507,8 @@ gp_XY SMESH_MesherHelper::GetNodeUV(const TopoDS_Face& F, //======================================================================= double SMESH_MesherHelper::GetNodeU(const TopoDS_Edge& E, - const SMDS_MeshNode* n) + const SMDS_MeshNode* n, + bool* check) { double param = 0; const SMDS_PositionPtr Pos = n->GetPosition(); @@ -414,152 +526,128 @@ double SMESH_MesherHelper::GetNodeU(const TopoDS_Edge& E, return param; } -//======================================================================= -//function : GetMediumNode -//purpose : -//======================================================================= +//================================================================================ /*! - * Special function for search or creation medium node + * \brief Return existing or create new medium nodes between given ones + * \param force3d - if true, new node is the middle of n1 and n2, + * else is located on geom face or geom edge */ +//================================================================================ + const SMDS_MeshNode* SMESH_MesherHelper::GetMediumNode(const SMDS_MeshNode* n1, const SMDS_MeshNode* n2, bool force3d) { - TopAbs_ShapeEnum shapeType = myShape.IsNull() ? TopAbs_SHAPE : myShape.ShapeType(); - - NLink link(( n1 < n2 ? n1 : n2 ), ( n1 < n2 ? n2 : n1 )); - ItNLinkNode itLN = myNLinkNodeMap.find( link ); - if ( itLN != myNLinkNodeMap.end() ) { + SMESH_TLink link(n1,n2); + ItTLinkNode itLN = myTLinkNodeMap.find( link ); + if ( itLN != myTLinkNodeMap.end() ) { return (*itLN).second; } - else { - // create medium node - SMDS_MeshNode* n12; - SMESHDS_Mesh* meshDS = GetMeshDS(); - int faceID = -1, edgeID = -1; - const SMDS_PositionPtr Pos1 = n1->GetPosition(); - const SMDS_PositionPtr Pos2 = n2->GetPosition(); - - if( myShape.IsNull() ) - { - if( Pos1->GetTypeOfPosition()==SMDS_TOP_FACE ) { - faceID = Pos1->GetShapeId(); - } - else if( Pos2->GetTypeOfPosition()==SMDS_TOP_FACE ) { - faceID = Pos2->GetShapeId(); - } + // create medium node + SMDS_MeshNode* n12; + SMESHDS_Mesh* meshDS = GetMeshDS(); + int faceID = -1, edgeID = -1; + const SMDS_PositionPtr Pos1 = n1->GetPosition(); + const SMDS_PositionPtr Pos2 = n2->GetPosition(); - if( Pos1->GetTypeOfPosition()==SMDS_TOP_EDGE ) { - edgeID = Pos1->GetShapeId(); - } - if( Pos2->GetTypeOfPosition()==SMDS_TOP_EDGE ) { - edgeID = Pos2->GetShapeId(); + if( myShape.IsNull() ) + { + if( Pos1->GetTypeOfPosition()==SMDS_TOP_FACE ) { + faceID = Pos1->GetShapeId(); + } + else if( Pos2->GetTypeOfPosition()==SMDS_TOP_FACE ) { + faceID = Pos2->GetShapeId(); + } + + if( Pos1->GetTypeOfPosition()==SMDS_TOP_EDGE ) { + edgeID = Pos1->GetShapeId(); + } + if( Pos2->GetTypeOfPosition()==SMDS_TOP_EDGE ) { + edgeID = Pos2->GetShapeId(); + } + } + if(!force3d) + { + // we try to create medium node using UV parameters of + // nodes, else - medium between corresponding 3d points + + TopAbs_ShapeEnum shapeType = myShape.IsNull() ? TopAbs_SHAPE : myShape.ShapeType(); + if(faceID>0 || shapeType == TopAbs_FACE) { + // obtaining a face and 2d points for nodes + TopoDS_Face F; + if( myShape.IsNull() ) + F = TopoDS::Face(meshDS->IndexToShape(faceID)); + else { + F = TopoDS::Face(myShape); + faceID = myShapeID; } + + gp_XY p1 = GetNodeUV(F,n1,n2, &myCheckNodePos); + gp_XY p2 = GetNodeUV(F,n2,n1, &myCheckNodePos); + + if ( IsDegenShape( Pos1->GetShapeId() )) + p1.SetCoord( myParIndex, p2.Coord( myParIndex )); + else if ( IsDegenShape( Pos2->GetShapeId() )) + p2.SetCoord( myParIndex, p1.Coord( myParIndex )); + + TopLoc_Location loc; + Handle(Geom_Surface) S = BRep_Tool::Surface(F,loc); + gp_XY uv = GetMiddleUV( S, p1, p2 ); + gp_Pnt P = S->Value( uv.X(), uv.Y() ).Transformed(loc); + n12 = meshDS->AddNode(P.X(), P.Y(), P.Z()); + meshDS->SetNodeOnFace(n12, faceID, uv.X(), uv.Y()); + myTLinkNodeMap.insert(make_pair(link,n12)); + return n12; } + if (edgeID>0 || shapeType == TopAbs_EDGE) { + + TopoDS_Edge E; + if( myShape.IsNull() ) + E = TopoDS::Edge(meshDS->IndexToShape(edgeID)); + else { + E = TopoDS::Edge(myShape); + edgeID = myShapeID; + } + + double p1 = GetNodeU(E,n1, &myCheckNodePos); + double p2 = GetNodeU(E,n2, &myCheckNodePos); - if(!force3d) { - // we try to create medium node using UV parameters of - // nodes, else - medium between corresponding 3d points - if(faceID>-1 || shapeType == TopAbs_FACE) { - // obtaining a face and 2d points for nodes - TopoDS_Face F; - if( myShape.IsNull() ) - F = TopoDS::Face(meshDS->IndexToShape(faceID)); - else { - F = TopoDS::Face(myShape); - faceID = myShapeID; + double f,l; + Handle(Geom_Curve) C = BRep_Tool::Curve(E, f, l); + if(!C.IsNull()) { + + Standard_Boolean isPeriodic = C->IsPeriodic(); + double u; + if(isPeriodic) { + Standard_Real Period = C->Period(); + Standard_Real p = p2+ShapeAnalysis::AdjustByPeriod(p2,p1,Period); + Standard_Real pmid = (p1+p)/2.; + u = pmid+ShapeAnalysis::AdjustToPeriod(pmid,C->FirstParameter(),C->LastParameter()); } + else + u = (p1+p2)/2.; - gp_XY p1 = GetNodeUV(F,n1,n2); - gp_XY p2 = GetNodeUV(F,n2,n1); - - if ( IsDegenShape( Pos1->GetShapeId() )) - p1.SetCoord( myParIndex, p2.Coord( myParIndex )); - else if ( IsDegenShape( Pos2->GetShapeId() )) - p2.SetCoord( myParIndex, p1.Coord( myParIndex )); - - //checking if surface is periodic - Handle(Geom_Surface) S = BRep_Tool::Surface(F); - Standard_Real UF,UL,VF,VL; - S->Bounds(UF,UL,VF,VL); - - Standard_Real u,v; - Standard_Boolean isUPeriodic = S->IsUPeriodic(); - if(isUPeriodic) { - Standard_Real UPeriod = S->UPeriod(); - Standard_Real p2x = p2.X()+ShapeAnalysis::AdjustByPeriod(p2.X(),p1.X(),UPeriod); - Standard_Real pmid = (p1.X()+p2x)/2.; - u = pmid+ShapeAnalysis::AdjustToPeriod(pmid,UF,UL); - } - else - u= (p1.X()+p2.X())/2.; - - Standard_Boolean isVPeriodic = S->IsVPeriodic(); - if(isVPeriodic) { - Standard_Real VPeriod = S->VPeriod(); - Standard_Real p2y = p2.Y()+ShapeAnalysis::AdjustByPeriod(p2.Y(),p1.Y(),VPeriod); - Standard_Real pmid = (p1.Y()+p2y)/2.; - v = pmid+ShapeAnalysis::AdjustToPeriod(pmid,VF,VL); - } - else - v = (p1.Y()+p2.Y())/2.; - - gp_Pnt P = S->Value(u, v); + gp_Pnt P = C->Value( u ); n12 = meshDS->AddNode(P.X(), P.Y(), P.Z()); - meshDS->SetNodeOnFace(n12, faceID, u, v); - myNLinkNodeMap.insert(NLinkNodeMap::value_type(link,n12)); + meshDS->SetNodeOnEdge(n12, edgeID, u); + myTLinkNodeMap.insert(make_pair(link,n12)); return n12; } - if (edgeID>-1 || shapeType == TopAbs_EDGE) { - - TopoDS_Edge E; - if( myShape.IsNull() ) - E = TopoDS::Edge(meshDS->IndexToShape(edgeID)); - else { - E = TopoDS::Edge(myShape); - edgeID = myShapeID; - } - - double p1 = GetNodeU(E,n1); - double p2 = GetNodeU(E,n2); - - double f,l; - Handle(Geom_Curve) C = BRep_Tool::Curve(E, f, l); - if(!C.IsNull()) { - - Standard_Boolean isPeriodic = C->IsPeriodic(); - double u; - if(isPeriodic) { - Standard_Real Period = C->Period(); - Standard_Real p = p2+ShapeAnalysis::AdjustByPeriod(p2,p1,Period); - Standard_Real pmid = (p1+p)/2.; - u = pmid+ShapeAnalysis::AdjustToPeriod(pmid,C->FirstParameter(),C->LastParameter()); - } - else - u = (p1+p2)/2.; - - gp_Pnt P = C->Value( u ); - n12 = meshDS->AddNode(P.X(), P.Y(), P.Z()); - meshDS->SetNodeOnEdge(n12, edgeID, u); - myNLinkNodeMap.insert(NLinkNodeMap::value_type(link,n12)); - return n12; - } - } } - // 3d variant - double x = ( n1->X() + n2->X() )/2.; - double y = ( n1->Y() + n2->Y() )/2.; - double z = ( n1->Z() + n2->Z() )/2.; - n12 = meshDS->AddNode(x,y,z); - if(edgeID>-1) - meshDS->SetNodeOnEdge(n12, edgeID); - else if(faceID>-1) - meshDS->SetNodeOnFace(n12, faceID); - else - meshDS->SetNodeInVolume(n12, myShapeID); - myNLinkNodeMap.insert(NLinkNodeMap::value_type(link,n12)); - return n12; } + // 3d variant + double x = ( n1->X() + n2->X() )/2.; + double y = ( n1->Y() + n2->Y() )/2.; + double z = ( n1->Z() + n2->Z() )/2.; + n12 = meshDS->AddNode(x,y,z); + if(edgeID>0) + meshDS->SetNodeOnEdge(n12, edgeID); + else if(faceID>0) + meshDS->SetNodeOnFace(n12, faceID); + else + meshDS->SetNodeInVolume(n12, myShapeID); + myTLinkNodeMap.insert( make_pair( link, n12 )); + return n12; } //======================================================================= @@ -1217,3 +1305,1176 @@ double SMESH_MesherHelper::GetOtherParam(const double param) const { return fabs(param-myPar1) < fabs(param-myPar2) ? myPar2 : myPar1; } + +//======================================================================= +namespace { // Structures used by FixQuadraticElements() +//======================================================================= + +#define __DMP__(txt) \ +//cout << txt +#define MSG(txt) __DMP__(txt< _faces; + mutable gp_Vec _nodeMove; + mutable int _nbMoves; + + QLink(const SMDS_MeshNode* n1, const SMDS_MeshNode* n2, const SMDS_MeshNode* nm): + SMESH_TLink( n1,n2 ), _mediumNode(nm), _nodeMove(0,0,0), _nbMoves(0) { + _faces.reserve(4); + //if ( MediumPos() != SMDS_TOP_3DSPACE ) + _nodeMove = MediumPnt() - MiddlePnt(); + } + void SetContinuesFaces() const; + const QFace* GetContinuesFace( const QFace* face ) const; + bool OnBoundary() const; + gp_XYZ MiddlePnt() const { return ( XYZ( node1() ) + XYZ( node2() )) / 2.; } + gp_XYZ MediumPnt() const { return XYZ( _mediumNode ); } + + SMDS_TypeOfPosition MediumPos() const + { return _mediumNode->GetPosition()->GetTypeOfPosition(); } + SMDS_TypeOfPosition EndPos(bool isSecond) const + { return (isSecond ? node2() : node1())->GetPosition()->GetTypeOfPosition(); } + const SMDS_MeshNode* EndPosNode(SMDS_TypeOfPosition pos) const + { return EndPos(0) == pos ? node1() : EndPos(1) == pos ? node2() : 0; } + + void Move(const gp_Vec& move, bool sum=false) const + { _nodeMove += move; _nbMoves += sum ? (_nbMoves==0) : 1; } + gp_XYZ Move() const { return _nodeMove.XYZ() / _nbMoves; } + bool IsMoved() const { return (_nbMoves > 0 && !IsStraight()); } + bool IsStraight() const { return _nodeMove.SquareMagnitude() <= straightTol2; } + + bool operator<(const QLink& other) const { + return (node1()->GetID() == other.node1()->GetID() ? + node2()->GetID() < other.node2()->GetID() : + node1()->GetID() < other.node1()->GetID()); + } + struct PtrComparator { + bool operator() (const QLink* l1, const QLink* l2 ) const { return *l1 < *l2; } + }; + }; + // --------------------------------------------------------- + /*! + * \brief Link in the chain of links; it connects two faces + */ + struct TChainLink + { + const QLink* _qlink; + mutable const QFace* _qfaces[2]; + + TChainLink(const QLink* qlink=0):_qlink(qlink) { + _qfaces[0] = _qfaces[1] = 0; + } + void SetFace(const QFace* face) { int iF = _qfaces[0] ? 1 : 0; _qfaces[iF]=face; } + + bool IsBoundary() const { return !_qfaces[1]; } + + void RemoveFace( const QFace* face ) const + { _qfaces[(face == _qfaces[1])] = 0; if (!_qfaces[0]) swap(_qfaces[0],_qfaces[1]); } + + const QFace* NextFace( const QFace* f ) const + { return _qfaces[0]==f ? _qfaces[1] : _qfaces[0]; } + + const SMDS_MeshNode* NextNode( const SMDS_MeshNode* n ) const + { return n == _qlink->node1() ? _qlink->node2() : _qlink->node1(); } + + bool operator<(const TChainLink& other) const { return *_qlink < *other._qlink; } + + operator bool() const { return (_qlink); } + + const QLink* operator->() const { return _qlink; } + + gp_Vec Normal() const; + }; + // -------------------------------------------------------------------- + typedef list< TChainLink > TChain; + typedef set < TChainLink > TLinkSet; + typedef TLinkSet::iterator TLinkInSet; + + const int theFirstStep = 5; + + enum { ERR_OK, ERR_TRI, ERR_PRISM, ERR_UNKNOWN }; // errors of QFace::GetLinkChain() + // -------------------------------------------------------------------- + /*! + * \brief Face shared by two volumes and bound by QLinks + */ + struct QFace: public TIDSortedElemSet + { + mutable const SMDS_MeshElement* _volumes[2]; + mutable vector< const QLink* > _sides; + mutable bool _sideIsAdded[4]; // added in chain of links + gp_Vec _normal; + + QFace( const vector< const QLink*>& links ); + + void SetVolume(const SMDS_MeshElement* v) const { _volumes[ _volumes[0] ? 1 : 0 ] = v; } + + int NbVolumes() const { return !_volumes[0] ? 0 : !_volumes[1] ? 1 : 2; } + + void AddSelfToLinks() const { + for ( int i = 0; i < _sides.size(); ++i ) + _sides[i]->_faces.push_back( this ); + } + int LinkIndex( const QLink* side ) const { + for (int i=0; i<_sides.size(); ++i ) if ( _sides[i] == side ) return i; + return -1; + } + bool GetLinkChain( int iSide, TChain& chain, SMDS_TypeOfPosition pos, int& error) const; + + bool GetLinkChain( TChainLink& link, TChain& chain, SMDS_TypeOfPosition pos, int& error) const + { + int i = LinkIndex( link._qlink ); + if ( i < 0 ) return true; + _sideIsAdded[i] = true; + link.SetFace( this ); + // continue from opposite link + return GetLinkChain( (i+2)%_sides.size(), chain, pos, error ); + } + bool IsBoundary() const { return !_volumes[1]; } + + bool Contains( const SMDS_MeshNode* node ) const { return count(node); } + + TLinkInSet GetBoundaryLink( const TLinkSet& links, + const TChainLink& avoidLink, + TLinkInSet * notBoundaryLink = 0, + const SMDS_MeshNode* nodeToContain = 0, + bool * isAdjacentUsed = 0) const; + + TLinkInSet GetLinkByNode( const TLinkSet& links, + const TChainLink& avoidLink, + const SMDS_MeshNode* nodeToContain) const; + + const SMDS_MeshNode* GetNodeInFace() const { + for ( int iL = 0; iL < _sides.size(); ++iL ) + if ( _sides[iL]->MediumPos() == SMDS_TOP_FACE ) return _sides[iL]->_mediumNode; + return 0; + } + + gp_Vec LinkNorm(const int i, SMESH_MesherHelper* theFaceHelper=0) const; + + double MoveByBoundary( const TChainLink& theLink, + const gp_Vec& theRefVec, + const TLinkSet& theLinks, + SMESH_MesherHelper* theFaceHelper=0, + const double thePrevLen=0, + const int theStep=theFirstStep, + gp_Vec* theLinkNorm=0, + double theSign=1.0) const; + }; + + //================================================================================ + /*! + * \brief Dump QLink and QFace + */ + ostream& operator << (ostream& out, const QLink& l) + { + out <<"QLink nodes: " + << l.node1()->GetID() << " - " + << l._mediumNode->GetID() << " - " + << l.node2()->GetID() << endl; + return out; + } + ostream& operator << (ostream& out, const QFace& f) + { + out <<"QFace nodes: "/*<< &f << " "*/; + for ( TIDSortedElemSet::iterator n = f.begin(); n != f.end(); ++n ) + out << (*n)->GetID() << " "; + out << " \tvolumes: " + << (f._volumes[0] ? f._volumes[0]->GetID() : 0) << " " + << (f._volumes[1] ? f._volumes[1]->GetID() : 0); + out << " \tNormal: "<< f._normal.X() <<", "<& links ) + { + _volumes[0] = _volumes[1] = 0; + _sides = links; + _sideIsAdded[0]=_sideIsAdded[1]=_sideIsAdded[2]=_sideIsAdded[3]=false; + _normal.SetCoord(0,0,0); + for ( int i = 1; i < _sides.size(); ++i ) { + const QLink *l1 = _sides[i-1], *l2 = _sides[i]; + insert( l1->node1() ); insert( l1->node2() ); + // compute normal + gp_Vec v1( XYZ( l1->node2()), XYZ( l1->node1())); + gp_Vec v2( XYZ( l2->node1()), XYZ( l2->node2())); + if ( l1->node1() != l2->node1() && l1->node2() != l2->node2() ) + v1.Reverse(); + _normal += v1 ^ v2; + } + double normSqSize = _normal.SquareMagnitude(); + if ( normSqSize > numeric_limits::min() ) + _normal /= sqrt( normSqSize ); + else + _normal.SetCoord(1e-33,0,0); + } + //================================================================================ + /*! + * \brief Make up chain of links + * \param iSide - link to add first + * \param chain - chain to fill in + * \param pos - postion of medium nodes the links should have + * \param error - out, specifies what is wrong + * \retval bool - false if valid chain can't be built; "valid" means that links + * of the chain belongs to rectangles bounding hexahedrons + */ + //================================================================================ + + bool QFace::GetLinkChain( int iSide, TChain& chain, SMDS_TypeOfPosition pos, int& error) const + { + if ( iSide >= _sides.size() ) // wrong argument iSide + return false; + if ( _sideIsAdded[ iSide ]) // already in chain + return true; + + if ( _sides.size() != 4 ) { // triangle - visit all my continous faces + MSGBEG( *this ); + for ( int i = 0; i < _sides.size(); ++i ) { + if ( !_sideIsAdded[i] && _sides[i] ) { + _sideIsAdded[i]=true; + TChain::iterator chLink = chain.insert( chain.begin(), TChainLink(_sides[i])); + chLink->SetFace( this ); + if ( _sides[i]->MediumPos() >= pos ) + if ( const QFace* f = _sides[i]->GetContinuesFace( this )) + f->GetLinkChain( *chLink, chain, pos, error ); + } + } + if ( error < ERR_TRI ) + error = ERR_TRI; + return false; + } + _sideIsAdded[iSide] = true; // not to add this link to chain again + const QLink* link = _sides[iSide]; + if ( !link) + return true; + + // add link into chain + TChain::iterator chLink = chain.insert( chain.begin(), TChainLink(link)); + chLink->SetFace( this ); + MSGBEG( *this ); + + // propagate from rectangle to neighbour faces + if ( link->MediumPos() >= pos ) { + int nbLinkFaces = link->_faces.size(); + if ( nbLinkFaces == 4 || nbLinkFaces < 4 && link->OnBoundary()) { + // hexahedral mesh or boundary quadrangles - goto a continous face + if ( const QFace* f = link->GetContinuesFace( this )) + return f->GetLinkChain( *chLink, chain, pos, error ); + } + else { + TChainLink chLink(link); // side face of prismatic mesh - visit all faces of iSide + for ( int i = 0; i < nbLinkFaces; ++i ) + if ( link->_faces[i] ) + link->_faces[i]->GetLinkChain( chLink, chain, pos, error ); + if ( error < ERR_PRISM ) + error = ERR_PRISM; + return false; + } + } + return true; + } + + //================================================================================ + /*! + * \brief Return a boundary link of the triangle face + * \param links - set of all links + * \param avoidLink - link not to return + * \param notBoundaryLink - out, neither the returned link nor avoidLink + * \param nodeToContain - node the returned link must contain; if provided, search + * also performed on adjacent faces + * \param isAdjacentUsed - returns true if link is found in adjacent faces + */ + //================================================================================ + + TLinkInSet QFace::GetBoundaryLink( const TLinkSet& links, + const TChainLink& avoidLink, + TLinkInSet * notBoundaryLink, + const SMDS_MeshNode* nodeToContain, + bool * isAdjacentUsed) const + { + TLinkInSet linksEnd = links.end(), boundaryLink = linksEnd; + + typedef list< pair< const QFace*, TLinkInSet > > TFaceLinkList; + TFaceLinkList adjacentFaces; + + for ( int iL = 0; iL < _sides.size(); ++iL ) + { + if ( avoidLink._qlink == _sides[iL] ) + continue; + TLinkInSet link = links.find( _sides[iL] ); + if ( link == linksEnd ) continue; + + // check link + if ( link->IsBoundary() ) { + if ( !nodeToContain || + (*link)->node1() == nodeToContain || + (*link)->node2() == nodeToContain ) + { + boundaryLink = link; + if ( !notBoundaryLink ) break; + } + } + else if ( notBoundaryLink ) { + *notBoundaryLink = link; + if ( boundaryLink != linksEnd ) break; + } + + if ( boundaryLink == linksEnd && nodeToContain ) // cellect adjacent faces + if ( const QFace* adj = link->NextFace( this )) + if ( adj->Contains( nodeToContain )) + adjacentFaces.push_back( make_pair( adj, link )); + } + + if ( isAdjacentUsed ) *isAdjacentUsed = false; + if ( boundaryLink == linksEnd && nodeToContain ) // check adjacent faces + { + TFaceLinkList::iterator adj = adjacentFaces.begin(); + for ( ; boundaryLink == linksEnd && adj != adjacentFaces.end(); ++adj ) + boundaryLink = adj->first->GetBoundaryLink( links, *(adj->second), + 0, nodeToContain, isAdjacentUsed); + if ( isAdjacentUsed ) *isAdjacentUsed = true; + } + return boundaryLink; + } + //================================================================================ + /*! + * \brief Return a link ending at the given node but not avoidLink + */ + //================================================================================ + + TLinkInSet QFace::GetLinkByNode( const TLinkSet& links, + const TChainLink& avoidLink, + const SMDS_MeshNode* nodeToContain) const + { + for ( int i = 0; i < _sides.size(); ++i ) + if ( avoidLink._qlink != _sides[i] && + (_sides[i]->node1() == nodeToContain || _sides[i]->node2() == nodeToContain )) + return links.find( _sides[ i ]); + return links.end(); + } + + //================================================================================ + /*! + * \brief Return normal to the i-th side pointing outside the face + */ + //================================================================================ + + gp_Vec QFace::LinkNorm(const int i, SMESH_MesherHelper* /*uvHelper*/) const + { + gp_Vec norm, vecOut; +// if ( uvHelper ) { +// TopoDS_Face face = TopoDS::Face( uvHelper->GetSubShape()); +// const SMDS_MeshNode* inFaceNode = uvHelper->GetNodeUVneedInFaceNode() ? GetNodeInFace() : 0; +// gp_XY uv1 = uvHelper->GetNodeUV( face, _sides[i]->node1(), inFaceNode ); +// gp_XY uv2 = uvHelper->GetNodeUV( face, _sides[i]->node2(), inFaceNode ); +// norm.SetCoord( uv1.Y() - uv2.Y(), uv2.X() - uv1.X(), 0 ); + +// const QLink* otherLink = _sides[(i + 1) % _sides.size()]; +// const SMDS_MeshNode* otherNode = +// otherLink->node1() == _sides[i]->node1() ? otherLink->node2() : otherLink->node1(); +// gp_XY pIn = uvHelper->GetNodeUV( face, otherNode, inFaceNode ); +// vecOut.SetCoord( uv1.X() - pIn.X(), uv1.Y() - pIn.Y(), 0 ); +// } +// else { + norm = _normal ^ gp_Vec( XYZ(_sides[i]->node1()), XYZ(_sides[i]->node2())); + gp_XYZ pIn = ( XYZ( _sides[0]->node1() ) + + XYZ( _sides[0]->node2() ) + + XYZ( _sides[1]->node1() )) / 3.; + vecOut.SetXYZ( _sides[i]->MiddlePnt() - pIn ); + //} + if ( norm * vecOut < 0 ) + norm.Reverse(); + double mag2 = norm.SquareMagnitude(); + if ( mag2 > numeric_limits::min() ) + norm /= sqrt( mag2 ); + return norm; + } + //================================================================================ + /*! + * \brief Move medium node of theLink according to its distance from boundary + * \param theLink - link to fix + * \param theRefVec - movement of boundary + * \param theLinks - all adjacent links of continous triangles + * \param theFaceHelper - helper is not used so far + * \param thePrevLen - distance from the boundary + * \param theStep - number of steps till movement propagation limit + * \param theLinkNorm - out normal to theLink + * \param theSign - 1 or -1 depending on movement of boundary + * \retval double - distance from boundary to propagation limit or other boundary + */ + //================================================================================ + + double QFace::MoveByBoundary( const TChainLink& theLink, + const gp_Vec& theRefVec, + const TLinkSet& theLinks, + SMESH_MesherHelper* theFaceHelper, + const double thePrevLen, + const int theStep, + gp_Vec* theLinkNorm, + double theSign) const + { + if ( !theStep ) + return thePrevLen; // propagation limit reached + + int iL; // index of theLink + for ( iL = 0; iL < _sides.size(); ++iL ) + if ( theLink._qlink == _sides[ iL ]) + break; + + MSG(string(theStep,'.')<<" Ref( "<NextFace( this ); // adjacent faces + const QFace* f2 = link2->NextFace( this ); + + // propagate to adjacent faces till limit step or boundary + double len1 = thePrevLen + (theLink->MiddlePnt() - _sides[iL1]->MiddlePnt()).Modulus(); + double len2 = thePrevLen + (theLink->MiddlePnt() - _sides[iL2]->MiddlePnt()).Modulus(); + gp_Vec linkDir1, linkDir2; + try { + OCC_CATCH_SIGNALS; + if ( f1 ) + len1 = f1->MoveByBoundary + ( *link1, theRefVec, theLinks, theFaceHelper, len1, theStep-1, &linkDir1, theSign); + else + linkDir1 = LinkNorm( iL1/*, theFaceHelper*/ ); + } catch (...) { + MSG( " --------------- EXCEPTION"); + return thePrevLen; + } + try { + OCC_CATCH_SIGNALS; + if ( f2 ) + len2 = f2->MoveByBoundary + ( *link2, theRefVec, theLinks, theFaceHelper, len2, theStep-1, &linkDir2, theSign); + else + linkDir2 = LinkNorm( iL2/*, theFaceHelper*/ ); + } catch (...) { + MSG( " --------------- EXCEPTION"); + return thePrevLen; + } + + double fullLen = 0; + if ( theStep != theFirstStep ) + { + // choose chain length by direction of propagation most codirected with theRefVec + bool choose1 = ( theRefVec * linkDir1 * theSign > theRefVec * linkDir2 * theSign ); + fullLen = choose1 ? len1 : len2; + double r = thePrevLen / fullLen; + + gp_Vec move = linkNorm * refProj * ( 1 - r ); + theLink->Move( move, true ); + + MSG(string(theStep,'.')<<" Move "<< theLink->_mediumNode->GetID()<< + " by " << refProj * ( 1 - r ) << " following " << + (choose1 ? *link1->_qlink : *link2->_qlink)); + + if ( theLinkNorm ) *theLinkNorm = linkNorm; + } + return fullLen; + } + + //================================================================================ + /*! + * \brief Find pairs of continues faces + */ + //================================================================================ + + void QLink::SetContinuesFaces() const + { + // x0 x - QLink, [-|] - QFace, v - volume + // v0 | v1 + // | Between _faces of link x2 two vertical faces are continues + // x1----x2-----x3 and two horizontal faces are continues. We set vertical faces + // | to _faces[0] and _faces[1] and horizontal faces to + // v2 | v3 _faces[2] and _faces[3] (or vise versa). + // x4 + + if ( _faces.empty() ) + return; + int iFaceCont = -1; + for ( int iF = 1; iFaceCont < 0 && iF < _faces.size(); ++iF ) + { + // look for a face bounding none of volumes bound by _faces[0] + bool sameVol = false; + int nbVol = _faces[iF]->NbVolumes(); + for ( int iV = 0; !sameVol && iV < nbVol; ++iV ) + sameVol = ( _faces[iF]->_volumes[iV] == _faces[0]->_volumes[0] || + _faces[iF]->_volumes[iV] == _faces[0]->_volumes[1]); + if ( !sameVol ) + iFaceCont = iF; + } + if ( iFaceCont > 0 ) // continues faces found, set one by the other + { + if ( iFaceCont != 1 ) + swap( _faces[1], _faces[iFaceCont] ); + } + else if ( _faces.size() > 1 ) // not found, set NULL by the first face + { + _faces.insert( ++_faces.begin(), 0 ); + } + } + //================================================================================ + /*! + * \brief Return a face continues to the given one + */ + //================================================================================ + + const QFace* QLink::GetContinuesFace( const QFace* face ) const + { + for ( int i = 0; i < _faces.size(); ++i ) { + if ( _faces[i] == face ) { + int iF = i < 2 ? 1-i : 5-i; + return iF < _faces.size() ? _faces[iF] : 0; + } + } + return 0; + } + //================================================================================ + /*! + * \brief True if link is on mesh boundary + */ + //================================================================================ + + bool QLink::OnBoundary() const + { + for ( int i = 0; i < _faces.size(); ++i ) + if (_faces[i] && _faces[i]->IsBoundary()) return true; + return false; + } + //================================================================================ + /*! + * \brief Return normal of link of the chain + */ + //================================================================================ + + gp_Vec TChainLink::Normal() const { + gp_Vec norm; + if (_qfaces[0]) norm = _qfaces[0]->_normal; + if (_qfaces[1]) norm += _qfaces[1]->_normal; + return norm; + } + //================================================================================ + /*! + * \brief Move medium nodes of vertical links of pentahedrons adjacent by side faces + */ + //================================================================================ + + void fixPrism( TChain& allLinks ) + { + // separate boundary links from internal ones + typedef set QLinkSet; + QLinkSet interLinks, bndLinks1, bndLink2; + + bool isCurved = false; + for ( TChain::iterator lnk = allLinks.begin(); lnk != allLinks.end(); ++lnk ) { + if ( (*lnk)->OnBoundary() ) + bndLinks1.insert( lnk->_qlink ); + else + interLinks.insert( lnk->_qlink ); + isCurved = isCurved || !(*lnk)->IsStraight(); + } + if ( !isCurved ) + return; // no need to move + + QLinkSet *curBndLinks = &bndLinks1, *newBndLinks = &bndLink2; + + while ( !interLinks.empty() && !curBndLinks->empty() ) + { + // propagate movement from boundary links to connected internal links + QLinkSet::iterator bnd = curBndLinks->begin(), bndEnd = curBndLinks->end(); + for ( ; bnd != bndEnd; ++bnd ) + { + const QLink* bndLink = *bnd; + for ( int i = 0; i < bndLink->_faces.size(); ++i ) // loop on faces of bndLink + { + const QFace* face = bndLink->_faces[i]; // quadrange lateral face of a prism + if ( !face ) continue; + // find and move internal link opposite to bndLink within the face + int interInd = ( face->LinkIndex( bndLink ) + 2 ) % face->_sides.size(); + const QLink* interLink = face->_sides[ interInd ]; + QLinkSet::iterator pInterLink = interLinks.find( interLink ); + if ( pInterLink == interLinks.end() ) continue; // not internal link + interLink->Move( bndLink->_nodeMove ); + // treated internal links become new boundary ones + interLinks. erase( pInterLink ); + newBndLinks->insert( interLink ); + } + } + curBndLinks->clear(); + swap( curBndLinks, newBndLinks ); + } + } + + //================================================================================ + /*! + * \brief Fix links of continues triangles near curved boundary + */ + //================================================================================ + + void fixTriaNearBoundary( TChain & allLinks, SMESH_MesherHelper& /*helper*/) + { + if ( allLinks.empty() ) return; + + TLinkSet linkSet( allLinks.begin(), allLinks.end()); + TLinkInSet linkIt = linkSet.begin(), linksEnd = linkSet.end(); + + // move in 2d if we are on geom face +// TopoDS_Face face; +// TopLoc_Location loc; +// SMESH_MesherHelper faceHelper( *helper.GetMesh()); +// while ( linkIt->IsBoundary()) ++linkIt; +// if ( linkIt == linksEnd ) return; +// if ( (*linkIt)->MediumPos() == SMDS_TOP_FACE ) { +// bool checkPos = true; +// TopoDS_Shape f = helper.GetSubShapeByNode( (*linkIt)->_mediumNode, helper.GetMeshDS() ); +// if ( !f.IsNull() && f.ShapeType() == TopAbs_FACE ) { +// face = TopoDS::Face( f ); +// helper.GetNodeUV( face, (*linkIt)->_mediumNode, 0, &checkPos); +// if (checkPos) +// face.Nullify(); +// else +// faceHelper.SetSubShape( face ); +// } +// } + for ( linkIt = linkSet.begin(); linkIt != linksEnd; ++linkIt) + { + if ( linkIt->IsBoundary() && !(*linkIt)->IsStraight() && linkIt->_qfaces[0]) + { +// if ( !face.IsNull() ) { +// const SMDS_MeshNode* inFaceNode = +// faceHelper.GetNodeUVneedInFaceNode() ? linkIt->_qfaces[0]->GetNodeInFace() : 0; +// gp_XY uvm = helper.GetNodeUV( face, (*linkIt)->_mediumNode, inFaceNode ); +// gp_XY uv1 = helper.GetNodeUV( face, (*linkIt)->node1(), inFaceNode); +// gp_XY uv2 = helper.GetNodeUV( face, (*linkIt)->node2(), inFaceNode); +// gp_XY uvMove = uvm - helper.GetMiddleUV( BRep_Tool::Surface(face,loc), uv1, uv2); +// gp_Vec move( uvMove.X(), uvMove.Y(), 0 ); +// linkIt->_qfaces[0]->MoveByBoundary( *linkIt, move, linkSet, &faceHelper ); +// } +// else { + linkIt->_qfaces[0]->MoveByBoundary( *linkIt, (*linkIt)->_nodeMove, linkSet ); + //} + } + } + } + + //================================================================================ + /*! + * \brief Detect rectangular structure of links and build chains from them + */ + //================================================================================ + + enum TSplitTriaResult { + _OK, _NO_CORNERS, _FEW_ROWS, _MANY_ROWS, _NO_SIDELINK, _BAD_MIDQUAD, _NOT_RECT, + _NO_MIDQUAD, _NO_UPTRIA, _BAD_SET_SIZE, _BAD_CORNER, _BAD_START, _NO_BOTLINK }; + + TSplitTriaResult splitTrianglesIntoChains( TChain & allLinks, + vector< TChain> & resultChains, + SMDS_TypeOfPosition pos ) + { + // put links in the set and evalute number of result chains by number of boundary links + TLinkSet linkSet; + int nbBndLinks = 0; + for ( TChain::iterator lnk = allLinks.begin(); lnk != allLinks.end(); ++lnk ) { + linkSet.insert( *lnk ); + nbBndLinks += lnk->IsBoundary(); + } + resultChains.clear(); + resultChains.reserve( nbBndLinks / 2 ); + + TLinkInSet linkIt, linksEnd = linkSet.end(); + + // find a boundary link with corner node; corner node has position pos-2 + // i.e. SMDS_TOP_VERTEX for links on faces and SMDS_TOP_EDGE for + // links in volume + SMDS_TypeOfPosition cornerPos = SMDS_TypeOfPosition(pos-2); + const SMDS_MeshNode* corner = 0; + for ( linkIt = linkSet.begin(); linkIt != linksEnd; ++linkIt ) + if ( linkIt->IsBoundary() && (corner = (*linkIt)->EndPosNode(cornerPos))) + break; + if ( !corner) + return _NO_CORNERS; + + TLinkInSet startLink = linkIt; + const SMDS_MeshNode* startCorner = corner; + vector< TChain* > rowChains; + int iCol = 0; + + while ( startLink != linksEnd) // loop on columns + { + // We suppose we have a rectangular structure like shown here. We have found a + // corner of the rectangle (startCorner) and a boundary link sharing + // |/ |/ | the startCorner (startLink). We are going to loop on rows of the + // --o---o---o structure making several chains at once. One chain (columnChain) + // |\ | /| starts at startLink and continues upward (we look at the structure + // \ | \ | / | from such point that startLink is on the bottom of the structure). + // \| \|/ | While going upward we also fill horizontal chains (rowChains) we + // --o---o---o encounter. + // /|\ |\ | + // / | \ | \ | startCorner + // | \| \|,' + // --o---o---o + // `.startLink + + if ( resultChains.size() == nbBndLinks / 2 ) + return _NOT_RECT; + resultChains.push_back( TChain() ); + TChain& columnChain = resultChains.back(); + + TLinkInSet botLink = startLink; // current horizontal link to go up from + corner = startCorner; // current corner the botLink ends at + int iRow = 0; + while ( botLink != linksEnd ) // loop on rows + { + // add botLink to the columnChain + columnChain.push_back( *botLink ); + + const QFace* botTria = botLink->_qfaces[0]; // bottom triangle bound by botLink + if ( !botTria ) + { // the column ends + linkSet.erase( botLink ); + if ( iRow != rowChains.size() ) + return _FEW_ROWS; // different nb of rows in columns + break; + } + // find the link dividing the quadrangle (midQuadLink) and vertical boundary + // link ending at (sideLink); there are two cases: + // 1) midQuadLink does not end at , then we easily find it by botTria, + // since midQuadLink is not at boundary while sideLink is. + // 2) midQuadLink ends at + bool isCase2; + TLinkInSet midQuadLink = linksEnd; + TLinkInSet sideLink = botTria->GetBoundaryLink( linkSet, *botLink, &midQuadLink, + corner, &isCase2 ); + if ( isCase2 ) { // find midQuadLink among links of botTria + midQuadLink = botTria->GetLinkByNode( linkSet, *botLink, corner ); + if ( midQuadLink->IsBoundary() ) + return _BAD_MIDQUAD; + } + if ( sideLink == linksEnd || midQuadLink == linksEnd || sideLink == midQuadLink ) + return sideLink == linksEnd ? _NO_SIDELINK : _NO_MIDQUAD; + + // fill chains + columnChain.push_back( *midQuadLink ); + if ( iRow >= rowChains.size() ) { + if ( iCol > 0 ) + return _MANY_ROWS; // different nb of rows in columns + if ( resultChains.size() == nbBndLinks / 2 ) + return _NOT_RECT; + resultChains.push_back( TChain() ); + rowChains.push_back( & resultChains.back() ); + } + rowChains[iRow]->push_back( *sideLink ); + rowChains[iRow]->push_back( *midQuadLink ); + + const QFace* upTria = midQuadLink->NextFace( botTria ); // upper tria of the rectangle + if ( !upTria) + return _NO_UPTRIA; + if ( iRow == 0 ) { + // prepare startCorner and startLink for the next column + startCorner = startLink->NextNode( startCorner ); + if (isCase2) + startLink = botTria->GetBoundaryLink( linkSet, *botLink, 0, startCorner ); + else + startLink = upTria->GetBoundaryLink( linkSet, *midQuadLink, 0, startCorner ); + // check if no more columns remains + if ( startLink != linksEnd ) { + const SMDS_MeshNode* botNode = startLink->NextNode( startCorner ); + if ( (isCase2 ? botTria : upTria)->Contains( botNode )) + startLink = linksEnd; // startLink bounds upTria or botTria + else if ( startLink == botLink || startLink == midQuadLink || startLink == sideLink ) + return _BAD_START; + } + } + // find bottom link and corner for the next row + corner = sideLink->NextNode( corner ); + // next bottom link ends at the new corner + linkSet.erase( botLink ); + botLink = upTria->GetLinkByNode( linkSet, (isCase2 ? *sideLink : *midQuadLink), corner ); + if ( botLink == linksEnd || botLink == (isCase2 ? midQuadLink : sideLink)) + return _NO_BOTLINK; + linkSet.erase( midQuadLink ); + linkSet.erase( sideLink ); + + // make faces neighboring the found ones be boundary + if ( startLink != linksEnd ) { + const QFace* tria = isCase2 ? botTria : upTria; + for ( int iL = 0; iL < 3; ++iL ) { + linkIt = linkSet.find( tria->_sides[iL] ); + if ( linkIt != linksEnd ) + linkIt->RemoveFace( tria ); + } + } + if ( botLink->_qfaces[0] == upTria || botLink->_qfaces[1] == upTria ) + botLink->RemoveFace( upTria ); // make next botTria first in vector + + iRow++; + } // loop on rows + + iCol++; + } + // In the linkSet, there must remain the last links of rowChains; add them + if ( linkSet.size() != rowChains.size() ) + return _BAD_SET_SIZE; + for ( int iRow = 0; iRow < rowChains.size(); ++iRow ) { + // find the link (startLink) ending at startCorner + corner = 0; + for ( startLink = linkSet.begin(); startLink != linksEnd; ++startLink ) { + if ( (*startLink)->node1() == startCorner ) { + corner = (*startLink)->node2(); break; + } + else if ( (*startLink)->node2() == startCorner) { + corner = (*startLink)->node1(); break; + } + } + if ( startLink == linksEnd ) + return _BAD_CORNER; + rowChains[ iRow ]->push_back( *startLink ); + linkSet.erase( startLink ); + startCorner = corner; + } + + return _OK; + } +} + +//======================================================================= +/*! + * \brief Move medium nodes of faces and volumes to fix distorted elements + * \param volumeOnly - to fix nodes on faces or not, if the shape is solid + * + * Issue 0020307: EDF 992 SMESH : Linea/Quadratic with Medium Node on Geometry + */ +//======================================================================= + +void SMESH_MesherHelper::FixQuadraticElements(bool volumeOnly) +{ + // apply algorithm to solids or geom faces + // ---------------------------------------------- + if ( myShape.IsNull() ) { + if ( !myMesh->HasShapeToMesh() ) return; + SetSubShape( myMesh->GetShapeToMesh() ); + + TopTools_MapOfShape faces; // faces not in solid or in not meshed solid + for ( TopExp_Explorer f(myShape,TopAbs_FACE,TopAbs_SOLID); f.More(); f.Next() ) { + faces.Add( f.Current() ); + } + for ( TopExp_Explorer v(myShape,TopAbs_SOLID); v.More(); v.Next() ) { + if ( myMesh->GetSubMesh( v.Current() )->IsEmpty() ) { // get faces of solid + for ( TopExp_Explorer f( v.Current(), TopAbs_FACE); f.More(); f.Next() ) + faces.Add( f.Current() ); + } + else { // fix nodes in the solid and its faces + SMESH_MesherHelper h(*myMesh); + h.SetSubShape( v.Current() ); + h.FixQuadraticElements(false); + } + } + // fix nodes on geom faces + for ( TopTools_MapIteratorOfMapOfShape fIt( faces ); fIt.More(); fIt.Next() ) { + SMESH_MesherHelper h(*myMesh); + h.SetSubShape( fIt.Key() ); + h.FixQuadraticElements(); + } + return; + } + + // Find out type of elements and get iterator on them + // --------------------------------------------------- + + SMDS_ElemIteratorPtr elemIt; + SMDSAbs_ElementType elemType = SMDSAbs_All; + + SMESH_subMesh* submesh = myMesh->GetSubMeshContaining( myShapeID ); + if ( !submesh ) + return; + if ( SMESHDS_SubMesh* smDS = submesh->GetSubMeshDS() ) { + elemIt = smDS->GetElements(); + if ( elemIt->more() ) { + elemType = elemIt->next()->GetType(); + elemIt = smDS->GetElements(); + } + } + if ( !elemIt || !elemIt->more() || elemType < SMDSAbs_Face ) + return; + + // Fill in auxiliary data structures + // ---------------------------------- + + set< QLink > links; + set< QFace > faces; + set< QLink >::iterator pLink; + set< QFace >::iterator pFace; + + bool isCurved = false; + bool hasRectFaces = false; + set nbElemNodeSet; + + if ( elemType == SMDSAbs_Volume ) + { + SMDS_VolumeTool volTool; + while ( elemIt->more() ) // loop on volumes + { + const SMDS_MeshElement* vol = elemIt->next(); + if ( !vol->IsQuadratic() || !volTool.Set( vol )) + return; //continue; + for ( int iF = 0; iF < volTool.NbFaces(); ++iF ) // loop on faces of volume + { + int nbN = volTool.NbFaceNodes( iF ); + nbElemNodeSet.insert( nbN ); + const SMDS_MeshNode** faceNodes = volTool.GetFaceNodes( iF ); + vector< const QLink* > faceLinks( nbN/2 ); + for ( int iN = 0; iN < nbN; iN += 2 ) // loop on links of a face + { + // store QLink + QLink link( faceNodes[iN], faceNodes[iN+2], faceNodes[iN+1] ); + pLink = links.insert( link ).first; + faceLinks[ iN/2 ] = & *pLink; + if ( !isCurved ) + isCurved = !link.IsStraight(); + if ( link.MediumPos() == SMDS_TOP_3DSPACE && !link.IsStraight() ) + return; // already fixed + } + // store QFace + pFace = faces.insert( QFace( faceLinks )).first; + if ( pFace->NbVolumes() == 0 ) + pFace->AddSelfToLinks(); + pFace->SetVolume( vol ); + hasRectFaces = hasRectFaces || + ( volTool.GetVolumeType() == SMDS_VolumeTool::QUAD_HEXA || + volTool.GetVolumeType() == SMDS_VolumeTool::QUAD_PENTA ); + } + } + set< QLink >::iterator pLink = links.begin(); + for ( ; pLink != links.end(); ++pLink ) + pLink->SetContinuesFaces(); + } + else + { + while ( elemIt->more() ) // loop on faces + { + const SMDS_MeshElement* face = elemIt->next(); + if ( !face->IsQuadratic() ) + continue; + nbElemNodeSet.insert( face->NbNodes() ); + int nbN = face->NbNodes()/2; + vector< const QLink* > faceLinks( nbN ); + for ( int iN = 0; iN < nbN; ++iN ) // loop on links of a face + { + // store QLink + QLink link( face->GetNode(iN), face->GetNode((iN+1)%nbN), face->GetNode(iN+nbN) ); + pLink = links.insert( link ).first; + faceLinks[ iN ] = & *pLink; + if ( !isCurved ) + isCurved = !link.IsStraight(); + } + // store QFace + pFace = faces.insert( QFace( faceLinks )).first; + pFace->AddSelfToLinks(); + hasRectFaces = ( hasRectFaces || nbN == 4 ); + } + } + if ( !isCurved ) + return; // no curved edges of faces + + // Compute displacement of medium nodes + // ------------------------------------- + + // two loops on faces: the first is to treat boundary links, the second is for internal ones + TopLoc_Location loc; + // not treat boundary of volumic submesh + int isInside = ( elemType == SMDSAbs_Volume && volumeOnly ) ? 1 : 0; + for ( ; isInside < 2; ++isInside ) { + MSG( "--------------- LOOP " << isInside << " ------------------"); + SMDS_TypeOfPosition pos = isInside ? SMDS_TOP_3DSPACE : SMDS_TOP_FACE; + + for ( pFace = faces.begin(); pFace != faces.end(); ++pFace ) { + if ( bool(isInside) == pFace->IsBoundary() ) + continue; + for ( int dir = 0; dir < 2; ++dir ) // 2 directions of propagation from quadrangle + { + MSG( "CHAIN"); + // make chain of links connected via continues faces + int error = ERR_OK; + TChain rawChain; + if ( !pFace->GetLinkChain( dir, rawChain, pos, error) && error ==ERR_UNKNOWN ) continue; + rawChain.reverse(); + if ( !pFace->GetLinkChain( dir+2, rawChain, pos, error ) && error ==ERR_UNKNOWN ) continue; + + vector< TChain > chains; + if ( error == ERR_OK ) { // chains contains continues rectangles + chains.resize(1); + chains[0].splice( chains[0].begin(), rawChain ); + } + else if ( error == ERR_TRI ) { // chains contains continues triangles + TSplitTriaResult res = splitTrianglesIntoChains( rawChain, chains, pos ); + if ( res != _OK ) { // not rectangles split into triangles + fixTriaNearBoundary( rawChain, *this ); + break; + } + } + else if ( error == ERR_PRISM ) { // side faces of prisms + fixPrism( rawChain ); + break; + } + else { + continue; + } + for ( int iC = 0; iC < chains.size(); ++iC ) + { + TChain& chain = chains[iC]; + if ( chain.empty() ) continue; + if ( chain.front()->IsStraight() && chain.back()->IsStraight() ) { + MSG("3D straight"); + continue; + } + // mesure chain length and compute link position along the chain + double chainLen = 0; + vector< double > linkPos; + MSGBEG( "Link medium nodes: "); + TChain::iterator link0 = chain.begin(), link1 = chain.begin(), link2; + for ( ++link1; link1 != chain.end(); ++link1, ++link0 ) { + MSGBEG( (*link0)->_mediumNode->GetID() << "-" <<(*link1)->_mediumNode->GetID()<<" "); + double len = ((*link0)->MiddlePnt() - (*link1)->MiddlePnt()).Modulus(); + while ( len < numeric_limits::min() ) { // remove degenerated link + link1 = chain.erase( link1 ); + if ( link1 == chain.end() ) + break; + len = ((*link0)->MiddlePnt() - (*link1)->MiddlePnt()).Modulus(); + } + chainLen += len; + linkPos.push_back( chainLen ); + } + MSG(""); + if ( linkPos.size() < 2 ) + continue; + + gp_Vec move0 = chain.front()->_nodeMove; + gp_Vec move1 = chain.back ()->_nodeMove; + + TopoDS_Face face; + bool checkUV = true; + if ( !isInside ) { + // compute node displacement of end links in parametric space of face + const SMDS_MeshNode* nodeOnFace = (*(++chain.begin()))->_mediumNode; + TopoDS_Shape f = GetSubShapeByNode( nodeOnFace, GetMeshDS() ); + if ( !f.IsNull() && f.ShapeType() == TopAbs_FACE ) { + face = TopoDS::Face( f ); + for ( int is1 = 0; is1 < 2; ++is1 ) { // move0 or move1 + TChainLink& link = is1 ? chain.back() : chain.front(); + gp_XY uv1 = GetNodeUV( face, link->node1(), nodeOnFace, &checkUV); + gp_XY uv2 = GetNodeUV( face, link->node2(), nodeOnFace, &checkUV); + gp_XY uvm = GetNodeUV( face, link->_mediumNode, nodeOnFace, &checkUV); + gp_XY uvMove = uvm - GetMiddleUV( BRep_Tool::Surface(face,loc), uv1, uv2); + if ( is1 ) move1.SetCoord( uvMove.X(), uvMove.Y(), 0 ); + else move0.SetCoord( uvMove.X(), uvMove.Y(), 0 ); + } + if ( move0.SquareMagnitude() < straightTol2 && + move1.SquareMagnitude() < straightTol2 ) { + MSG("2D straight"); + continue; // straight - no need to move nodes of internal links + } + } + } + gp_Trsf trsf; + if ( isInside || face.IsNull() ) + { + // compute node displacement of end links in their local coord systems + { + TChainLink& ln0 = chain.front(), ln1 = *(++chain.begin()); + trsf.SetTransformation( gp_Ax3( gp::Origin(), ln0.Normal(), + gp_Vec( ln0->MiddlePnt(), ln1->MiddlePnt() ))); + move0.Transform(trsf); + } + { + TChainLink& ln0 = *(++chain.rbegin()), ln1 = chain.back(); + trsf.SetTransformation( gp_Ax3( gp::Origin(), ln1.Normal(), + gp_Vec( ln0->MiddlePnt(), ln1->MiddlePnt() ))); + move1.Transform(trsf); + } + } + // compute displacement of medium nodes + link2 = chain.begin(); + link0 = link2++; + link1 = link2++; + for ( int i = 0; link2 != chain.end(); ++link0, ++link1, ++link2, ++i ) + { + double r = linkPos[i] / chainLen; + // displacement in local coord system + gp_Vec move = (1. - r) * move0 + r * move1; + if ( isInside || face.IsNull()) { + // transform to global + gp_Vec x01( (*link0)->MiddlePnt(), (*link1)->MiddlePnt() ); + gp_Vec x12( (*link1)->MiddlePnt(), (*link2)->MiddlePnt() ); + gp_Vec x = x01.Normalized() + x12.Normalized(); + trsf.SetTransformation( gp_Ax3( gp::Origin(), link1->Normal(), x), gp_Ax3() ); + move.Transform(trsf); + } + else { + // compute 3D displacement by 2D one + gp_XY oldUV = GetNodeUV( face, (*link1)->_mediumNode, 0, &checkUV); + gp_XY newUV = oldUV + gp_XY( move.X(), move.Y() ); + gp_Pnt newPnt = BRep_Tool::Surface(face,loc)->Value( newUV.X(), newUV.Y()); + move = gp_Vec( XYZ((*link1)->_mediumNode), newPnt.Transformed(loc) ); +#ifdef _DEBUG_ + if ( (XYZ((*link1)->node1()) - XYZ((*link1)->node2())).SquareModulus() < + move.SquareMagnitude()) + { + gp_XY uv0 = GetNodeUV( face, (*link0)->_mediumNode, 0, &checkUV); + gp_XY uv2 = GetNodeUV( face, (*link2)->_mediumNode, 0, &checkUV); + MSG( "uv0: "<Move( move ); + MSG( "Move " << (*link1)->_mediumNode->GetID() << " following " + << chain.front()->_mediumNode->GetID() <<"-" + << chain.back ()->_mediumNode->GetID() << + " by " << move.Magnitude()); + } + } // loop on chains of links + } // loop on 2 directions of propagation from quadrangle + } // loop on faces + } + + // Move nodes + // ----------- + + for ( pLink = links.begin(); pLink != links.end(); ++pLink ) { + if ( pLink->IsMoved() ) { + //gp_Pnt p = pLink->MediumPnt() + pLink->Move(); + gp_Pnt p = pLink->MiddlePnt() + pLink->Move(); + GetMeshDS()->MoveNode( pLink->_mediumNode, p.X(), p.Y(), p.Z()); + } + } +} diff --git a/src/SMESH/SMESH_MesherHelper.hxx b/src/SMESH/SMESH_MesherHelper.hxx index 733cfa4a4..65c3f600d 100644 --- a/src/SMESH/SMESH_MesherHelper.hxx +++ b/src/SMESH/SMESH_MesherHelper.hxx @@ -32,15 +32,15 @@ #include #include +#include #include #include #include #include -typedef std::pair NLink; -typedef std::map NLinkNodeMap; -typedef std::map::iterator ItNLinkNode; +typedef std::map TLinkNodeMap; +typedef std::map::iterator ItTLinkNode; /*! * \brief It helps meshers to add elements @@ -91,9 +91,8 @@ public: * \param meshDS - mesh DS * \retval TopoDS_Shape - found support shape */ - static const TopoDS_Shape& GetSubShapeByNode(const SMDS_MeshNode* node, - SMESHDS_Mesh* meshDS) - { return meshDS->IndexToShape( node->GetPosition()->GetShapeId() ); } + static TopoDS_Shape GetSubShapeByNode(const SMDS_MeshNode* node, + SMESHDS_Mesh* meshDS); /*! * \brief Return a valid node index, fixing the given one if necessary @@ -126,7 +125,7 @@ public: /*! * Check submesh for given shape: if all elements on this shape are quadratic, - * quadratic elements will be created. Also fill myNLinkNodeMap + * quadratic elements will be created. Also fill myTLinkNodeMap */ bool IsQuadraticSubMesh(const TopoDS_Shape& theShape); /*! @@ -139,6 +138,12 @@ public: */ bool GetIsQuadratic() const { return myCreateQuadratic; } + /*! + * \brief Move medium nodes of faces and volumes to fix distorted elements + * \param volumeOnly - fix nodes on geom faces or not if the shape is solid + */ + void FixQuadraticElements(bool volumeOnly=true); + /*! * \brief To set created elements on the shape set by IsQuadraticSubMesh() * or the next methods. By defaul elements are set on the shape if @@ -146,6 +151,15 @@ public: */ void SetElementsOnShape(bool toSet) { mySetElemOnShape = toSet; } + /*! + * \brief Enable/disable checking of node parameters on shapes while adding elements. + * In case of incorrect parameters mudium node place is computed as the middle + * of two nodes. Default is false. + * NOTE that this flag is reset to "not to check" if check with non-default partameter + * is successful + */ + void SetCheckNodePosition(bool toCheck) { myCheckNodePos = toCheck; } + /*! * \brief Set shape to make elements on without calling IsQuadraticSubMesh() */ @@ -236,14 +250,22 @@ public: * \brief Return U of the given node on the edge */ double GetNodeU(const TopoDS_Edge& theEdge, - const SMDS_MeshNode* theNode); + const SMDS_MeshNode* theNode, + bool* check=0); /*! * \brief Return node UV on face - * \param inFaceNode - a node of element being created located inside a face + * \param inFaceNode - a node of element being created located inside a face */ gp_XY GetNodeUV(const TopoDS_Face& F, const SMDS_MeshNode* n, - const SMDS_MeshNode* inFaceNode=0) const; + const SMDS_MeshNode* inFaceNode=0, + bool* check=0) const; + /*! + * \brief Return middle UV taking in account surface period + */ + static gp_XY GetMiddleUV(const Handle(Geom_Surface)& surface, + const gp_XY& uv1, + const gp_XY& uv2); /*! * \brief Check if inFaceNode argument is necessary for call GetNodeUV(F,..) * \retval bool - return true if the face is periodic @@ -317,21 +339,21 @@ public: const SMDS_MeshNode* n2, const bool force3d); /*! - * Auxilary function for filling myNLinkNodeMap + * Auxilary function for filling myTLinkNodeMap */ - void AddNLinkNode(const SMDS_MeshNode* n1, + void AddTLinkNode(const SMDS_MeshNode* n1, const SMDS_MeshNode* n2, const SMDS_MeshNode* n12); /** - * Auxilary function for filling myNLinkNodeMap + * Auxilary function for filling myTLinkNodeMap */ - void AddNLinkNodeMap(const NLinkNodeMap& aMap) - { myNLinkNodeMap.insert(aMap.begin(), aMap.end()); } + void AddTLinkNodeMap(const TLinkNodeMap& aMap) + { myTLinkNodeMap.insert(aMap.begin(), aMap.end()); } /** - * Returns myNLinkNodeMap + * Returns myTLinkNodeMap */ - const NLinkNodeMap& GetNLinkNodeMap() const { return myNLinkNodeMap; } + const TLinkNodeMap& GetTLinkNodeMap() const { return myTLinkNodeMap; } /** * Check mesh without geometry for: if all elements on this shape are quadratic, @@ -357,7 +379,7 @@ protected: SMESH_MesherHelper (const SMESH_MesherHelper& theOther) {}; // special map for using during creation of quadratic elements - NLinkNodeMap myNLinkNodeMap; + TLinkNodeMap myTLinkNodeMap; std::set< int > myDegenShapeIds; std::set< int > mySeamShapeIds; @@ -371,6 +393,7 @@ protected: // to create quadratic elements bool myCreateQuadratic; bool mySetElemOnShape; + bool myCheckNodePos; }; -- 2.39.2