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 65e59d98dfdb38e53223261b42b0937910621293..7b02701b3c72227515ad10e94bb71ca29d853e77 100644 (file)
--- 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 23d72c5a0da5b1dc9a29e4011b964e556e29d2b6..6975f958bb08a86ab917e34798312582229e5fe5 100644 (file)
--- 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 2632073a7b42bb3aed32b28e4353475240e7b970..9fce23337f80410db0b0cc76714487d90492dd25 100644 (file)
--- 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 57dc0948166477c0dc05cf4e1bf42b11392a1638..45eb7809da58d2ee44153ebd4e7983f76215619b 100644 (file)
--- 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)              |\r
 +--------------------------------------------+-----------------------------------------------+\r
 |.. image:: images/13_vis_1.png              | .. image:: images/13_vis_1_2.png              |\r
-|   :width: 400                             |    :width: 400                                 |\r
+|   :width: 400                              |    :width: 400                                |\r
 |   :align: center                           |    :align: center                             |\r
 +--------------------------------------------+-----------------------------------------------+\r
 | tube                                                                                       |\r