X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FStdMeshers%2FStdMeshers_CompositeHexa_3D.cxx;h=b0f10f8d0d174ec23abf4ef64c1425175b8cb0c5;hb=a87bde2a084268d40af501d4b8b5c9e8d48c8323;hp=cc27b86d7cef22fc9937a25764d95d2dac31e18a;hpb=3369d458eaf2f08db6e32b75609679f06771a5cb;p=modules%2Fsmesh.git diff --git a/src/StdMeshers/StdMeshers_CompositeHexa_3D.cxx b/src/StdMeshers/StdMeshers_CompositeHexa_3D.cxx index cc27b86d7..b0f10f8d0 100644 --- a/src/StdMeshers/StdMeshers_CompositeHexa_3D.cxx +++ b/src/StdMeshers/StdMeshers_CompositeHexa_3D.cxx @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2015 CEA/DEN, EDF R&D, OPEN CASCADE +// Copyright (C) 2007-2019 CEA/DEN, EDF R&D, OPEN CASCADE // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public @@ -17,7 +17,7 @@ // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -// SMESH SMESH : implementaion of SMESH idl descriptions +// SMESH SMESH : implementation of SMESH idl descriptions // File : StdMeshers_CompositeHexa_3D.cxx // Module : SMESH // Created : Tue Nov 25 11:04:59 2008 @@ -28,13 +28,17 @@ #include "SMDS_Mesh.hxx" #include "SMDS_MeshNode.hxx" #include "SMDS_SetIterator.hxx" +#include "SMESHDS_Mesh.hxx" +#include "SMESHDS_SubMesh.hxx" #include "SMESH_Block.hxx" #include "SMESH_Comment.hxx" #include "SMESH_ComputeError.hxx" +#include "SMESH_HypoFilter.hxx" #include "SMESH_Mesh.hxx" #include "SMESH_MeshAlgos.hxx" #include "SMESH_MesherHelper.hxx" #include "SMESH_subMesh.hxx" +#include "StdMeshers_ViscousLayers.hxx" #include #include @@ -58,6 +62,7 @@ #include #include +using namespace std; #ifdef _DEBUG_ // #define DEB_FACES @@ -78,9 +83,11 @@ enum EQuadSides{ Q_BOTTOM=0, Q_RIGHT, Q_TOP, Q_LEFT, Q_CHILD, Q_PARENT }; enum EBoxSides{ B_BOTTOM=0, B_RIGHT, B_TOP, B_LEFT, B_FRONT, B_BACK, B_UNDEFINED }; +enum EAxes{ COO_X=1, COO_Y, COO_Z }; + //================================================================================ /*! - * \brief Convertor of a pair of integers to a sole index + * \brief Converter of a pair of integers to a sole index */ struct _Indexer { @@ -113,8 +120,9 @@ public: bool Contain( const TopoDS_Vertex& vertex ) const; void AppendSide( const _FaceSide& side ); void SetBottomSide( int i ); - int GetNbSegments(SMESH_Mesh& mesh) const; - bool StoreNodes(SMESH_Mesh& mesh, vector& myGrid, bool reverse ); + int GetNbSegments(SMESH_ProxyMesh& mesh, const SMESHDS_SubMesh* smToCheckEdges=0) const; + bool StoreNodes(SMESH_ProxyMesh& mesh, vector& myGrid, + bool reverse, bool isProxy, const SMESHDS_SubMesh* smToCheckEdges=0 ); void SetID(EQuadSides id) { myID = id; } static inline const TopoDS_TShape* ptr(const TopoDS_Shape& theShape) { return theShape.TShape().operator->(); } @@ -145,7 +153,7 @@ public: public: //** Methods to find and orient faces of 6 sides of the box **// //!< initialization - bool Init(const TopoDS_Face& f, SMESH_Mesh& mesh ); + bool Init(const TopoDS_Face& f, SMESH_ProxyMesh& mesh ); //!< try to unite self with other face bool AddContinuousFace( const _QuadFaceGrid& f, const TopTools_MapOfShape& internalEdges ); @@ -157,7 +165,7 @@ public: //** Methods to find and orient faces of 6 sides of the box **// _QuadFaceGrid* FindAdjacentForSide(int i, list<_QuadFaceGrid>& faces, EBoxSides id) const; //!< Reverse edges in order to have the bottom edge going along axes of the unit box - void ReverseEdges(/*int e1, int e2*/); + void ReverseEdges(); bool IsComplex() const { return !myChildren.empty(); } @@ -175,13 +183,16 @@ public: //** Methods to find and orient faces of 6 sides of the box **// public: //** Loading and access to mesh **// //!< Load nodes of a mesh - bool LoadGrid( SMESH_Mesh& mesh ); + bool LoadGrid( SMESH_ProxyMesh& mesh ); + + //!< Computes normalized parameters of nodes of myGrid + void ComputeIJK( int i1, int i2, double v3 ); //!< Return number of segments on the hirizontal sides - int GetNbHoriSegments(SMESH_Mesh& mesh, bool withBrothers=false) const; + int GetNbHoriSegments(SMESH_ProxyMesh& mesh, bool withBrothers=false) const; //!< Return number of segments on the vertical sides - int GetNbVertSegments(SMESH_Mesh& mesh, bool withBrothers=false) const; + int GetNbVertSegments(SMESH_ProxyMesh& mesh, bool withBrothers=false) const; //!< Return edge on the hirizontal bottom sides int GetHoriEdges(vector & edges) const; @@ -192,6 +203,9 @@ public: //** Loading and access to mesh **// //!< Return node coordinates by its position gp_XYZ GetXYZ(int iHori, int iVert) const; + //!< Return normalized parameters of nodes within the unitary cube + gp_XYZ& GetIJK(int iCol, int iRow) { return myIJK[ myIndexer( iCol, iRow )]; } + public: //** Access to member fields **// //!< Return i-th face side (0IsOK() ); } - bool loadCompositeGrid(SMESH_Mesh& mesh); + bool loadCompositeGrid(SMESH_ProxyMesh& mesh); - bool fillGrid(SMESH_Mesh& theMesh, + bool fillGrid(SMESH_ProxyMesh& theMesh, vector & theGrid, const _Indexer& theIndexer, int theX, @@ -241,8 +255,9 @@ private: _QuadFaceGrid* myRightBrother; _QuadFaceGrid* myUpBrother; - _Indexer myIndexer; + _Indexer myIndexer; vector myGrid; + vector myIJK; // normalized parameters of nodes SMESH_ComputeErrorPtr myError; @@ -255,8 +270,8 @@ private: */ //================================================================================ -StdMeshers_CompositeHexa_3D::StdMeshers_CompositeHexa_3D(int hypId, int studyId, SMESH_Gen* gen) - :SMESH_3D_Algo(hypId, studyId, gen) +StdMeshers_CompositeHexa_3D::StdMeshers_CompositeHexa_3D(int hypId, SMESH_Gen* gen) + :SMESH_3D_Algo(hypId, gen) { _name = "CompositeHexa_3D"; _shapeType = (1 << TopAbs_SHELL) | (1 << TopAbs_SOLID); // 1 bit /shape type @@ -286,10 +301,10 @@ namespace */ //================================================================================ - bool isContinuousMesh(TopoDS_Edge E1, - TopoDS_Edge E2, - const TopoDS_Face& F, - const SMESH_Mesh& mesh) + bool isContinuousMesh(TopoDS_Edge E1, + TopoDS_Edge E2, + const TopoDS_Face& F, + const SMESH_ProxyMesh& mesh) { if (E1.Orientation() > TopAbs_REVERSED) // INTERNAL E1.Orientation( TopAbs_FORWARD ); @@ -300,13 +315,17 @@ namespace if ( !TopExp::CommonVertex( E1, E2, V )) return false; const SMDS_MeshNode* n = SMESH_Algo::VertexNode( V, mesh.GetMeshDS() ); - if ( !n ) return false; + if ( !n ) return SMESH_Algo::IsContinuous( E1, E2 ); // meshed by "composite segment" + + n = mesh.GetProxyNode( n ); - SMESHDS_SubMesh* sm = mesh.GetSubMeshContaining( F )->GetSubMeshDS(); + const SMESHDS_SubMesh* sm = mesh.GetSubMesh( F ); if ( !sm ) return false; int nbQuads = 0; - SMDS_ElemIteratorPtr fIt = n->GetInverseElementIterator(SMDSAbs_Face); + SMDS_ElemIteratorPtr fIt = mesh.GetInverseElementIterator( n, SMDSAbs_Face ); + if ( !fIt->more() ) + return SMESH_Algo::IsContinuous( E1, E2 ); // meshed by "composite segment" while ( fIt->more() ) { const SMDS_MeshElement* f = fIt->next(); @@ -320,17 +339,39 @@ namespace return nbQuads == 2; } + //================================================================================ + /*! + * \brief Return true if a vertex holds a node and this node is used by some quadrangle + */ + //================================================================================ + + // bool isMeshedVertex( TopoDS_Vertex& V, + // const SMESH_Mesh& mesh ) + // { + // const SMDS_MeshNode* n = SMESH_Algo::VertexNode( V, mesh.GetMeshDS() ); + // if ( !n ) return false; + + // SMDS_ElemIteratorPtr fIt = n->GetInverseElementIterator(SMDSAbs_Face); + // while ( fIt->more() ) + // { + // const SMDS_MeshElement* f = fIt->next(); + // if ( f->NbCornerNodes() == 4 ) + // return true; + // } + // return false; + // } + //================================================================================ /*! * \brief Finds VERTEXes located at block corners */ //================================================================================ - void getBlockCorners( SMESH_Mesh& mesh, + void getBlockCorners( SMESH_ProxyMesh& mesh, const TopoDS_Shape& shape, TopTools_MapOfShape& cornerVV) { - set faceIDs; // ids of FACEs in the shape + std::set faceIDs; // ids of FACEs in the shape TopExp_Explorer exp; for ( exp.Init( shape, TopAbs_FACE ); exp.More(); exp.Next() ) faceIDs.insert( mesh.GetMeshDS()->ShapeToIndex( exp.Current() )); @@ -344,13 +385,20 @@ namespace const SMDS_MeshNode* n = SMESH_Algo::VertexNode( V, mesh.GetMeshDS() ); if ( !n ) continue; + const SMDS_MeshNode* nProxy = mesh.GetProxyNode( n ); + bool isProxy = ( nProxy != n ); + n = nProxy; + int nbQuads = 0; - SMDS_ElemIteratorPtr fIt = n->GetInverseElementIterator(SMDSAbs_Face); + SMDS_ElemIteratorPtr fIt = mesh.GetInverseElementIterator( n, SMDSAbs_Face ); while ( fIt->more() ) { const SMDS_MeshElement* f = fIt->next(); if ( !faceIDs.count( f->getshapeId() )) continue; + if ( isProxy && !mesh.GetSubMesh( f->getshapeId() )->Contains( f )) + continue; + if ( f->NbCornerNodes() == 4 ) ++nbQuads; else @@ -372,12 +420,12 @@ namespace const TopTools_MapOfShape& cornerVV, TopTools_MapOfShape& internEE) { - TopTools_IndexedMapOfShape subEE, subFF; + TopTools_IndexedMapOfShape subEE; TopExp::MapShapes( shape, TopAbs_EDGE, subEE ); - TopExp::MapShapes( shape, TopAbs_FACE, subFF ); + //TopExp::MapShapes( shape, TopAbs_FACE, subFF ); TopoDS_Vertex VV[2]; - TopTools_MapOfShape subChecked/*, ridgeEE*/; + TopTools_MapOfShape subChecked, ridgeEE; TopTools_MapIteratorOfMapOfShape vIt( cornerVV ); for ( ; vIt.More(); vIt.Next() ) { @@ -391,6 +439,8 @@ namespace TopoDS_Edge ridgeE = TopoDS::Edge( *riE ); while ( !ridgeE.IsNull() ) { + if ( !ridgeEE.Add( ridgeE )) + break; TopExp::Vertices( ridgeE, VV[0], VV[1] ); TopoDS_Shape V1 = VV[ V0.IsSame( VV[0] )]; if ( cornerVV.Contains( V1 ) ) @@ -441,8 +491,58 @@ namespace } // loop on ridge EDGEs around a corner VERTEX } // loop on on corner VERTEXes + if ( subEE.Extent() > ridgeEE.Extent() + internEE.Extent() ) // PAL23269 + for ( int i = 1; i < subEE.Extent(); ++i ) + if ( !ridgeEE.Contains( subEE(i) )) + internEE.Add( subEE(i) ); + return true; } // getInternalEdges() + + //================================================================================ + /*! + * \brief Find a face including two given nodes + */ + //================================================================================ + + const SMDS_MeshElement* FindFaceByNodes( const SMDS_MeshNode* n1, + const SMDS_MeshNode* n2, + TIDSortedElemSet avoidSet, + SMESH_ProxyMesh& mesh) + { + SMDS_ElemIteratorPtr faceIt = mesh.GetInverseElementIterator( n1, SMDSAbs_Face ); + while ( faceIt->more() ) + { + const SMDS_MeshElement* f = faceIt->next(); + if ( !avoidSet.count( f ) && f->GetNodeIndex( n2 ) >= 0 ) + return f; + } + return 0; + } + + //================================================================================ + /*! + * \brief Check that a segment bounds a face belonging to smOfFaces + */ + //================================================================================ + + bool IsSegmentOnSubMeshBoundary( const SMDS_MeshNode* n1, + const SMDS_MeshNode* n2, + const SMESHDS_SubMesh* smOfFaces, + SMESH_ProxyMesh& mesh) + { + TIDSortedElemSet avoidSet; + bool faceFound = false; + + while ( const SMDS_MeshElement* f = FindFaceByNodes( n1, n2, avoidSet, mesh )) + { + if (( faceFound = smOfFaces->Contains( f ))) + break; + avoidSet.insert( f ); + } + return faceFound; + } + } // namespace //================================================================================ @@ -454,6 +554,7 @@ namespace bool StdMeshers_CompositeHexa_3D::findBoxFaces( const TopoDS_Shape& shape, list< _QuadFaceGrid >& boxFaces, SMESH_Mesh& mesh, + SMESH_ProxyMesh& proxyMesh, _QuadFaceGrid * & fBottom, _QuadFaceGrid * & fTop, _QuadFaceGrid * & fFront, @@ -462,7 +563,7 @@ bool StdMeshers_CompositeHexa_3D::findBoxFaces( const TopoDS_Shape& shape, _QuadFaceGrid * & fRight) { TopTools_MapOfShape cornerVertices; - getBlockCorners( mesh, shape, cornerVertices ); + getBlockCorners( proxyMesh, shape, cornerVertices ); if ( cornerVertices.Extent() != 8 ) return error( COMPERR_BAD_INPUT_MESH, "Can't find 8 corners of a block by 2D mesh" ); TopTools_MapOfShape internalEdges; @@ -475,7 +576,7 @@ bool StdMeshers_CompositeHexa_3D::findBoxFaces( const TopoDS_Shape& shape, for ( exp.Init( shape, TopAbs_FACE ); exp.More(); exp.Next(), ++nbFaces ) { _QuadFaceGrid f; - if ( !f.Init( TopoDS::Face( exp.Current() ), mesh )) + if ( !f.Init( TopoDS::Face( exp.Current() ), proxyMesh )) return error (COMPERR_BAD_SHAPE); _QuadFaceGrid* prevContinuous = 0; @@ -504,7 +605,7 @@ bool StdMeshers_CompositeHexa_3D::findBoxFaces( const TopoDS_Shape& shape, boxFaces.resize( 6 ); boxFace = boxFaces.begin(); for ( exp.Init( shape, TopAbs_FACE); exp.More(); exp.Next(), ++boxFace ) - boxFace->Init( TopoDS::Face( exp.Current() ), mesh ); + boxFace->Init( TopoDS::Face( exp.Current() ), proxyMesh ); } // ---------------------------------------- // Find out position of faces within a box @@ -545,7 +646,7 @@ bool StdMeshers_CompositeHexa_3D::findBoxFaces( const TopoDS_Shape& shape, if ( !fTop ) return error(COMPERR_BAD_SHAPE); - // orient bottom egde of faces along axes of the unit box + // orient bottom edge of faces along axes of the unit box fBottom->ReverseEdges(); fBack ->ReverseEdges(); fLeft ->ReverseEdges(); @@ -558,7 +659,7 @@ bool StdMeshers_CompositeHexa_3D::findBoxFaces( const TopoDS_Shape& shape, * \brief Computes hexahedral mesh on a box with composite sides * \param aMesh - mesh to compute * \param aShape - shape to mesh - * \retval bool - succes sign + * \retval bool - success sign */ //================================================================================ @@ -569,12 +670,22 @@ bool StdMeshers_CompositeHexa_3D::Compute(SMESH_Mesh& theMesh, _quadraticMesh = helper.IsQuadraticSubMesh( theShape ); helper.SetElementsOnShape( true ); + // get Viscous Mesh + SMESH_ProxyMesh::Ptr proxyMesh; + SMESH_HypoFilter vlFilter( SMESH_HypoFilter::HasName( StdMeshers_ViscousLayers::GetHypType() )); + const SMESH_Hypothesis * hyp = theMesh.GetHypothesis( theShape, vlFilter, true ); + const StdMeshers_ViscousLayers* vlHyp = static_cast< const StdMeshers_ViscousLayers* >( hyp ); + if ( vlHyp ) + proxyMesh = vlHyp->Compute( theMesh, theShape, /*toMakeN2NMap=*/true ); + else + proxyMesh.reset( new SMESH_ProxyMesh( theMesh )); + // ------------------------- // Try to find 6 side faces // ------------------------- list< _QuadFaceGrid > boxFaceContainer; _QuadFaceGrid *fBottom, *fTop, *fFront, *fBack, *fLeft, *fRight; - if ( ! findBoxFaces( theShape, boxFaceContainer, theMesh, + if ( ! findBoxFaces( theShape, boxFaceContainer, theMesh, *proxyMesh, fBottom, fTop, fFront, fBack, fLeft, fRight)) return false; @@ -583,16 +694,24 @@ bool StdMeshers_CompositeHexa_3D::Compute(SMESH_Mesh& theMesh, // ------------------------------------------ // let faces load their grids - if ( !fBottom->LoadGrid( theMesh )) return error( fBottom->GetError() ); - if ( !fBack ->LoadGrid( theMesh )) return error( fBack ->GetError() ); - if ( !fLeft ->LoadGrid( theMesh )) return error( fLeft ->GetError() ); - if ( !fFront ->LoadGrid( theMesh )) return error( fFront ->GetError() ); - if ( !fRight ->LoadGrid( theMesh )) return error( fRight ->GetError() ); - if ( !fTop ->LoadGrid( theMesh )) return error( fTop ->GetError() ); - - int x, xSize = fBottom->GetNbHoriSegments(theMesh) + 1, X = xSize - 1; - int y, ySize = fBottom->GetNbVertSegments(theMesh) + 1, Y = ySize - 1; - int z, zSize = fFront ->GetNbVertSegments(theMesh) + 1, Z = zSize - 1; + if ( !fBottom->LoadGrid( *proxyMesh )) return error( fBottom->GetError() ); + if ( !fBack ->LoadGrid( *proxyMesh )) return error( fBack ->GetError() ); + if ( !fLeft ->LoadGrid( *proxyMesh )) return error( fLeft ->GetError() ); + if ( !fFront ->LoadGrid( *proxyMesh )) return error( fFront ->GetError() ); + if ( !fRight ->LoadGrid( *proxyMesh )) return error( fRight ->GetError() ); + if ( !fTop ->LoadGrid( *proxyMesh )) return error( fTop ->GetError() ); + + // compute normalized parameters of nodes on sides (PAL23189) + fBottom->ComputeIJK( COO_X, COO_Y, /*z=*/0. ); + fBack ->ComputeIJK( COO_X, COO_Z, /*y=*/1. ); + fLeft ->ComputeIJK( COO_Y, COO_Z, /*x=*/0. ); + fFront ->ComputeIJK( COO_X, COO_Z, /*y=*/0. ); + fRight ->ComputeIJK( COO_Y, COO_Z, /*x=*/1. ); + fTop ->ComputeIJK( COO_X, COO_Y, /*z=*/1. ); + + int x, xSize = fBottom->GetNbHoriSegments(*proxyMesh) + 1, X = xSize - 1; + int y, ySize = fBottom->GetNbVertSegments(*proxyMesh) + 1, Y = ySize - 1; + int z, zSize = fFront ->GetNbVertSegments(*proxyMesh) + 1, Z = zSize - 1; _Indexer colIndex( xSize, ySize ); vector< vector< const SMDS_MeshNode* > > columns( colIndex.size() ); @@ -645,13 +764,14 @@ bool StdMeshers_CompositeHexa_3D::Compute(SMESH_Mesh& theMesh, pointsOnShapes[ SMESH_Block::ID_V011 ] = fTop->GetXYZ( 0, Y ); pointsOnShapes[ SMESH_Block::ID_V111 ] = fTop->GetXYZ( X, Y ); + gp_XYZ params; // normalized parameters of an internal node within the unit box + for ( x = 1; x < xSize-1; ++x ) { - gp_XYZ params; // normalized parameters of internal node within a unit box - params.SetCoord( 1, x / double(X) ); + const double rX = x / double(X); for ( y = 1; y < ySize-1; ++y ) { - params.SetCoord( 2, y / double(Y) ); + const double rY = y / double(Y); // column to fill during z loop vector< const SMDS_MeshNode* >& column = columns[ colIndex( x, y )]; // points projections on horizontal edges @@ -668,14 +788,28 @@ bool StdMeshers_CompositeHexa_3D::Compute(SMESH_Mesh& theMesh, pointsOnShapes[ SMESH_Block::ID_Fxy1 ] = fTop ->GetXYZ( x, y ); for ( z = 1; z < zSize-1; ++z ) // z loop { - params.SetCoord( 3, z / double(Z) ); + // compute normalized parameters of an internal node within the unit box + const double rZ = z / double(Z); + const gp_XYZ& pBo = fBottom->GetIJK( x, y ); + const gp_XYZ& pTo = fTop ->GetIJK( x, y ); + const gp_XYZ& pFr = fFront ->GetIJK( x, z ); + const gp_XYZ& pBa = fBack ->GetIJK( x, z ); + const gp_XYZ& pLe = fLeft ->GetIJK( y, z ); + const gp_XYZ& pRi = fRight ->GetIJK( y, z ); + params.SetCoord( 1, 0.5 * ( pBo.X() * ( 1. - rZ ) + pTo.X() * rZ + + pFr.X() * ( 1. - rY ) + pBa.X() * rY )); + params.SetCoord( 2, 0.5 * ( pBo.Y() * ( 1. - rZ ) + pTo.Y() * rZ + + pLe.Y() * ( 1. - rX ) + pRi.Y() * rX )); + params.SetCoord( 3, 0.5 * ( pFr.Z() * ( 1. - rY ) + pBa.Z() * rY + + pLe.Z() * ( 1. - rX ) + pRi.Z() * rX )); + // point projections on vertical edges - pointsOnShapes[ SMESH_Block::ID_E00z ] = fFront->GetXYZ( 0, z ); - pointsOnShapes[ SMESH_Block::ID_E10z ] = fFront->GetXYZ( X, z ); - pointsOnShapes[ SMESH_Block::ID_E01z ] = fBack->GetXYZ( 0, z ); + pointsOnShapes[ SMESH_Block::ID_E00z ] = fFront->GetXYZ( 0, z ); + pointsOnShapes[ SMESH_Block::ID_E10z ] = fFront->GetXYZ( X, z ); + pointsOnShapes[ SMESH_Block::ID_E01z ] = fBack->GetXYZ( 0, z ); pointsOnShapes[ SMESH_Block::ID_E11z ] = fBack->GetXYZ( X, z ); // point projections on vertical faces - pointsOnShapes[ SMESH_Block::ID_Fx0z ] = fFront->GetXYZ( x, z ); + pointsOnShapes[ SMESH_Block::ID_Fx0z ] = fFront->GetXYZ( x, z ); pointsOnShapes[ SMESH_Block::ID_Fx1z ] = fBack ->GetXYZ( x, z ); pointsOnShapes[ SMESH_Block::ID_F0yz ] = fLeft ->GetXYZ( y, z ); pointsOnShapes[ SMESH_Block::ID_F1yz ] = fRight->GetXYZ( y, z ); @@ -732,12 +866,14 @@ bool StdMeshers_CompositeHexa_3D::Evaluate(SMESH_Mesh& theMesh, const TopoDS_Shape& theShape, MapShapeNbElems& aResMap) { + SMESH_ProxyMesh::Ptr proxyMesh( new SMESH_ProxyMesh( theMesh )); + // ------------------------- // Try to find 6 side faces // ------------------------- list< _QuadFaceGrid > boxFaceContainer; _QuadFaceGrid *fBottom, *fTop, *fFront, *fBack, *fLeft, *fRight; - if ( ! findBoxFaces( theShape, boxFaceContainer, theMesh, + if ( ! findBoxFaces( theShape, boxFaceContainer, theMesh, *proxyMesh, fBottom, fTop, fFront, fBack, fLeft, fRight)) return false; @@ -760,7 +896,7 @@ bool StdMeshers_CompositeHexa_3D::Evaluate(SMESH_Mesh& theMesh, nbSeg1 += Max( nbElems[ SMDSEntity_Edge ], nbElems[ SMDSEntity_Quad_Edge ]); } - // Get an 1D size of a box side ortogonal to lessComplexSide + // Get an 1D size of a box side orthogonal to lessComplexSide int nbSeg2 = 0; _QuadFaceGrid* ortoSide = lessComplexSide->FindAdjacentForSide( Q_LEFT, boxFaceContainer, B_UNDEFINED ); @@ -773,7 +909,7 @@ bool StdMeshers_CompositeHexa_3D::Evaluate(SMESH_Mesh& theMesh, nbSeg2 += Max( nbElems[ SMDSEntity_Edge ], nbElems[ SMDSEntity_Quad_Edge ]); } - // Get an 2D size of a box side ortogonal to lessComplexSide + // Get an 2D size of a box side orthogonal to lessComplexSide int nbFaces = 0, nbQuadFace = 0; list< TopoDS_Face > sideFaces; if ( ortoSide->IsComplex() ) @@ -823,7 +959,7 @@ _QuadFaceGrid::_QuadFaceGrid(): */ //================================================================================ -bool _QuadFaceGrid::Init(const TopoDS_Face& f, SMESH_Mesh& mesh) +bool _QuadFaceGrid::Init(const TopoDS_Face& f, SMESH_ProxyMesh& mesh) { myFace = f; mySides = _FaceSide(); @@ -851,14 +987,10 @@ bool _QuadFaceGrid::Init(const TopoDS_Face& f, SMESH_Mesh& mesh) while ( !edges.empty()) { sideEdges.clear(); sideEdges.splice( sideEdges.end(), edges, edges.begin());// edges.front()->sideEdges.back() + if ( SMESH_Algo::isDegenerated( sideEdges.back() )) + continue; while ( !edges.empty() ) { - if ( SMESH_Algo::IsContinuous( sideEdges.back(), edges.front() )) { - sideEdges.splice( sideEdges.end(), edges, edges.begin()); - } - else if ( SMESH_Algo::IsContinuous( sideEdges.front(), edges.back() )) { - sideEdges.splice( sideEdges.begin(), edges, --edges.end()); - } - else if ( isContinuousMesh( sideEdges.back(), edges.front(), f, mesh )) { + if ( isContinuousMesh( sideEdges.back(), edges.front(), f, mesh )) { sideEdges.splice( sideEdges.end(), edges, edges.begin()); } else if ( isContinuousMesh( sideEdges.front(), edges.back(), f, mesh )) { @@ -897,7 +1029,7 @@ bool _QuadFaceGrid::AddContinuousFace( const _QuadFaceGrid& other, { const _FaceSide& otherSide = other.GetSide( i ); int iMyCommon; - if ( mySides.Contain( otherSide, &iMyCommon ) ) + if ( mySides.Contain( otherSide, &iMyCommon )) { if ( internalEdges.Contains( otherSide.Edge( 0 ))) { @@ -905,13 +1037,23 @@ bool _QuadFaceGrid::AddContinuousFace( const _QuadFaceGrid& other, DUMP_VERT("Cont 2", mySides.GetSide(iMyCommon)->LastVertex()); DUMP_VERT("Cont 3", otherSide.FirstVertex()); DUMP_VERT("Cont 4", otherSide.LastVertex()); - if ( myChildren.empty() ) { + + if ( myChildren.empty() ) + { myChildren.push_back( *this ); myFace.Nullify(); } + else // find iMyCommon in myChildren + { + for ( TChildIterator children = GetChildren(); children.more(); ) { + const _QuadFaceGrid& child = children.next(); + if ( child.mySides.Contain( otherSide, &iMyCommon )) + break; + } + } // orient new children equally - int otherBottomIndex = ( 4 + i - iMyCommon + 2 ) % 4; + int otherBottomIndex = SMESH_MesherHelper::WrapIndex( i - iMyCommon + 2, 4 ); if ( other.IsComplex() ) for ( TChildIterator children = other.GetChildren(); children.more(); ) { myChildren.push_back( children.next() ); @@ -928,7 +1070,7 @@ bool _QuadFaceGrid::AddContinuousFace( const _QuadFaceGrid& other, if ( other.IsComplex() ) for ( TChildIterator children = other.GetChildren(); children.more(); ) { - const _QuadFaceGrid& child = children.next(); + const _QuadFaceGrid& child = children.next(); for ( int i = 0; i < 4; ++i ) mySides.AppendSide( child.GetSide(i) ); } @@ -970,9 +1112,9 @@ bool _QuadFaceGrid::SetBottomSide(const _FaceSide& bottom, int* sideIndex) { if ( childFace->SetBottomSide( bottom, &myBottomIndex )) { - TChildren::iterator orientedCild = childFace; + TChildren::iterator orientedChild = childFace; for ( childFace = myChildren.begin(); childFace != childEnd; ++childFace ) { - if ( childFace != orientedCild ) + if ( childFace != orientedChild ) childFace->SetBottomSide( childFace->GetSide( myBottomIndex )); } if ( sideIndex ) @@ -1044,7 +1186,7 @@ const _FaceSide& _QuadFaceGrid::GetSide(int i) const */ //================================================================================ -void _QuadFaceGrid::ReverseEdges(/*int e1, int e2*/) +void _QuadFaceGrid::ReverseEdges() { myReverse = !myReverse; @@ -1055,8 +1197,6 @@ void _QuadFaceGrid::ReverseEdges(/*int e1, int e2*/) if ( myChildren.empty() ) { -// mySides.GetSide( e1 )->Reverse(); -// mySides.GetSide( e2 )->Reverse(); DumpVertices(); } else @@ -1064,7 +1204,7 @@ void _QuadFaceGrid::ReverseEdges(/*int e1, int e2*/) DumpVertices(); TChildren::iterator child = myChildren.begin(), childEnd = myChildren.end(); for ( ; child != childEnd; ++child ) - child->ReverseEdges( /*e1, e2*/ ); + child->ReverseEdges(); } } @@ -1074,7 +1214,7 @@ void _QuadFaceGrid::ReverseEdges(/*int e1, int e2*/) */ //================================================================================ -bool _QuadFaceGrid::LoadGrid( SMESH_Mesh& mesh ) +bool _QuadFaceGrid::LoadGrid( SMESH_ProxyMesh& mesh ) { if ( !myChildren.empty() ) { @@ -1096,28 +1236,37 @@ bool _QuadFaceGrid::LoadGrid( SMESH_Mesh& mesh ) if ( !myGrid.empty() ) return true; - SMESHDS_SubMesh* faceSubMesh = mesh.GetSubMesh( myFace )->GetSubMeshDS(); + const SMESHDS_SubMesh* faceSubMesh = mesh.GetSubMesh( myFace ); + // check that all faces are quadrangular SMDS_ElemIteratorPtr fIt = faceSubMesh->GetElements(); while ( fIt->more() ) if ( fIt->next()->NbNodes() % 4 > 0 ) return error("Non-quadrangular mesh faces are not allowed on sides of a composite block"); - - myIndexer._xSize = 1 + mySides.GetSide( Q_BOTTOM )->GetNbSegments( mesh ); - myIndexer._ySize = 1 + mySides.GetSide( Q_LEFT )->GetNbSegments( mesh ); + + bool isProxy, isTmpElem; + if ( faceSubMesh && faceSubMesh->NbElements() > 0 ) + { + isProxy = dynamic_cast< const SMESH_ProxyMesh::SubMesh* >( faceSubMesh ); + isTmpElem = mesh.IsTemporary( faceSubMesh->GetElements()->next() ); + } + const SMESHDS_SubMesh* smToCheckEdges = ( isProxy && !isTmpElem ) ? faceSubMesh : 0; + + myIndexer._xSize = 1 + mySides.GetSide( Q_BOTTOM )->GetNbSegments( mesh, smToCheckEdges ); + myIndexer._ySize = 1 + mySides.GetSide( Q_LEFT )->GetNbSegments( mesh, smToCheckEdges ); myGrid.resize( myIndexer.size() ); - // strore nodes bound to the bottom edge - mySides.GetSide( Q_BOTTOM )->StoreNodes( mesh, myGrid, myReverse ); + // store nodes bound to the bottom edge + mySides.GetSide( Q_BOTTOM )->StoreNodes( mesh, myGrid, myReverse, isProxy, smToCheckEdges ); // store the rest nodes row by row - TIDSortedElemSet emptySet, avoidSet; + TIDSortedElemSet avoidSet; const SMDS_MeshElement* firstQuad = 0; // most left face above the last row of found nodes - int nbFoundNodes = myIndexer._xSize; - while ( nbFoundNodes != (int) myGrid.size() ) + size_t nbFoundNodes = myIndexer._xSize; + while ( nbFoundNodes != myGrid.size() ) { // first and last nodes of the last filled row of nodes const SMDS_MeshNode* n1down = myGrid[ nbFoundNodes - myIndexer._xSize ]; @@ -1132,10 +1281,10 @@ bool _QuadFaceGrid::LoadGrid( SMESH_Mesh& mesh ) // o---o o o o o //n1down n2down // - firstQuad = SMESH_MeshAlgos::FindFaceInSet( n1down, n2down, emptySet, avoidSet); + firstQuad = FindFaceByNodes( n1down, n2down, avoidSet, mesh ); while ( firstQuad && !faceSubMesh->Contains( firstQuad )) { avoidSet.insert( firstQuad ); - firstQuad = SMESH_MeshAlgos::FindFaceInSet( n1down, n2down, emptySet, avoidSet); + firstQuad = FindFaceByNodes( n1down, n2down, avoidSet, mesh); } if ( !firstQuad || !faceSubMesh->Contains( firstQuad )) return error(ERR_LI("Error in _QuadFaceGrid::LoadGrid()")); @@ -1165,7 +1314,7 @@ bool _QuadFaceGrid::LoadGrid( SMESH_Mesh& mesh ) { // next face avoidSet.clear(); avoidSet.insert( quad ); - quad = SMESH_MeshAlgos::FindFaceInSet( n1down, n1up, emptySet, avoidSet ); + quad = FindFaceByNodes( n1down, n1up, avoidSet, mesh ); if ( !quad || quad->NbNodes() % 4 > 0) return error(ERR_LI("Error in _QuadFaceGrid::LoadGrid()")); @@ -1185,6 +1334,53 @@ bool _QuadFaceGrid::LoadGrid( SMESH_Mesh& mesh ) return true; } +//================================================================================ +/*! + * \brief Fill myIJK with normalized parameters of nodes in myGrid + * \param [in] i1 - coordinate index along rows of myGrid + * \param [in] i2 - coordinate index along columns of myGrid + * \param [in] v3 - value of the constant parameter + */ +//================================================================================ + +void _QuadFaceGrid::ComputeIJK( int i1, int i2, double v3 ) +{ + gp_XYZ ijk( v3, v3, v3 ); + myIJK.resize( myIndexer.size(), ijk ); + + const size_t nbCol = myIndexer._xSize; + const size_t nbRow = myIndexer._ySize; + + vector< double > len( nbRow ); + len[0] = 0; + for ( size_t i = 0; i < nbCol; ++i ) + { + gp_Pnt pPrev = GetXYZ( i, 0 ); + for ( size_t j = 1; j < nbRow; ++j ) + { + gp_Pnt p = GetXYZ( i, j ); + len[ j ] = len[ j-1 ] + p.Distance( pPrev ); + pPrev = p; + } + for ( size_t j = 0; j < nbRow; ++j ) + GetIJK( i, j ).SetCoord( i2, len[ j ]/len.back() ); + } + + len.resize( nbCol ); + for ( size_t j = 0; j < nbRow; ++j ) + { + gp_Pnt pPrev = GetXYZ( 0, j ); + for ( size_t i = 1; i < nbCol; ++i ) + { + gp_Pnt p = GetXYZ( i, j ); + len[ i ] = len[ i-1 ] + p.Distance( pPrev ); + pPrev = p; + } + for ( size_t i = 0; i < nbCol; ++i ) + GetIJK( i, j ).SetCoord( i1, len[ i ]/len.back() ); + } +} + //================================================================================ /*! * \brief Find out mutual location of children: find their right and up brothers @@ -1235,7 +1431,7 @@ bool _QuadFaceGrid::locateChildren() */ //================================================================================ -bool _QuadFaceGrid::loadCompositeGrid(SMESH_Mesh& mesh) +bool _QuadFaceGrid::loadCompositeGrid(SMESH_ProxyMesh& mesh) { // Find out mutual location of children: find their right and up brothers if ( !locateChildren() ) @@ -1244,13 +1440,13 @@ bool _QuadFaceGrid::loadCompositeGrid(SMESH_Mesh& mesh) // Load nodes according to mutual location of children // grid size - myIndexer._xSize = 1 + myLeftBottomChild->GetNbHoriSegments(mesh, /*withBrothers=*/true); - myIndexer._ySize = 1 + myLeftBottomChild->GetNbVertSegments(mesh, /*withBrothers=*/true); + myIndexer._xSize = 1 + myLeftBottomChild->GetNbHoriSegments( mesh, /*withBrothers=*/true ); + myIndexer._ySize = 1 + myLeftBottomChild->GetNbVertSegments( mesh, /*withBrothers=*/true ); myGrid.resize( myIndexer.size() ); int fromX = myReverse ? myIndexer._xSize : 0; - if (!myLeftBottomChild->fillGrid( mesh, myGrid, myIndexer, fromX, 0 )) + if ( !myLeftBottomChild->fillGrid( mesh, myGrid, myIndexer, fromX, 0 )) return error( myLeftBottomChild->GetError() ); DumpGrid(); @@ -1312,7 +1508,7 @@ void _QuadFaceGrid::setBrothers( set< _QuadFaceGrid* >& notLocatedBrothers ) */ //================================================================================ -bool _QuadFaceGrid::fillGrid(SMESH_Mesh& theMesh, +bool _QuadFaceGrid::fillGrid(SMESH_ProxyMesh& theMesh, vector & theGrid, const _Indexer& theIndexer, int theX, @@ -1355,7 +1551,7 @@ bool _QuadFaceGrid::fillGrid(SMESH_Mesh& theMesh, */ //================================================================================ -int _QuadFaceGrid::GetNbHoriSegments(SMESH_Mesh& mesh, bool withBrothers) const +int _QuadFaceGrid::GetNbHoriSegments(SMESH_ProxyMesh& mesh, bool withBrothers) const { int nbSegs = 0; if ( myLeftBottomChild ) @@ -1364,7 +1560,7 @@ int _QuadFaceGrid::GetNbHoriSegments(SMESH_Mesh& mesh, bool withBrothers) const } else { - nbSegs = mySides.GetSide( Q_BOTTOM )->GetNbSegments(mesh); + nbSegs = mySides.GetSide( Q_BOTTOM )->GetNbSegments( mesh ); if ( withBrothers && myRightBrother ) nbSegs += myRightBrother->GetNbHoriSegments( mesh, withBrothers ); } @@ -1377,7 +1573,7 @@ int _QuadFaceGrid::GetNbHoriSegments(SMESH_Mesh& mesh, bool withBrothers) const */ //================================================================================ -int _QuadFaceGrid::GetNbVertSegments(SMESH_Mesh& mesh, bool withBrothers) const +int _QuadFaceGrid::GetNbVertSegments(SMESH_ProxyMesh& mesh, bool withBrothers) const { int nbSegs = 0; if ( myLeftBottomChild ) @@ -1386,7 +1582,7 @@ int _QuadFaceGrid::GetNbVertSegments(SMESH_Mesh& mesh, bool withBrothers) const } else { - nbSegs = mySides.GetSide( Q_LEFT )->GetNbSegments(mesh); + nbSegs = mySides.GetSide( Q_LEFT )->GetNbSegments(mesh,0); if ( withBrothers && myUpBrother ) nbSegs += myUpBrother->GetNbVertSegments( mesh, withBrothers ); } @@ -1441,8 +1637,8 @@ const SMDS_MeshNode* _QuadFaceGrid::GetNode(int iHori, int iVert) const gp_XYZ _QuadFaceGrid::GetXYZ(int iHori, int iVert) const { - const SMDS_MeshNode* n = myGrid[ myIndexer( iHori, iVert )]; - return gp_XYZ( n->X(), n->Y(), n->Z() ); + SMESH_TNodeXYZ xyz = myGrid[ myIndexer( iHori, iVert )]; + return xyz; } //================================================================================ @@ -1593,8 +1789,6 @@ _FaceSide::_FaceSide(const list& edges): for ( ; edge != eEnd; ++edge ) { myChildren.push_back( _FaceSide( *edge )); myNbChildren++; -// myVertices.insert( myChildren.back().myVertices.begin(), -// myChildren.back().myVertices.end() ); myVertices.Add( myChildren.back().FirstVertex() ); myVertices.Add( myChildren.back().LastVertex() ); myChildren.back().SetID( Q_CHILD ); // not to splice them @@ -1603,7 +1797,7 @@ _FaceSide::_FaceSide(const list& edges): //======================================================================= //function : GetSide -//purpose : +//purpose : //======================================================================= _FaceSide* _FaceSide::GetSide(const int i) @@ -1799,30 +1993,46 @@ void _FaceSide::SetBottomSide( int i ) //purpose : //======================================================================= -int _FaceSide::GetNbSegments(SMESH_Mesh& mesh) const +int _FaceSide::GetNbSegments(SMESH_ProxyMesh& mesh, const SMESHDS_SubMesh* smToCheckEdges) const { int nb = 0; if ( myChildren.empty() ) { - nb = mesh.GetSubMesh(myEdge)->GetSubMeshDS()->NbElements(); + nb = mesh.GetSubMesh(myEdge)->NbElements(); + + if ( smToCheckEdges ) + { + // check that segments bound faces belonging to smToCheckEdges + SMDS_ElemIteratorPtr segIt = mesh.GetSubMesh(myEdge)->GetElements(); + while ( segIt->more() ) + { + const SMDS_MeshElement* seg = segIt->next(); + if ( !IsSegmentOnSubMeshBoundary( mesh.GetProxyNode( seg->GetNode(0) ), + mesh.GetProxyNode( seg->GetNode(1) ), + smToCheckEdges, mesh )) + --nb; + } + } } else { list< _FaceSide >::const_iterator side = myChildren.begin(), sideEnd = myChildren.end(); for ( ; side != sideEnd; ++side ) - nb += side->GetNbSegments(mesh); + nb += side->GetNbSegments( mesh, smToCheckEdges ); } return nb; } //======================================================================= //function : StoreNodes -//purpose : +//purpose : //======================================================================= -bool _FaceSide::StoreNodes(SMESH_Mesh& mesh, +bool _FaceSide::StoreNodes(SMESH_ProxyMesh& mesh, vector& myGrid, - bool reverse ) + bool reverse, + bool isProxy, + const SMESHDS_SubMesh* smToCheckEdges) { list< TopoDS_Edge > edges; if ( myChildren.empty() ) @@ -1842,24 +2052,61 @@ bool _FaceSide::StoreNodes(SMESH_Mesh& mesh, list< TopoDS_Edge >::iterator edge = edges.begin(), eEnd = edges.end(); for ( ; edge != eEnd; ++edge ) { - map< double, const SMDS_MeshNode* > nodes; + typedef map< double, const SMDS_MeshNode* > TParamNodeMap; + TParamNodeMap nodes; bool ok = SMESH_Algo::GetSortedNodesOnEdge( mesh.GetMeshDS(), *edge, /*ignoreMediumNodes=*/true, nodes); if ( !ok ) return false; + // skip nodes on VERTEXes not included in faces + if ( !nodes.begin()->second->GetInverseElementIterator(SMDSAbs_Face)->more() ) + nodes.erase( nodes.begin() ); + if ( !nodes.empty() && + !nodes.rbegin()->second->GetInverseElementIterator(SMDSAbs_Face)->more() ) + nodes.erase( --nodes.end() ); + + if ( isProxy ) + { + TParamNodeMap::iterator u_node, nEnd = nodes.end(); + for ( u_node = nodes.begin(); u_node != nEnd; ++u_node ) + u_node->second = mesh.GetProxyNode( u_node->second ); + } + + if ( smToCheckEdges ) // erase nodes of segments not bounding faces of smToCheckEdges + { + { + TParamNodeMap::iterator u_node1, u_node2 = nodes.begin(), nEnd = nodes.end(); + for ( u_node1 = u_node2++; u_node2 != nEnd; u_node1 = u_node2++ ) + if ( IsSegmentOnSubMeshBoundary( u_node1->second, u_node2->second, + smToCheckEdges, mesh )) + break; + else + nodes.erase( u_node1 ); + } + { + TParamNodeMap::reverse_iterator u_node1, u_node2 = nodes.rbegin(), nEnd = nodes.rend(); + for ( u_node1 = u_node2++; u_node2 != nEnd; u_node1 = u_node2++ ) + if ( IsSegmentOnSubMeshBoundary( u_node1->second, u_node2->second, + smToCheckEdges, mesh )) + break; + else + nodes.erase( --( u_node1.base() )); + } + } + bool forward = ( edge->Orientation() == TopAbs_FORWARD ); if ( reverse ) forward = !forward; if ( forward ) { - map< double, const SMDS_MeshNode* >::iterator u_node, nEnd = nodes.end(); + TParamNodeMap::iterator u_node, nEnd = nodes.end(); for ( u_node = nodes.begin(); u_node != nEnd; ++u_node ) myGrid[ nbNodes++ ] = u_node->second; } - else + else { - map< double, const SMDS_MeshNode* >::reverse_iterator u_node, nEnd = nodes.rend(); + TParamNodeMap::reverse_iterator u_node, nEnd = nodes.rend(); for ( u_node = nodes.rbegin(); u_node != nEnd; ++u_node ) myGrid[ nbNodes++ ] = u_node->second; }