Changeset 28233 for issm/trunk-jpl/src/c/classes/Loads/Channel.cpp

Timestamp:

04/29/24 13:59:08 (11 months ago)

Author:

timhill2

Message:

GlaDS: options to include sheet thickness in hydraulic potential and turn off cavity creep opening

File:

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

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

@@ -380 +380 @@
         bool istransition;
         element->FindParam(&istransition,HydrologyIsTransitionEnum);
+        bool isincludesheetthickness;
+        element->FindParam(&isincludesheetthickness,HydrologyIsIncludeSheetThicknessEnum);
         IssmDouble L         = element->FindParam(MaterialsLatentheatEnum);
         IssmDouble mu_water  = element->FindParam(MaterialsMuWaterEnum);
@@ -435 +437 @@
                 /*Get values for a few potentials*/
                 phi_0   = rho_water*g*b + rho_ice*g*H;
+                if(isincludesheetthickness) phi_0 += rho_water*g*h;
                 dphids  = dphi[0]*tx + dphi[1]*ty;
                 dphimds = rho_water*g*(db[0]*tx + db[1]*ty);
@@ -541 +544 @@
         bool istransition;
         element->FindParam(&istransition,HydrologyIsTransitionEnum);
+        bool isincludesheetthickness;
+        element->FindParam(&isincludesheetthickness,HydrologyIsIncludeSheetThicknessEnum);
         IssmDouble L         = element->FindParam(MaterialsLatentheatEnum);
         IssmDouble mu_water  = element->FindParam(MaterialsMuWaterEnum);
@@ -592 +597 @@
                 /*Get values for a few potentials*/
                 phi_0   = rho_water*g*b + rho_ice*g*H;
+                if(isincludesheetthickness) phi_0 += rho_water*g*h;
                 dphids  = dphi[0]*tx + dphi[1]*ty;
                 dphimds = rho_water*g*(db[0]*tx + db[1]*ty);
@@ -691 +697 @@
         bool istransition;
         element->FindParam(&istransition,HydrologyIsTransitionEnum);
+        bool isincludesheetthickness;
+        element->FindParam(&isincludesheetthickness,HydrologyIsIncludeSheetThicknessEnum);
         IssmDouble L         = element->FindParam(MaterialsLatentheatEnum);
         IssmDouble rho_ice   = element->FindParam(MaterialsRhoIceEnum);
@@ -738 +746 @@
         /*Get values for a few potentials*/
         phi_0   = rho_water*g*b + rho_ice*g*H;
+        if(isincludesheetthickness) phi_0 += rho_water*g*h;
         dphids  = dphi[0]*tx + dphi[1]*ty;
         dphimds = rho_water*g*(db[0]*tx + db[1]*ty);