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

Timestamp:

05/21/15 11:43:14 (10 years ago)

Author:

seroussi

Message:

CHG: updated friction law water layer for Derrick

File:

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

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

@@ -390 +390 @@
         IssmDouble  r,s;
         IssmDouble  drag_p, drag_q;
-        IssmDouble  Neff;
+        IssmDouble  Neff,F;
         IssmDouble  thickness,bed;
         IssmDouble  vx,vy,vz,vmag;
@@ -397 +397 @@
 
         /*Recover parameters: */
+        element->parameters->FindParam(&F,FrictionFEnum);
         element->GetInputValue(&drag_p,FrictionPEnum);
         element->GetInputValue(&drag_q,FrictionQEnum);
@@ -413 +414 @@
         //From bed and thickness, compute effective pressure when drag is viscous:
         if(bed>0) bed=0;
-        Neff=gravity*(rho_ice*thickness+rho_water*(bed-water_layer));
+        if(water_layer==0) Neff=gravity*rho_ice*thickness+gravity*rho_water*bed;
+        else if(water_layer>0) Neff=gravity*rho_ice*thickness*F;
+        else _error_("negative water layer thickness");
         if(Neff<0) Neff=0;