SALOME_TESTS/Grids/smesh/mesh_Projection_2D_00/A0

  Fix association EDGE <-> closed EDGE

diff --git a/src/StdMeshers/StdMeshers_Prism_3D.cxx b/src/StdMeshers/StdMeshers_Prism_3D.cxx
index 579cbe55011420ac9c6d1725381b2e59bdcaf906..79fd9f82e0e7d49f4c043ddfe1384632f4390f8f 100644 (file)
--- a/src/StdMeshers/StdMeshers_Prism_3D.cxx
+++ b/src/StdMeshers/StdMeshers_Prism_3D.cxx
@@ -1487,7 +1487,7 @@ bool StdMeshers_Prism_3D::computeWalls(const Prism_3D::TPrismTopo& thePrism)
           // compute nodes on VERTEXes
           SMESH_subMeshIteratorPtr smIt = tgtSM->getDependsOnIterator(/*includeSelf=*/false);
           while ( smIt->more() )
           // compute nodes on VERTEXes
           SMESH_subMeshIteratorPtr smIt = tgtSM->getDependsOnIterator(/*includeSelf=*/false);
           while ( smIt->more() )

-            smIt->next()->ComputeSubMeshStateEngine( SMESH_subMesh::COMPUTE );
+            smIt->next()->ComputeStateEngine( SMESH_subMesh::COMPUTE );

           // project segments
           DBGOUT( "COMPUTE H edge (proj) " << tgtSM->GetId());
           projector1D->myHyp.SetSourceEdge( TopoDS::Edge( srcSM->GetSubShape() ));
           // project segments
           DBGOUT( "COMPUTE H edge (proj) " << tgtSM->GetId());
           projector1D->myHyp.SetSourceEdge( TopoDS::Edge( srcSM->GetSubShape() ));

diff --git a/src/StdMeshers/StdMeshers_ProjectionUtils.cxx b/src/StdMeshers/StdMeshers_ProjectionUtils.cxx
index 6079b0c5442464b005b1fcbf884f3da8e774b355..8d4e172adac1ed1fcf001c07ecfce2dcbc8bd1a9 100644 (file)
--- a/src/StdMeshers/StdMeshers_ProjectionUtils.cxx
+++ b/src/StdMeshers/StdMeshers_ProjectionUtils.cxx
@@ -1169,9 +1169,13 @@ bool StdMeshers_ProjectionUtils::FindSubShapeAssociation(const TopoDS_Shape& the
       RETURN_BAD_RESULT("Different nb of vertices");
   }
 
       RETURN_BAD_RESULT("Different nb of vertices");
   }
 

-  if ( vMap1.Extent() == 1 ) {
+  if ( vMap1.Extent() == 1 || vMap2.Extent() == 1 ) {

     InsertAssociation( vMap1(1), vMap2(1), theMap );
     if ( theShape1.ShapeType() == TopAbs_EDGE ) {
     InsertAssociation( vMap1(1), vMap2(1), theMap );
     if ( theShape1.ShapeType() == TopAbs_EDGE ) {

+      if ( vMap1.Extent() == 2 )
+        InsertAssociation( vMap1(2), vMap2(1), theMap );
+      else if ( vMap2.Extent() == 2 )
+        InsertAssociation( vMap2(2), vMap1(1), theMap );

       InsertAssociation( theShape1, theShape2, theMap );
       return true;
     }
       InsertAssociation( theShape1, theShape2, theMap );
       return true;
     }