Ignore:
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:
1 edited

Legend:

Unmodified
Added
Removed
  • issm/trunk/src/c/solutions/controlrestart.cpp

    r9356 r9571  
    1212        int*     control_type = NULL;
    1313        int      nsteps;
    14         bool     qmu_analysis=true;
     14        bool     dakota_analysis=true;
    1515
    1616        /*retrieve output file name: */
     
    1818        femmodel->parameters->FindParam(&control_type,NULL,ControlTypeEnum);
    1919        femmodel->parameters->FindParam(&nsteps,NstepsEnum);
    20         femmodel->parameters->FindParam(&qmu_analysis,QmuAnalysisEnum);
     20        femmodel->parameters->FindParam(&dakota_analysis,DakotaAnalysisEnum);
    2121
    2222        /*only save if we are not running qmu analysis. We certainly don't want to save control results each time we
    2323         * run on control core!: */
    24         if(!qmu_analysis){
     24        if(!dakota_analysis){
    2525                /*we essentially want J and the parameter: */
    2626                for(int i=0;i<num_controls;i++) InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,control_type[i]);
Note: See TracChangeset for help on using the changeset viewer.