Changeset 19488

Timestamp:

08/11/15 16:31:41 (10 years ago)

Author:

seroussi

Message:

BUG: floatation is from sae water and not freshwater

File:

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

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

@@ -241 +241 @@
         element->GetInputValue(&drag_coefficient, gauss,FrictionCoefficientEnum);
         element->GetInputValue(&drag_coefficient_coulomb, gauss,FrictionCoefficientcoulombEnum);
-        IssmDouble rho_freshwater   = element->GetMaterialParameter(MaterialsRhoFreshwaterEnum);
         IssmDouble rho_water        = element->GetMaterialParameter(MaterialsRhoSeawaterEnum);
         IssmDouble rho_ice          = element->GetMaterialParameter(MaterialsRhoIceEnum);
@@ -279 +278 @@
 
         floatation_thickness=0;
-        if(bed<0) floatation_thickness=-rho_freshwater/rho_ice*bed;
+        if(bed<0) floatation_thickness=-rho_water/rho_ice*bed;
         if(vmag==0.) alpha2_coulomb=0.;
         else alpha2_coulomb=drag_coefficient_coulomb*drag_coefficient_coulomb*rho_water*gravity*(thickness-floatation_thickness)/vmag;