Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Location.cs
===================================================================
diff -u -r2472 -r2493
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Location.cs	(.../Location.cs)	(revision 2472)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Location.cs	(.../Location.cs)	(revision 2493)
@@ -90,6 +90,8 @@
         public const string RequiredSafetyFactorStabilityInnerSlope = "RequiredSafetyFactorStabilityInnerSlope";
         public const string RequiredSafetyFactorStabilityOuterSlope = "RequiredSafetyFactorStabilityOuterSlope";
         public const string RequiredSafetyFactorPiping = "RequiredSafetyFactorPiping";
+        public const string UpliftCriterionPiping = "UpliftCriterionPiping";
+        public const string UpliftCriterionStability = "UpliftCriterionStability";
         public const string StabilityZoneType = "StabilityZoneType";
         public const string ForbiddenZoneFactor = "ForbiddenZoneFactor";
         public const string ZoneAreaRestSlopeCrestWidth = "ZoneAreaRestSlopeCrestWidth";
@@ -638,6 +640,44 @@
             }
         }
 
+        [XmlIgnore]
+        [Label("Uplift criterion stability")]
+        [Description("Uplift criterion that is used in stability calulation")]
+        [Unit(UnitType.None)]
+        [Format("F3")]
+        [PropertyOrder(6, 1)]
+        [Category(WaterCategory)]
+        public virtual double? UpliftCriterionStability
+        {
+            get
+            {
+                return ModelFactors.UpliftCriterionStability;
+            }
+            set
+            {
+                ModelFactors.UpliftCriterionStability = value;
+            }
+        }
+
+        [XmlIgnore]
+        [Label("Uplift criterion piping")]
+        [Description("Uplift criterion that is used in piping calulation")]
+        [Unit(UnitType.None)]
+        [Format("F3")]
+        [PropertyOrder(6, 2)]
+        [Category(WaterCategory)]
+        public virtual double? UpliftCriterionPiping
+        {
+            get
+            {
+                return ModelFactors.UpliftCriterionPiping;
+            }
+            set
+            {
+                ModelFactors.UpliftCriterionPiping = value;
+            }
+        }
+
         [Label("Layer height distribution")]
         [Category(AllCategory)]
         [PropertyOrder(4, 7)]
@@ -2319,6 +2359,14 @@
             {
                 nameValuePairs.Add(LocationParameterNames.RequiredSafetyFactorPiping, ModelFactors.RequiredSafetyFactorPiping.Value.ToString(numberFormatInfo));
             }
+            if (ModelFactors.UpliftCriterionPiping != null)
+            {
+                nameValuePairs.Add(LocationParameterNames.UpliftCriterionPiping, ModelFactors.UpliftCriterionPiping.Value.ToString(numberFormatInfo));
+            }
+            if (ModelFactors.UpliftCriterionStability != null)
+            {
+                nameValuePairs.Add(LocationParameterNames.UpliftCriterionStability, ModelFactors.UpliftCriterionStability.Value.ToString(numberFormatInfo));
+            }
             nameValuePairs.Add(LocationParameterNames.StabilityZoneType, StabilityZoneType.ToString());
             nameValuePairs.Add(LocationParameterNames.ForbiddenZoneFactor, ForbiddenZoneFactor.ToString(numberFormatInfo));
             nameValuePairs.Add(LocationParameterNames.ZoneAreaRestSlopeCrestWidth, ZoneAreaRestSlopeCrestWidth.ToString(numberFormatInfo));
@@ -2747,6 +2795,14 @@
             {
                 ModelFactors.RequiredSafetyFactorPiping = Convert.ToDouble(parameterValue, numberFormatInfo);
             }
+            if (parameterName.Equals(LocationParameterNames.UpliftCriterionPiping))
+            {
+                ModelFactors.UpliftCriterionPiping = Convert.ToDouble(parameterValue, numberFormatInfo);
+            }
+            if (parameterName.Equals(LocationParameterNames.UpliftCriterionStability))
+            {
+                ModelFactors.UpliftCriterionStability = Convert.ToDouble(parameterValue, numberFormatInfo);
+            }
             if (parameterName.Equals(LocationParameterNames.StabilityZoneType))
             {
                 StabilityZoneType = (MStabZonesType) Enum.Parse(typeof(MStabZonesType), parameterValue);
@@ -2891,6 +2947,10 @@
                     return isDesign;
                 case "StabilitySlopeAdaptionDeltaX":
                     return isDesign;
+                case "UpliftCriterionStability":
+                    return !isDesign;
+                case "UpliftCriterionPiping":
+                    return !isDesign;
                 case "PlLineOffsetBelowDikeToeAtPolder":
                     return !isDesign && arePlLineCreationExpertKnowledgeParametersNeeded;
                 case "PlLineOffsetBelowDikeTopAtPolder":