ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2024-12-25 17:00:34 +05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'V9_12_BR'

Browse Source
This commit is contained in:
jfa 2024-01-13 00:44:31 +00:00
commit d2955ae6fb
5 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -38,7 +38,7 @@ ENDIF()
# Versioning
# ===========
SALOME_SETUP_VERSION(9.11.0)
SALOME_SETUP_VERSION(9.12.0)
MESSAGE(STATUS "Building ${PROJECT_NAME_UC} ${${PROJECT_NAME_UC}_VERSION} from \"${${PROJECT_NAME_UC}_GIT_SHA1}\"")
# Find KERNEL

8
idl/SMESH_BasicHypothesis.idl
View File

@ -1270,15 +1270,15 @@ module StdMeshers
void SetTotalThickness(in double thickness) raises (SALOME::SALOME_Exception);
void SetNumberLayers(in short numberOfLayers ) raises (SALOME::SALOME_Exception);
void SetStretchFactor(in double strechFactor ) raises (SALOME::SALOME_Exception);
void SetMethod( in VLExtrusionMethod how );
void SetGroupName(in string name);
void SetMethod( in VLExtrusionMethod how ) raises (SALOME::SALOME_Exception);
void SetGroupName(in string name) raises (SALOME::SALOME_Exception);
GEOM::GEOM_Object GetShrinkGeometry( in SMESH::SMESH_Mesh finalMesh, in GEOM::GEOM_Object theObject );
GEOM::GEOM_Object GetShrinkGeometry( in SMESH::SMESH_Mesh finalMesh, in GEOM::GEOM_Object theObject ) raises (SALOME::SALOME_Exception);
/*!
* Build the prismatic layer from the shrink mesh
*/
boolean AddLayers( in SMESH::SMESH_Mesh sourceMesh, in SMESH::SMESH_Mesh finalMesh, in GEOM::GEOM_Object theObject );
boolean AddLayers( in SMESH::SMESH_Mesh sourceMesh, in SMESH::SMESH_Mesh finalMesh, in GEOM::GEOM_Object theObject ) raises (SALOME::SALOME_Exception);
};

2
src/SMESHGUI/SMESHGUI_MeshOp.cxx
View File

@ -2631,7 +2631,7 @@ bool SMESHGUI_MeshOp::editMeshOrSubMesh( QString& theMess, QStringList& theEntry
_PTR(SObject) aMeshSO = SMESH::FindSObject(aMesh.in());
if (aMeshSO) {
SMESH::SetName(aMeshSO, myDlg->objectText(SMESHGUI_MeshDlg::Obj));
if (aSubMeshVar->_is_nil()) SMESH::SetName(aMeshSO, myDlg->objectText(SMESHGUI_MeshDlg::Obj));
theEntryList.append(aMeshSO->GetID().c_str());
}

2
src/StdMeshers/StdMeshers_Cartesian_VL.cxx
View File

@ -1121,7 +1121,7 @@ bool StdMeshers_Cartesian_VL::ViscousBuilder::MakeViscousLayers( SMESH_Mesh &
// Validate map of shrink+joint geometry elements
if ( !CheckGeometryMaps(offsetMesh, theShape ) && !isMainShape2D )
throw SALOME_Exception("All elements from the shrink geometry were not match to the original geometry\n");
throw SALOME_Exception("The shrink geometry does not match or respect the original topology.The viscous layer can't be build");
initMDS->ClearMesh(); // avoid mesh superposition on multiple calls of addLayers

12
src/StdMeshers_I/StdMeshers_ViscousLayerBuilder_i.cxx
View File

@ -188,8 +188,16 @@ CORBA::Boolean StdMeshers_ViscousLayerBuilder_i::AddLayers( SMESH::SMESH_Mesh_pt
TopoDS_Shape theShape = StdMeshers_ObjRefUlils::GeomObjectToShape( theShapeObject );
SMESH_Mesh_i* shrinkMesh_i = SMESH::DownCast< SMESH_Mesh_i* >( shrinkMesh );
SMESH_Mesh_i* theFinalMesh_i = SMESH::DownCast< SMESH_Mesh_i* >( finalMesh );
bool success = GetImpl()->AddLayers( shrinkMesh_i->GetImpl(), theFinalMesh_i->GetImpl(), theShape );
bool success = false;
try
{
success = GetImpl()->AddLayers( shrinkMesh_i->GetImpl(), theFinalMesh_i->GetImpl(), theShape );
}
catch ( std::exception& exc )
{
THROW_SALOME_CORBA_EXCEPTION( exc.what(), SALOME::INTERNAL_ERROR );
}
return success;
}