Changeset 18749

Timestamp:

11/06/14 10:30:58 (10 years ago)

Author:

bdef

Message:

NEW: Adding eplflip lock specific Enum

File:

• issm/trunk-jpl/src/m/classes/hydrologydc.py (modified) (7 diffs)

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

@@ -41 +41 @@
                 self.epl_max_thickness        = 0
                 self.epl_conductivity         = 0
+                self.eplflip_lock             = 0
                                  
                 #set defaults
@@ -90 +91 @@
                         string="%s\n%s"%(string,fielddisplay(self,'epl_colapse_thickness','epl colapsing thickness [m]'))
                         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)'))
                 return string
 #}}}
@@ -98 +100 @@
                 self.isefficientlayer         = 1
                 self.penalty_factor           = 3
+                self.penalty_lock             = 0
                 self.rel_tol                  = 1.0e-06
                 self.max_iter                 = 100
@@ -116 +119 @@
                 self.epl_max_thickness        = 5.0
                 self.epl_conductivity         = 8.0e-02
-
+                self.eplflip_lock             = 0
+                
                 return self
         # }}}
@@ -136 +140 @@
                 md = checkfield(md,'fieldname','hydrology.isefficientlayer','numel',[1],'values',[0,1])
                 md = checkfield(md,'fieldname','hydrology.penalty_factor','>',0.,'numel',[1])
+                md = checkfield(md,'fieldname','hydrology.penalty_lock','>=',0.,'numel',[1])
                 md = checkfield(md,'fieldname','hydrology.rel_tol','>',0.,'numel',[1])
                 md = checkfield(md,'fieldname','hydrology.max_iter','>',0.,'numel',[1])
@@ -161 +166 @@
                         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.eplflip_lock','>=',0.,'numel',[1])
                         if self.epl_colapse_thickness > self.epl_initial_thickness:
                                 md.checkmessage('Colapsing thickness for EPL larger than initial thickness')
@@ -197 +203 @@
                         WriteData(fid,'object',self,'fieldname','epl_colapse_thickness','format','Double')                      
                         WriteData(fid,'object',self,'fieldname','epl_conductivity','format','Double')
-        # }}}
+                        WriteData(fid,'object',self,'fieldname','eplflip_lock','format','Integer')
+        # }}}