Changeset 21572

Timestamp:

02/22/17 06:06:11 (8 years ago)

Author:

bdef

Message:

CHG: changing the if condition for a Heavyside approximation for the shift from confined to unconfined storage

File:

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

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

@@ -528 +528 @@
 
         storing=rho_freshwater*g*sediment_porosity*sediment_thickness*(water_compressibility+(sediment_compressibility/sediment_porosity));
-        //porosity for unconfined region
-        if (water_sheet<=0.9*sediment_thickness){
-                sediment_storing=sediment_porosity;
-        }
-        //continuity ramp
-        else if((water_sheet<sediment_thickness) && (water_sheet>0.9*sediment_thickness)){
-                sediment_storing=(sediment_thickness-water_sheet)*(sediment_porosity-storing)/(0.1*sediment_thickness)+storing;
-        }
-        //storing coefficient for confined
-        else{
-                sediment_storing=storing;
-        }
+        
+        //Heavyside approximation (1/(1+exp(-2kx))) with k=25 centering at thickness minus 1%
+        sediment_storing=(sediment_porosity*exp(-20.*(water_sheet-0.99*sediment_thickness))+storing)/(1+exp(-20.*(water_sheet-0.99*sediment_thickness)));
+
         return sediment_storing;
 }/*}}}*/