Changeset 1671

Timestamp:

08/13/09 15:49:12 (15 years ago)

Author:

Mathieu Morlighem

Message:

Moved ControlPrepareStokes to ControlInitialization to avoid ifstokes everywhere

Location:

issm/trunk/src/c

Files:

• Makefile.am (modified) (1 diff)
• parallel/ControlInitialization.cpp (added)
• parallel/ControlPrepareStokes.cpp (deleted)
• parallel/control_core.cpp (modified) (5 diffs)
• parallel/parallel.h (modified) (1 diff)

issm/trunk/src/c/Makefile.am

@@ -587 +587 @@
                                         ./parallel/control.cpp\
                                         ./parallel/control_core.cpp\
-                                        ./parallel/ControlPrepareStokes.cpp\
+                                        ./parallel/ControlInitialization.cpp\
                                         ./parallel/ControlTemporaryResults.cpp\
                                         ./parallel/objectivefunctionC.cpp\

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

@@ -13 +13 @@
         extern int my_rank;
 
-        /*fem models: */
-        FemModel* fem_dh=NULL;
-        FemModel* fem_dv=NULL;
-        FemModel* fem_dhu=NULL;
-        FemModel* fem_ds=NULL;
-        FemModel* fem_sl=NULL;
+        /*fem model: */
+        FemModel* fem_model=NULL;
 
         /*output: */
@@ -47 +43 @@
 
         /*flags: */
-        int   analysis_type;
-        int   sub_analysis_type;
+        int analysis_type;
+        int sub_analysis_type;
         int debug=0;
-        int dim=-1;
-        int ishutter=0;
-        int ismacayealpattyn=0;
-        int isstokes=0;
-        int numberofdofspernode_sl;
-        int numberofdofspernode_dh;
-        int numberofdofspernode_ds;
         int numberofnodes;
 
-        /*recover fem models: */
-        fem_dh=fems+0;
-        fem_dv=fems+1;
-        fem_ds=fems+2;
-        fem_dhu=fems+3;
-        fem_sl=fems+4;
-
-        //first recover parameters common to all solutions
-        fem_dh->parameters->FindParam((void*)&debug,"debug");
-        fem_dh->parameters->FindParam((void*)&dim,"dim");
-        fem_dh->parameters->FindParam((void*)&ishutter,"ishutter");
-        fem_dh->parameters->FindParam((void*)&ismacayealpattyn,"ismacayealpattyn");
-        fem_dh->parameters->FindParam((void*)&numberofnodes,"numberofnodes");
-        fem_dh->parameters->FindParam((void*)&isstokes,"isstokes");
+        /*Process models*/
+        ControlInitialization(&fem_model,fems,inputs);
 
         /*Recover parameters used throughout the solution:*/
-        fem_dh->parameters->FindParam((void*)&nsteps,"nsteps");
-        fem_dh->parameters->FindParam((void*)&control_type,"control_type");
-        fem_dh->parameters->FindParam((void*)&fit,"fit");
-        fem_dh->parameters->FindParam((void*)&optscal,"optscal");
-        fem_dh->parameters->FindParam((void*)&maxiter,"maxiter");
-        fem_dh->parameters->FindParam((void*)&tolx,"tolx");
-        fem_dh->parameters->FindParam((void*)&mincontrolconstraint,"mincontrolconstraint");
-        fem_dh->parameters->FindParam((void*)&maxcontrolconstraint,"maxcontrolconstraint");
-        fem_dh->parameters->FindParam((void*)&param_g,"param_g");
-        fem_dh->parameters->FindParam((void*)&analysis_type,"analysis_type");
-        fem_dh->parameters->FindParam((void*)&sub_analysis_type,"sub_analysis_type");
-        fem_dh->parameters->FindParam((void*)&numberofnodes,"numberofnodes");
-        gsize=fem_dh->nodes->NumberOfDofs();
+        fem_model->parameters->FindParam((void*)&nsteps,"nsteps");
+        fem_model->parameters->FindParam((void*)&control_type,"control_type");
+        fem_model->parameters->FindParam((void*)&fit,"fit");
+        fem_model->parameters->FindParam((void*)&optscal,"optscal");
+        fem_model->parameters->FindParam((void*)&maxiter,"maxiter");
+        fem_model->parameters->FindParam((void*)&tolx,"tolx");
+        fem_model->parameters->FindParam((void*)&mincontrolconstraint,"mincontrolconstraint");
+        fem_model->parameters->FindParam((void*)&maxcontrolconstraint,"maxcontrolconstraint");
+        fem_model->parameters->FindParam((void*)&param_g,"param_g");
+        fem_model->parameters->FindParam((void*)&analysis_type,"analysis_type");
+        fem_model->parameters->FindParam((void*)&sub_analysis_type,"sub_analysis_type");
+        fem_model->parameters->FindParam((void*)&numberofnodes,"numberofnodes");
+        gsize=fem_model->nodes->NumberOfDofs();
 
         /*Initialize misfit: */
@@ -93 +70 @@
 
         /*erase useless parameters: */
-        param=(Param*)fem_dh->parameters->FindParamObject("param_g");
-        fem_dh->parameters->DeleteObject((Object*)param);
+        param=(Param*)fem_model->parameters->FindParamObject("param_g");
+        fem_model->parameters->DeleteObject((Object*)param);
 
-        param=(Param*)fem_dh->parameters->FindParamObject("u_g");
-        fem_dh->parameters->DeleteObject((Object*)param);
-
-        /*take care of Stokes: compute slope and get spc once for all*/
-        if (isstokes) ControlPrepareStokes(fems,inputs);
+        param=(Param*)fem_model->parameters->FindParamObject("u_g");
+        fem_model->parameters->DeleteObject((Object*)param);
 
         /*Start looping: */
@@ -110 +84 @@
 
                 /*Update parameters: */
-                if (isstokes) UpdateFromInputsx(fem_ds->elements,fem_ds->nodes,fem_ds->loads, fem_ds->materials,inputs);
-                else UpdateFromInputsx(fem_dh->elements,fem_dh->nodes,fem_dh->loads, fem_dh->materials,inputs);
+                UpdateFromInputsx(fem_model->elements,fem_model->nodes,fem_model->loads, fem_model->materials,inputs);
 
                 _printf_("%s\n","      computing gradJ...");
-                if (isstokes) grad_g=GradJCompute(inputs,fem_ds);
-                else grad_g=GradJCompute(inputs,fem_dh);
+                grad_g=GradJCompute(inputs,fem_model);
                 _printf_("%s\n","      done.");
 
@@ -126 +98 @@
 
                 _printf_("%s\n","      optimizing along gradient direction...");
-                if (isstokes) optargs.femmodel=fem_ds;
-                else optargs.femmodel=fem_dh;
+                optargs.femmodel=fem_model;
                 optargs.param_g=param_g; optargs.grad_g=grad_g_double; optargs.inputs=inputs;optargs.n=n;
                 optpars.xmin=0; optpars.xmax=1; optpars.tolerance=tolx; optpars.maxiter=(int)maxiter[n];

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

@@ -41 +41 @@
 void WriteLockFile(char* filename);
 
-void ControlPrepareStokes(FemModel* fems, ParameterInputs* inputs);
+void ControlInitialization(FemModel** pmodel, FemModel* fems, ParameterInputs* inputs);
 void ControlTemporaryResults(FemModel* fems,double* param_g,double* J,int n,ParameterInputs* inputs);