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

Timestamp:

12/20/22 05:28:05 (2 years ago)

Author:

vverjans

Message:

NEW arma hydrology model implemented (nightly test and python translation to be done)

File:

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

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

@@ -344 +344 @@
 
         /*Get effective pressure*/
-        bool ispwStochastic;
-        IssmDouble Neff;
-        element->parameters->FindParam(&ispwStochastic,StochasticForcingIsWaterPressureEnum);
-        if(ispwStochastic){
-                /*Retrieve stochastic water pressure and compute ice pressure*/
-                IssmDouble p_ice,p_water,Neff_limit;
-                element->GetInputValue(&p_water,gauss,FrictionWaterPressureEnum);
-                element->parameters->FindParam(&Neff_limit,FrictionEffectivePressureLimitEnum);
-                p_ice = IcePressure(gauss);
-                Neff  = max(Neff_limit*p_ice, p_ice - p_water);
-        }       
-        else{
-                /*Compute effective pressure directly*/
-                Neff = EffectivePressure(gauss);
-        }
+        bool ispwHydro,ispwStochastic;
+   IssmDouble Neff;
+   element->parameters->FindParam(&ispwStochastic,StochasticForcingIsWaterPressureEnum);
+   element->parameters->FindParam(&ispwHydro,HydrologyIsWaterPressureArmaEnum);
+   if(ispwStochastic || ispwHydro){
+      /*Retrieve pre-computed water pressure and compute ice pressure*/
+      IssmDouble p_ice,p_water,Neff_limit;
+      element->GetInputValue(&p_water,gauss,FrictionWaterPressureEnum);
+      element->parameters->FindParam(&Neff_limit,FrictionEffectivePressureLimitEnum);
+      p_ice = IcePressure(gauss);
+      Neff  = max(Neff_limit*p_ice, p_ice - p_water);
+   }
+   else{
+      /*Compute effective pressure directly*/
+      Neff = EffectivePressure(gauss);
+   }
         
         /*Get velocity magnitude*/
@@ -559 +560 @@
         IssmDouble vmag = VelMag(gauss);
 
-        bool ispwStochastic;
-        IssmDouble Neff;
-        element->parameters->FindParam(&ispwStochastic,StochasticForcingIsWaterPressureEnum);
-        if(ispwStochastic){
-                /*Retrieve stochastic water pressure and compute ice pressure*/
-                IssmDouble p_ice,p_water,Neff_limit;
-                element->GetInputValue(&p_water,gauss,FrictionWaterPressureEnum);
+        bool ispwHydro,ispwStochastic;
+   IssmDouble Neff;
+   element->parameters->FindParam(&ispwStochastic,StochasticForcingIsWaterPressureEnum);
+   element->parameters->FindParam(&ispwHydro,HydrologyIsWaterPressureArmaEnum);
+   if(ispwStochastic || ispwHydro){
+      /*Retrieve pre-computed water pressure and compute ice pressure*/
+      IssmDouble p_ice,p_water,Neff_limit;
+      element->GetInputValue(&p_water,gauss,FrictionWaterPressureEnum);
                 element->parameters->FindParam(&Neff_limit,FrictionEffectivePressureLimitEnum);
-                p_ice = IcePressure(gauss);
-                Neff  = max(Neff_limit*p_ice, p_ice - p_water);
-        }       
+      p_ice = IcePressure(gauss);
+      Neff  = max(Neff_limit*p_ice, p_ice - p_water);
+   }    
         else{
                 /*Compute effective pressure directly*/