Changeset 21161

Timestamp:

08/24/16 16:17:53 (9 years ago)

Author:

jbondzio

Message:

CHG: merge enthalpy postprocessing of steadystate and transient case

File:

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

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

@@ -475 +475 @@
         InputDuplicatex(femmodel,EnthalpyEnum,EnthalpyPicardEnum);
 
-        if(dt==0.) ComputeBasalMeltingrate(femmodel);
-        else PostProcessing(femmodel);
+        PostProcessing(femmodel);
 
 }/*}}}*/
@@ -1545 +1544 @@
         femmodel->parameters->FindParam(&dt,TimesteppingTimeStepEnum);
 
-        if(drainicecolumn)      DrainWaterfraction(femmodel);
+        if(drainicecolumn && (dt>0.))   DrainWaterfraction(femmodel);
         if(computebasalmeltingrates)    ComputeBasalMeltingrate(femmodel);