Fixing issues pointed. Eliminate reference to MG_TetraHPC_API class since it is not...

[plugins/ghs3dplugin.git] / src / GUI / GHS3DPluginGUI_HypothesisCreator.cxx

diff --git a/src/GUI/GHS3DPluginGUI_HypothesisCreator.cxx b/src/GUI/GHS3DPluginGUI_HypothesisCreator.cxx
index 6b477bf2e5c9b3121e39d6295c58b62a9e13c3d8..2589be3438fc78e739012c21b903769cccec5ba7 100644 (file)
--- a/src/GUI/GHS3DPluginGUI_HypothesisCreator.cxx
+++ b/src/GUI/GHS3DPluginGUI_HypothesisCreator.cxx
@@ -1921,20 +1921,28 @@ bool GHS3DPluginGUI_HypothesisCreator::storeParamsToHypo( const GHS3DHypothesisD
     if( isCreation() )
       SMESH::SetName( SMESH::FindSObject( h ), h_data.myName.toLatin1().constData() );
 
-    h->SetAlgorithm                   ((CORBA::Short) h_data.myAlgorithm );
+    if ( opt->_is_nil() )
+    {
+      h->SetAlgorithm                   ((CORBA::Short) h_data.myAlgorithm );
+      h->SetUseNumOfThreads             ( h_data.myUseNumOfThreads     );
+      h->SetNumOfThreads                ( (CORBA::Short) h_data.myNumOfThreads        );
+      h->SetPthreadMode                 ( (CORBA::Short) h_data.myPthreadMode         );
+      h->SetParallelMode                ( (CORBA::Short) h_data.myParallelMode        );
+      h->SetGradation                   ( h_data.myGradation         );
+      h->SetToMeshHoles                 ( h_data.myToMeshHoles       );
+      h->SetToMakeGroupsOfDomains       ( h_data.myToMakeGroupsOfDomains );
+      h->SetVolumeProximity             ( h_data.myUseProximity      );
+      h->SetNbVolumeProximityLayers     ((CORBA::Short) h_data.myNbProximityLayers );
+    }
+
+    // Common existing options optimization a MGTetra && MGTetraHPC
     h->SetOptimizationLevel           ((CORBA::Short) h_data.myOptimizationLevel );
     h->SetMinSize                     ( h_data.myUseMinSize ? h_data.myMinSize : 0 );
     h->SetMaxSize                     ( h_data.myUseMaxSize ? h_data.myMaxSize : 0 );
     h->SetMinMaxSizeDefault           ( this->myMinSizeDefault, this->myMaxSizeDefault );
-    h->SetGradation                   ( h_data.myGradation         );
-    h->SetVolumeProximity             ( h_data.myUseProximity      );
-    h->SetNbVolumeProximityLayers     ((CORBA::Short) h_data.myNbProximityLayers );
-    h->SetToMeshHoles                 ( h_data.myToMeshHoles       );
-    h->SetToMakeGroupsOfDomains       ( h_data.myToMakeGroupsOfDomains );
 
     h->SetMaximumMemory               ( h_data.myMaximumMemory     );
     h->SetInitialMemory               ( h_data.myInitialMemory     );
-    h->SetInitialMemory               ( h_data.myInitialMemory     );
     h->SetKeepFiles                   ( h_data.myKeepFiles         );
     h->SetWorkingDirectory            ( h_data.myWorkingDir.toLatin1().constData() );
     h->SetVerboseLevel                ( h_data.myVerboseLevel      );
@@ -1943,10 +1951,7 @@ bool GHS3DPluginGUI_HypothesisCreator::storeParamsToHypo( const GHS3DHypothesisD
     //h->SetFEMCorrection               ( h_data.myFEMCorrection     );
     h->SetStandardOutputLog           ( h_data.myLogInStandardOutput );
     h->SetRemoveLogOnSuccess          ( h_data.myRemoveLogOnSuccess  );
-    h->SetUseNumOfThreads             ( h_data.myUseNumOfThreads     );
-    h->SetNumOfThreads                ( (CORBA::Short) h_data.myNumOfThreads        );
-    h->SetPthreadMode                 ( (CORBA::Short) h_data.myPthreadMode         );
-    h->SetParallelMode                ( (CORBA::Short) h_data.myParallelMode        );
+    
 
     if ( !opt->_is_nil() )
     {