Changeset 6042

Timestamp:

09/26/10 20:52:18 (15 years ago)

Author:

Eric.Larour

Message:

fixed basal stress, was getting old

File:

• issm/trunk/src/m/model/basalstress.m (modified) (2 diffs)

issm/trunk/src/m/model/basalstress.m

@@ -9 +9 @@
 
 %compute exponents
-s=averaging(md,1./md.p,0);
-r=averaging(md,md.p./md.q,0);
+s=averaging(md,1./md.drag_p,0);
+r=averaging(md,md.drag_p./md.drag_q,0);
 
 %compute horizontal velocity
@@ -18 +18 @@
 
 %compute basal drag
-bx=(md.g*(md.rho_ice*md.thickness+md.rho_water*md.bed)).^r.*(md.drag).^2.*ubx.^s;
-by=(md.g*(md.rho_ice*md.thickness+md.rho_water*md.bed)).^r.*(md.drag).^2.*uby.^s;
-b=(md.g*(md.rho_ice*md.thickness+md.rho_water*md.bed)).^r.*(md.drag).^2.*ub.^s;
+bx=(md.g*(md.rho_ice*md.thickness+md.rho_water*md.bed)).^r.*(md.drag_coefficient).^2.*ubx.^s;
+by=(md.g*(md.rho_ice*md.thickness+md.rho_water*md.bed)).^r.*(md.drag_coefficient).^2.*uby.^s;
+b=(md.g*(md.rho_ice*md.thickness+md.rho_water*md.bed)).^r.*(md.drag_coefficient).^2.*ub.^s;