Changeset 24551

Timestamp:

02/07/20 10:12:27 (5 years ago)

Author:

Mathieu Morlighem

Message:

CHG: integrating Josh's commit

File:

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

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

@@ -379 +379 @@
 
         /*Intermediaries: */
-        IssmDouble  T,Tpmp,deltaT,deltaTref,pressure;
-        IssmDouble  alpha2,time,gamma;
+        IssmDouble  T,Tpmp,deltaT,deltaTref,pressure,diff,drag_coefficient;
+        IssmDouble  alpha2,time,gamma,ref,alp_new,alphascaled;
         const IssmDouble yts = 365*24*3600.;
 
@@ -388 +388 @@
         /*Get delta Refs*/
         element->GetInputValue(&deltaTref,gauss,FrictionPressureAdjustedTemperatureEnum);
+        element->GetInputValue(&drag_coefficient, gauss,FrictionCoefficientEnum);
+        /*New*/
+        /*element->GetInputValue(&deltaTrefsfc,gauss,FrictionSurfaceTemperatureEnum);
+         *    element->GetInputValue(&Tpdd,gauss,TemperaturePDDEnum);
+         *       */
 
         /*Compute delta T*/
@@ -395 +400 @@
         deltaT = T-Tpmp;
 
+
         /*Compute gamma*/
         element->parameters->FindParam(&time,TimeEnum);
         element->parameters->FindParam(&gamma,FrictionGammaEnum);
-        //if(time<25e3*yts){
-        //      gamma = 10.;
-        //}
-        //else{
-        //      gamma = 5.;
-        //}
-        //gamma = 5.;
-
-        /*Compute scaling parameter*/
-        alpha2 = alpha2 * exp((deltaTref - deltaT)/(2*gamma));
-
-        /*Assign output pointers:*/
-        *palpha2=alpha2;
+
+        ref = exp(deltaTref/gamma);
+        alp_new = ref/exp(deltaT/gamma);
+
+        alphascaled = sqrt(alp_new)*drag_coefficient;
+        if (alphascaled > 300) alp_new = (300/drag_coefficient)*(300/drag_coefficient);
+
+        alp_new=alp_new*alpha2;
+
+        /*Assign output pointers:*/
+        *palpha2=alp_new;
 }/*}}}*/
 void Friction::GetAlpha2Viscous(IssmDouble* palpha2, Gauss* gauss){/*{{{*/