X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FStdMeshers%2FStdMeshers_Quadrangle_2D.cxx;h=0a13e88eaedd7e10772f9dbadef611e1af4c7d16;hb=184f00f38ef65b5d58b798e8c13042c16e030a4f;hp=e20b1500eafb199774bedb36026aa196f325d835;hpb=c63ee099ad2b149bd70136839c973e8910137bc5;p=modules%2Fsmesh.git diff --git a/src/StdMeshers/StdMeshers_Quadrangle_2D.cxx b/src/StdMeshers/StdMeshers_Quadrangle_2D.cxx index e20b1500e..0a13e88ea 100644 --- a/src/StdMeshers/StdMeshers_Quadrangle_2D.cxx +++ b/src/StdMeshers/StdMeshers_Quadrangle_2D.cxx @@ -1,59 +1,56 @@ -// SMESH SMESH : implementaion of SMESH idl descriptions +// Copyright (C) 2007-2008 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 // -// Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS -// -// 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. -// -// This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// Lesser General Public License for more details. -// -// You should have received a copy of the GNU Lesser General Public -// License along with this library; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -// -// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// 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. // +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. // +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// +// SMESH SMESH : implementaion of SMESH idl descriptions // File : StdMeshers_Quadrangle_2D.cxx // Moved here from SMESH_Quadrangle_2D.cxx // Author : Paul RASCLE, EDF // Module : SMESH -// $Header$ - -using namespace std; +// #include "StdMeshers_Quadrangle_2D.hxx" + +#include "StdMeshers_FaceSide.hxx" + #include "SMESH_Gen.hxx" #include "SMESH_Mesh.hxx" #include "SMESH_subMesh.hxx" +#include "SMESH_MesherHelper.hxx" +#include "SMESH_Block.hxx" +#include "SMESH_Comment.hxx" #include "SMDS_MeshElement.hxx" #include "SMDS_MeshNode.hxx" #include "SMDS_EdgePosition.hxx" #include "SMDS_FacePosition.hxx" -#include -#include #include - +#include #include -#include -#include -#include -#include -#include - +#include #include -#include -#include #include #include +#include +#include +#include #include "utilities.h" #include "Utils_ExceptHandlers.hxx" @@ -61,12 +58,15 @@ using namespace std; #ifndef StdMeshers_Array2OfNode_HeaderFile #define StdMeshers_Array2OfNode_HeaderFile typedef const SMDS_MeshNode* SMDS_MeshNodePtr; -#include DEFINE_BASECOLLECTION (StdMeshers_BaseCollectionNodePtr, SMDS_MeshNodePtr) DEFINE_ARRAY2(StdMeshers_Array2OfNode, StdMeshers_BaseCollectionNodePtr, SMDS_MeshNodePtr) #endif +using namespace std; + +typedef gp_XY gp_UV; +typedef SMESH_Comment TComm; //============================================================================= /*! @@ -81,6 +81,7 @@ StdMeshers_Quadrangle_2D::StdMeshers_Quadrangle_2D (int hypId, int studyId, SMES _name = "Quadrangle_2D"; _shapeType = (1 << TopAbs_FACE); _compatibleHypothesis.push_back("QuadranglePreference"); + _compatibleHypothesis.push_back("TrianglePreference"); myTool = 0; } @@ -93,8 +94,6 @@ StdMeshers_Quadrangle_2D::StdMeshers_Quadrangle_2D (int hypId, int studyId, SMES StdMeshers_Quadrangle_2D::~StdMeshers_Quadrangle_2D() { MESSAGE("StdMeshers_Quadrangle_2D::~StdMeshers_Quadrangle_2D"); - if ( myTool ) - delete myTool; } //============================================================================= @@ -111,10 +110,25 @@ bool StdMeshers_Quadrangle_2D::CheckHypothesis bool isOk = true; aStatus = SMESH_Hypothesis::HYP_OK; - // there is only one compatible Hypothesis so far - const list &hyps = GetUsedHypothesis(aMesh, aShape); - myQuadranglePreference = hyps.size() > 0; + const list &hyps = GetUsedHypothesis(aMesh, aShape, false); + const SMESHDS_Hypothesis *theHyp = 0; + + if(hyps.size() > 0){ + theHyp = *hyps.begin(); + if(strcmp("QuadranglePreference", theHyp->GetName()) == 0) { + myQuadranglePreference= true; + myTrianglePreference= false; + } + else if(strcmp("TrianglePreference", theHyp->GetName()) == 0){ + myQuadranglePreference= false; + myTrianglePreference= true; + } + } + else { + myQuadranglePreference = false; + myTrianglePreference = false; + } return isOk; } @@ -125,55 +139,51 @@ bool StdMeshers_Quadrangle_2D::CheckHypothesis //============================================================================= bool StdMeshers_Quadrangle_2D::Compute (SMESH_Mesh& aMesh, - const TopoDS_Shape& aShape) throw (SALOME_Exception) + const TopoDS_Shape& aShape)// throw (SALOME_Exception) { - Unexpect aCatch(SalomeException); - //MESSAGE("StdMeshers_Quadrangle_2D::Compute"); + // PAL14921. Enable catching std::bad_alloc and Standard_OutOfMemory outside + //Unexpect aCatchSalomeException); + SMESHDS_Mesh * meshDS = aMesh.GetMeshDS(); aMesh.GetSubMesh(aShape); - if ( !myTool ) - myTool = new SMESH_MesherHelper(aMesh); - _quadraticMesh = myTool->IsQuadraticSubMesh(aShape); + SMESH_MesherHelper helper(aMesh); + myTool = &helper; - //FaceQuadStruct *quad = CheckAnd2Dcompute(aMesh, aShape); - FaceQuadStruct* quad = CheckNbEdges(aMesh, aShape); + _quadraticMesh = myTool->IsQuadraticSubMesh(aShape); - if (!quad) { - delete myTool; myTool = 0; + FaceQuadStruct *quad = CheckNbEdges( aMesh, aShape ); + std::auto_ptr quadDeleter( quad ); // to delete quad at exit from Compute() + if (!quad) return false; - } if(myQuadranglePreference) { - int n1 = quad->nbPts[0]; - int n2 = quad->nbPts[1]; - int n3 = quad->nbPts[2]; - int n4 = quad->nbPts[3]; + int n1 = quad->side[0]->NbPoints(); + int n2 = quad->side[1]->NbPoints(); + int n3 = quad->side[2]->NbPoints(); + int n4 = quad->side[3]->NbPoints(); int nfull = n1+n2+n3+n4; int ntmp = nfull/2; ntmp = ntmp*2; if( nfull==ntmp && ( (n1!=n3) || (n2!=n4) ) ) { // special path for using only quandrangle faces bool ok = ComputeQuadPref(aMesh, aShape, quad); - delete myTool; myTool = 0; return ok; } } // set normalized grid on unit square in parametric domain - SetNormalizedGrid(aMesh, aShape, quad); - if (!quad) { - delete myTool; myTool = 0; + + if (!SetNormalizedGrid(aMesh, aShape, quad)) return false; - } // --- compute 3D values on points, store points & quadrangles - int nbdown = quad->nbPts[0]; - int nbup = quad->nbPts[2]; + int nbdown = quad->side[0]->NbPoints(); + int nbup = quad->side[2]->NbPoints(); - int nbright = quad->nbPts[1]; - int nbleft = quad->nbPts[3]; + int nbright = quad->side[1]->NbPoints(); + int nbleft = quad->side[3]->NbPoints(); int nbhoriz = Min(nbdown, nbup); int nbvertic = Min(nbright, nbleft); @@ -226,16 +236,18 @@ bool StdMeshers_Quadrangle_2D::Compute (SMESH_Mesh& aMesh, b = quad->uv_grid[j * nbhoriz + i + 1].node; c = quad->uv_grid[(j + 1) * nbhoriz + i + 1].node; d = quad->uv_grid[(j + 1) * nbhoriz + i].node; - //SMDS_MeshFace * face = meshDS->AddFace(a, b, c, d); SMDS_MeshFace* face = myTool->AddFace(a, b, c, d); meshDS->SetMeshElementOnShape(face, geomFaceID); } } - - UVPtStruct *uv_e0 = quad->uv_edges[0]; - UVPtStruct *uv_e1 = quad->uv_edges[1]; - UVPtStruct *uv_e2 = quad->uv_edges[2]; - UVPtStruct *uv_e3 = quad->uv_edges[3]; + + const vector& uv_e0 = quad->side[0]->GetUVPtStruct(true,0 ); + const vector& uv_e1 = quad->side[1]->GetUVPtStruct(false,1); + const vector& uv_e2 = quad->side[2]->GetUVPtStruct(true,1 ); + const vector& uv_e3 = quad->side[3]->GetUVPtStruct(false,0); + + if ( uv_e0.empty() || uv_e1.empty() || uv_e2.empty() || uv_e3.empty() ) + return error( COMPERR_BAD_INPUT_MESH ); double eps = Precision::Confusion(); @@ -309,8 +321,14 @@ bool StdMeshers_Quadrangle_2D::Compute (SMESH_Mesh& aMesh, else d = quad->uv_grid[nbhoriz + near - 1].node; //SMDS_MeshFace* face = meshDS->AddFace(a, b, c, d); - SMDS_MeshFace* face = myTool->AddFace(a, b, c, d); - meshDS->SetMeshElementOnShape(face, geomFaceID); + + if(!myTrianglePreference){ + SMDS_MeshFace* face = myTool->AddFace(a, b, c, d); + meshDS->SetMeshElementOnShape(face, geomFaceID); + } + else { + SplitQuad(meshDS, geomFaceID, a, b, c, d); + } // if node d is not at position g - make additional triangles if (near - 1 > g) { @@ -393,8 +411,13 @@ bool StdMeshers_Quadrangle_2D::Compute (SMESH_Mesh& aMesh, else d = quad->uv_grid[nbhoriz*(nbvertic - 2) + near + 1].node; //SMDS_MeshFace* face = meshDS->AddFace(a, b, c, d); - SMDS_MeshFace* face = myTool->AddFace(a, b, c, d); - meshDS->SetMeshElementOnShape(face, geomFaceID); + if(!myTrianglePreference){ + SMDS_MeshFace* face = myTool->AddFace(a, b, c, d); + meshDS->SetMeshElementOnShape(face, geomFaceID); + } + else { + SplitQuad(meshDS, geomFaceID, a, b, c, d); + } if (near + 1 < g) { // if d not is at g - make additional triangles for (int k = near + 1; k < g; k++) { @@ -462,8 +485,14 @@ bool StdMeshers_Quadrangle_2D::Compute (SMESH_Mesh& aMesh, else d = quad->uv_grid[nbhoriz*near - 2].node; //SMDS_MeshFace* face = meshDS->AddFace(a, b, c, d); - SMDS_MeshFace* face = myTool->AddFace(a, b, c, d); - meshDS->SetMeshElementOnShape(face, geomFaceID); + + if(!myTrianglePreference){ + SMDS_MeshFace* face = myTool->AddFace(a, b, c, d); + meshDS->SetMeshElementOnShape(face, geomFaceID); + } + else { + SplitQuad(meshDS, geomFaceID, a, b, c, d); + } if (near - 1 > g) { // if d not is at g - make additional triangles for (int k = near - 1; k > g; k--) { @@ -528,8 +557,13 @@ bool StdMeshers_Quadrangle_2D::Compute (SMESH_Mesh& aMesh, else d = quad->uv_grid[nbhoriz*(near + 1) + 1].node; //SMDS_MeshFace* face = meshDS->AddFace(a, b, c, d); - SMDS_MeshFace* face = myTool->AddFace(a, b, c, d); - meshDS->SetMeshElementOnShape(face, geomFaceID); + if(!myTrianglePreference){ + SMDS_MeshFace* face = myTool->AddFace(a, b, c, d); + meshDS->SetMeshElementOnShape(face, geomFaceID); + } + else { + SplitQuad(meshDS, geomFaceID, a, b, c, d); + } if (near + 1 < g) { // if d not is at g - make additional triangles for (int k = near + 1; k < g; k++) { @@ -549,68 +583,368 @@ bool StdMeshers_Quadrangle_2D::Compute (SMESH_Mesh& aMesh, } } - QuadDelete(quad); - delete myTool; myTool = 0; - bool isOk = true; return isOk; } +//============================================================================= +/*! + * Evaluate + */ +//============================================================================= + +bool StdMeshers_Quadrangle_2D::Evaluate(SMESH_Mesh& aMesh, + const TopoDS_Shape& aShape, + MapShapeNbElems& aResMap) + +{ + aMesh.GetSubMesh(aShape); + + std::vector aNbNodes(4); + bool IsQuadratic = false; + if( !CheckNbEdgesForEvaluate( aMesh, aShape, aResMap, aNbNodes, IsQuadratic ) ) { + std::vector aResVec(17); + for(int i=0; i<17; i++) aResVec[i] = 0; + SMESH_subMesh * sm = aMesh.GetSubMesh(aShape); + aResMap.insert(std::make_pair(sm,aResVec)); + SMESH_ComputeErrorPtr& smError = sm->GetComputeError(); + smError.reset( new SMESH_ComputeError(COMPERR_ALGO_FAILED,"Submesh can not be evaluated",this)); + return false; + } + + if(myQuadranglePreference) { + int n1 = aNbNodes[0]; + int n2 = aNbNodes[1]; + int n3 = aNbNodes[2]; + int n4 = aNbNodes[3]; + int nfull = n1+n2+n3+n4; + int ntmp = nfull/2; + ntmp = ntmp*2; + if( nfull==ntmp && ( (n1!=n3) || (n2!=n4) ) ) { + // special path for using only quandrangle faces + return EvaluateQuadPref(aMesh, aShape, aNbNodes, aResMap, IsQuadratic); + //return true; + } + } + + int nbdown = aNbNodes[0]; + int nbup = aNbNodes[2]; + + int nbright = aNbNodes[1]; + int nbleft = aNbNodes[3]; + + int nbhoriz = Min(nbdown, nbup); + int nbvertic = Min(nbright, nbleft); + + int dh = Max(nbdown, nbup) - nbhoriz; + int dv = Max(nbright, nbleft) - nbvertic; + + int kdh = 0; + if(dh>0) kdh = 1; + int kdv = 0; + if(dv>0) kdv = 1; + + int nbNodes = (nbhoriz-2)*(nbvertic-2); + int nbFaces3 = dh + dv + kdh*(nbvertic-1)*2 + kdv*(nbhoriz-1)*2; + if( kdh==1 && kdv==1 ) nbFaces3 -= 2; + int nbFaces4 = (nbhoriz-1-kdh)*(nbvertic-1-kdv); + + std::vector aVec(17); + for(int i=0; i<17; i++) aVec[i] = 0; + if(IsQuadratic) { + aVec[4] = nbFaces3; + aVec[6] = nbFaces4; + int nbbndedges = nbdown + nbup + nbright + nbleft -4; + int nbintedges = ( nbFaces4*4 + nbFaces3*3 - nbbndedges ) / 2; + aVec[0] = nbNodes + nbintedges; + } + else { + aVec[0] = nbNodes; + aVec[3] = nbFaces3; + aVec[5] = nbFaces4; + } + SMESH_subMesh * sm = aMesh.GetSubMesh(aShape); + aResMap.insert(std::make_pair(sm,aVec)); + + return true; +} + + +//================================================================================ +/*! + * \brief Return true if only two given edges meat at their common vertex + */ +//================================================================================ + +static bool twoEdgesMeatAtVertex(const TopoDS_Edge& e1, + const TopoDS_Edge& e2, + SMESH_Mesh & mesh) +{ + TopoDS_Vertex v; + if ( !TopExp::CommonVertex( e1, e2, v )) + return false; + TopTools_ListIteratorOfListOfShape ancestIt( mesh.GetAncestors( v )); + for ( ; ancestIt.More() ; ancestIt.Next() ) + if ( ancestIt.Value().ShapeType() == TopAbs_EDGE ) + if ( !e1.IsSame( ancestIt.Value() ) && !e2.IsSame( ancestIt.Value() )) + return false; + return true; +} + //============================================================================= /*! * */ //============================================================================= -FaceQuadStruct* StdMeshers_Quadrangle_2D::CheckNbEdges(SMESH_Mesh & aMesh, +FaceQuadStruct* StdMeshers_Quadrangle_2D::CheckNbEdges(SMESH_Mesh & aMesh, const TopoDS_Shape & aShape) - throw(SALOME_Exception) + //throw(SALOME_Exception) { - Unexpect aCatch(SalomeException); - const TopoDS_Face & F = TopoDS::Face(aShape); + const bool ignoreMediumNodes = _quadraticMesh; // verify 1 wire only, with 4 edges - - if (NumberOfWires(F) != 1) { - INFOS("only 1 wire by face (quadrangles)"); + TopoDS_Vertex V; + list< TopoDS_Edge > edges; + list< int > nbEdgesInWire; + int nbWire = SMESH_Block::GetOrderedEdges (F, V, edges, nbEdgesInWire); + if (nbWire != 1) { + error(COMPERR_BAD_SHAPE, TComm("Wrong number of wires: ") << nbWire); return 0; } - const TopoDS_Wire& W = BRepTools::OuterWire(F); - BRepTools_WireExplorer wexp (W, F); - FaceQuadStruct* quad = new FaceQuadStruct; - for (int i = 0; i < 4; i++) - quad->uv_edges[i] = 0; quad->uv_grid = 0; - - int nbEdges = 0; - for (wexp.Init(W, F); wexp.More(); wexp.Next()) { - const TopoDS_Edge& E = wexp.Current(); - int nb = aMesh.GetSubMesh(E)->GetSubMeshDS()->NbNodes(); - if (nbEdges < 4) { - quad->edge[nbEdges] = E; - if(!_quadraticMesh) { - quad->nbPts[nbEdges] = nb + 2; // internal points + 2 extrema + quad->side.reserve(nbEdgesInWire.front()); + + int nbSides = 0; + list< TopoDS_Edge >::iterator edgeIt = edges.begin(); + if ( nbEdgesInWire.front() == 4 ) { // exactly 4 edges + for ( ; edgeIt != edges.end(); ++edgeIt, nbSides++ ) + quad->side.push_back( new StdMeshers_FaceSide(F, *edgeIt, &aMesh, + nbSides 4 ) { // more than 4 edges - try to unite some + list< TopoDS_Edge > sideEdges; + while ( !edges.empty()) { + sideEdges.clear(); + sideEdges.splice( sideEdges.end(), edges, edges.begin()); // edges.front() -> sideEdges.end() + bool sameSide = true; + while ( !edges.empty() && sameSide ) { + sameSide = SMESH_Algo::IsContinuous( sideEdges.back(), edges.front() ); + if ( sameSide ) + sideEdges.splice( sideEdges.end(), edges, edges.begin()); } - else { - int tmp = nb/2; - quad->nbPts[nbEdges] = tmp + 2; // internal not medium points + 2 extrema + if ( nbSides == 0 ) { // go backward from the first edge + sameSide = true; + while ( !edges.empty() && sameSide ) { + sameSide = SMESH_Algo::IsContinuous( sideEdges.front(), edges.back() ); + if ( sameSide ) + sideEdges.splice( sideEdges.begin(), edges, --edges.end()); + } + } + quad->side.push_back( new StdMeshers_FaceSide(F, sideEdges, &aMesh, + nbSidesside.clear(); + quad->side.reserve(nbEdgesInWire.front()); + nbSides = 0; + + SMESH_Block::GetOrderedEdges (F, V, edges, nbEdgesInWire); + while ( !edges.empty()) { + sideEdges.clear(); + sideEdges.splice( sideEdges.end(), edges, edges.begin()); + bool sameSide = true; + while ( !edges.empty() && sameSide ) { + sameSide = + SMESH_Algo::IsContinuous( sideEdges.back(), edges.front() ) && + twoEdgesMeatAtVertex( sideEdges.back(), edges.front(), aMesh ); + if ( sameSide ) + sideEdges.splice( sideEdges.end(), edges, edges.begin()); + } + if ( nbSides == 0 ) { // go backward from the first edge + sameSide = true; + while ( !edges.empty() && sameSide ) { + sameSide = + SMESH_Algo::IsContinuous( sideEdges.front(), edges.back() ) && + twoEdgesMeatAtVertex( sideEdges.front(), edges.back(), aMesh ); + if ( sameSide ) + sideEdges.splice( sideEdges.begin(), edges, --edges.end()); + } + } + quad->side.push_back( new StdMeshers_FaceSide(F, sideEdges, &aMesh, + nbSidesside[i]->NbEdges(); ++e ) + MESSAGE ( myTool->GetMeshDS()->ShapeToIndex( quad->side[i]->Edge( e )) << " " ); + MESSAGE ( ")\n" ); + } + //cout << endl; +#endif + if ( !nbSides ) + nbSides = nbEdgesInWire.front(); + error(COMPERR_BAD_SHAPE, TComm("Face must have 4 sides but not ") << nbSides); + delete quad; + quad = 0; } return quad; } + +//============================================================================= +/*! + * + */ +//============================================================================= + +bool StdMeshers_Quadrangle_2D::CheckNbEdgesForEvaluate(SMESH_Mesh& aMesh, + const TopoDS_Shape & aShape, + MapShapeNbElems& aResMap, + std::vector& aNbNodes, + bool& IsQuadratic) + +{ + const TopoDS_Face & F = TopoDS::Face(aShape); + + // verify 1 wire only, with 4 edges + TopoDS_Vertex V; + list< TopoDS_Edge > edges; + list< int > nbEdgesInWire; + int nbWire = SMESH_Block::GetOrderedEdges (F, V, edges, nbEdgesInWire); + if (nbWire != 1) { + return false; + } + + aNbNodes.resize(4); + + int nbSides = 0; + list< TopoDS_Edge >::iterator edgeIt = edges.begin(); + SMESH_subMesh * sm = aMesh.GetSubMesh( *edgeIt ); + MapShapeNbElemsItr anIt = aResMap.find(sm); + if(anIt==aResMap.end()) { + return false; + } + std::vector aVec = (*anIt).second; + IsQuadratic = (aVec[2] > aVec[1]); + if ( nbEdgesInWire.front() == 4 ) { // exactly 4 edges + for(; edgeIt != edges.end(); edgeIt++) { + SMESH_subMesh * sm = aMesh.GetSubMesh( *edgeIt ); + MapShapeNbElemsItr anIt = aResMap.find(sm); + if(anIt==aResMap.end()) { + return false; + } + std::vector aVec = (*anIt).second; + if(IsQuadratic) + aNbNodes[nbSides] = (aVec[0]-1)/2 + 2; + else + aNbNodes[nbSides] = aVec[0] + 2; + nbSides++; + } + } + else if ( nbEdgesInWire.front() > 4 ) { // more than 4 edges - try to unite some + list< TopoDS_Edge > sideEdges; + while ( !edges.empty()) { + sideEdges.clear(); + sideEdges.splice( sideEdges.end(), edges, edges.begin()); // edges.front() -> sideEdges.end() + bool sameSide = true; + while ( !edges.empty() && sameSide ) { + sameSide = SMESH_Algo::IsContinuous( sideEdges.back(), edges.front() ); + if ( sameSide ) + sideEdges.splice( sideEdges.end(), edges, edges.begin()); + } + if ( nbSides == 0 ) { // go backward from the first edge + sameSide = true; + while ( !edges.empty() && sameSide ) { + sameSide = SMESH_Algo::IsContinuous( sideEdges.front(), edges.back() ); + if ( sameSide ) + sideEdges.splice( sideEdges.begin(), edges, --edges.end()); + } + } + list::iterator ite = sideEdges.begin(); + aNbNodes[nbSides] = 1; + for(; ite!=sideEdges.end(); ite++) { + SMESH_subMesh * sm = aMesh.GetSubMesh( *ite ); + MapShapeNbElemsItr anIt = aResMap.find(sm); + if(anIt==aResMap.end()) { + return false; + } + std::vector aVec = (*anIt).second; + if(IsQuadratic) + aNbNodes[nbSides] += (aVec[0]-1)/2 + 1; + else + aNbNodes[nbSides] += aVec[0] + 1; + } + ++nbSides; + } + // issue 20222. Try to unite only edges shared by two same faces + if (nbSides < 4) { + nbSides = 0; + SMESH_Block::GetOrderedEdges (F, V, edges, nbEdgesInWire); + while ( !edges.empty()) { + sideEdges.clear(); + sideEdges.splice( sideEdges.end(), edges, edges.begin()); + bool sameSide = true; + while ( !edges.empty() && sameSide ) { + sameSide = + SMESH_Algo::IsContinuous( sideEdges.back(), edges.front() ) && + twoEdgesMeatAtVertex( sideEdges.back(), edges.front(), aMesh ); + if ( sameSide ) + sideEdges.splice( sideEdges.end(), edges, edges.begin()); + } + if ( nbSides == 0 ) { // go backward from the first edge + sameSide = true; + while ( !edges.empty() && sameSide ) { + sameSide = + SMESH_Algo::IsContinuous( sideEdges.front(), edges.back() ) && + twoEdgesMeatAtVertex( sideEdges.front(), edges.back(), aMesh ); + if ( sameSide ) + sideEdges.splice( sideEdges.begin(), edges, --edges.end()); + } + } + list::iterator ite = sideEdges.begin(); + aNbNodes[nbSides] = 1; + for(; ite!=sideEdges.end(); ite++) { + SMESH_subMesh * sm = aMesh.GetSubMesh( *ite ); + MapShapeNbElemsItr anIt = aResMap.find(sm); + if(anIt==aResMap.end()) { + return false; + } + std::vector aVec = (*anIt).second; + if(IsQuadratic) + aNbNodes[nbSides] += (aVec[0]-1)/2 + 1; + else + aNbNodes[nbSides] += aVec[0] + 1; + } + ++nbSides; + } + } + } + if (nbSides != 4) { + if ( !nbSides ) + nbSides = nbEdgesInWire.front(); + error(COMPERR_BAD_SHAPE, TComm("Face must have 4 sides but not ") << nbSides); + return false; + } + + return true; +} + + //============================================================================= /*! * CheckAnd2Dcompute @@ -618,12 +952,10 @@ FaceQuadStruct* StdMeshers_Quadrangle_2D::CheckNbEdges(SMESH_Mesh & aMesh, //============================================================================= FaceQuadStruct *StdMeshers_Quadrangle_2D::CheckAnd2Dcompute - (SMESH_Mesh & aMesh, + (SMESH_Mesh & aMesh, const TopoDS_Shape & aShape, - const bool CreateQuadratic) throw(SALOME_Exception) + const bool CreateQuadratic) //throw(SALOME_Exception) { - Unexpect aCatch(SalomeException); - _quadraticMesh = CreateQuadratic; FaceQuadStruct *quad = CheckNbEdges(aMesh, aShape); @@ -631,7 +963,12 @@ FaceQuadStruct *StdMeshers_Quadrangle_2D::CheckAnd2Dcompute if(!quad) return 0; // set normalized grid on unit square in parametric domain - SetNormalizedGrid(aMesh, aShape, quad); + bool stat = SetNormalizedGrid(aMesh, aShape, quad); + if(!stat) { + if(!quad) + delete quad; + quad = 0; + } return quad; } @@ -642,20 +979,23 @@ FaceQuadStruct *StdMeshers_Quadrangle_2D::CheckAnd2Dcompute */ //============================================================================= -void StdMeshers_Quadrangle_2D::QuadDelete (FaceQuadStruct * quad) +faceQuadStruct::~faceQuadStruct() { - //MESSAGE("StdMeshers_Quadrangle_2D::QuadDelete"); - if (quad) + for (int i = 0; i < side.size(); i++) { + if (side[i]) delete side[i]; + } + if (uv_grid) delete [] uv_grid; +} + +namespace { + inline const vector& GetUVPtStructIn(FaceQuadStruct* quad, int i, int nbSeg) { - for (int i = 0; i < 4; i++) - { - if (quad->uv_edges[i]) - delete [] quad->uv_edges[i]; - quad->edge[i].Nullify(); - } - if (quad->uv_grid) - delete [] quad->uv_grid; - delete quad; + bool isXConst = ( i == BOTTOM_SIDE || i == TOP_SIDE ); + double constValue = ( i == BOTTOM_SIDE || i == LEFT_SIDE ) ? 0 : 1; + return + quad->isEdgeOut[i] ? + quad->side[i]->SimulateUVPtStruct(nbSeg,isXConst,constValue) : + quad->side[i]->GetUVPtStruct(isXConst,constValue); } } @@ -665,18 +1005,17 @@ void StdMeshers_Quadrangle_2D::QuadDelete (FaceQuadStruct * quad) */ //============================================================================= -void StdMeshers_Quadrangle_2D::SetNormalizedGrid (SMESH_Mesh & aMesh, +bool StdMeshers_Quadrangle_2D::SetNormalizedGrid (SMESH_Mesh & aMesh, const TopoDS_Shape& aShape, - FaceQuadStruct* quad) throw (SALOME_Exception) + FaceQuadStruct* & quad) //throw (SALOME_Exception) { - Unexpect aCatch(SalomeException); // Algorithme décrit dans "Génération automatique de maillages" // P.L. GEORGE, MASSON, § 6.4.1 p. 84-85 // traitement dans le domaine paramétrique 2d u,v // transport - projection sur le carré unité // MESSAGE("StdMeshers_Quadrangle_2D::SetNormalizedGrid"); - const TopoDS_Face& F = TopoDS::Face(aShape); +// const TopoDS_Face& F = TopoDS::Face(aShape); // 1 --- find orientation of the 4 edges, by test on extrema @@ -692,88 +1031,26 @@ void StdMeshers_Quadrangle_2D::SetNormalizedGrid (SMESH_Mesh & aMesh, // =down // - Handle(Geom2d_Curve) c2d[4]; - gp_Pnt2d pf[4]; - gp_Pnt2d pl[4]; - for (int i = 0; i < 4; i++) - { - c2d[i] = BRep_Tool::CurveOnSurface(quad->edge[i], F, - quad->first[i], quad->last[i]); - pf[i] = c2d[i]->Value(quad->first[i]); - pl[i] = c2d[i]->Value(quad->last[i]); - quad->isEdgeForward[i] = false; - } - - double l0f1 = pl[0].SquareDistance(pf[1]); - double l0l1 = pl[0].SquareDistance(pl[1]); - double f0f1 = pf[0].SquareDistance(pf[1]); - double f0l1 = pf[0].SquareDistance(pl[1]); - if ( Min( l0f1, l0l1 ) < Min ( f0f1, f0l1 )) - { - quad->isEdgeForward[0] = true; - } else { - double tmp = quad->first[0]; - quad->first[0] = quad->last[0]; - quad->last[0] = tmp; - pf[0] = c2d[0]->Value(quad->first[0]); - pl[0] = c2d[0]->Value(quad->last[0]); - } - for (int i = 1; i < 4; i++) - { - l0l1 = pl[i - 1].SquareDistance(pl[i]); - l0f1 = pl[i - 1].SquareDistance(pf[i]); - quad->isEdgeForward[i] = ( l0f1 < l0l1 ); - if (!quad->isEdgeForward[i]) - { - double tmp = quad->first[i]; - quad->first[i] = quad->last[i]; - quad->last[i] = tmp; - pf[i] = c2d[i]->Value(quad->first[i]); - pl[i] = c2d[i]->Value(quad->last[i]); - } - } - - // 2 --- load 2d edge points (u,v) with orientation and value on unit square - - bool loadOk = true; - for (int i = 0; i < 2; i++) - { - quad->uv_edges[i] = LoadEdgePoints(aMesh, F, quad->edge[i], - quad->first[i], quad->last[i]); - if (!quad->uv_edges[i]) loadOk = false; - } - - for (int i = 2; i < 4; i++) - { - quad->uv_edges[i] = LoadEdgePoints(aMesh, F, quad->edge[i], - quad->last[i], quad->first[i]); - if (!quad->uv_edges[i]) loadOk = false; - } - - if (!loadOk) - { - INFOS("StdMeshers_Quadrangle_2D::SetNormalizedGrid - LoadEdgePoints failed"); - QuadDelete( quad ); - quad = 0; - return; - } // 3 --- 2D normalized values on unit square [0..1][0..1] - int nbhoriz = Min(quad->nbPts[0], quad->nbPts[2]); - int nbvertic = Min(quad->nbPts[1], quad->nbPts[3]); + int nbhoriz = Min(quad->side[0]->NbPoints(), quad->side[2]->NbPoints()); + int nbvertic = Min(quad->side[1]->NbPoints(), quad->side[3]->NbPoints()); + + quad->isEdgeOut[0] = (quad->side[0]->NbPoints() > quad->side[2]->NbPoints()); + quad->isEdgeOut[1] = (quad->side[1]->NbPoints() > quad->side[3]->NbPoints()); + quad->isEdgeOut[2] = (quad->side[2]->NbPoints() > quad->side[0]->NbPoints()); + quad->isEdgeOut[3] = (quad->side[3]->NbPoints() > quad->side[1]->NbPoints()); - quad->isEdgeOut[0] = (quad->nbPts[0] > quad->nbPts[2]); - quad->isEdgeOut[1] = (quad->nbPts[1] > quad->nbPts[3]); - quad->isEdgeOut[2] = (quad->nbPts[2] > quad->nbPts[0]); - quad->isEdgeOut[3] = (quad->nbPts[3] > quad->nbPts[1]); + UVPtStruct *uv_grid = quad->uv_grid = new UVPtStruct[nbvertic * nbhoriz]; - quad->uv_grid = new UVPtStruct[nbvertic * nbhoriz]; + const vector& uv_e0 = GetUVPtStructIn( quad, 0, nbhoriz - 1 ); + const vector& uv_e1 = GetUVPtStructIn( quad, 1, nbvertic - 1 ); + const vector& uv_e2 = GetUVPtStructIn( quad, 2, nbhoriz - 1 ); + const vector& uv_e3 = GetUVPtStructIn( quad, 3, nbvertic - 1 ); - UVPtStruct *uv_grid = quad->uv_grid; - UVPtStruct *uv_e0 = quad->uv_edges[0]; - UVPtStruct *uv_e1 = quad->uv_edges[1]; - UVPtStruct *uv_e2 = quad->uv_edges[2]; - UVPtStruct *uv_e3 = quad->uv_edges[3]; + if ( uv_e0.empty() || uv_e1.empty() || uv_e2.empty() || uv_e3.empty() ) + //return error( "Can't find nodes on sides"); + return error( COMPERR_BAD_INPUT_MESH ); // nodes Id on "in" edges if (! quad->isEdgeOut[0]) { @@ -805,21 +1082,6 @@ void StdMeshers_Quadrangle_2D::SetNormalizedGrid (SMESH_Mesh & aMesh, } } - // falsificate "out" edges - if (quad->isEdgeOut[0]) // down - uv_e0 = MakeEdgePoints - (aMesh, F, quad->edge[0], quad->first[0], quad->last[0], nbhoriz - 1); - else if (quad->isEdgeOut[2]) // up - uv_e2 = MakeEdgePoints - (aMesh, F, quad->edge[2], quad->last[2], quad->first[2], nbhoriz - 1); - - if (quad->isEdgeOut[1]) // right - uv_e1 = MakeEdgePoints - (aMesh, F, quad->edge[1], quad->first[1], quad->last[1], nbvertic - 1); - else if (quad->isEdgeOut[3]) // left - uv_e3 = MakeEdgePoints - (aMesh, F, quad->edge[3], quad->last[3], quad->first[3], nbvertic - 1); - // normalized 2d values on grid for (int i = 0; i < nbhoriz; i++) { @@ -843,10 +1105,10 @@ void StdMeshers_Quadrangle_2D::SetNormalizedGrid (SMESH_Mesh & aMesh, } // 4 --- projection on 2d domain (u,v) - gp_Pnt2d a0 = pf[0]; - gp_Pnt2d a1 = pf[1]; - gp_Pnt2d a2 = pf[2]; - gp_Pnt2d a3 = pf[3]; + gp_UV a0( uv_e0.front().u, uv_e0.front().v ); + gp_UV a1( uv_e0.back().u, uv_e0.back().v ); + gp_UV a2( uv_e2.back().u, uv_e2.back().v ); + gp_UV a3( uv_e2.front().u, uv_e2.front().v ); for (int i = 0; i < nbhoriz; i++) { @@ -855,188 +1117,149 @@ void StdMeshers_Quadrangle_2D::SetNormalizedGrid (SMESH_Mesh & aMesh, int ij = j * nbhoriz + i; double x = uv_grid[ij].x; double y = uv_grid[ij].y; - double param_0 = uv_e0[0].param + x * (uv_e0[nbhoriz - 1].param - uv_e0[0].param); // sud - double param_2 = uv_e2[0].param + x * (uv_e2[nbhoriz - 1].param - uv_e2[0].param); // nord - double param_1 = uv_e1[0].param + y * (uv_e1[nbvertic - 1].param - uv_e1[0].param); // est - double param_3 = uv_e3[0].param + y * (uv_e3[nbvertic - 1].param - uv_e3[0].param); // ouest + double param_0 = uv_e0[0].normParam + x * (uv_e0.back().normParam - uv_e0[0].normParam); // sud + double param_2 = uv_e2[0].normParam + x * (uv_e2.back().normParam - uv_e2[0].normParam); // nord + double param_1 = uv_e1[0].normParam + y * (uv_e1.back().normParam - uv_e1[0].normParam); // est + double param_3 = uv_e3[0].normParam + y * (uv_e3.back().normParam - uv_e3[0].normParam); // ouest //MESSAGE("params "<Value(param_0); - gp_Pnt2d p1 = c2d[1]->Value(param_1); - gp_Pnt2d p2 = c2d[2]->Value(param_2); - gp_Pnt2d p3 = c2d[3]->Value(param_3); - - double u = (1 - y) * p0.X() + x * p1.X() + y * p2.X() + (1 - x) * p3.X(); - double v = (1 - y) * p0.Y() + x * p1.Y() + y * p2.Y() + (1 - x) * p3.Y(); + gp_UV p0 = quad->side[0]->Value2d(param_0).XY(); + gp_UV p1 = quad->side[1]->Value2d(param_1).XY(); + gp_UV p2 = quad->side[2]->Value2d(param_2).XY(); + gp_UV p3 = quad->side[3]->Value2d(param_3).XY(); - u -= (1 - x) * (1 - y) * a0.X() + x * (1 - y) * a1.X() + - x * y * a2.X() + (1 - x) * y * a3.X(); - v -= (1 - x) * (1 - y) * a0.Y() + x * (1 - y) * a1.Y() + - x * y * a2.Y() + (1 - x) * y * a3.Y(); + gp_UV uv = (1 - y) * p0 + x * p1 + y * p2 + (1 - x) * p3; + uv -= (1 - x) * (1 - y) * a0 + x * (1 - y) * a1 + x * y * a2 + (1 - x) * y * a3; - uv_grid[ij].u = u; - uv_grid[ij].v = v; + uv_grid[ij].u = uv.X(); + uv_grid[ij].v = uv.Y(); } } + return true; } - //======================================================================= //function : ShiftQuad //purpose : auxilary function for ComputeQuadPref //======================================================================= -static void ShiftQuad(FaceQuadStruct* quad, const int num, bool WisF) + +static void ShiftQuad(FaceQuadStruct* quad, const int num, bool) { - if(num>3) return; - int i; - for(i=1; i<=num; i++) { - int nbPts3 = quad->nbPts[0]; - quad->nbPts[0] = quad->nbPts[1]; - quad->nbPts[1] = quad->nbPts[2]; - quad->nbPts[2] = quad->nbPts[3]; - quad->nbPts[3] = nbPts3; - TopoDS_Edge edge3 = quad->edge[0]; - quad->edge[0] = quad->edge[1]; - quad->edge[1] = quad->edge[2]; - quad->edge[2] = quad->edge[3]; - quad->edge[3] = edge3; - double first3 = quad->first[0]; - quad->first[0] = quad->first[1]; - quad->first[1] = quad->first[2]; - quad->first[2] = quad->first[3]; - quad->first[3] = first3; - double last3 = quad->last[0]; - quad->last[0] = quad->last[1]; - quad->last[1] = quad->last[2]; - quad->last[2] = quad->last[3]; - quad->last[3] = last3; - bool isEdgeForward3 = quad->isEdgeForward[0]; - quad->isEdgeForward[0] = quad->isEdgeForward[1]; - quad->isEdgeForward[1] = quad->isEdgeForward[2]; - quad->isEdgeForward[2] = quad->isEdgeForward[3]; - quad->isEdgeForward[3] = isEdgeForward3; - bool isEdgeOut3 = quad->isEdgeOut[0]; - quad->isEdgeOut[0] = quad->isEdgeOut[1]; - quad->isEdgeOut[1] = quad->isEdgeOut[2]; - quad->isEdgeOut[2] = quad->isEdgeOut[3]; - quad->isEdgeOut[3] = isEdgeOut3; - UVPtStruct* uv_edges3 = quad->uv_edges[0]; - quad->uv_edges[0] = quad->uv_edges[1]; - quad->uv_edges[1] = quad->uv_edges[2]; - quad->uv_edges[2] = quad->uv_edges[3]; - quad->uv_edges[3] = uv_edges3; - } - if(!WisF) { - // replacement left and right edges - int nbPts3 = quad->nbPts[1]; - quad->nbPts[1] = quad->nbPts[3]; - quad->nbPts[3] = nbPts3; - TopoDS_Edge edge3 = quad->edge[1]; - quad->edge[1] = quad->edge[3]; - quad->edge[3] = edge3; - double first3 = quad->first[1]; - quad->first[1] = quad->first[3]; - quad->first[3] = first3; - double last3 = quad->last[1]; - quad->last[1] = quad->last[2]; - quad->last[3] = last3; - bool isEdgeForward3 = quad->isEdgeForward[1]; - quad->isEdgeForward[1] = quad->isEdgeForward[3]; - quad->isEdgeForward[3] = isEdgeForward3; - bool isEdgeOut3 = quad->isEdgeOut[1]; - quad->isEdgeOut[1] = quad->isEdgeOut[3]; - quad->isEdgeOut[3] = isEdgeOut3; - UVPtStruct* uv_edges3 = quad->uv_edges[1]; - quad->uv_edges[1] = quad->uv_edges[3]; - quad->uv_edges[3] = uv_edges3; + StdMeshers_FaceSide* side[4] = { quad->side[0], quad->side[1], quad->side[2], quad->side[3] }; + for (int i = BOTTOM_SIDE; i < NB_SIDES; ++i ) { + int id = ( i + num ) % NB_SIDES; + bool wasForward = ( i < TOP_SIDE ); + bool newForward = ( id < TOP_SIDE ); + if ( wasForward != newForward ) + side[ i ]->Reverse(); + quad->side[ id ] = side[ i ]; } } - //======================================================================= //function : CalcUV //purpose : auxilary function for ComputeQuadPref //======================================================================= -static gp_XY CalcUV(double x0, double x1, double y0, double y1, + +static gp_UV CalcUV(double x0, double x1, double y0, double y1, FaceQuadStruct* quad, - const gp_Pnt2d& a0, const gp_Pnt2d& a1, - const gp_Pnt2d& a2, const gp_Pnt2d& a3, - const Handle(Geom2d_Curve)& c2db, - const Handle(Geom2d_Curve)& c2dr, - const Handle(Geom2d_Curve)& c2dt, - const Handle(Geom2d_Curve)& c2dl) + const gp_UV& a0, const gp_UV& a1, + const gp_UV& a2, const gp_UV& a3) { - int nb = quad->nbPts[0]; - int nr = quad->nbPts[1]; - int nt = quad->nbPts[2]; - int nl = quad->nbPts[3]; - - UVPtStruct* uv_eb = quad->uv_edges[0]; - UVPtStruct* uv_er = quad->uv_edges[1]; - UVPtStruct* uv_et = quad->uv_edges[2]; - UVPtStruct* uv_el = quad->uv_edges[3]; + const vector& uv_eb = quad->side[0]->GetUVPtStruct(true,0 ); + const vector& uv_er = quad->side[1]->GetUVPtStruct(false,1); + const vector& uv_et = quad->side[2]->GetUVPtStruct(true,1 ); + const vector& uv_el = quad->side[3]->GetUVPtStruct(false,0); double x = (x0 + y0 * (x1 - x0)) / (1 - (y1 - y0) * (x1 - x0)); double y = y0 + x * (y1 - y0); - double param_b = uv_eb[0].param + x * (uv_eb[nb-1].param - uv_eb[0].param); - double param_t = uv_et[0].param + x * (uv_et[nt-1].param - uv_et[0].param); - double param_r = uv_er[0].param + y * (uv_er[nr-1].param - uv_er[0].param); - double param_l = uv_el[0].param + y * (uv_el[nl-1].param - uv_el[0].param); + double param_b = uv_eb[0].normParam + x * (uv_eb.back().normParam - uv_eb[0].normParam); + double param_t = uv_et[0].normParam + x * (uv_et.back().normParam - uv_et[0].normParam); + double param_r = uv_er[0].normParam + y * (uv_er.back().normParam - uv_er[0].normParam); + double param_l = uv_el[0].normParam + y * (uv_el.back().normParam - uv_el[0].normParam); - gp_Pnt2d p0 = c2db->Value(param_b); - gp_Pnt2d p1 = c2dr->Value(param_r); - gp_Pnt2d p2 = c2dt->Value(param_t); - gp_Pnt2d p3 = c2dl->Value(param_l); + gp_UV p0 = quad->side[BOTTOM_SIDE]->Value2d(param_b).XY(); + gp_UV p1 = quad->side[RIGHT_SIDE ]->Value2d(param_r).XY(); + gp_UV p2 = quad->side[TOP_SIDE ]->Value2d(param_t).XY(); + gp_UV p3 = quad->side[LEFT_SIDE ]->Value2d(param_l).XY(); - double u = (1 - y) * p0.X() + x * p1.X() + y * p2.X() + (1 - x) * p3.X(); - double v = (1 - y) * p0.Y() + x * p1.Y() + y * p2.Y() + (1 - x) * p3.Y(); + gp_UV uv = p0 * (1 - y) + p1 * x + p2 * y + p3 * (1 - x); - u -= (1 - x) * (1 - y) * a0.X() + x * (1 - y) * a1.X() + - x * y * a2.X() + (1 - x) * y * a3.X(); - v -= (1 - x) * (1 - y) * a0.Y() + x * (1 - y) * a1.Y() + - x * y * a2.Y() + (1 - x) * y * a3.Y(); + uv -= (1 - x) * (1 - y) * a0 + x * (1 - y) * a1 + x * y * a2 + (1 - x) * y * a3; - //cout<<"x0="<ShapeToIndex( F ); - int nb = quad->nbPts[0]; - int nr = quad->nbPts[1]; - int nt = quad->nbPts[2]; - int nl = quad->nbPts[3]; + int nb = quad->side[0]->NbPoints(); + int nr = quad->side[1]->NbPoints(); + int nt = quad->side[2]->NbPoints(); + int nl = quad->side[3]->NbPoints(); int dh = abs(nb-nt); int dv = abs(nr-nl); @@ -1052,19 +1275,19 @@ bool StdMeshers_Quadrangle_2D::ComputeQuadPref } else { if( nr>nl ) { - // we have to shift quad on 3 - ShiftQuad(quad,3,WisF); - } - else { // we have to shift quad on 1 ShiftQuad(quad,1,WisF); } + else { + // we have to shift quad on 3 + ShiftQuad(quad,3,WisF); + } } - nb = quad->nbPts[0]; - nr = quad->nbPts[1]; - nt = quad->nbPts[2]; - nl = quad->nbPts[3]; + nb = quad->side[0]->NbPoints(); + nr = quad->side[1]->NbPoints(); + nt = quad->side[2]->NbPoints(); + nl = quad->side[3]->NbPoints(); dh = abs(nb-nt); dv = abs(nr-nl); int nbh = Max(nb,nt); @@ -1072,6 +1295,7 @@ bool StdMeshers_Quadrangle_2D::ComputeQuadPref int addh = 0; int addv = 0; + // ----------- Old version --------------- // orientation of face and 3 main domain for future faces // 0 top 1 // 1------------1 @@ -1085,6 +1309,20 @@ bool StdMeshers_Quadrangle_2D::ComputeQuadPref // 0------------0 // 0 bottom 1 + // ----------- New version --------------- + // orientation of face and 3 main domain for future faces + // 0 top 1 + // 1------------1 + // | |____| | + // | / \ | + // | / C \ | + // left |/________\| rigth + // | | + // | | + // | | + // 0------------0 + // 0 bottom 1 + if(dh>dv) { addv = (dh-dv)/2; nbv = nbv + addv; @@ -1094,39 +1332,17 @@ bool StdMeshers_Quadrangle_2D::ComputeQuadPref nbh = nbh + addh; } - Handle(Geom2d_Curve) c2d[4]; - for(i=0; i<4; i++) { - c2d[i] = BRep_Tool::CurveOnSurface(quad->edge[i], F, - quad->first[i], quad->last[i]); - } - - bool loadOk = true; - for(i=0; i<2; i++) { - quad->uv_edges[i] = LoadEdgePoints2(aMesh, F, quad->edge[i], false); - if(!quad->uv_edges[i]) loadOk = false; - } - for(i=2; i<4; i++) { - quad->uv_edges[i] = LoadEdgePoints2(aMesh, F, quad->edge[i], true); - if (!quad->uv_edges[i]) loadOk = false; - } - if (!loadOk) { - INFOS("StdMeshers_Quadrangle_2D::ComputeQuadPref - LoadEdgePoints failed"); - QuadDelete( quad ); - quad = 0; - return false; - } - - UVPtStruct* uv_eb = quad->uv_edges[0]; - UVPtStruct* uv_er = quad->uv_edges[1]; - UVPtStruct* uv_et = quad->uv_edges[2]; - UVPtStruct* uv_el = quad->uv_edges[3]; + const vector& uv_eb = quad->side[0]->GetUVPtStruct(true,0 ); + const vector& uv_er = quad->side[1]->GetUVPtStruct(false,1); + const vector& uv_et = quad->side[2]->GetUVPtStruct(true,1 ); + const vector& uv_el = quad->side[3]->GetUVPtStruct(false,0); // arrays for normalized params //cout<<"Dump B:"<X()<<","<Y()<<","<Z()<<")"<D0(uv_eb[0].param,a[0]); - c2d[0]->D0(uv_eb[nb-1].param,a[1]); - c2d[2]->D0(uv_et[nt-1].param,a[2]); - c2d[2]->D0(uv_et[0].param,a[3]); - //cout<<" a[0]("<0) { - // add top nodes - for(i=1; i<=dl; i++) - NodesL.SetValue(i+1,nl,uv_et[i].node); + if(OldVersion) { + // step1: create faces for left domain + StdMeshers_Array2OfNode NodesL(1,dl+1,1,nl); + // add left nodes + for(j=1; j<=nl; j++) + NodesL.SetValue(1,j,uv_el[j-1].node); + if(dl>0) { + // add top nodes + for(i=1; i<=dl; i++) + NodesL.SetValue(i+1,nl,uv_et[i].node); + // create and add needed nodes + TColgp_SequenceOfXY UVtmp; + for(i=1; i<=dl; i++) { + double x0 = npt.Value(i+1); + double x1 = x0; + // diagonal node + double y0 = npl.Value(i+1); + double y1 = npr.Value(i+1); + gp_UV UV = CalcUV(x0, x1, y0, y1, quad, a0, a1, a2, a3); + gp_Pnt P = S->Value(UV.X(),UV.Y()); + SMDS_MeshNode * N = meshDS->AddNode(P.X(), P.Y(), P.Z()); + meshDS->SetNodeOnFace(N, geomFaceID, UV.X(), UV.Y()); + NodesL.SetValue(i+1,1,N); + if(UVL.Length()Value(UV.X(),UV.Y()); + SMDS_MeshNode* N = meshDS->AddNode(P.X(), P.Y(), P.Z()); + meshDS->SetNodeOnFace(N, geomFaceID, UV.X(), UV.Y()); + NodesL.SetValue(i+1,j,N); + if( i==dl ) UVtmp.Append(UV); + } + } + for(i=1; i<=UVtmp.Length() && UVL.Length()X()<<","<Y()<<","<Z()<<")"; + // } + // cout<AddFace(NodesL.Value(i,j), NodesL.Value(i+1,j), + NodesL.Value(i+1,j+1), NodesL.Value(i,j+1)); + meshDS->SetMeshElementOnShape(F, geomFaceID); + } + else { + SMDS_MeshFace* F = + myTool->AddFace(NodesL.Value(i,j), NodesL.Value(i,j+1), + NodesL.Value(i+1,j+1), NodesL.Value(i+1,j)); + meshDS->SetMeshElementOnShape(F, geomFaceID); + } + } + } + } + else { + // fill UVL using c2d + for(i=1; i0) { + // add top nodes + for(i=1; i<=dr; i++) + NodesR.SetValue(i+1,1,uv_et[nt-1-i].node); + // create and add needed nodes + TColgp_SequenceOfXY UVtmp; + for(i=1; i<=dr; i++) { + double x0 = npt.Value(nt-i); + double x1 = x0; + // diagonal node + double y0 = npl.Value(i+1); + double y1 = npr.Value(i+1); + gp_UV UV = CalcUV(x0, x1, y0, y1, quad, a0, a1, a2, a3); + gp_Pnt P = S->Value(UV.X(),UV.Y()); + SMDS_MeshNode * N = meshDS->AddNode(P.X(), P.Y(), P.Z()); + meshDS->SetNodeOnFace(N, geomFaceID, UV.X(), UV.Y()); + NodesR.SetValue(i+1,nr,N); + if(UVR.Length()Value(UV.X(),UV.Y()); + SMDS_MeshNode* N = meshDS->AddNode(P.X(), P.Y(), P.Z()); + meshDS->SetNodeOnFace(N, geomFaceID, UV.X(), UV.Y()); + NodesR.SetValue(i+1,j,N); + if( i==dr ) UVtmp.Prepend(UV); + } + } + for(i=1; i<=UVtmp.Length() && UVR.Length()AddFace(NodesR.Value(i,j), NodesR.Value(i+1,j), + NodesR.Value(i+1,j+1), NodesR.Value(i,j+1)); + meshDS->SetMeshElementOnShape(F, geomFaceID); + } + else { + SMDS_MeshFace* F = + myTool->AddFace(NodesR.Value(i,j), NodesR.Value(i,j+1), + NodesR.Value(i+1,j+1), NodesR.Value(i+1,j)); + meshDS->SetMeshElementOnShape(F, geomFaceID); + } + } + } + } + else { + // fill UVR using c2d + for(i=1; iValue(UV.X(),UV.Y()); - SMDS_MeshNode * N = meshDS->AddNode(P.X(), P.Y(), P.Z()); - meshDS->SetNodeOnFace(N, geomFaceID, UV.X(), UV.Y()); - NodesL.SetValue(i+1,1,N); - if(UVL.Length()Value(UV.X(),UV.Y()); SMDS_MeshNode* N = meshDS->AddNode(P.X(), P.Y(), P.Z()); meshDS->SetNodeOnFace(N, geomFaceID, UV.X(), UV.Y()); - NodesL.SetValue(i+1,j,N); - if( i==dl ) UVtmp.Append(UV); + NodesC.SetValue(i,nbv-nnn+j,N); } } - for(i=1; i<=UVtmp.Length() && UVL.Length()X()<<","<Y()<<","<Z()<<")"; - // } - // cout<Value(u,v); + SMDS_MeshNode* N = meshDS->AddNode(P.X(), P.Y(), P.Z()); + meshDS->SetNodeOnFace(N, geomFaceID, u, v); + NodesC.SetValue(j,i+1,N); + } + } // create faces - for(i=1; i<=dl; i++) { - for(j=1; jAddFace(NodesL.Value(i,j), NodesL.Value(i+1,j), - NodesL.Value(i+1,j+1), NodesL.Value(i,j+1)); + myTool->AddFace(NodesC.Value(i,j), NodesC.Value(i+1,j), + NodesC.Value(i+1,j+1), NodesC.Value(i,j+1)); meshDS->SetMeshElementOnShape(F, geomFaceID); } else { SMDS_MeshFace* F = - myTool->AddFace(NodesL.Value(i,j), NodesL.Value(i,j+1), - NodesL.Value(i+1,j+1), NodesL.Value(i+1,j)); + myTool->AddFace(NodesC.Value(i,j), NodesC.Value(i,j+1), + NodesC.Value(i+1,j+1), NodesC.Value(i+1,j)); meshDS->SetMeshElementOnShape(F, geomFaceID); } } } } - else { - // fill UVL using c2d - for(i=1; iD0(uv_el[i].param,p2d); - UVL.Append(p2d.XY()); - } - } - // step2: create faces for right domain - StdMeshers_Array2OfNode NodesR(1,dr+1,1,nr); - // add right nodes - for(j=1; j<=nr; j++) - NodesR.SetValue(1,j,uv_er[nr-j].node); - if(dr>0) { - // add top nodes - for(i=1; i<=dr; i++) - NodesR.SetValue(i+1,1,uv_et[nt-1-i].node); - // create and add needed nodes - TColgp_SequenceOfXY UVtmp; - for(i=1; i<=dr; i++) { - double x0 = npt.Value(nt-i); - double x1 = x0; - // diagonal node - double y0 = npl.Value(i+1); - double y1 = npr.Value(i+1); - gp_XY UV = CalcUV(x0, x1, y0, y1, quad, a[0], a[1], a[2], a[3], - c2d[0], c2d[1], c2d[2], c2d[3]); - gp_Pnt P = S->Value(UV.X(),UV.Y()); - SMDS_MeshNode * N = meshDS->AddNode(P.X(), P.Y(), P.Z()); - meshDS->SetNodeOnFace(N, geomFaceID, UV.X(), UV.Y()); - NodesR.SetValue(i+1,nr,N); - if(UVR.Length()Value(UV.X(),UV.Y()); + else { // New version (!OldVersion) + // step1: create faces for bottom rectangle domain + StdMeshers_Array2OfNode NodesBRD(1,nb,1,nnn-1); + // fill UVL and UVR using c2d + for(j=0; jValue(u,v); SMDS_MeshNode* N = meshDS->AddNode(P.X(), P.Y(), P.Z()); - meshDS->SetNodeOnFace(N, geomFaceID, UV.X(), UV.Y()); - NodesR.SetValue(i+1,j,N); - if( i==dr ) UVtmp.Prepend(UV); + meshDS->SetNodeOnFace(N, geomFaceID, u, v); + NodesBRD.SetValue(j,i+1,N); + } } - for(i=1; i<=UVtmp.Length() && UVR.Length()AddFace(NodesR.Value(i,j), NodesR.Value(i+1,j), - NodesR.Value(i+1,j+1), NodesR.Value(i,j+1)); + myTool->AddFace(NodesBRD.Value(i,j), NodesBRD.Value(i+1,j), + NodesBRD.Value(i+1,j+1), NodesBRD.Value(i,j+1)); meshDS->SetMeshElementOnShape(F, geomFaceID); } else { SMDS_MeshFace* F = - myTool->AddFace(NodesR.Value(i,j), NodesR.Value(i,j+1), - NodesR.Value(i+1,j+1), NodesR.Value(i+1,j)); + myTool->AddFace(NodesBRD.Value(i,j), NodesBRD.Value(i,j+1), + NodesBRD.Value(i+1,j+1), NodesBRD.Value(i+1,j)); meshDS->SetMeshElementOnShape(F, geomFaceID); } } } - } - else { - // fill UVR using c2d - for(i=1; iD0(uv_er[i].param,p2d); - UVR.Append(p2d.XY()); + int drl = abs(nr-nl); + // create faces for region C + StdMeshers_Array2OfNode NodesC(1,nb,1,drl+1+addv); + // add nodes from previous region + for(j=1; j<=nb; j++) { + NodesC.SetValue(j,1,NodesBRD.Value(j,nnn-1)); } - } + if( (drl+addv) > 0 ) { + int n1,n2; + if(nr>nl) { + n1 = 1; + n2 = drl + 1; + TColgp_SequenceOfXY UVtmp; + double drparam = npr.Value(nr) - npr.Value(nnn-1); + double dlparam = npl.Value(nnn) - npl.Value(nnn-1); + double y0,y1; + for(i=1; i<=drl; i++) { + // add existed nodes from right edge + NodesC.SetValue(nb,i+1,uv_er[nnn+i-2].node); + //double dtparam = npt.Value(i+1); + y1 = npr.Value(nnn+i-1); // param on right edge + double dpar = (y1 - npr.Value(nnn-1))/drparam; + y0 = npl.Value(nnn-1) + dpar*dlparam; // param on left edge + double dy = y1 - y0; + for(j=1; jValue(UV.X(),UV.Y()); + SMDS_MeshNode* N = meshDS->AddNode(P.X(), P.Y(), P.Z()); + meshDS->SetNodeOnFace(N, geomFaceID, UV.X(), UV.Y()); + NodesC.SetValue(j,i+1,N); + } + } + double dy0 = (1-y0)/(addv+1); + double dy1 = (1-y1)/(addv+1); + for(i=1; i<=addv; i++) { + double yy0 = y0 + dy0*i; + double yy1 = y1 + dy1*i; + double dyy = yy1 - yy0; + for(j=1; j<=nb; j++) { + double x = npt.Value(i+1+drl) + + npb.Value(j) * ( npt.Value(nt-i) - npt.Value(i+1+drl) ); + double y = yy0 + dyy*x; + gp_UV UV = CalcUV2(x, y, quad, a0, a1, a2, a3); + gp_Pnt P = S->Value(UV.X(),UV.Y()); + SMDS_MeshNode* N = meshDS->AddNode(P.X(), P.Y(), P.Z()); + meshDS->SetNodeOnFace(N, geomFaceID, UV.X(), UV.Y()); + NodesC.SetValue(j,i+drl+1,N); + } + } + } + else { // nrValue(UV.X(),UV.Y()); + SMDS_MeshNode* N = meshDS->AddNode(P.X(), P.Y(), P.Z()); + meshDS->SetNodeOnFace(N, geomFaceID, UV.X(), UV.Y()); + NodesC.SetValue(j,i+1,N); + } + } + double dy0 = (1-y0)/(addv+1); + double dy1 = (1-y1)/(addv+1); + for(i=1; i<=addv; i++) { + double yy0 = y0 + dy0*i; + double yy1 = y1 + dy1*i; + double dyy = yy1 - yy0; + for(j=1; j<=nb; j++) { + double x = npt.Value(i+1) + + npb.Value(j) * ( npt.Value(nt-i-drl) - npt.Value(i+1) ); + double y = yy0 + dyy*x; + gp_UV UV = CalcUV2(x, y, quad, a0, a1, a2, a3); + gp_Pnt P = S->Value(UV.X(),UV.Y()); + SMDS_MeshNode* N = meshDS->AddNode(P.X(), P.Y(), P.Z()); + meshDS->SetNodeOnFace(N, geomFaceID, UV.X(), UV.Y()); + NodesC.SetValue(j,i+drl+1,N); + } + } + } + // create faces + for(j=1; j<=drl+addv; j++) { + for(i=1; iAddFace(NodesC.Value(i,j), NodesC.Value(i+1,j), + NodesC.Value(i+1,j+1), NodesC.Value(i,j+1)); + meshDS->SetMeshElementOnShape(F, geomFaceID); + } + else { + SMDS_MeshFace* F = + myTool->AddFace(NodesC.Value(i,j), NodesC.Value(i,j+1), + NodesC.Value(i+1,j+1), NodesC.Value(i+1,j)); + meshDS->SetMeshElementOnShape(F, geomFaceID); + } + } + } // end nrD0(uv_eb[i-1].param,p2d); - } - // create and add needed nodes - // add linear layers - for(i=2; iValue(UV.X(),UV.Y()); - SMDS_MeshNode* N = meshDS->AddNode(P.X(), P.Y(), P.Z()); - meshDS->SetNodeOnFace(N, geomFaceID, UV.X(), UV.Y()); - NodesC.SetValue(i,nbv-nnn+j,N); - } - } - // add diagonal layers - //cout<<"UVL.Length()="<Value(u,v); - SMDS_MeshNode* N = meshDS->AddNode(P.X(), P.Y(), P.Z()); - meshDS->SetNodeOnFace(N, geomFaceID, u, v); - NodesC.SetValue(j,i+1,N); - } - } - // create faces - for(i=1; iAddFace(NodesC.Value(i,j), NodesC.Value(i+1,j), - NodesC.Value(i+1,j+1), NodesC.Value(i,j+1)); - meshDS->SetMeshElementOnShape(F, geomFaceID); + StdMeshers_Array2OfNode NodesLast(1,nt,1,2); + for(i=1; i<=nt; i++) { + NodesLast.SetValue(i,2,uv_et[i-1].node); } - else { - SMDS_MeshFace* F = - myTool->AddFace(NodesC.Value(i,j), NodesC.Value(i,j+1), - NodesC.Value(i+1,j+1), NodesC.Value(i+1,j)); - meshDS->SetMeshElementOnShape(F, geomFaceID); + int nnn=0; + for(i=n1; i=n2; i--) { + nnn++; + NodesLast.SetValue(nnn,1,NodesC.Value(nb,i)); + } + for(i=1; iAddFace(NodesLast.Value(i,1), NodesLast.Value(i+1,1), + NodesLast.Value(i+1,2), NodesLast.Value(i,2)); + meshDS->SetMeshElementOnShape(F, geomFaceID); + } + else { + SMDS_MeshFace* F = + myTool->AddFace(NodesLast.Value(i,1), NodesLast.Value(i,2), + NodesLast.Value(i+1,2), NodesLast.Value(i+1,2)); + meshDS->SetMeshElementOnShape(F, geomFaceID); + } + } + } // if( (drl+addv) > 0 ) + + } // end new version implementation - QuadDelete(quad); bool isOk = true; return isOk; } -//============================================================================= +//======================================================================= /*! - * LoadEdgePoints2 + * Evaluate only quandrangle faces */ -//============================================================================= -UVPtStruct* StdMeshers_Quadrangle_2D::LoadEdgePoints2 (SMESH_Mesh & aMesh, - const TopoDS_Face& F, - const TopoDS_Edge& E, - bool IsReverse) -{ - //MESSAGE("StdMeshers_Quadrangle_2D::LoadEdgePoints"); - // --- IDNodes of first and last Vertex - TopoDS_Vertex VFirst, VLast; - TopExp::Vertices(E, VFirst, VLast); // corresponds to f and l - - ASSERT(!VFirst.IsNull()); - SMDS_NodeIteratorPtr lid = aMesh.GetSubMesh(VFirst)->GetSubMeshDS()->GetNodes(); - if (!lid->more()) { - MESSAGE ( "NO NODE BUILT ON VERTEX" ); - return 0; - } - const SMDS_MeshNode* idFirst = lid->next(); +//======================================================================= - ASSERT(!VLast.IsNull()); - lid = aMesh.GetSubMesh(VLast)->GetSubMeshDS()->GetNodes(); - if (!lid->more()) { - MESSAGE ( "NO NODE BUILT ON VERTEX" ); - return 0; - } - const SMDS_MeshNode* idLast = lid->next(); +bool StdMeshers_Quadrangle_2D::EvaluateQuadPref(SMESH_Mesh & aMesh, + const TopoDS_Shape& aShape, + std::vector& aNbNodes, + MapShapeNbElems& aResMap, + bool IsQuadratic) +{ + // Auxilary key in order to keep old variant + // of meshing after implementation new variant + // for bug 0016220 from Mantis. + bool OldVersion = false; - // --- edge internal IDNodes (relies on good order storage, not checked) + const TopoDS_Face& F = TopoDS::Face(aShape); + Handle(Geom_Surface) S = BRep_Tool::Surface(F); - map params; - SMDS_NodeIteratorPtr ite = aMesh.GetSubMesh(E)->GetSubMeshDS()->GetNodes(); - int nbPoints = aMesh.GetSubMesh(E)->GetSubMeshDS()->NbNodes(); + int nb = aNbNodes[0]; + int nr = aNbNodes[1]; + int nt = aNbNodes[2]; + int nl = aNbNodes[3]; + int dh = abs(nb-nt); + int dv = abs(nr-nl); - if(!_quadraticMesh) { - while(ite->more()) { - const SMDS_MeshNode* node = ite->next(); - const SMDS_EdgePosition* epos = - static_cast(node->GetPosition().get()); - double param = epos->GetUParameter(); - params[param] = node; - } - } - else { - vector nodes(nbPoints+2); - nodes[0] = idFirst; - nodes[nbPoints+1] = idLast; - nbPoints = nbPoints/2; - int nn = 1; - while(ite->more()) { - const SMDS_MeshNode* node = ite->next(); - nodes[nn++] = node; - // check if node is medium - bool IsMedium = false; - SMDS_ElemIteratorPtr itn = node->GetInverseElementIterator(); - while (itn->more()) { - const SMDS_MeshElement* elem = itn->next(); - if ( elem->GetType() != SMDSAbs_Edge ) - continue; - if(elem->IsMediumNode(node)) { - IsMedium = true; - break; - } - } - if(IsMedium) - continue; - const SMDS_EdgePosition* epos = - static_cast(node->GetPosition().get()); - double param = epos->GetUParameter(); - params[param] = node; + if( dh>=dv ) { + if( nt>nb ) { + // it is a base case => not shift } - } - - if (nbPoints != params.size()) { - MESSAGE( "BAD NODE ON EDGE POSITIONS" ); - return 0; - } - UVPtStruct* uvslf = new UVPtStruct[nbPoints + 2]; - - double f, l; - Handle(Geom2d_Curve) C2d = BRep_Tool::CurveOnSurface(E, F, f, l); - - const TopoDS_Wire& W = BRepTools::OuterWire(F); - bool FisF = (F.Orientation()==TopAbs_FORWARD); - bool WisF = (W.Orientation()==TopAbs_FORWARD); - bool isForward = (E.Orientation()==TopAbs_FORWARD); - //if(isForward) cout<<"E is FORWARD"<Value(f); // first point = Vertex Forward - uvslf[0].x = p.X(); - uvslf[0].y = p.Y(); - uvslf[0].param = f; - uvslf[0].node = idFirst; - //MESSAGE("__ f "<::iterator itp = params.begin(); - for (int i = 1; i <= nbPoints; i++) { // nbPoints internal - double param = (*itp).first; - gp_Pnt2d p = C2d->Value(param); - uvslf[i].x = p.X(); - uvslf[i].y = p.Y(); - uvslf[i].param = param; - uvslf[i].node = (*itp).second; - //MESSAGE("__ "<Value(l); // last point = Vertex Reversed - uvslf[nbPoints + 1].x = p.X(); - uvslf[nbPoints + 1].y = p.Y(); - uvslf[nbPoints + 1].param = l; - uvslf[nbPoints + 1].node = idLast; - //MESSAGE("__ l "<Value(l); // first point = Vertex Reversed - uvslf[0].x = p.X(); - uvslf[0].y = p.Y(); - uvslf[0].param = l; - uvslf[0].node = idLast; - //MESSAGE("__ l "<::reverse_iterator itp = params.rbegin(); - for (int j = nbPoints; j >= 1; j--) { // nbPoints internal - double param = (*itp).first; - int i = nbPoints + 1 - j; - gp_Pnt2d p = C2d->Value(param); - uvslf[i].x = p.X(); - uvslf[i].y = p.Y(); - uvslf[i].param = param; - uvslf[i].node = (*itp).second; - //MESSAGE("__ "<Value(f); // last point = Vertex Forward - uvslf[nbPoints + 1].x = p.X(); - uvslf[nbPoints + 1].y = p.Y(); - uvslf[nbPoints + 1].param = f; - uvslf[nbPoints + 1].node = idFirst; - //MESSAGE("__ f "<GetSubMeshDS()->GetNodes(); - if (!lid->more()) - { - MESSAGE ( "NO NODE BUILT ON VERTEX" ); - return 0; - } - const SMDS_MeshNode* idFirst = lid->next(); - - ASSERT(!VLast.IsNull()); - lid = aMesh.GetSubMesh(VLast)->GetSubMeshDS()->GetNodes(); - if (!lid->more()) - { - MESSAGE ( "NO NODE BUILT ON VERTEX" ); - return 0; - } - const SMDS_MeshNode* idLast = lid->next(); - - // --- edge internal IDNodes (relies on good order storage, not checked) - -// if(_quadraticMesh) { - // fill myNLinkNodeMap -// SMDS_ElemIteratorPtr iter = aMesh.GetSubMesh(E)->GetSubMeshDS()->GetElements(); -// while(iter->more()) { -// const SMDS_MeshElement* elem = iter->next(); -// SMDS_ElemIteratorPtr nodeIt = elem->nodesIterator(); -// const SMDS_MeshNode* n1 = static_cast( nodeIt->next() ); -// const SMDS_MeshNode* n2 = static_cast( nodeIt->next() ); -// const SMDS_MeshNode* n3 = static_cast( nodeIt->next() ); -// NLink link(( n1 < n2 ? n1 : n2 ), ( n1 < n2 ? n2 : n1 )); -// myNLinkNodeMap.insert(NLinkNodeMap::value_type(link,n3)); -// myNLinkNodeMap[link] = n3; -// } -// } - - map params; - SMDS_NodeIteratorPtr ite = aMesh.GetSubMesh(E)->GetSubMeshDS()->GetNodes(); - int nbPoints = aMesh.GetSubMesh(E)->GetSubMeshDS()->NbNodes(); - - if(!_quadraticMesh) { - while(ite->more()) { - const SMDS_MeshNode* node = ite->next(); - const SMDS_EdgePosition* epos = - static_cast(node->GetPosition().get()); - double param = epos->GetUParameter(); - params[param] = node; + if( nr>nl ) { + // we have to shift quad on 1 + nb = aNbNodes[3]; + nr = aNbNodes[0]; + nt = aNbNodes[1]; + nl = aNbNodes[2]; } - } - else { - nbPoints = nbPoints/2; - while(ite->more()) { - const SMDS_MeshNode* node = ite->next(); - // check if node is medium - bool IsMedium = false; - SMDS_ElemIteratorPtr itn = node->GetInverseElementIterator(); - while (itn->more()) { - const SMDS_MeshElement* elem = itn->next(); - if ( elem->GetType() != SMDSAbs_Edge ) - continue; - if(elem->IsMediumNode(node)) { - IsMedium = true; - break; - } - } - if(IsMedium) - continue; - const SMDS_EdgePosition* epos = - static_cast(node->GetPosition().get()); - double param = epos->GetUParameter(); - params[param] = node; + else { + // we have to shift quad on 3 + nb = aNbNodes[1]; + nr = aNbNodes[2]; + nt = aNbNodes[3]; + nl = aNbNodes[0]; } } - if (nbPoints != params.size()) { - MESSAGE( "BAD NODE ON EDGE POSITIONS" ); - return 0; - } - UVPtStruct* uvslf = new UVPtStruct[nbPoints + 2]; - - double f, l; - Handle(Geom2d_Curve) C2d = BRep_Tool::CurveOnSurface(E, F, f, l); + dh = abs(nb-nt); + dv = abs(nr-nl); + int nbh = Max(nb,nt); + int nbv = Max(nr,nl); + int addh = 0; + int addv = 0; - bool isForward = (((l - f) * (last - first)) > 0); - double paramin = 0; - double paramax = 0; - if (isForward) - { - paramin = f; - paramax = l; - gp_Pnt2d p = C2d->Value(f); // first point = Vertex Forward - uvslf[0].x = p.X(); - uvslf[0].y = p.Y(); - uvslf[0].param = f; - uvslf[0].node = idFirst; - //MESSAGE("__ f "<::iterator itp = params.begin(); - for (int i = 1; i <= nbPoints; i++) // nbPoints internal - { - double param = (*itp).first; - gp_Pnt2d p = C2d->Value(param); - uvslf[i].x = p.X(); - uvslf[i].y = p.Y(); - uvslf[i].param = param; - uvslf[i].node = (*itp).second; - //MESSAGE("__ "<Value(l); // last point = Vertex Reversed - uvslf[nbPoints + 1].x = p.X(); - uvslf[nbPoints + 1].y = p.Y(); - uvslf[nbPoints + 1].param = l; - uvslf[nbPoints + 1].node = idLast; - //MESSAGE("__ l "<Value(l); // first point = Vertex Reversed - uvslf[0].x = p.X(); - uvslf[0].y = p.Y(); - uvslf[0].param = l; - uvslf[0].node = idLast; - //MESSAGE("__ l "<::reverse_iterator itp = params.rbegin(); - - for (int j = nbPoints; j >= 1; j--) // nbPoints internal - { - double param = (*itp).first; - int i = nbPoints + 1 - j; - gp_Pnt2d p = C2d->Value(param); - uvslf[i].x = p.X(); - uvslf[i].y = p.Y(); - uvslf[i].param = param; - uvslf[i].node = (*itp).second; - //MESSAGE("__ "<Value(f); // last point = Vertex Forward - uvslf[nbPoints + 1].x = p.X(); - uvslf[nbPoints + 1].y = p.Y(); - uvslf[nbPoints + 1].param = f; - uvslf[nbPoints + 1].node = idFirst; - //MESSAGE("__ f "<dv) { + addv = (dh-dv)/2; + nbv = nbv + addv; } - - ASSERT(paramin != paramax); - for (int i = 0; i < nbPoints + 2; i++) - { - uvslf[i].normParam = (uvslf[i].param - paramin) / (paramax - paramin); + else { // dv>=dh + addh = (dv-dh)/2; + nbh = nbh + addh; } - return uvslf; -} - -//============================================================================= -/*! - * MakeEdgePoints - */ -//============================================================================= -UVPtStruct* StdMeshers_Quadrangle_2D::MakeEdgePoints (SMESH_Mesh & aMesh, - const TopoDS_Face& F, - const TopoDS_Edge& E, - double first, double last, - int nb_segm) -{ -// MESSAGE("StdMeshers_Quadrangle_2D::MakeEdgePoints"); - - UVPtStruct* uvslf = new UVPtStruct[nb_segm + 1]; - list params; - - // --- edge internal points - double fi, li; - Handle(Geom_Curve) Curve = BRep_Tool::Curve(E, fi, li); - if (!Curve.IsNull()) { - try { - GeomAdaptor_Curve C3d (Curve); - double length = EdgeLength(E); - double eltSize = length / nb_segm; - GCPnts_UniformAbscissa Discret (C3d, eltSize, fi, li); - if (!Discret.IsDone()) return false; - int NbPoints = Discret.NbPoints(); - for (int i = 1; i <= NbPoints; i++) { - double param = Discret.Parameter(i); - params.push_back(param); - } - } - catch (Standard_Failure) { - return 0; - } + int dl,dr; + if(OldVersion) { + // add some params to right and left after the first param + // insert to right + dr = nbv - nr; + // insert to left + dl = nbv - nl; } - else - { - // Edge is a degenerated Edge - BRep_Tool::Range(E, fi, li); - double du = (li - fi) / nb_segm; - for (int i = 1; i <= nb_segm + 1; i++) - { - double param = fi + (i - 1) * du; - params.push_back(param); - } - } - - double f, l; - Handle(Geom2d_Curve) C2d = BRep_Tool::CurveOnSurface(E, F, f, l); - ASSERT(f != l); + + int nnn = Min(nr,nl); - bool isForward = (((l - f) * (last - first)) > 0); - if (isForward) { - list::iterator itU = params.begin(); - for (int i = 0; i <= nb_segm; i++) // nbPoints internal - { - double param = *itU; - gp_Pnt2d p = C2d->Value(param); - uvslf[i].x = p.X(); - uvslf[i].y = p.Y(); - uvslf[i].param = param; - uvslf[i].normParam = (param - f) / (l - f); - itU++; + int nbNodes = 0; + int nbFaces = 0; + if(OldVersion) { + // step1: create faces for left domain + if(dl>0) { + nbNodes += dl*(nl-1); + nbFaces += dl*(nl-1); } - } else { - list::reverse_iterator itU = params.rbegin(); - for (int j = nb_segm; j >= 0; j--) // nbPoints internal - { - double param = *itU; - int i = nb_segm - j; - gp_Pnt2d p = C2d->Value(param); - uvslf[i].x = p.X(); - uvslf[i].y = p.Y(); - uvslf[i].param = param; - uvslf[i].normParam = (param - l) / (f - l); - itU++; + // step2: create faces for right domain + if(dr>0) { + nbNodes += dr*(nr-1); + nbFaces += dr*(nr-1); } + // step3: create faces for central domain + nbNodes += (nb-2)*(nnn-1) + (nbv-nnn-1)*(nb-2); + nbFaces += (nb-1)*(nbv-1); + } + else { // New version (!OldVersion) + nbNodes += (nnn-2)*(nb-2); + nbFaces += (nnn-2)*(nb-1); + int drl = abs(nr-nl); + nbNodes += drl*(nb-1) + addv*nb; + nbFaces += (drl+addv)*(nb-1) + (nt-1); + } // end new version implementation + + std::vector aVec(17); + for(int i=0; i<17; i++) aVec[i] = 0; + if(IsQuadratic) { + aVec[6] = nbFaces; + aVec[0] = nbNodes + nbFaces*4; } + else { + aVec[0] = nbNodes; + aVec[5] = nbFaces; + } + SMESH_subMesh * sm = aMesh.GetSubMesh(aShape); + aResMap.insert(std::make_pair(sm,aVec)); - return uvslf; -} - - -//============================================================================= -/*! - * - */ -//============================================================================= - -ostream & StdMeshers_Quadrangle_2D::SaveTo(ostream & save) -{ - return save; -} - -//============================================================================= -/*! - * - */ -//============================================================================= - -istream & StdMeshers_Quadrangle_2D::LoadFrom(istream & load) -{ - return load; + return true; } -//============================================================================= -/*! - * - */ -//============================================================================= - -ostream & operator <<(ostream & save, StdMeshers_Quadrangle_2D & hyp) -{ - return hyp.SaveTo( save ); -} //============================================================================= -/*! - * +/*! Split quadrangle in to 2 triangles by smallest diagonal + * */ //============================================================================= - -istream & operator >>(istream & load, StdMeshers_Quadrangle_2D & hyp) +void StdMeshers_Quadrangle_2D::SplitQuad(SMESHDS_Mesh *theMeshDS, + int theFaceID, + const SMDS_MeshNode* theNode1, + const SMDS_MeshNode* theNode2, + const SMDS_MeshNode* theNode3, + const SMDS_MeshNode* theNode4) { - return hyp.LoadFrom( load ); + gp_Pnt a(theNode1->X(),theNode1->Y(),theNode1->Z()); + gp_Pnt b(theNode2->X(),theNode2->Y(),theNode2->Z()); + gp_Pnt c(theNode3->X(),theNode3->Y(),theNode3->Z()); + gp_Pnt d(theNode4->X(),theNode4->Y(),theNode4->Z()); + SMDS_MeshFace* face; + if(a.Distance(c) > b.Distance(d)){ + face = myTool->AddFace(theNode2, theNode4 , theNode1); + theMeshDS->SetMeshElementOnShape(face, theFaceID ); + face = myTool->AddFace(theNode2, theNode3, theNode4); + theMeshDS->SetMeshElementOnShape(face, theFaceID ); + + } + else{ + face = myTool->AddFace(theNode1, theNode2 ,theNode3); + theMeshDS->SetMeshElementOnShape(face, theFaceID ); + face = myTool->AddFace(theNode1, theNode3, theNode4); + theMeshDS->SetMeshElementOnShape(face, theFaceID ); + } }