Changeset 22881

Timestamp:

07/02/18 06:35:19 (7 years ago)

Author:

bdef

Message:

CHG:change in the default value of EPL colapse thickness

Location:

issm/trunk-jpl/src/m/classes

Files:

• hydrologydc.m (modified) (2 diffs)
• hydrologydc.py (modified) (2 diffs)

issm/trunk-jpl/src/m/classes/hydrologydc.m

@@ -75 +75 @@
 
                 function self = initialize(self,md) % {{{
+                        self.epl_colapse_thickness = self.sediment_transmitivity/self.epl_conductivity;
                         if isnan(self.basal_moulin_input),
                                 self.basal_moulin_input=zeros(md.mesh.numberofvertices,1);
@@ -107 +108 @@
 
                         self.epl_compressibility      = 1.0e-08;
+                        self.epl_conductivity         = 8.0e-02;
                         self.epl_porosity             = 0.4;
                         self.epl_initial_thickness    = 1.0;
-                        self.epl_colapse_thickness    = 1.0e-3;
+                        self.epl_colapse_thickness    = self.sediment_transmitivity/self.epl_conductivity;
                         self.epl_thick_comp           = 1;
                         self.epl_max_thickness        = 5.0;
-                        self.epl_conductivity         = 8.0e-02;
                         self.eplflip_lock             = 0;
                 end

issm/trunk-jpl/src/m/classes/hydrologydc.py

@@ -133 +133 @@
 
                 self.epl_compressibility      = 1.0e-08
+                self.epl_conductivity         = 8.0e-02
                 self.epl_porosity             = 0.4
                 self.epl_initial_thickness    = 1.0
-                self.epl_colapse_thickness    = 1.0e-3
+                self.epl_colapse_thickness    = self.sediment_transmitivity/self.epl_conductivity
                 self.epl_thick_comp           = 1
                 self.epl_max_thickness        = 5.0
-                self.epl_conductivity         = 8.0e-02
                 self.eplflip_lock             = 0
 
@@ -156 +156 @@
 
         def initialize(self,md): # {{{
+                self.epl_colapse_thickness = self.sediment_transmitivity/self.epl_conductivity
                 if np.all(np.isnan(self.basal_moulin_input)):
                         self.basal_moulin_input=np.zeros((md.mesh.numberofvertices))