From: eap <eap@opencascade.com>
Date: Wed, 31 Oct 2018 12:01:25 +0000 (+0300)
Subject: 23373: [CEA 1170] Optimization of a 3D mesh using MG-Tetra (note 0022387)
X-Git-Tag: V9_2_0a2~1
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;ds=sidebyside;h=f3b562929664592c3fde17e052f5dbb50c1a3c01;p=plugins%2Fghs3dplugin.git

23373: [CEA 1170] Optimization of a 3D mesh using MG-Tetra (note 0022387)

always provide memory options for MG-Tetra Optimization
---

diff --git a/src/GHS3DPlugin/GHS3DPlugin_OptimizerHypothesis.cxx b/src/GHS3DPlugin/GHS3DPlugin_OptimizerHypothesis.cxx
index d183a14..88f8f00 100644
--- a/src/GHS3DPlugin/GHS3DPlugin_OptimizerHypothesis.cxx
+++ b/src/GHS3DPlugin/GHS3DPlugin_OptimizerHypothesis.cxx
@@ -155,6 +155,12 @@ std::string GHS3DPlugin_OptimizerHypothesis::CommandToRun(const GHS3DPlugin_Opti
 {
   SMESH_Comment cmd( GetExeName() );
 
+  cmd << " --max_memory "
+      << (( hyp && hyp->myMaximumMemory > 0 ) ? hyp->myMaximumMemory : DefaultMaximumMemory());
+
+  cmd << " --automatic_memory "
+      << (( hyp && hyp->myInitialMemory > 0 ) ? hyp->myInitialMemory : 100.0 );
+
   if ( hyp )
   {
     const char* mode[3] = { "no", "yes", "only" };
@@ -187,12 +193,6 @@ std::string GHS3DPlugin_OptimizerHypothesis::CommandToRun(const GHS3DPlugin_Opti
     if ( !hyp->myToCreateNewNodes )
       cmd << " --no_internal_points";
 
-    if ( hyp->myMaximumMemory > 0 )
-      cmd << " --max_memory " << hyp->myMaximumMemory;
-
-    if ( hyp->myInitialMemory > 0 )
-      cmd << " --automatic_memory " << hyp->myInitialMemory;
-
     cmd << " --verbose " << hyp->myVerboseLevel;
     
     cmd << " " << hyp->myTextOption;