X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FStdMeshers%2FStdMeshers_Projection_2D.cxx;h=609b9b35ed0c8d84db881ae411e83b3575355979;hb=b0b291e152175e4771ca8daf5b49b794debc074a;hp=152aa72bdb4965738e2077b70eea76e4ee6d4746;hpb=2c607013a23bd4e7ba07e72e0c04dee2c1209cff;p=modules%2Fsmesh.git diff --git a/src/StdMeshers/StdMeshers_Projection_2D.cxx b/src/StdMeshers/StdMeshers_Projection_2D.cxx index 152aa72bd..609b9b35e 100644 --- a/src/StdMeshers/StdMeshers_Projection_2D.cxx +++ b/src/StdMeshers/StdMeshers_Projection_2D.cxx @@ -190,13 +190,21 @@ namespace { */ //================================================================================ - bool isOldNode( const SMDS_MeshNode* node ) + bool isOldNode( const SMDS_MeshNode* node/*, const bool is1DComputed*/ ) { // old nodes are shared by edges and new ones are shared // only by faces created by mapper - SMDS_ElemIteratorPtr invEdge = node->GetInverseElementIterator(SMDSAbs_Edge); - bool isOld = invEdge->more(); - return isOld; + //if ( is1DComputed ) + { + bool isOld = node->NbInverseElements(SMDSAbs_Edge) > 0; + return isOld; + } + // else + // { + // SMDS_ElemIteratorPtr invFace = node->GetInverseElementIterator(SMDSAbs_Face); + // bool isNew = invFace->more(); + // return !isNew; + // } } //================================================================================ @@ -215,7 +223,7 @@ namespace { void Release() { sm = 0; } // mesh will not be removed static void Clean( SMESH_subMesh* sm, bool withSub=true ) { - if ( !sm ) return; + if ( !sm || !sm->GetSubMeshDS() ) return; // PAL16567, 18920. Remove face nodes as well // switch ( sm->GetSubShape().ShapeType() ) { // case TopAbs_VERTEX: @@ -520,7 +528,7 @@ namespace { // Make new faces - // prepare the helper adding quadratic elements if necessary + // prepare the helper to adding quadratic elements if necessary SMESH_MesherHelper helper( *tgtMesh ); helper.SetSubShape( tgtFace ); helper.IsQuadraticSubMesh( tgtFace ); @@ -582,14 +590,15 @@ namespace { const TopoDS_Face& srcFace, SMESH_Mesh * tgtMesh, SMESH_Mesh * srcMesh, - const TAssocTool::TShapeShapeMap& shape2ShapeMap) + const TAssocTool::TShapeShapeMap& shape2ShapeMap, + const bool is1DComputed) { // 1) Preparation // get ordered src EDGEs TError err; TSideVector srcWires = - StdMeshers_FaceSide::GetFaceWires( srcFace, *srcMesh,/*theIgnoreMediumNodes = */false, err); + StdMeshers_FaceSide::GetFaceWires( srcFace, *srcMesh,/*ignoreMediumNodes = */false, err); if ( err && !err->IsOK() ) return false; @@ -605,7 +614,8 @@ namespace { tgtWires[ iW ].reset( new StdMeshers_FaceSide( tgtFace, tgtEdges, tgtMesh, /*theIsForward = */ true, /*theIgnoreMediumNodes = */false)); - if ( srcWires[iW]->GetUVPtStruct().size() != + if ( is1DComputed && + srcWires[iW]->GetUVPtStruct().size() != tgtWires[iW]->GetUVPtStruct().size()) return false; } @@ -614,15 +624,11 @@ namespace { gp_Trsf2d trsf; { - // get ordered nodes data - const vector& srcUVs = srcWires[0]->GetUVPtStruct(); - const vector& tgtUVs = tgtWires[0]->GetUVPtStruct(); - // get 2 pairs of corresponding UVs - gp_XY srcP0( srcUVs[0].u, srcUVs[0].v ); - gp_XY srcP1( srcUVs[1].u, srcUVs[1].v ); - gp_XY tgtP0( tgtUVs[0].u, tgtUVs[0].v ); - gp_XY tgtP1( tgtUVs[1].u, tgtUVs[1].v ); + gp_Pnt2d srcP0 = srcWires[0]->Value2d(0.0); + gp_Pnt2d srcP1 = srcWires[0]->Value2d(0.333); + gp_Pnt2d tgtP0 = tgtWires[0]->Value2d(0.0); + gp_Pnt2d tgtP1 = tgtWires[0]->Value2d(0.333); // make transformation gp_Trsf2d fromTgtCS, toSrcCS; // from/to global CS @@ -636,12 +642,10 @@ namespace { // check transformation const double tol = 1e-5 * gp_Vec2d( srcP0, srcP1 ).Magnitude(); - const int nbCheckPnt = Min( 10, srcUVs.size()-2 ); - const int dP = ( srcUVs.size()-2 ) / nbCheckPnt; - for ( unsigned iP = 2; iP < srcUVs.size(); iP += dP ) + for ( double u = 0.12; u < 1.; u += 0.1 ) { - gp_Pnt2d srcUV( srcUVs[iP].u, srcUVs[iP].v ); - gp_Pnt2d tgtUV( tgtUVs[iP].u, tgtUVs[iP].v ); + gp_Pnt2d srcUV = srcWires[0]->Value2d( u ); + gp_Pnt2d tgtUV = tgtWires[0]->Value2d( u ); gp_Pnt2d tgtUV2 = srcUV.Transformed( trsf ); if ( tgtUV.Distance( tgtUV2 ) > tol ) return false; @@ -656,26 +660,45 @@ namespace { // fill src2tgtNodes in with nodes on EDGEs for ( unsigned iW = 0; iW < srcWires.size(); ++iW ) - { - const vector& srcUVs = srcWires[iW]->GetUVPtStruct(); - const vector& tgtUVs = tgtWires[iW]->GetUVPtStruct(); - for ( unsigned i = 0; i < srcUVs.size(); ++i ) - src2tgtNodes.insert( make_pair( srcUVs[i].node, tgtUVs[i].node )); - } + if ( is1DComputed ) + { + const vector& srcUVs = srcWires[iW]->GetUVPtStruct(); + const vector& tgtUVs = tgtWires[iW]->GetUVPtStruct(); + for ( unsigned i = 0; i < srcUVs.size(); ++i ) + src2tgtNodes.insert( make_pair( srcUVs[i].node, tgtUVs[i].node )); + } + else + { + for ( int iE = 0; iE < srcWires[iW]->NbEdges(); ++iE ) + { + TopoDS_Vertex srcV = srcWires[iW]->FirstVertex(iE); + TopoDS_Vertex tgtV = tgtWires[iW]->FirstVertex(iE); + const SMDS_MeshNode* srcNode = SMESH_Algo::VertexNode( srcV, srcMesh->GetMeshDS() ); + const SMDS_MeshNode* tgtNode = SMESH_Algo::VertexNode( tgtV, tgtMesh->GetMeshDS() ); + if ( tgtNode && srcNode ) + src2tgtNodes.insert( make_pair( srcNode, tgtNode )); + } + } // make elements + + SMESHDS_SubMesh* srcSubDS = srcMesh->GetMeshDS()->MeshElements( srcFace ); + SMESH_MesherHelper helper( *tgtMesh ); helper.SetSubShape( tgtFace ); - helper.IsQuadraticSubMesh( tgtFace ); + if ( is1DComputed ) + helper.IsQuadraticSubMesh( tgtFace ); + else + helper.SetIsQuadratic( srcSubDS->GetElements()->next()->IsQuadratic() ); helper.SetElementsOnShape( true ); Handle(Geom_Surface) tgtSurface = BRep_Tool::Surface( tgtFace ); - + SMESHDS_Mesh* tgtMeshDS = tgtMesh->GetMeshDS(); + SMESH_MesherHelper srcHelper( *srcMesh ); srcHelper.SetSubShape( srcFace ); const SMDS_MeshNode* nullNode = 0; - SMESHDS_SubMesh* srcSubDS = srcMesh->GetMeshDS()->MeshElements( srcFace ); SMDS_ElemIteratorPtr elemIt = srcSubDS->GetElements(); vector< const SMDS_MeshNode* > tgtNodes; bool uvOK; @@ -693,11 +716,29 @@ namespace { // create a new node gp_Pnt2d srcUV = srcHelper.GetNodeUV( srcFace, srcNode, elem->GetNode( helper.WrapIndex(i+1,nbN)), &uvOK); - gp_Pnt2d tgtUV = srcUV.Transformed( trsf ); gp_Pnt tgtP = tgtSurface->Value( tgtUV.X(), tgtUV.Y() ); - SMDS_MeshNode* n = helper.AddNode( tgtP.X(), tgtP.Y(), tgtP.Z() ); - n->SetPosition( new SMDS_FacePosition( tgtUV.X(), tgtUV.Y() )); + SMDS_MeshNode* n = tgtMeshDS->AddNode( tgtP.X(), tgtP.Y(), tgtP.Z() ); + switch ( srcNode->GetPosition()->GetTypeOfPosition() ) + { + case SMDS_TOP_FACE: { + tgtMeshDS->SetNodeOnFace( n, helper.GetSubShapeID(), tgtUV.X(), tgtUV.Y() ); + break; + } + case SMDS_TOP_EDGE: { + TopoDS_Shape srcEdge = srcHelper.GetSubShapeByNode( srcNode, srcHelper.GetMeshDS() ); + TopoDS_Shape tgtEdge = shape2ShapeMap( srcEdge ); + double U = srcHelper.GetNodeU( TopoDS::Edge( srcEdge ), srcNode ); + tgtMeshDS->SetNodeOnEdge( n, TopoDS::Edge( tgtEdge ), U); + break; + } + case SMDS_TOP_VERTEX: { + TopoDS_Shape srcV = srcHelper.GetSubShapeByNode( srcNode, srcHelper.GetMeshDS() ); + TopoDS_Shape tgtV = shape2ShapeMap( srcV ); + tgtMeshDS->SetNodeOnVertex( n, TopoDS::Vertex( tgtV )); + break; + } + } srcN_tgtN->second = n; } tgtNodes[i] = srcN_tgtN->second; @@ -711,8 +752,7 @@ namespace { } return true; - } // bool projectBy2DSimilarity() - + } // bool projectBy2DSimilarity(...) } // namespace @@ -736,7 +776,7 @@ bool StdMeshers_Projection_2D::Compute(SMESH_Mesh& theMesh, const TopoDS_Shape& SMESHDS_Mesh * meshDS = theMesh.GetMeshDS(); // --------------------------- - // Make subshapes association + // Make sub-shapes association // --------------------------- TopoDS_Face tgtFace = TopoDS::Face( theShape.Oriented(TopAbs_FORWARD)); @@ -767,200 +807,258 @@ bool StdMeshers_Projection_2D::Compute(SMESH_Mesh& theMesh, const TopoDS_Shape& return error(COMPERR_BAD_INPUT_MESH,"Source mesh not computed"); } - // try to project from same face with different location - if ( projectPartner( tgtFace, srcFace, tgtMesh, srcMesh, shape2ShapeMap )) - return true; - - if ( projectBy2DSimilarity( tgtFace, srcFace, tgtMesh, srcMesh, shape2ShapeMap )) - return true; + // =========== + // Projection + // =========== - // -------------------- - // Prepare to mapping - // -------------------- - - SMESH_MesherHelper helper( theMesh ); - helper.SetSubShape( tgtFace ); - - // Check if node projection to a face is needed - Bnd_B2d uvBox; - SMDS_ElemIteratorPtr faceIt = srcSubMesh->GetSubMeshDS()->GetElements(); - int nbFaceNodes = 0; - for ( ; nbFaceNodes < 3 && faceIt->more(); ) { - const SMDS_MeshElement* face = faceIt->next(); - SMDS_ElemIteratorPtr nodeIt = face->nodesIterator(); - while ( nodeIt->more() ) { - const SMDS_MeshNode* node = static_cast( nodeIt->next() ); - if ( node->GetPosition()->GetTypeOfPosition() == SMDS_TOP_FACE ) { - nbFaceNodes++; - uvBox.Add( helper.GetNodeUV( srcFace, node )); - } - } - } - const bool toProjectNodes = - ( nbFaceNodes > 0 && ( uvBox.IsVoid() || uvBox.SquareExtent() < DBL_MIN )); - - // Load pattern from the source face - SMESH_Pattern mapper; - mapper.Load( srcMesh, srcFace, toProjectNodes ); - if ( mapper.GetErrorCode() != SMESH_Pattern::ERR_OK ) - return error(COMPERR_BAD_INPUT_MESH,"Can't load mesh pattern from the source face"); - - // Find the first target vertex corresponding to first vertex of the - // and flag needed to call mapper.Apply() - - TopoDS_Vertex srcV1 = TopoDS::Vertex( mapper.GetSubShape( 1 )); - if ( srcV1.IsNull() ) - RETURN_BAD_RESULT("Mesh is not bound to the face"); - if ( !shape2ShapeMap.IsBound( srcV1 )) - RETURN_BAD_RESULT("Not associated vertices, srcV1 " << srcV1.TShape().operator->() ); - TopoDS_Vertex tgtV1 = TopoDS::Vertex( shape2ShapeMap( srcV1 )); - - if ( !SMESH_MesherHelper::IsSubShape( srcV1, srcFace )) - RETURN_BAD_RESULT("Wrong srcV1 " << srcV1.TShape().operator->()); - if ( !SMESH_MesherHelper::IsSubShape( tgtV1, tgtFace )) - RETURN_BAD_RESULT("Wrong tgtV1 " << tgtV1.TShape().operator->()); - - // try to find out orientation by order of edges - bool reverse = false; - list< TopoDS_Edge > tgtEdges, srcEdges; - list< int > nbEdgesInWires; - SMESH_Block::GetOrderedEdges( tgtFace, tgtV1, tgtEdges, nbEdgesInWires); - SMESH_Block::GetOrderedEdges( srcFace, srcV1, srcEdges, nbEdgesInWires); - if ( nbEdgesInWires.front() > 1 ) // possible to find out + // find out if EDGEs are meshed or not + bool is1DComputed = false; + SMESH_subMeshIteratorPtr smIt = tgtSubMesh->getDependsOnIterator(/*includeSelf=*/false, + /*complexShapeFirst=*/true); + while ( smIt->more() && !is1DComputed ) { - TopoDS_Edge srcE1 = srcEdges.front(), tgtE1 = tgtEdges.front(); - TopoDS_Shape srcE1bis = shape2ShapeMap( tgtE1 ); - reverse = ( ! srcE1.IsSame( srcE1bis )); + SMESH_subMesh* sm = smIt->next(); + if ( sm->GetSubShape().ShapeType() == TopAbs_EDGE ) + is1DComputed = sm->IsMeshComputed(); } - else if ( nbEdgesInWires.front() == 1 ) + + bool done = false; + + if ( !done ) { - // TODO::Compare orientation of curves in a sole edge - //RETURN_BAD_RESULT("Not implemented case"); + // try to project from the same face with different location + done = projectPartner( tgtFace, srcFace, tgtMesh, srcMesh, shape2ShapeMap ); } - else + if ( !done ) { - RETURN_BAD_RESULT("Bad result from SMESH_Block::GetOrderedEdges()"); + // projection in case if the faces are similar in 2D space + done = projectBy2DSimilarity( tgtFace, srcFace, tgtMesh, srcMesh, shape2ShapeMap, is1DComputed); } - // -------------------- - // Perform 2D mapping - // -------------------- + if ( !done ) + { + // -------------------- + // Prepare to mapping + // -------------------- - // Compute mesh on a target face + SMESH_MesherHelper helper( theMesh ); + helper.SetSubShape( tgtFace ); - mapper.Apply( tgtFace, tgtV1, reverse ); - if ( mapper.GetErrorCode() != SMESH_Pattern::ERR_OK ) - return error("Can't apply source mesh pattern to the face"); + // Check if node projection to a face is needed + Bnd_B2d uvBox; + SMDS_ElemIteratorPtr faceIt = srcSubMesh->GetSubMeshDS()->GetElements(); + int nbFaceNodes = 0; + for ( ; nbFaceNodes < 3 && faceIt->more(); ) { + const SMDS_MeshElement* face = faceIt->next(); + SMDS_ElemIteratorPtr nodeIt = face->nodesIterator(); + while ( nodeIt->more() ) { + const SMDS_MeshNode* node = static_cast( nodeIt->next() ); + if ( node->GetPosition()->GetTypeOfPosition() == SMDS_TOP_FACE ) { + nbFaceNodes++; + uvBox.Add( helper.GetNodeUV( srcFace, node )); + } + } + } + const bool toProjectNodes = + ( nbFaceNodes > 0 && ( uvBox.IsVoid() || uvBox.SquareExtent() < DBL_MIN )); + + // Load pattern from the source face + SMESH_Pattern mapper; + mapper.Load( srcMesh, srcFace, toProjectNodes ); + if ( mapper.GetErrorCode() != SMESH_Pattern::ERR_OK ) + return error(COMPERR_BAD_INPUT_MESH,"Can't load mesh pattern from the source face"); + + // Find the first target vertex corresponding to first vertex of the + // and flag needed to call mapper.Apply() + + TopoDS_Vertex srcV1 = TopoDS::Vertex( mapper.GetSubShape( 1 )); + if ( srcV1.IsNull() ) + RETURN_BAD_RESULT("Mesh is not bound to the face"); + if ( !shape2ShapeMap.IsBound( srcV1 )) + RETURN_BAD_RESULT("Not associated vertices, srcV1 " << srcV1.TShape().operator->() ); + TopoDS_Vertex tgtV1 = TopoDS::Vertex( shape2ShapeMap( srcV1 )); + + if ( !SMESH_MesherHelper::IsSubShape( srcV1, srcFace )) + RETURN_BAD_RESULT("Wrong srcV1 " << srcV1.TShape().operator->()); + if ( !SMESH_MesherHelper::IsSubShape( tgtV1, tgtFace )) + RETURN_BAD_RESULT("Wrong tgtV1 " << tgtV1.TShape().operator->()); + + // try to find out orientation by order of edges + bool reverse = false; + list< TopoDS_Edge > tgtEdges, srcEdges; + list< int > nbEdgesInWires; + SMESH_Block::GetOrderedEdges( tgtFace, tgtV1, tgtEdges, nbEdgesInWires); + SMESH_Block::GetOrderedEdges( srcFace, srcV1, srcEdges, nbEdgesInWires); + if ( nbEdgesInWires.front() > 1 ) // possible to find out + { + TopoDS_Edge srcE1 = srcEdges.front(), tgtE1 = tgtEdges.front(); + TopoDS_Shape srcE1bis = shape2ShapeMap( tgtE1 ); + reverse = ( ! srcE1.IsSame( srcE1bis )); + } + else if ( nbEdgesInWires.front() == 1 ) + { + // TODO::Compare orientation of curves in a sole edge + //RETURN_BAD_RESULT("Not implemented case"); + } + else + { + RETURN_BAD_RESULT("Bad result from SMESH_Block::GetOrderedEdges()"); + } - // Create the mesh + // -------------------- + // Perform 2D mapping + // -------------------- - const bool toCreatePolygons = false, toCreatePolyedrs = false; - mapper.MakeMesh( tgtMesh, toCreatePolygons, toCreatePolyedrs ); - if ( mapper.GetErrorCode() != SMESH_Pattern::ERR_OK ) - return error("Can't make mesh by source mesh pattern"); + // Compute mesh on a target face - // it will remove mesh built by pattern mapper on edges and vertices - // in failure case - MeshCleaner cleaner( tgtSubMesh ); + mapper.Apply( tgtFace, tgtV1, reverse ); + if ( mapper.GetErrorCode() != SMESH_Pattern::ERR_OK ) + return error("Can't apply source mesh pattern to the face"); - // ------------------------------------------------------------------------- - // mapper doesn't take care of nodes already existing on edges and vertices, - // so we must merge nodes created by it with existing ones - // ------------------------------------------------------------------------- + // Create the mesh - SMESH_MeshEditor editor( tgtMesh ); - SMESH_MeshEditor::TListOfListOfNodes groupsOfNodes; + const bool toCreatePolygons = false, toCreatePolyedrs = false; + mapper.MakeMesh( tgtMesh, toCreatePolygons, toCreatePolyedrs ); + if ( mapper.GetErrorCode() != SMESH_Pattern::ERR_OK ) + return error("Can't make mesh by source mesh pattern"); - // Make groups of nodes to merge + // it will remove mesh built by pattern mapper on edges and vertices + // in failure case + MeshCleaner cleaner( tgtSubMesh ); - // loop on edge and vertex submeshes of a target face - SMESH_subMeshIteratorPtr smIt = tgtSubMesh->getDependsOnIterator(false,false); - while ( smIt->more() ) - { - SMESH_subMesh* sm = smIt->next(); - SMESHDS_SubMesh* smDS = sm->GetSubMeshDS(); + // ------------------------------------------------------------------------- + // mapper doesn't take care of nodes already existing on edges and vertices, + // so we must merge nodes created by it with existing ones + // ------------------------------------------------------------------------- + + SMESH_MeshEditor::TListOfListOfNodes groupsOfNodes; + + // Make groups of nodes to merge - // Sort new and old nodes of a submesh separately + // loop on edge and vertex submeshes of a target face + smIt = tgtSubMesh->getDependsOnIterator(/*includeSelf=*/false,/*complexShapeFirst=*/false); + while ( smIt->more() ) + { + SMESH_subMesh* sm = smIt->next(); + SMESHDS_SubMesh* smDS = sm->GetSubMeshDS(); + if ( !sm->IsMeshComputed() ) + break; + //if ( !is1DComputed && sm->GetSubShape().ShapeType() == TopAbs_EDGE ) + //break; - bool isSeam = helper.IsRealSeam( sm->GetId() ); + // Sort new and old nodes of a submesh separately - enum { NEW_NODES = 0, OLD_NODES }; - map< double, const SMDS_MeshNode* > u2nodesMaps[2], u2nodesOnSeam; - map< double, const SMDS_MeshNode* >::iterator u_oldNode, u_newNode, u_newOnSeam, newEnd; - set< const SMDS_MeshNode* > seamNodes; + bool isSeam = helper.IsRealSeam( sm->GetId() ); - // mapper puts on a seam edge nodes from 2 edges - if ( isSeam && ! getBoundaryNodes ( sm, tgtFace, u2nodesOnSeam, seamNodes )) - RETURN_BAD_RESULT("getBoundaryNodes() failed"); + enum { NEW_NODES = 0, OLD_NODES }; + map< double, const SMDS_MeshNode* > u2nodesMaps[2], u2nodesOnSeam; + map< double, const SMDS_MeshNode* >::iterator u_oldNode, u_newNode, u_newOnSeam, newEnd; + set< const SMDS_MeshNode* > seamNodes; - SMDS_NodeIteratorPtr nIt = smDS->GetNodes(); - while ( nIt->more() ) - { - const SMDS_MeshNode* node = nIt->next(); - bool isOld = isOldNode( node ); + // mapper puts on a seam edge nodes from 2 edges + if ( isSeam && ! getBoundaryNodes ( sm, tgtFace, u2nodesOnSeam, seamNodes )) + RETURN_BAD_RESULT("getBoundaryNodes() failed"); - if ( !isOld && isSeam ) { // new node on a seam edge - if ( seamNodes.find( node ) != seamNodes.end()) - continue; // node is already in the map - } + SMDS_NodeIteratorPtr nIt = smDS->GetNodes(); + while ( nIt->more() ) + { + const SMDS_MeshNode* node = nIt->next(); + bool isOld = isOldNode( node ); + + if ( !isOld && isSeam ) { // new node on a seam edge + if ( seamNodes.find( node ) != seamNodes.end()) + continue; // node is already in the map + } - // sort nodes on edges by their position - map< double, const SMDS_MeshNode* > & pos2nodes = u2nodesMaps[isOld ? OLD_NODES : NEW_NODES]; - switch ( node->GetPosition()->GetTypeOfPosition() ) + // sort nodes on edges by their position + map< double, const SMDS_MeshNode* > & pos2nodes = u2nodesMaps[isOld ? OLD_NODES : NEW_NODES]; + switch ( node->GetPosition()->GetTypeOfPosition() ) + { + case SMDS_TOP_VERTEX: { + if ( !is1DComputed && !pos2nodes.empty() ) + u2nodesMaps[isOld ? NEW_NODES : OLD_NODES].insert( make_pair( 0, node )); + else + pos2nodes.insert( make_pair( 0, node )); + break; + } + case SMDS_TOP_EDGE: { + const SMDS_EdgePosition* pos = + static_cast(node->GetPosition()); + pos2nodes.insert( make_pair( pos->GetUParameter(), node )); + break; + } + default: + RETURN_BAD_RESULT("Wrong node position type: "<< + node->GetPosition()->GetTypeOfPosition()); + } + } + if ( u2nodesMaps[ NEW_NODES ].size() != u2nodesMaps[ OLD_NODES ].size() ) { - case SMDS_TOP_VERTEX: { - pos2nodes.insert( make_pair( 0, node )); - break; + if ( u2nodesMaps[ NEW_NODES ].size() == 0 && + sm->GetSubShape().ShapeType() == TopAbs_EDGE && + helper.IsDegenShape( sm->GetId() ) ) + // NPAL15894 (tt88bis.py) - project mesh built by NETGEN_1d_2D that + // does not make segments/nodes on degenerated edges + continue; + + if ( u2nodesMaps[ OLD_NODES ].size() == 0 && + sm->GetSubShape().ShapeType() == TopAbs_VERTEX ) + // old nodes are optional on vertices in the case of 1D-2D projection + continue; + + RETURN_BAD_RESULT("Different nb of old and new nodes on shape #"<< sm->GetId() <<" "<< + u2nodesMaps[ OLD_NODES ].size() << " != " << + u2nodesMaps[ NEW_NODES ].size()); } - case SMDS_TOP_EDGE: { - const SMDS_EdgePosition* pos = - static_cast(node->GetPosition()); - pos2nodes.insert( make_pair( pos->GetUParameter(), node )); - break; + if ( isSeam && u2nodesMaps[ OLD_NODES ].size() != u2nodesOnSeam.size() ) { + RETURN_BAD_RESULT("Different nb of old and seam nodes " << + u2nodesMaps[ OLD_NODES ].size() << " != " << u2nodesOnSeam.size()); } - default: - RETURN_BAD_RESULT("Wrong node position type: "<< - node->GetPosition()->GetTypeOfPosition()); + // Make groups of nodes to merge + u_oldNode = u2nodesMaps[ OLD_NODES ].begin(); + u_newNode = u2nodesMaps[ NEW_NODES ].begin(); + newEnd = u2nodesMaps[ NEW_NODES ].end(); + u_newOnSeam = u2nodesOnSeam.begin(); + for ( ; u_newNode != newEnd; ++u_newNode, ++u_oldNode ) { + groupsOfNodes.push_back( list< const SMDS_MeshNode* >() ); + groupsOfNodes.back().push_back( u_oldNode->second ); + groupsOfNodes.back().push_back( u_newNode->second ); + if ( isSeam ) + groupsOfNodes.back().push_back( (u_newOnSeam++)->second ); } } - if ( u2nodesMaps[ NEW_NODES ].size() != u2nodesMaps[ OLD_NODES ].size() ) + + // Merge + + SMESH_MeshEditor editor( tgtMesh ); + int nbFaceBeforeMerge = tgtSubMesh->GetSubMeshDS()->NbElements(); + editor.MergeNodes( groupsOfNodes ); + int nbFaceAtferMerge = tgtSubMesh->GetSubMeshDS()->NbElements(); + if ( nbFaceBeforeMerge != nbFaceAtferMerge ) + return error(COMPERR_BAD_INPUT_MESH, "Probably invalid node parameters on geom faces"); + + // ---------------------------------------------------------------- + // The mapper can't create quadratic elements, so convert if needed + // ---------------------------------------------------------------- + + faceIt = srcSubMesh->GetSubMeshDS()->GetElements(); + bool srcIsQuad = faceIt->next()->IsQuadratic(); + faceIt = tgtSubMesh->GetSubMeshDS()->GetElements(); + bool tgtIsQuad = faceIt->next()->IsQuadratic(); + if ( srcIsQuad && !tgtIsQuad ) { - if ( u2nodesMaps[ NEW_NODES ].size() == 0 && - sm->GetSubShape().ShapeType() == TopAbs_EDGE && - helper.IsDegenShape( sm->GetId() ) ) - // NPAL15894 (tt88bis.py) - project mesh built by NETGEN_1d_2D that - // does not make segments/nodes on degenerated edges - continue; - - RETURN_BAD_RESULT("Different nb of old and new nodes on shape #"<< sm->GetId() <<" "<< - u2nodesMaps[ OLD_NODES ].size() << " != " << - u2nodesMaps[ NEW_NODES ].size()); - } - if ( isSeam && u2nodesMaps[ OLD_NODES ].size() != u2nodesOnSeam.size() ) { - RETURN_BAD_RESULT("Different nb of old and seam nodes " << - u2nodesMaps[ OLD_NODES ].size() << " != " << u2nodesOnSeam.size()); - } - // Make groups of nodes to merge - u_oldNode = u2nodesMaps[ OLD_NODES ].begin(); - u_newNode = u2nodesMaps[ NEW_NODES ].begin(); - newEnd = u2nodesMaps[ NEW_NODES ].end(); - u_newOnSeam = u2nodesOnSeam.begin(); - for ( ; u_newNode != newEnd; ++u_newNode, ++u_oldNode ) { - groupsOfNodes.push_back( list< const SMDS_MeshNode* >() ); - groupsOfNodes.back().push_back( u_oldNode->second ); - groupsOfNodes.back().push_back( u_newNode->second ); - if ( isSeam ) - groupsOfNodes.back().push_back( (u_newOnSeam++)->second ); + TIDSortedElemSet tgtFaces; + faceIt = tgtSubMesh->GetSubMeshDS()->GetElements(); + while ( faceIt->more() ) + tgtFaces.insert( tgtFaces.end(), faceIt->next() ); + + editor.ConvertToQuadratic(/*theForce3d=*/false, tgtFaces); } - } - // Merge + cleaner.Release(); // not to remove mesh + + } // end of projection using Pattern mapping - int nbFaceBeforeMerge = tgtSubMesh->GetSubMeshDS()->NbElements(); - editor.MergeNodes( groupsOfNodes ); - int nbFaceAtferMerge = tgtSubMesh->GetSubMeshDS()->NbElements(); - if ( nbFaceBeforeMerge != nbFaceAtferMerge ) - return error(COMPERR_BAD_INPUT_MESH, "Probably invalid node parameters on geom faces"); // --------------------------- // Check elements orientation @@ -998,6 +1096,7 @@ bool StdMeshers_Projection_2D::Compute(SMESH_Mesh& theMesh, const TopoDS_Shape& // Fix orientation if ( SMESH_Algo::IsReversedSubMesh( face, meshDS )) { + SMESH_MeshEditor editor( tgtMesh ); SMDS_ElemIteratorPtr eIt = meshDS->MeshElements( face )->GetElements(); while ( eIt->more() ) { const SMDS_MeshElement* e = eIt->next(); @@ -1006,8 +1105,6 @@ bool StdMeshers_Projection_2D::Compute(SMESH_Mesh& theMesh, const TopoDS_Shape& } } - cleaner.Release(); // do not remove mesh - return true; } @@ -1017,9 +1114,9 @@ bool StdMeshers_Projection_2D::Compute(SMESH_Mesh& theMesh, const TopoDS_Shape& //purpose : //======================================================================= -bool StdMeshers_Projection_2D::Evaluate(SMESH_Mesh& theMesh, +bool StdMeshers_Projection_2D::Evaluate(SMESH_Mesh& theMesh, const TopoDS_Shape& theShape, - MapShapeNbElems& aResMap) + MapShapeNbElems& aResMap) { if ( !_sourceHypo ) return false; @@ -1030,7 +1127,7 @@ bool StdMeshers_Projection_2D::Evaluate(SMESH_Mesh& theMesh, srcMesh = tgtMesh; // --------------------------- - // Make subshapes association + // Make sub-shapes association // --------------------------- TopoDS_Face tgtFace = TopoDS::Face( theShape.Oriented(TopAbs_FORWARD)); @@ -1045,40 +1142,31 @@ bool StdMeshers_Projection_2D::Evaluate(SMESH_Mesh& theMesh, TopoDS_Face srcFace = TopoDS::Face( shape2ShapeMap( tgtFace ).Oriented(TopAbs_FORWARD)); - // ---------------------------------------------- - // Assure that mesh on a source Face is computed - // ---------------------------------------------- - - SMESH_subMesh* srcSubMesh = srcMesh->GetSubMesh( srcFace ); + // ------------------------------------------------------- + // Assure that mesh on a source Face is computed/evaluated + // ------------------------------------------------------- - if ( !srcSubMesh->IsMeshComputed() ) - return error(COMPERR_BAD_INPUT_MESH,"Source mesh not computed"); + std::vector aVec; + SMESH_subMesh* srcSubMesh = srcMesh->GetSubMesh( srcFace ); + if ( srcSubMesh->IsMeshComputed() ) + { + aVec.resize( SMDSEntity_Last, 0 ); + aVec[SMDSEntity_Node] = srcSubMesh->GetSubMeshDS()->NbNodes(); - std::vector aVec(SMDSEntity_Last); - for(int i=SMDSEntity_Node; iGetSubMeshDS()->NbNodes(); - - //bool quadratic = false; - SMDS_ElemIteratorPtr elemIt = srcSubMesh->GetSubMeshDS()->GetElements(); - while ( elemIt->more() ) { - const SMDS_MeshElement* E = elemIt->next(); - if( E->NbNodes()==3 ) { - aVec[SMDSEntity_Triangle]++; - } - else if( E->NbNodes()==4 ) { - aVec[SMDSEntity_Quadrangle]++; - } - else if( E->NbNodes()==6 && E->IsQuadratic() ) { - aVec[SMDSEntity_Quad_Triangle]++; - } - else if( E->NbNodes()==8 && E->IsQuadratic() ) { - aVec[SMDSEntity_Quad_Quadrangle]++; - } - else { - aVec[SMDSEntity_Polygon]++; - } + SMDS_ElemIteratorPtr elemIt = srcSubMesh->GetSubMeshDS()->GetElements(); + while ( elemIt->more() ) + aVec[ elemIt->next()->GetEntityType() ]++; + } + else + { + MapShapeNbElems tmpResMap; + MapShapeNbElems& srcResMap = (srcMesh == tgtMesh) ? aResMap : tmpResMap; + if ( !_gen->Evaluate( *srcMesh, srcShape, srcResMap )) + return error(COMPERR_BAD_INPUT_MESH,"Source mesh not evaluatable"); + aVec = srcResMap[ srcSubMesh ]; + if ( aVec.empty() ) + return error(COMPERR_BAD_INPUT_MESH,"Source mesh is wrongly evaluated"); } SMESH_subMesh * sm = theMesh.GetSubMesh(theShape);