Changeset 17979

Timestamp:

05/12/14 11:58:37 (11 years ago)

Author:

bdef

Message:

BUG:Fixing effective pressure computation

File:

• issm/trunk-jpl/src/c/analyses/HydrologyDCInefficientAnalysis.cpp (modified) (1 diff)

issm/trunk-jpl/src/c/analyses/HydrologyDCInefficientAnalysis.cpp ¶

@@ -449 +449 @@
                         if(values[i]>h_max) {
                                 residual[i] = kappa*(values[i]-h_max);
-                                pressure[i]=(rho_ice*g*thickness[i])-(rho_freshwater*g*(values[i]-base[i]));
                         }
                         else{
                                 residual[i] = 0.;
-                                pressure[i]=(rho_ice*g*thickness[i])-(rho_freshwater*g*(h_max-base[i]));
                         }
+                        pressure[i]=(rho_ice*g*thickness[i])-(rho_freshwater*g*(min(hmax,values[i])-base[i]));
                 }
                 xDelete<IssmDouble>(thickness);