Changeset 4052

Timestamp:

06/17/10 11:10:12 (15 years ago)

Author:

Eric.Larour

Message:

Some renaming of routines.
extensive changes to control_core.

Location:

issm/trunk/src/c/solutions

Files:

• ControlInitialization.cpp (deleted)
• ControlRestart.cpp (deleted)
• control_core.cpp (modified) (6 diffs)
• controlrestart.cpp (added)
• diagnostic_core.cpp (modified) (2 diffs)
• objectivefunctionC.cpp (modified) (1 diff)
• solutions.h (modified) (3 diffs)
• stokescontrolinit.cpp (added)

issm/trunk/src/c/solutions/control_core.cpp ¶

@@ -41 +41 @@
         double* J=NULL;
 
-        /*Process models*/
-        ControlInitialization(femmodel);
+        /*some preliminary work to be done if running full-Stokes analysis: */
+        stokescontrolinit(femmodel);
 
-        /*Recover parameters used throughout the solution:*/
+        /*Recover parameters used throughout the solution:{{{1*/
         femmodel->parameters->FindParam(&nsteps,NStepsEnum);
         femmodel->parameters->FindParam(&control_type,ControlTypeEnum);
@@ -57 +57 @@
         femmodel->parameters->FindParam(&cm_gradient,CmGradientEnum);
         femmodel->parameters->FindParam(&control_steady,ControlSteadyEnum);
+        /*}}}*/
 
         /*Initialize misfit: */
@@ -69 +70 @@
 
                 _printf_("\n%s%i%s%i\n","   control method step ",n+1,"/",nsteps);
-                femmodel->UpdateInputsFromConstant(fit[n],FitEnum);
+                UpdateInputsFromConstantx(femmodel->elements,femmodel->nodes, femmodel->vertices, femmodel->loads, femmodel->materials, femmodel->parameters,fit[n],FitEnum);
                 
                 /*In case we are running a steady state control method, compute new temperature field using new parameter * distribution: */
-                if (control_steady) steadystate_core(model);
+                if (control_steady) steadystate_core(femmodel);
         
-                if(verbose)_printf_("%s\n","      computing gradJ...");
+                _printf_("%s\n","      computing gradJ...");
                 gradient_core(femmodel);
 
                 /*Return gradient if asked: */
                 if (cm_gradient){
-                        InputToResultx(femodel->elements,femodel->nodes,femodel->vertices,femodel->loads,femodel->materials,femodel->parameters,GradientEnum);
+                        InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,GradientEnum);
                         goto cleanup_and_return;
                 }
@@ -91 +92 @@
 
                 _printf_("%s","      constraining the new distribution...");    
-                ControlConstrainx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,control_type,cm_min,cm_max);
+                ControlConstrainInputx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,control_type,cm_min,cm_max);
                 
                 _printf_("%s","      save new parameter...");
@@ -98 +99 @@
                 _printf_("%s%i%s%g\n","      value of misfit J after optimization #",n+1,": ",J[n]);
                 
-                if(controlconvergence)goto cleanup_and_return;
+                if(controlconvergence(J,fit,eps_cm,n))goto convergence_point;
 
                 /*Temporary saving every 5 control steps: */
                 if (((n+1)%5)==0){
                         _printf_("%s","      saving temporary results...");
-                        ControlRestart(femmodel);
+                        controlrestart(femmodel);
                 }
         }
 
+
+        convergence_point:
         _printf_("%s","      preparing final velocity solution");
         if (control_steady) steadystate_core(femmodel);
@@ -113 +116 @@
         /*some results not computed by steadystate_core or diagnostic_core: */
         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)));
+        femmodel->results->AddObject(new DoubleVecExternalResult(femmodel->results->Size()+1,JEnum,J,nsteps,1,0));
+        femmodel->results->AddObject(new StringExternalResult(femmodel->results->Size()+1,ControlTypeEnum,EnumAsString(control_type),1,0));
 
         cleanup_and_return:
-        
         /*Free ressources: */
         xfree((void**)&control_type);

issm/trunk/src/c/solutions/diagnostic_core.cpp ¶

@@ -23 +23 @@
         double stokesreconditioning;
 
-        /* recover parameters: */
+        /* recover parameters: {{{1*/
         femmodel->parameters->FindParam(&verbose,VerboseEnum);
         femmodel->parameters->FindParam(&dim,DimEnum);
@@ -31 +31 @@
         femmodel->parameters->FindParam(&stokesreconditioning,StokesReconditioningEnum);
         femmodel->parameters->FindParam(&qmu_analysis,QmuAnalysisEnum);
+        /*}}}*/
 
         /*for qmu analysis, reinitialize velocity so that fake sensitivities do not show up as a result of a different restart of the convergence at each trial.*/

issm/trunk/src/c/solutions/objectivefunctionC.cpp ¶

@@ -54 +54 @@
 
         /*Constrain:*/
-        ControlConstrainx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,control_type,cm_min,cm_max);
+        ControlConstrainInputx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,control_type,cm_min,cm_max);
 
         /*Run diagnostic with updated inputs: */

issm/trunk/src/c/solutions/solutions.h ¶

@@ -13 +13 @@
 
 /*cores: */
-Results* prognostic_core(FemModel* model);
-Results* prognostic2_core(FemModel* model);
-Results* balancedthickness_core(FemModel* model);
-Results* balancedthickness2_core(FemModel* model);
-Results* balancedvelocities_core(FemModel* model);
-Results* slopecompute_core(FemModel* model);
-Results* control_core(FemModel* model);
-Results* steadystate_core(FemModel* model);
-Results* transient_core(FemModel* model);
-Results* transient_core_2d(FemModel* model);
-Results* transient_core_3d(FemModel* model);
-void adjoint_core(FemModel* model);
-void gradient_core(FemModel* model,int step=0, double search_scalar=0);
-void diagnostic_core(FemModel* model);
-void thermal_core(FemModel* model);
-void surfaceslope_core(FemModel* femmodel);
-void bedslope_core(FemModel* femmodel);
+Results* prognostic_core(FemModel* femmodel);
+Results* prognostic2_core(FemModel* femmodel);
+Results* balancedthickness_core(FemModel* femmodel);
+Results* balancedthickness2_core(FemModel* femmodel);
+Results* balancedvelocities_core(FemModel* femmodel);
+Results* slopecompute_core(FemModel* femmodel);
+Results* steadystate_core(FemModel* femmodel);
+Results* transient_core(FemModel* femmodel);
+Results* transient_core_2d(FemModel* femmodel);
+Results* transient_core_3d(FemModel* femmodel);
+void adjoint_core(FemModel* femmodel);
+void gradient_core(FemModel* femmodel,int step=0, double search_scalar=0);
+void diagnostic_core(FemModel* femmodel);
+void thermal_core(FemModel* femmodel);
+void surfaceslope_core(FemModel* femfemmodel);
+void bedslope_core(FemModel* femfemmodel);
+void control_core(FemModel* femmodel);
 
 //int GradJOrth(WorkspaceParams* workspaceparams);
@@ -35 +35 @@
 int controlconvergence(double* J, double* fit, double eps_cm, int n);
 
-int GoldenSearch(double* psearch_scalar,double* pJ,double xa, double xb, double tolerance, int maxiter, double fit,double optscal,double (*f)(double*,double,double,FemModel*),FemModel* femmodel);
+int GoldenSearch(double* psearch_scalar,double* pJ,double xa, double xb, double tolerance, int maxiter, double fit,double optscal,double (*f)(double*,double,double,FemModel*),FemModel* femfemmodel);
 
-int BrentSearch(double* psearch_scalar,double* pJ,double xa, double xb, double tolerance, int maxiter, double fit,double optscal,double (*f)(double*,double,double,FemModel*),FemModel* femmodel);
+int BrentSearch(double* psearch_scalar,double* pJ,double xa, double xb, double tolerance, int maxiter, double fit,double optscal,double (*f)(double*,double,double,FemModel*),FemModel* femfemmodel);
         
 double objectivefunctionC(double search_scalar,OptArgs* optargs);
 
-int GradJSearch(double* search_vector,FemModel* femmodel,int step);
+int GradJSearch(double* search_vector,FemModel* femfemmodel,int step);
 //int GradJCheck(WorkspaceParams* workspaceparams,int step,int status);
 
@@ -47 +47 @@
 void WriteLockFile(char* filename);
 
-void ControlInitialization(FemModel* model);
-void ControlRestart(FemModel* femmodel);
+void stokescontrolinit(FemModel* femfemmodel);
+void controlrestart(FemModel* femfemmodel);
 
-void CreateFemModel(FemModel* femmodel,ConstDataHandle MODEL,int analysis_type,int sub_analysis_type);
-//int BatchDebug(Mat* Kgg,Vec* pg,FemModel* femmodel,char* filename);
-void ResetBoundaryConditions(FemModel* femmodel, int analysis_type, int sub_analysis_type);
+void CreateFemModel(FemModel* femfemmodel,ConstDataHandle MODEL,int analysis_type,int sub_analysis_type);
+//int BatchDebug(Mat* Kgg,Vec* pg,FemModel* femfemmodel,char* filename);
+void ResetBoundaryConditions(FemModel* femfemmodel, int analysis_type, int sub_analysis_type);
 
 #endif