Changeset 5247

Timestamp:

08/13/10 11:05:48 (15 years ago)

Author:

Mathieu Morlighem

Message:

control_methods are more general now

Location:

issm/trunk/src/c

Files:

• Makefile.am (modified) (2 diffs)
• modules/ModelProcessorx/Control/CreateParametersControl.cpp (modified) (1 diff)
• solutions/CorePointerFromSolutionEnum.cpp (added)
• solutions/SolutionConfiguration.cpp (modified) (12 diffs)
• solutions/balancedvelocities_core.cpp (modified) (1 diff)
• solutions/control_core.cpp (modified) (6 diffs)
• solutions/solutions.h (modified) (1 diff)

issm/trunk/src/c/Makefile.am

@@ -610 +610 @@
                                         ./objects/Bamg/VertexOnGeom.cpp\
                                         ./objects/Bamg/VertexOnVertex.h\
+                                        ./objects/Bamg/VertexOnVertex.cpp\
                                         ./objects/Bamg/Mesh.h\
                                         ./objects/Bamg/Mesh.cpp\
@@ -1092 +1093 @@
                                         ./solutions/ResetBoundaryConditions.cpp\
                                         ./solutions/SolutionConfiguration.cpp\
+                                        ./solutions/CorePointerFromSolutionEnum.cpp\
                                         ./solvers/solver_linear.cpp\
                                         ./solvers/solver_adjoint_linear.cpp\

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

@@ -32 +32 @@
                         parameters->AddObject(new IntParam(ControlTypeEnum,RheologyB2dEnum));
                 }
-                else
-                 ISSMERROR("control_type %s not supported yet!",iomodel->control_type);
+                else  if (strcmp(iomodel->control_type,"dhdt")==0){
+                        parameters->AddObject(new IntParam(ControlTypeEnum,DhDtEnum));
+                }
+                else{
+                        ISSMERROR("control_type %s not supported yet!",iomodel->control_type);
+                }
 
                 /*What solution type?*/
-                if (solution_type==DiagnosticSolutionEnum){
-                        parameters->AddObject(new BoolParam(ControlSteadyEnum,false));
-                }
-                else if (solution_type==SteadystateSolutionEnum){
+                if (solution_type==SteadystateSolutionEnum){
                         parameters->AddObject(new BoolParam(ControlSteadyEnum,true));
                 }
                 else{
-                        ISSMERROR("Control for solution of type %s not supported yet",EnumToString(solution_type));
+                        parameters->AddObject(new BoolParam(ControlSteadyEnum,false));
                 }
                 parameters->AddObject(new IntParam(NStepsEnum,iomodel->nsteps));

issm/trunk/src/c/solutions/SolutionConfiguration.cpp

@@ -26 +26 @@
         void (*solutioncore)(FemModel*)=NULL;
 
+        /*Get Core pointer*/
+        CorePointerFromSolutionEnum(&solutioncore,solutiontype);
+
+        /*Analyses lists*/
         switch(solutiontype){
         
@@ -37 +41 @@
                         analyses[4]=SurfaceSlopeAnalysisEnum;
                         analyses[5]=BedSlopeAnalysisEnum;
-                        solutioncore=&diagnostic_core;
                         break;
 
@@ -51 +54 @@
                         analyses[6]=ThermalAnalysisEnum;
                         analyses[7]=MeltingAnalysisEnum;
-                        solutioncore=&steadystate_core;
                         break;
 
@@ -59 +61 @@
                         analyses[0]=ThermalAnalysisEnum;
                         analyses[1]=MeltingAnalysisEnum;
-                        solutioncore=&thermal_core;
                         break;
 
@@ -66 +67 @@
                         analyses=(int*)xmalloc(numanalyses*sizeof(int));
                         analyses[0]=PrognosticAnalysisEnum;
-                        solutioncore=&prognostic_core;
                         break;
 
@@ -73 +73 @@
                         analyses=(int*)xmalloc(numanalyses*sizeof(int));
                         analyses[0]=BalancedthicknessAnalysisEnum;
-                        solutioncore=&balancedthickness_core;
                         break;
 
@@ -80 +79 @@
                         analyses=(int*)xmalloc(numanalyses*sizeof(int));
                         analyses[0]=BalancedvelocitiesAnalysisEnum;
-                        solutioncore=&balancedvelocities_core;
                         break;
 
@@ -87 +85 @@
                         analyses=(int*)xmalloc(numanalyses*sizeof(int));
                         analyses[0]=SurfaceSlopeAnalysisEnum;
-                        solutioncore=&surfaceslope_core;
                         break;
 
@@ -94 +91 @@
                         analyses=(int*)xmalloc(numanalyses*sizeof(int));
                         analyses[0]=BedSlopeAnalysisEnum;
-                        solutioncore=&bedslope_core;
                         break;
 
@@ -107 +103 @@
                         analyses[5]=BedSlopeAnalysisEnum;
                         analyses[6]=PrognosticAnalysisEnum;
-                        solutioncore=&transient2d_core;
                         break;
                 
@@ -122 +117 @@
                         analyses[7]=ThermalAnalysisEnum;
                         analyses[8]=MeltingAnalysisEnum;
-                        solutioncore=&transient3d_core;
                         break;
 
@@ -132 +126 @@
         /*Assign output pointers:*/
         if(pnumanalyses) *pnumanalyses=numanalyses;
-        if(panalyses)*panalyses=analyses;
-        else xfree((void**)&analyses);
+        if(panalyses)    *panalyses=analyses;
+        else              xfree((void**)&analyses);
         if(psolutioncore)*psolutioncore=solutioncore;
 

issm/trunk/src/c/solutions/balancedvelocities_core.cpp

@@ -31 +31 @@
         if(verbose)_printf_("saving results:\n");
         if(solution_type==BalancedvelocitiesSolutionEnum){
-                InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,VxEnum);
-                InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,VyEnum);
+                InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,VelEnum);
         }
 

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

@@ -19 +19 @@
         int     verbose=0;
         int     control_type;
-        bool    control_steady;
         int     nsteps;
         double  eps_cm;
@@ -25 +24 @@
         bool    cm_gradient;
         int     dim;
+        int     solution_type;
 
         double* fit=NULL;
@@ -37 +37 @@
         OptPars optpars;
 
+        /*Solution core pointer*/
+        void (*solutioncore)(FemModel*)=NULL;
+
         /*output: */
         double* J=NULL;
-
-        /*some preliminary work to be done if running full-Stokes analysis: */
-        stokescontrolinit(femmodel);
 
         /*Recover parameters used throughout the solution:{{{1*/
@@ -53 +53 @@
         femmodel->parameters->FindParam(&tolx,TolXEnum);
         femmodel->parameters->FindParam(&cm_gradient,CmGradientEnum);
-        femmodel->parameters->FindParam(&control_steady,ControlSteadyEnum);
         femmodel->parameters->FindParam(&dim,DimEnum);
+        femmodel->parameters->FindParam(&solution_type,SolutionTypeEnum);
         /*}}}*/
+
+        /*out of solution_type, figure out solution core function pointer*/
+        CorePointerFromSolutionEnum(&solutioncore,solution_type);
+
+        /*some preliminary work to be done if running full-Stokes analysis: */
+        if (solution_type==SteadystateSolutionEnum || solution_type==DiagnosticSolutionEnum){
+                stokescontrolinit(femmodel);
+        }
 
         /*Initialize misfit: */
@@ -70 +78 @@
                 InputUpdateFromConstantx(femmodel->elements,femmodel->nodes, femmodel->vertices, femmodel->loads, femmodel->materials, femmodel->parameters,(int)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(femmodel);
+                /*In case we are running a steady state control method, compute new temperature field using new parameter distribution: */
+                if (solution_type==SteadystateSolutionEnum) solutioncore(femmodel);
         
                 _printf_("%s\n","      computing gradJ...");
@@ -99 +107 @@
 
         _printf_("%s\n","      preparing final velocity solution");
-        if (control_steady) steadystate_core(femmodel);
-        else diagnostic_core(femmodel);
+        solutioncore(femmodel);
 
         /*some results not computed by steadystate_core or diagnostic_core: */

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

@@ -48 +48 @@
 //solution configuration
 void SolutionConfiguration(int** panalyses,int* pnumanalyses, void (**psolutioncore)(FemModel*),int solutiontype);
+void CorePointerFromSolutionEnum(void (**psolutioncore)(FemModel*),int solutiontype);
 
 #endif