X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FSMESH%2FSMESH_MesherHelper.cxx;h=1bc159afa2d0c95e7811ad26858037e75ba86147;hp=efaf7a853362f95f3f2dc082aec184ab173b4e68;hb=ebb518296392b51b6ca9d80037a12703a160518f;hpb=bd4e115a78b52e3fbc016e5e30bb0e19b2a9e7d6 diff --git a/src/SMESH/SMESH_MesherHelper.cxx b/src/SMESH/SMESH_MesherHelper.cxx index efaf7a853..1bc159afa 100644 --- a/src/SMESH/SMESH_MesherHelper.cxx +++ b/src/SMESH/SMESH_MesherHelper.cxx @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE +// Copyright (C) 2007-2015 CEA/DEN, EDF R&D, OPEN CASCADE // // Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS @@ -6,7 +6,7 @@ // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public // License as published by the Free Software Foundation; either -// version 2.1 of the License. +// version 2.1 of the License, or (at your option) any later version. // // This library is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -26,15 +26,19 @@ // #include "SMESH_MesherHelper.hxx" -#include "SMDS_FacePosition.hxx" #include "SMDS_EdgePosition.hxx" +#include "SMDS_FaceOfNodes.hxx" +#include "SMDS_FacePosition.hxx" +#include "SMDS_IteratorOnIterators.hxx" #include "SMDS_VolumeTool.hxx" -#include "SMESH_subMesh.hxx" +#include "SMESH_Block.hxx" +#include "SMESH_MeshAlgos.hxx" #include "SMESH_ProxyMesh.hxx" +#include "SMESH_subMesh.hxx" +#include #include #include -#include #include #include #include @@ -66,7 +70,7 @@ using namespace std; namespace { - gp_XYZ XYZ(const SMDS_MeshNode* n) { return gp_XYZ(n->X(), n->Y(), n->Z()); } + inline SMESH_TNodeXYZ XYZ(const SMDS_MeshNode* n) { return SMESH_TNodeXYZ(n); } enum { U_periodic = 1, V_periodic = 2 }; } @@ -78,7 +82,11 @@ namespace { //================================================================================ SMESH_MesherHelper::SMESH_MesherHelper(SMESH_Mesh& theMesh) - : myParIndex(0), myMesh(&theMesh), myShapeID(0), myCreateQuadratic(false), + : myParIndex(0), + myMesh(&theMesh), + myShapeID(0), + myCreateQuadratic(false), + myCreateBiQuadratic(false), myFixNodeParameters(false) { myPar1[0] = myPar2[0] = myPar1[1] = myPar2[1] = 0; @@ -158,14 +166,14 @@ bool SMESH_MesherHelper::IsQuadraticSubMesh(const TopoDS_Shape& aSh) } else { // fill TLinkNodeMap - switch ( e->NbNodes() ) { - case 3: + switch ( e->NbCornerNodes() ) { + case 2: AddTLinkNode(e->GetNode(0),e->GetNode(1),e->GetNode(2)); break; - case 6: + case 3: 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: + case 4: 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)); @@ -195,7 +203,7 @@ bool SMESH_MesherHelper::IsQuadraticSubMesh(const TopoDS_Shape& aSh) //======================================================================= //function : SetSubShape -//purpose : Set geomerty to make elements on +//purpose : Set geometry to make elements on //======================================================================= void SMESH_MesherHelper::SetSubShape(const int aShID) @@ -210,7 +218,7 @@ void SMESH_MesherHelper::SetSubShape(const int aShID) //======================================================================= //function : SetSubShape -//purpose : Set geomerty to create elements on +//purpose : Set geometry to create elements on //======================================================================= void SMESH_MesherHelper::SetSubShape(const TopoDS_Shape& aSh) @@ -234,50 +242,97 @@ void SMESH_MesherHelper::SetSubShape(const TopoDS_Shape& aSh) for ( TopExp_Explorer eF( aSh, TopAbs_FACE ); eF.More(); eF.Next() ) { const TopoDS_Face& face = TopoDS::Face( eF.Current() ); - TopLoc_Location loc; - Handle(Geom_Surface) surface = BRep_Tool::Surface( face, loc ); + BRepAdaptor_Surface surf( face, false ); + if ( surf.IsUPeriodic() || surf.IsUClosed() ) { + myParIndex |= U_periodic; + myPar1[0] = surf.FirstUParameter(); + myPar2[0] = surf.LastUParameter(); + } + if ( surf.IsVPeriodic() || surf.IsVClosed() ) { + myParIndex |= V_periodic; + myPar1[1] = surf.FirstVParameter(); + myPar2[1] = surf.LastVParameter(); + } - if ( surface->IsUPeriodic() || surface->IsVPeriodic() || - surface->IsUClosed() || surface->IsVClosed() ) + gp_Pnt2d uv1, uv2; + for (TopExp_Explorer exp( face, TopAbs_EDGE ); exp.More(); exp.Next()) { - //while ( surface->IsKind(STANDARD_TYPE(Geom_RectangularTrimmedSurface ))) - //surface = Handle(Geom_RectangularTrimmedSurface)::DownCast( surface )->BasisSurface(); - GeomAdaptor_Surface surf( surface ); - - for (TopExp_Explorer exp( face, TopAbs_EDGE ); exp.More(); exp.Next()) + // look for a "seam" edge, a real seam or an edge on period boundary + TopoDS_Edge edge = TopoDS::Edge( exp.Current() ); + const int edgeID = meshDS->ShapeToIndex( edge ); + if ( myParIndex ) { - // look for a seam edge - const TopoDS_Edge& edge = TopoDS::Edge( exp.Current() ); - if ( BRep_Tool::IsClosed( edge, face )) { - // initialize myPar1, myPar2 and myParIndex - gp_Pnt2d uv1, uv2; - BRep_Tool::UVPoints( edge, face, uv1, uv2 ); - if ( Abs( uv1.Coord(1) - uv2.Coord(1) ) < Abs( uv1.Coord(2) - uv2.Coord(2) )) + BRep_Tool::UVPoints( edge, face, uv1, uv2 ); + const double du = Abs( uv1.Coord(1) - uv2.Coord(1) ); + const double dv = Abs( uv1.Coord(2) - uv2.Coord(2) ); + + bool isSeam = BRep_Tool::IsClosed( edge, face ); + if ( isSeam ) // real seam - having two pcurves on face + { + // pcurve can lie not on pediod boundary (22582, mesh_Quadratic_01/C9) + if ( du < dv ) { - myParIndex |= U_periodic; - myPar1[0] = surf.FirstUParameter(); - myPar2[0] = surf.LastUParameter(); + double u1 = uv1.Coord(1); + edge.Reverse(); + BRep_Tool::UVPoints( edge, face, uv1, uv2 ); + double u2 = uv1.Coord(1); + myPar1[0] = Min( u1, u2 ); + myPar2[0] = Max( u1, u2 ); } - else { - myParIndex |= V_periodic; - myPar1[1] = surf.FirstVParameter(); - myPar2[1] = surf.LastVParameter(); + else + { + double v1 = uv1.Coord(2); + edge.Reverse(); + BRep_Tool::UVPoints( edge, face, uv1, uv2 ); + double v2 = uv1.Coord(2); + myPar1[1] = Min( v1, v2 ); + myPar2[1] = Max( v1, v2 ); + } + } + else //if ( !isSeam ) + { + // one pcurve but on period boundary (22772, mesh_Quadratic_01/D1) + if (( myParIndex & U_periodic ) && du < Precision::PConfusion() ) + { + isSeam = ( Abs( uv1.Coord(1) - myPar1[0] ) < Precision::PConfusion() || + Abs( uv1.Coord(1) - myPar2[0] ) < Precision::PConfusion() ); + } + else if (( myParIndex & V_periodic ) && dv < Precision::PConfusion() ) + { + isSeam = ( Abs( uv1.Coord(2) - myPar1[1] ) < Precision::PConfusion() || + Abs( uv1.Coord(2) - myPar2[1] ) < Precision::PConfusion() ); + } + if ( isSeam ) // vertices are on period boundary, check a middle point (23032) + { + double f,l, r = 0.2345; + Handle(Geom2d_Curve) C2d = BRep_Tool::CurveOnSurface( edge, face, f, l ); + uv2 = C2d->Value( f * r + l * ( 1.-r )); + if ( du < Precision::PConfusion() ) + isSeam = ( Abs( uv1.Coord(1) - uv2.Coord(1) ) < Precision::PConfusion() ); + else + isSeam = ( Abs( uv1.Coord(2) - uv2.Coord(2) ) < Precision::PConfusion() ); } - // store seam shape indices, negative if shape encounters twice - int edgeID = meshDS->ShapeToIndex( edge ); + } + if ( isSeam ) + { + // store seam shape indices, negative if shape encounters twice ('real seam') mySeamShapeIds.insert( IsSeamShape( edgeID ) ? -edgeID : edgeID ); for ( TopExp_Explorer v( edge, TopAbs_VERTEX ); v.More(); v.Next() ) { int vertexID = meshDS->ShapeToIndex( v.Current() ); mySeamShapeIds.insert( IsSeamShape( vertexID ) ? -vertexID : vertexID ); } } - - // look for a degenerated edge - if ( BRep_Tool::Degenerated( edge )) { - myDegenShapeIds.insert( meshDS->ShapeToIndex( edge )); - for ( TopExp_Explorer v( edge, TopAbs_VERTEX ); v.More(); v.Next() ) - myDegenShapeIds.insert( meshDS->ShapeToIndex( v.Current() )); - } + } + // look for a degenerated edge + if ( SMESH_Algo::isDegenerated( edge )) { + myDegenShapeIds.insert( edgeID ); + for ( TopExp_Explorer v( edge, TopAbs_VERTEX ); v.More(); v.Next() ) + myDegenShapeIds.insert( meshDS->ShapeToIndex( v.Current() )); + } + if ( !BRep_Tool::SameParameter( edge ) || + !BRep_Tool::SameRange( edge )) + { + setPosOnShapeValidity( edgeID, false ); } } } @@ -325,7 +380,7 @@ bool SMESH_MesherHelper::IsMedium(const SMDS_MeshNode* node, TopoDS_Shape SMESH_MesherHelper::GetSubShapeByNode(const SMDS_MeshNode* node, const SMESHDS_Mesh* meshDS) { - int shapeID = node->getshapeId(); + int shapeID = node ? node->getshapeId() : 0; if ( 0 < shapeID && shapeID <= meshDS->MaxShapeIndex() ) return meshDS->IndexToShape( shapeID ); else @@ -353,10 +408,13 @@ void SMESH_MesherHelper::AddTLinkNode(const SMDS_MeshNode* n1, */ //================================================================================ -void SMESH_MesherHelper::AddTLinks(const SMDS_MeshEdge* edge) +bool SMESH_MesherHelper::AddTLinks(const SMDS_MeshEdge* edge) { - if ( edge->IsQuadratic() ) + if ( edge && edge->IsQuadratic() ) AddTLinkNode(edge->GetNode(0), edge->GetNode(1), edge->GetNode(2)); + else + return false; + return true; } //================================================================================ @@ -365,21 +423,35 @@ void SMESH_MesherHelper::AddTLinks(const SMDS_MeshEdge* edge) */ //================================================================================ -void SMESH_MesherHelper::AddTLinks(const SMDS_MeshFace* f) +bool SMESH_MesherHelper::AddTLinks(const SMDS_MeshFace* f) { + bool isQuad = true; if ( !f->IsPoly() ) switch ( f->NbNodes() ) { + case 7: + // myMapWithCentralNode.insert + // ( make_pair( TBiQuad( f->GetNode(0),f->GetNode(1),f->GetNode(2) ), + // f->GetNode(6))); + // break; -- add medium nodes as well case 6: AddTLinkNode(f->GetNode(0),f->GetNode(1),f->GetNode(3)); AddTLinkNode(f->GetNode(1),f->GetNode(2),f->GetNode(4)); AddTLinkNode(f->GetNode(2),f->GetNode(0),f->GetNode(5)); break; + + case 9: + // myMapWithCentralNode.insert + // ( make_pair( TBiQuad( f->GetNode(0),f->GetNode(1),f->GetNode(2),f->GetNode(3) ), + // f->GetNode(8))); + // break; -- add medium nodes as well case 8: AddTLinkNode(f->GetNode(0),f->GetNode(1),f->GetNode(4)); AddTLinkNode(f->GetNode(1),f->GetNode(2),f->GetNode(5)); AddTLinkNode(f->GetNode(2),f->GetNode(3),f->GetNode(6)); - AddTLinkNode(f->GetNode(3),f->GetNode(0),f->GetNode(7)); + AddTLinkNode(f->GetNode(3),f->GetNode(0),f->GetNode(7)); break; default:; + isQuad = false; } + return isQuad; } //================================================================================ @@ -388,7 +460,7 @@ void SMESH_MesherHelper::AddTLinks(const SMDS_MeshFace* f) */ //================================================================================ -void SMESH_MesherHelper::AddTLinks(const SMDS_MeshVolume* volume) +bool SMESH_MesherHelper::AddTLinks(const SMDS_MeshVolume* volume) { if ( volume->IsQuadratic() ) { @@ -403,7 +475,7 @@ void SMESH_MesherHelper::AddTLinks(const SMDS_MeshVolume* volume) { int iN1 = iNodes[i++]; int iN12 = iNodes[i++]; - int iN2 = iNodes[i++]; + int iN2 = iNodes[i]; if ( iN1 > iN2 ) std::swap( iN1, iN2 ); int linkID = iN1 * vTool.NbNodes() + iN2; pair< set::iterator, bool > it_isNew = addedLinks.insert( linkID ); @@ -412,8 +484,19 @@ void SMESH_MesherHelper::AddTLinks(const SMDS_MeshVolume* volume) else addedLinks.erase( it_isNew.first ); // each link encounters only twice } + if ( vTool.NbNodes() == 27 ) + { + const SMDS_MeshNode* nFCenter = nodes[ vTool.GetCenterNodeIndex( iF )]; + if ( nFCenter->GetPosition()->GetTypeOfPosition() == SMDS_TOP_3DSPACE ) + myMapWithCentralNode.insert + ( make_pair( TBiQuad( nodes[ iNodes[0]], nodes[ iNodes[1]], + nodes[ iNodes[2]], nodes[ iNodes[3]] ), + nFCenter )); + } } + return true; } + return false; } //================================================================================ @@ -438,7 +521,10 @@ bool SMESH_MesherHelper::toCheckPosOnShape(int shapeID ) const void SMESH_MesherHelper::setPosOnShapeValidity(int shapeID, bool ok ) const { - ((SMESH_MesherHelper*)this)->myNodePosShapesValidity.insert( make_pair( shapeID, ok)); + std::map< int,bool >::iterator sh_ok = + ((SMESH_MesherHelper*)this)->myNodePosShapesValidity.insert( make_pair( shapeID, ok)).first; + if ( !ok ) + sh_ok->second = ok; } //======================================================================= @@ -456,11 +542,11 @@ void SMESH_MesherHelper::ToFixNodeParameters(bool toFix) //======================================================================= -//function : GetUVOnSeam +//function : getUVOnSeam //purpose : Select UV on either of 2 pcurves of a seam edge, closest to the given UV //======================================================================= -gp_Pnt2d SMESH_MesherHelper::GetUVOnSeam( const gp_Pnt2d& uv1, const gp_Pnt2d& uv2 ) const +gp_Pnt2d SMESH_MesherHelper::getUVOnSeam( const gp_Pnt2d& uv1, const gp_Pnt2d& uv2 ) const { gp_Pnt2d result = uv1; for ( int i = U_periodic; i <= V_periodic ; ++i ) @@ -470,8 +556,8 @@ gp_Pnt2d SMESH_MesherHelper::GetUVOnSeam( const gp_Pnt2d& uv1, const gp_Pnt2d& u double p1 = uv1.Coord( i ); double dp1 = Abs( p1-myPar1[i-1]), dp2 = Abs( p1-myPar2[i-1]); if ( myParIndex == i || - dp1 < ( myPar2[i-1] - myPar2[i-1] ) / 100. || - dp2 < ( myPar2[i-1] - myPar2[i-1] ) / 100. ) + dp1 < ( myPar2[i-1] - myPar1[i-1] ) / 100. || + dp2 < ( myPar2[i-1] - myPar1[i-1] ) / 100. ) { double p2 = uv2.Coord( i ); double p1Alt = ( dp1 < dp2 ) ? myPar2[i-1] : myPar1[i-1]; @@ -494,40 +580,37 @@ gp_XY SMESH_MesherHelper::GetNodeUV(const TopoDS_Face& F, bool* check) const { gp_Pnt2d uv( Precision::Infinite(), Precision::Infinite() ); + const SMDS_PositionPtr Pos = n->GetPosition(); bool uvOK = false; - if(Pos->GetTypeOfPosition()==SMDS_TOP_FACE) + if ( Pos->GetTypeOfPosition() == SMDS_TOP_FACE ) { // node has position on face - const SMDS_FacePosition* fpos = - static_cast(n->GetPosition()); - uv.SetCoord(fpos->GetUParameter(),fpos->GetVParameter()); + const SMDS_FacePosition* fpos = static_cast( Pos ); + uv.SetCoord( fpos->GetUParameter(), fpos->GetVParameter() ); if ( check ) - uvOK = CheckNodeUV( F, n, uv.ChangeCoord(), 10*MaxTolerance( F )); + uvOK = CheckNodeUV( F, n, uv.ChangeCoord(), 2.*getFaceMaxTol( F )); // 2. from 22830 } - else if(Pos->GetTypeOfPosition()==SMDS_TOP_EDGE) + 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 retrieve value from this pcurve - const SMDS_EdgePosition* epos = - static_cast(n->GetPosition()); - int edgeID = n->getshapeId(); - TopoDS_Edge E = TopoDS::Edge(GetMeshDS()->IndexToShape(edgeID)); + // node has position on EDGE => it is needed to find + // corresponding EDGE from FACE, get pcurve for this + // EDGE and retrieve value from this pcurve + const SMDS_EdgePosition* epos = static_cast( Pos ); + const int edgeID = n->getshapeId(); + const TopoDS_Edge& E = TopoDS::Edge( GetMeshDS()->IndexToShape( edgeID )); double f, l, u = epos->GetUParameter(); - Handle(Geom2d_Curve) C2d = BRep_Tool::CurveOnSurface(E, F, f, l); - bool validU = ( f < u && u < l ); - if ( validU ) - uv = C2d->Value( u ); - else - uv.SetCoord( Precision::Infinite(),0.); + Handle(Geom2d_Curve) C2d = BRep_Tool::CurveOnSurface( E, F, f, l ); + bool validU = ( !C2d.IsNull() && ( f < u ) && ( u < l )); + if ( validU ) uv = C2d->Value( u ); + else uv.SetCoord( Precision::Infinite(),0.); if ( check || !validU ) - uvOK = CheckNodeUV( F, n, uv.ChangeCoord(), 10*MaxTolerance( F ),/*force=*/ !validU ); + uvOK = CheckNodeUV( F, n, uv.ChangeCoord(), 2.*getFaceMaxTol( F ),/*force=*/ !validU ); - // for a node on a seam edge select one of UVs on 2 pcurves - if ( n2 && IsSeamShape( edgeID ) ) + // 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, check )); + uv = getUVOnSeam( uv, GetNodeUV( F, n2, 0, check )); } else { // adjust uv to period @@ -535,17 +618,26 @@ gp_XY SMESH_MesherHelper::GetNodeUV(const TopoDS_Face& F, Handle(Geom_Surface) S = BRep_Tool::Surface(F,loc); Standard_Boolean isUPeriodic = S->IsUPeriodic(); Standard_Boolean isVPeriodic = S->IsVPeriodic(); + gp_Pnt2d newUV = uv; 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)); + if ( isUPeriodic ) newUV.SetX( uv.X() + ShapeAnalysis::AdjustToPeriod(uv.X(),UF,UL)); + if ( isVPeriodic ) newUV.SetY( uv.Y() + ShapeAnalysis::AdjustToPeriod(uv.Y(),VF,VL)); + + if ( n2 ) + { + gp_Pnt2d uv2 = GetNodeUV( F, n2, 0, check ); + if ( isUPeriodic && Abs( uv.X()-uv2.X() ) < Abs( newUV.X()-uv2.X() )) + newUV.SetX( uv.X() ); + if ( isVPeriodic && Abs( uv.Y()-uv2.Y() ) < Abs( newUV.Y()-uv2.Y() )) + newUV.SetY( uv.Y() ); + } } + uv = newUV; } } - else if(Pos->GetTypeOfPosition()==SMDS_TOP_VERTEX) + else if ( Pos->GetTypeOfPosition() == SMDS_TOP_VERTEX ) { if ( int vertexID = n->getshapeId() ) { const TopoDS_Vertex& V = TopoDS::Vertex(GetMeshDS()->IndexToShape(vertexID)); @@ -559,14 +651,12 @@ gp_XY SMESH_MesherHelper::GetNodeUV(const TopoDS_Face& F, for ( TopExp_Explorer vert(F,TopAbs_VERTEX); !uvOK && vert.More(); vert.Next() ) uvOK = ( V == vert.Current() ); if ( !uvOK ) { -#ifdef _DEBUG_ MESSAGE ( "SMESH_MesherHelper::GetNodeUV(); Vertex " << vertexID - << " not in face " << GetMeshDS()->ShapeToIndex( F ) ); -#endif + << " not in face " << GetMeshDS()->ShapeToIndex( F ) ); // get UV of a vertex closest to the node double dist = 1e100; gp_Pnt pn = XYZ( n ); - for ( TopExp_Explorer vert(F,TopAbs_VERTEX); !uvOK && vert.More(); vert.Next() ) { + for ( TopExp_Explorer vert( F,TopAbs_VERTEX ); !uvOK && vert.More(); vert.Next() ) { TopoDS_Vertex curV = TopoDS::Vertex( vert.Current() ); gp_Pnt p = BRep_Tool::Pnt( curV ); double curDist = p.SquareDistance( pn ); @@ -595,16 +685,26 @@ gp_XY SMESH_MesherHelper::GetNodeUV(const TopoDS_Face& F, } } } - if ( n2 && IsSeamShape( vertexID ) ) - uv = GetUVOnSeam( uv, GetNodeUV( F, n2, 0 )); + if ( n2 && IsSeamShape( vertexID )) + { + bool isSeam = ( myShape.IsSame( F )); + if ( !isSeam ) { + SMESH_MesherHelper h( *myMesh ); + h.SetSubShape( F ); + isSeam = IsSeamShape( vertexID ); + } + + if ( isSeam ) + uv = getUVOnSeam( uv, GetNodeUV( F, n2, 0 )); + } } } else { - uvOK = CheckNodeUV( F, n, uv.ChangeCoord(), 10*MaxTolerance( F )); + uvOK = CheckNodeUV( F, n, uv.ChangeCoord(), 2.*getFaceMaxTol( F )); } - if ( check ) + if ( check && !uvOK ) *check = uvOK; return uv.XY(); @@ -622,9 +722,12 @@ bool SMESH_MesherHelper::CheckNodeUV(const TopoDS_Face& F, const bool force, double distXYZ[4]) const { - int shapeID = n->getshapeId(); - bool infinit = ( Precision::IsInfinite( uv.X() ) || Precision::IsInfinite( uv.Y() )); - if ( force || toCheckPosOnShape( shapeID ) || infinit ) + int shapeID = n->getshapeId(); + bool infinit; + if (( infinit = ( Precision::IsInfinite( uv.X() ) || Precision::IsInfinite( uv.Y() ))) || + ( force ) || + ( uv.X() == 0. && uv.Y() == 0. ) || + ( toCheckPosOnShape( shapeID ))) { // check that uv is correct TopLoc_Location loc; @@ -669,7 +772,7 @@ bool SMESH_MesherHelper::CheckNodeUV(const TopoDS_Face& F, const_cast(n)->SetPosition ( SMDS_PositionPtr( new SMDS_FacePosition( U, V ))); } - else if ( uv.Modulus() > numeric_limits::min() ) + else if ( myShape.IsSame(F) && uv.Modulus() > numeric_limits::min() ) { setPosOnShapeValidity( shapeID, true ); } @@ -768,6 +871,34 @@ gp_XY SMESH_MesherHelper::GetMiddleUV(const Handle(Geom_Surface)& surface, return applyIn2D( surf, p1, p2, & AverageUV ); } +//======================================================================= +//function : GetCenterUV +//purpose : Return UV for the central node of a biquadratic triangle +//======================================================================= + +gp_XY SMESH_MesherHelper::GetCenterUV(const gp_XY& uv1, + const gp_XY& uv2, + const gp_XY& uv3, + const gp_XY& uv12, + const gp_XY& uv23, + const gp_XY& uv31, + bool * isBadTria/*=0*/) +{ + bool badTria; + gp_XY uvAvg = ( uv12 + uv23 + uv31 ) / 3.; + + if (( badTria = (( uvAvg - uv1 ) * ( uvAvg - uv23 ) > 0 ))) + uvAvg = ( uv1 + uv23 ) / 2.; + else if (( badTria = (( uvAvg - uv2 ) * ( uvAvg - uv31 ) > 0 ))) + uvAvg = ( uv2 + uv31 ) / 2.; + else if (( badTria = (( uvAvg - uv3 ) * ( uvAvg - uv12 ) > 0 ))) + uvAvg = ( uv3 + uv12 ) / 2.; + + if ( isBadTria ) + *isBadTria = badTria; + return uvAvg; +} + //======================================================================= //function : GetNodeU //purpose : Return node U on edge @@ -776,9 +907,10 @@ gp_XY SMESH_MesherHelper::GetMiddleUV(const Handle(Geom_Surface)& surface, double SMESH_MesherHelper::GetNodeU(const TopoDS_Edge& E, const SMDS_MeshNode* n, const SMDS_MeshNode* inEdgeNode, - bool* check) + bool* check) const { - double param = 0; + double param = Precision::Infinite(); + const SMDS_PositionPtr pos = n->GetPosition(); if ( pos->GetTypeOfPosition()==SMDS_TOP_EDGE ) { @@ -828,8 +960,12 @@ bool SMESH_MesherHelper::CheckNodeU(const TopoDS_Edge& E, const bool force, double distXYZ[4]) const { - int shapeID = n->getshapeId(); - if ( force || toCheckPosOnShape( shapeID )) + int shapeID = n->getshapeId(); + bool infinit; + if (( infinit = Precision::IsInfinite( u )) || + ( force ) || + ( u == 0. ) || + ( toCheckPosOnShape( shapeID ))) { TopLoc_Location loc; double f,l; Handle(Geom_Curve) curve = BRep_Tool::Curve( E,loc,f,l ); @@ -845,12 +981,17 @@ bool SMESH_MesherHelper::CheckNodeU(const TopoDS_Edge& E, { gp_Pnt nodePnt = SMESH_TNodeXYZ( n ); if ( !loc.IsIdentity() ) nodePnt.Transform( loc.Transformation().Inverted() ); - gp_Pnt curvPnt = curve->Value( u ); - double dist = nodePnt.Distance( curvPnt ); - if ( distXYZ ) { - curvPnt.Transform( loc ); - distXYZ[0] = dist; - distXYZ[1] = curvPnt.X(); distXYZ[2] = curvPnt.Y(); distXYZ[3]=curvPnt.Z(); + gp_Pnt curvPnt; + double dist = 2*tol; + if ( !infinit ) + { + curvPnt = curve->Value( u ); + dist = nodePnt.Distance( curvPnt ); + if ( distXYZ ) { + curvPnt.Transform( loc ); + distXYZ[0] = dist; + distXYZ[1] = curvPnt.X(); distXYZ[2] = curvPnt.Y(); distXYZ[3]=curvPnt.Z(); + } } if ( dist > tol ) { @@ -874,6 +1015,7 @@ bool SMESH_MesherHelper::CheckNodeU(const TopoDS_Edge& E, } Quantity_Parameter U = projector->LowerDistanceParameter(); u = double( U ); + MESSAGE(" f " << f << " l " << l << " u " << u); curvPnt = curve->Value( u ); dist = nodePnt.Distance( curvPnt ); if ( distXYZ ) { @@ -898,6 +1040,7 @@ bool SMESH_MesherHelper::CheckNodeU(const TopoDS_Edge& E, } if (( u < f-tol || u > l+tol ) && force ) { + MESSAGE("u < f-tol || u > l+tol ; u " << u << " f " << f << " l " << l); // node is on vertex but is set on periodic but trimmed edge (issue 0020890) try { @@ -918,12 +1061,26 @@ bool SMESH_MesherHelper::CheckNodeU(const TopoDS_Edge& E, //======================================================================= //function : GetMediumPos //purpose : Return index and type of the shape (EDGE or FACE only) to -// set a medium node on +// set a medium node on +//param : useCurSubShape - if true, returns the shape set via SetSubShape() +// if any +//param : expectedSupport - shape type corresponding to element being created, +// e.g TopAbs_EDGE if SMDSAbs_Edge is created +// basing on \a n1 and \a n2 +// Calling GetMediumPos() with useCurSubShape=true is OK only for the +// case where the lower dim mesh is already constructed and converted to quadratic, +// else, nodes on EDGEs are assigned to FACE, for example. //======================================================================= -std::pair SMESH_MesherHelper::GetMediumPos(const SMDS_MeshNode* n1, - const SMDS_MeshNode* n2) +std::pair +SMESH_MesherHelper::GetMediumPos(const SMDS_MeshNode* n1, + const SMDS_MeshNode* n2, + const bool useCurSubShape, + TopAbs_ShapeEnum expectedSupport) { + if ( useCurSubShape && !myShape.IsNull() ) + return std::make_pair( myShapeID, myShape.ShapeType() ); + TopAbs_ShapeEnum shapeType = TopAbs_SHAPE; int shapeID = -1; TopoDS_Shape shape; @@ -938,17 +1095,19 @@ std::pair SMESH_MesherHelper::GetMediumPos(const SMDS_Mes shapeID = n2->getshapeId(); shape = GetSubShapeByNode( n1, GetMeshDS() ); } - else + else // 2 different shapes { const SMDS_TypeOfPosition Pos1 = n1->GetPosition()->GetTypeOfPosition(); const SMDS_TypeOfPosition Pos2 = n2->GetPosition()->GetTypeOfPosition(); if ( Pos1 == SMDS_TOP_3DSPACE || Pos2 == SMDS_TOP_3DSPACE ) { + // in SOLID } else if ( Pos1 == SMDS_TOP_FACE || Pos2 == SMDS_TOP_FACE ) { - if ( Pos1 != SMDS_TOP_FACE || Pos2 != SMDS_TOP_FACE ) + // in FACE or SOLID + if ( Pos1 != SMDS_TOP_FACE || Pos2 != SMDS_TOP_FACE ) // not 2 FACEs { if ( Pos1 != SMDS_TOP_FACE ) std::swap( n1,n2 ); TopoDS_Shape F = GetSubShapeByNode( n1, GetMeshDS() ); @@ -973,7 +1132,7 @@ std::pair SMESH_MesherHelper::GetMediumPos(const SMDS_Mes shape = GetCommonAncestor( V1, V2, *myMesh, TopAbs_EDGE ); if ( shape.IsNull() ) shape = GetCommonAncestor( V1, V2, *myMesh, TopAbs_FACE ); } - else // VERTEX and EDGE + else // on VERTEX and EDGE { if ( Pos1 != SMDS_TOP_VERTEX ) std::swap( n1,n2 ); TopoDS_Shape V = GetSubShapeByNode( n1, GetMeshDS() ); @@ -989,19 +1148,344 @@ std::pair SMESH_MesherHelper::GetMediumPos(const SMDS_Mes { if ( shapeID < 1 ) shapeID = GetMeshDS()->ShapeToIndex( shape ); - shapeType = shape.ShapeType(); + shapeType = shape.ShapeType(); // EDGE or FACE + + if ( expectedSupport < shapeType && + expectedSupport != TopAbs_SHAPE && + !myShape.IsNull() && + myShape.ShapeType() == expectedSupport ) + { + // e.g. a side of triangle connects nodes on the same EDGE but does not + // lie on this EDGE (an arc with a coarse mesh) + // => shapeType == TopAbs_EDGE, expectedSupport == TopAbs_FACE; + // hope that myShape is a right shape, return it if the found shape + // has converted elements of corresponding dim (segments in our example) + int nbConvertedElems = 0; + SMDSAbs_ElementType type = ( shapeType == TopAbs_FACE ? SMDSAbs_Face : SMDSAbs_Edge ); + for ( int iN = 0; iN < 2; ++iN ) + { + const SMDS_MeshNode* n = iN ? n2 : n1; + SMDS_ElemIteratorPtr it = n->GetInverseElementIterator( type ); + while ( it->more() ) + { + const SMDS_MeshElement* elem = it->next(); + if ( elem->getshapeId() == shapeID && + elem->IsQuadratic() ) + { + ++nbConvertedElems; + break; + } + } + } + if ( nbConvertedElems == 2 ) + { + shapeType = myShape.ShapeType(); + shapeID = myShapeID; + } + } } return make_pair( shapeID, shapeType ); } +//======================================================================= +//function : GetCentralNode +//purpose : Return existing or create a new central node for a quardilateral +// quadratic face given its 8 nodes. +//@param : force3d - true means node creation in between the given nodes, +// else node position is found on a geometrical face if any. +//======================================================================= + +const SMDS_MeshNode* SMESH_MesherHelper::GetCentralNode(const SMDS_MeshNode* n1, + const SMDS_MeshNode* n2, + const SMDS_MeshNode* n3, + const SMDS_MeshNode* n4, + const SMDS_MeshNode* n12, + const SMDS_MeshNode* n23, + const SMDS_MeshNode* n34, + const SMDS_MeshNode* n41, + bool force3d) +{ + SMDS_MeshNode *centralNode = 0; // central node to return + + // Find an existing central node + + TBiQuad keyOfMap(n1,n2,n3,n4); + std::map::iterator itMapCentralNode; + itMapCentralNode = myMapWithCentralNode.find( keyOfMap ); + if ( itMapCentralNode != myMapWithCentralNode.end() ) + { + return (*itMapCentralNode).second; + } + + // Get type of shape for the new central node + + TopAbs_ShapeEnum shapeType = TopAbs_SHAPE; + int solidID = -1; + int faceID = -1; + TopoDS_Shape shape; + TopTools_ListIteratorOfListOfShape it; + + std::map< int, int > faceId2nbNodes; + std::map< int, int > ::iterator itMapWithIdFace; + + SMESHDS_Mesh* meshDS = GetMeshDS(); + + // check if a face lies on a FACE, i.e. its all corner nodes lie either on the FACE or + // on sub-shapes of the FACE + if ( GetMesh()->HasShapeToMesh() ) + { + const SMDS_MeshNode* nodes[] = { n1, n2, n3, n4 }; + for(int i = 0; i < 4; i++) + { + shape = GetSubShapeByNode( nodes[i], meshDS ); + if ( shape.IsNull() ) break; + if ( shape.ShapeType() == TopAbs_SOLID ) + { + solidID = nodes[i]->getshapeId(); + shapeType = TopAbs_SOLID; + break; + } + if ( shape.ShapeType() == TopAbs_FACE ) + { + faceID = nodes[i]->getshapeId(); + itMapWithIdFace = faceId2nbNodes.insert( std::make_pair( faceID, 0 ) ).first; + itMapWithIdFace->second++; + } + else + { + PShapeIteratorPtr it = GetAncestors( shape, *GetMesh(), TopAbs_FACE ); + while ( const TopoDS_Shape* face = it->next() ) + { + faceID = meshDS->ShapeToIndex( *face ); + itMapWithIdFace = faceId2nbNodes.insert( std::make_pair( faceID, 0 )).first; + itMapWithIdFace->second++; + } + } + } + } + if ( solidID < 1 && !faceId2nbNodes.empty() ) // SOLID not found + { + // find ID of the FACE the four corner nodes belong to + itMapWithIdFace = faceId2nbNodes.begin(); + for ( ; itMapWithIdFace != faceId2nbNodes.end(); ++itMapWithIdFace) + { + if ( itMapWithIdFace->second == 4 ) + { + shapeType = TopAbs_FACE; + faceID = (*itMapWithIdFace).first; + break; + } + } + } + + TopoDS_Face F; + if ( shapeType == TopAbs_FACE ) + { + F = TopoDS::Face( meshDS->IndexToShape( faceID )); + } + + // Create a node + + gp_XY uvAvg; + gp_Pnt P; + bool toCheck = true; + if ( !F.IsNull() && !force3d ) + { + uvAvg = calcTFI (0.5, 0.5, + GetNodeUV(F,n1,n3,&toCheck), GetNodeUV(F,n2,n4,&toCheck), + GetNodeUV(F,n3,n1,&toCheck), GetNodeUV(F,n4,n2,&toCheck), + GetNodeUV(F,n12,n3), GetNodeUV(F,n23,n4), + GetNodeUV(F,n34,n2), GetNodeUV(F,n41,n2)); + TopLoc_Location loc; + Handle( Geom_Surface ) S = BRep_Tool::Surface( F, loc ); + P = S->Value( uvAvg.X(), uvAvg.Y() ).Transformed( loc ); + centralNode = meshDS->AddNode( P.X(), P.Y(), P.Z() ); + // if ( mySetElemOnShape ) node is not elem! + meshDS->SetNodeOnFace( centralNode, faceID, uvAvg.X(), uvAvg.Y() ); + } + else // ( force3d || F.IsNull() ) + { + P = calcTFI (0.5, 0.5, + SMESH_TNodeXYZ(n1), SMESH_TNodeXYZ(n2), + SMESH_TNodeXYZ(n3), SMESH_TNodeXYZ(n4), + SMESH_TNodeXYZ(n12), SMESH_TNodeXYZ(n23), + SMESH_TNodeXYZ(n34), SMESH_TNodeXYZ(n41)); + centralNode = meshDS->AddNode( P.X(), P.Y(), P.Z() ); + + if ( !F.IsNull() ) // force3d + { + uvAvg = (GetNodeUV(F,n1,n3,&toCheck) + + GetNodeUV(F,n2,n4,&toCheck) + + GetNodeUV(F,n3,n1,&toCheck) + + GetNodeUV(F,n4,n2,&toCheck)) / 4; + //CheckNodeUV( F, centralNode, uvAvg, 2*BRep_Tool::Tolerance( F ), /*force=*/true); + meshDS->SetNodeOnFace( centralNode, faceID, uvAvg.X(), uvAvg.Y() ); + } + else if ( solidID > 0 ) + { + meshDS->SetNodeInVolume( centralNode, solidID ); + } + else if ( myShapeID > 0 && mySetElemOnShape ) + { + meshDS->SetMeshElementOnShape( centralNode, myShapeID ); + } + } + myMapWithCentralNode.insert( std::make_pair( keyOfMap, centralNode ) ); + return centralNode; +} + +//======================================================================= +//function : GetCentralNode +//purpose : Return existing or create a new central node for a +// quadratic triangle given its 6 nodes. +//@param : force3d - true means node creation in between the given nodes, +// else node position is found on a geometrical face if any. +//======================================================================= + +const SMDS_MeshNode* SMESH_MesherHelper::GetCentralNode(const SMDS_MeshNode* n1, + const SMDS_MeshNode* n2, + const SMDS_MeshNode* n3, + const SMDS_MeshNode* n12, + const SMDS_MeshNode* n23, + const SMDS_MeshNode* n31, + bool force3d) +{ + SMDS_MeshNode *centralNode = 0; // central node to return + + // Find an existing central node + + TBiQuad keyOfMap(n1,n2,n3); + std::map::iterator itMapCentralNode; + itMapCentralNode = myMapWithCentralNode.find( keyOfMap ); + if ( itMapCentralNode != myMapWithCentralNode.end() ) + { + return (*itMapCentralNode).second; + } + + // Get type of shape for the new central node + + TopAbs_ShapeEnum shapeType = TopAbs_SHAPE; + int solidID = -1; + int faceID = -1; + TopoDS_Shape shape; + TopTools_ListIteratorOfListOfShape it; + + std::map< int, int > faceId2nbNodes; + std::map< int, int > ::iterator itMapWithIdFace; + + SMESHDS_Mesh* meshDS = GetMeshDS(); + + // check if a face lies on a FACE, i.e. its all corner nodes lie either on the FACE or + // on sub-shapes of the FACE + if ( GetMesh()->HasShapeToMesh() ) + { + const SMDS_MeshNode* nodes[] = { n1, n2, n3 }; + for(int i = 0; i < 3; i++) + { + shape = GetSubShapeByNode( nodes[i], meshDS ); + if ( shape.IsNull() ) break; + if ( shape.ShapeType() == TopAbs_SOLID ) + { + solidID = nodes[i]->getshapeId(); + shapeType = TopAbs_SOLID; + break; + } + if ( shape.ShapeType() == TopAbs_FACE ) + { + faceID = nodes[i]->getshapeId(); + itMapWithIdFace = faceId2nbNodes.insert( std::make_pair( faceID, 0 ) ).first; + itMapWithIdFace->second++; + } + else + { + PShapeIteratorPtr it = GetAncestors(shape, *GetMesh(), TopAbs_FACE ); + while ( const TopoDS_Shape* face = it->next() ) + { + faceID = meshDS->ShapeToIndex( *face ); + itMapWithIdFace = faceId2nbNodes.insert( std::make_pair( faceID, 0 ) ).first; + itMapWithIdFace->second++; + } + } + } + } + if ( solidID < 1 && !faceId2nbNodes.empty() ) // SOLID not found + { + // find ID of the FACE the four corner nodes belong to + itMapWithIdFace = faceId2nbNodes.begin(); + for ( ; itMapWithIdFace != faceId2nbNodes.end(); ++itMapWithIdFace) + { + if ( itMapWithIdFace->second == 3 ) + { + shapeType = TopAbs_FACE; + faceID = (*itMapWithIdFace).first; + break; + } + } + } + + TopoDS_Face F; + gp_XY uvAvg; + + if ( shapeType == TopAbs_FACE ) + { + F = TopoDS::Face( meshDS->IndexToShape( faceID )); + bool checkOK = true, badTria = false; + gp_XY uv1 = GetNodeUV( F, n1, n23, &checkOK ); + gp_XY uv2 = GetNodeUV( F, n2, n31, &checkOK ); + gp_XY uv3 = GetNodeUV( F, n3, n12, &checkOK ); + gp_XY uv12 = GetNodeUV( F, n12, n3, &checkOK ); + gp_XY uv23 = GetNodeUV( F, n23, n1, &checkOK ); + gp_XY uv31 = GetNodeUV( F, n31, n2, &checkOK ); + uvAvg = GetCenterUV( uv1,uv2,uv3, uv12,uv23,uv31, &badTria ); + if ( badTria || !checkOK ) + force3d = true; + } + + // Create a central node + + gp_Pnt P; + if ( !F.IsNull() && !force3d ) + { + TopLoc_Location loc; + Handle( Geom_Surface ) S = BRep_Tool::Surface( F, loc ); + P = S->Value( uvAvg.X(), uvAvg.Y() ).Transformed( loc ); + centralNode = meshDS->AddNode( P.X(), P.Y(), P.Z() ); + // if ( mySetElemOnShape ) node is not elem! + meshDS->SetNodeOnFace( centralNode, faceID, uvAvg.X(), uvAvg.Y() ); + } + else // ( force3d || F.IsNull() ) + { + P = ( SMESH_TNodeXYZ( n12 ) + + SMESH_TNodeXYZ( n23 ) + + SMESH_TNodeXYZ( n31 ) ) / 3; + centralNode = meshDS->AddNode( P.X(), P.Y(), P.Z() ); + + if ( !F.IsNull() ) // force3d + { + meshDS->SetNodeOnFace( centralNode, faceID, uvAvg.X(), uvAvg.Y() ); + } + else if ( solidID > 0 ) + { + meshDS->SetNodeInVolume( centralNode, solidID ); + } + else if ( myShapeID > 0 && mySetElemOnShape ) + { + meshDS->SetMeshElementOnShape( centralNode, myShapeID ); + } + } + myMapWithCentralNode.insert( std::make_pair( keyOfMap, centralNode ) ); + return centralNode; +} + //======================================================================= //function : GetMediumNode -//purpose : Return existing or create new medium nodes between given ones +//purpose : Return existing or create a new medium node between given ones //======================================================================= const SMDS_MeshNode* SMESH_MesherHelper::GetMediumNode(const SMDS_MeshNode* n1, const SMDS_MeshNode* n2, - bool force3d) + bool force3d, + TopAbs_ShapeEnum expectedSupport) { // Find existing node @@ -1024,9 +1508,10 @@ const SMDS_MeshNode* SMESH_MesherHelper::GetMediumNode(const SMDS_MeshNode* n1, int faceID = -1, edgeID = -1; TopoDS_Edge E; double u [2]; TopoDS_Face F; gp_XY uv[2]; - bool uvOK[2] = { false, false }; + bool uvOK[2] = { true, true }; + const bool useCurSubShape = ( !myShape.IsNull() && myShape.ShapeType() == TopAbs_EDGE ); - pair pos = GetMediumPos( n1, n2 ); + pair pos = GetMediumPos( n1, n2, useCurSubShape, expectedSupport ); // get positions of the given nodes on shapes if ( pos.second == TopAbs_FACE ) @@ -1047,8 +1532,16 @@ const SMDS_MeshNode* SMESH_MesherHelper::GetMediumNode(const SMDS_MeshNode* n1, return getMediumNodeOnComposedWire(n1,n2,force3d); } E = TopoDS::Edge(meshDS->IndexToShape( edgeID = pos.first )); - u[0] = GetNodeU(E,n1,n2, force3d ? 0 : &uvOK[0]); - u[1] = GetNodeU(E,n2,n1, force3d ? 0 : &uvOK[1]); + try { + u[0] = GetNodeU(E,n1,n2, force3d ? 0 : &uvOK[0]); + u[1] = GetNodeU(E,n2,n1, force3d ? 0 : &uvOK[1]); + } + catch ( Standard_Failure& f ) + { + // issue 22502 / a node is on VERTEX not belonging to E + // issue 22568 / both nodes are on non-connected VERTEXes + return getMediumNodeOnComposedWire(n1,n2,force3d); + } } if ( !force3d & uvOK[0] && uvOK[1] ) @@ -1067,12 +1560,12 @@ const SMDS_MeshNode* SMESH_MesherHelper::GetMediumNode(const SMDS_MeshNode* n1, if ( myParIndex & U_periodic ) uv[1].SetCoord( 1, uv[0].Coord( 1 )); else uv[1].SetCoord( 2, uv[0].Coord( 2 )); } - TopLoc_Location loc; Handle(Geom_Surface) S = BRep_Tool::Surface(F,loc); gp_XY UV = GetMiddleUV( S, uv[0], uv[1] ); gp_Pnt P = S->Value( UV.X(), UV.Y() ).Transformed(loc); n12 = meshDS->AddNode(P.X(), P.Y(), P.Z()); + // if ( mySetElemOnShape ) node is not elem! meshDS->SetNodeOnFace(n12, faceID, UV.X(), UV.Y()); myTLinkNodeMap.insert(make_pair(link,n12)); return n12; @@ -1097,6 +1590,7 @@ const SMDS_MeshNode* SMESH_MesherHelper::GetMediumNode(const SMDS_MeshNode* n1, gp_Pnt P = C->Value( U ); n12 = meshDS->AddNode(P.X(), P.Y(), P.Z()); + //if ( mySetElemOnShape ) node is not elem! meshDS->SetNodeOnEdge(n12, edgeID, U); myTLinkNodeMap.insert(make_pair(link,n12)); return n12; @@ -1110,21 +1604,24 @@ const SMDS_MeshNode* SMESH_MesherHelper::GetMediumNode(const SMDS_MeshNode* n1, double z = ( n1->Z() + n2->Z() )/2.; n12 = meshDS->AddNode(x,y,z); - if ( !F.IsNull() ) - { - gp_XY UV = ( uv[0] + uv[1] ) / 2.; - CheckNodeUV( F, n12, UV, 2*BRep_Tool::Tolerance( F ), /*force=*/true); - meshDS->SetNodeOnFace(n12, faceID, UV.X(), UV.Y() ); - } - else if ( !E.IsNull() ) + //if ( mySetElemOnShape ) node is not elem! { - double U = ( u[0] + u[1] ) / 2.; - CheckNodeU( E, n12, U, 2*BRep_Tool::Tolerance( E ), /*force=*/true); - meshDS->SetNodeOnEdge(n12, edgeID, U); - } - else if ( myShapeID > 0 ) - { - meshDS->SetNodeInVolume(n12, myShapeID); + if ( !F.IsNull() ) + { + gp_XY UV = ( uv[0] + uv[1] ) / 2.; + CheckNodeUV( F, n12, UV, 2 * BRep_Tool::Tolerance( F ), /*force=*/true); + meshDS->SetNodeOnFace(n12, faceID, UV.X(), UV.Y() ); + } + else if ( !E.IsNull() ) + { + double U = ( u[0] + u[1] ) / 2.; + CheckNodeU( E, n12, U, 2 * BRep_Tool::Tolerance( E ), /*force=*/true); + meshDS->SetNodeOnEdge(n12, edgeID, U); + } + else if ( myShapeID > 0 && mySetElemOnShape ) + { + meshDS->SetMeshElementOnShape(n12, myShapeID); + } } myTLinkNodeMap.insert( make_pair( link, n12 )); @@ -1141,63 +1638,109 @@ const SMDS_MeshNode* SMESH_MesherHelper::getMediumNodeOnComposedWire(const SMDS_ const SMDS_MeshNode* n2, bool force3d) { - gp_Pnt middle = 0.5 * XYZ(n1) + 0.5 * XYZ(n2); + SMESH_TNodeXYZ p1( n1 ), p2( n2 ); + gp_Pnt middle = 0.5 * p1 + 0.5 * p2; SMDS_MeshNode* n12 = AddNode( middle.X(), middle.Y(), middle.Z() ); // To find position on edge and 3D position for n12, // project to 2 edges and select projection most close to - double u = 0, distMiddleProj = Precision::Infinite(), distXYZ[4]; - int iOkEdge = 0; - TopoDS_Edge edges[2]; + TopoDS_Edge bestEdge; + double u = 0, distMiddleProj = Precision::Infinite(), distXYZ[4], f,l; + + // get shapes under the nodes + TopoDS_Shape shape[2]; + int nbShapes = 0; for ( int is2nd = 0; is2nd < 2; ++is2nd ) { - // get an edge const SMDS_MeshNode* n = is2nd ? n2 : n1; - TopoDS_Shape shape = GetSubShapeByNode( n, GetMeshDS() ); - if ( shape.IsNull() || shape.ShapeType() != TopAbs_EDGE ) - continue; + TopoDS_Shape S = GetSubShapeByNode( n, GetMeshDS() ); + if ( !S.IsNull() ) + shape[ nbShapes++ ] = S; + } + // get EDGEs + vector< TopoDS_Shape > edges; + for ( int iS = 0; iS < nbShapes; ++iS ) + { + switch ( shape[iS].ShapeType() ) { + case TopAbs_EDGE: + { + edges.push_back( shape[iS] ); + break; + } + case TopAbs_VERTEX: + { + TopoDS_Shape edge; + if ( nbShapes == 2 && iS==0 && shape[1-iS].ShapeType() == TopAbs_VERTEX ) + edge = GetCommonAncestor( shape[iS], shape[1-iS], *myMesh, TopAbs_EDGE ); - // project to get U of projection and distance from middle to projection - TopoDS_Edge edge = edges[ is2nd ] = TopoDS::Edge( shape ); - double node2MiddleDist = middle.Distance( XYZ(n) ); - double foundU = GetNodeU( edge, n ); - CheckNodeU( edge, n12, foundU, 2*BRep_Tool::Tolerance(edge), /*force=*/true, distXYZ ); - if ( distXYZ[0] < node2MiddleDist ) + if ( edge.IsNull() ) + { + PShapeIteratorPtr eIt = GetAncestors( shape[iS], *myMesh, TopAbs_EDGE ); + while( const TopoDS_Shape* e = eIt->next() ) + edges.push_back( *e ); + } + break; + } + case TopAbs_FACE: { - distMiddleProj = distXYZ[0]; - u = foundU; - iOkEdge = is2nd; + if ( nbShapes == 1 || shape[1-iS].ShapeType() < TopAbs_EDGE ) + for ( TopExp_Explorer e( shape[iS], TopAbs_EDGE ); e.More(); e.Next() ) + edges.push_back( e.Current() ); + break; + } + default: + continue; } } - if ( Precision::IsInfinite( distMiddleProj )) + // project to get U of projection and distance from middle to projection + for ( size_t iE = 0; iE < edges.size(); ++iE ) { - // both projections failed; set n12 on the edge of n1 with U of a common vertex - TopoDS_Vertex vCommon; - if ( TopExp::CommonVertex( edges[0], edges[1], vCommon )) - u = BRep_Tool::Parameter( vCommon, edges[0] ); - else + const TopoDS_Edge& edge = TopoDS::Edge( edges[ iE ]); + distXYZ[0] = distMiddleProj; + double testU = 0; + CheckNodeU( edge, n12, testU, 2 * BRep_Tool::Tolerance(edge), /*force=*/true, distXYZ ); + if ( distXYZ[0] < distMiddleProj ) { - double f,l, u0 = GetNodeU( edges[0], n1 ); - BRep_Tool::Range( edges[0],f,l ); - u = ( fabs(u0-f) < fabs(u0-l) ) ? f : l; + distMiddleProj = distXYZ[0]; + u = testU; + bestEdge = edge; } - iOkEdge = 0; - distMiddleProj = 0; } - - // move n12 to position of a successfull projection - double tol = BRep_Tool::Tolerance(edges[ iOkEdge ]); - if ( !force3d && distMiddleProj > 2*tol ) + // { + // // both projections failed; set n12 on the edge of n1 with U of a common vertex + // TopoDS_Vertex vCommon; + // if ( TopExp::CommonVertex( edges[0], edges[1], vCommon )) + // u = BRep_Tool::Parameter( vCommon, edges[0] ); + // else + // { + // double f,l, u0 = GetNodeU( edges[0], n1 ); + // BRep_Tool::Range( edges[0],f,l ); + // u = ( fabs(u0-f) < fabs(u0-l) ) ? f : l; + // } + // iOkEdge = 0; + // distMiddleProj = 0; + // } + + if ( !bestEdge.IsNull() ) { - TopLoc_Location loc; double f,l; - Handle(Geom_Curve) curve = BRep_Tool::Curve( edges[iOkEdge],loc,f,l ); - gp_Pnt p = curve->Value( u ); - GetMeshDS()->MoveNode( n12, p.X(), p.Y(), p.Z() ); + // move n12 to position of a successfull projection + //double tol = BRep_Tool::Tolerance(edges[ iOkEdge ]); + if ( !force3d /*&& distMiddleProj > 2*tol*/ ) + { + TopLoc_Location loc; + Handle(Geom_Curve) curve = BRep_Tool::Curve( bestEdge,loc,f,l ); + gp_Pnt p = curve->Value( u ).Transformed( loc ); + GetMeshDS()->MoveNode( n12, p.X(), p.Y(), p.Z() ); + } + //if ( mySetElemOnShape ) node is not elem! + { + int edgeID = GetMeshDS()->ShapeToIndex( bestEdge ); + if ( edgeID != n12->getshapeId() ) + GetMeshDS()->UnSetNodeOnShape( n12 ); + GetMeshDS()->SetNodeOnEdge(n12, edgeID, u); + } } - - GetMeshDS()->SetNodeOnEdge(n12, edges[iOkEdge], u); - myTLinkNodeMap.insert( make_pair( SMESH_TLink(n1,n2), n12 )); return n12; @@ -1217,7 +1760,7 @@ SMDS_MeshNode* SMESH_MesherHelper::AddNode(double x, double y, double z, int ID, node = meshDS->AddNodeWithID( x, y, z, ID ); else node = meshDS->AddNode( x, y, z ); - if ( mySetElemOnShape && myShapeID > 0 ) { + if ( mySetElemOnShape && myShapeID > 0 ) { // node is not elem ? switch ( myShape.ShapeType() ) { case TopAbs_SOLID: meshDS->SetNodeInVolume( node, myShapeID); break; case TopAbs_SHELL: meshDS->SetNodeInVolume( node, myShapeID); break; @@ -1287,14 +1830,24 @@ SMDS_MeshFace* SMESH_MesherHelper::AddFace(const SMDS_MeshNode* n1, elem = meshDS->AddFace(n1, n2, n3); } else { - const SMDS_MeshNode* n12 = GetMediumNode(n1,n2,force3d); - const SMDS_MeshNode* n23 = GetMediumNode(n2,n3,force3d); - const SMDS_MeshNode* n31 = GetMediumNode(n3,n1,force3d); - - if(id) - elem = meshDS->AddFaceWithID(n1, n2, n3, n12, n23, n31, id); + const SMDS_MeshNode* n12 = GetMediumNode( n1, n2, force3d, TopAbs_FACE ); + const SMDS_MeshNode* n23 = GetMediumNode( n2, n3, force3d, TopAbs_FACE ); + const SMDS_MeshNode* n31 = GetMediumNode( n3, n1, force3d, TopAbs_FACE ); + if(myCreateBiQuadratic) + { + const SMDS_MeshNode* nCenter = GetCentralNode(n1, n2, n3, n12, n23, n31, force3d); + if(id) + elem = meshDS->AddFaceWithID(n1, n2, n3, n12, n23, n31, nCenter, id); + else + elem = meshDS->AddFace(n1, n2, n3, n12, n23, n31, nCenter); + } else - elem = meshDS->AddFace(n1, n2, n3, n12, n23, n31); + { + if(id) + elem = meshDS->AddFaceWithID(n1, n2, n3, n12, n23, n31, id); + else + elem = meshDS->AddFace(n1, n2, n3, n12, n23, n31); + } } if ( mySetElemOnShape && myShapeID > 0 ) meshDS->SetMeshElementOnShape( elem, myShapeID ); @@ -1304,7 +1857,7 @@ SMDS_MeshFace* SMESH_MesherHelper::AddFace(const SMDS_MeshNode* n1, //======================================================================= //function : AddFace -//purpose : Creates quadratic or linear quadrangle +//purpose : Creates bi-quadratic, quadratic or linear quadrangle //======================================================================= SMDS_MeshFace* SMESH_MesherHelper::AddFace(const SMDS_MeshNode* n1, @@ -1343,15 +1896,25 @@ SMDS_MeshFace* SMESH_MesherHelper::AddFace(const SMDS_MeshNode* n1, elem = meshDS->AddFace(n1, n2, n3, n4); } else { - const SMDS_MeshNode* n12 = GetMediumNode(n1,n2,force3d); - const SMDS_MeshNode* n23 = GetMediumNode(n2,n3,force3d); - const SMDS_MeshNode* n34 = GetMediumNode(n3,n4,force3d); - const SMDS_MeshNode* n41 = GetMediumNode(n4,n1,force3d); - - if(id) - elem = meshDS->AddFaceWithID(n1, n2, n3, n4, n12, n23, n34, n41, id); + const SMDS_MeshNode* n12 = GetMediumNode( n1, n2, force3d, TopAbs_FACE ); + const SMDS_MeshNode* n23 = GetMediumNode( n2, n3, force3d, TopAbs_FACE ); + const SMDS_MeshNode* n34 = GetMediumNode( n3, n4, force3d, TopAbs_FACE ); + const SMDS_MeshNode* n41 = GetMediumNode( n4, n1, force3d, TopAbs_FACE ); + if(myCreateBiQuadratic) + { + const SMDS_MeshNode* nCenter = GetCentralNode(n1, n2, n3, n4, n12, n23, n34, n41, force3d); + if(id) + elem = meshDS->AddFaceWithID(n1, n2, n3, n4, n12, n23, n34, n41, nCenter, id); + else + elem = meshDS->AddFace(n1, n2, n3, n4, n12, n23, n34, n41, nCenter); + } else - elem = meshDS->AddFace(n1, n2, n3, n4, n12, n23, n34, n41); + { + if(id) + elem = meshDS->AddFaceWithID(n1, n2, n3, n4, n12, n23, n34, n41, id); + else + elem = meshDS->AddFace(n1, n2, n3, n4, n12, n23, n34, n41); + } } if ( mySetElemOnShape && myShapeID > 0 ) meshDS->SetMeshElementOnShape( elem, myShapeID ); @@ -1383,7 +1946,7 @@ SMDS_MeshFace* SMESH_MesherHelper::AddPolygonalFace (const vectorAddVolume(n1, n2, n3, n4, n5, n6); } else { - const SMDS_MeshNode* n12 = GetMediumNode(n1,n2,force3d); - const SMDS_MeshNode* n23 = GetMediumNode(n2,n3,force3d); - const SMDS_MeshNode* n31 = GetMediumNode(n3,n1,force3d); + const SMDS_MeshNode* n12 = GetMediumNode( n1, n2, force3d, TopAbs_SOLID ); + const SMDS_MeshNode* n23 = GetMediumNode( n2, n3, force3d, TopAbs_SOLID ); + const SMDS_MeshNode* n31 = GetMediumNode( n3, n1, force3d, TopAbs_SOLID ); - const SMDS_MeshNode* n45 = GetMediumNode(n4,n5,force3d); - const SMDS_MeshNode* n56 = GetMediumNode(n5,n6,force3d); - const SMDS_MeshNode* n64 = GetMediumNode(n6,n4,force3d); + const SMDS_MeshNode* n45 = GetMediumNode( n4, n5, force3d, TopAbs_SOLID ); + const SMDS_MeshNode* n56 = GetMediumNode( n5, n6, force3d, TopAbs_SOLID ); + const SMDS_MeshNode* n64 = GetMediumNode( n6, n4, force3d, TopAbs_SOLID ); - const SMDS_MeshNode* n14 = GetMediumNode(n1,n4,force3d); - const SMDS_MeshNode* n25 = GetMediumNode(n2,n5,force3d); - const SMDS_MeshNode* n36 = GetMediumNode(n3,n6,force3d); + const SMDS_MeshNode* n14 = GetMediumNode( n1, n4, force3d, TopAbs_SOLID ); + const SMDS_MeshNode* n25 = GetMediumNode( n2, n5, force3d, TopAbs_SOLID ); + const SMDS_MeshNode* n36 = GetMediumNode( n3, n6, force3d, TopAbs_SOLID ); if(id) - elem = meshDS->AddVolumeWithID(n1, n2, n3, n4, n5, n6, + elem = meshDS->AddVolumeWithID(n1, n2, n3, n4, n5, n6, n12, n23, n31, n45, n56, n64, n14, n25, n36, id); else elem = meshDS->AddVolume(n1, n2, n3, n4, n5, n6, @@ -1455,7 +2018,7 @@ SMDS_MeshVolume* SMESH_MesherHelper::AddVolume(const SMDS_MeshNode* n1, const SMDS_MeshNode* n2, const SMDS_MeshNode* n3, const SMDS_MeshNode* n4, - const int id, + const int id, const bool force3d) { SMESHDS_Mesh * meshDS = GetMeshDS(); @@ -1467,13 +2030,13 @@ SMDS_MeshVolume* SMESH_MesherHelper::AddVolume(const SMDS_MeshNode* n1, elem = meshDS->AddVolume(n1, n2, n3, n4); } else { - const SMDS_MeshNode* n12 = GetMediumNode(n1,n2,force3d); - const SMDS_MeshNode* n23 = GetMediumNode(n2,n3,force3d); - const SMDS_MeshNode* n31 = GetMediumNode(n3,n1,force3d); + const SMDS_MeshNode* n12 = GetMediumNode( n1, n2, force3d, TopAbs_SOLID ); + const SMDS_MeshNode* n23 = GetMediumNode( n2, n3, force3d, TopAbs_SOLID ); + const SMDS_MeshNode* n31 = GetMediumNode( n3, n1, force3d, TopAbs_SOLID ); - const SMDS_MeshNode* n14 = GetMediumNode(n1,n4,force3d); - const SMDS_MeshNode* n24 = GetMediumNode(n2,n4,force3d); - const SMDS_MeshNode* n34 = GetMediumNode(n3,n4,force3d); + const SMDS_MeshNode* n14 = GetMediumNode( n1, n4, force3d, TopAbs_SOLID ); + const SMDS_MeshNode* n24 = GetMediumNode( n2, n4, force3d, TopAbs_SOLID ); + const SMDS_MeshNode* n34 = GetMediumNode( n3, n4, force3d, TopAbs_SOLID ); if(id) elem = meshDS->AddVolumeWithID(n1, n2, n3, n4, n12, n23, n31, n14, n24, n34, id); @@ -1496,7 +2059,7 @@ SMDS_MeshVolume* SMESH_MesherHelper::AddVolume(const SMDS_MeshNode* n1, const SMDS_MeshNode* n3, const SMDS_MeshNode* n4, const SMDS_MeshNode* n5, - const int id, + const int id, const bool force3d) { SMDS_MeshVolume* elem = 0; @@ -1507,15 +2070,15 @@ SMDS_MeshVolume* SMESH_MesherHelper::AddVolume(const SMDS_MeshNode* n1, elem = GetMeshDS()->AddVolume(n1, n2, n3, n4, n5); } else { - const SMDS_MeshNode* n12 = GetMediumNode(n1,n2,force3d); - const SMDS_MeshNode* n23 = GetMediumNode(n2,n3,force3d); - const SMDS_MeshNode* n34 = GetMediumNode(n3,n4,force3d); - const SMDS_MeshNode* n41 = GetMediumNode(n4,n1,force3d); + const SMDS_MeshNode* n12 = GetMediumNode( n1, n2, force3d, TopAbs_SOLID ); + const SMDS_MeshNode* n23 = GetMediumNode( n2, n3, force3d, TopAbs_SOLID ); + const SMDS_MeshNode* n34 = GetMediumNode( n3, n4, force3d, TopAbs_SOLID ); + const SMDS_MeshNode* n41 = GetMediumNode( n4, n1, force3d, TopAbs_SOLID ); - const SMDS_MeshNode* n15 = GetMediumNode(n1,n5,force3d); - const SMDS_MeshNode* n25 = GetMediumNode(n2,n5,force3d); - const SMDS_MeshNode* n35 = GetMediumNode(n3,n5,force3d); - const SMDS_MeshNode* n45 = GetMediumNode(n4,n5,force3d); + const SMDS_MeshNode* n15 = GetMediumNode( n1, n5, force3d, TopAbs_SOLID ); + const SMDS_MeshNode* n25 = GetMediumNode( n2, n5, force3d, TopAbs_SOLID ); + const SMDS_MeshNode* n35 = GetMediumNode( n3, n5, force3d, TopAbs_SOLID ); + const SMDS_MeshNode* n45 = GetMediumNode( n4, n5, force3d, TopAbs_SOLID ); if(id) elem = GetMeshDS()->AddVolumeWithID ( n1, n2, n3, n4, n5, @@ -1535,7 +2098,7 @@ SMDS_MeshVolume* SMESH_MesherHelper::AddVolume(const SMDS_MeshNode* n1, //======================================================================= //function : AddVolume -//purpose : Creates quadratic or linear hexahedron +//purpose : Creates tri-quadratic, quadratic or linear hexahedron //======================================================================= SMDS_MeshVolume* SMESH_MesherHelper::AddVolume(const SMDS_MeshNode* n1, @@ -1558,29 +2121,89 @@ SMDS_MeshVolume* SMESH_MesherHelper::AddVolume(const SMDS_MeshNode* n1, elem = meshDS->AddVolume(n1, n2, n3, n4, n5, n6, n7, n8); } else { - const SMDS_MeshNode* n12 = GetMediumNode(n1,n2,force3d); - const SMDS_MeshNode* n23 = GetMediumNode(n2,n3,force3d); - const SMDS_MeshNode* n34 = GetMediumNode(n3,n4,force3d); - const SMDS_MeshNode* n41 = GetMediumNode(n4,n1,force3d); - - const SMDS_MeshNode* n56 = GetMediumNode(n5,n6,force3d); - const SMDS_MeshNode* n67 = GetMediumNode(n6,n7,force3d); - const SMDS_MeshNode* n78 = GetMediumNode(n7,n8,force3d); - const SMDS_MeshNode* n85 = GetMediumNode(n8,n5,force3d); - - const SMDS_MeshNode* n15 = GetMediumNode(n1,n5,force3d); - const SMDS_MeshNode* n26 = GetMediumNode(n2,n6,force3d); - const SMDS_MeshNode* n37 = GetMediumNode(n3,n7,force3d); - const SMDS_MeshNode* n48 = GetMediumNode(n4,n8,force3d); - - if(id) - elem = meshDS->AddVolumeWithID(n1, n2, n3, n4, n5, n6, n7, n8, - n12, n23, n34, n41, n56, n67, - n78, n85, n15, n26, n37, n48, id); + const SMDS_MeshNode* n12 = GetMediumNode( n1, n2, force3d, TopAbs_SOLID ); + const SMDS_MeshNode* n23 = GetMediumNode( n2, n3, force3d, TopAbs_SOLID ); + const SMDS_MeshNode* n34 = GetMediumNode( n3, n4, force3d, TopAbs_SOLID ); + const SMDS_MeshNode* n41 = GetMediumNode( n4, n1, force3d, TopAbs_SOLID ); + + const SMDS_MeshNode* n56 = GetMediumNode( n5, n6, force3d, TopAbs_SOLID ); + const SMDS_MeshNode* n67 = GetMediumNode( n6, n7, force3d, TopAbs_SOLID ); + const SMDS_MeshNode* n78 = GetMediumNode( n7, n8, force3d, TopAbs_SOLID ); + const SMDS_MeshNode* n85 = GetMediumNode( n8, n5, force3d, TopAbs_SOLID ); + + const SMDS_MeshNode* n15 = GetMediumNode( n1, n5, force3d, TopAbs_SOLID ); + const SMDS_MeshNode* n26 = GetMediumNode( n2, n6, force3d, TopAbs_SOLID ); + const SMDS_MeshNode* n37 = GetMediumNode( n3, n7, force3d, TopAbs_SOLID ); + const SMDS_MeshNode* n48 = GetMediumNode( n4, n8, force3d, TopAbs_SOLID ); + if(myCreateBiQuadratic) + { + const SMDS_MeshNode* n1234 = GetCentralNode( n1,n2,n3,n4,n12,n23,n34,n41,force3d ); + const SMDS_MeshNode* n1256 = GetCentralNode( n1,n2,n5,n6,n12,n26,n56,n15,force3d ); + const SMDS_MeshNode* n2367 = GetCentralNode( n2,n3,n6,n7,n23,n37,n67,n26,force3d ); + const SMDS_MeshNode* n3478 = GetCentralNode( n3,n4,n7,n8,n34,n48,n78,n37,force3d ); + const SMDS_MeshNode* n1458 = GetCentralNode( n1,n4,n5,n8,n41,n48,n15,n85,force3d ); + const SMDS_MeshNode* n5678 = GetCentralNode( n5,n6,n7,n8,n56,n67,n78,n85,force3d ); + + vector pointsOnShapes( SMESH_Block::ID_Shell ); + + pointsOnShapes[ SMESH_Block::ID_V000 ] = SMESH_TNodeXYZ( n4 ); + pointsOnShapes[ SMESH_Block::ID_V100 ] = SMESH_TNodeXYZ( n8 ); + pointsOnShapes[ SMESH_Block::ID_V010 ] = SMESH_TNodeXYZ( n3 ); + pointsOnShapes[ SMESH_Block::ID_V110 ] = SMESH_TNodeXYZ( n7 ); + pointsOnShapes[ SMESH_Block::ID_V001 ] = SMESH_TNodeXYZ( n1 ); + pointsOnShapes[ SMESH_Block::ID_V101 ] = SMESH_TNodeXYZ( n5 ); + pointsOnShapes[ SMESH_Block::ID_V011 ] = SMESH_TNodeXYZ( n2 ); + pointsOnShapes[ SMESH_Block::ID_V111 ] = SMESH_TNodeXYZ( n6 ); + + pointsOnShapes[ SMESH_Block::ID_Ex00 ] = SMESH_TNodeXYZ( n48 ); + pointsOnShapes[ SMESH_Block::ID_Ex10 ] = SMESH_TNodeXYZ( n37 ); + pointsOnShapes[ SMESH_Block::ID_E0y0 ] = SMESH_TNodeXYZ( n15 ); + pointsOnShapes[ SMESH_Block::ID_E1y0 ] = SMESH_TNodeXYZ( n26 ); + pointsOnShapes[ SMESH_Block::ID_Ex01 ] = SMESH_TNodeXYZ( n34 ); + pointsOnShapes[ SMESH_Block::ID_Ex11 ] = SMESH_TNodeXYZ( n78 ); + pointsOnShapes[ SMESH_Block::ID_E0y1 ] = SMESH_TNodeXYZ( n12 ); + pointsOnShapes[ SMESH_Block::ID_E1y1 ] = SMESH_TNodeXYZ( n56 ); + pointsOnShapes[ SMESH_Block::ID_E00z ] = SMESH_TNodeXYZ( n41 ); + pointsOnShapes[ SMESH_Block::ID_E10z ] = SMESH_TNodeXYZ( n85 ); + pointsOnShapes[ SMESH_Block::ID_E01z ] = SMESH_TNodeXYZ( n23 ); + pointsOnShapes[ SMESH_Block::ID_E11z ] = SMESH_TNodeXYZ( n67 ); + + pointsOnShapes[ SMESH_Block::ID_Fxy0 ] = SMESH_TNodeXYZ( n3478 ); + pointsOnShapes[ SMESH_Block::ID_Fxy1 ] = SMESH_TNodeXYZ( n1256 ); + pointsOnShapes[ SMESH_Block::ID_Fx0z ] = SMESH_TNodeXYZ( n1458 ); + pointsOnShapes[ SMESH_Block::ID_Fx1z ] = SMESH_TNodeXYZ( n2367 ); + pointsOnShapes[ SMESH_Block::ID_F0yz ] = SMESH_TNodeXYZ( n1234 ); + pointsOnShapes[ SMESH_Block::ID_F1yz ] = SMESH_TNodeXYZ( n5678 ); + + gp_XYZ centerCube(0.5, 0.5, 0.5); + gp_XYZ nCenterElem; + SMESH_Block::ShellPoint( centerCube, pointsOnShapes, nCenterElem ); + const SMDS_MeshNode* nCenter = + meshDS->AddNode( nCenterElem.X(), nCenterElem.Y(), nCenterElem.Z() ); + meshDS->SetNodeInVolume( nCenter, myShapeID ); + + if(id) + elem = meshDS->AddVolumeWithID(n1, n2, n3, n4, n5, n6, n7, n8, + n12, n23, n34, n41, n56, n67, + n78, n85, n15, n26, n37, n48, + n1234, n1256, n2367, n3478, n1458, n5678, nCenter, id); + else + elem = meshDS->AddVolume(n1, n2, n3, n4, n5, n6, n7, n8, + n12, n23, n34, n41, n56, n67, + n78, n85, n15, n26, n37, n48, + n1234, n1256, n2367, n3478, n1458, n5678, nCenter); + } else - elem = meshDS->AddVolume(n1, n2, n3, n4, n5, n6, n7, n8, - n12, n23, n34, n41, n56, n67, - n78, n85, n15, n26, n37, n48); + { + if(id) + elem = meshDS->AddVolumeWithID(n1, n2, n3, n4, n5, n6, n7, n8, + n12, n23, n34, n41, n56, n67, + n78, n85, n15, n26, n37, n48, id); + else + elem = meshDS->AddVolume(n1, n2, n3, n4, n5, n6, n7, n8, + n12, n23, n34, n41, n56, n67, + n78, n85, n15, n26, n37, n48); + } } if ( mySetElemOnShape && myShapeID > 0 ) meshDS->SetMeshElementOnShape( elem, myShapeID ); @@ -1657,7 +2280,7 @@ SMESH_MesherHelper::AddPolyhedralVolume (const std::vector // if ( n1->GetPosition()->GetTypeOfPosition() != SMDS_TOP_3DSPACE && // n2->GetPosition()->GetTypeOfPosition() != SMDS_TOP_3DSPACE ) { - const SMDS_MeshNode* n12 = GetMediumNode(n1,n2,force3d); + const SMDS_MeshNode* n12 = GetMediumNode( n1, n2, force3d, TopAbs_SOLID ); newNodes.push_back( n12 ); newQuantities.back()++; } @@ -1675,6 +2298,44 @@ SMESH_MesherHelper::AddPolyhedralVolume (const std::vector return elem; } +namespace +{ + //================================================================================ + /*! + * \brief Check if a node belongs to any face of sub-mesh + */ + //================================================================================ + + bool isNodeInSubMesh( const SMDS_MeshNode* n, const SMESHDS_SubMesh* sm ) + { + SMDS_ElemIteratorPtr fIt = n->GetInverseElementIterator( SMDSAbs_Face ); + while ( fIt->more() ) + if ( sm->Contains( fIt->next() )) + return true; + return false; + } +} + +//======================================================================= +//function : IsSameElemGeometry +//purpose : Returns true if all elements of a sub-mesh are of same shape +//======================================================================= + +bool SMESH_MesherHelper::IsSameElemGeometry(const SMESHDS_SubMesh* smDS, + SMDSAbs_GeometryType shape, + const bool nullSubMeshRes) +{ + if ( !smDS ) return nullSubMeshRes; + + SMDS_ElemIteratorPtr elemIt = smDS->GetElements(); + while ( elemIt->more() ) { + const SMDS_MeshElement* e = elemIt->next(); + if ( e->GetGeomType() != shape ) + return false; + } + return true; +} + //======================================================================= //function : LoadNodeColumns //purpose : Load nodes bound to face into a map of node columns @@ -1704,7 +2365,7 @@ bool SMESH_MesherHelper::LoadNodeColumns(TParam2ColumnMap & theParam2 SMESHDS_Mesh* theMesh, SMESH_ProxyMesh* theProxyMesh) { - // get a right submesh of theFace + // get a right sub-mesh of theFace const SMESHDS_SubMesh* faceSubMesh = 0; if ( theProxyMesh ) @@ -1724,93 +2385,480 @@ bool SMESH_MesherHelper::LoadNodeColumns(TParam2ColumnMap & theParam2 if ( !faceSubMesh || faceSubMesh->NbElements() == 0 ) return false; - // get data of edges for normalization of params + if ( theParam2ColumnMap.empty() ) + { + // get data of edges for normalization of params + vector< double > length; + double fullLen = 0; + list::const_iterator edge; + { + for ( edge = theBaseSide.begin(); edge != theBaseSide.end(); ++edge ) + { + double len = std::max( 1e-10, SMESH_Algo::EdgeLength( *edge )); + fullLen += len; + length.push_back( len ); + } + } + + // get nodes on theBaseEdge sorted by param on edge and initialize theParam2ColumnMap with them + edge = theBaseSide.begin(); + for ( int iE = 0; edge != theBaseSide.end(); ++edge, ++iE ) + { + map< double, const SMDS_MeshNode*> sortedBaseNN; + SMESH_Algo::GetSortedNodesOnEdge( theMesh, *edge,/*noMedium=*/true, sortedBaseNN ); + + map< double, const SMDS_MeshNode*>::iterator u_n; + // pb with mesh_Projection_2D_00/A1 fixed by adding expectedSupport arg to GetMediumPos() + // so the following solution is commented (hope forever :) + // + // SMESH_Algo::GetSortedNodesOnEdge( theMesh, *edge,/*noMedium=*/true, sortedBaseNN, + // // SMDSAbs_Edge here is needed to be coherent with + // // StdMeshers_FaceSide used by Quadrangle to get nodes + // // on EDGE; else pb in mesh_Projection_2D_00/A1 where a + // // medium node on EDGE is medium in a triangle but not + // // in a segment + // SMDSAbs_Edge ); + // if ( faceSubMesh->GetElements()->next()->IsQuadratic() ) + // // filter off nodes medium in faces on theFace (same pb with mesh_Projection_2D_00/A1) + // for ( u_n = sortedBaseNN.begin(); u_n != sortedBaseNN.end() ; ) + // { + // const SMDS_MeshNode* node = u_n->second; + // SMDS_ElemIteratorPtr faceIt = node->GetInverseElementIterator( SMDSAbs_Face ); + // if ( faceIt->more() && node ) { + // const SMDS_MeshElement* face = faceIt->next(); + // if ( faceSubMesh->Contains( face ) && face->IsMediumNode( node )) + // node = 0; + // } + // if ( !node ) + // sortedBaseNN.erase( u_n++ ); + // else + // ++u_n; + // } + if ( sortedBaseNN.empty() ) continue; + + u_n = sortedBaseNN.begin(); + if ( theProxyMesh ) // from sortedBaseNN remove nodes not shared by faces of faceSubMesh + { + const SMDS_MeshNode* n1 = (++sortedBaseNN.begin())->second; + const SMDS_MeshNode* n2 = (++sortedBaseNN.rbegin())->second; + bool allNodesAreProxy = ( n1 != theProxyMesh->GetProxyNode( n1 ) && + n2 != theProxyMesh->GetProxyNode( n2 )); + if ( allNodesAreProxy ) + for ( u_n = sortedBaseNN.begin(); u_n != sortedBaseNN.end(); u_n++ ) + u_n->second = theProxyMesh->GetProxyNode( u_n->second ); + + if ( u_n = sortedBaseNN.begin(), !isNodeInSubMesh( u_n->second, faceSubMesh )) + { + while ( ++u_n != sortedBaseNN.end() && !isNodeInSubMesh( u_n->second, faceSubMesh )); + sortedBaseNN.erase( sortedBaseNN.begin(), u_n ); + } + if ( !sortedBaseNN.empty() ) + if ( u_n = --sortedBaseNN.end(), !isNodeInSubMesh( u_n->second, faceSubMesh )) + { + while ( u_n != sortedBaseNN.begin() && !isNodeInSubMesh( (--u_n)->second, faceSubMesh )); + sortedBaseNN.erase( ++u_n, sortedBaseNN.end() ); + } + if ( sortedBaseNN.empty() ) continue; + } + + double f, l; + BRep_Tool::Range( *edge, f, l ); + if ( edge->Orientation() == TopAbs_REVERSED ) std::swap( f, l ); + const double coeff = 1. / ( l - f ) * length[iE] / fullLen; + const double prevPar = theParam2ColumnMap.empty() ? 0 : theParam2ColumnMap.rbegin()->first; + for ( u_n = sortedBaseNN.begin(); u_n != sortedBaseNN.end(); u_n++ ) + { + double par = prevPar + coeff * ( u_n->first - f ); + TParam2ColumnMap::iterator u2nn = + theParam2ColumnMap.insert( theParam2ColumnMap.end(), make_pair( par, TNodeColumn())); + u2nn->second.push_back( u_n->second ); + } + } + if ( theParam2ColumnMap.size() < 2 ) + return false; + } + + // nb rows of nodes + int prevNbRows = theParam2ColumnMap.begin()->second.size(); // current, at least 1 here + int expectedNbRows = faceSubMesh->NbElements() / ( theParam2ColumnMap.size()-1 ); // to be added + + // fill theParam2ColumnMap column by column by passing from nodes on + // theBaseEdge up via mesh faces on theFace + + TParam2ColumnMap::iterator par_nVec_1, par_nVec_2; + par_nVec_2 = theParam2ColumnMap.begin(); + par_nVec_1 = par_nVec_2++; + TIDSortedElemSet emptySet, avoidSet; + for ( ; par_nVec_2 != theParam2ColumnMap.end(); ++par_nVec_1, ++par_nVec_2 ) + { + vector& nCol1 = par_nVec_1->second; + vector& nCol2 = par_nVec_2->second; + nCol1.resize( prevNbRows + expectedNbRows ); + nCol2.resize( prevNbRows + expectedNbRows ); + + int i1, i2, foundNbRows = 0; + const SMDS_MeshNode *n1 = nCol1[ prevNbRows-1 ]; + const SMDS_MeshNode *n2 = nCol2[ prevNbRows-1 ]; + // find face sharing node n1 and n2 and belonging to faceSubMesh + while ( const SMDS_MeshElement* face = + SMESH_MeshAlgos::FindFaceInSet( n1, n2, emptySet, avoidSet, &i1, &i2)) + { + if ( faceSubMesh->Contains( face )) + { + int nbNodes = face->NbCornerNodes(); + if ( nbNodes != 4 ) + return false; + if ( foundNbRows + 1 > expectedNbRows ) + return false; + n1 = face->GetNode( (i2+2) % 4 ); // opposite corner of quadrangle face + n2 = face->GetNode( (i1+2) % 4 ); + nCol1[ prevNbRows + foundNbRows] = n1; + nCol2[ prevNbRows + foundNbRows] = n2; + ++foundNbRows; + } + avoidSet.insert( face ); + } + if ( foundNbRows != expectedNbRows ) + return false; + avoidSet.clear(); + } + return ( theParam2ColumnMap.size() > 1 && + theParam2ColumnMap.begin()->second.size() == prevNbRows + expectedNbRows ); +} + +namespace +{ + //================================================================================ + /*! + * \brief Return true if a node is at a corner of a 2D structured mesh of FACE + */ + //================================================================================ + + bool isCornerOfStructure( const SMDS_MeshNode* n, + const SMESHDS_SubMesh* faceSM, + SMESH_MesherHelper& faceAnalyser ) + { + int nbFacesInSM = 0; + if ( n ) { + SMDS_ElemIteratorPtr fIt = n->GetInverseElementIterator( SMDSAbs_Face ); + while ( fIt->more() ) + nbFacesInSM += faceSM->Contains( fIt->next() ); + } + if ( nbFacesInSM == 1 ) + return true; + + if ( nbFacesInSM == 2 && n->GetPosition()->GetTypeOfPosition() == SMDS_TOP_VERTEX ) + { + return faceAnalyser.IsRealSeam( n->getshapeId() ); + } + return false; + } +} + +//======================================================================= +//function : IsStructured +//purpose : Return true if 2D mesh on FACE is a structured rectangle +//======================================================================= + +bool SMESH_MesherHelper::IsStructured( SMESH_subMesh* faceSM ) +{ + SMESHDS_SubMesh* fSM = faceSM->GetSubMeshDS(); + if ( !fSM || fSM->NbElements() == 0 ) + return false; + + list< TopoDS_Edge > edges; + list< int > nbEdgesInWires; + int nbWires = SMESH_Block::GetOrderedEdges( TopoDS::Face( faceSM->GetSubShape() ), + edges, nbEdgesInWires ); + if ( nbWires != 1 /*|| nbEdgesInWires.front() != 4*/ ) // allow composite sides + return false; + + // algo: find corners of a structure and then analyze nb of faces and + // length of structure sides + + SMESHDS_Mesh* meshDS = faceSM->GetFather()->GetMeshDS(); + SMESH_MesherHelper faceAnalyser( *faceSM->GetFather() ); + faceAnalyser.SetSubShape( faceSM->GetSubShape() ); + + // rotate edges to get the first node being at corner + // (in principle it's not necessary because so far none SALOME algo can make + // such a structured mesh that all corner nodes are not on VERTEXes) + bool isCorner = false; + int nbRemainEdges = nbEdgesInWires.front(); + do { + TopoDS_Vertex V = IthVertex( 0, edges.front() ); + isCorner = isCornerOfStructure( SMESH_Algo::VertexNode( V, meshDS ), + fSM, faceAnalyser); + if ( !isCorner ) { + edges.splice( edges.end(), edges, edges.begin() ); + --nbRemainEdges; + } + } + while ( !isCorner && nbRemainEdges > 0 ); + + if ( !isCorner ) + return false; + + // get all nodes from EDGEs + list< const SMDS_MeshNode* > nodes; + list< TopoDS_Edge >::iterator edge = edges.begin(); + for ( ; edge != edges.end(); ++edge ) + { + map< double, const SMDS_MeshNode* > u2Nodes; + if ( !SMESH_Algo::GetSortedNodesOnEdge( meshDS, *edge, + /*skipMedium=*/true, u2Nodes )) + return false; + + list< const SMDS_MeshNode* > edgeNodes; + map< double, const SMDS_MeshNode* >::iterator u2n = u2Nodes.begin(); + for ( ; u2n != u2Nodes.end(); ++u2n ) + edgeNodes.push_back( u2n->second ); + if ( edge->Orientation() == TopAbs_REVERSED ) + edgeNodes.reverse(); + + if ( !nodes.empty() && nodes.back() == edgeNodes.front() ) + edgeNodes.pop_front(); + nodes.splice( nodes.end(), edgeNodes, edgeNodes.begin(), edgeNodes.end() ); + } + + // get length of structured sides + vector nbEdgesInSide; + int nbEdges = 0; + list< const SMDS_MeshNode* >::iterator n = ++nodes.begin(); + for ( ; n != nodes.end(); ++n ) + { + ++nbEdges; + if ( isCornerOfStructure( *n, fSM, faceAnalyser )) { + nbEdgesInSide.push_back( nbEdges ); + nbEdges = 0; + } + } + + // checks + if ( nbEdgesInSide.size() != 4 ) + return false; + if ( nbEdgesInSide[0] != nbEdgesInSide[2] ) + return false; + if ( nbEdgesInSide[1] != nbEdgesInSide[3] ) + return false; + if ( nbEdgesInSide[0] * nbEdgesInSide[1] != fSM->NbElements() ) + return false; + + return true; +} + +//======================================================================= +//function : IsDistorted2D +//purpose : Return true if 2D mesh on FACE is ditorted +//======================================================================= + +bool SMESH_MesherHelper::IsDistorted2D( SMESH_subMesh* faceSM, + bool checkUV) +{ + if ( !faceSM || faceSM->GetSubShape().ShapeType() != TopAbs_FACE ) + return false; + + bool haveBadFaces = false; + + SMESH_MesherHelper helper( *faceSM->GetFather() ); + helper.SetSubShape( faceSM->GetSubShape() ); - vector< double > length; - double fullLen = 0; - list::const_iterator edge; + const TopoDS_Face& F = TopoDS::Face( faceSM->GetSubShape() ); + SMESHDS_SubMesh* smDS = helper.GetMeshDS()->MeshElements( F ); + if ( !smDS || smDS->NbElements() == 0 ) return false; + + SMDS_ElemIteratorPtr faceIt = smDS->GetElements(); + double prevArea = 0; + vector< const SMDS_MeshNode* > nodes; + vector< gp_XY > uv; + bool* toCheckUV = checkUV ? & checkUV : 0; + while ( faceIt->more() && !haveBadFaces ) { - for ( edge = theBaseSide.begin(); edge != theBaseSide.end(); ++edge ) + const SMDS_MeshElement* face = faceIt->next(); + + // get nodes + nodes.resize( face->NbCornerNodes() ); + SMDS_MeshElement::iterator n = face->begin_nodes(); + for ( size_t i = 0; i < nodes.size(); ++n, ++i ) + nodes[ i ] = *n; + + // avoid elems on degenarate shapes as UV on them can be wrong + if ( helper.HasDegeneratedEdges() ) + { + bool isOnDegen = false; + for ( size_t i = 0; ( i < nodes.size() && !isOnDegen ); ++i ) + isOnDegen = helper.IsDegenShape( nodes[ i ]->getshapeId() ); + if ( isOnDegen ) + continue; + } + // prepare to getting UVs + const SMDS_MeshNode* inFaceNode = 0; + if ( helper.HasSeam() ) { + for ( size_t i = 0; ( i < nodes.size() && !inFaceNode ); ++i ) + if ( !helper.IsSeamShape( nodes[ i ]->getshapeId() )) + inFaceNode = nodes[ i ]; + if ( !inFaceNode ) + continue; + } + // get UVs + uv.resize( nodes.size() ); + for ( size_t i = 0; i < nodes.size(); ++i ) + uv[ i ] = helper.GetNodeUV( F, nodes[ i ], inFaceNode, toCheckUV ); + + // compare orientation of triangles + double faceArea = 0; + for ( int iT = 0, nbT = nodes.size()-2; iT < nbT; ++iT ) { - double len = std::max( 1e-10, SMESH_Algo::EdgeLength( *edge )); - fullLen += len; - length.push_back( len ); + gp_XY v1 = uv[ iT+1 ] - uv[ 0 ]; + gp_XY v2 = uv[ iT+2 ] - uv[ 0 ]; + faceArea += v2 ^ v1; } + haveBadFaces = ( faceArea * prevArea < 0 ); + prevArea = faceArea; } - // get nodes on theBaseEdge sorted by param on edge and initialize theParam2ColumnMap with them - edge = theBaseSide.begin(); - for ( int iE = 0; edge != theBaseSide.end(); ++edge, ++iE ) + return haveBadFaces; +} + +//================================================================================ +/*! + * \brief Find out elements orientation on a geometrical face + * \param theFace - The face correctly oriented in the shape being meshed + * \retval bool - true if the face normal and the normal of first element + * in the correspoding submesh point in different directions + */ +//================================================================================ + +bool SMESH_MesherHelper::IsReversedSubMesh (const TopoDS_Face& theFace) +{ + if ( theFace.IsNull() ) + return false; + + // find out orientation of a meshed face + int faceID = GetMeshDS()->ShapeToIndex( theFace ); + TopoDS_Shape aMeshedFace = GetMeshDS()->IndexToShape( faceID ); + bool isReversed = ( theFace.Orientation() != aMeshedFace.Orientation() ); + + const SMESHDS_SubMesh * aSubMeshDSFace = GetMeshDS()->MeshElements( faceID ); + if ( !aSubMeshDSFace ) + return isReversed; + + // find an element on a bounday of theFace + SMDS_ElemIteratorPtr iteratorElem = aSubMeshDSFace->GetElements(); + const SMDS_MeshNode* nn[2]; + while ( iteratorElem->more() ) // loop on elements on theFace { - map< double, const SMDS_MeshNode*> sortedBaseNodes; - SMESH_Algo::GetSortedNodesOnEdge( theMesh, *edge,/*noMedium=*/true, sortedBaseNodes); - if ( sortedBaseNodes.empty() ) continue; + const SMDS_MeshElement* elem = iteratorElem->next(); + if ( ! elem ) continue; - double f, l; - BRep_Tool::Range( *edge, f, l ); - if ( edge->Orientation() == TopAbs_REVERSED ) std::swap( f, l ); - const double coeff = 1. / ( l - f ) * length[iE] / fullLen; - const double prevPar = theParam2ColumnMap.empty() ? 0 : theParam2ColumnMap.rbegin()->first; - map< double, const SMDS_MeshNode*>::iterator u_n = sortedBaseNodes.begin(); - for ( ; u_n != sortedBaseNodes.end(); u_n++ ) + // look for 2 nodes on EDGE + int nbNodes = elem->NbCornerNodes(); + nn[0] = elem->GetNode( nbNodes-1 ); + for ( int iN = 0; iN < nbNodes; ++iN ) { - double par = prevPar + coeff * ( u_n->first - f ); - TParam2ColumnMap::iterator u2nn = - theParam2ColumnMap.insert( theParam2ColumnMap.end(), make_pair( par, TNodeColumn())); - u2nn->second.push_back( u_n->second ); + nn[1] = elem->GetNode( iN ); + if ( nn[0]->GetPosition()->GetDim() < 2 && + nn[1]->GetPosition()->GetDim() < 2 ) + { + TopoDS_Shape s0 = GetSubShapeByNode( nn[0], GetMeshDS() ); + TopoDS_Shape s1 = GetSubShapeByNode( nn[1], GetMeshDS() ); + TopoDS_Shape E = GetCommonAncestor( s0, s1, *myMesh, TopAbs_EDGE ); + if ( !E.IsNull() && !s0.IsSame( s1 )) + { + // is E seam edge? + int nb = 0; + for ( TopExp_Explorer exp( theFace, TopAbs_EDGE ); exp.More(); exp.Next() ) + if ( E.IsSame( exp.Current() )) { + ++nb; + E = exp.Current(); // to know orientation + } + if ( nb == 1 ) + { + bool ok = true; + double u0 = GetNodeU( TopoDS::Edge( E ), nn[0], nn[1], &ok ); + double u1 = GetNodeU( TopoDS::Edge( E ), nn[1], nn[0], &ok ); + if ( ok ) + { + isReversed = ( u0 > u1 ); + if ( E.Orientation() == TopAbs_REVERSED ) + isReversed = !isReversed; + return isReversed; + } + } + } + } + nn[0] = nn[1]; } } - TParam2ColumnMap::iterator par_nVec_2, par_nVec_1 = theParam2ColumnMap.begin(); - if ( theProxyMesh ) + + // find an element with a good normal + gp_Vec Ne; + bool normalOK = false; + gp_XY uv; + iteratorElem = aSubMeshDSFace->GetElements(); + while ( !normalOK && iteratorElem->more() ) // loop on elements on theFace { - for ( ; par_nVec_1 != theParam2ColumnMap.end(); ++par_nVec_1 ) + const SMDS_MeshElement* elem = iteratorElem->next(); + if ( ! SMESH_MeshAlgos::FaceNormal( elem, const_cast( Ne.XYZ() ), /*normalized=*/0 )) + continue; + normalOK = true; + + // get UV of a node inside theFACE + SMDS_ElemIteratorPtr nodesIt = elem->nodesIterator(); + const SMDS_MeshNode* nInFace = 0; + int iPosDim = SMDS_TOP_VERTEX; + while ( nodesIt->more() ) // loop on nodes { - const SMDS_MeshNode* & n = par_nVec_1->second[0]; - n = theProxyMesh->GetProxyNode( n ); + const SMDS_MeshNode* n = static_cast( nodesIt->next() ); + if ( n->GetPosition()->GetTypeOfPosition() >= iPosDim ) + { + nInFace = n; + iPosDim = n->GetPosition()->GetTypeOfPosition(); + } } + uv = GetNodeUV( theFace, nInFace, 0, &normalOK ); } + if ( !normalOK ) + return isReversed; - int nbRows = 1 + faceSubMesh->NbElements() / ( theParam2ColumnMap.size()-1 ); + // face normal at node position + TopLoc_Location loc; + Handle(Geom_Surface) surf = BRep_Tool::Surface( theFace, loc ); + // if ( surf.IsNull() || surf->Continuity() < GeomAbs_C1 ) + // some surfaces not detected as GeomAbs_C1 are nevertheless correct for meshing + if ( surf.IsNull() || surf->Continuity() < GeomAbs_C0 ) + return isReversed; - // fill theParam2ColumnMap column by column by passing from nodes on - // theBaseEdge up via mesh faces on theFace + gp_Vec d1u, d1v; gp_Pnt p; + surf->D1( uv.X(), uv.Y(), p, d1u, d1v ); + gp_Vec Nf = (d1u ^ d1v).Transformed( loc ); - par_nVec_2 = theParam2ColumnMap.begin(); - par_nVec_1 = par_nVec_2++; - TIDSortedElemSet emptySet, avoidSet; - for ( ; par_nVec_2 != theParam2ColumnMap.end(); ++par_nVec_1, ++par_nVec_2 ) - { - vector& nCol1 = par_nVec_1->second; - vector& nCol2 = par_nVec_2->second; - nCol1.resize( nbRows ); - nCol2.resize( nbRows ); + if ( theFace.Orientation() == TopAbs_REVERSED ) + Nf.Reverse(); - int i1, i2, iRow = 0; - const SMDS_MeshNode *n1 = nCol1[0], *n2 = nCol2[0]; - // find face sharing node n1 and n2 and belonging to faceSubMesh - while ( const SMDS_MeshElement* face = - SMESH_MeshEditor::FindFaceInSet( n1, n2, emptySet, avoidSet, &i1, &i2)) - { - if ( faceSubMesh->Contains( face )) - { - int nbNodes = face->IsQuadratic() ? face->NbNodes()/2 : face->NbNodes(); - if ( nbNodes != 4 ) - return false; - n1 = face->GetNode( (i2+2) % 4 ); // opposite corner of quadrangle face - n2 = face->GetNode( (i1+2) % 4 ); - if ( ++iRow >= nbRows ) - return false; - nCol1[ iRow ] = n1; - nCol2[ iRow ] = n2; - avoidSet.clear(); - } - avoidSet.insert( face ); - } - // set a real height - nCol1.resize( iRow + 1 ); - nCol2.resize( iRow + 1 ); + return Ne * Nf < 0.; +} + +//======================================================================= +//function : Count +//purpose : Count nb of sub-shapes +//======================================================================= + +int SMESH_MesherHelper::Count(const TopoDS_Shape& shape, + const TopAbs_ShapeEnum type, + const bool ignoreSame) +{ + if ( ignoreSame ) { + TopTools_IndexedMapOfShape map; + TopExp::MapShapes( shape, type, map ); + return map.Extent(); + } + else { + int nb = 0; + for ( TopExp_Explorer exp( shape, type ); exp.More(); exp.Next() ) + ++nb; + return nb; } - return theParam2ColumnMap.size() > 1 && theParam2ColumnMap.begin()->second.size() > 1; } //======================================================================= @@ -1890,6 +2938,28 @@ bool SMESH_MesherHelper::IsSubShape( const TopoDS_Shape& shape, SMESH_Mesh* aMes (shape.ShapeType() == TopAbs_COMPOUND && aMesh->GetMeshDS()->IsGroupOfSubShapes( shape )); } +//======================================================================= +//function : IsBlock +//purpose : +//======================================================================= + +bool SMESH_MesherHelper::IsBlock( const TopoDS_Shape& shape ) +{ + if ( shape.IsNull() ) + return false; + + TopoDS_Shell shell; + TopExp_Explorer exp( shape, TopAbs_SHELL ); + if ( !exp.More() ) return false; + shell = TopoDS::Shell( exp.Current() ); + if ( exp.Next(), exp.More() ) return false; + + TopoDS_Vertex v; + TopTools_IndexedMapOfOrientedShape map; + return SMESH_Block::FindBlockShapes( shell, v, v, map ); +} + + //================================================================================ /*! * \brief Return maximal tolerance of shape @@ -1910,6 +2980,110 @@ double SMESH_MesherHelper::MaxTolerance( const TopoDS_Shape& shape ) return tol; } +//================================================================================ +/*! + * \brief Return MaxTolerance( face ), probably cached + */ +//================================================================================ + +double SMESH_MesherHelper::getFaceMaxTol( const TopoDS_Shape& face ) const +{ + int faceID = GetMeshDS()->ShapeToIndex( face ); + + SMESH_MesherHelper* me = const_cast< SMESH_MesherHelper* >( this ); + double & tol = me->myFaceMaxTol.insert( make_pair( faceID, -1. )).first->second; + if ( tol < 0 ) + tol = MaxTolerance( face ); + + return tol; +} + +//================================================================================ +/*! + * \brief Return an angle between two EDGEs sharing a common VERTEX with reference + * of the FACE normal + * \return double - the angle (between -Pi and Pi), negative if the angle is concave, + * 1e100 in case of failure + * \waring Care about order of the EDGEs and their orientation to be as they are + * within the FACE! Don't pass degenerated EDGEs neither! + */ +//================================================================================ + +double SMESH_MesherHelper::GetAngle( const TopoDS_Edge & theE1, + const TopoDS_Edge & theE2, + const TopoDS_Face & theFace, + const TopoDS_Vertex & theCommonV, + gp_Vec* theFaceNormal) +{ + double angle = 1e100; + try + { + double f,l; + Handle(Geom_Curve) c1 = BRep_Tool::Curve( theE1, f,l ); + Handle(Geom_Curve) c2 = BRep_Tool::Curve( theE2, f,l ); + Handle(Geom2d_Curve) c2d1 = BRep_Tool::CurveOnSurface( theE1, theFace, f,l ); + Handle(Geom_Surface) surf = BRep_Tool::Surface( theFace ); + double p1 = BRep_Tool::Parameter( theCommonV, theE1 ); + double p2 = BRep_Tool::Parameter( theCommonV, theE2 ); + if ( c1.IsNull() || c2.IsNull() ) + return angle; + gp_XY uv = c2d1->Value( p1 ).XY(); + gp_Vec du, dv; gp_Pnt p; + surf->D1( uv.X(), uv.Y(), p, du, dv ); + gp_Vec vec1, vec2, vecRef = du ^ dv; + int nbLoops = 0; + double p1tmp = p1; + while ( vecRef.SquareMagnitude() < 1e-25 ) + { + double dp = ( l - f ) / 1000.; + p1tmp += dp * (( Abs( p1 - f ) > Abs( p1 - l )) ? -1. : +1.); + uv = c2d1->Value( p1tmp ).XY(); + surf->D1( uv.X(), uv.Y(), p, du, dv ); + vecRef = du ^ dv; + if ( ++nbLoops > 10 ) + { +#ifdef _DEBUG_ + cout << "SMESH_MesherHelper::GetAngle(): Captured in a sigularity" << endl; +#endif + return angle; + } + } + if ( theFace.Orientation() == TopAbs_REVERSED ) + vecRef.Reverse(); + if ( theFaceNormal ) *theFaceNormal = vecRef; + + c1->D1( p1, p, vec1 ); + c2->D1( p2, p, vec2 ); + // TopoDS_Face F = theFace; + // if ( F.Orientation() == TopAbs_INTERNAL ) + // F.Orientation( TopAbs_FORWARD ); + if ( theE1.Orientation() /*GetSubShapeOri( F, theE1 )*/ == TopAbs_REVERSED ) + vec1.Reverse(); + if ( theE2.Orientation() /*GetSubShapeOri( F, theE2 )*/ == TopAbs_REVERSED ) + vec2.Reverse(); + angle = vec1.AngleWithRef( vec2, vecRef ); + + if ( Abs ( angle ) >= 0.99 * M_PI ) + { + BRep_Tool::Range( theE1, f, l ); + p1 += 1e-7 * ( p1-f < l-p1 ? +1. : -1. ); + c1->D1( p1, p, vec1 ); + if ( theE1.Orientation() == TopAbs_REVERSED ) + vec1.Reverse(); + BRep_Tool::Range( theE2, f, l ); + p2 += 1e-7 * ( p2-f < l-p2 ? +1. : -1. ); + c2->D1( p2, p, vec2 ); + if ( theE2.Orientation() == TopAbs_REVERSED ) + vec2.Reverse(); + angle = vec1.AngleWithRef( vec2, vecRef ); + } + } + catch (...) + { + } + return angle; +} + //================================================================================ /*! * \brief Check if the first and last vertices of an edge are the same @@ -1947,6 +3121,30 @@ TopoDS_Vertex SMESH_MesherHelper::IthVertex( const bool is2nd, return ( vIt.More() ? TopoDS::Vertex(vIt.Value()) : TopoDS_Vertex() ); } +//================================================================================ +/*! + * \brief Return type of shape contained in a group + * \param group - a shape of type TopAbs_COMPOUND + * \param avoidCompound - not to return TopAbs_COMPOUND + */ +//================================================================================ + +TopAbs_ShapeEnum SMESH_MesherHelper::GetGroupType(const TopoDS_Shape& group, + const bool avoidCompound) +{ + if ( !group.IsNull() ) + { + if ( group.ShapeType() != TopAbs_COMPOUND ) + return group.ShapeType(); + + // iterate on a compound + TopoDS_Iterator it( group ); + if ( it.More() ) + return avoidCompound ? GetGroupType( it.Value() ) : it.Value().ShapeType(); + } + return TopAbs_SHAPE; +} + //======================================================================= //function : IsQuadraticMesh //purpose : Check mesh without geometry for: if all elements on this shape are quadratic, @@ -1961,6 +3159,8 @@ SMESH_MesherHelper:: MType SMESH_MesherHelper::IsQuadraticMesh() int NbFacesAndEdges=0; //All faces and edges NbAllEdgsAndFaces = myMesh->NbEdges() + myMesh->NbFaces(); + if ( NbAllEdgsAndFaces == 0 ) + return SMESH_MesherHelper::LINEAR; //Quadratic faces and edges NbQuadFacesAndEdgs = myMesh->NbEdges(ORDER_QUADRATIC) + myMesh->NbFaces(ORDER_QUADRATIC); @@ -2056,6 +3256,11 @@ TopoDS_Shape SMESH_MesherHelper::GetCommonAncestor(const TopoDS_Shape& shape1, TopoDS_Shape commonAnc; if ( !shape1.IsNull() && !shape2.IsNull() ) { + if ( shape1.ShapeType() == ancestorType && IsSubShape( shape2, shape1 )) + return shape1; + if ( shape2.ShapeType() == ancestorType && IsSubShape( shape1, shape2 )) + return shape2; + PShapeIteratorPtr ancIt = GetAncestors( shape1, mesh, ancestorType ); while ( const TopoDS_Shape* anc = ancIt->next() ) if ( IsSubShape( shape2, *anc )) @@ -2074,7 +3279,7 @@ namespace { // Structures used by FixQuadraticElements() //======================================================================= #define __DMP__(txt) \ - //cout << txt + // cout << txt #define MSG(txt) __DMP__(txt< _faces; mutable gp_Vec _nodeMove; mutable int _nbMoves; + mutable bool _is2dFixed; // is moved along surface or in 3D 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(); + _nodeMove = MediumPnt() - MiddlePnt(); + _is2dFixed = ( MediumPos() != SMDS_TOP_FACE ); } void SetContinuesFaces() const; const QFace* GetContinuesFace( const QFace* face ) const; @@ -2116,10 +3322,11 @@ namespace { // Structures used by FixQuadraticElements() 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; } + void Move(const gp_Vec& move, bool sum=false, bool is2dFixed=false) const + { _nodeMove += move; _nbMoves += sum ? (_nbMoves==0) : 1; _is2dFixed |= is2dFixed; } gp_XYZ Move() const { return _nodeMove.XYZ() / _nbMoves; } bool IsMoved() const { return (_nbMoves > 0 /*&& !IsStraight()*/); } + bool IsFixedOnSurface() const { return _is2dFixed; } bool IsStraight() const { return isStraightLink( (XYZ(node1())-XYZ(node2())).SquareModulus(), _nodeMove.SquareMagnitude()); @@ -2178,7 +3385,7 @@ namespace { // Structures used by FixQuadraticElements() enum { ERR_OK, ERR_TRI, ERR_PRISM, ERR_UNKNOWN }; // errors of QFace::GetLinkChain() // -------------------------------------------------------------------- /*! - * \brief Face shared by two volumes and bound by QLinks + * \brief Quadratic face shared by two volumes and bound by QLinks */ struct QFace: public TIDSortedNodeSet { @@ -2367,7 +3574,7 @@ namespace { // Structures used by FixQuadraticElements() chLink->SetFace( this ); MSGBEG( *this ); - // propagate from quadrangle to neighbour faces + // propagate from a quadrangle to neighbour faces if ( link->MediumPos() >= pos ) { int nbLinkFaces = link->_faces.size(); if ( nbLinkFaces == 4 || (/*nbLinkFaces < 4 && */link->OnBoundary())) { @@ -2482,27 +3689,11 @@ namespace { // Structures used by FixQuadraticElements() 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 ); - //} + gp_Vec norm = _normal ^ gp_Vec( XYZ(_sides[i]->node1()), XYZ(_sides[i]->node2())); + gp_XYZ pIn = ( _sides[ (i+1)%3 ]->MiddlePnt() + + _sides[ (i+2)%3 ]->MiddlePnt() ) / 2.; + gp_Vec vecOut = ( _sides[i]->MiddlePnt() - pIn ); + if ( norm * vecOut < 0 ) norm.Reverse(); double mag2 = norm.SquareMagnitude(); @@ -2556,10 +3747,26 @@ namespace { // Structures used by FixQuadraticElements() int iL1 = (iL + 1) % 3, iL2 = (iL + 2) % 3; // indices of the two other links of triangle TLinkInSet link1 = theLinks.find( _sides[iL1] ); TLinkInSet link2 = theLinks.find( _sides[iL2] ); - if ( link1 == theLinks.end() || link2 == theLinks.end() ) - return thePrevLen; - const QFace* f1 = link1->NextFace( this ); // adjacent faces - const QFace* f2 = link2->NextFace( this ); + + const QFace *f1 = 0, *f2 = 0; // adjacent faces + bool isBndLink1 = true, isBndLink2 = true; + if ( link1 != theLinks.end() && link2 != theLinks.end() ) + { + f1 = link1->NextFace( this ); + f2 = link2->NextFace( this ); + + isBndLink1 = ( theLink->MediumPos() > (*link1)->MediumPos() ); + isBndLink2 = ( theLink->MediumPos() > (*link2)->MediumPos() ); + if ( theStep == theFirstStep ) // (issue 22541) quad-dominant mesh + { + if ( !isBndLink1 && !f1 ) + f1 = (*link1)->GetContinuesFace( this ); // get a quadrangle face + if ( !isBndLink2 && !f2 ) + f2 = (*link2)->GetContinuesFace( this ); + } + } + else if ( _sides.size() < 4 ) + return thePrevLen; // propagate to adjacent faces till limit step or boundary double len1 = thePrevLen + (theLink->MiddlePnt() - _sides[iL1]->MiddlePnt()).Modulus(); @@ -2568,7 +3775,7 @@ namespace { // Structures used by FixQuadraticElements() gp_Vec linkDir2(0,0,0); try { OCC_CATCH_SIGNALS; - if ( f1 && theLink->MediumPos() <= (*link1)->MediumPos() ) + if ( f1 && !isBndLink1 ) len1 = f1->MoveByBoundary ( *link1, theRefVec, theLinks, theFaceHelper, len1, theStep-1, &linkDir1, theSign); else @@ -2579,7 +3786,7 @@ namespace { // Structures used by FixQuadraticElements() } try { OCC_CATCH_SIGNALS; - if ( f2 && theLink->MediumPos() <= (*link2)->MediumPos() ) + if ( f2 && !isBndLink2 ) len2 = f2->MoveByBoundary ( *link2, theRefVec, theLinks, theFaceHelper, len2, theStep-1, &linkDir2, theSign); else @@ -2598,11 +3805,11 @@ namespace { // Structures used by FixQuadraticElements() double r = thePrevLen / fullLen; gp_Vec move = linkNorm * refProj * ( 1 - r ); - theLink->Move( move, true ); + theLink->Move( move, /*sum=*/true ); MSG(string(theStep,'.')<<" Move "<< theLink->_mediumNode->GetID()<< " by " << refProj * ( 1 - r ) << " following " << - (choose1 ? *link1->_qlink : *link2->_qlink)); + (choose1 ? *link1->_qlink : *link2->_qlink)); // warning: link1 can be invalid if ( theLinkNorm ) *theLinkNorm = linkNorm; } @@ -2692,7 +3899,7 @@ namespace { // Structures used by FixQuadraticElements() } else if ( _faces.size() > 1 ) // not found, set NULL by the first face { - _faces.insert( ++_faces.begin(), 0 ); + _faces.insert( ++_faces.begin(), (QFace*) 0 ); } } //================================================================================ @@ -2799,7 +4006,7 @@ namespace { // Structures used by FixQuadraticElements() if ( pInterLink == interLinks.end() ) continue; // not internal link interLink->Move( bndLink->_nodeMove ); // treated internal links become new boundary ones - interLinks. erase( pInterLink ); + interLinks.erase( pInterLink ); newBndLinks->insert( interLink ); } } @@ -3021,18 +4228,358 @@ namespace { // Structures used by FixQuadraticElements() return _OK; } + + //================================================================================ + /*! + * \brief Place medium nodes at the link middle for elements whose corner nodes + * are out of geometrical boundary to prevent distorting elements. + * Issue 0020982, note 0013990 + */ + //================================================================================ + + void force3DOutOfBoundary( SMESH_MesherHelper& theHelper, + SMESH_ComputeErrorPtr& theError) + { + SMESHDS_Mesh* meshDS = theHelper.GetMeshDS(); + TopoDS_Shape shape = theHelper.GetSubShape().Oriented( TopAbs_FORWARD ); + if ( shape.IsNull() ) return; + + if ( !theError ) theError = SMESH_ComputeError::New(); + + gp_XYZ faceNorm; + + if ( shape.ShapeType() == TopAbs_FACE ) // 2D + { + if ( theHelper.GetMesh()->NbTriangles( ORDER_QUADRATIC ) < 1 ) return; + + SMESHDS_SubMesh* faceSM = meshDS->MeshElements( shape ); + if ( !faceSM ) return; + + const TopoDS_Face& face = TopoDS::Face( shape ); + Handle(Geom_Surface) surface = BRep_Tool::Surface( face ); + + TopExp_Explorer edgeIt( face, TopAbs_EDGE ); + for ( ; edgeIt.More(); edgeIt.Next() ) // loop on EDGEs of a FACE + { + // check if the EDGE needs checking + const TopoDS_Edge& edge = TopoDS::Edge( edgeIt.Current() ); + if ( SMESH_Algo::isDegenerated( edge ) ) + continue; + if ( theHelper.IsRealSeam( edge ) && + edge.Orientation() == TopAbs_REVERSED ) + continue; + + SMESHDS_SubMesh* edgeSM = meshDS->MeshElements( edge ); + if ( !edgeSM ) continue; + + double f,l; + Handle(Geom2d_Curve) pcurve = BRep_Tool::CurveOnSurface( edge, face, f, l ); + BRepAdaptor_Curve curve3D( edge ); + switch ( curve3D.GetType() ) { + case GeomAbs_Line: continue; + case GeomAbs_Circle: + case GeomAbs_Ellipse: + case GeomAbs_Hyperbola: + case GeomAbs_Parabola: + try + { + gp_Vec D1, D2, Du1, Dv1; gp_Pnt p; + curve3D.D2( 0.5 * ( f + l ), p, D1, D2 ); + gp_Pnt2d uv = pcurve->Value( 0.5 * ( f + l ) ); + surface->D1( uv.X(), uv.Y(), p, Du1, Dv1 ); + gp_Vec fNorm = Du1 ^ Dv1; + if ( fNorm.IsParallel( D2, M_PI * 25./180. )) + continue; // face is normal to the curve3D + + gp_Vec curvNorm = fNorm ^ D1; + if ( edge.Orientation() == TopAbs_REVERSED ) curvNorm.Reverse(); + if ( curvNorm * D2 > 0 ) + continue; // convex edge + } + catch ( Standard_Failure ) + { + continue; + } + } + // get nodes shared by faces that may be distorted + SMDS_NodeIteratorPtr nodeIt; + if ( edgeSM->NbNodes() > 0 ) { + nodeIt = edgeSM->GetNodes(); + } + else { + SMESHDS_SubMesh* vertexSM = meshDS->MeshElements( theHelper.IthVertex( 0, edge )); + if ( !vertexSM ) + vertexSM = meshDS->MeshElements( theHelper.IthVertex( 1, edge )); + if ( !vertexSM ) continue; + nodeIt = vertexSM->GetNodes(); + } + + // find suspicious faces + TIDSortedElemSet checkedFaces; + vector< const SMDS_MeshNode* > nOnEdge( 2 ); + const SMDS_MeshNode* nOnFace; + while ( nodeIt->more() ) + { + const SMDS_MeshNode* n = nodeIt->next(); + SMDS_ElemIteratorPtr faceIt = n->GetInverseElementIterator( SMDSAbs_Face ); + while ( faceIt->more() ) + { + const SMDS_MeshElement* f = faceIt->next(); + if ( !faceSM->Contains( f ) || + f->NbNodes() < 6 || // check quadratic triangles only + !checkedFaces.insert( f ).second ) + continue; + + // get nodes on EDGE and on FACE of a suspicious face + nOnEdge.clear(); nOnFace = 0; + SMDS_MeshElement::iterator triNode = f->begin_nodes(); + for ( int nbN = 0; nbN < 3; ++triNode, ++nbN ) + { + n = *triNode; + if ( n->GetPosition()->GetDim() == 2 ) + nOnFace = n; + else + nOnEdge.push_back( n ); + } + + // check if nOnFace is inside the FACE + if ( nOnFace && nOnEdge.size() == 2 ) + { + theHelper.AddTLinks( static_cast< const SMDS_MeshFace* > ( f )); + if ( !SMESH_MeshAlgos::FaceNormal( f, faceNorm, /*normalized=*/false )) + continue; + gp_XYZ edgeDir = SMESH_TNodeXYZ( nOnEdge[0] ) - SMESH_TNodeXYZ( nOnEdge[1] ); + gp_XYZ edgeNorm = faceNorm ^ edgeDir; + n = theHelper.GetMediumNode( nOnEdge[0], nOnEdge[1], true ); // find n, not create + gp_XYZ pN0 = SMESH_TNodeXYZ( nOnEdge[0] ); + gp_XYZ pMedium = SMESH_TNodeXYZ( n ); // on-edge node location + gp_XYZ pFaceN = SMESH_TNodeXYZ( nOnFace ); // on-face node location + double hMedium = edgeNorm * gp_Vec( pN0, pMedium ).XYZ(); + double hFace = edgeNorm * gp_Vec( pN0, pFaceN ).XYZ(); + if ( Abs( hMedium ) > Abs( hFace * 0.6 )) + { + // nOnFace is out of FACE, move a medium on-edge node to the middle + gp_XYZ pMid3D = 0.5 * ( pN0 + SMESH_TNodeXYZ( nOnEdge[1] )); + meshDS->MoveNode( n, pMid3D.X(), pMid3D.Y(), pMid3D.Z() ); + MSG( "move OUT of face " << n ); + theError->myBadElements.push_back( f ); + } + } + } + } + } + if ( !theError->myBadElements.empty() ) + theError->myName = EDITERR_NO_MEDIUM_ON_GEOM; + return; + + } // 2D ============================================================================== + + if ( shape.ShapeType() == TopAbs_SOLID ) // 3D + { + if ( theHelper.GetMesh()->NbTetras ( ORDER_QUADRATIC ) < 1 && + theHelper.GetMesh()->NbPyramids( ORDER_QUADRATIC ) < 1 ) return; + + SMESHDS_SubMesh* solidSM = meshDS->MeshElements( shape ); + if ( !solidSM ) return; + + // check if the SOLID is bound by concave FACEs + vector< TopoDS_Face > concaveFaces; + TopExp_Explorer faceIt( shape, TopAbs_FACE ); + for ( ; faceIt.More(); faceIt.Next() ) // loop on FACEs of a SOLID + { + const TopoDS_Face& face = TopoDS::Face( faceIt.Current() ); + if ( !meshDS->MeshElements( face )) continue; + + BRepAdaptor_Surface surface( face ); + switch ( surface.GetType() ) { + case GeomAbs_Plane: continue; + case GeomAbs_Cylinder: + case GeomAbs_Cone: + case GeomAbs_Sphere: + try + { + double u = 0.5 * ( surface.FirstUParameter() + surface.LastUParameter() ); + double v = 0.5 * ( surface.FirstVParameter() + surface.LastVParameter() ); + gp_Vec Du1, Dv1, Du2, Dv2, Duv2; gp_Pnt p; + surface.D2( u,v, p, Du1, Dv1, Du2, Dv2, Duv2 ); + gp_Vec fNorm = Du1 ^ Dv1; + if ( face.Orientation() == TopAbs_REVERSED ) fNorm.Reverse(); + bool concaveU = ( fNorm * Du2 > 1e-100 ); + bool concaveV = ( fNorm * Dv2 > 1e-100 ); + if ( concaveU || concaveV ) + concaveFaces.push_back( face ); + } + catch ( Standard_Failure ) + { + concaveFaces.push_back( face ); + } + } + } + if ( concaveFaces.empty() ) + return; + + // fix 2D mesh on the SOLID + for ( faceIt.ReInit(); faceIt.More(); faceIt.Next() ) // loop on FACEs of a SOLID + { + SMESH_MesherHelper faceHelper( *theHelper.GetMesh() ); + faceHelper.SetSubShape( faceIt.Current() ); + force3DOutOfBoundary( faceHelper, theError ); + } + + // get an iterator over faces on concaveFaces + vector< SMDS_ElemIteratorPtr > faceIterVec( concaveFaces.size() ); + for ( size_t i = 0; i < concaveFaces.size(); ++i ) + faceIterVec[i] = meshDS->MeshElements( concaveFaces[i] )->GetElements(); + typedef SMDS_IteratorOnIterators + < const SMDS_MeshElement*, vector< SMDS_ElemIteratorPtr > > TIterOnIter; + SMDS_ElemIteratorPtr faceIter( new TIterOnIter( faceIterVec )); + + // a seacher to check if a volume is close to a concave face + std::auto_ptr< SMESH_ElementSearcher > faceSearcher + ( SMESH_MeshAlgos::GetElementSearcher( *theHelper.GetMeshDS(), faceIter )); + + // classifier + //BRepClass3d_SolidClassifier solidClassifier( shape ); + + TIDSortedElemSet checkedVols, movedNodes; + //for ( faceIt.ReInit(); faceIt.More(); faceIt.Next() ) // loop on FACEs of a SOLID + for ( size_t iF = 0; iF < concaveFaces.size(); ++iF ) // loop on concave FACEs + { + //const TopoDS_Shape& face = faceIt.Current(); + const TopoDS_Shape& face = concaveFaces[ iF ]; + SMESHDS_SubMesh* faceSM = meshDS->MeshElements( face ); + if ( !faceSM ) continue; + + // get nodes shared by volumes (tet and pyra) on the FACE that may be distorted + SMDS_NodeIteratorPtr nodeIt; + if ( faceSM->NbNodes() > 0 ) { + nodeIt = faceSM->GetNodes(); + } + else { + TopExp_Explorer vertex( face, TopAbs_VERTEX ); + SMESHDS_SubMesh* vertexSM = meshDS->MeshElements( vertex.Current() ); + if ( !vertexSM ) continue; + nodeIt = vertexSM->GetNodes(); + } + // get ids of sub-shapes of the FACE + set< int > subIDs; + SMESH_subMeshIteratorPtr smIt = + theHelper.GetMesh()->GetSubMesh( face )->getDependsOnIterator(/*includeSelf=*/true); + while ( smIt->more() ) + subIDs.insert( smIt->next()->GetId() ); + + // find suspicious volumes adjacent to the FACE + vector< const SMDS_MeshNode* > nOnFace( 4 ); + const SMDS_MeshNode* nInSolid; + while ( nodeIt->more() ) + { + const SMDS_MeshNode* n = nodeIt->next(); + SMDS_ElemIteratorPtr volIt = n->GetInverseElementIterator( SMDSAbs_Volume ); + while ( volIt->more() ) + { + const SMDS_MeshElement* vol = volIt->next(); + int nbN = vol->NbCornerNodes(); + if ( ( nbN != 4 && nbN != 5 ) || + !solidSM->Contains( vol ) || + !checkedVols.insert( vol ).second ) + continue; + + // get nodes on FACE and in SOLID of a suspicious volume + nOnFace.clear(); nInSolid = 0; + SMDS_MeshElement::iterator volNode = vol->begin_nodes(); + for ( int nb = nbN; nb > 0; ++volNode, --nb ) + { + n = *volNode; + if ( n->GetPosition()->GetDim() == 3 ) + nInSolid = n; + else if ( subIDs.count( n->getshapeId() )) + nOnFace.push_back( n ); + else + nInSolid = n; + } + if ( !nInSolid || nOnFace.size() != nbN - 1 ) + continue; + + // get size of the vol + SMESH_TNodeXYZ pInSolid( nInSolid ), pOnFace0( nOnFace[0] ); + double volLength = pInSolid.SquareDistance( nOnFace[0] ); + for ( size_t i = 1; i < nOnFace.size(); ++i ) + { + volLength = Max( volLength, pOnFace0.SquareDistance( nOnFace[i] )); + } + + // check if vol is close to concaveFaces + const SMDS_MeshElement* closeFace = + faceSearcher->FindClosestTo( pInSolid, SMDSAbs_Face ); + if ( !closeFace || + pInSolid.SquareDistance( closeFace->GetNode(0) ) > 4 * volLength ) + continue; + + // check if vol is distorted, i.e. a medium node is much closer + // to nInSolid than the link middle + bool isDistorted = false; + SMDS_FaceOfNodes onFaceTria( nOnFace[0], nOnFace[1], nOnFace[2] ); + if ( !SMESH_MeshAlgos::FaceNormal( &onFaceTria, faceNorm, /*normalized=*/false )) + continue; + theHelper.AddTLinks( static_cast< const SMDS_MeshVolume* > ( vol )); + vector< pair< SMESH_TLink, const SMDS_MeshNode* > > links; + for ( size_t i = 0; i < nOnFace.size(); ++i ) // loop on links between nOnFace + for ( size_t j = i+1; j < nOnFace.size(); ++j ) + { + SMESH_TLink link( nOnFace[i], nOnFace[j] ); + TLinkNodeMap::const_iterator linkIt = + theHelper.GetTLinkNodeMap().find( link ); + if ( linkIt != theHelper.GetTLinkNodeMap().end() ) + { + links.push_back( make_pair( linkIt->first, linkIt->second )); + if ( !isDistorted ) { + // compare projections of nInSolid and nMedium to face normal + gp_Pnt pMedium = SMESH_TNodeXYZ( linkIt->second ); + double hMedium = faceNorm * gp_Vec( pOnFace0, pMedium ).XYZ(); + double hVol = faceNorm * gp_Vec( pOnFace0, pInSolid ).XYZ(); + isDistorted = ( Abs( hMedium ) > Abs( hVol * 0.5 )); + } + } + } + // move medium nodes to link middle + if ( isDistorted ) + { + for ( size_t i = 0; i < links.size(); ++i ) + { + const SMDS_MeshNode* nMedium = links[i].second; + if ( movedNodes.insert( nMedium ).second ) + { + gp_Pnt pMid3D = 0.5 * ( SMESH_TNodeXYZ( links[i].first.node1() ) + + SMESH_TNodeXYZ( links[i].first.node2() )); + meshDS->MoveNode( nMedium, pMid3D.X(), pMid3D.Y(), pMid3D.Z() ); + MSG( "move OUT of solid " << nMedium ); + } + } + theError->myBadElements.push_back( vol ); + } + } // loop on volumes sharing a node on FACE + } // loop on nodes on FACE + } // loop on FACEs of a SOLID + + if ( !theError->myBadElements.empty() ) + theError->myName = EDITERR_NO_MEDIUM_ON_GEOM; + } // 3D case + } + } //namespace //======================================================================= /*! * \brief Move medium nodes of faces and volumes to fix distorted elements + * \param error - container of fixed 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) +void SMESH_MesherHelper::FixQuadraticElements(SMESH_ComputeErrorPtr& compError, + bool volumeOnly) { // setenv NO_FixQuadraticElements to know if FixQuadraticElements() is guilty of bad conversion if ( getenv("NO_FixQuadraticElements") ) @@ -3065,7 +4612,8 @@ void SMESH_MesherHelper::FixQuadraticElements(bool volumeOnly) #endif SMESH_MesherHelper h(*myMesh); h.SetSubShape( s.Current() ); - h.FixQuadraticElements(false); + h.ToFixNodeParameters(true); + h.FixQuadraticElements( compError, false ); } } // fix nodes on geom faces @@ -3076,10 +4624,13 @@ void SMESH_MesherHelper::FixQuadraticElements(bool volumeOnly) MSG("FIX FACE " << nbfaces-- << " #" << GetMeshDS()->ShapeToIndex(fIt.Key())); SMESH_MesherHelper h(*myMesh); h.SetSubShape( fIt.Key() ); - h.FixQuadraticElements(true); h.ToFixNodeParameters(true); + h.FixQuadraticElements( compError, true); } //perf_print_all_meters(1); + if ( compError && compError->myName == EDITERR_NO_MEDIUM_ON_GEOM ) + compError->myComment = "during conversion to quadratic, " + "some medium nodes were not placed on geometry to avoid distorting elements"; return; } @@ -3118,6 +4669,11 @@ void SMESH_MesherHelper::FixQuadraticElements(bool volumeOnly) TIDSortedNodeSet apexOfPyramid; const int apexIndex = 4; + // Issue 0020982 + // Move medium nodes to the link middle for elements whose corner nodes + // are out of geometrical boundary to fix distorted elements. + force3DOutOfBoundary( *this, compError ); + if ( elemType == SMDSAbs_Volume ) { while ( elemIt->more() ) // loop on volumes @@ -3190,7 +4746,9 @@ void SMESH_MesherHelper::FixQuadraticElements(bool volumeOnly) QLink link( face->GetNode(iN), face->GetNode((iN+1)%nbN), face->GetNode(iN+nbN) ); pLink = links.insert( link ).first; faceLinks[ iN ] = & *pLink; - if ( !isCurved ) + if ( !isCurved && + link.node1()->GetPosition()->GetTypeOfPosition() < 2 && + link.node2()->GetPosition()->GetTypeOfPosition() < 2 ) isCurved = !link.IsStraight(); } // store QFace @@ -3205,11 +4763,15 @@ void SMESH_MesherHelper::FixQuadraticElements(bool volumeOnly) // 3. Compute displacement of medium nodes // --------------------------------------- - // two loops on QFaces: the first is to treat boundary links, the second is for internal ones + SMESH_MesherHelper faceHlp(*myMesh); + + // two loops on QFaces: the first is to treat boundary links, the second is for internal ones. TopLoc_Location loc; - // not treat boundary of volumic submesh + bool checkUV; + // not to treat boundary of volumic sub-mesh. int isInside = ( elemType == SMDSAbs_Volume && volumeOnly ) ? 1 : 0; - for ( ; isInside < 2; ++isInside ) { + for ( ; isInside < 2; ++isInside ) + { MSG( "--------------- LOOP (inside=" << isInside << ") ------------------"); SMDS_TypeOfPosition pos = isInside ? SMDS_TOP_3DSPACE : SMDS_TOP_FACE; SMDS_TypeOfPosition bndPos = isInside ? SMDS_TOP_FACE : SMDS_TOP_EDGE; @@ -3234,7 +4796,7 @@ void SMESH_MesherHelper::FixQuadraticElements(bool volumeOnly) } else if ( error == ERR_TRI ) { // chain contains continues triangles TSplitTriaResult res = splitTrianglesIntoChains( rawChain, chains, pos ); - if ( res != _OK ) { // not quadrangles split into triangles + if ( res != _OK ) { // not 'quadrangles split into triangles' in chain fixTriaNearBoundary( rawChain, *this ); break; } @@ -3262,12 +4824,14 @@ void SMESH_MesherHelper::FixQuadraticElements(bool volumeOnly) // mesure chain length and compute link position along the chain double chainLen = 0; vector< double > linkPos; + TChain savedChain; // backup 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 + if ( savedChain.empty() ) savedChain = chain; link1 = chain.erase( link1 ); if ( link1 == chain.end() ) break; @@ -3277,32 +4841,39 @@ void SMESH_MesherHelper::FixQuadraticElements(bool volumeOnly) linkPos.push_back( chainLen ); } MSG(""); - if ( linkPos.size() < 2 ) - continue; - + if ( linkPos.size() <= 2 && savedChain.size() > 2 ) { + //continue; + linkPos.clear(); + chainLen = 0; + chain = savedChain; + for ( link1 = chain.begin(); link1 != chain.end(); ++link1 ) { + chainLen += 1; + linkPos.push_back( chainLen ); + } + } 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 of chain in parametric space of face + // compute node displacement of end links of chain in parametric space of FACE TChainLink& linkOnFace = *(++chain.begin()); const SMDS_MeshNode* nodeOnFace = linkOnFace->_mediumNode; TopoDS_Shape f = GetSubShapeByNode( nodeOnFace, GetMeshDS() ); if ( !f.IsNull() && f.ShapeType() == TopAbs_FACE ) { face = TopoDS::Face( f ); + faceHlp.SetSubShape( face ); Handle(Geom_Surface) surf = BRep_Tool::Surface(face,loc); bool isStraight[2]; for ( int is1 = 0; is1 < 2; ++is1 ) // move0 or move1 { TChainLink& link = is1 ? chain.back() : chain.front(); - gp_XY uvm = GetNodeUV( face, link->_mediumNode, nodeOnFace, &checkUV); - gp_XY uv1 = GetNodeUV( face, link->node1(), nodeOnFace, &checkUV); - gp_XY uv2 = GetNodeUV( face, link->node2(), nodeOnFace, &checkUV); - gp_XY uv12 = GetMiddleUV( surf, uv1, uv2); + gp_XY uvm = faceHlp.GetNodeUV( face, link->_mediumNode, nodeOnFace, &checkUV ); + gp_XY uv1 = faceHlp.GetNodeUV( face, link->node1(), nodeOnFace, &checkUV ); + gp_XY uv2 = faceHlp.GetNodeUV( face, link->node2(), nodeOnFace, &checkUV ); + gp_XY uv12 = faceHlp.GetMiddleUV( surf, uv1, uv2 ); // uvMove = uvm - uv12 gp_XY uvMove = applyIn2D(surf, uvm, uv12, gp_XY_Subtracted, /*inPeriod=*/false); ( is1 ? move1 : move0 ).SetCoord( uvMove.X(), uvMove.Y(), 0 ); @@ -3317,10 +4888,10 @@ void SMESH_MesherHelper::FixQuadraticElements(bool volumeOnly) } // check if a chain is already fixed - gp_XY uvm = GetNodeUV( face, linkOnFace->_mediumNode, 0, &checkUV); - gp_XY uv1 = GetNodeUV( face, linkOnFace->node1(), nodeOnFace, &checkUV); - gp_XY uv2 = GetNodeUV( face, linkOnFace->node2(), nodeOnFace, &checkUV); - gp_XY uv12 = GetMiddleUV( surf, uv1, uv2); + gp_XY uvm = faceHlp.GetNodeUV( face, linkOnFace->_mediumNode, 0, &checkUV ); + gp_XY uv1 = faceHlp.GetNodeUV( face, linkOnFace->node1(), nodeOnFace, &checkUV ); + gp_XY uv2 = faceHlp.GetNodeUV( face, linkOnFace->node2(), nodeOnFace, &checkUV ); + gp_XY uv12 = faceHlp.GetMiddleUV( surf, uv1, uv2 ); if (( uvm - uv12 ).SquareModulus() > 1e-10 ) { MSG("Already fixed - ignore"); @@ -3358,23 +4929,31 @@ void SMESH_MesherHelper::FixQuadraticElements(bool volumeOnly) // 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() ); + try { + gp_Vec x = x01.Normalized() + x12.Normalized(); + trsf.SetTransformation( gp_Ax3( gp::Origin(), link1->Normal(), x), gp_Ax3() ); + } catch ( Standard_Failure ) { + trsf.Invert(); + } move.Transform(trsf); + (*link1)->Move( move, /*sum=*/false, /*is2dFixed=*/false ); } else { // compute 3D displacement by 2D one Handle(Geom_Surface) s = BRep_Tool::Surface(face,loc); - gp_XY oldUV = GetNodeUV( face, (*link1)->_mediumNode, 0, &checkUV); - gp_XY newUV = applyIn2D( s, oldUV, gp_XY( move.X(),move.Y()), gp_XY_Added); + gp_XY oldUV = faceHlp.GetNodeUV( face, (*link1)->_mediumNode, 0, &checkUV ); + gp_XY newUV = applyIn2D( s, oldUV, gp_XY( move.X(),move.Y()), gp_XY_Added ); gp_Pnt newPnt = s->Value( newUV.X(), newUV.Y()); move = gp_Vec( XYZ((*link1)->_mediumNode), newPnt.Transformed(loc) ); + if ( SMDS_FacePosition* nPos = + dynamic_cast< SMDS_FacePosition* >((*link1)->_mediumNode->GetPosition())) + nPos->SetParameters( newUV.X(), newUV.Y() ); #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); + gp_XY uv0 = faceHlp.GetNodeUV( face, (*link0)->_mediumNode, 0, &checkUV ); + gp_XY uv2 = faceHlp.GetNodeUV( face, (*link2)->_mediumNode, 0, &checkUV ); MSG( "TOO LONG MOVE \t" << "uv0: "<Move( move, /*sum=*/false, /*is2dFixed=*/true ); } - (*link1)->Move( move ); MSG( "Move " << (*link1)->_mediumNode->GetID() << " following " << chain.front()->_mediumNode->GetID() <<"-" << chain.back ()->_mediumNode->GetID() << @@ -3392,109 +4971,197 @@ void SMESH_MesherHelper::FixQuadraticElements(bool volumeOnly) } // loop on chains of links } // loop on 2 directions of propagation from quadrangle } // loop on faces - } + } // fix faces and/or volumes // 4. Move nodes // ------------- -// vector vols( 100 ); -// vector volSize( 100 ); -// int nbVols; -// bool ok; + TIDSortedElemSet biQuadQuas, biQuadTris, triQuadHexa; + const SMDS_MeshElement *biQuadQua, *triQuadHex; + const bool toFixCentralNodes = ( myMesh->NbBiQuadQuadrangles() + + myMesh->NbBiQuadTriangles() + + myMesh->NbTriQuadraticHexas() ); + double distXYZ[4]; + faceHlp.ToFixNodeParameters( true ); + for ( pLink = links.begin(); pLink != links.end(); ++pLink ) { - if ( pLink->IsMoved() ) { + if ( pLink->IsMoved() ) + { gp_Pnt p = pLink->MiddlePnt() + pLink->Move(); + + // put on surface nodes on FACE but moved in 3D (23050) + if ( !pLink->IsFixedOnSurface() ) + { + faceHlp.SetSubShape( pLink->_mediumNode->getshapeId() ); + if ( faceHlp.GetSubShape().ShapeType() == TopAbs_FACE ) + { + const_cast( pLink->_mediumNode )->setXYZ( p.X(), p.Y(), p.Z()); + p.Coord( distXYZ[1], distXYZ[2], distXYZ[3] ); + gp_XY uv( Precision::Infinite(), 0 ); + if ( faceHlp.CheckNodeUV( TopoDS::Face( faceHlp.GetSubShape() ), pLink->_mediumNode, + uv, /*tol=*/pLink->Move().Modulus(), /*force=*/true, distXYZ )) + p.SetCoord( distXYZ[1], distXYZ[2], distXYZ[3] ); + } + } GetMeshDS()->MoveNode( pLink->_mediumNode, p.X(), p.Y(), p.Z()); - // -// gp_Pnt pNew = pLink->MiddlePnt() + pLink->Move(); -// if ( pLink->MediumPos() != SMDS_TOP_3DSPACE ) -// { -// // avoid making distorted volumes near boundary -// SMDS_ElemIteratorPtr volIt = -// (*pLink)._mediumNode->GetInverseElementIterator( SMDSAbs_Volume ); -// for ( nbVols = 0; volIt->more() && volTool.Set( volIt->next() ); ++nbVols ) -// { -// vols [ nbVols ] = volTool.Element(); -// volSize[ nbVols ] = volTool.GetSize(); -// } -// gp_Pnt pOld = pLink->MediumPnt(); -// const_cast( pLink->_mediumNode )->setXYZ( pNew.X(), pNew.Y(), pNew.Z() ); -// ok = true; -// while ( nbVols-- && ok ) -// { -// volTool.Set( vols[ nbVols ]); -// ok = ( volSize[ nbVols ] * volTool.GetSize() > 1e-20 ); -// } -// if ( !ok ) -// { -// const_cast( pLink->_mediumNode )->setXYZ( pOld.X(), pOld.Y(), pOld.Z() ); -// MSG( "Do NOT move \t" << pLink->_mediumNode->GetID() -// << " because of distortion of volume " << vols[ nbVols+1 ]->GetID()); -// continue; -// } -// } -// GetMeshDS()->MoveNode( pLink->_mediumNode, pNew.X(), pNew.Y(), pNew.Z() ); - } - } - - //return; - - // issue 0020982 - // Move the apex of pyramid together with the most curved link - - TIDSortedNodeSet::iterator apexIt = apexOfPyramid.begin(); - for ( ; apexIt != apexOfPyramid.end(); ++apexIt ) - { - SMESH_TNodeXYZ apex = *apexIt; - - gp_Vec maxMove( 0,0,0 ); - double maxMoveSize2 = 0; - - // shift of node index to get medium nodes between the base nodes - const int base2MediumShift = 5; - - // find maximal movement of medium node - SMDS_ElemIteratorPtr volIt = apex._node->GetInverseElementIterator( SMDSAbs_Volume ); - vector< const SMDS_MeshElement* > pyramids; - while ( volIt->more() ) - { - const SMDS_MeshElement* pyram = volIt->next(); - if ( pyram->GetEntityType() != SMDSEntity_Quad_Pyramid ) continue; - pyramids.push_back( pyram ); - - for ( int iBase = 0; iBase < apexIndex; ++iBase ) + + // collect bi-quadratic elements + if ( toFixCentralNodes ) { - SMESH_TNodeXYZ medium = pyram->GetNode( iBase + base2MediumShift ); - if ( medium._node->GetPosition()->GetTypeOfPosition() != SMDS_TOP_3DSPACE ) + biQuadQua = triQuadHex = 0; + SMDS_ElemIteratorPtr eIt = pLink->_mediumNode->GetInverseElementIterator(); + while ( eIt->more() ) { - SMESH_TNodeXYZ n1 = pyram->GetNode( iBase ); - SMESH_TNodeXYZ n2 = pyram->GetNode( ( iBase+1 ) % 4 ); - gp_Pnt middle = 0.5 * ( n1 + n2 ); - gp_Vec move( middle, medium ); - double moveSize2 = move.SquareMagnitude(); - if ( moveSize2 > maxMoveSize2 ) - maxMove = move, maxMoveSize2 = moveSize2; + const SMDS_MeshElement* e = eIt->next(); + switch( e->GetEntityType() ) { + case SMDSEntity_BiQuad_Quadrangle: biQuadQuas.insert( e ); break; + case SMDSEntity_BiQuad_Triangle: biQuadTris.insert( e ); break; + case SMDSEntity_TriQuad_Hexa: triQuadHexa.insert( e ); break; + default:; + } } } } + } + // Fix positions of central nodes of bi-tri-quadratic elements + + // treat bi-quad quadrangles + { + vector< const SMDS_MeshNode* > nodes( 9 ); + gp_XY uv[ 9 ]; + TIDSortedElemSet::iterator quadIt = biQuadQuas.begin(); + for ( ; quadIt != biQuadQuas.end(); ++quadIt ) + { + const SMDS_MeshElement* quad = *quadIt; + // nodes + nodes.clear(); + nodes.assign( quad->begin_nodes(), quad->end_nodes() ); + // FACE + TopoDS_Shape S = GetSubShapeByNode( nodes.back(), GetMeshDS() ); + if ( S.IsNull() || S.ShapeType() != TopAbs_FACE ) continue; + const TopoDS_Face& F = TopoDS::Face( S ); + Handle( Geom_Surface ) surf = BRep_Tool::Surface( F, loc ); + const double tol = BRep_Tool::Tolerance( F ); + // UV + for ( int i = 0; i < 8; ++i ) + { + uv[ i ] = GetNodeUV( F, nodes[i], nodes[8], &checkUV ); + // as this method is used after mesh generation, UV of nodes is not + // updated according to bending links, so we update + if ( i > 3 && nodes[i]->GetPosition()->GetTypeOfPosition() == SMDS_TOP_FACE ) + CheckNodeUV( F, nodes[i], uv[ i ], 2*tol, /*force=*/true ); + } + // move the central node + gp_XY uvCent = calcTFI (0.5, 0.5, uv[0],uv[1],uv[2],uv[3],uv[4],uv[5],uv[6],uv[7] ); + gp_Pnt p = surf->Value( uvCent.X(), uvCent.Y() ).Transformed( loc ); + GetMeshDS()->MoveNode( nodes[8], p.X(), p.Y(), p.Z()); + } + } + + // treat bi-quad triangles + { + vector< const SMDS_MeshNode* > nodes; + gp_XY uv[ 6 ]; + TIDSortedElemSet::iterator triIt = biQuadTris.begin(); + for ( ; triIt != biQuadTris.end(); ++triIt ) + { + const SMDS_MeshElement* tria = *triIt; + // FACE + const TopoDS_Shape& S = GetMeshDS()->IndexToShape( tria->getshapeId() ); + if ( S.IsNull() || S.ShapeType() != TopAbs_FACE ) continue; + const TopoDS_Face& F = TopoDS::Face( S ); + Handle( Geom_Surface ) surf = BRep_Tool::Surface( F, loc ); + const double tol = BRep_Tool::Tolerance( F ); + + // nodes + nodes.assign( tria->begin_nodes(), tria->end_nodes() ); + // UV + bool uvOK = true, badTria; + for ( int i = 0; i < 6; ++i ) + { + uv[ i ] = GetNodeUV( F, nodes[i], nodes[(i+1)%3], &uvOK ); + // as this method is used after mesh generation, UV of nodes is not + // updated according to bending links, so we update + if ( nodes[i]->GetPosition()->GetTypeOfPosition() == SMDS_TOP_FACE ) + CheckNodeUV( F, nodes[i], uv[ i ], 2*tol, /*force=*/true ); + } + // move the central node + gp_Pnt p; + if ( !uvOK || badTria ) + { + p = ( SMESH_TNodeXYZ( nodes[3] ) + + SMESH_TNodeXYZ( nodes[4] ) + + SMESH_TNodeXYZ( nodes[5] )) / 3; + } + else + { + gp_XY uvCent = GetCenterUV( uv[0], uv[1], uv[2], uv[3], uv[4], uv[5], &badTria ); + p = surf->Value( uvCent.X(), uvCent.Y() ).Transformed( loc ); + } + GetMeshDS()->MoveNode( tria->GetNode(6), p.X(), p.Y(), p.Z() ); + } + } - // move the apex - if ( maxMoveSize2 > 1e-20 ) + // treat tri-quadratic hexahedra + { + SMDS_VolumeTool volExp; + TIDSortedElemSet::iterator hexIt = triQuadHexa.begin(); + for ( ; hexIt != triQuadHexa.end(); ++hexIt ) { - apex += maxMove.XYZ(); - GetMeshDS()->MoveNode( apex._node, apex.X(), apex.Y(), apex.Z()); + volExp.Set( *hexIt, /*ignoreCentralNodes=*/false ); - // move medium nodes neighboring the apex to the middle - const int base2MediumShift_2 = 9; - for ( unsigned i = 0; i < pyramids.size(); ++i ) - for ( int iBase = 0; iBase < apexIndex; ++iBase ) + // fix nodes central in sides + for ( int iQuad = 0; iQuad < volExp.NbFaces(); ++iQuad ) + { + const SMDS_MeshNode** quadNodes = volExp.GetFaceNodes( iQuad ); + if ( quadNodes[8]->GetPosition()->GetTypeOfPosition() == SMDS_TOP_3DSPACE ) { - SMESH_TNodeXYZ base = pyramids[i]->GetNode( iBase ); - const SMDS_MeshNode* medium = pyramids[i]->GetNode( iBase + base2MediumShift_2 ); - gp_XYZ middle = 0.5 * ( apex + base ); - GetMeshDS()->MoveNode( medium, middle.X(), middle.Y(), middle.Z()); + gp_XYZ p = calcTFI( 0.5, 0.5, + SMESH_TNodeXYZ( quadNodes[0] ), SMESH_TNodeXYZ( quadNodes[2] ), + SMESH_TNodeXYZ( quadNodes[4] ), SMESH_TNodeXYZ( quadNodes[6] ), + SMESH_TNodeXYZ( quadNodes[1] ), SMESH_TNodeXYZ( quadNodes[3] ), + SMESH_TNodeXYZ( quadNodes[5] ), SMESH_TNodeXYZ( quadNodes[7] )); + GetMeshDS()->MoveNode( quadNodes[8], p.X(), p.Y(), p.Z()); } + } + + // fix the volume central node + vector pointsOnShapes( SMESH_Block::ID_Shell ); + const SMDS_MeshNode** hexNodes = volExp.GetNodes(); + + pointsOnShapes[ SMESH_Block::ID_V000 ] = SMESH_TNodeXYZ( hexNodes[ 0 ] ); + pointsOnShapes[ SMESH_Block::ID_V100 ] = SMESH_TNodeXYZ( hexNodes[ 3 ] ); + pointsOnShapes[ SMESH_Block::ID_V010 ] = SMESH_TNodeXYZ( hexNodes[ 1 ] ); + pointsOnShapes[ SMESH_Block::ID_V110 ] = SMESH_TNodeXYZ( hexNodes[ 2 ] ); + pointsOnShapes[ SMESH_Block::ID_V001 ] = SMESH_TNodeXYZ( hexNodes[ 4 ] ); + pointsOnShapes[ SMESH_Block::ID_V101 ] = SMESH_TNodeXYZ( hexNodes[ 7 ] ); + pointsOnShapes[ SMESH_Block::ID_V011 ] = SMESH_TNodeXYZ( hexNodes[ 5 ] ); + pointsOnShapes[ SMESH_Block::ID_V111 ] = SMESH_TNodeXYZ( hexNodes[ 6 ] ); + + pointsOnShapes[ SMESH_Block::ID_Ex00 ] = SMESH_TNodeXYZ( hexNodes[ 11 ] ); + pointsOnShapes[ SMESH_Block::ID_Ex10 ] = SMESH_TNodeXYZ( hexNodes[ 9 ] ); + pointsOnShapes[ SMESH_Block::ID_E0y0 ] = SMESH_TNodeXYZ( hexNodes[ 8 ] ); + pointsOnShapes[ SMESH_Block::ID_E1y0 ] = SMESH_TNodeXYZ( hexNodes[ 10 ] ); + pointsOnShapes[ SMESH_Block::ID_Ex01 ] = SMESH_TNodeXYZ( hexNodes[ 15 ] ); + pointsOnShapes[ SMESH_Block::ID_Ex11 ] = SMESH_TNodeXYZ( hexNodes[ 13 ] ); + pointsOnShapes[ SMESH_Block::ID_E0y1 ] = SMESH_TNodeXYZ( hexNodes[ 12 ] ); + pointsOnShapes[ SMESH_Block::ID_E1y1 ] = SMESH_TNodeXYZ( hexNodes[ 14 ] ); + pointsOnShapes[ SMESH_Block::ID_E00z ] = SMESH_TNodeXYZ( hexNodes[ 16 ] ); + pointsOnShapes[ SMESH_Block::ID_E10z ] = SMESH_TNodeXYZ( hexNodes[ 19 ] ); + pointsOnShapes[ SMESH_Block::ID_E01z ] = SMESH_TNodeXYZ( hexNodes[ 17 ] ); + pointsOnShapes[ SMESH_Block::ID_E11z ] = SMESH_TNodeXYZ( hexNodes[ 18 ] ); + + pointsOnShapes[ SMESH_Block::ID_Fxy0 ] = SMESH_TNodeXYZ( hexNodes[ 20 ] ); + pointsOnShapes[ SMESH_Block::ID_Fxy1 ] = SMESH_TNodeXYZ( hexNodes[ 25 ] ); + pointsOnShapes[ SMESH_Block::ID_Fx0z ] = SMESH_TNodeXYZ( hexNodes[ 21 ] ); + pointsOnShapes[ SMESH_Block::ID_Fx1z ] = SMESH_TNodeXYZ( hexNodes[ 23 ] ); + pointsOnShapes[ SMESH_Block::ID_F0yz ] = SMESH_TNodeXYZ( hexNodes[ 24 ] ); + pointsOnShapes[ SMESH_Block::ID_F1yz ] = SMESH_TNodeXYZ( hexNodes[ 22 ] ); + + gp_XYZ nCenterParams(0.5, 0.5, 0.5), nCenterCoords; + SMESH_Block::ShellPoint( nCenterParams, pointsOnShapes, nCenterCoords ); + GetMeshDS()->MoveNode( hexNodes[26], + nCenterCoords.X(), nCenterCoords.Y(), nCenterCoords.Z()); } } } -