Changeset 17928

Timestamp:

05/05/14 11:38:22 (11 years ago)

Author:

cborstad

Message:

CHG: better description of friction parameters

Location:

issm/trunk-jpl/src/m/classes

Files:

• friction.m (modified) (1 diff)
• friction.py (modified) (1 diff)

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

@@ -40 +40 @@
                 end % }}}
                 function disp(obj) % {{{
-                        disp(sprintf('Sigma= drag^2 * Neff ^r * u ^s, with Neff=rho_ice*g*thickness+rho_water*g*bed, r=q/p and s=1/p'));
+                        disp(sprintf('Basal shear stress parameters: Sigma_b = coefficient^2 * Neff ^r * |u_b|^(s-1) * u_b\n(effective stress Neff=rho_ice*g*thickness+rho_water*g*bed, r=q/p and s=1/p)'));
                         fielddisplay(obj,'coefficient','friction coefficient [SI]');
                         fielddisplay(obj,'p','p exponent');

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

@@ -22 +22 @@
                 #}}}
         def __repr__(self): # {{{
-                string="Sigma= drag^2 * Neff ^r * u ^s, with Neff=rho_ice*g*thickness+rho_water*g*bed, r=q/p and s=1/p"
+                string="Basal shear stress parameters: Sigma_b = coefficient^2 * Neff ^r * |u_b|^(s-1) * u_b,\n(effective stress Neff=rho_ice*g*thickness+rho_water*g*bed, r=q/p and s=1/p)"
 
                 string="%s\n%s"%(string,fielddisplay(self,"coefficient","friction coefficient [SI]"))