Changeset 17045

Timestamp:

12/23/13 06:44:06 (11 years ago)

Author:

jbondzio

Message:

BUG basal conditions corrected

Location:

issm/trunk-jpl/src/c

Files:

• analyses/EnthalpyAnalysis.cpp (modified) (3 diffs)
• cores/thermal_core.cpp (modified) (1 diff)

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

@@ -774 +774 @@
                         element->EnthalpyToThermal(&temperature[i],&waterfraction[i],values[i],pressure[i]);
                         if(waterfraction[i]<0.) _error_("Negative water fraction found in solution vector");
-                        if(waterfraction[i]>1.) _error_("Water fraction >1 found in solution vector");
+                        //if(waterfraction[i]>1.) _error_("Water fraction >1 found in solution vector");
                 }
                 element->AddInput(EnthalpyEnum,values,P1Enum);
@@ -948 +948 @@
 
         /******** DRAINAGE *****************************************/
-        IssmDouble* drainrate_column  = xNew<IssmDouble>(numsegments); //TODO: xDelete?
+        IssmDouble* drainrate_column  = xNew<IssmDouble>(numsegments);
         IssmDouble* drainrate_element = xNew<IssmDouble>(numsegments);
         for(is=0;is<numsegments;is++)   drainrate_column[is]=0.;
@@ -1116 +1116 @@
                         setspc=((enthalpyup<PureIceEnthalpy(element,pressureup)) && (watercolumn>=0.))?true:false;
                 }
-                else if(watercolumn>0.) // case H<Hpmp && watercolumn>0.
-                        setspc=true;
                 else
                         setspc = false;
+
+
 
                 node=element->GetNode(indices[i]);

issm/trunk-jpl/src/c/cores/thermal_core.cpp

@@ -48 +48 @@
                 InputDuplicatex(femmodel,EnthalpyEnum,EnthalpyPicardEnum);
 
-                /*Post process*/
-                enthalpy_analysis = new EnthalpyAnalysis();
-                enthalpy_analysis->PostProcessing(femmodel);
-                delete enthalpy_analysis;
+                if(solution_type!=SteadystateSolutionEnum){
+                        /*Post process*/
+                        enthalpy_analysis = new EnthalpyAnalysis();
+                        enthalpy_analysis->PostProcessing(femmodel);
+                        delete enthalpy_analysis;
+                }
         }
         else{