Changeset 22039

Timestamp:

09/05/17 10:14:04 (8 years ago)

Author:

seroussi

Message:

FIX: improved friction coulomb

File:

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

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

@@ -342 +342 @@
 
         floatation_thickness=0;
-        if(base<0) floatation_thickness=-rho_water/rho_ice*base;
+        if(base<0) floatation_thickness=-(rho_water/rho_ice)*base;
         if(vmag==0.) alpha2_coulomb=0.;
-        else alpha2_coulomb=drag_coefficient_coulomb*drag_coefficient_coulomb*rho_water*gravity*(thickness-floatation_thickness)/vmag;
+        else alpha2_coulomb=drag_coefficient_coulomb*drag_coefficient_coulomb*rho_ice*gravity*(thickness-floatation_thickness)/vmag;
 
         if(alpha2_coulomb<alpha2) alpha2=alpha2_coulomb;