Changeset 23538

Timestamp:

12/12/18 00:38:23 (6 years ago)

Author:

bdef

Message:

BUG:reverting friction hydro to original after check

File:

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

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

@@ -316 +316 @@
                 Based on Gagliardini 2007, needs a good effective pressure computation
                 Not tested so far so use at your own risks
-          alpha2= NeffC[Chi/(1+alpha*Chi^q)]^(1/n)*|vel|^(1/n-1)  with
+          alpha2= NeffC[Chi/(1+alpha*Chi^q)]^(1/n)*|vel|^(-1)  with
                  Chi=|vel|/(C^n*Neff^n*As)
                  alpha=(q-1)^(q-1)/q^q */
@@ -375 +375 @@
         if(vmag==0.) alpha2=0.;
         else    if (Neff==0) alpha2=0.0;
-        else    alpha2=Neff * C_param * pow(Gamma,1./n) * pow(vmag,1/n-1);
+        else    alpha2=Neff * C_param * pow(Gamma,1./n) * pow(vmag,-1);
 
         _assert_(!xIsNan<IssmDouble>(alpha2));