Changeset 1209

Timestamp:

07/01/09 17:49:07 (16 years ago)

Author:

Mathieu Morlighem

Message:

Added some routine needed for Stokes CM

Location:

issm/trunk/src/c

Files:

• Makefile.am (modified) (1 diff)
• parallel/ControlPrepareStokes.cpp (added)
• parallel/GradJCompute.cpp (modified) (1 diff)
• parallel/ProcessResults.cpp (modified) (3 diffs)
• parallel/control_core.cpp (modified) (5 diffs)
• parallel/objectivefunctionC.cpp (modified) (1 diff)
• parallel/parallel.h (modified) (1 diff)

issm/trunk/src/c/Makefile.am

@@ -574 +574 @@
                                         ./parallel/control.cpp\
                                         ./parallel/control_core.cpp\
+                                        ./parallel/ControlPrepareStokes.cpp\
                                         ./parallel/objectivefunctionC.cpp\
                                         ./parallel/GradJCompute.cpp\

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

@@ -57 +57 @@
 
         _printf_("%s\n","      recover solution for this stiffness and right hand side:");
-        diagnostic_core_nonlinear(&u_g,&K_ff0,&K_fs0,femmodel,inputs,analysis_type,sub_analysis_type);
+        diagnostic_core_nonlinear(&u_g,&K_ff0,&K_fs0,femmodel,inputs,DiagnosticAnalysisEnum(),sub_analysis_type);
         VecToMPISerial(&u_g_double,u_g); VecFree(&u_g);
         inputs->Add("velocity",u_g_double,numberofdofspernode,numberofnodes);

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

@@ -101 +101 @@
         /*Recover femmodels first: */
         if(analysis_type==DiagnosticAnalysisEnum()){
-
                 fem_dh=fems+0;
                 fem_dv=fems+1;
@@ -116 +115 @@
 
         if(analysis_type==TransientAnalysisEnum()){
-
                 fem_dh=fems+0;
                 fem_dv=fems+1;
@@ -144 +142 @@
 
         if(analysis_type==ControlAnalysisEnum()){
-                fem_dh=fems+0; //load u_g
+                fem_dh=fems+0;
+                fem_dv=fems+1;
+                fem_ds=fems+2;
+                fem_dhu=fems+3;
+                fem_sl=fems+4;
                 fem_c=fems+0;  //load param_g
 

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

@@ -15 +15 @@
         /*fem models: */
         FemModel* fem_dh=NULL;
+        FemModel* fem_dv=NULL;
+        FemModel* fem_dhu=NULL;
+        FemModel* fem_ds=NULL;
+        FemModel* fem_sl=NULL;
 
         /*output: */
@@ -57 +61 @@
         /*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
@@ -91 +99 @@
         fem_dh->parameters->DeleteObject((Object*)param);
 
+        /*take care of Stokes: compute slope and get spc once for all*/
+        if (isstokes){
+                ControlPrepareStokes(fems,inputs);
+        }
+
         /*Start looping: */
         for(n=0;n<nsteps;n++){
@@ -99 +112 @@
 
                 /*Update parameters: */
-                UpdateFromInputsx(fem_dh->elements,fem_dh->nodes,fem_dh->loads, fem_dh->materials,inputs);
+                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);
+                }
 
                 _printf_("%s\n","      computing gradJ...");
-                grad_g=GradJCompute(inputs,fem_dh);
+                if (isstokes){
+                        grad_g=GradJCompute(inputs,fem_ds);
+                }
+                else{
+                        grad_g=GradJCompute(inputs,fem_dh);
+                }
                 _printf_("%s\n","      done.");
 
@@ -113 +136 @@
 
                 _printf_("%s\n","      optimizing along gradient direction...");
-                optargs.femmodel=fem_dh; optargs.param_g=param_g; optargs.grad_g=grad_g_double; optargs.inputs=inputs;optargs.n=n;
+                if (isstokes){
+                        optargs.femmodel=fem_ds;
+                }
+                else{
+                        optargs.femmodel=fem_dh;
+                }
+                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];
                 BrentSearch(&search_scalar,J+n,&optpars,&objectivefunctionC,&optargs);

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

@@ -77 +77 @@
 
         //Run diagnostic with updated parameters.
-        diagnostic_core_nonlinear(&u_g,NULL,NULL,femmodel,inputs,analysis_type,sub_analysis_type);
+        diagnostic_core_nonlinear(&u_g,NULL,NULL,femmodel,inputs,DiagnosticAnalysisEnum(),sub_analysis_type);
         VecToMPISerial(&u_g_double,u_g); VecFree(&u_g);
         inputs->Add("velocity",u_g_double,numberofdofspernode,numberofnodes);

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

@@ -40 +40 @@
 void WriteLockFile(char* filename);
 
+void ControlPrepareStokes(FemModel* fems, ParameterInputs* inputs);
+
 void CreateFemModel(FemModel* femmodel,ConstDataHandle MODEL,char* analysis_type,char* sub_analysis_type);
 //int BatchDebug(Mat* Kgg,Vec* pg,FemModel* femmodel,char* filename);