Index: dam engine/trunk/src/Deltares.DamEngine.Io/DamInput.cs =================================================================== diff -u -r488 -r496 --- dam engine/trunk/src/Deltares.DamEngine.Io/DamInput.cs (.../DamInput.cs) (revision 488) +++ dam engine/trunk/src/Deltares.DamEngine.Io/DamInput.cs (.../DamInput.cs) (revision 496) @@ -20,6 +20,7 @@ [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlRootAttribute(Namespace="", IsNullable=false)] public partial class Input { private Location[] locationsField; @@ -98,6 +99,8 @@ private LocationPipingProbabilisticParameters pipingProbabilisticParametersField; + private string surfaceLineNameField; + /// public LocationAssesmentRegionalOptions AssesmentRegionalOptions { get { @@ -177,6 +180,17 @@ this.pipingProbabilisticParametersField = value; } } + + /// + [System.Xml.Serialization.XmlAttributeAttribute()] + public string SurfaceLineName { + get { + return this.surfaceLineNameField; + } + set { + this.surfaceLineNameField = value; + } + } } /// @@ -300,7 +314,240 @@ [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class Soil { + + private string nameField; + + private double beddingAngleField; + + private bool beddingAngleFieldSpecified; + + private double diameterD70Field; + + private bool diameterD70FieldSpecified; + + private double permeabKxField; + + private bool permeabKxFieldSpecified; + + private double whitesConstantField; + + private bool whitesConstantFieldSpecified; + + private double diameterD90Field; + + private bool diameterD90FieldSpecified; + + /// + [System.Xml.Serialization.XmlAttributeAttribute()] + public string Name { + get { + return this.nameField; + } + set { + this.nameField = value; + } + } + + /// + [System.Xml.Serialization.XmlAttributeAttribute()] + public double BeddingAngle { + get { + return this.beddingAngleField; + } + set { + this.beddingAngleField = value; + } + } + + /// + [System.Xml.Serialization.XmlIgnoreAttribute()] + public bool BeddingAngleSpecified { + get { + return this.beddingAngleFieldSpecified; + } + set { + this.beddingAngleFieldSpecified = value; + } + } + + /// + [System.Xml.Serialization.XmlAttributeAttribute()] + public double DiameterD70 { + get { + return this.diameterD70Field; + } + set { + this.diameterD70Field = value; + } + } + + /// + [System.Xml.Serialization.XmlIgnoreAttribute()] + public bool DiameterD70Specified { + get { + return this.diameterD70FieldSpecified; + } + set { + this.diameterD70FieldSpecified = value; + } + } + + /// + [System.Xml.Serialization.XmlAttributeAttribute()] + public double PermeabKx { + get { + return this.permeabKxField; + } + set { + this.permeabKxField = value; + } + } + + /// + [System.Xml.Serialization.XmlIgnoreAttribute()] + public bool PermeabKxSpecified { + get { + return this.permeabKxFieldSpecified; + } + set { + this.permeabKxFieldSpecified = value; + } + } + + /// + [System.Xml.Serialization.XmlAttributeAttribute()] + public double WhitesConstant { + get { + return this.whitesConstantField; + } + set { + this.whitesConstantField = value; + } + } + + /// + [System.Xml.Serialization.XmlIgnoreAttribute()] + public bool WhitesConstantSpecified { + get { + return this.whitesConstantFieldSpecified; + } + set { + this.whitesConstantFieldSpecified = value; + } + } + + /// + [System.Xml.Serialization.XmlAttributeAttribute()] + public double DiameterD90 { + get { + return this.diameterD90Field; + } + set { + this.diameterD90Field = value; + } + } + + /// + [System.Xml.Serialization.XmlIgnoreAttribute()] + public bool DiameterD90Specified { + get { + return this.diameterD90FieldSpecified; + } + set { + this.diameterD90FieldSpecified = value; + } + } + } + + /// + [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; + + private string nameField; + + /// + [System.Xml.Serialization.XmlArrayItemAttribute("Point", IsNullable=false)] + public SurfaceLinePoint[] Points { + get { + return this.pointsField; + } + set { + this.pointsField = value; + } + } + + /// + [System.Xml.Serialization.XmlAttributeAttribute()] + public string Name { + get { + return this.nameField; + } + set { + this.nameField = value; + } + } + } + + /// + [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 SurfaceLinePoint { + + private double xField; + + private double zField; + + private int pointTypeField; + + /// + [System.Xml.Serialization.XmlAttributeAttribute()] + public double X { + get { + return this.xField; + } + set { + this.xField = value; + } + } + + /// + [System.Xml.Serialization.XmlAttributeAttribute()] + public double Z { + get { + return this.zField; + } + set { + this.zField = value; + } + } + + /// + [System.Xml.Serialization.XmlAttributeAttribute()] + public int PointType { + get { + return this.pointTypeField; + } + set { + this.pointTypeField = value; + } + } + } + + /// + [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; @@ -969,227 +1216,7 @@ /// [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; - - /// - [System.Xml.Serialization.XmlArrayItemAttribute("Point", IsNullable=false)] - public SurfaceLinePoint[] Points { - get { - return this.pointsField; - } - set { - this.pointsField = value; - } - } - } - - /// - [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 SurfaceLinePoint { - - private double xField; - - private double zField; - - private int pointTypeField; - - /// - [System.Xml.Serialization.XmlAttributeAttribute()] - public double X { - get { - return this.xField; - } - set { - this.xField = value; - } - } - - /// - [System.Xml.Serialization.XmlAttributeAttribute()] - public double Z { - get { - return this.zField; - } - set { - this.zField = value; - } - } - - /// - [System.Xml.Serialization.XmlAttributeAttribute()] - public int PointType { - get { - return this.pointTypeField; - } - set { - this.pointTypeField = value; - } - } - } - - /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] - [System.SerializableAttribute()] - [System.Diagnostics.DebuggerStepThroughAttribute()] - [System.ComponentModel.DesignerCategoryAttribute("code")] - public partial class Soil { - - private string nameField; - - private double beddingAngleField; - - private bool beddingAngleFieldSpecified; - - private double diameterD70Field; - - private bool diameterD70FieldSpecified; - - private double permeabKxField; - - private bool permeabKxFieldSpecified; - - private double whitesConstantField; - - private bool whitesConstantFieldSpecified; - - private double diameterD90Field; - - private bool diameterD90FieldSpecified; - - /// - [System.Xml.Serialization.XmlAttributeAttribute()] - public string Name { - get { - return this.nameField; - } - set { - this.nameField = value; - } - } - - /// - [System.Xml.Serialization.XmlAttributeAttribute()] - public double BeddingAngle { - get { - return this.beddingAngleField; - } - set { - this.beddingAngleField = value; - } - } - - /// - [System.Xml.Serialization.XmlIgnoreAttribute()] - public bool BeddingAngleSpecified { - get { - return this.beddingAngleFieldSpecified; - } - set { - this.beddingAngleFieldSpecified = value; - } - } - - /// - [System.Xml.Serialization.XmlAttributeAttribute()] - public double DiameterD70 { - get { - return this.diameterD70Field; - } - set { - this.diameterD70Field = value; - } - } - - /// - [System.Xml.Serialization.XmlIgnoreAttribute()] - public bool DiameterD70Specified { - get { - return this.diameterD70FieldSpecified; - } - set { - this.diameterD70FieldSpecified = value; - } - } - - /// - [System.Xml.Serialization.XmlAttributeAttribute()] - public double PermeabKx { - get { - return this.permeabKxField; - } - set { - this.permeabKxField = value; - } - } - - /// - [System.Xml.Serialization.XmlIgnoreAttribute()] - public bool PermeabKxSpecified { - get { - return this.permeabKxFieldSpecified; - } - set { - this.permeabKxFieldSpecified = value; - } - } - - /// - [System.Xml.Serialization.XmlAttributeAttribute()] - public double WhitesConstant { - get { - return this.whitesConstantField; - } - set { - this.whitesConstantField = value; - } - } - - /// - [System.Xml.Serialization.XmlIgnoreAttribute()] - public bool WhitesConstantSpecified { - get { - return this.whitesConstantFieldSpecified; - } - set { - this.whitesConstantFieldSpecified = value; - } - } - - /// - [System.Xml.Serialization.XmlAttributeAttribute()] - public double DiameterD90 { - get { - return this.diameterD90Field; - } - set { - this.diameterD90Field = value; - } - } - - /// - [System.Xml.Serialization.XmlIgnoreAttribute()] - public bool DiameterD90Specified { - get { - return this.diameterD90FieldSpecified; - } - set { - this.diameterD90FieldSpecified = value; - } - } - } - - /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] - [System.SerializableAttribute()] - [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)] public enum InputDamProjectType { ///