Changeset 26632

Timestamp:

11/16/21 14:05:39 (3 years ago)

Author:

aleahsommers

Message:

CHG: take out friction heat from melt rate when gap height is greater than bump height

File:

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

issm/trunk-jpl/src/c/analyses/HydrologyShaktiAnalysis.cpp ¶

@@ -357 +357 @@
                 frictionheat=alpha2*(vx*vx+vy*vy);
 
+                /* *** TEST take out frictional heat for large gap height *** */
+                if(gap>br)
+                 frictionheat=0.;
+
                 /*Get water and ice pressures*/
                 IssmDouble pressure_ice   = rho_ice*g*thickness;    _assert_(pressure_ice>0.); 
@@ -648 +652 @@
                 frictionheat=alpha2*(vx*vx+vy*vy);
 
+                /* *** TEST take out frictional heat for large gap height *** */
+                if(gap>br)
+                 frictionheat=0.;
+
                 /*Get water and ice pressures*/
                 IssmDouble pressure_ice   = rho_ice*g*thickness;    _assert_(pressure_ice>0.);