Changeset 18797

Timestamp:

11/17/14 13:56:59 (10 years ago)

Author:

bdef

Message:

CHG: Adding friction law and clean up

File:

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

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

@@ -224 +224 @@
                 alpha=(pow(q_exp-1,q_exp-1))/pow(q_exp,q_exp);
         }
-        
         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);
         _assert_(!xIsNan<IssmDouble>(alpha2));
-        
         /*Assign output pointers:*/
         *palpha2=alpha2;