Changeset 18982

Timestamp:

01/06/15 08:56:46 (10 years ago)

Author:

bdef

Message:

NEW: adding a flag to switch off the epl thickness computation

Location:

issm/trunk-jpl/src/m

Files:

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

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

@@ -31 +31 @@
                 epl_initial_thickness    = 0;
                 epl_colapse_thickness    = 0;
+                epl_thick_comp           = 0;
                 epl_max_thickness        = 0;
                 epl_conductivity         = 0;
@@ -77 +78 @@
                         obj.epl_initial_thickness    = 1.0;
                         obj.epl_colapse_thickness    = 1.0e-3;
+                        obj.epl_thick_comp           = 1;
                         obj.epl_max_thickness        = 5.0;
                         obj.epl_conductivity         = 8.0e-02;
@@ -118 +120 @@
                                 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_thick_comp','numel',[1],'values',[0 1]);
                                 md = checkfield(md,'fieldname','hydrology.epl_max_thickness','>',0,'numel',1);
                                 md = checkfield(md,'fieldname','hydrology.epl_conductivity','>',0,'numel',1);
@@ -167 +170 @@
                                 fielddisplay(obj,'epl_initial_thickness','epl initial thickness [m]');
                                 fielddisplay(obj,'epl_colapse_thickness','epl colapsing thickness [m]');
+                                fielddisplay(obj,'epl_thick_comp','epl thickness computation flag');
                                 fielddisplay(obj,'epl_max_thickness','epl maximal thickness [m]');
                                 fielddisplay(obj,'epl_conductivity','epl conductivity [m^2/s]');
@@ -206 +210 @@
                                 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_thick_comp','format','Integer');
                                 WriteData(fid,'object',obj,'fieldname','epl_max_thickness','format','Double');
                                 WriteData(fid,'object',obj,'fieldname','epl_conductivity','format','Double');

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

@@ -39 +39 @@
                 self.epl_initial_thickness    = 0
                 self.epl_colapse_thickness    = 0
+                self.epl_thick_comp           = 0
                 self.epl_max_thickness        = 0
                 self.epl_conductivity         = 0
@@ -89 +90 @@
                         string="%s\n%s"%(string,fielddisplay(self,'epl_initial_thickness','epl initial thickness [m]'))                 
                         string="%s\n%s"%(string,fielddisplay(self,'epl_colapse_thickness','epl colapsing thickness [m]'))
+                        string="%s\n%s"%(string,fielddisplay(self,'epl_thick_comp','epl thickness computation flag'))
                         string="%s\n%s"%(string,fielddisplay(self,'epl_conductivity','epl conductivity [m^2/s]'))
                         string="%s\n%s"%(string,fielddisplay(self,'eplflip_lock','lock epl activity to avoid flip-floping (default is 0, no stabilization)'))
@@ -116 +118 @@
                 self.epl_initial_thickness    = 1.0
                 self.epl_colapse_thickness    = 1.0e-3
+                self.epl_thick_comp           = 1
                 self.epl_max_thickness        = 5.0
                 self.epl_conductivity         = 8.0e-02
@@ -165 +168 @@
                         md = checkfield(md,'fieldname','hydrology.epl_initial_thickness','numel',[1],'>',0.)
                         md = checkfield(md,'fieldname','hydrology.epl_colapse_thickness','numel',[1],'>',0.)
+                        md = checkfield(md,'fieldname','hydrology.epl_thick_comp','numel',[1],'values',[0 1])
                         md = checkfield(md,'fieldname','hydrology.eplflip_lock','>=',0.,'numel',[1])
                         if self.epl_colapse_thickness > self.epl_initial_thickness:
@@ -200 +204 @@
                         WriteData(fid,'object',self,'fieldname','epl_max_thickness','format','Double')
                         WriteData(fid,'object',self,'fieldname','epl_initial_thickness','format','Double')                      
-                        WriteData(fid,'object',self,'fieldname','epl_colapse_thickness','format','Double')                      
+                        WriteData(fid,'object',self,'fieldname','epl_colapse_thickness','format','Double')
+                        WriteData(fid,'object',self,'fieldname','epl_thick_comp','format','Integer')                    
                         WriteData(fid,'object',self,'fieldname','epl_conductivity','format','Double')
                         WriteData(fid,'object',self,'fieldname','eplflip_lock','format','Integer')

issm/trunk-jpl/src/m/classes/model.py ¶

@@ -63 +63 @@
         #properties
         def __init__(self):#{{{
+
+                # classtype=model.properties
+                                
+                # for classe in dict.keys(classtype):
+                #       print classe
+                #       self.__dict__[classe] = classtype[str(classe)]
+
                 self.mesh             = mesh2d()
                 self.mask             = mask()
@@ -134 +141 @@
                         'transient',\
                         'calving',\
-                        'gia',\
+                                                'gia',\
                         'autodiff',\
                         'flaim',\

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

@@ -131 +131 @@
 def HydrologydcEplThicknessEnum(): return StringToEnum("HydrologydcEplThickness")[0]
 def HydrologydcEplThicknessOldEnum(): return StringToEnum("HydrologydcEplThicknessOld")[0]
+def HydrologydcEplThickCompEnum(): return StringToEnum("HydrologydcEplThickComp")[0]
 def HydrologydcEplConductivityEnum(): return StringToEnum("HydrologydcEplConductivity")[0]
 def HydrologydcIsefficientlayerEnum(): return StringToEnum("HydrologydcIsefficientlayer")[0]