Changeset 19931

Timestamp:

01/06/16 14:00:42 (9 years ago)

Author:

aleahsommers

Message:

CHG: Put in a cap so that subglacial gap height cannot exceed the ice thickness

File:

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

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

@@ -484 +484 @@
                 IssmDouble pressure_water = rho_water*g*(head-bed);
                 if(pressure_water>pressure_ice) pressure_water = pressure_ice;
+      
 
                 meltrate = 1/latentheat*(G+frictionheat+rho_water*g*conductivity*(dh[0]*dh[0]+dh[1]*dh[1]));
@@ -501 +502 @@
         if(newgap<mingap) newgap=mingap;
 
+        /*Limit gap height to grow to surface*/
+        if(newgap>thickness)
+         newgap = thickness;
+        
+         
         /*Add new gap as an input*/
         element->AddInput(HydrologyGapHeightEnum,&newgap,P0Enum);