Changeset 15055 for issm/trunk-jpl/src/c/analyses/steadystate_core.cpp

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)

File:

• issm/trunk-jpl/src/c/analyses/steadystate_core.cpp (modified) (2 diffs)

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;
+}