X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FStdMeshers%2FStdMeshers_FaceSide.cxx;h=3fd0305636b9a9c3b8208d154a12aca4055c249d;hp=e474f5bf7f671fbbd5dcd8087bf8b6bdc2f52bff;hb=0e017d4c87d670c01e72c0b4858ffcb9e47aa9ba;hpb=ff644361c82ba87ed768ad457533b41dcf24133c diff --git a/src/StdMeshers/StdMeshers_FaceSide.cxx b/src/StdMeshers/StdMeshers_FaceSide.cxx index e474f5bf7..3fd030563 100644 --- a/src/StdMeshers/StdMeshers_FaceSide.cxx +++ b/src/StdMeshers/StdMeshers_FaceSide.cxx @@ -79,8 +79,6 @@ StdMeshers_FaceSide::StdMeshers_FaceSide(const TopoDS_Face& theFace, //================================================================================ /*! * \brief Constructor of a side of several edges - * \param theFace - the face - * \param theEdge - the edge */ //================================================================================ @@ -101,6 +99,7 @@ StdMeshers_FaceSide::StdMeshers_FaceSide(const TopoDS_Face& theFace, myNormPar.resize ( nbEdges ); myEdgeLength.resize( nbEdges ); myIsUniform.resize ( nbEdges, true ); + myFace = theFace; myLength = 0; myNbPonits = myNbSegments = 0; myProxyMesh = theProxyMesh; @@ -121,7 +120,7 @@ StdMeshers_FaceSide::StdMeshers_FaceSide(const TopoDS_Face& theFace, myEdgeLength[i] = SMESH_Algo::EdgeLength( *edge ); if ( myEdgeLength[i] < DBL_MIN ) nbDegen++; myLength += myEdgeLength[i]; - myEdge[i] = *edge; + myEdge [i] = *edge; myEdgeID[i] = meshDS->ShapeToIndex( *edge ); if ( !theIsForward ) myEdge[i].Reverse(); @@ -132,34 +131,16 @@ StdMeshers_FaceSide::StdMeshers_FaceSide(const TopoDS_Face& theFace, if ( myEdge[i].Orientation() == TopAbs_REVERSED ) std::swap( myFirst[i], myLast[i] ); - if ( const SMESHDS_SubMesh* sm = myProxyMesh->GetSubMesh( *edge )) { - int nbN = sm->NbNodes(); - if ( theIgnoreMediumNodes ) { - SMDS_ElemIteratorPtr elemIt = sm->GetElements(); - if ( elemIt->more() && elemIt->next()->IsQuadratic() ) - nbN -= sm->NbElements(); - } - myNbPonits += nbN; - myNbSegments += sm->NbElements(); - } - - // TopExp::FirstVertex() and TopExp::LastVertex() return NULL from INTERNAL edge - vExp.Initialize( *edge ); - if ( vExp.Value().Orientation() == TopAbs_REVERSED ) vExp.Next(); - if ( SMESH_Algo::VertexNode( TopoDS::Vertex( vExp.Value()), meshDS )) - myNbPonits += 1; // for the first end - else - myMissingVertexNodes = true; - // check if the edge has a non-uniform parametrization (issue 0020705) if ( !myC2d[i].IsNull() ) { - if ( myEdgeLength[i] > DBL_MIN) + if ( myEdgeLength[i] > DBL_MIN ) { Geom2dAdaptor_Curve A2dC( myC2d[i], std::min( myFirst[i], myLast[i] ), std::max( myFirst[i], myLast[i] )); - double p2 = myFirst[i]+(myLast[i]-myFirst[i])/2., p4 = myFirst[i]+(myLast[i]-myFirst[i])/4.; + double p2 = myFirst[i]+(myLast[i]-myFirst[i])/2.; + double p4 = myFirst[i]+(myLast[i]-myFirst[i])/4.; double d2 = GCPnts_AbscissaPoint::Length( A2dC, myFirst[i], p2 ); double d4 = GCPnts_AbscissaPoint::Length( A2dC, myFirst[i], p4 ); //cout<<"len = "<GetSubMesh( myEdge[iE] )) + // Add internal nodes + nodes.clear(); + if ( !GetEdgeNodes( iE, nodes, /*v0=*/false, /*v1=*/false )) + return myPoints; + if ( !nodes.empty() ) { - vector< pair< double, const SMDS_MeshNode*> > u2nodeVec; - u2nodeVec.reserve( sm->NbNodes() ); - SMDS_NodeIteratorPtr nItr = sm->GetNodes(); + u2nodeVec.clear(); double paramSize = myLast[iE] - myFirst[iE]; double r = myNormPar[iE] - prevNormPar; helper.SetSubShape( myEdge[iE] ); helper.ToFixNodeParameters( true ); if ( !myIsUniform[iE] ) - while ( nItr->more() ) + for ( size_t i = 0; i < nodes.size(); ++i ) { - const SMDS_MeshNode* node = nItr->next(); - if ( myIgnoreMediumNodes && SMESH_MeshEditor::IsMedium( node, SMDSAbs_Edge )) - continue; - double u = helper.GetNodeU( myEdge[iE], node, 0, ¶mOK ); - double aLenU = GCPnts_AbscissaPoint::Length - ( const_cast( myC3dAdaptor[iE]), myFirst[iE], u ); + double u = helper.GetNodeU( myEdge[iE], nodes[i], 0, ¶mOK ); + double aLenU = GCPnts_AbscissaPoint::Length( me->myC3dAdaptor[iE], myFirst[iE], u ); if ( myEdgeLength[iE] < aLenU ) // nonregression test "3D_mesh_NETGEN/G6" { u2nodeVec.clear(); break; } - double normPar = prevNormPar + r*aLenU/myEdgeLength[iE]; - u2nodeVec.push_back( make_pair( normPar, node )); + double normPar = prevNormPar + r * aLenU / myEdgeLength[iE]; + u2nodeVec.push_back( make_pair( normPar, nodes[i] )); } - nItr = sm->GetNodes(); if ( u2nodeVec.empty() ) - while ( nItr->more() ) + for ( size_t i = 0; i < nodes.size(); ++i ) { - const SMDS_MeshNode* node = nItr->next(); - if ( myIgnoreMediumNodes && SMESH_MeshEditor::IsMedium( node, SMDSAbs_Edge )) - continue; - double u = helper.GetNodeU( myEdge[iE], node, 0, ¶mOK ); - + double u = helper.GetNodeU( myEdge[iE], nodes[i], 0, ¶mOK ); // paramSize is signed so orientation is taken into account double normPar = prevNormPar + r * ( u - myFirst[iE] ) / paramSize; - u2nodeVec.push_back( make_pair( normPar, node )); + u2nodeVec.push_back( make_pair( normPar, nodes[i] )); } for ( size_t j = 0; j < u2nodeVec.size(); ++j ) u2node.insert( u2node.end(), u2nodeVec[j] ); } + } // loop on myEdge's + + if ( u2node.empty() ) return myPoints; - // Put 2nd vertex node for a last edge - if ( iE+1 == myEdge.size() ) { - node = SMESH_Algo::VertexNode( VV[1], meshDS ); - if ( !node ) { - MESSAGE(" NO NODE on VERTEX" ); + // Add 2nd VERTEX node for a last EDGE + { + const SMDS_MeshNode* node; + if ( IsClosed() ) + node = u2node.begin()->second; + else + { + node = VertexNode( iE ); + while ( !node && iE > 0 ) + node = VertexNode( --iE ); + if ( !node ) return myPoints; - } - u2node.insert( u2node.end(), make_pair( 1., node )); } - } // loop on myEdge's + if ( u2node.rbegin()->second == node ) + u2node.erase( --u2node.end() ); + u2node.insert( u2node.end(), make_pair( 1., node )); + } if ( u2node.size() + nbProxyNodes != myNbPonits && u2node.size() + nbProxyNodes != NbPoints( /*update=*/true )) @@ -440,7 +432,7 @@ const vector& StdMeshers_FaceSide::GetUVPtStruct(bool isXConst, // fill array of UVPtStruct - UVPtStructVec& points = const_cast< UVPtStructVec& >( myPoints ); + UVPtStructVec& points = me->myPoints; points.resize( myNbPonits ); int iPt = 0; @@ -487,7 +479,7 @@ const vector& StdMeshers_FaceSide::GetUVPtStruct(bool isXConst, // -- U ---------------------------------------------- const SMDS_EdgePosition* epos = dynamic_cast(uvPt.node->GetPosition()); - if ( epos ) { + if ( epos && uvPt.node->getshapeId() == myEdgeID[iE] ) { uvPt.param = epos->GetUParameter(); } else { @@ -577,65 +569,101 @@ const vector& StdMeshers_FaceSide::SimulateUVPtStruct(int nbSeg, //purpose : Return nodes in the order they encounter while walking along the side //======================================================================= -std::vector StdMeshers_FaceSide::GetOrderedNodes() const +std::vector StdMeshers_FaceSide::GetOrderedNodes(int theEdgeInd) const { vector resultNodes; - if ( myPoints.empty() ) + if ( myPoints.empty() || ( theEdgeInd >= 0 && NbEdges() > 0 )) { if ( NbEdges() == 0 ) return resultNodes; SMESHDS_Mesh* meshDS = myProxyMesh->GetMeshDS(); SMESH_MesherHelper helper(*myProxyMesh->GetMesh()); - bool paramOK; + bool paramOK = true; // Sort nodes of all edges putting them into a map - map< double, const SMDS_MeshNode*> u2node; - for ( int i = 0; i < myEdge.size(); ++i ) + map< double, const SMDS_MeshNode*> u2node; + vector nodes; + set vertexNodes; + int iE = 0, iEnd = myEdge.size(); + if ( theEdgeInd >= 0 ) + { + iE = theEdgeInd % NbEdges(); + iEnd = iE + 1; + } + for ( iE = 0; iE < iEnd; ++iE ) { - // Put 1st vertex node of a current edge - TopoDS_Vertex VV[2]; // TopExp::FirstVertex() returns NULL for INTERNAL edge - VV[0] = SMESH_MesherHelper::IthVertex( 0, myEdge[i]); - VV[1] = SMESH_MesherHelper::IthVertex( 1, myEdge[i]); - const SMDS_MeshNode* node = SMESH_Algo::VertexNode( VV[0], meshDS ); - double prevNormPar = ( i == 0 ? 0 : myNormPar[ i-1 ]); // normalized param + double prevNormPar = ( iE == 0 ? 0 : myNormPar[ iE-1 ]); // normalized param + + const SMESH_ProxyMesh::SubMesh* proxySM = myProxyMesh->GetProxySubMesh( myEdge[iE] ); + if ( proxySM ) + { + const UVPtStructVec& points = proxySM->GetUVPtStructVec(); + for ( size_t i = 0; i < points.size(); ++i ) + u2node.insert( make_pair( prevNormPar + points[i].normParam, points[i].node )); + continue; + } + + // Add 1st vertex node of a current EDGE + const SMDS_MeshNode* node = VertexNode( iE ); if ( node ) { // nodes on internal vertices may be missing - u2node.insert( make_pair( prevNormPar, node )); + if ( vertexNodes.insert( node ).second ) + u2node.insert( make_pair( prevNormPar, node )); } - else if ( i == 0 ) { - MESSAGE(" NO NODE on VERTEX" ); - return resultNodes; + else if ( iE == 0 ) + { + if ( nodes.empty() ) { + for ( ++iE; iE < iEnd; ++iE ) + if (( node = VertexNode( iE ))) { + u2node.insert( make_pair( prevNormPar, node )); + break; + } + --iE; + } + if ( !node ) + return resultNodes; + vertexNodes.insert( node ); } - // Put internal nodes - if ( SMESHDS_SubMesh* sm = meshDS->MeshElements( myEdge[i] )) + // Add internal nodes + nodes.clear(); + if ( !GetEdgeNodes( iE, nodes, /*v0=*/false, /*v1=*/false )) + return resultNodes; + if ( !nodes.empty() ) { - SMDS_NodeIteratorPtr nItr = sm->GetNodes(); - double paramSize = myLast[i] - myFirst[i]; - double r = myNormPar[i] - prevNormPar; - helper.SetSubShape( myEdge[i] ); + double paramSize = myLast[iE] - myFirst[iE]; + double r = myNormPar[iE] - prevNormPar; + helper.SetSubShape( myEdge[iE] ); helper.ToFixNodeParameters( true ); - while ( nItr->more() ) + for ( size_t i = 0; i < nodes.size(); ++i ) { - const SMDS_MeshNode* node = nItr->next(); - if ( myIgnoreMediumNodes && SMESH_MeshEditor::IsMedium( node, SMDSAbs_Edge )) - continue; - double u = helper.GetNodeU( myEdge[i], node, 0, ¶mOK ); - + double u = helper.GetNodeU( myEdge[iE], nodes[i], 0, ¶mOK ); // paramSize is signed so orientation is taken into account - double normPar = prevNormPar + r * ( u - myFirst[i] ) / paramSize; - u2node.insert( u2node.end(), make_pair( normPar, node )); + double normPar = prevNormPar + r * ( u - myFirst[iE] ) / paramSize; + u2node.insert( u2node.end(), make_pair( normPar, nodes[i] )); } } - // Put 2nd vertex node for a last edge - if ( i+1 == myEdge.size() ) { - node = SMESH_Algo::VertexNode( VV[1], meshDS ); - if ( !node ) { + } // loop on myEdges + + if ( u2node.empty() ) return resultNodes; + + // Add 2nd vertex node for a last EDGE + { + const SMDS_MeshNode* node; + if ( IsClosed() && theEdgeInd < 0 ) + node = u2node.begin()->second; + else + { + node = VertexNode( iE ); + while ( !node && iE > 0 ) + node = VertexNode( --iE ); + if ( !node ) return resultNodes; - } - u2node.insert( u2node.end(), make_pair( 1., node )); } + if ( u2node.rbegin()->second == node ) + u2node.erase( --u2node.end() ); + u2node.insert( u2node.end(), make_pair( 1., node )); } // Fill the result vector @@ -658,6 +686,135 @@ std::vector StdMeshers_FaceSide::GetOrderedNodes() const return resultNodes; } +//================================================================================ +/*! + * \brief Return (unsorted) nodes of the i-th EDGE. + * Nodes moved to other geometry by MergeNodes() are also returned. + * \retval bool - is OK + */ +//================================================================================ + +bool StdMeshers_FaceSide::GetEdgeNodes(size_t i, + vector& nodes, + bool inlude1stVertex, + bool inludeLastVertex) const +{ + if ( i >= myEdge.size() ) + return false; + + SMESH_Mesh* mesh = myProxyMesh->GetMesh(); + SMESHDS_Mesh* meshDS = mesh->GetMeshDS(); + SMESHDS_SubMesh* sm = meshDS->MeshElements( myEdge[i] ); + + if ( inlude1stVertex ) + { + const SMDS_MeshNode* n0 = VertexNode( i ); + if ( !n0 ) return false; + nodes.push_back( n0 ); + } + + if ( sm && ( sm->NbElements() > 0 || sm->NbNodes() > 0 )) + { + if ( mesh->HasModificationsToDiscard() ) // check nb of nodes on the EDGE sub-mesh + { + int iQuad = sm->GetElements()->next()->IsQuadratic(); + int nbExpect = sm->NbElements() - 1 + iQuad * sm->NbElements(); + if ( nbExpect != sm->NbNodes() ) // some nodes are moved from the EDGE by MergeNodes() + { + // add nodes of all segments + typedef set< const SMDS_MeshNode* > TNodeSet; + TNodeSet sharedNodes; + SMDS_ElemIteratorPtr segIt = sm->GetElements(); + while ( segIt->more() ) + { + const SMDS_MeshElement* seg = segIt->next(); + if ( seg->GetType() != SMDSAbs_Edge ) + continue; + for ( int i = 0; i < 3-myIgnoreMediumNodes; ++i ) + { + const SMDS_MeshNode* n = seg->GetNode( i ); + if ( i == 2 ) // medium node + { + nodes.push_back( n ); + } + else + { + pair it2new = sharedNodes.insert( n ); + if ( !it2new.second ) // n encounters twice == it's on EDGE, not on VERTEX + { + nodes.push_back( n ); + sharedNodes.erase( it2new.first ); + } + } + } + } + } + } + if ( nodes.size() < 2 ) // add nodes assigned to the EDGE + { + SMDS_NodeIteratorPtr nItr = sm->GetNodes(); + while ( nItr->more() ) + { + const SMDS_MeshNode* n = nItr->next(); + if ( myIgnoreMediumNodes && SMESH_MeshEditor::IsMedium( n, SMDSAbs_Edge )) + continue; + nodes.push_back( n ); + } + } + } // if ( sm && sm->NbElements() > 0 ) + + if ( inludeLastVertex ) + { + const SMDS_MeshNode* n1 = VertexNode( i+1 ); + if ( !n1 ) return false; + nodes.push_back( n1 ); + } + return true; +} + +//================================================================================ +/*! + * \brief Return a node from the i-th VERTEX (count starts from zero) + * Nodes moved to other geometry by MergeNodes() are also returned. + * \param [in] i - the VERTEX index + * \param [out] isMoved - returns \c true if the found node is moved by MergeNodes() + * \return const SMDS_MeshNode* - the found node + */ +//================================================================================ + +const SMDS_MeshNode* StdMeshers_FaceSide::VertexNode(std::size_t i, bool* isMoved) const +{ + TopoDS_Vertex V = ( i >= myEdge.size() ) ? LastVertex() : FirstVertex(i); + + const SMDS_MeshNode* n = SMESH_Algo::VertexNode( V, myProxyMesh->GetMeshDS() ); + + if ( !n && !myEdge.empty() && myProxyMesh->GetMesh()->HasModificationsToDiscard() ) + { + size_t iE = ( i < myEdge.size() ) ? i : myEdge.size()-1; + SMESHDS_SubMesh* sm = myProxyMesh->GetMeshDS()->MeshElements( myEdgeID[ iE ]); + + n = SMESH_Algo::VertexNode( V, sm, myProxyMesh->GetMesh(), /*checkV=*/false ); + + if (( !n ) && + (( i > 0 && i < NbEdges() ) || IsClosed() )) + { + iE = SMESH_MesherHelper::WrapIndex( int(i)-1, NbEdges() ); + sm = myProxyMesh->GetMeshDS()->MeshElements( myEdgeID[ iE ]); + n = SMESH_Algo::VertexNode( V, sm, myProxyMesh->GetMesh(), /*checkV=*/false ); + } + + if ( n && n->GetPosition()->GetDim() == 1 ) // check that n does not lie on an EDGE of myFace + { + TopoDS_Shape S = SMESH_MesherHelper::GetSubShapeByNode( n, myProxyMesh->GetMeshDS() ); + if ( SMESH_MesherHelper::IsSubShape( S, myFace )) + n = 0; // VERTEX ignored by e.g. Composite Wire Discretization algo + } + if ( isMoved ) + *isMoved = n; + } + return n; +} + //================================================================================ /*! * \brief reverse order of vector elements @@ -667,8 +824,7 @@ std::vector StdMeshers_FaceSide::GetOrderedNodes() const template void reverse(vector & vec) { - for ( int f=0, r=vec.size()-1; f < r; ++f, --r ) - std::swap( vec[f], vec[r] ); + std::reverse( vec.begin(), vec.end() ); } //================================================================================ @@ -790,28 +946,29 @@ int StdMeshers_FaceSide::NbPoints(const bool update) const for ( int i = 0; i < NbEdges(); ++i ) { - TopoDS_Vertex v1 = SMESH_MesherHelper::IthVertex( 0, myEdge[i] ); - if ( SMESH_Algo::VertexNode( v1, myProxyMesh->GetMeshDS() )) - me->myNbPonits += 1; // for the first end - else - me->myMissingVertexNodes = true; - if ( const SMESHDS_SubMesh* sm = myProxyMesh->GetSubMesh( Edge(i) )) { int nbN = sm->NbNodes(); - if ( myIgnoreMediumNodes ) { - SMDS_ElemIteratorPtr elemIt = sm->GetElements(); - if ( elemIt->more() && elemIt->next()->IsQuadratic() ) - nbN -= sm->NbElements(); + if ( sm->NbElements() > 0 ) { + nbN = sm->NbElements() - 1; // nodes can be moved to other shapes by MergeNodes() + if ( !myIgnoreMediumNodes && + sm->GetElements()->next()->IsQuadratic() ) + nbN += sm->NbElements(); } me->myNbPonits += nbN; me->myNbSegments += sm->NbElements(); } } - TopoDS_Vertex v1 = SMESH_MesherHelper::IthVertex( 1, Edge( NbEdges()-1 )); - if ( SMESH_Algo::VertexNode( v1, myProxyMesh->GetMeshDS() )) - me->myNbPonits++; // for the last end - else - me->myMissingVertexNodes = true; + + std::set< const SMDS_MeshNode* > vNodes; + for ( int i = 0; i <= NbEdges(); ++i ) + if ( const SMDS_MeshNode* n = VertexNode( i )) + vNodes.insert( n ); + else + me->myMissingVertexNodes = true; + me->myNbPonits += vNodes.size(); + + if ( IsClosed() ) + me->myNbPonits++; // closing node is repeated } return myNbPonits; } @@ -928,7 +1085,7 @@ BRepAdaptor_CompCurve* StdMeshers_FaceSide::GetCurve3d() const for ( int i=0; i