Changeset 18985

Timestamp:

01/06/15 09:07:18 (10 years ago)

Author:

bdef

Message:

CHG: Correction to hydro friciton

File:

• issm/trunk-jpl/src/c/classes/Loads/Friction.cpp (modified) (2 diffs)

issm/trunk-jpl/src/c/classes/Loads/Friction.cpp

@@ -135 +135 @@
                 Based on Gagliardini 2007, needs a good effective pressure computation
                 Not tested so far so use at your own risks
-          alpha2= [vel^(1-n)/{(As)*(1+alpha*Chi^q)}]^(1/n)  with
+          alpha2= NeffC[Chi/(1+alpha*Chi^q)]^(1/n)*1/vel  with
                 -Chi=|vel|/(C^n*Neff^n*As)
                 -alpha=(q-1)^(q-1)/q^q  **/
@@ -191 +191 @@
         }
         Chi=vmag/(pow(C_param,n)*pow(Neff,n)*As);
-        alpha2=pow((pow(vmag,1.-n)/(As*(1+alpha*pow(Chi,q_exp)))),1./n);
+        alpha2= Neff * C_param * pow((Chi/(1 + alpha * pow(Chi,q))),1/n) * 1/vmag;
         _assert_(!xIsNan<IssmDouble>(alpha2));
         /*Assign output pointers:*/