Index: dam engine/trunk/src/Deltares.DamEngine.Io/DamInput.cs
===================================================================
diff -u -r631 -r669
--- dam engine/trunk/src/Deltares.DamEngine.Io/DamInput.cs	(.../DamInput.cs)	(revision 631)
+++ dam engine/trunk/src/Deltares.DamEngine.Io/DamInput.cs	(.../DamInput.cs)	(revision 669)
@@ -219,10 +219,8 @@
         
         private object operationalOptionsField;
         
-        private object designOptionsField;
+        private LocationDesignOptions designOptionsField;
         
-        private object nWOOptionsField;
-        
         private LocationWaternetOptions waternetOptionsField;
         
         private LocationGeneral generalField;
@@ -268,7 +266,7 @@
         }
         
         /// <remarks/>
-        public object DesignOptions {
+        public LocationDesignOptions DesignOptions {
             get {
                 return this.designOptionsField;
             }
@@ -278,16 +276,6 @@
         }
         
         /// <remarks/>
-        public object NWOOptions {
-            get {
-                return this.nWOOptionsField;
-            }
-            set {
-                this.nWOOptionsField = value;
-            }
-        }
-        
-        /// <remarks/>
         public LocationWaternetOptions WaternetOptions {
             get {
                 return this.waternetOptionsField;
@@ -1297,6 +1285,431 @@
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
     [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)]
+    public partial class LocationDesignOptions {
+        
+        private bool redesignDikeHeightField;
+        
+        private bool redesignDikeShoulderField;
+        
+        private string shoulderEmbankmentMaterialField;
+        
+        private double stabilityShoulderGrowSlopeField;
+        
+        private double stabilityShoulderGrowDeltaXField;
+        
+        private double stabilitySlopeAdaptionDeltaXField;
+        
+        private double slopeAdaptionStartCotangentField;
+        
+        private double slopeAdaptionEndCotangentField;
+        
+        private double slopeAdaptionStepCotangentField;
+        
+        private double newDikeTopWidthField;
+        
+        private bool newDikeTopWidthFieldSpecified;
+        
+        private double newDikeSlopeInsideField;
+        
+        private bool newDikeSlopeInsideFieldSpecified;
+        
+        private double newDikeSlopeOutsideField;
+        
+        private bool newDikeSlopeOutsideFieldSpecified;
+        
+        private double newShoulderTopSlopeField;
+        
+        private bool newShoulderTopSlopeFieldSpecified;
+        
+        private double newShoulderBaseSlopeField;
+        
+        private bool newShoulderBaseSlopeFieldSpecified;
+        
+        private double newMaxHeightShoulderAsFractionField;
+        
+        private bool newMaxHeightShoulderAsFractionFieldSpecified;
+        
+        private double newMinDistanceDikeToeStartDitchField;
+        
+        private bool newMinDistanceDikeToeStartDitchFieldSpecified;
+        
+        private bool useNewDitchDefinitionField;
+        
+        private double newWidthDitchBottomField;
+        
+        private bool newWidthDitchBottomFieldSpecified;
+        
+        private double newSlopeAngleDitchField;
+        
+        private bool newSlopeAngleDitchFieldSpecified;
+        
+        private double newDepthDitchField;
+        
+        private bool newDepthDitchFieldSpecified;
+        
+        private LocationDesignOptionsStabilityDesignMethod stabilityDesignMethodField;
+        
+        /// <remarks/>
+        [System.Xml.Serialization.XmlAttributeAttribute()]
+        public bool RedesignDikeHeight {
+            get {
+                return this.redesignDikeHeightField;
+            }
+            set {
+                this.redesignDikeHeightField = value;
+            }
+        }
+        
+        /// <remarks/>
+        [System.Xml.Serialization.XmlAttributeAttribute()]
+        public bool RedesignDikeShoulder {
+            get {
+                return this.redesignDikeShoulderField;
+            }
+            set {
+                this.redesignDikeShoulderField = value;
+            }
+        }
+        
+        /// <remarks/>
+        [System.Xml.Serialization.XmlAttributeAttribute()]
+        public string ShoulderEmbankmentMaterial {
+            get {
+                return this.shoulderEmbankmentMaterialField;
+            }
+            set {
+                this.shoulderEmbankmentMaterialField = value;
+            }
+        }
+        
+        /// <remarks/>
+        [System.Xml.Serialization.XmlAttributeAttribute()]
+        public double StabilityShoulderGrowSlope {
+            get {
+                return this.stabilityShoulderGrowSlopeField;
+            }
+            set {
+                this.stabilityShoulderGrowSlopeField = value;
+            }
+        }
+        
+        /// <remarks/>
+        [System.Xml.Serialization.XmlAttributeAttribute()]
+        public double StabilityShoulderGrowDeltaX {
+            get {
+                return this.stabilityShoulderGrowDeltaXField;
+            }
+            set {
+                this.stabilityShoulderGrowDeltaXField = value;
+            }
+        }
+        
+        /// <remarks/>
+        [System.Xml.Serialization.XmlAttributeAttribute()]
+        public double StabilitySlopeAdaptionDeltaX {
+            get {
+                return this.stabilitySlopeAdaptionDeltaXField;
+            }
+            set {
+                this.stabilitySlopeAdaptionDeltaXField = value;
+            }
+        }
+        
+        /// <remarks/>
+        [System.Xml.Serialization.XmlAttributeAttribute()]
+        public double SlopeAdaptionStartCotangent {
+            get {
+                return this.slopeAdaptionStartCotangentField;
+            }
+            set {
+                this.slopeAdaptionStartCotangentField = value;
+            }
+        }
+        
+        /// <remarks/>
+        [System.Xml.Serialization.XmlAttributeAttribute()]
+        public double SlopeAdaptionEndCotangent {
+            get {
+                return this.slopeAdaptionEndCotangentField;
+            }
+            set {
+                this.slopeAdaptionEndCotangentField = value;
+            }
+        }
+        
+        /// <remarks/>
+        [System.Xml.Serialization.XmlAttributeAttribute()]
+        public double SlopeAdaptionStepCotangent {
+            get {
+                return this.slopeAdaptionStepCotangentField;
+            }
+            set {
+                this.slopeAdaptionStepCotangentField = value;
+            }
+        }
+        
+        /// <remarks/>
+        [System.Xml.Serialization.XmlAttributeAttribute()]
+        public double NewDikeTopWidth {
+            get {
+                return this.newDikeTopWidthField;
+            }
+            set {
+                this.newDikeTopWidthField = value;
+            }
+        }
+        
+        /// <remarks/>
+        [System.Xml.Serialization.XmlIgnoreAttribute()]
+        public bool NewDikeTopWidthSpecified {
+            get {
+                return this.newDikeTopWidthFieldSpecified;
+            }
+            set {
+                this.newDikeTopWidthFieldSpecified = value;
+            }
+        }
+        
+        /// <remarks/>
+        [System.Xml.Serialization.XmlAttributeAttribute()]
+        public double NewDikeSlopeInside {
+            get {
+                return this.newDikeSlopeInsideField;
+            }
+            set {
+                this.newDikeSlopeInsideField = value;
+            }
+        }
+        
+        /// <remarks/>
+        [System.Xml.Serialization.XmlIgnoreAttribute()]
+        public bool NewDikeSlopeInsideSpecified {
+            get {
+                return this.newDikeSlopeInsideFieldSpecified;
+            }
+            set {
+                this.newDikeSlopeInsideFieldSpecified = value;
+            }
+        }
+        
+        /// <remarks/>
+        [System.Xml.Serialization.XmlAttributeAttribute()]
+        public double NewDikeSlopeOutside {
+            get {
+                return this.newDikeSlopeOutsideField;
+            }
+            set {
+                this.newDikeSlopeOutsideField = value;
+            }
+        }
+        
+        /// <remarks/>
+        [System.Xml.Serialization.XmlIgnoreAttribute()]
+        public bool NewDikeSlopeOutsideSpecified {
+            get {
+                return this.newDikeSlopeOutsideFieldSpecified;
+            }
+            set {
+                this.newDikeSlopeOutsideFieldSpecified = value;
+            }
+        }
+        
+        /// <remarks/>
+        [System.Xml.Serialization.XmlAttributeAttribute()]
+        public double NewShoulderTopSlope {
+            get {
+                return this.newShoulderTopSlopeField;
+            }
+            set {
+                this.newShoulderTopSlopeField = value;
+            }
+        }
+        
+        /// <remarks/>
+        [System.Xml.Serialization.XmlIgnoreAttribute()]
+        public bool NewShoulderTopSlopeSpecified {
+            get {
+                return this.newShoulderTopSlopeFieldSpecified;
+            }
+            set {
+                this.newShoulderTopSlopeFieldSpecified = value;
+            }
+        }
+        
+        /// <remarks/>
+        [System.Xml.Serialization.XmlAttributeAttribute()]
+        public double NewShoulderBaseSlope {
+            get {
+                return this.newShoulderBaseSlopeField;
+            }
+            set {
+                this.newShoulderBaseSlopeField = value;
+            }
+        }
+        
+        /// <remarks/>
+        [System.Xml.Serialization.XmlIgnoreAttribute()]
+        public bool NewShoulderBaseSlopeSpecified {
+            get {
+                return this.newShoulderBaseSlopeFieldSpecified;
+            }
+            set {
+                this.newShoulderBaseSlopeFieldSpecified = value;
+            }
+        }
+        
+        /// <remarks/>
+        [System.Xml.Serialization.XmlAttributeAttribute()]
+        public double NewMaxHeightShoulderAsFraction {
+            get {
+                return this.newMaxHeightShoulderAsFractionField;
+            }
+            set {
+                this.newMaxHeightShoulderAsFractionField = value;
+            }
+        }
+        
+        /// <remarks/>
+        [System.Xml.Serialization.XmlIgnoreAttribute()]
+        public bool NewMaxHeightShoulderAsFractionSpecified {
+            get {
+                return this.newMaxHeightShoulderAsFractionFieldSpecified;
+            }
+            set {
+                this.newMaxHeightShoulderAsFractionFieldSpecified = value;
+            }
+        }
+        
+        /// <remarks/>
+        [System.Xml.Serialization.XmlAttributeAttribute()]
+        public double NewMinDistanceDikeToeStartDitch {
+            get {
+                return this.newMinDistanceDikeToeStartDitchField;
+            }
+            set {
+                this.newMinDistanceDikeToeStartDitchField = value;
+            }
+        }
+        
+        /// <remarks/>
+        [System.Xml.Serialization.XmlIgnoreAttribute()]
+        public bool NewMinDistanceDikeToeStartDitchSpecified {
+            get {
+                return this.newMinDistanceDikeToeStartDitchFieldSpecified;
+            }
+            set {
+                this.newMinDistanceDikeToeStartDitchFieldSpecified = value;
+            }
+        }
+        
+        /// <remarks/>
+        [System.Xml.Serialization.XmlAttributeAttribute()]
+        public bool UseNewDitchDefinition {
+            get {
+                return this.useNewDitchDefinitionField;
+            }
+            set {
+                this.useNewDitchDefinitionField = value;
+            }
+        }
+        
+        /// <remarks/>
+        [System.Xml.Serialization.XmlAttributeAttribute()]
+        public double NewWidthDitchBottom {
+            get {
+                return this.newWidthDitchBottomField;
+            }
+            set {
+                this.newWidthDitchBottomField = value;
+            }
+        }
+        
+        /// <remarks/>
+        [System.Xml.Serialization.XmlIgnoreAttribute()]
+        public bool NewWidthDitchBottomSpecified {
+            get {
+                return this.newWidthDitchBottomFieldSpecified;
+            }
+            set {
+                this.newWidthDitchBottomFieldSpecified = value;
+            }
+        }
+        
+        /// <remarks/>
+        [System.Xml.Serialization.XmlAttributeAttribute()]
+        public double NewSlopeAngleDitch {
+            get {
+                return this.newSlopeAngleDitchField;
+            }
+            set {
+                this.newSlopeAngleDitchField = value;
+            }
+        }
+        
+        /// <remarks/>
+        [System.Xml.Serialization.XmlIgnoreAttribute()]
+        public bool NewSlopeAngleDitchSpecified {
+            get {
+                return this.newSlopeAngleDitchFieldSpecified;
+            }
+            set {
+                this.newSlopeAngleDitchFieldSpecified = value;
+            }
+        }
+        
+        /// <remarks/>
+        [System.Xml.Serialization.XmlAttributeAttribute()]
+        public double NewDepthDitch {
+            get {
+                return this.newDepthDitchField;
+            }
+            set {
+                this.newDepthDitchField = value;
+            }
+        }
+        
+        /// <remarks/>
+        [System.Xml.Serialization.XmlIgnoreAttribute()]
+        public bool NewDepthDitchSpecified {
+            get {
+                return this.newDepthDitchFieldSpecified;
+            }
+            set {
+                this.newDepthDitchFieldSpecified = value;
+            }
+        }
+        
+        /// <remarks/>
+        [System.Xml.Serialization.XmlAttributeAttribute()]
+        public LocationDesignOptionsStabilityDesignMethod StabilityDesignMethod {
+            get {
+                return this.stabilityDesignMethodField;
+            }
+            set {
+                this.stabilityDesignMethodField = value;
+            }
+        }
+    }
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")]
+    [System.SerializableAttribute()]
+    [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)]
+    public enum LocationDesignOptionsStabilityDesignMethod {
+        
+        /// <remarks/>
+        OptimizedSlopeAndShoulderAdaption,
+        
+        /// <remarks/>
+        SlopeAdaptionBeforeShoulderAdaption,
+    }
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")]
+    [System.SerializableAttribute()]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)]
     public partial class LocationWaternetOptions {
         
         private LocationWaternetOptionsPhreaticLineCreationMethod phreaticLineCreationMethodField;
@@ -2404,9 +2817,6 @@
         
         /// <remarks/>
         Design,
-        
-        /// <remarks/>
-        NWO,
     }
     
     /// <remarks/>