Index: DamClassic/trunk/src/Dam/Forms/Properties/licenses.licx
===================================================================
diff -u
--- DamClassic/trunk/src/Dam/Forms/Properties/licenses.licx	(revision 0)
+++ DamClassic/trunk/src/Dam/Forms/Properties/licenses.licx	(revision 2567)
@@ -0,0 +1,4 @@
+DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v12.2, Version=12.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v12.2, Version=12.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.ComboBoxEdit, DevExpress.XtraEditors.v12.2, Version=12.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.TextEdit, DevExpress.XtraEditors.v12.2, Version=12.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
Index: DamEngine/trunk/src/Deltares.DamEngine.Data/Design/DesignScenario.cs
===================================================================
diff -u -r2463 -r2567
--- DamEngine/trunk/src/Deltares.DamEngine.Data/Design/DesignScenario.cs	(.../DesignScenario.cs)	(revision 2463)
+++ DamEngine/trunk/src/Deltares.DamEngine.Data/Design/DesignScenario.cs	(.../DesignScenario.cs)	(revision 2567)
@@ -47,10 +47,10 @@
         private double riverLevel;
         private double? riverLevelLow;
         private double? dikeTableHeight;
-        private double? plLineOffsetBelowDikeTopAtRiver;
-        private double? plLineOffsetBelowDikeTopAtPolder;
-        private double? plLineOffsetBelowShoulderBaseInside;
-        private double? plLineOffsetBelowDikeToeAtPolder;
+        private double plLineOffsetBelowDikeTopAtRiver;
+        private double plLineOffsetBelowDikeTopAtPolder;
+        private double plLineOffsetBelowShoulderBaseInside;
+        private double plLineOffsetBelowDikeToeAtPolder;
         private bool? usePlLineOffsetBelowDikeCrestMiddle;
         private double? plLineOffsetBelowDikeCrestMiddle;
         private bool? usePlLineOffsetFactorBelowShoulderCrest;
@@ -250,7 +250,7 @@
             }
         }
 
-        public double? PlLineOffsetBelowDikeTopAtRiver
+        public double PlLineOffsetBelowDikeTopAtRiver
         {
             get
             {
@@ -268,7 +268,7 @@
         /// <value>
         /// The pl line offset below dike top at polder.
         /// </value>
-        public double? PlLineOffsetBelowDikeTopAtPolder
+        public double PlLineOffsetBelowDikeTopAtPolder
         {
             get
             {
@@ -286,7 +286,7 @@
         /// <value>
         /// The pl line offset below shoulder base inside.
         /// </value>
-        public double? PlLineOffsetBelowShoulderBaseInside
+        public double PlLineOffsetBelowShoulderBaseInside
         {
             get
             {
@@ -304,7 +304,7 @@
         /// <value>
         /// The pl line offset below dike toe at polder.
         /// </value>
-        public double? PlLineOffsetBelowDikeToeAtPolder
+        public double PlLineOffsetBelowDikeToeAtPolder
         {
             get
             {
@@ -617,10 +617,10 @@
                                  DikeTableHeight.HasValue ? DikeTableHeight.ToString() : "?",
                                  ModelFactors.RequiredSafetyFactorStabilityInnerSlope.HasValue ? ModelFactors.RequiredSafetyFactorStabilityInnerSlope.ToString() : "?",
                                  ModelFactors.RequiredSafetyFactorStabilityOuterSlope.HasValue ? ModelFactors.RequiredSafetyFactorStabilityOuterSlope.ToString() : "?",
-                                 PlLineOffsetBelowDikeTopAtRiver.HasValue ? PlLineOffsetBelowDikeToeAtPolder.ToString() : "?",
-                                 PlLineOffsetBelowDikeToeAtPolder.HasValue ? PlLineOffsetBelowDikeToeAtPolder.ToString() : "?",
-                                 PlLineOffsetBelowDikeTopAtPolder.HasValue ? PlLineOffsetBelowDikeTopAtPolder.ToString() : "?",
-                                 PlLineOffsetBelowShoulderBaseInside.HasValue ? PlLineOffsetBelowShoulderBaseInside.ToString() : "?",
+                                 PlLineOffsetBelowDikeTopAtRiver,
+                                 PlLineOffsetBelowDikeToeAtPolder,
+                                 PlLineOffsetBelowDikeTopAtPolder,
+                                 PlLineOffsetBelowShoulderBaseInside,
                                  UsePlLineOffsetBelowDikeCrestMiddle.HasValue ? UsePlLineOffsetBelowDikeCrestMiddle.ToString() : "?",
                                  PlLineOffsetBelowDikeCrestMiddle.HasValue ? PlLineOffsetBelowDikeCrestMiddle.ToString() : "?",
                                  UsePlLineOffsetFactorBelowShoulderCrest.HasValue ? UsePlLineOffsetFactorBelowShoulderCrest.ToString() : "?",
Index: DamEngine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlInput.cs
===================================================================
diff -u -r2563 -r2567
--- DamEngine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlInput.cs	(.../FillDamFromXmlInput.cs)	(revision 2563)
+++ DamEngine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlInput.cs	(.../FillDamFromXmlInput.cs)	(revision 2567)
@@ -561,10 +561,10 @@
                         designScenario.RiverLevel = inputLocationDesignScenario.RiverLevel;
                         designScenario.RiverLevelLow = (inputLocationDesignScenario.RiverLevelLowSpecified ? (double?)inputLocationDesignScenario.RiverLevelLow : null);
                         designScenario.DikeTableHeight = (inputLocationDesignScenario.DikeTableHeightSpecified ? (double?)inputLocationDesignScenario.DikeTableHeight : null);
-                        designScenario.PlLineOffsetBelowDikeTopAtRiver = (inputLocationDesignScenario.PlLineOffsetBelowDikeTopAtRiverSpecified ? (double?)inputLocationDesignScenario.PlLineOffsetBelowDikeTopAtRiver : null);
-                        designScenario.PlLineOffsetBelowDikeTopAtPolder = (inputLocationDesignScenario.PlLineOffsetBelowDikeTopAtPolderSpecified ? (double?)inputLocationDesignScenario.PlLineOffsetBelowDikeTopAtPolder : null);
-                        designScenario.PlLineOffsetBelowShoulderBaseInside = (inputLocationDesignScenario.PlLineOffsetBelowShoulderBaseInsideSpecified ? (double?)inputLocationDesignScenario.PlLineOffsetBelowShoulderBaseInside : null);
-                        designScenario.PlLineOffsetBelowDikeToeAtPolder = (inputLocationDesignScenario.PlLineOffsetBelowDikeToeAtPolderSpecified ? (double?)inputLocationDesignScenario.PlLineOffsetBelowDikeToeAtPolder : null);
+                        designScenario.PlLineOffsetBelowDikeTopAtRiver = inputLocationDesignScenario.PlLineOffsetBelowDikeTopAtRiver;
+                        designScenario.PlLineOffsetBelowDikeTopAtPolder = inputLocationDesignScenario.PlLineOffsetBelowDikeTopAtPolder;
+                        designScenario.PlLineOffsetBelowShoulderBaseInside = inputLocationDesignScenario.PlLineOffsetBelowShoulderBaseInside;
+                        designScenario.PlLineOffsetBelowDikeToeAtPolder = inputLocationDesignScenario.PlLineOffsetBelowDikeToeAtPolder;
                         designScenario.UsePlLineOffsetBelowDikeCrestMiddle = inputLocationDesignScenario.PlLineOffsetBelowDikeCrestMiddleSpecified;
                         designScenario.PlLineOffsetBelowDikeCrestMiddle = inputLocationDesignScenario.PlLineOffsetBelowDikeCrestMiddle;
                         designScenario.UsePlLineOffsetFactorBelowShoulderCrest = inputLocationDesignScenario.PlLineOffsetFactorBelowShoulderCrestSpecified;
Index: DamEngine/trunk/src/Deltares.DamEngine.Io/DamInput.cs
===================================================================
diff -u -r2522 -r2567
--- DamEngine/trunk/src/Deltares.DamEngine.Io/DamInput.cs	(.../DamInput.cs)	(revision 2522)
+++ DamEngine/trunk/src/Deltares.DamEngine.Io/DamInput.cs	(.../DamInput.cs)	(revision 2567)
@@ -3512,20 +3512,12 @@
         
         private double plLineOffsetBelowDikeTopAtRiverField;
         
-        private bool plLineOffsetBelowDikeTopAtRiverFieldSpecified;
-        
         private double plLineOffsetBelowDikeTopAtPolderField;
         
-        private bool plLineOffsetBelowDikeTopAtPolderFieldSpecified;
-        
         private double plLineOffsetBelowShoulderBaseInsideField;
         
-        private bool plLineOffsetBelowShoulderBaseInsideFieldSpecified;
-        
         private double plLineOffsetBelowDikeToeAtPolderField;
         
-        private bool plLineOffsetBelowDikeToeAtPolderFieldSpecified;
-        
         private double plLineOffsetBelowDikeCrestMiddleField;
         
         private bool plLineOffsetBelowDikeCrestMiddleFieldSpecified;
@@ -3640,17 +3632,6 @@
         }
         
         /// <remarks/>
-        [System.Xml.Serialization.XmlIgnoreAttribute()]
-        public bool PlLineOffsetBelowDikeTopAtRiverSpecified {
-            get {
-                return this.plLineOffsetBelowDikeTopAtRiverFieldSpecified;
-            }
-            set {
-                this.plLineOffsetBelowDikeTopAtRiverFieldSpecified = value;
-            }
-        }
-        
-        /// <remarks/>
         [System.Xml.Serialization.XmlAttributeAttribute()]
         public double PlLineOffsetBelowDikeTopAtPolder {
             get {
@@ -3662,17 +3643,6 @@
         }
         
         /// <remarks/>
-        [System.Xml.Serialization.XmlIgnoreAttribute()]
-        public bool PlLineOffsetBelowDikeTopAtPolderSpecified {
-            get {
-                return this.plLineOffsetBelowDikeTopAtPolderFieldSpecified;
-            }
-            set {
-                this.plLineOffsetBelowDikeTopAtPolderFieldSpecified = value;
-            }
-        }
-        
-        /// <remarks/>
         [System.Xml.Serialization.XmlAttributeAttribute()]
         public double PlLineOffsetBelowShoulderBaseInside {
             get {
@@ -3684,17 +3654,6 @@
         }
         
         /// <remarks/>
-        [System.Xml.Serialization.XmlIgnoreAttribute()]
-        public bool PlLineOffsetBelowShoulderBaseInsideSpecified {
-            get {
-                return this.plLineOffsetBelowShoulderBaseInsideFieldSpecified;
-            }
-            set {
-                this.plLineOffsetBelowShoulderBaseInsideFieldSpecified = value;
-            }
-        }
-        
-        /// <remarks/>
         [System.Xml.Serialization.XmlAttributeAttribute()]
         public double PlLineOffsetBelowDikeToeAtPolder {
             get {
@@ -3706,17 +3665,6 @@
         }
         
         /// <remarks/>
-        [System.Xml.Serialization.XmlIgnoreAttribute()]
-        public bool PlLineOffsetBelowDikeToeAtPolderSpecified {
-            get {
-                return this.plLineOffsetBelowDikeToeAtPolderFieldSpecified;
-            }
-            set {
-                this.plLineOffsetBelowDikeToeAtPolderFieldSpecified = value;
-            }
-        }
-        
-        /// <remarks/>
         [System.Xml.Serialization.XmlAttributeAttribute()]
         public double PlLineOffsetBelowDikeCrestMiddle {
             get {
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/DikesDesign/DesignCalculator.cs
===================================================================
diff -u -r2193 -r2567
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/DikesDesign/DesignCalculator.cs	(.../DesignCalculator.cs)	(revision 2193)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/DikesDesign/DesignCalculator.cs	(.../DesignCalculator.cs)	(revision 2567)
@@ -299,22 +299,10 @@
         private void SynchronizeScenarioDataWithLocationData(DesignScenario designScenario, Location location)
         {
             // Synchronize PlLine parameters
-            if (designScenario.PlLineOffsetBelowDikeToeAtPolder.HasValue)
-            {
-                location.PlLineOffsetBelowDikeToeAtPolder = designScenario.PlLineOffsetBelowDikeToeAtPolder.Value;
-            }
-            if (designScenario.PlLineOffsetBelowDikeTopAtPolder.HasValue)
-            {
-                location.PlLineOffsetBelowDikeTopAtPolder = designScenario.PlLineOffsetBelowDikeTopAtPolder.Value;
-            }
-            if (designScenario.PlLineOffsetBelowDikeTopAtRiver.HasValue)
-            {
-                location.PlLineOffsetBelowDikeTopAtRiver = designScenario.PlLineOffsetBelowDikeTopAtRiver.Value;
-            }
-            if (designScenario.PlLineOffsetBelowShoulderBaseInside.HasValue)
-            {
-                location.PlLineOffsetBelowShoulderBaseInside = designScenario.PlLineOffsetBelowShoulderBaseInside.Value;
-            }
+            location.PlLineOffsetBelowDikeToeAtPolder = designScenario.PlLineOffsetBelowDikeToeAtPolder;
+            location.PlLineOffsetBelowDikeTopAtPolder = designScenario.PlLineOffsetBelowDikeTopAtPolder;
+            location.PlLineOffsetBelowDikeTopAtRiver = designScenario.PlLineOffsetBelowDikeTopAtRiver;
+            location.PlLineOffsetBelowShoulderBaseInside = designScenario.PlLineOffsetBelowShoulderBaseInside;
             if (designScenario.PlLineOffsetBelowDikeCrestMiddle.HasValue)
             {
                 location.PlLineOffsetBelowDikeCrestMiddle = designScenario.PlLineOffsetBelowDikeCrestMiddle;
Index: DamEngine/trunk/xsd/DamLocation.xsd
===================================================================
diff -u -r2522 -r2567
--- DamEngine/trunk/xsd/DamLocation.xsd	(.../DamLocation.xsd)	(revision 2522)
+++ DamEngine/trunk/xsd/DamLocation.xsd	(.../DamLocation.xsd)	(revision 2567)
@@ -95,10 +95,10 @@
                 <xs:attribute name="RiverLevel" type="xs:double" use="required" />
                 <xs:attribute name="RiverLevelLow" type="xs:double" use="optional" />
                 <xs:attribute name="DikeTableHeight" type="xs:double" use="optional" />
-                <xs:attribute name="PlLineOffsetBelowDikeTopAtRiver" type="xs:double" use="optional" />
-                <xs:attribute name="PlLineOffsetBelowDikeTopAtPolder" type="xs:double" use="optional" />
-                <xs:attribute name="PlLineOffsetBelowShoulderBaseInside" type="xs:double" use="optional" />
-                <xs:attribute name="PlLineOffsetBelowDikeToeAtPolder" type="xs:double" use="optional" />
+                <xs:attribute name="PlLineOffsetBelowDikeTopAtRiver" type="xs:double" use="required" />
+                <xs:attribute name="PlLineOffsetBelowDikeTopAtPolder" type="xs:double" use="required" />
+                <xs:attribute name="PlLineOffsetBelowShoulderBaseInside" type="xs:double" use="required" />
+                <xs:attribute name="PlLineOffsetBelowDikeToeAtPolder" type="xs:double" use="required" />
                 <xs:attribute name="PlLineOffsetBelowDikeCrestMiddle" type="xs:double" use="optional" />
                 <xs:attribute name="PlLineOffsetFactorBelowShoulderCrest" type="xs:double" use="optional" />
                 <xs:attribute name="HeadPl3" type="xs:double" use="optional" />
Index: DamEngine/trunk/src/Deltares.DamEngine.Interface/FillXmlInputFromDam.cs
===================================================================
diff -u -r2563 -r2567
--- DamEngine/trunk/src/Deltares.DamEngine.Interface/FillXmlInputFromDam.cs	(.../FillXmlInputFromDam.cs)	(revision 2563)
+++ DamEngine/trunk/src/Deltares.DamEngine.Interface/FillXmlInputFromDam.cs	(.../FillXmlInputFromDam.cs)	(revision 2567)
@@ -556,14 +556,10 @@
                     inputDesignScenario.RiverLevelLow = designScenario.RiverLevelLow ?? 0.0;
                     inputDesignScenario.DikeTableHeightSpecified = designScenario.DikeTableHeight.HasValue;
                     inputDesignScenario.DikeTableHeight = designScenario.DikeTableHeight ?? 0.0;
-                    inputDesignScenario.PlLineOffsetBelowDikeTopAtRiverSpecified = designScenario.PlLineOffsetBelowDikeTopAtRiver.HasValue;
-                    inputDesignScenario.PlLineOffsetBelowDikeTopAtRiver = designScenario.PlLineOffsetBelowDikeTopAtRiver ?? 0.0;
-                    inputDesignScenario.PlLineOffsetBelowDikeTopAtPolderSpecified = designScenario.PlLineOffsetBelowDikeTopAtPolder.HasValue;
-                    inputDesignScenario.PlLineOffsetBelowDikeTopAtPolder = designScenario.PlLineOffsetBelowDikeTopAtPolder ?? 0.0;
-                    inputDesignScenario.PlLineOffsetBelowShoulderBaseInsideSpecified = designScenario.PlLineOffsetBelowShoulderBaseInside.HasValue;
-                    inputDesignScenario.PlLineOffsetBelowShoulderBaseInside = designScenario.PlLineOffsetBelowShoulderBaseInside ?? 0.0;
-                    inputDesignScenario.PlLineOffsetBelowDikeToeAtPolderSpecified = designScenario.PlLineOffsetBelowDikeToeAtPolder.HasValue;
-                    inputDesignScenario.PlLineOffsetBelowDikeToeAtPolder = designScenario.PlLineOffsetBelowDikeToeAtPolder ?? 0.0;
+                    inputDesignScenario.PlLineOffsetBelowDikeTopAtRiver = designScenario.PlLineOffsetBelowDikeTopAtRiver;
+                    inputDesignScenario.PlLineOffsetBelowDikeTopAtPolder = designScenario.PlLineOffsetBelowDikeTopAtPolder;
+                    inputDesignScenario.PlLineOffsetBelowShoulderBaseInside = designScenario.PlLineOffsetBelowShoulderBaseInside;
+                    inputDesignScenario.PlLineOffsetBelowDikeToeAtPolder = designScenario.PlLineOffsetBelowDikeToeAtPolder;
                     inputDesignScenario.PlLineOffsetBelowDikeCrestMiddleSpecified = designScenario.UsePlLineOffsetBelowDikeCrestMiddle.Value;
                     inputDesignScenario.PlLineOffsetBelowDikeCrestMiddle = designScenario.PlLineOffsetBelowDikeCrestMiddle.Value;
                     inputDesignScenario.PlLineOffsetFactorBelowShoulderCrestSpecified = designScenario.UsePlLineOffsetFactorBelowShoulderCrest.Value;