Changeset 18580

Timestamp:

10/06/14 12:21:13 (10 years ago)

Author:

bdef

Message:

NEW: adding a colapsing thickness to the EPL

Location:

issm/trunk-jpl/src/m

Files:

• classes/hydrologydc.m (modified) (5 diffs)
• enum/EnumDefinitions.py (modified) (1 diff)
• enum/HydrologydcEplColapseThicknessEnum.m (added)

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

@@ -30 +30 @@
                 epl_porosity             = 0;
                 epl_initial_thickness    = 0;
+                epl_colapse_thickness    = 0;
                 epl_max_thickness        = 0;
                 epl_conductivity         = 0;
@@ -73 +74 @@
                         obj.epl_porosity             = 0.4;
                         obj.epl_initial_thickness    = 1.0;
+                        obj.epl_colapse_thickness    = 1.0e-3;
                         obj.epl_max_thickness        = 5.0;
                         obj.epl_conductivity         = 8.0e-02;
@@ -112 +114 @@
                                 md = checkfield(md,'fieldname','hydrology.epl_porosity','>',0,'numel',1);
                                 md = checkfield(md,'fieldname','hydrology.epl_initial_thickness','>',0,'numel',1);
+                                md = checkfield(md,'fieldname','hydrology.epl_colapse_thickness','>',0,'numel',1);
                                 md = checkfield(md,'fieldname','hydrology.epl_max_thickness','>',0,'numel',1);
                                 md = checkfield(md,'fieldname','hydrology.epl_conductivity','>',0,'numel',1);
+                                if (obj.epl_colapse_thickness>obj.epl_initial_thickness),
+                                        md = checkmessage(md,'Colapsing thickness for EPL larger than initial thickness');
+                                end 
             end
                 end 
@@ -156 +162 @@
                                 fielddisplay(obj,'epl_porosity','epl [dimensionless]');
                                 fielddisplay(obj,'epl_initial_thickness','epl initial thickness [m]');
+                                fielddisplay(obj,'epl_colapse_thickness','epl colapsing thickness [m]');
                                 fielddisplay(obj,'epl_max_thickness','epl maximal thickness [m]');
                                 fielddisplay(obj,'epl_conductivity','epl conductivity [m^2/s]');
@@ -193 +200 @@
                                 WriteData(fid,'object',obj,'fieldname','epl_porosity','format','Double');                       
                                 WriteData(fid,'object',obj,'fieldname','epl_initial_thickness','format','Double');
+                                WriteData(fid,'object',obj,'fieldname','epl_colapse_thickness','format','Double');
                                 WriteData(fid,'object',obj,'fieldname','epl_max_thickness','format','Double');
                                 WriteData(fid,'object',obj,'fieldname','epl_conductivity','format','Double');

issm/trunk-jpl/src/m/enum/EnumDefinitions.py

@@ -123 +123 @@
 def HydrologydcEplPorosityEnum(): return StringToEnum("HydrologydcEplPorosity")[0]
 def HydrologydcEplInitialThicknessEnum(): return StringToEnum("HydrologydcEplInitialThickness")[0]
+def HydrologydcEplColapseThicknessEnum(): return StringToEnum("HydrologydcEplColapseThickness")[0]
 def HydrologydcEplMaxThicknessEnum(): return StringToEnum("HydrologydcEplMaxThickness")[0]
 def HydrologydcEplThicknessEnum(): return StringToEnum("HydrologydcEplThickness")[0]