From: eap <eap@opencascade.com>
Date: Sat, 27 Nov 2021 11:33:18 +0000 (+0300)
Subject: bos #26523 EDF 24234 - Viscous Layer
X-Git-Tag: V9_9_0a1~27
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=e8af688e3b07bdb0324e59760e978a60180efde5;p=modules%2Fsmesh.git

bos #26523 EDF 24234 - Viscous Layer

  fix computing a sole sub-mesh
---

diff --git a/src/SMESH/SMESH_Gen.cxx b/src/SMESH/SMESH_Gen.cxx
index 65e59d98d..7b02701b3 100644
--- a/src/SMESH/SMESH_Gen.cxx
+++ b/src/SMESH/SMESH_Gen.cxx
@@ -376,7 +376,7 @@ bool SMESH_Gen::Compute(SMESH_Mesh &                aMesh,
 
           const TopoDS_Shape& aSubShape = smToCompute->GetSubShape();
           const int aShapeDim = GetShapeDim( aSubShape );
-          if ( aShapeDim < 1 || aSubShape.ShapeType() == shapeType )
+          if ( aShapeDim < 1 || aSubShape.ShapeType() <= shapeType )
             continue;
 
           // check for preview dimension limitations
diff --git a/src/SMESH/SMESH_subMesh.cxx b/src/SMESH/SMESH_subMesh.cxx
index 23d72c5a0..6975f958b 100644
--- a/src/SMESH/SMESH_subMesh.cxx
+++ b/src/SMESH/SMESH_subMesh.cxx
@@ -2209,7 +2209,7 @@ TopoDS_Shape SMESH_subMesh::getCollection(SMESH_Gen * /*theGen*/,
     }
   }
 
-  return aCompound;
+  return theSubs.size() == 1 ? theSubs[0]->GetSubShape() : aCompound;
 }
 
 //=======================================================================
diff --git a/src/SMESH_I/SMESH_Gen_i.cxx b/src/SMESH_I/SMESH_Gen_i.cxx
index 2632073a7..9fce23337 100644
--- a/src/SMESH_I/SMESH_Gen_i.cxx
+++ b/src/SMESH_I/SMESH_Gen_i.cxx
@@ -189,22 +189,22 @@ PortableServer::ServantBase_var SMESH_Gen_i::GetServant( CORBA::Object_ptr theOb
   }
   catch (PortableServer::POA::ObjectNotActive &ex)
   {
-    INFOS("GetServant: ObjectNotActive");
+    MESSAGE("GetServant: ObjectNotActive");
     return NULL;
   }
   catch (PortableServer::POA::WrongAdapter &ex)
   {
-    INFOS("GetServant: WrongAdapter: OK when several servants used to build several mesh in parallel...");
+    MESSAGE("GetServant: WrongAdapter: OK when several servants used to build several mesh in parallel...");
     return NULL;
   }
   catch (PortableServer::POA::WrongPolicy &ex)
   {
-    INFOS("GetServant: WrongPolicy");
+    MESSAGE("GetServant: WrongPolicy");
     return NULL;
   }
   catch (...)
   {
-    INFOS( "GetServant - Unknown exception was caught!!!" );
+    MESSAGE( "GetServant - Unknown exception was caught!!!" );
     return NULL;
   }
 }
diff --git a/src/Tools/blocFissure/doc/testcases.rst b/src/Tools/blocFissure/doc/testcases.rst
index 57dc09481..45eb7809d 100644
--- a/src/Tools/blocFissure/doc/testcases.rst
+++ b/src/Tools/blocFissure/doc/testcases.rst
@@ -95,7 +95,7 @@ All 16 cases are shown Table 2. Two views show the whole cracked structure and a
 | vis (Crack is in the radius filet between the screw head and the screw shank)              |
 +--------------------------------------------+-----------------------------------------------+
 |.. image:: images/13_vis_1.png              | .. image:: images/13_vis_1_2.png              |
-|   :width: 400                             |    :width: 400                                 |
+|   :width: 400                              |    :width: 400                                |
 |   :align: center                           |    :align: center                             |
 +--------------------------------------------+-----------------------------------------------+
 | tube                                                                                       |