Index: DamEngine/trunk/src/Deltares.DamEngine.Io/DamOutput.cs =================================================================== diff -u -r1578 -r1661 --- DamEngine/trunk/src/Deltares.DamEngine.Io/DamOutput.cs (.../DamOutput.cs) (revision 1578) +++ DamEngine/trunk/src/Deltares.DamEngine.Io/DamOutput.cs (.../DamOutput.cs) (revision 1661) @@ -59,10 +59,10 @@ private CalculationResults calculationResultsField; - private Message[] calculationMessagesField; - private TimeSerie[] operationalOutputTimeSeriesField; + private Message[] calculationMessagesField; + /// public CalculationResults CalculationResults { get { @@ -74,25 +74,25 @@ } /// - [System.Xml.Serialization.XmlElementAttribute("CalculationMessages")] - public Message[] CalculationMessages { + [System.Xml.Serialization.XmlArrayAttribute(IsNullable=true)] + [System.Xml.Serialization.XmlArrayItemAttribute(IsNullable=false)] + public TimeSerie[] OperationalOutputTimeSeries { get { - return this.calculationMessagesField; + return this.operationalOutputTimeSeriesField; } set { - this.calculationMessagesField = value; + this.operationalOutputTimeSeriesField = value; } } /// - [System.Xml.Serialization.XmlArrayAttribute(IsNullable=true)] [System.Xml.Serialization.XmlArrayItemAttribute(IsNullable=false)] - public TimeSerie[] OperationalOutputTimeSeries { + public Message[] CalculationMessages { get { - return this.operationalOutputTimeSeriesField; + return this.calculationMessagesField; } set { - this.operationalOutputTimeSeriesField = value; + this.calculationMessagesField = value; } } } @@ -579,6 +579,56 @@ [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class Message { + + private MessageMessageType messageTypeField; + + private string message1Field; + + /// + [System.Xml.Serialization.XmlAttributeAttribute()] + public MessageMessageType MessageType { + get { + return this.messageTypeField; + } + set { + this.messageTypeField = value; + } + } + + /// + [System.Xml.Serialization.XmlAttributeAttribute("Message")] + public string Message1 { + get { + return this.message1Field; + } + set { + this.message1Field = value; + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] + [System.SerializableAttribute()] + [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)] + public enum MessageMessageType { + + /// + Error, + + /// + Warning, + + /// + Info, + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] public partial class TimeSerie { private TimeSerieTimeStep timeStepField; @@ -1062,56 +1112,6 @@ [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] - public partial class Message { - - private MessageMessageType messageTypeField; - - private string message1Field; - - /// - [System.Xml.Serialization.XmlAttributeAttribute()] - public MessageMessageType MessageType { - get { - return this.messageTypeField; - } - set { - this.messageTypeField = value; - } - } - - /// - [System.Xml.Serialization.XmlAttributeAttribute("Message")] - public string Message1 { - get { - return this.message1Field; - } - set { - this.message1Field = value; - } - } - } - - /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] - [System.SerializableAttribute()] - [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)] - public enum MessageMessageType { - - /// - Error, - - /// - Warning, - - /// - Info, - } - - /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] - [System.SerializableAttribute()] - [System.Diagnostics.DebuggerStepThroughAttribute()] - [System.ComponentModel.DesignerCategoryAttribute("code")] public partial class SurfaceLine { private SurfaceLinePoint[] pointsField;