Changeset 1265

Timestamp:

07/08/09 16:55:21 (16 years ago)

Author:

Mathieu Morlighem

Message:

Added temporary results for control methods

Location:

issm/trunk/src/c

Files:

• Makefile.am (modified) (1 diff)
• parallel/ControlTemporaryResults.cpp (added)
• parallel/control.cpp (modified) (2 diffs)
• parallel/control_core.cpp (modified) (1 diff)
• parallel/diagnostic_core_nonlinear.cpp (modified) (1 diff)
• parallel/parallel.h (modified) (1 diff)

issm/trunk/src/c/Makefile.am

@@ -575 +575 @@
                                         ./parallel/control_core.cpp\
                                         ./parallel/ControlPrepareStokes.cpp\
+                                        ./parallel/ControlTemporaryResults.cpp\
                                         ./parallel/objectivefunctionC.cpp\
                                         ./parallel/GradJCompute.cpp\

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

@@ -38 +38 @@
         double* u_g_obs=NULL;
         Param*  param=NULL;
+        int      count;
 
         MODULEBOOT();
@@ -90 +91 @@
         results=new DataSet(ResultsEnum());
 
+        //Add output file name to parameters of femmodels[0]
+        count=femmodels[0].parameters->Size()+1;
+        param= new Param(count,"outputfilename",STRING);
+        param->SetString(outputfilename);
+        femmodels[0].parameters->AddObject(param);
+
         /*are we running the solution sequence, or a qmu wrapper around it? : */
         femmodels[0].parameters->FindParam((void*)&qmu_analysis,"qmu_analysis");

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

@@ -141 +141 @@
                 _printf_("%s\n","      done.");
 
-                _printf_("%s%i%s%g\n","      value of misfit J after optimization #",n,": ",J[n]);
+                _printf_("%s%i%s%g\n","      value of misfit J after optimization #",n+1,": ",J[n]);
 
                 /*some freeing:*/
                 xfree((void**)&grad_g_double);
+
+                //some temporary saving
+                if (((n+1)%5)==0){
+                        _printf_("%s\n","      saving temporary results...");
+                        ControlTemporaryResults(fems,param_g,J,n,inputs);
+                        _printf_("%s\n","      done.");
+                }
         }
 

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

@@ -134 +134 @@
                 VecDuplicate(old_ug,&dug);VecCopy(old_ug,dug); VecAYPX(dug,-1.0,ug);
                 VecNorm(dug,NORM_2,&ndu);VecNorm(old_ug,NORM_2,&nu);VecNorm(dug,NORM_INFINITY,&nduinf); VecFree(&dug);
+                if (isnan(ndu) || isnan(nu)) throw ErrorException(__FUNCT__,exprintf("convergence criterion is NaN! "));
 
                 //residue

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

@@ -41 +41 @@
 
 void ControlPrepareStokes(FemModel* fems, ParameterInputs* inputs);
+void ControlTemporaryResults(FemModel* fems,double* param_g,double* J,int n,ParameterInputs* inputs);
 
 void CreateFemModel(FemModel* femmodel,ConstDataHandle MODEL,char* analysis_type,char* sub_analysis_type);