From a0e37fe402a12490ce1ede2d7b07343cf7e99a98 Mon Sep 17 00:00:00 2001 From: Christophe Bourcier Date: Thu, 28 Sep 2023 16:52:27 +0200 Subject: [PATCH] Don't need to set the height of the layer face by face Remove old files from install --- bin/CMakeLists.txt | 3 --- src/HYBRIDPlugin/HYBRIDPlugin_Hypothesis.cxx | 17 ++++++++--------- 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/bin/CMakeLists.txt b/bin/CMakeLists.txt index f866ddd..938ce35 100644 --- a/bin/CMakeLists.txt +++ b/bin/CMakeLists.txt @@ -22,9 +22,6 @@ SALOME_CONFIGURE_FILE(VERSION.in VERSION INSTALL ${SALOME_INSTALL_BINS}) # scripts / static / binaries # temporary standalone project version of mg-hybrid.exe SET(_bin_SCRIPTS - mg-hybrid.bash - mg-hybrid.exe_Linux_64_avril2014 - mg-hybrid.exe_Linux_64_juillet2014 createGroupsOnEntitiesFromGMFFile.py ) diff --git a/src/HYBRIDPlugin/HYBRIDPlugin_Hypothesis.cxx b/src/HYBRIDPlugin/HYBRIDPlugin_Hypothesis.cxx index 5eb51c7..ff12ecf 100644 --- a/src/HYBRIDPlugin/HYBRIDPlugin_Hypothesis.cxx +++ b/src/HYBRIDPlugin/HYBRIDPlugin_Hypothesis.cxx @@ -2068,10 +2068,14 @@ std::string HYBRIDPlugin_Hypothesis::CommandToRun(const HYBRIDPlugin_Hypothesis* cmd << " --boundary_layer_surface_tags "; for ( size_t i = 0; i < faceLayersIDs.size(); ++i ) cmd << faceLayersIDs[i] << ","; - if ( !faceLayersIDs.empty() ) - cmd << " --boundary_layer_initial_height_on_surface_tags "; - for ( size_t i = 0; i < faceLayersIDs.size(); ++i ) - cmd << hyp->myHeightFirstLayer << ","; + // Don't need to set the height of the layer face by face since: + // - the same height is already set on all the faces with boundary_layer_global_initial_height + // - we don't allow the user to set different heights for specific faces for now + // nor in GUI nor in python (it will require a further improvement if needed) +// if ( !faceLayersIDs.empty() ) +// cmd << " --boundary_layer_initial_height_on_surface_tags "; +// for ( size_t i = 0; i < faceLayersIDs.size(); ++i ) +// cmd << hyp->myHeightFirstLayer << ","; // faces with imprinting const std::vector& faceImprintingIDs = hyp->GetFacesWithImprinting(); @@ -2173,12 +2177,7 @@ std::string HYBRIDPlugin_Hypothesis::GetFileName(const HYBRIDPlugin_Hypothesis* std::string HYBRIDPlugin_Hypothesis::GetExeName() { - //call mg-hybrid.bash is script which assumes new project version(s) mg-hybrid.exe in the prerequisite base and special? licence. -#ifdef WIN32 return "mg-hybrid.exe"; -#else - return "mg-hybrid.bash"; -#endif } //============================================================================= -- 2.39.2