Index: dam engine/trunk/src/Deltares.DamEngine.Io/DamInput.cs
===================================================================
diff -u -r728 -r730
--- dam engine/trunk/src/Deltares.DamEngine.Io/DamInput.cs	(.../DamInput.cs)	(revision 728)
+++ dam engine/trunk/src/Deltares.DamEngine.Io/DamInput.cs	(.../DamInput.cs)	(revision 730)
@@ -512,64 +512,72 @@
         
         private int searchMethodField;
         
-        private int determinationGridField;
+        private int gridDeterminationField;
         
-        private int definitionTangentLinesField;
+        private int bishopTangentLinesDefinitionField;
         
-        private bool definitionTangentLinesFieldSpecified;
+        private bool bishopTangentLinesDefinitionFieldSpecified;
         
-        private double distanceTangentLinesField;
+        private double bishopTangentLinesDistanceField;
         
-        private bool distanceTangentLinesFieldSpecified;
+        private bool bishopTangentLinesDistanceFieldSpecified;
         
-        private int bishopNumberOfVerticalPointsGridField;
+        private int bishopGridVerticalPointsCountField;
         
-        private bool bishopNumberOfVerticalPointsGridFieldSpecified;
+        private bool bishopGridVerticalPointsCountFieldSpecified;
         
-        private double bishopDistanceOfVerticalPointsGridField;
+        private double bishopGridVerticalPointsDistanceField;
         
-        private bool bishopDistanceOfVerticalPointsGridFieldSpecified;
+        private bool bishopGridVerticalPointsDistanceFieldSpecified;
         
-        private int bishopNumberOfHorizontalPointsGridField;
+        private int bishopGridHorizontalPointsCountField;
         
-        private bool bishopNumberOfHorizontalPointsGridFieldSpecified;
+        private bool bishopGridHorizontalPointsCountFieldSpecified;
         
-        private double bishopDistanceOfHorizontalPointsGridField;
+        private double bishopGridHorizontalPointsDistanceField;
         
-        private bool bishopDistanceOfHorizontalPointsGridFieldSpecified;
+        private bool bishopGridHorizontalPointsDistanceFieldSpecified;
         
-        private int upliftVanNumberOfVerticalPointsGridLeftField;
+        private int upliftVanGridLeftVerticalPointsCountField;
         
-        private bool upliftVanNumberOfVerticalPointsGridLeftFieldSpecified;
+        private bool upliftVanGridLeftVerticalPointsCountFieldSpecified;
         
-        private double upliftVanDistanceOfVerticalPointsGridLeftField;
+        private double upliftVanGridLeftVerticalPointsDistanceField;
         
-        private bool upliftVanDistanceOfVerticalPointsGridLeftFieldSpecified;
+        private bool upliftVanGridLeftVerticalPointsDistanceFieldSpecified;
         
-        private int upliftVanNumberOfHorizontalPointsGridLeftField;
+        private int upliftVanGridLeftHorizontalPointsCountField;
         
-        private bool upliftVanNumberOfHorizontalPointsGridLeftFieldSpecified;
+        private bool upliftVanGridLeftHorizontalPointsCountFieldSpecified;
         
-        private double upliftVanDistanceOfHorizontalPointsGridLeftField;
+        private double upliftVanGridLeftHorizontalPointsDistanceField;
         
-        private bool upliftVanDistanceOfHorizontalPointsGridLeftFieldSpecified;
+        private bool upliftVanGridLeftHorizontalPointsDistanceFieldSpecified;
         
-        private int upliftVanNumberOfVerticalPointsGridRightField;
+        private int upliftVanGridRightVerticalPointsCountField;
         
-        private bool upliftVanNumberOfVerticalPointsGridRightFieldSpecified;
+        private bool upliftVanGridRightVerticalPointsCountFieldSpecified;
         
-        private double upliftVanDistanceOfVerticalPointsGridRightField;
+        private double upliftVanGridRightVerticalPointsDistanceField;
         
-        private bool upliftVanDistanceOfVerticalPointsGridRightFieldSpecified;
+        private bool upliftVanGridRightVerticalPointsDistanceFieldSpecified;
         
-        private int upliftVanNumberOfHorizontalPointsGridRightField;
+        private int upliftVanGridRightHorizontalPointsCountField;
         
-        private bool upliftVanNumberOfHorizontalPointsGridRightFieldSpecified;
+        private bool upliftVanGridRightHorizontalPointsCountFieldSpecified;
         
-        private double upliftVanDistanceOfHorizontalPointsGridRightField;
+        private double upliftVanGridRightHorizontalPointsDistanceField;
         
-        private bool upliftVanDistanceOfHorizontalPointsGridRightFieldSpecified;
+        private bool upliftVanGridRightHorizontalPointsDistanceFieldSpecified;
         
+        private int upliftVanTangentLinesDefinitionField;
+        
+        private bool upliftVanTangentLinesDefinitionFieldSpecified;
+        
+        private double upliftVanTangentLinesDistanceField;
+        
+        private bool upliftVanTangentLinesDistanceFieldSpecified;
+        
         /// <remarks/>
         [System.Xml.Serialization.XmlAttributeAttribute()]
         public int SearchMethod {
@@ -583,322 +591,366 @@
         
         /// <remarks/>
         [System.Xml.Serialization.XmlAttributeAttribute()]
-        public int DeterminationGrid {
+        public int GridDetermination {
             get {
-                return this.determinationGridField;
+                return this.gridDeterminationField;
             }
             set {
-                this.determinationGridField = value;
+                this.gridDeterminationField = value;
             }
         }
         
         /// <remarks/>
         [System.Xml.Serialization.XmlAttributeAttribute()]
-        public int DefinitionTangentLines {
+        public int BishopTangentLinesDefinition {
             get {
-                return this.definitionTangentLinesField;
+                return this.bishopTangentLinesDefinitionField;
             }
             set {
-                this.definitionTangentLinesField = value;
+                this.bishopTangentLinesDefinitionField = value;
             }
         }
         
         /// <remarks/>
         [System.Xml.Serialization.XmlIgnoreAttribute()]
-        public bool DefinitionTangentLinesSpecified {
+        public bool BishopTangentLinesDefinitionSpecified {
             get {
-                return this.definitionTangentLinesFieldSpecified;
+                return this.bishopTangentLinesDefinitionFieldSpecified;
             }
             set {
-                this.definitionTangentLinesFieldSpecified = value;
+                this.bishopTangentLinesDefinitionFieldSpecified = value;
             }
         }
         
         /// <remarks/>
         [System.Xml.Serialization.XmlAttributeAttribute()]
-        public double DistanceTangentLines {
+        public double BishopTangentLinesDistance {
             get {
-                return this.distanceTangentLinesField;
+                return this.bishopTangentLinesDistanceField;
             }
             set {
-                this.distanceTangentLinesField = value;
+                this.bishopTangentLinesDistanceField = value;
             }
         }
         
         /// <remarks/>
         [System.Xml.Serialization.XmlIgnoreAttribute()]
-        public bool DistanceTangentLinesSpecified {
+        public bool BishopTangentLinesDistanceSpecified {
             get {
-                return this.distanceTangentLinesFieldSpecified;
+                return this.bishopTangentLinesDistanceFieldSpecified;
             }
             set {
-                this.distanceTangentLinesFieldSpecified = value;
+                this.bishopTangentLinesDistanceFieldSpecified = value;
             }
         }
         
         /// <remarks/>
         [System.Xml.Serialization.XmlAttributeAttribute()]
-        public int BishopNumberOfVerticalPointsGrid {
+        public int BishopGridVerticalPointsCount {
             get {
-                return this.bishopNumberOfVerticalPointsGridField;
+                return this.bishopGridVerticalPointsCountField;
             }
             set {
-                this.bishopNumberOfVerticalPointsGridField = value;
+                this.bishopGridVerticalPointsCountField = value;
             }
         }
         
         /// <remarks/>
         [System.Xml.Serialization.XmlIgnoreAttribute()]
-        public bool BishopNumberOfVerticalPointsGridSpecified {
+        public bool BishopGridVerticalPointsCountSpecified {
             get {
-                return this.bishopNumberOfVerticalPointsGridFieldSpecified;
+                return this.bishopGridVerticalPointsCountFieldSpecified;
             }
             set {
-                this.bishopNumberOfVerticalPointsGridFieldSpecified = value;
+                this.bishopGridVerticalPointsCountFieldSpecified = value;
             }
         }
         
         /// <remarks/>
         [System.Xml.Serialization.XmlAttributeAttribute()]
-        public double BishopDistanceOfVerticalPointsGrid {
+        public double BishopGridVerticalPointsDistance {
             get {
-                return this.bishopDistanceOfVerticalPointsGridField;
+                return this.bishopGridVerticalPointsDistanceField;
             }
             set {
-                this.bishopDistanceOfVerticalPointsGridField = value;
+                this.bishopGridVerticalPointsDistanceField = value;
             }
         }
         
         /// <remarks/>
         [System.Xml.Serialization.XmlIgnoreAttribute()]
-        public bool BishopDistanceOfVerticalPointsGridSpecified {
+        public bool BishopGridVerticalPointsDistanceSpecified {
             get {
-                return this.bishopDistanceOfVerticalPointsGridFieldSpecified;
+                return this.bishopGridVerticalPointsDistanceFieldSpecified;
             }
             set {
-                this.bishopDistanceOfVerticalPointsGridFieldSpecified = value;
+                this.bishopGridVerticalPointsDistanceFieldSpecified = value;
             }
         }
         
         /// <remarks/>
         [System.Xml.Serialization.XmlAttributeAttribute()]
-        public int BishopNumberOfHorizontalPointsGrid {
+        public int BishopGridHorizontalPointsCount {
             get {
-                return this.bishopNumberOfHorizontalPointsGridField;
+                return this.bishopGridHorizontalPointsCountField;
             }
             set {
-                this.bishopNumberOfHorizontalPointsGridField = value;
+                this.bishopGridHorizontalPointsCountField = value;
             }
         }
         
         /// <remarks/>
         [System.Xml.Serialization.XmlIgnoreAttribute()]
-        public bool BishopNumberOfHorizontalPointsGridSpecified {
+        public bool BishopGridHorizontalPointsCountSpecified {
             get {
-                return this.bishopNumberOfHorizontalPointsGridFieldSpecified;
+                return this.bishopGridHorizontalPointsCountFieldSpecified;
             }
             set {
-                this.bishopNumberOfHorizontalPointsGridFieldSpecified = value;
+                this.bishopGridHorizontalPointsCountFieldSpecified = value;
             }
         }
         
         /// <remarks/>
         [System.Xml.Serialization.XmlAttributeAttribute()]
-        public double BishopDistanceOfHorizontalPointsGrid {
+        public double BishopGridHorizontalPointsDistance {
             get {
-                return this.bishopDistanceOfHorizontalPointsGridField;
+                return this.bishopGridHorizontalPointsDistanceField;
             }
             set {
-                this.bishopDistanceOfHorizontalPointsGridField = value;
+                this.bishopGridHorizontalPointsDistanceField = value;
             }
         }
         
         /// <remarks/>
         [System.Xml.Serialization.XmlIgnoreAttribute()]
-        public bool BishopDistanceOfHorizontalPointsGridSpecified {
+        public bool BishopGridHorizontalPointsDistanceSpecified {
             get {
-                return this.bishopDistanceOfHorizontalPointsGridFieldSpecified;
+                return this.bishopGridHorizontalPointsDistanceFieldSpecified;
             }
             set {
-                this.bishopDistanceOfHorizontalPointsGridFieldSpecified = value;
+                this.bishopGridHorizontalPointsDistanceFieldSpecified = value;
             }
         }
         
         /// <remarks/>
         [System.Xml.Serialization.XmlAttributeAttribute()]
-        public int UpliftVanNumberOfVerticalPointsGridLeft {
+        public int UpliftVanGridLeftVerticalPointsCount {
             get {
-                return this.upliftVanNumberOfVerticalPointsGridLeftField;
+                return this.upliftVanGridLeftVerticalPointsCountField;
             }
             set {
-                this.upliftVanNumberOfVerticalPointsGridLeftField = value;
+                this.upliftVanGridLeftVerticalPointsCountField = value;
             }
         }
         
         /// <remarks/>
         [System.Xml.Serialization.XmlIgnoreAttribute()]
-        public bool UpliftVanNumberOfVerticalPointsGridLeftSpecified {
+        public bool UpliftVanGridLeftVerticalPointsCountSpecified {
             get {
-                return this.upliftVanNumberOfVerticalPointsGridLeftFieldSpecified;
+                return this.upliftVanGridLeftVerticalPointsCountFieldSpecified;
             }
             set {
-                this.upliftVanNumberOfVerticalPointsGridLeftFieldSpecified = value;
+                this.upliftVanGridLeftVerticalPointsCountFieldSpecified = value;
             }
         }
         
         /// <remarks/>
         [System.Xml.Serialization.XmlAttributeAttribute()]
-        public double UpliftVanDistanceOfVerticalPointsGridLeft {
+        public double UpliftVanGridLeftVerticalPointsDistance {
             get {
-                return this.upliftVanDistanceOfVerticalPointsGridLeftField;
+                return this.upliftVanGridLeftVerticalPointsDistanceField;
             }
             set {
-                this.upliftVanDistanceOfVerticalPointsGridLeftField = value;
+                this.upliftVanGridLeftVerticalPointsDistanceField = value;
             }
         }
         
         /// <remarks/>
         [System.Xml.Serialization.XmlIgnoreAttribute()]
-        public bool UpliftVanDistanceOfVerticalPointsGridLeftSpecified {
+        public bool UpliftVanGridLeftVerticalPointsDistanceSpecified {
             get {
-                return this.upliftVanDistanceOfVerticalPointsGridLeftFieldSpecified;
+                return this.upliftVanGridLeftVerticalPointsDistanceFieldSpecified;
             }
             set {
-                this.upliftVanDistanceOfVerticalPointsGridLeftFieldSpecified = value;
+                this.upliftVanGridLeftVerticalPointsDistanceFieldSpecified = value;
             }
         }
         
         /// <remarks/>
         [System.Xml.Serialization.XmlAttributeAttribute()]
-        public int UpliftVanNumberOfHorizontalPointsGridLeft {
+        public int UpliftVanGridLeftHorizontalPointsCount {
             get {
-                return this.upliftVanNumberOfHorizontalPointsGridLeftField;
+                return this.upliftVanGridLeftHorizontalPointsCountField;
             }
             set {
-                this.upliftVanNumberOfHorizontalPointsGridLeftField = value;
+                this.upliftVanGridLeftHorizontalPointsCountField = value;
             }
         }
         
         /// <remarks/>
         [System.Xml.Serialization.XmlIgnoreAttribute()]
-        public bool UpliftVanNumberOfHorizontalPointsGridLeftSpecified {
+        public bool UpliftVanGridLeftHorizontalPointsCountSpecified {
             get {
-                return this.upliftVanNumberOfHorizontalPointsGridLeftFieldSpecified;
+                return this.upliftVanGridLeftHorizontalPointsCountFieldSpecified;
             }
             set {
-                this.upliftVanNumberOfHorizontalPointsGridLeftFieldSpecified = value;
+                this.upliftVanGridLeftHorizontalPointsCountFieldSpecified = value;
             }
         }
         
         /// <remarks/>
         [System.Xml.Serialization.XmlAttributeAttribute()]
-        public double UpliftVanDistanceOfHorizontalPointsGridLeft {
+        public double UpliftVanGridLeftHorizontalPointsDistance {
             get {
-                return this.upliftVanDistanceOfHorizontalPointsGridLeftField;
+                return this.upliftVanGridLeftHorizontalPointsDistanceField;
             }
             set {
-                this.upliftVanDistanceOfHorizontalPointsGridLeftField = value;
+                this.upliftVanGridLeftHorizontalPointsDistanceField = value;
             }
         }
         
         /// <remarks/>
         [System.Xml.Serialization.XmlIgnoreAttribute()]
-        public bool UpliftVanDistanceOfHorizontalPointsGridLeftSpecified {
+        public bool UpliftVanGridLeftHorizontalPointsDistanceSpecified {
             get {
-                return this.upliftVanDistanceOfHorizontalPointsGridLeftFieldSpecified;
+                return this.upliftVanGridLeftHorizontalPointsDistanceFieldSpecified;
             }
             set {
-                this.upliftVanDistanceOfHorizontalPointsGridLeftFieldSpecified = value;
+                this.upliftVanGridLeftHorizontalPointsDistanceFieldSpecified = value;
             }
         }
         
         /// <remarks/>
         [System.Xml.Serialization.XmlAttributeAttribute()]
-        public int UpliftVanNumberOfVerticalPointsGridRight {
+        public int UpliftVanGridRightVerticalPointsCount {
             get {
-                return this.upliftVanNumberOfVerticalPointsGridRightField;
+                return this.upliftVanGridRightVerticalPointsCountField;
             }
             set {
-                this.upliftVanNumberOfVerticalPointsGridRightField = value;
+                this.upliftVanGridRightVerticalPointsCountField = value;
             }
         }
         
         /// <remarks/>
         [System.Xml.Serialization.XmlIgnoreAttribute()]
-        public bool UpliftVanNumberOfVerticalPointsGridRightSpecified {
+        public bool UpliftVanGridRightVerticalPointsCountSpecified {
             get {
-                return this.upliftVanNumberOfVerticalPointsGridRightFieldSpecified;
+                return this.upliftVanGridRightVerticalPointsCountFieldSpecified;
             }
             set {
-                this.upliftVanNumberOfVerticalPointsGridRightFieldSpecified = value;
+                this.upliftVanGridRightVerticalPointsCountFieldSpecified = value;
             }
         }
         
         /// <remarks/>
         [System.Xml.Serialization.XmlAttributeAttribute()]
-        public double UpliftVanDistanceOfVerticalPointsGridRight {
+        public double UpliftVanGridRightVerticalPointsDistance {
             get {
-                return this.upliftVanDistanceOfVerticalPointsGridRightField;
+                return this.upliftVanGridRightVerticalPointsDistanceField;
             }
             set {
-                this.upliftVanDistanceOfVerticalPointsGridRightField = value;
+                this.upliftVanGridRightVerticalPointsDistanceField = value;
             }
         }
         
         /// <remarks/>
         [System.Xml.Serialization.XmlIgnoreAttribute()]
-        public bool UpliftVanDistanceOfVerticalPointsGridRightSpecified {
+        public bool UpliftVanGridRightVerticalPointsDistanceSpecified {
             get {
-                return this.upliftVanDistanceOfVerticalPointsGridRightFieldSpecified;
+                return this.upliftVanGridRightVerticalPointsDistanceFieldSpecified;
             }
             set {
-                this.upliftVanDistanceOfVerticalPointsGridRightFieldSpecified = value;
+                this.upliftVanGridRightVerticalPointsDistanceFieldSpecified = value;
             }
         }
         
         /// <remarks/>
         [System.Xml.Serialization.XmlAttributeAttribute()]
-        public int UpliftVanNumberOfHorizontalPointsGridRight {
+        public int UpliftVanGridRightHorizontalPointsCount {
             get {
-                return this.upliftVanNumberOfHorizontalPointsGridRightField;
+                return this.upliftVanGridRightHorizontalPointsCountField;
             }
             set {
-                this.upliftVanNumberOfHorizontalPointsGridRightField = value;
+                this.upliftVanGridRightHorizontalPointsCountField = value;
             }
         }
         
         /// <remarks/>
         [System.Xml.Serialization.XmlIgnoreAttribute()]
-        public bool UpliftVanNumberOfHorizontalPointsGridRightSpecified {
+        public bool UpliftVanGridRightHorizontalPointsCountSpecified {
             get {
-                return this.upliftVanNumberOfHorizontalPointsGridRightFieldSpecified;
+                return this.upliftVanGridRightHorizontalPointsCountFieldSpecified;
             }
             set {
-                this.upliftVanNumberOfHorizontalPointsGridRightFieldSpecified = value;
+                this.upliftVanGridRightHorizontalPointsCountFieldSpecified = value;
             }
         }
         
         /// <remarks/>
         [System.Xml.Serialization.XmlAttributeAttribute()]
-        public double UpliftVanDistanceOfHorizontalPointsGridRight {
+        public double UpliftVanGridRightHorizontalPointsDistance {
             get {
-                return this.upliftVanDistanceOfHorizontalPointsGridRightField;
+                return this.upliftVanGridRightHorizontalPointsDistanceField;
             }
             set {
-                this.upliftVanDistanceOfHorizontalPointsGridRightField = value;
+                this.upliftVanGridRightHorizontalPointsDistanceField = value;
             }
         }
         
         /// <remarks/>
         [System.Xml.Serialization.XmlIgnoreAttribute()]
-        public bool UpliftVanDistanceOfHorizontalPointsGridRightSpecified {
+        public bool UpliftVanGridRightHorizontalPointsDistanceSpecified {
             get {
-                return this.upliftVanDistanceOfHorizontalPointsGridRightFieldSpecified;
+                return this.upliftVanGridRightHorizontalPointsDistanceFieldSpecified;
             }
             set {
-                this.upliftVanDistanceOfHorizontalPointsGridRightFieldSpecified = value;
+                this.upliftVanGridRightHorizontalPointsDistanceFieldSpecified = value;
             }
         }
+        
+        /// <remarks/>
+        [System.Xml.Serialization.XmlAttributeAttribute()]
+        public int UpliftVanTangentLinesDefinition {
+            get {
+                return this.upliftVanTangentLinesDefinitionField;
+            }
+            set {
+                this.upliftVanTangentLinesDefinitionField = value;
+            }
+        }
+        
+        /// <remarks/>
+        [System.Xml.Serialization.XmlIgnoreAttribute()]
+        public bool UpliftVanTangentLinesDefinitionSpecified {
+            get {
+                return this.upliftVanTangentLinesDefinitionFieldSpecified;
+            }
+            set {
+                this.upliftVanTangentLinesDefinitionFieldSpecified = value;
+            }
+        }
+        
+        /// <remarks/>
+        [System.Xml.Serialization.XmlAttributeAttribute()]
+        public double UpliftVanTangentLinesDistance {
+            get {
+                return this.upliftVanTangentLinesDistanceField;
+            }
+            set {
+                this.upliftVanTangentLinesDistanceField = value;
+            }
+        }
+        
+        /// <remarks/>
+        [System.Xml.Serialization.XmlIgnoreAttribute()]
+        public bool UpliftVanTangentLinesDistanceSpecified {
+            get {
+                return this.upliftVanTangentLinesDistanceFieldSpecified;
+            }
+            set {
+                this.upliftVanTangentLinesDistanceFieldSpecified = value;
+            }
+        }
     }
     
     /// <remarks/>