Changeset 4048 for issm/trunk/src/c/solutions/ControlRestart.cpp

Timestamp:

06/16/10 18:20:52 (15 years ago)

Author:

Eric.Larour

Message:

Serious cleanup of the control solutoin

File:

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

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

@@ -1 @@
-
 /*!\file: ControlRestart.cpp
- * \brief: core of the control solution 
+ * \brief: save as much as possible, to be able to restart the control_core solution
  */ 
 
@@ -8 +7 @@
 #include "../EnumDefinitions/EnumDefinitions.h"
 
-void ControlRestart(Model* model,double* param_g){
+void ControlRestart(FemModel* femmodel){
 
-        extern int my_rank;
-
-        /*output: */
-        Results* results=NULL;
         char*    outputfilename=NULL;
-
-        /*Intermediary: */
-        int      i;
-        int      numberofnodes;
-        double* param_g_copy;
-
-        /*Recover parameters used throughout the solution:*/
-        model->FindParam(&numberofnodes,NumberOfNodesEnum);
+        
+        /*retrieve output file name: */
         model->FindParam(&outputfilename,OutputFileNameEnum);
 
-        /*Plug COPYS of the results into output dataset: 
-         * only the pointer is given to temporary_results and at the
-         * end of ProcessResultsx the pointer is deleted. That would 
-         * destroy param_g*/
+        /*we essentially want J and the parameter: */
+        InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,control_type); //the parameter itself!
+        femmodel->otherresults->AddObject(new DoubleResult(femmodel->otherresults->Size()+1,0,1,"J",J,nsteps));
+        femmodel->otherresults->AddObject(new StringResult(results->Size()+1,ControlTypeEnum,0,1,EnumAsString(control_type)));
 
-        param_g_copy=(double*)xcalloc(numberofnodes,sizeof(double));
-        for(i=0;i<numberofnodes;i++) param_g_copy[i]=param_g[i];
-
-        results=new Results();
-        results->AddObject(new Result(results->Size()+1,0,1,"param_g",param_g_copy,numberofnodes));
-        results->AddObject(new StringResult(results->Size()+1,AnalysisTypeEnum,0,1,EnumAsString(DiagnosticAnalysisEnum)));
-
-        //Write results on disk
-        OutputResults(results,outputfilename);
+        /*write to disk: */
+        OutputResults(femmodel->elements, femmodel->loads, femmodel->nodes, femmodel->vertices, femmodel->materials, femmodel->parameters, outputfilename);
         
         /*Free ressources:*/
-        delete results;
         xfree((void**)&outputfilename);
-        xfree((void**)&param_g_copy);
 }