Changeset 21160

Timestamp:

08/24/16 16:14:51 (9 years ago)

Author:

jbondzio

Message:

BUG: update enthalpy basal BCs before run: newly activated, grounded elements at ice front might cause inconsistencies in basal BCs otherwise

Location:

issm/trunk-jpl

Files:

• src/c/analyses/EnthalpyAnalysis.cpp (modified) (3 diffs)
• test/Archives/Archive327.arch (modified) ( previous)

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

@@ -460 +460 @@
 }/*}}}*/
 void           EnthalpyAnalysis::Core(FemModel* femmodel){/*{{{*/
+
+        IssmDouble dt;
+        bool isdynamicbasalspc;
+
+        femmodel->parameters->FindParam(&dt,TimesteppingTimeStepEnum);
+        femmodel->parameters->FindParam(&isdynamicbasalspc,ThermalIsdynamicbasalspcEnum);
+
         if(VerboseSolution()) _printf0_("   computing enthalpy\n");
         femmodel->SetCurrentConfiguration(EnthalpyAnalysisEnum);
+        if((dt>0.) && isdynamicbasalspc)        UpdateBasalConstraints(femmodel);
         solutionsequence_thermal_nonlinear(femmodel);
 
@@ -467 +475 @@
         InputDuplicatex(femmodel,EnthalpyEnum,EnthalpyPicardEnum);
 
-        IssmDouble dt;
-        femmodel->parameters->FindParam(&dt,TimesteppingTimeStepEnum);
         if(dt==0.) ComputeBasalMeltingrate(femmodel);
         else PostProcessing(femmodel);
@@ -1535 +1541 @@
         bool computebasalmeltingrates=true;
         bool drainicecolumn=true;
-        bool isdynamicbasalspc;
         IssmDouble dt;
 
-        femmodel->parameters->FindParam(&isdynamicbasalspc,ThermalIsdynamicbasalspcEnum);
         femmodel->parameters->FindParam(&dt,TimesteppingTimeStepEnum);
 
-        //TODO: use dt to decide what to do
         if(drainicecolumn)      DrainWaterfraction(femmodel);
         if(computebasalmeltingrates)    ComputeBasalMeltingrate(femmodel);
-        if(isdynamicbasalspc)   UpdateBasalConstraints(femmodel);
 
 }/*}}}*/