Changeset 15055

Timestamp:

05/21/13 10:09:52 (12 years ago)

Author:

Mathieu Morlighem

Message:

CHG: moved convergence stuff to solutionsequences (solutionsequences should not include analyses.h)

Location:

issm/trunk-jpl/src/c

Files:

• Makefile.am (modified) (4 diffs)
• analyses/CMakeLists.txt (modified) (1 diff)
• analyses/analyses.h (modified) (2 diffs)
• analyses/control_core.cpp (modified) (4 diffs)
• analyses/controlconvergence.cpp (deleted)
• analyses/controlrestart.cpp (deleted)
• analyses/steadystate_core.cpp (modified) (2 diffs)
• analyses/steadystateconvergence.cpp (deleted)
• solutionsequences/convergence.cpp (moved) (moved from issm/trunk-jpl/src/c/analyses/convergence.cpp )
• solutionsequences/solutionsequence_newton.cpp (modified) (1 diff)
• solutionsequences/solutionsequence_nonlinear.cpp (modified) (1 diff)
• solutionsequences/solutionsequence_stokescoupling_nonlinear.cpp (modified) (1 diff)
• solutionsequences/solutionsequences.h (modified) (2 diffs)

issm/trunk-jpl/src/c/Makefile.am

@@ -321 +321 @@
                                         ./modules/InputConvergencex/InputConvergencex.cpp\
                                         ./modules/InputConvergencex/InputConvergencex.h\
-                                        ./analyses/convergence.cpp\
                                         ./analyses/ProcessArguments.cpp\
                                         ./analyses/ResetBoundaryConditions.cpp\
@@ -333 +332 @@
                                         ./solutionsequences/solutionsequence_nonlinear.cpp\
                                         ./solutionsequences/solutionsequence_newton.cpp\
+                                        ./solutionsequences/convergence.cpp\
                                         ./classes/Options/Options.h\
                                         ./classes/Options/Options.cpp\
@@ -361 +361 @@
 #}}}
 #Steadystate sources  {{{
-steadystate_sources = ./analyses/steadystate_core.cpp\
-                                                         ./analyses/steadystateconvergence.cpp
+steadystate_sources = ./analyses/steadystate_core.cpp
 #}}}
 #Prognostic sources  {{{
@@ -436 +435 @@
                                           ./analyses/control_core.cpp\
                                           ./analyses/controltao_core.cpp\
-                                          ./analyses/controlrestart.cpp\
-                                          ./analyses/controlconvergence.cpp\
                                           ./analyses/objectivefunction.cpp\
                                           ./analyses/gradient_core.cpp\

issm/trunk-jpl/src/c/analyses/CMakeLists.txt

@@ -23 +23 @@
 # }}}
 # STEADYSTATE_SOURCES {{{
-set(STEADYSTATE_SOURCES $ENV{ISSM_DIR}/src/c/solutions/steadystate_core.cpp
-                  $ENV{ISSM_DIR}/src/c/solutions/steadystateconvergence.cpp PARENT_SCOPE)
+set(STEADYSTATE_SOURCES $ENV{ISSM_DIR}/src/c/solutions/steadystate_core.cpp PARENT_SCOPE)
 # }}}
 # PROGNOSTIC_SOURCES {{{

issm/trunk-jpl/src/c/analyses/analyses.h

@@ -39 +39 @@
 IssmDouble objectivefunction(IssmDouble search_scalar,OptArgs* optargs);
 
-//convergence:
-void convergence(bool* pconverged, Matrix<IssmDouble>* K_ff,Vector<IssmDouble>* p_f,Vector<IssmDouble>* u_f,Vector<IssmDouble>* u_f_old,Parameters* parameters);
-bool controlconvergence(IssmDouble J,IssmDouble tol_cm);
-bool steadystateconvergence(FemModel* femmodel);
-
 //optimization
 int GradJSearch(IssmDouble* search_vector,FemModel* femmodel,int step);
@@ -50 +45 @@
 void ProcessArguments(int* solution,char** pbinname,char** poutbinname,char** ptoolkitsname,char** plockname,char** prootpath,int argc,char **argv);
 void WriteLockFile(char* filename);
-void controlrestart(FemModel* femmodel,IssmDouble* J);
 void ResetBoundaryConditions(FemModel* femmodel, int analysis_type);
 COMM EnvironmentInit(int argc,char** argv);

issm/trunk-jpl/src/c/analyses/control_core.cpp

@@ -10 +10 @@
 #include "../solutionsequences/solutionsequences.h"
 
+/*Local prototypes*/
+bool controlconvergence(IssmDouble J, IssmDouble tol_cm);
+
 void control_core(FemModel* femmodel){
 
-        int     i,n;
+        int     i;
 
         /*parameters: */
-        int     num_controls,num_responses;
-        int     nsteps;
-        IssmDouble  tol_cm;
-        bool    cm_gradient;
-        int     dim;
-        int     solution_type;
-        bool    isstokes;
-        bool    dakota_analysis=false;
+        int        num_controls,num_responses;
+        int        nsteps;
+        IssmDouble tol_cm;
+        bool       cm_gradient;
+        int        dim;
+        int        solution_type;
+        bool       isstokes;
+        bool       dakota_analysis = false;
 
-        int*    control_type = NULL;
-        IssmDouble* responses=NULL;
-        int*    step_responses=NULL;
-        IssmDouble* maxiter=NULL;
-        IssmDouble* cm_jump=NULL;
+        int        *control_type   = NULL;
+        IssmDouble *responses      = NULL;
+        int        *step_responses = NULL;
+        IssmDouble *maxiter        = NULL;
+        IssmDouble *cm_jump        = NULL;
 
         /*intermediary: */
-        IssmDouble  search_scalar=1;
-        OptArgs optargs;
-        OptPars optpars;
+        IssmDouble search_scalar = 1;
+        OptArgs    optargs;
+        OptPars    optpars;
 
         /*Solution and Adjoint core pointer*/
-        void (*solutioncore)(FemModel*)=NULL;
-        void (*adjointcore)(FemModel*)=NULL;
+        void (*solutioncore)(FemModel*) = NULL;
+        void (*adjointcore)(FemModel*)  = NULL;
 
         /*output: */
@@ -75 +78 @@
 
         /*Start looping: */
-        for(n=0;n<nsteps;n++){
+        for(int n=0;n<nsteps;n++){
 
                 /*Display info*/
@@ -115 +118 @@
                 #ifdef _HAVE_ADOLC_
                 IssmPDouble* J_passive=xNew<IssmPDouble>(nsteps);
-                for(int i=0;i<nsteps;i++)J_passive[i]=reCast<IssmPDouble>(J[i]);
+                for(i=0;i<nsteps;i++) J_passive[i]=reCast<IssmPDouble>(J[i]);
                 femmodel->results->AddObject(new GenericExternalResult<IssmPDouble*>(femmodel->results->Size()+1,JEnum,J_passive,nsteps,1,1,0));
                 xDelete<IssmPDouble>(J_passive);
@@ -132 +135 @@
         xDelete<IssmDouble>(J);
 }
+bool controlconvergence(IssmDouble J, IssmDouble tol_cm){
+
+        bool converged=false;
+
+        /*Has convergence been reached?*/
+        if (!xIsNan<IssmDouble>(tol_cm) && J<tol_cm){
+                converged=true;
+                if(VerboseConvergence()) _pprintString_("      Convergence criterion reached: J = " << J << " < " << tol_cm);
+        }
+
+        return converged;
+}

issm/trunk-jpl/src/c/analyses/steadystate_core.cpp

@@ -14 +14 @@
 #include "../modules/modules.h"
 #include "../solutionsequences/solutionsequences.h"
+
+/*Local prototypes*/
+bool steadystateconvergence(FemModel* femmodel);
 
 void steadystate_core(FemModel* femmodel){
@@ -91 +94 @@
         xDelete<int>(requested_outputs);
 }
+bool steadystateconvergence(FemModel* femmodel){
+
+        /*output: */
+        bool converged=false;
+        bool velocity_converged=false;
+        bool temperature_converged=false;
+
+        /*intermediary: */
+        int velocityenums[8]={VxEnum,VxPicardEnum,VyEnum,VyPicardEnum,VzEnum,VzPicardEnum,PressureEnum,PressurePicardEnum}; //pairs of enums (new and old) on which to carry out the converence tests
+        int temperatureenums[2]={TemperatureEnum,TemperatureOldEnum};
+        int convergencecriterion[1]={RelativeEnum}; //criterions for convergence, RelativeEnum or AbsoluteEnum
+        IssmDouble convergencecriterionvalue[1]; //value of criterion to be respected
+
+        /*retrieve parameters: */
+        femmodel->parameters->FindParam(&convergencecriterionvalue[0],SteadystateReltolEnum);
+
+        /*figure out convergence at the input level, because we don't have the solution vectors!: */
+        velocity_converged=InputConvergencex(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,&velocityenums[0],8,&convergencecriterion[0],&convergencecriterionvalue[0],1);
+        temperature_converged=InputConvergencex(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,&temperatureenums[0],2,&convergencecriterion[0],&convergencecriterionvalue[0],1);
+
+        if(velocity_converged && temperature_converged) converged=true;
+
+        /*return: */
+        return converged;
+}

issm/trunk-jpl/src/c/solutionsequences/solutionsequence_newton.cpp

@@ -3 +3 @@
  */ 
 
+#include "./solutionsequences.h"
 #include "../toolkits/toolkits.h"
 #include "../classes/classes.h"
 #include "../shared/shared.h"
 #include "../modules/modules.h"
-#include "../analyses/analyses.h"
 
 void solutionsequence_newton(FemModel* femmodel){

issm/trunk-jpl/src/c/solutionsequences/solutionsequence_nonlinear.cpp

@@ -3 +3 @@
  */ 
 
+#include "./solutionsequences.h"
 #include "../toolkits/toolkits.h"
 #include "../classes/classes.h"
 #include "../shared/shared.h"
 #include "../modules/modules.h"
-#include "../analyses/analyses.h"
 
 void solutionsequence_nonlinear(FemModel* femmodel,bool conserve_loads){

issm/trunk-jpl/src/c/solutionsequences/solutionsequence_stokescoupling_nonlinear.cpp

@@ -3 +3 @@
  */ 
 
+#include "./solutionsequences.h"
 #include "../toolkits/toolkits.h"
 #include "../classes/classes.h"
 #include "../shared/shared.h"
 #include "../modules/modules.h"
-#include "../analyses/analyses.h"
 
 void solutionsequence_stokescoupling_nonlinear(FemModel* femmodel,bool conserve_loads){

issm/trunk-jpl/src/c/solutionsequences/solutionsequences.h

@@ -6 +6 @@
 #define _SOLUTION_SEQUENCES_H_
 
-struct OptArgs;
 class FemModel;
+class Parameters;
+template <class doubletype> class Matrix;
+template <class doubletype> class Vector;
+#include "../shared/Numerics/types.h"
 
 void solutionsequence_thermal_nonlinear(FemModel* femmodel);
@@ -17 +20 @@
 void solutionsequence_adjoint_linear(FemModel* femmodel);
 
+/*convergence*/
+void convergence(bool* pconverged, Matrix<IssmDouble>* K_ff,Vector<IssmDouble>* p_f,Vector<IssmDouble>* u_f,Vector<IssmDouble>* u_f_old,Parameters* parameters);
+
 #endif