Changeset 2383

Timestamp:

10/07/09 14:57:09 (15 years ago)

Author:

Mathieu Morlighem

Message:

Added Control Restart that saves parameter every 5 iterations

Location:

issm/trunk/src/c

Files:

• Makefile.am (modified) (1 diff)
• ModelProcessorx/Control/CreateParametersControl.cpp (modified) (1 diff)
• ModelProcessorx/CreateParameters.cpp (modified) (1 diff)
• ModelProcessorx/IoModel.cpp (modified) (3 diffs)
• ModelProcessorx/IoModel.h (modified) (1 diff)
• parallel/ControlRestart.cpp (modified) (1 diff)
• parallel/control_core.cpp (modified) (1 diff)
• parallel/parallel.h (modified) (1 diff)

issm/trunk/src/c/Makefile.am

@@ -599 +599 @@
                                         ./parallel/control_core.cpp\
                                         ./parallel/ControlInitialization.cpp\
-                                        ./parallel/ControlTemporaryResults.cpp\
+                                        ./parallel/ControlRestart.cpp\
                                         ./parallel/objectivefunctionC.cpp\
                                         ./parallel/gradjcompute_core.cpp\

issm/trunk/src/c/ModelProcessorx/Control/CreateParametersControl.cpp

@@ -49 +49 @@
         
         if(iomodel->control_analysis){
+
                 /*control_type: */
                 count++;

issm/trunk/src/c/ModelProcessorx/CreateParameters.cpp

@@ -39 +39 @@
         numpar= new Numpar(count);
         parameters->AddObject(numpar);
+
+        //outputfilename
+        count++;
+        param= new Param(count,"outputfilename",STRING);
+        param->SetString(iomodel->outputfilename);
+        parameters->AddObject(param);
 
 

issm/trunk/src/c/ModelProcessorx/IoModel.cpp

@@ -33 +33 @@
         /*!initialize all pointers to 0: */
         iomodel->name=NULL;
+        iomodel->inputfilename=NULL;
+        iomodel->outputfilename=NULL;
         iomodel->repository=NULL;
         iomodel->meshtype=NULL;
@@ -256 +258 @@
 
         /*!Delete structure fields: */
+        xfree((void**)&iomodel->inputfilename);
+        xfree((void**)&iomodel->outputfilename);
         xfree((void**)&iomodel->repository);
         xfree((void**)&iomodel->meshtype);
@@ -296 +300 @@
         /*In IoModelInit, we get all the data that is not difficult to get, and that is small: */
         IoModelFetchData(&iomodel->name,iomodel_handle,"name"); 
+        IoModelFetchData(&iomodel->inputfilename,iomodel_handle,"inputfilename"); 
+        IoModelFetchData(&iomodel->outputfilename,iomodel_handle,"outputfilename"); 
         IoModelFetchData(&iomodel->analysis_type,iomodel_handle,"analysis_type"); 
         IoModelFetchData(&iomodel->sub_analysis_type,iomodel_handle,"sub_analysis_type"); 

issm/trunk/src/c/ModelProcessorx/IoModel.h

@@ -16 +16 @@
 
         char*   name;
+        char*     inputfilename;
+        char*     outputfilename;
         char*   repository;
         char*   meshtype;

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

@@ -51 +51 @@
         
         /*Free ressources:*/
-        delete result;
         delete temporary_results;
         delete results;

issm/trunk/src/c/parallel/control_core.cpp

@@ -166 +166 @@
 
                 //some temporary saving
-                /*if (((n+1)%5)==0){
+                if (((n+1)%1)==0){
                         _printf_("%s\n","      saving temporary results...");
-                        ControlTemporaryResults(model,param_g,J,n,inputs);
+                        ControlRestart(model,param_g);
                         _printf_("%s\n","      done.");
-                }*/
+                }
         }
 

issm/trunk/src/c/parallel/parallel.h

@@ -48 +48 @@
 
 void ControlInitialization(Model* model, ParameterInputs* inputs);
-void ControlTemporaryResults(Model* model,double* param_g,double* J,int n,ParameterInputs* inputs);
+void ControlRestart(Model* model,double* param_g);
 
 void CreateFemModel(FemModel* femmodel,ConstDataHandle MODEL,int analysis_type,int sub_analysis_type);