Changeset 18517

Timestamp:

09/15/14 04:25:08 (11 years ago)

Author:

jbondzio

Message:

BUG: From the series: 'bugs are small and hard to find', lesson 113: 'Do apply basal heating throughout steadystate solver runs, otherwise the solver starts to oscillate'.

Location:

issm/trunk-jpl

Files:

• src/c/analyses/EnthalpyAnalysis.cpp (modified) (1 diff)
• test/Archives/Archive325.nc (modified) ( previous)
• test/Archives/Archive431.nc (modified) ( previous)
• test/Archives/Archive432.nc (modified) ( previous)

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

@@ -588 +588 @@
                 watercolumn_input->GetInputValue(&watercolumn,gauss);
 
-                if((watercolumn<=0.) && (enthalpy<PureIceEnthalpy(element,pressure))){
+                if((dt==0.) || ((watercolumn<=0.) && (enthalpy<PureIceEnthalpy(element,pressure)))){
                         /* the above check is equivalent to 
                          NOT [(watercolumn>0.) AND (enthalpy<PIE)] AND (enthalpy<PIE)*/