Changeset 19707

Timestamp:

11/12/15 06:47:59 (9 years ago)

Author:

cborstad

Message:

NEW: python implementation of Coulomb limit friction class and MISMIP+ basal melt parameterization class

Location:

issm/trunk-jpl/src/m/classes

Files:

• friction.py (modified) (1 diff)
• frictioncoulomb.m (modified) (1 diff)
• frictioncoulomb.py (added)
• mismipbasalforcings.m (modified) (1 diff)
• mismipbasalforcings.py (added)
• timestepping.py (modified) (1 diff)

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

@@ -10 +10 @@
 
            Usage:
-              friction=friction();
+              friction=friction()
         """
 

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

@@ -48 +48 @@
                 end % }}}
                 function disp(self) % {{{
-                        disp(sprintf('Basal shear stress parameters: Sigma_b = min( coefficient^2 * Neff ^r * |u_b|^(s-1) * u_b\n, coefficientcoulomb^2 * rho_i * g * (h-h_f) (effective stress Neff=rho_ice*g*thickness+rho_water*g*bed, r=q/p and s=1/p, floatation thickness h_f=max(0,-rho_fw / rho_i * bed))'));
-                        fielddisplay(self,'coefficient','friction coefficient [SI]');
-                        fielddisplay(self,'coefficientcoulomb','coulomb friction coefficient [SI]');
+                        disp(sprintf('Basal shear stress parameters: Sigma_b = min( coefficient^2 * Neff ^r * |u_b|^(s-1) * u_b\n, coefficientcoulomb^2 * rho_i * g * (h-h_f)) (effective stress Neff=rho_ice*g*thickness+rho_water*g*bed, r=q/p and s=1/p, floatation thickness h_f=max(0,-rho_sw / rho_i * bed))'));
+                        fielddisplay(self,'coefficient','power law (Weertman) friction coefficient [SI]');
+                        fielddisplay(self,'coefficientcoulomb','Coulomb friction coefficient [SI]');
                         fielddisplay(self,'p','p exponent');
                         fielddisplay(self,'q','q exponent');
                 end % }}}
                 function marshall(self,md,fid) % {{{
-                        yts=365.0*24.0*3600.0;
 
                         WriteData(fid,'enum',FrictionLawEnum,'data',7,'format','Integer');

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

@@ -72 +72 @@
                 end % }}}
                 function disp(self) % {{{
-                        disp(sprintf('   mismip basal forcings parameters:'));
+                        disp(sprintf('   MISMIP+ basal melt parameterization:'));
 
                         fielddisplay(self,'groundedice_melting_rate','basal melting rate (positive if melting) [m/yr]');

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

@@ -66 +66 @@
         def marshall(self,md,fid):    # {{{
 
-                yts=365.0*24.0*3600.0
+                yts=md.constants.yts
 
                 WriteData(fid,'object',self,'fieldname','start_time','format','Double','scale',yts)