Index: /issm/trunk-jpl/src/m/classes/hydrologydc.m
===================================================================
--- /issm/trunk-jpl/src/m/classes/hydrologydc.m	(revision 18747)
+++ /issm/trunk-jpl/src/m/classes/hydrologydc.m	(revision 18748)
@@ -33,4 +33,5 @@
 		epl_max_thickness        = 0;
 		epl_conductivity         = 0;
+		eplflip_lock             = 0;
   end
 	methods
@@ -59,4 +60,5 @@
 			obj.isefficientlayer         = 1;
 			obj.penalty_factor           = 3;
+			obj.penalty_lock             = 0;
 			obj.rel_tol                  = 1.0e-06;
 			obj.max_iter                 = 100;
@@ -77,5 +79,5 @@
 			obj.epl_max_thickness        = 5.0;
 			obj.epl_conductivity         = 8.0e-02;
-
+			obj.eplflip_lock             = 0;
 		end 
 		% }}}
@@ -90,4 +92,5 @@
 			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,4 +120,5 @@
 				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,4 +169,5 @@
 				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,5 +208,6 @@
 				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 
 % }}}
Index: /issm/trunk-jpl/src/m/enum/EnumDefinitions.py
===================================================================
--- /issm/trunk-jpl/src/m/enum/EnumDefinitions.py	(revision 18747)
+++ /issm/trunk-jpl/src/m/enum/EnumDefinitions.py	(revision 18748)
@@ -137,4 +137,5 @@
 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]
Index: /issm/trunk-jpl/src/m/enum/HydrologydcEplflipLockEnum.m
===================================================================
--- /issm/trunk-jpl/src/m/enum/HydrologydcEplflipLockEnum.m	(revision 18748)
+++ /issm/trunk-jpl/src/m/enum/HydrologydcEplflipLockEnum.m	(revision 18748)
@@ -0,0 +1,11 @@
+function macro=HydrologydcEplflipLockEnum()
+%HYDROLOGYDCEPLFLIPLOCKENUM - Enum of HydrologydcEplflipLock
+%
+%   WARNING: DO NOT MODIFY THIS FILE
+%            this file has been automatically generated by src/c/shared/Enum/Synchronize.sh
+%            Please read src/c/shared/Enum/README for more information
+%
+%   Usage:
+%      macro=HydrologydcEplflipLockEnum()
+
+macro=StringToEnum('HydrologydcEplflipLock');