Changeset 27937

Timestamp:

10/04/23 12:09:12 (19 months ago)

Author:

koitf1

Message:

BUG: fix coeff calculation in GlaDS hydrology transition model

Location:

issm/trunk-jpl/src

Files:

• c/analyses/HydrologyGlaDSAnalysis.cpp (modified) (1 diff)
• m/classes/hydrologyglads.m (modified) (1 diff)
• m/classes/hydrologyglads.py (modified) (1 diff)

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

@@ -531 +531 @@
                 IssmDouble coarg = 1. + 4.*pow(hratio,3-2*alpha)*omega*k*pow(h,3)*normgradphi/nu;
                 coeff = nu/2./omega*pow(hratio,2*alpha-3) * (-1 + pow(coarg, 0.5))/normgradphi/max(AEPS,h);  // divide by h to get speed instead of discharge
-                coeff = k*pow(h,alpha)*pow(normgradphi,beta-2.)/max(AEPS,h);  // divide by h to get speed instead of discharge
         }
         else {

issm/trunk-jpl/src/m/classes/hydrologyglads.m

@@ -126 +126 @@
                         fielddisplay(self,'requested_outputs','additional outputs requested');
                         fielddisplay(self,'melt_flag','User specified basal melt? 0: no (default), 1: use md.basalforcings.groundedice_melting_rate');
-                        fielddisplay(self,'istransition','do we use transition [1] or turbulent physics [0, default]');
+                        fielddisplay(self,'istransition','do we use standard [0, default] or transition model [1]');
                 end % }}}
                 function marshall(self,prefix,md,fid) % {{{

issm/trunk-jpl/src/m/classes/hydrologyglads.py

@@ -72 +72 @@
         s += '{}\n'.format(fielddisplay(self, 'requested_outputs', 'additional outputs requested'))
         s += '{}\n'.format(fielddisplay(self, 'melt_flag', 'User specified basal melt? 0: no (default), 1: use md.basalforcings.groundedice_melting_rate'))
-        s += '{}\n'.format(fielddisplay(self, 'istransition','do we use transition [1] or turbulent physics [0, default]'))
+        s += '{}\n'.format(fielddisplay(self, 'istransition','do we use standard [0, default] or transition model [1]'))
         return string
     # }}}