Don't need to set the height of the layer face by face

Remove old files from install

diff --git a/bin/CMakeLists.txt b/bin/CMakeLists.txt
index f866ddd6b7b52169cac52d8d22cd5988cd2f1c34..938ce35537aabe756aac51184d2a83abacfcf9b9 100644 (file)
--- 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 5eb51c712a1436191e6bff72ca0dd1b38ec0b922..ff12ecf34881e660777d41273f0f6c0d543a9634 100644 (file)
--- 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<int>& 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
 }
 
 //=============================================================================