Index: dam engine/trunk/src/Deltares.DamEngine.Io/DamOutput.cs
===================================================================
diff -u -r408 -r416
--- dam engine/trunk/src/Deltares.DamEngine.Io/DamOutput.cs	(.../DamOutput.cs)	(revision 408)
+++ dam engine/trunk/src/Deltares.DamEngine.Io/DamOutput.cs	(.../DamOutput.cs)	(revision 416)
@@ -71,8 +71,6 @@
         
         private InputDamProjectType damProjectTypeField;
         
-        private bool damProjectTypeFieldSpecified;
-        
         /// <remarks/>
         [System.Xml.Serialization.XmlArrayItemAttribute(IsNullable=false)]
         public Location[] Locations {
@@ -94,17 +92,6 @@
                 this.damProjectTypeField = value;
             }
         }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlIgnoreAttribute()]
-        public bool DamProjectTypeSpecified {
-            get {
-                return this.damProjectTypeFieldSpecified;
-            }
-            set {
-                this.damProjectTypeFieldSpecified = value;
-            }
-        }
     }
     
     /// <remarks/>
@@ -837,7 +824,7 @@
         
         private TimeSerie pipingTimeSerieField;
         
-        private RWScenarioResult[] rWScenariosResultField;
+        private CalculationResultsLocationResultRWScenariosResult rWScenariosResultField;
         
         private CalculationResultsLocationResultRWSchematizationFactorsResult rWSchematizationFactorsResultField;
         
@@ -864,8 +851,7 @@
         }
         
         /// <remarks/>
-        [System.Xml.Serialization.XmlArrayItemAttribute(IsNullable=false)]
-        public RWScenarioResult[] RWScenariosResult {
+        public CalculationResultsLocationResultRWScenariosResult RWScenariosResult {
             get {
                 return this.rWScenariosResultField;
             }
@@ -1596,12 +1582,84 @@
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
+    [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)]
+    public partial class CalculationResultsLocationResultRWScenariosResult {
+        
+        private RWScenarioResult[] rWScenarioResultField;
+        
+        private CalculationResultsLocationResultRWScenariosResultCalculationResult calculationResultField;
+        
+        private bool calculationResultFieldSpecified;
+        
+        private double safetyFactorField;
+        
+        private bool safetyFactorFieldSpecified;
+        
+        /// <remarks/>
+        [System.Xml.Serialization.XmlElementAttribute("RWScenarioResult")]
+        public RWScenarioResult[] RWScenarioResult {
+            get {
+                return this.rWScenarioResultField;
+            }
+            set {
+                this.rWScenarioResultField = value;
+            }
+        }
+        
+        /// <remarks/>
+        [System.Xml.Serialization.XmlAttributeAttribute()]
+        public CalculationResultsLocationResultRWScenariosResultCalculationResult CalculationResult {
+            get {
+                return this.calculationResultField;
+            }
+            set {
+                this.calculationResultField = value;
+            }
+        }
+        
+        /// <remarks/>
+        [System.Xml.Serialization.XmlIgnoreAttribute()]
+        public bool CalculationResultSpecified {
+            get {
+                return this.calculationResultFieldSpecified;
+            }
+            set {
+                this.calculationResultFieldSpecified = value;
+            }
+        }
+        
+        /// <remarks/>
+        [System.Xml.Serialization.XmlAttributeAttribute()]
+        public double SafetyFactor {
+            get {
+                return this.safetyFactorField;
+            }
+            set {
+                this.safetyFactorField = value;
+            }
+        }
+        
+        /// <remarks/>
+        [System.Xml.Serialization.XmlIgnoreAttribute()]
+        public bool SafetyFactorSpecified {
+            get {
+                return this.safetyFactorFieldSpecified;
+            }
+            set {
+                this.safetyFactorFieldSpecified = value;
+            }
+        }
+    }
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")]
+    [System.SerializableAttribute()]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
     public partial class RWScenarioResult {
         
         private RWScenarioResultRWScenarioProfileResult[] rWScenarioProfileResultsField;
         
-        private RWResult rWResultField;
-        
         private RWScenarioResultLoadSituation loadSituationField;
         
         private bool loadSituationFieldSpecified;
@@ -1626,6 +1684,14 @@
         
         private bool scenarioTypeFieldSpecified;
         
+        private RWScenarioResultCalculationResult calculationResultField;
+        
+        private bool calculationResultFieldSpecified;
+        
+        private double safetyFactorField;
+        
+        private bool safetyFactorFieldSpecified;
+        
         /// <remarks/>
         [System.Xml.Serialization.XmlArrayItemAttribute("RWScenarioProfileResult", IsNullable=false)]
         public RWScenarioResultRWScenarioProfileResult[] RWScenarioProfileResults {
@@ -1638,16 +1704,6 @@
         }
         
         /// <remarks/>
-        public RWResult RWResult {
-            get {
-                return this.rWResultField;
-            }
-            set {
-                this.rWResultField = value;
-            }
-        }
-        
-        /// <remarks/>
         [System.Xml.Serialization.XmlAttributeAttribute()]
         public RWScenarioResultLoadSituation LoadSituation {
             get {
@@ -1778,6 +1834,50 @@
                 this.scenarioTypeFieldSpecified = value;
             }
         }
+        
+        /// <remarks/>
+        [System.Xml.Serialization.XmlAttributeAttribute()]
+        public RWScenarioResultCalculationResult CalculationResult {
+            get {
+                return this.calculationResultField;
+            }
+            set {
+                this.calculationResultField = value;
+            }
+        }
+        
+        /// <remarks/>
+        [System.Xml.Serialization.XmlIgnoreAttribute()]
+        public bool CalculationResultSpecified {
+            get {
+                return this.calculationResultFieldSpecified;
+            }
+            set {
+                this.calculationResultFieldSpecified = value;
+            }
+        }
+        
+        /// <remarks/>
+        [System.Xml.Serialization.XmlAttributeAttribute()]
+        public double SafetyFactor {
+            get {
+                return this.safetyFactorField;
+            }
+            set {
+                this.safetyFactorField = value;
+            }
+        }
+        
+        /// <remarks/>
+        [System.Xml.Serialization.XmlIgnoreAttribute()]
+        public bool SafetyFactorSpecified {
+            get {
+                return this.safetyFactorFieldSpecified;
+            }
+            set {
+                this.safetyFactorFieldSpecified = value;
+            }
+        }
     }
     
     /// <remarks/>
@@ -1790,18 +1890,8 @@
         
         private RWResult rWResultField;
         
-        private string locationniettochField;
-        
         private string locationNameField;
         
-        private double detrimentFactorinputField;
-        
-        private bool detrimentFactorinputFieldSpecified;
-        
-        private double soilProfileProbabilityinputField;
-        
-        private bool soilProfileProbabilityinputFieldSpecified;
-        
         private RWScenarioResultRWScenarioProfileResultLoadSituation loadSituationField;
         
         private bool loadSituationFieldSpecified;
@@ -1832,18 +1922,16 @@
         
         private string soilProfileNameField;
         
-        private string mStabParametersinputField;
+        private double soilProfileProbabilityField;
         
-        private string soilGeometryProbabilityniettochField;
+        private bool soilProfileProbabilityFieldSpecified;
         
         private RWScenarioResultRWScenarioProfileResultFailureMechanismType failureMechanismTypeField;
         
         private bool failureMechanismTypeFieldSpecified;
         
-        private string inputFileNameField;
+        private string baseFileNameField;
         
-        private string resultFileNameField;
-        
         /// <remarks/>
         public RWResult RWResult {
             get {
@@ -1855,17 +1943,6 @@
         }
         
         /// <remarks/>
-        [System.Xml.Serialization.XmlAttributeAttribute("Location-niettoch")]
-        public string Locationniettoch {
-            get {
-                return this.locationniettochField;
-            }
-            set {
-                this.locationniettochField = value;
-            }
-        }
-        
-        /// <remarks/>
         [System.Xml.Serialization.XmlAttributeAttribute()]
         public string LocationName {
             get {
@@ -1877,50 +1954,6 @@
         }
         
         /// <remarks/>
-        [System.Xml.Serialization.XmlAttributeAttribute("DetrimentFactor-input")]
-        public double DetrimentFactorinput {
-            get {
-                return this.detrimentFactorinputField;
-            }
-            set {
-                this.detrimentFactorinputField = value;
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlIgnoreAttribute()]
-        public bool DetrimentFactorinputSpecified {
-            get {
-                return this.detrimentFactorinputFieldSpecified;
-            }
-            set {
-                this.detrimentFactorinputFieldSpecified = value;
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlAttributeAttribute("SoilProfileProbability-input")]
-        public double SoilProfileProbabilityinput {
-            get {
-                return this.soilProfileProbabilityinputField;
-            }
-            set {
-                this.soilProfileProbabilityinputField = value;
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlIgnoreAttribute()]
-        public bool SoilProfileProbabilityinputSpecified {
-            get {
-                return this.soilProfileProbabilityinputFieldSpecified;
-            }
-            set {
-                this.soilProfileProbabilityinputFieldSpecified = value;
-            }
-        }
-        
-        /// <remarks/>
         [System.Xml.Serialization.XmlAttributeAttribute()]
         public RWScenarioResultRWScenarioProfileResultLoadSituation LoadSituation {
             get {
@@ -2086,24 +2119,24 @@
         }
         
         /// <remarks/>
-        [System.Xml.Serialization.XmlAttributeAttribute("MStabParameters-input")]
-        public string MStabParametersinput {
+        [System.Xml.Serialization.XmlAttributeAttribute()]
+        public double SoilProfileProbability {
             get {
-                return this.mStabParametersinputField;
+                return this.soilProfileProbabilityField;
             }
             set {
-                this.mStabParametersinputField = value;
+                this.soilProfileProbabilityField = value;
             }
         }
         
         /// <remarks/>
-        [System.Xml.Serialization.XmlAttributeAttribute("SoilGeometryProbability-niettoch")]
-        public string SoilGeometryProbabilityniettoch {
+        [System.Xml.Serialization.XmlIgnoreAttribute()]
+        public bool SoilProfileProbabilitySpecified {
             get {
-                return this.soilGeometryProbabilityniettochField;
+                return this.soilProfileProbabilityFieldSpecified;
             }
             set {
-                this.soilGeometryProbabilityniettochField = value;
+                this.soilProfileProbabilityFieldSpecified = value;
             }
         }
         
@@ -2131,25 +2164,14 @@
         
         /// <remarks/>
         [System.Xml.Serialization.XmlAttributeAttribute()]
-        public string InputFileName {
+        public string BaseFileName {
             get {
-                return this.inputFileNameField;
+                return this.baseFileNameField;
             }
             set {
-                this.inputFileNameField = value;
+                this.baseFileNameField = value;
             }
         }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlAttributeAttribute()]
-        public string ResultFileName {
-            get {
-                return this.resultFileNameField;
-            }
-            set {
-                this.resultFileNameField = value;
-            }
-        }
     }
     
     /// <remarks/>
@@ -2478,7 +2500,7 @@
         Piping,
         
         /// <remarks/>
-        HorizontalBalance        
+        HorizontalBalance,
     }
     
     /// <remarks/>
@@ -2613,6 +2635,74 @@
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")]
     [System.SerializableAttribute()]
+    [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)]
+    public enum RWScenarioResultCalculationResult {
+        
+        /// <remarks/>
+        NoRun,
+        
+        /// <remarks/>
+        Succeeded,
+        
+        /// <remarks/>
+        NoInput,
+        
+        /// <remarks/>
+        NoLicense,
+        
+        /// <remarks/>
+        UserAbort,
+        
+        /// <remarks/>
+        InvalidInputStructure,
+        
+        /// <remarks/>
+        InvalidInputData,
+        
+        /// <remarks/>
+        RunFailed,
+        
+        /// <remarks/>
+        UnexpectedError,
+    }
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")]
+    [System.SerializableAttribute()]
+    [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)]
+    public enum CalculationResultsLocationResultRWScenariosResultCalculationResult {
+        
+        /// <remarks/>
+        NoRun,
+        
+        /// <remarks/>
+        Succeeded,
+        
+        /// <remarks/>
+        NoInput,
+        
+        /// <remarks/>
+        NoLicense,
+        
+        /// <remarks/>
+        UserAbort,
+        
+        /// <remarks/>
+        InvalidInputStructure,
+        
+        /// <remarks/>
+        InvalidInputData,
+        
+        /// <remarks/>
+        RunFailed,
+        
+        /// <remarks/>
+        UnexpectedError,
+    }
+    
+    /// <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)]
@@ -2869,10 +2959,10 @@
     public enum CalculationResultsLocationResultRWSchematizationFactorsResultRWSchematizationFactorResultSchematizationType {
         
         /// <remarks/>
-        MacroStabiltyInnerSideWet,
+        MacroStabilityInnerSideWet,
         
         /// <remarks/>
-        MacroStabiltyInnerSideDry,
+        MacroStabilityInnerSideDry,
         
         /// <remarks/>
         PipingWet,
@@ -2881,7 +2971,7 @@
         PipingDry,
         
         /// <remarks/>
-        HorzontalBalanceDry,
+        HorizontalBalanceDry,
     }
     
     /// <remarks/>