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

Timestamp:

08/21/18 19:16:04 (7 years ago)

Author:

Mathieu Morlighem

Message:

BUG: fixing friction and hydrology PISM

File:

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

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

@@ -710 +710 @@
         element->GetInputValue(&Cc,gauss,FrictionSedimentCompressibilityCoefficientEnum);
         element->GetInputValue(&W,gauss,WatercolumnEnum);
-        element->GetInputValue(&Wmax,gauss,FrictionWatercolumnMaxEnum);
-
-//      /*Check that water column height is within 0 and upper bound, correct if needed*/
-//      // if watercolumn height is higher than the maximum allowed height, set height to upper bound
-//      if(W>Wmax){
-//              W=Wmax;
-//      }
-//      // if watercolumn height is negative (shouldn't happen), set it to 0
-//      if(W<0){
-//              W=0;
-//      }
-//      // if watercolumn height is within 0 and upper bound, nothing to be done
-//      else{
-//              //do nothing
-//      }
+        element->GetInputValue(&Wmax,gauss,HydrologyWatercolumnMaxEnum);
+
+        /*Check that water column height is within 0 and upper bound, correct if needed*/
+        if(W>Wmax) W=Wmax;
+        if(W<0)    W=0.;
 
         N = delta*P0*pow(10.,(e0/Cc)*(1.-W/Wmax));
@@ -746 +736 @@
         element->parameters->FindParam(&u0,FrictionThresholdSpeedEnum);
         element->parameters->FindParam(&q,FrictionPseudoplasticityExponentEnum);
-        IssmDouble alpha2 = tau_c/(pow(ub,1.-q)*pow(u0,q));
+        IssmDouble alpha2 = tau_c/(pow(ub+1.e-10,1.-q)*pow(u0,q));
 
         /*Final checks in debuging mode*/