From f3b562929664592c3fde17e052f5dbb50c1a3c01 Mon Sep 17 00:00:00 2001 From: eap Date: Wed, 31 Oct 2018 15:01:25 +0300 Subject: [PATCH] 23373: [CEA 1170] Optimization of a 3D mesh using MG-Tetra (note 0022387) always provide memory options for MG-Tetra Optimization --- src/GHS3DPlugin/GHS3DPlugin_OptimizerHypothesis.cxx | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) 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; -- 2.39.2