ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2025-01-13 02:00:34 +05:00
Code Issues Packages Projects Releases Wiki Activity

bos #26523 EDF 24234 - Viscous Layer

Browse Source 
fix computing a sole sub-mesh
This commit is contained in:
eap 2021-11-27 14:33:18 +03:00 committed by vsr
parent 254c02d6e1
commit 4207944cd6
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/SMESH/SMESH_Gen.cxx
View File

@ -376,7 +376,7 @@ bool SMESH_Gen::Compute(SMESH_Mesh & aMesh,
const TopoDS_Shape& aSubShape = smToCompute->GetSubShape(); const TopoDS_Shape& aSubShape = smToCompute->GetSubShape();
const int aShapeDim = GetShapeDim( aSubShape ); const int aShapeDim = GetShapeDim( aSubShape );
if ( aShapeDim < 1 || aSubShape.ShapeType() == shapeType ) if ( aShapeDim < 1 || aSubShape.ShapeType() <= shapeType )
continue; continue;
// check for preview dimension limitations // check for preview dimension limitations

2
src/SMESH/SMESH_subMesh.cxx
View File

@ -2209,7 +2209,7 @@ TopoDS_Shape SMESH_subMesh::getCollection(SMESH_Gen * /*theGen*/,
} }
} }
return aCompound; return theSubs.size() == 1 ? theSubs[0]->GetSubShape() : aCompound;
} }
//======================================================================= //=======================================================================

8
src/SMESH_I/SMESH_Gen_i.cxx
View File

@ -189,22 +189,22 @@ PortableServer::ServantBase_var SMESH_Gen_i::GetServant( CORBA::Object_ptr theOb
} }
catch (PortableServer::POA::ObjectNotActive &ex) catch (PortableServer::POA::ObjectNotActive &ex)
{ {
INFOS("GetServant: ObjectNotActive"); MESSAGE("GetServant: ObjectNotActive");
return NULL; return NULL;
} }
catch (PortableServer::POA::WrongAdapter &ex) 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; return NULL;
} }
catch (PortableServer::POA::WrongPolicy &ex) catch (PortableServer::POA::WrongPolicy &ex)
{ {
INFOS("GetServant: WrongPolicy"); MESSAGE("GetServant: WrongPolicy");
return NULL; return NULL;
} }
catch (...) catch (...)
{ {
INFOS( "GetServant - Unknown exception was caught!!!" ); MESSAGE( "GetServant - Unknown exception was caught!!!" );
return NULL; return NULL;
} }
} }

2
src/Tools/blocFissure/doc/testcases.rst
View File

@ -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) | | 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 | |.. 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 | | :align: center | :align: center |
+--------------------------------------------+-----------------------------------------------+ +--------------------------------------------+-----------------------------------------------+
| tube | | tube |