Fix bug 10390. fix getting submesh for a shell

diff --git a/src/SMESH/SMESH_Pattern.cxx b/src/SMESH/SMESH_Pattern.cxx
index 4809aa7e644ae6e93ede1a7cf8c554d5042b9d59..493799d3551c53b0f4a02aa8338318eb5c75391c 100644 (file)
--- a/src/SMESH/SMESH_Pattern.cxx
+++ b/src/SMESH/SMESH_Pattern.cxx
@@ -46,6 +46,7 @@
 #include <TopoDS_Shell.hxx>
 #include <TopoDS_Vertex.hxx>
 #include <TopoDS_Wire.hxx>
+#include <TopTools_ListIteratorOfListOfShape.hxx>
 #include <gp_Ax2.hxx>
 #include <gp_Lin2d.hxx>
 #include <gp_Pnt2d.hxx>
@@ -2839,7 +2840,7 @@ bool SMESH_Pattern::Load (SMESH_Mesh*         theMesh,
   MESSAGE(" ::Load(volume) " );
   Clear();
   myIs2D = false;
-  SMESHDS_Mesh * aMeshDS = theMesh->GetMeshDS();
+  SMESHDS_SubMesh * aSubMesh;
 
   // load shapes in myShapeIDMap
   SMESH_Block block;
@@ -2852,7 +2853,7 @@ bool SMESH_Pattern::Load (SMESH_Mesh*         theMesh,
   for ( shapeID = 1; shapeID <= myShapeIDMap.Extent(); shapeID++ )
   {
     const TopoDS_Shape& S = myShapeIDMap( shapeID );
-    SMESHDS_SubMesh * aSubMesh = aMeshDS->MeshElements( S );
+    aSubMesh = getSubmeshWithElements( theMesh, S );
     if ( aSubMesh )
       nbNodes += aSubMesh->NbNodes();
   }
@@ -2865,7 +2866,7 @@ bool SMESH_Pattern::Load (SMESH_Mesh*         theMesh,
   {
     const TopoDS_Shape& S = myShapeIDMap( shapeID );
     list< TPoint* > & shapePoints = getShapePoints( shapeID );
-    SMESHDS_SubMesh * aSubMesh = aMeshDS->MeshElements( S );
+    aSubMesh = getSubmeshWithElements( theMesh, S );
     if ( ! aSubMesh ) continue;
     SMDS_NodeIteratorPtr nIt = aSubMesh->GetNodes();
     if ( !nIt->more() ) continue;
@@ -2929,7 +2930,7 @@ bool SMESH_Pattern::Load (SMESH_Mesh*         theMesh,
 
   // load elements
 
-  SMESHDS_SubMesh * aSubMesh = aMeshDS->MeshElements( theBlock );
+  aSubMesh = getSubmeshWithElements( theMesh, theBlock );
   if ( aSubMesh )
   {
     SMDS_ElemIteratorPtr elemIt = aSubMesh->GetElements();
@@ -2947,6 +2948,32 @@ bool SMESH_Pattern::Load (SMESH_Mesh*         theMesh,
   return setErrorCode( ERR_OK );
 }
 
+//=======================================================================
+//function : getSubmeshWithElements
+//purpose  : return submesh containing elements bound to theBlock in theMesh
+//=======================================================================
+
+SMESHDS_SubMesh * SMESH_Pattern::getSubmeshWithElements(SMESH_Mesh*         theMesh,
+                                                        const TopoDS_Shape& theShape)
+{
+  SMESHDS_SubMesh * aSubMesh = theMesh->GetMeshDS()->MeshElements( theShape );
+  if ( aSubMesh && ( aSubMesh->GetElements()->more() || aSubMesh->GetNodes()->more() ))
+    return aSubMesh;
+
+  if ( theShape.ShapeType() == TopAbs_SHELL )
+  {
+    // look for submesh of VOLUME
+    TopTools_ListIteratorOfListOfShape it( theMesh->GetAncestors( theShape ));
+    for (; it.More(); it.Next()) {
+      aSubMesh = theMesh->GetMeshDS()->MeshElements( it.Value() );
+      if ( aSubMesh && ( aSubMesh->GetElements()->more() || aSubMesh->GetNodes()->more() ))
+        return aSubMesh;
+    }
+  }
+  return 0;
+}
+
+
 //=======================================================================
 //function : Apply
 //purpose  : Compute nodes coordinates applying

diff --git a/src/SMESH/SMESH_Pattern.hxx b/src/SMESH/SMESH_Pattern.hxx
index cc0bd159a1e317fbd22c4ccaa6bdb99552a72327..e49b498ecb838b6868d403333fb2b0b3feeadee6 100644 (file)
--- a/src/SMESH/SMESH_Pattern.hxx
+++ b/src/SMESH/SMESH_Pattern.hxx
@@ -41,6 +41,7 @@ class SMDS_MeshFace;
 class SMDS_MeshVolume;
 class SMDS_MeshNode;
 class SMESH_Mesh;
+class SMESHDS_SubMesh;
 class TopoDS_Shell;
 class TopoDS_Vertex;
 class TopoDS_Face;
@@ -305,6 +306,10 @@ class SMESH_Pattern {
   void clearMesh(SMESH_Mesh* theMesh) const;
   // clear mesh elements existing on myShape in theMesh
 
+  static SMESHDS_SubMesh * getSubmeshWithElements(SMESH_Mesh*         theMesh,
+                                                  const TopoDS_Shape& theShape);
+  // return submesh containing elements bound to theShape in theMesh
+
  private:
   // fields