Index: DamEngine/trunk/src/Deltares.DamEngine.Io/DamOutput.cs
===================================================================
diff -u -r6119 -r6194
--- DamEngine/trunk/src/Deltares.DamEngine.Io/DamOutput.cs	(.../DamOutput.cs)	(revision 6119)
+++ DamEngine/trunk/src/Deltares.DamEngine.Io/DamOutput.cs	(.../DamOutput.cs)	(revision 6194)
@@ -63,7 +63,7 @@
         
         private OutputResultsOperationalLocationsStaticData operationalLocationsStaticDataField;
         
-        private TimeSerie[] operationalOutputTimeSeriesField;
+        private TimeSerieOutput[] operationalOutputTimeSeriesField;
         
         private Message[] calculationMessagesField;
         
@@ -101,8 +101,8 @@
         
         /// <remarks/>
         [System.Xml.Serialization.XmlArrayAttribute(IsNullable=true)]
-        [System.Xml.Serialization.XmlArrayItemAttribute(IsNullable=false)]
-        public TimeSerie[] OperationalOutputTimeSeries {
+        [System.Xml.Serialization.XmlArrayItemAttribute("TimeSerie", IsNullable=false)]
+        public TimeSerieOutput[] OperationalOutputTimeSeries {
             get {
                 return this.operationalOutputTimeSeriesField;
             }
@@ -1077,16 +1077,12 @@
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
-    public partial class TimeSerie {
+    public partial class TimeSerieOutput {
         
-        private TimeSerieTimeStep timeStepField;
+        private TimeSerieOutputEntries entriesField;
         
-        private TimeSerieEntries entriesField;
-        
         private System.DateTime forecastDateTimeField;
         
-        private string typeField;
-        
         private string locationIdField;
         
         private string parameterIdField;
@@ -1097,39 +1093,17 @@
         
         private double missValField;
         
-        private string longNameField;
-        
-        private string stationNameField;
-        
         private string unitsField;
         
-        private string sourceOrganisationField;
-        
-        private string sourceSystemField;
-        
-        private string fileDescriptionField;
-        
-        private string regionField;
-        
         private string commentField;
         
         private System.DateTime creationDateTimeField;
         
         private bool creationDateTimeFieldSpecified;
         
         /// <remarks/>
-        public TimeSerieTimeStep TimeStep {
+        public TimeSerieOutputEntries Entries {
             get {
-                return this.timeStepField;
-            }
-            set {
-                this.timeStepField = value;
-            }
-        }
-        
-        /// <remarks/>
-        public TimeSerieEntries Entries {
-            get {
                 return this.entriesField;
             }
             set {
@@ -1150,17 +1124,6 @@
         
         /// <remarks/>
         [System.Xml.Serialization.XmlAttributeAttribute()]
-        public string Type {
-            get {
-                return this.typeField;
-            }
-            set {
-                this.typeField = value;
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlAttributeAttribute()]
         public string LocationId {
             get {
                 return this.locationIdField;
@@ -1216,28 +1179,6 @@
         
         /// <remarks/>
         [System.Xml.Serialization.XmlAttributeAttribute()]
-        public string LongName {
-            get {
-                return this.longNameField;
-            }
-            set {
-                this.longNameField = value;
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlAttributeAttribute()]
-        public string StationName {
-            get {
-                return this.stationNameField;
-            }
-            set {
-                this.stationNameField = value;
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlAttributeAttribute()]
         public string Units {
             get {
                 return this.unitsField;
@@ -1249,50 +1190,6 @@
         
         /// <remarks/>
         [System.Xml.Serialization.XmlAttributeAttribute()]
-        public string SourceOrganisation {
-            get {
-                return this.sourceOrganisationField;
-            }
-            set {
-                this.sourceOrganisationField = value;
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlAttributeAttribute()]
-        public string SourceSystem {
-            get {
-                return this.sourceSystemField;
-            }
-            set {
-                this.sourceSystemField = value;
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlAttributeAttribute()]
-        public string FileDescription {
-            get {
-                return this.fileDescriptionField;
-            }
-            set {
-                this.fileDescriptionField = value;
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlAttributeAttribute()]
-        public string Region {
-            get {
-                return this.regionField;
-            }
-            set {
-                this.regionField = value;
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlAttributeAttribute()]
         public string Comment {
             get {
                 return this.commentField;
@@ -1331,72 +1228,20 @@
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
     [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)]
-    public partial class TimeSerieTimeStep {
+    public partial class TimeSerieOutputEntries {
         
-        private uint dividerField;
+        private TimeSerieOutputEntriesTimeSerieEntryOutput[] timeSerieEntryOutputField;
         
-        private uint multiplierField;
-        
-        private bool dividerSpecified1Field;
-        
-        private bool multiplierSpecified1Field;
-        
-        private uint timeStepUnitField;
-        
         /// <remarks/>
-        [System.Xml.Serialization.XmlAttributeAttribute()]
-        public uint Divider {
+        [System.Xml.Serialization.XmlElementAttribute("TimeSerieEntryOutput")]
+        public TimeSerieOutputEntriesTimeSerieEntryOutput[] TimeSerieEntryOutput {
             get {
-                return this.dividerField;
+                return this.timeSerieEntryOutputField;
             }
             set {
-                this.dividerField = value;
+                this.timeSerieEntryOutputField = value;
             }
         }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlAttributeAttribute()]
-        public uint Multiplier {
-            get {
-                return this.multiplierField;
-            }
-            set {
-                this.multiplierField = value;
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlAttributeAttribute("DividerSpecified")]
-        public bool DividerSpecified1 {
-            get {
-                return this.dividerSpecified1Field;
-            }
-            set {
-                this.dividerSpecified1Field = value;
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlAttributeAttribute("MultiplierSpecified")]
-        public bool MultiplierSpecified1 {
-            get {
-                return this.multiplierSpecified1Field;
-            }
-            set {
-                this.multiplierSpecified1Field = value;
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlAttributeAttribute()]
-        public uint TimeStepUnit {
-            get {
-                return this.timeStepUnitField;
-            }
-            set {
-                this.timeStepUnitField = value;
-            }
-        }
     }
     
     /// <remarks/>
@@ -1405,30 +1250,8 @@
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
     [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)]
-    public partial class TimeSerieEntries {
+    public partial class TimeSerieOutputEntriesTimeSerieEntryOutput {
         
-        private TimeSerieEntriesTimeSerieEntry[] timeSerieEntryField;
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute("TimeSerieEntry")]
-        public TimeSerieEntriesTimeSerieEntry[] TimeSerieEntry {
-            get {
-                return this.timeSerieEntryField;
-            }
-            set {
-                this.timeSerieEntryField = value;
-            }
-        }
-    }
-    
-    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")]
-    [System.SerializableAttribute()]
-    [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ComponentModel.DesignerCategoryAttribute("code")]
-    [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)]
-    public partial class TimeSerieEntriesTimeSerieEntry {
-        
         private WaternetType waternetField;
         
         private BishopCalculationGridType bishopCalculationGridField;