Changeset 24451

Timestamp:

12/06/19 08:54:38 (5 years ago)

Author:

Mathieu Morlighem

Message:

CHG: fixing dakota output

File:

• issm/trunk-jpl/src/c/modules/OutputResultsx/OutputResultsx.cpp (modified) (1 diff)

issm/trunk-jpl/src/c/modules/OutputResultsx/OutputResultsx.cpp

@@ -24 +24 @@
         int         solutiontype;
         char*       solutiontypestring      = NULL;
-        bool        dakota_analysis;
-        bool        dakota_output;
 
-        /*retrieve parameters: */
-        femmodel->parameters->FindParam(&dakota_analysis,QmuIsdakotaEnum);
-        femmodel->parameters->FindParam(&dakota_output,QmuOutputEnum);
 
         /*recover my_rank:*/
         my_rank=IssmComm::GetRank();
 
-        if(dakota_analysis & !dakota_output){
-                //user wants to rely purely on Dakota analysis output, not the core output. 
-                return; 
+        /*If we are running dakota, do we want to output?*/
+        bool dakota_analysis;
+        femmodel->parameters->FindParam(&dakota_analysis,QmuIsdakotaEnum);
+        if(dakota_analysis){
+                bool dakota_output;
+                femmodel->parameters->FindParam(&dakota_output,QmuOutputEnum);
+                if(!dakota_output) return; 
         }