Index: dam engine/trunk/src/Deltares.DamEngine.Io/DamInput.cs =================================================================== diff -u -r669 -r689 --- dam engine/trunk/src/Deltares.DamEngine.Io/DamInput.cs (.../DamInput.cs) (revision 669) +++ dam engine/trunk/src/Deltares.DamEngine.Io/DamInput.cs (.../DamInput.cs) (revision 689) @@ -229,6 +229,8 @@ private LocationDesignScenario[] designScenariosField; + private LocationStabilityOptions stabilityOptionsField; + private string surfaceLineNameField; private string segmentNameField; @@ -317,6 +319,16 @@ } /// + public LocationStabilityOptions StabilityOptions { + get { + return this.stabilityOptionsField; + } + set { + this.stabilityOptionsField = value; + } + } + + /// [System.Xml.Serialization.XmlAttributeAttribute()] public string SurfaceLineName { get { @@ -2094,10 +2106,6 @@ private string descriptionField; - private string dikeEmbankmentMaterialField; - - private double forbiddenZoneFactorField; - private bool isUseOriginalPLLineAssignmentsField; private bool isUseOriginalPLLineAssignmentsFieldSpecified; @@ -2116,7 +2124,6 @@ public LocationGeneral() { this.damTypeField = LocationGeneralDamType.Primary; - this.forbiddenZoneFactorField = 1D; } /// @@ -2144,29 +2151,6 @@ /// [System.Xml.Serialization.XmlAttributeAttribute()] - public string DikeEmbankmentMaterial { - get { - return this.dikeEmbankmentMaterialField; - } - set { - this.dikeEmbankmentMaterialField = value; - } - } - - /// - [System.Xml.Serialization.XmlAttributeAttribute()] - [System.ComponentModel.DefaultValueAttribute(1D)] - public double ForbiddenZoneFactor { - get { - return this.forbiddenZoneFactorField; - } - set { - this.forbiddenZoneFactorField = value; - } - } - - /// - [System.Xml.Serialization.XmlAttributeAttribute()] public bool IsUseOriginalPLLineAssignments { get { return this.isUseOriginalPLLineAssignmentsField; @@ -2233,7 +2217,7 @@ /// [System.Xml.Serialization.XmlAttributeAttribute()] - public double headPL4 { + public double HeadPL4 { get { return this.headPL4Field; } @@ -2244,7 +2228,7 @@ /// [System.Xml.Serialization.XmlIgnoreAttribute()] - public bool headPL4Specified { + public bool HeadPL4Specified { get { return this.headPL4FieldSpecified; } @@ -2803,7 +2787,151 @@ /// [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 LocationStabilityOptions { + + private string mapForSoilgeometries2DField; + + private int zoneTypeField; + + private double forbiddenZoneFactorField; + + private double zoneAreaRestSlopeCrestWidthField; + + private bool zoneAreaRestSlopeCrestWidthFieldSpecified; + + private string dikeEmbankmentMaterialField; + + private double trafficLoadField; + + private bool trafficLoadFieldSpecified; + + private double minimumCircleDepthField; + + private bool minimumCircleDepthFieldSpecified; + + public LocationStabilityOptions() { + this.forbiddenZoneFactorField = 1D; + } + + /// + [System.Xml.Serialization.XmlAttributeAttribute()] + public string MapForSoilgeometries2D { + get { + return this.mapForSoilgeometries2DField; + } + set { + this.mapForSoilgeometries2DField = value; + } + } + + /// + [System.Xml.Serialization.XmlAttributeAttribute()] + public int ZoneType { + get { + return this.zoneTypeField; + } + set { + this.zoneTypeField = value; + } + } + + /// + [System.Xml.Serialization.XmlAttributeAttribute()] + [System.ComponentModel.DefaultValueAttribute(1D)] + public double ForbiddenZoneFactor { + get { + return this.forbiddenZoneFactorField; + } + set { + this.forbiddenZoneFactorField = value; + } + } + + /// + [System.Xml.Serialization.XmlAttributeAttribute()] + public double ZoneAreaRestSlopeCrestWidth { + get { + return this.zoneAreaRestSlopeCrestWidthField; + } + set { + this.zoneAreaRestSlopeCrestWidthField = value; + } + } + + /// + [System.Xml.Serialization.XmlIgnoreAttribute()] + public bool ZoneAreaRestSlopeCrestWidthSpecified { + get { + return this.zoneAreaRestSlopeCrestWidthFieldSpecified; + } + set { + this.zoneAreaRestSlopeCrestWidthFieldSpecified = value; + } + } + + /// + [System.Xml.Serialization.XmlAttributeAttribute()] + public string DikeEmbankmentMaterial { + get { + return this.dikeEmbankmentMaterialField; + } + set { + this.dikeEmbankmentMaterialField = value; + } + } + + /// + [System.Xml.Serialization.XmlAttributeAttribute()] + public double TrafficLoad { + get { + return this.trafficLoadField; + } + set { + this.trafficLoadField = value; + } + } + + /// + [System.Xml.Serialization.XmlIgnoreAttribute()] + public bool TrafficLoadSpecified { + get { + return this.trafficLoadFieldSpecified; + } + set { + this.trafficLoadFieldSpecified = value; + } + } + + /// + [System.Xml.Serialization.XmlAttributeAttribute()] + public double MinimumCircleDepth { + get { + return this.minimumCircleDepthField; + } + set { + this.minimumCircleDepthField = value; + } + } + + /// + [System.Xml.Serialization.XmlIgnoreAttribute()] + public bool MinimumCircleDepthSpecified { + get { + return this.minimumCircleDepthFieldSpecified; + } + set { + this.minimumCircleDepthFieldSpecified = value; + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] + [System.SerializableAttribute()] + [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)] public enum InputDamProjectType { /// Index: dam engine/trunk/Xsds Liquid/DamLocation.xsd =================================================================== diff -u -r685 -r689 --- dam engine/trunk/Xsds Liquid/DamLocation.xsd (.../DamLocation.xsd) (revision 685) +++ dam engine/trunk/Xsds Liquid/DamLocation.xsd (.../DamLocation.xsd) (revision 689) @@ -189,7 +189,7 @@ - + \ No newline at end of file