Changeset 5530


Ignore:
Timestamp:
08/23/10 22:21:23 (15 years ago)
Author:
Eric.Larour
Message:

Unhooked control_core backup in case we are running it from a qmu analysis

Location:
issm/trunk/src/c/solutions
Files:
2 edited

Legend:

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

    r5471 r5530  
    2626        int     solution_type;
    2727        bool    isstokes;
     28        bool    qmu_analysis=false;
    2829
    2930        double* responses=NULL;
     
    5859        femmodel->parameters->FindParam(&solution_type,SolutionTypeEnum);
    5960        femmodel->parameters->FindParam(&isstokes,IsStokesEnum);
     61        femmodel->parameters->FindParam(&qmu_analysis,QmuAnalysisEnum);
    6062        /*}}}*/
    6163
     
    118120
    119121        /*some results not computed by steadystate_core or diagnostic_core: */
    120         InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,control_type); //the parameter itself!
    121         InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,GradientEnum);
    122         femmodel->results->AddObject(new DoubleVecExternalResult(femmodel->results->Size()+1,JEnum,J,nsteps,1,0));
    123         femmodel->results->AddObject(new StringExternalResult(femmodel->results->Size()+1,ControlTypeEnum,EnumToString(control_type),1,0));
     122        if(!qmu_analysis){ //do not save this if we are running the control core from a qmu run!
     123                InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,control_type); //the parameter itself!
     124                InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,GradientEnum);
     125                femmodel->results->AddObject(new DoubleVecExternalResult(femmodel->results->Size()+1,JEnum,J,nsteps,1,0));
     126                femmodel->results->AddObject(new StringExternalResult(femmodel->results->Size()+1,ControlTypeEnum,EnumToString(control_type),1,0));
     127        }
    124128
    125129        cleanup_and_return:
  • issm/trunk/src/c/solutions/controlrestart.cpp

    r5103 r5530  
    1111        int      control_type;
    1212        int      nsteps;
     13        bool     qmu_analysis=true;
    1314
    1415        /*retrieve output file name: */
    1516        femmodel->parameters->FindParam(&control_type,ControlTypeEnum);
    1617        femmodel->parameters->FindParam(&nsteps,NStepsEnum);
     18        femmodel->parameters->FindParam(&qmu_analysis,QmuAnalysisEnum);
    1719
    18         /*we essentially want J and the parameter: */
    19         InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,control_type); //the parameter itself!
    20         femmodel->results->AddObject(new DoubleVecExternalResult(femmodel->results->Size()+1,JEnum,J,nsteps,1,0));
    21         femmodel->results->AddObject(new StringExternalResult(femmodel->results->Size()+1,ControlTypeEnum,EnumToString(control_type),1,0));
     20        /*only save if we are not running qmu analysis. We certainly don't want to save control results each time we
     21         * run on control core!: */
     22        if(!qmu_analysis){
     23                /*we essentially want J and the parameter: */
     24                InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,control_type); //the parameter itself!
     25                femmodel->results->AddObject(new DoubleVecExternalResult(femmodel->results->Size()+1,JEnum,J,nsteps,1,0));
     26                femmodel->results->AddObject(new StringExternalResult(femmodel->results->Size()+1,ControlTypeEnum,EnumToString(control_type),1,0));
    2227
    23         /*write to disk: */
    24         OutputResultsx(femmodel->elements, femmodel->nodes, femmodel->vertices, femmodel->loads, femmodel->materials, femmodel->parameters,&femmodel->results);
     28                /*write to disk: */
     29                OutputResultsx(femmodel->elements, femmodel->nodes, femmodel->vertices, femmodel->loads, femmodel->materials, femmodel->parameters,&femmodel->results);
     30        }
    2531
    2632}
Note: See TracChangeset for help on using the changeset viewer.