Changeset 18589 for issm/trunk-jpl/src/c/solutionsequences/convergence.cpp

Timestamp:

10/08/14 02:06:27 (10 years ago)

Author:

jbondzio

Message:

CHG: use solutionsequence_thermal_nonlinear for enthalpy

File:

• issm/trunk-jpl/src/c/solutionsequences/convergence.cpp (modified) (2 diffs)

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

@@ -23 +23 @@
         IssmDouble nF;
         IssmDouble solver_residue,res;
+        int analysis_type;
 
         /*convergence options*/
@@ -41 +42 @@
         /*get convergence options*/
         parameters->FindParam(&eps_res,StressbalanceRestolEnum);
-        parameters->FindParam(&eps_rel,StressbalanceReltolEnum);
+        // get analysis type
+        parameters->FindParam(&analysis_type,AnalysisTypeEnum);
+        if(analysis_type==StressbalanceAnalysisEnum)
+                parameters->FindParam(&eps_rel,StressbalanceReltolEnum);
+        else if(analysis_type==EnthalpyAnalysisEnum)
+                parameters->FindParam(&eps_rel,ThermalReltolEnum);
         parameters->FindParam(&eps_abs,StressbalanceAbstolEnum);
         parameters->FindParam(&yts,ConstantsYtsEnum);