Changeset 9571 for issm/trunk/src/c/solutions/controlrestart.cpp

Timestamp:

09/01/11 19:58:19 (14 years ago)

Author:

Eric.Larour

Message:

Simplified solutioncore calling structure. Took out control_core
from issm.m and issm.cpp.
New AnalysisConfiguration routine and new call to CorePointerFromSolutionEnum in issm.m and issm.cpp
Qmu could not be folded, had to put it back into issm.m and issm.cpp

Renamed Qmu to Dakota.

File:

• issm/trunk/src/c/solutions/controlrestart.cpp (modified) (2 diffs)

issm/trunk/src/c/solutions/controlrestart.cpp

@@ -12 +12 @@
         int*     control_type = NULL;
         int      nsteps;
-        bool     qmu_analysis=true;
+        bool     dakota_analysis=true;
 
         /*retrieve output file name: */
@@ -18 +18 @@
         femmodel->parameters->FindParam(&control_type,NULL,ControlTypeEnum);
         femmodel->parameters->FindParam(&nsteps,NstepsEnum);
-        femmodel->parameters->FindParam(&qmu_analysis,QmuAnalysisEnum);
+        femmodel->parameters->FindParam(&dakota_analysis,DakotaAnalysisEnum);
 
         /*only save if we are not running qmu analysis. We certainly don't want to save control results each time we 
          * run on control core!: */
-        if(!qmu_analysis){
+        if(!dakota_analysis){
                 /*we essentially want J and the parameter: */
                 for(int i=0;i<num_controls;i++) InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,control_type[i]);