Changeset 5378

Timestamp:

08/18/10 14:58:34 (15 years ago)

Author:

Mathieu Morlighem

Message:

One adjoint per solution

Location:

issm/trunk/src/c

Files:

• Makefile.am (modified) (2 diffs)
• solutions/AdjointCorePointerFromSolutionEnum.cpp (added)
• solutions/adjoint_core.cpp (deleted)
• solutions/adjointbalancedthickness_core.cpp (added)
• solutions/adjointdiagnostic_core.cpp (added)
• solutions/control_core.cpp (modified) (3 diffs)
• solutions/gradient_core.cpp (modified) (2 diffs)
• solutions/solutions.h (modified) (2 diffs)

issm/trunk/src/c/Makefile.am

@@ -1113 +1113 @@
                                         ./solutions/objectivefunctionC.cpp\
                                         ./solutions/gradient_core.cpp\
-                                        ./solutions/adjoint_core.cpp\
+                                        ./solutions/adjointdiagnostic_core.cpp\
+                                        ./solutions/adjointbalancedthickness_core.cpp\
                                         ./solutions/prognostic_core.cpp\
                                         ./solutions/balancedthickness_core.cpp\
@@ -1126 +1127 @@
                                         ./solutions/SolutionConfiguration.cpp\
                                         ./solutions/CorePointerFromSolutionEnum.cpp\
+                                        ./solutions/AdjointCorePointerFromSolutionEnum.cpp\
                                         ./solvers/solver_linear.cpp\
                                         ./solvers/solver_adjoint_linear.cpp\

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

@@ -37 +37 @@
         OptPars optpars;
 
-        /*Solution core pointer*/
+        /*Solution and Adjoint core pointer*/
         void (*solutioncore)(FemModel*)=NULL;
+        void (*adjointcore)(FemModel*)=NULL;
 
         /*output: */
@@ -57 +58 @@
         /*}}}*/
 
-        /*out of solution_type, figure out solution core function pointer*/
+        /*out of solution_type, figure out solution core and adjoint function pointer*/
         CorePointerFromSolutionEnum(&solutioncore,solution_type);
+        AdjointCorePointerFromSolutionEnum(&adjointcore,solution_type);
 
         /*some preliminary work to be done if running full-Stokes analysis: */
@@ -81 +83 @@
                 /*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","      compute adjoint state:");
+                adjointcore(femmodel);
         
                 _printf_("%s\n","      computing gradJ...");

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

@@ -17 +17 @@
         /*parameters: */
         bool control_steady;
-        int control_type;
-        int verbose;
+        int  control_type;
+        int  verbose;
+
+        /*Intermediaries*/
         Vec new_gradient=NULL;
         Vec gradient=NULL;
@@ -28 +30 @@
         femmodel->parameters->FindParam(&verbose,VerboseEnum);
 
-        if(verbose)_printf_("%s\n","      compute adjoint state:");
-        adjoint_core(femmodel);
-        
         if(verbose)_printf_("%s\n","      compute gradient:");
         Gradjx(&gradient, femmodel->elements,femmodel->nodes, femmodel->vertices,femmodel->loads, femmodel->materials,femmodel->parameters, control_type);

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

@@ -13 +13 @@
 
 /*cores: */
-void adjoint_core(FemModel* femmodel);
+void adjointdiagnostic_core(FemModel* femmodel);
+void adjointbalancedthickness_core(FemModel* femmodel);
 void gradient_core(FemModel* femmodel,int step=0, double search_scalar=0);
 void diagnostic_core(FemModel* femmodel);
@@ -49 +50 @@
 void SolutionConfiguration(int** panalyses,int* pnumanalyses, void (**psolutioncore)(FemModel*),int solutiontype);
 void CorePointerFromSolutionEnum(void (**psolutioncore)(FemModel*),int solutiontype);
+void AdjointCorePointerFromSolutionEnum(void (**padjointcore)(FemModel*),int solutiontype);
 
 #endif