Changeset 18748

Timestamp:

11/06/14 10:26:31 (10 years ago)

Author:

bdef

Message:

NEW: Adding eplflip lock specific Enum

Location:

issm/trunk-jpl/src/m

Files:

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

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

@@ -33 +33 @@
                 epl_max_thickness        = 0;
                 epl_conductivity         = 0;
+                eplflip_lock             = 0;
   end
         methods
@@ -59 +60 @@
                         obj.isefficientlayer         = 1;
                         obj.penalty_factor           = 3;
+                        obj.penalty_lock             = 0;
                         obj.rel_tol                  = 1.0e-06;
                         obj.max_iter                 = 100;
@@ -77 +79 @@
                         obj.epl_max_thickness        = 5.0;
                         obj.epl_conductivity         = 8.0e-02;
-
+                        obj.eplflip_lock             = 0;
                 end 
                 % }}}
@@ -90 +92 @@
                         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);
@@ -117 +120 @@
                                 md = checkfield(md,'fieldname','hydrology.epl_max_thickness','>',0,'numel',1);
                                 md = checkfield(md,'fieldname','hydrology.epl_conductivity','>',0,'numel',1);
+                                md = checkfield(md,'fieldname','hydrology.eplflip_lock','>=',0,'numel',1);
                                 if (obj.epl_colapse_thickness>obj.epl_initial_thickness),
                                         md = checkmessage(md,'Colapsing thickness for EPL larger than initial thickness');
@@ -165 +169 @@
                                 fielddisplay(obj,'epl_max_thickness','epl maximal thickness [m]');
                                 fielddisplay(obj,'epl_conductivity','epl conductivity [m^2/s]');
+                                fielddisplay(obj,'eplflip_lock','lock the epl activation to avoid fli-floping (default is 0, no stabilization)');
             end
 
@@ -203 +208 @@
                                 WriteData(fid,'object',obj,'fieldname','epl_max_thickness','format','Double');
                                 WriteData(fid,'object',obj,'fieldname','epl_conductivity','format','Double');
-                        end
+                                WriteData(fid,'object',obj,'fieldname','eplflip_lock','format','Integer');
+            end
                 end 
 % }}}

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

@@ -137 +137 @@
 def HydrologydcPenaltyFactorEnum(): return StringToEnum("HydrologydcPenaltyFactor")[0]
 def HydrologydcPenaltyLockEnum(): return StringToEnum("HydrologydcPenaltyLock")[0]
+def HydrologydcEplflipLockEnum(): return StringToEnum("HydrologydcEplflipLock")[0]
 def HydrologydcBasalMoulinInputEnum(): return StringToEnum("HydrologydcBasalMoulinInput")[0]
 def HydrologyLayerEnum(): return StringToEnum("HydrologyLayer")[0]