Index: dam engine/trunk/src/Deltares.DamEngine.Io/DamInput.cs =================================================================== diff -u -r689 -r711 --- dam engine/trunk/src/Deltares.DamEngine.Io/DamInput.cs (.../DamInput.cs) (revision 689) +++ dam engine/trunk/src/Deltares.DamEngine.Io/DamInput.cs (.../DamInput.cs) (revision 711) @@ -35,6 +35,8 @@ private SoilProfile2D[] soilProfiles2DField; + private StabilityParameters stabilityParametersField; + private InputDamProjectType damProjectTypeField; private int failureMechanismSystemTypeField; @@ -118,6 +120,16 @@ } /// + public StabilityParameters StabilityParameters { + get { + return this.stabilityParametersField; + } + set { + this.stabilityParametersField = value; + } + } + + /// [System.Xml.Serialization.XmlAttributeAttribute()] public InputDamProjectType DamProjectType { get { @@ -237,6 +249,8 @@ private string nameField; + private string dikeEmbankmentMaterialField; + /// public LocationAssesmentRegionalOptions AssesmentRegionalOptions { get { @@ -360,6 +374,17 @@ this.nameField = value; } } + + /// + [System.Xml.Serialization.XmlAttributeAttribute()] + public string DikeEmbankmentMaterial { + get { + return this.dikeEmbankmentMaterialField; + } + set { + this.dikeEmbankmentMaterialField = value; + } + } } /// @@ -483,6 +508,404 @@ [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class StabilityParameters { + + private int searchMethodField; + + private int determinationGridField; + + private int definitionTangentLinesField; + + private bool definitionTangentLinesFieldSpecified; + + private double distanceTangentLinesField; + + private bool distanceTangentLinesFieldSpecified; + + private int bishopNumberOfVerticalPointsGridField; + + private bool bishopNumberOfVerticalPointsGridFieldSpecified; + + private double bishopDistanceOfVerticalPointsGridField; + + private bool bishopDistanceOfVerticalPointsGridFieldSpecified; + + private int bishopNumberOfHorizontalPointsGridField; + + private bool bishopNumberOfHorizontalPointsGridFieldSpecified; + + private double bishopDistanceOfHorizontalPointsGridField; + + private bool bishopDistanceOfHorizontalPointsGridFieldSpecified; + + private int upliftVanNumberOfVerticalPointsGridLeftField; + + private bool upliftVanNumberOfVerticalPointsGridLeftFieldSpecified; + + private double upliftVanDistanceOfVerticalPointsGridLeftField; + + private bool upliftVanDistanceOfVerticalPointsGridLeftFieldSpecified; + + private int upliftVanNumberOfHorizontalPointsGridLeftField; + + private bool upliftVanNumberOfHorizontalPointsGridLeftFieldSpecified; + + private double upliftVanDistanceOfHorizontalPointsGridLeftField; + + private bool upliftVanDistanceOfHorizontalPointsGridLeftFieldSpecified; + + private int upliftVanNumberOfVerticalPointsGridRightField; + + private bool upliftVanNumberOfVerticalPointsGridRightFieldSpecified; + + private double upliftVanDistanceOfVerticalPointsGridRightField; + + private bool upliftVanDistanceOfVerticalPointsGridRightFieldSpecified; + + private int upliftVanNumberOfHorizontalPointsGridRightField; + + private bool upliftVanNumberOfHorizontalPointsGridRightFieldSpecified; + + private double upliftVanDistanceOfHorizontalPointsGridRightField; + + private bool upliftVanDistanceOfHorizontalPointsGridRightFieldSpecified; + + /// + [System.Xml.Serialization.XmlAttributeAttribute()] + public int SearchMethod { + get { + return this.searchMethodField; + } + set { + this.searchMethodField = value; + } + } + + /// + [System.Xml.Serialization.XmlAttributeAttribute()] + public int DeterminationGrid { + get { + return this.determinationGridField; + } + set { + this.determinationGridField = value; + } + } + + /// + [System.Xml.Serialization.XmlAttributeAttribute()] + public int DefinitionTangentLines { + get { + return this.definitionTangentLinesField; + } + set { + this.definitionTangentLinesField = value; + } + } + + /// + [System.Xml.Serialization.XmlIgnoreAttribute()] + public bool DefinitionTangentLinesSpecified { + get { + return this.definitionTangentLinesFieldSpecified; + } + set { + this.definitionTangentLinesFieldSpecified = value; + } + } + + /// + [System.Xml.Serialization.XmlAttributeAttribute()] + public double DistanceTangentLines { + get { + return this.distanceTangentLinesField; + } + set { + this.distanceTangentLinesField = value; + } + } + + /// + [System.Xml.Serialization.XmlIgnoreAttribute()] + public bool DistanceTangentLinesSpecified { + get { + return this.distanceTangentLinesFieldSpecified; + } + set { + this.distanceTangentLinesFieldSpecified = value; + } + } + + /// + [System.Xml.Serialization.XmlAttributeAttribute()] + public int BishopNumberOfVerticalPointsGrid { + get { + return this.bishopNumberOfVerticalPointsGridField; + } + set { + this.bishopNumberOfVerticalPointsGridField = value; + } + } + + /// + [System.Xml.Serialization.XmlIgnoreAttribute()] + public bool BishopNumberOfVerticalPointsGridSpecified { + get { + return this.bishopNumberOfVerticalPointsGridFieldSpecified; + } + set { + this.bishopNumberOfVerticalPointsGridFieldSpecified = value; + } + } + + /// + [System.Xml.Serialization.XmlAttributeAttribute()] + public double BishopDistanceOfVerticalPointsGrid { + get { + return this.bishopDistanceOfVerticalPointsGridField; + } + set { + this.bishopDistanceOfVerticalPointsGridField = value; + } + } + + /// + [System.Xml.Serialization.XmlIgnoreAttribute()] + public bool BishopDistanceOfVerticalPointsGridSpecified { + get { + return this.bishopDistanceOfVerticalPointsGridFieldSpecified; + } + set { + this.bishopDistanceOfVerticalPointsGridFieldSpecified = value; + } + } + + /// + [System.Xml.Serialization.XmlAttributeAttribute()] + public int BishopNumberOfHorizontalPointsGrid { + get { + return this.bishopNumberOfHorizontalPointsGridField; + } + set { + this.bishopNumberOfHorizontalPointsGridField = value; + } + } + + /// + [System.Xml.Serialization.XmlIgnoreAttribute()] + public bool BishopNumberOfHorizontalPointsGridSpecified { + get { + return this.bishopNumberOfHorizontalPointsGridFieldSpecified; + } + set { + this.bishopNumberOfHorizontalPointsGridFieldSpecified = value; + } + } + + /// + [System.Xml.Serialization.XmlAttributeAttribute()] + public double BishopDistanceOfHorizontalPointsGrid { + get { + return this.bishopDistanceOfHorizontalPointsGridField; + } + set { + this.bishopDistanceOfHorizontalPointsGridField = value; + } + } + + /// + [System.Xml.Serialization.XmlIgnoreAttribute()] + public bool BishopDistanceOfHorizontalPointsGridSpecified { + get { + return this.bishopDistanceOfHorizontalPointsGridFieldSpecified; + } + set { + this.bishopDistanceOfHorizontalPointsGridFieldSpecified = value; + } + } + + /// + [System.Xml.Serialization.XmlAttributeAttribute()] + public int UpliftVanNumberOfVerticalPointsGridLeft { + get { + return this.upliftVanNumberOfVerticalPointsGridLeftField; + } + set { + this.upliftVanNumberOfVerticalPointsGridLeftField = value; + } + } + + /// + [System.Xml.Serialization.XmlIgnoreAttribute()] + public bool UpliftVanNumberOfVerticalPointsGridLeftSpecified { + get { + return this.upliftVanNumberOfVerticalPointsGridLeftFieldSpecified; + } + set { + this.upliftVanNumberOfVerticalPointsGridLeftFieldSpecified = value; + } + } + + /// + [System.Xml.Serialization.XmlAttributeAttribute()] + public double UpliftVanDistanceOfVerticalPointsGridLeft { + get { + return this.upliftVanDistanceOfVerticalPointsGridLeftField; + } + set { + this.upliftVanDistanceOfVerticalPointsGridLeftField = value; + } + } + + /// + [System.Xml.Serialization.XmlIgnoreAttribute()] + public bool UpliftVanDistanceOfVerticalPointsGridLeftSpecified { + get { + return this.upliftVanDistanceOfVerticalPointsGridLeftFieldSpecified; + } + set { + this.upliftVanDistanceOfVerticalPointsGridLeftFieldSpecified = value; + } + } + + /// + [System.Xml.Serialization.XmlAttributeAttribute()] + public int UpliftVanNumberOfHorizontalPointsGridLeft { + get { + return this.upliftVanNumberOfHorizontalPointsGridLeftField; + } + set { + this.upliftVanNumberOfHorizontalPointsGridLeftField = value; + } + } + + /// + [System.Xml.Serialization.XmlIgnoreAttribute()] + public bool UpliftVanNumberOfHorizontalPointsGridLeftSpecified { + get { + return this.upliftVanNumberOfHorizontalPointsGridLeftFieldSpecified; + } + set { + this.upliftVanNumberOfHorizontalPointsGridLeftFieldSpecified = value; + } + } + + /// + [System.Xml.Serialization.XmlAttributeAttribute()] + public double UpliftVanDistanceOfHorizontalPointsGridLeft { + get { + return this.upliftVanDistanceOfHorizontalPointsGridLeftField; + } + set { + this.upliftVanDistanceOfHorizontalPointsGridLeftField = value; + } + } + + /// + [System.Xml.Serialization.XmlIgnoreAttribute()] + public bool UpliftVanDistanceOfHorizontalPointsGridLeftSpecified { + get { + return this.upliftVanDistanceOfHorizontalPointsGridLeftFieldSpecified; + } + set { + this.upliftVanDistanceOfHorizontalPointsGridLeftFieldSpecified = value; + } + } + + /// + [System.Xml.Serialization.XmlAttributeAttribute()] + public int UpliftVanNumberOfVerticalPointsGridRight { + get { + return this.upliftVanNumberOfVerticalPointsGridRightField; + } + set { + this.upliftVanNumberOfVerticalPointsGridRightField = value; + } + } + + /// + [System.Xml.Serialization.XmlIgnoreAttribute()] + public bool UpliftVanNumberOfVerticalPointsGridRightSpecified { + get { + return this.upliftVanNumberOfVerticalPointsGridRightFieldSpecified; + } + set { + this.upliftVanNumberOfVerticalPointsGridRightFieldSpecified = value; + } + } + + /// + [System.Xml.Serialization.XmlAttributeAttribute()] + public double UpliftVanDistanceOfVerticalPointsGridRight { + get { + return this.upliftVanDistanceOfVerticalPointsGridRightField; + } + set { + this.upliftVanDistanceOfVerticalPointsGridRightField = value; + } + } + + /// + [System.Xml.Serialization.XmlIgnoreAttribute()] + public bool UpliftVanDistanceOfVerticalPointsGridRightSpecified { + get { + return this.upliftVanDistanceOfVerticalPointsGridRightFieldSpecified; + } + set { + this.upliftVanDistanceOfVerticalPointsGridRightFieldSpecified = value; + } + } + + /// + [System.Xml.Serialization.XmlAttributeAttribute()] + public int UpliftVanNumberOfHorizontalPointsGridRight { + get { + return this.upliftVanNumberOfHorizontalPointsGridRightField; + } + set { + this.upliftVanNumberOfHorizontalPointsGridRightField = value; + } + } + + /// + [System.Xml.Serialization.XmlIgnoreAttribute()] + public bool UpliftVanNumberOfHorizontalPointsGridRightSpecified { + get { + return this.upliftVanNumberOfHorizontalPointsGridRightFieldSpecified; + } + set { + this.upliftVanNumberOfHorizontalPointsGridRightFieldSpecified = value; + } + } + + /// + [System.Xml.Serialization.XmlAttributeAttribute()] + public double UpliftVanDistanceOfHorizontalPointsGridRight { + get { + return this.upliftVanDistanceOfHorizontalPointsGridRightField; + } + set { + this.upliftVanDistanceOfHorizontalPointsGridRightField = value; + } + } + + /// + [System.Xml.Serialization.XmlIgnoreAttribute()] + public bool UpliftVanDistanceOfHorizontalPointsGridRightSpecified { + get { + return this.upliftVanDistanceOfHorizontalPointsGridRightFieldSpecified; + } + set { + this.upliftVanDistanceOfHorizontalPointsGridRightFieldSpecified = value; + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] public partial class SoilProfile2D { private SoilProfile2DLayer2D[] layers2DField; @@ -2798,12 +3221,12 @@ private double forbiddenZoneFactorField; + private bool forbiddenZoneFactorFieldSpecified; + private double zoneAreaRestSlopeCrestWidthField; private bool zoneAreaRestSlopeCrestWidthFieldSpecified; - private string dikeEmbankmentMaterialField; - private double trafficLoadField; private bool trafficLoadFieldSpecified; @@ -2812,10 +3235,6 @@ private bool minimumCircleDepthFieldSpecified; - public LocationStabilityOptions() { - this.forbiddenZoneFactorField = 1D; - } - /// [System.Xml.Serialization.XmlAttributeAttribute()] public string MapForSoilgeometries2D { @@ -2840,7 +3259,6 @@ /// [System.Xml.Serialization.XmlAttributeAttribute()] - [System.ComponentModel.DefaultValueAttribute(1D)] public double ForbiddenZoneFactor { get { return this.forbiddenZoneFactorField; @@ -2851,6 +3269,17 @@ } /// + [System.Xml.Serialization.XmlIgnoreAttribute()] + public bool ForbiddenZoneFactorSpecified { + get { + return this.forbiddenZoneFactorFieldSpecified; + } + set { + this.forbiddenZoneFactorFieldSpecified = value; + } + } + + /// [System.Xml.Serialization.XmlAttributeAttribute()] public double ZoneAreaRestSlopeCrestWidth { get { @@ -2874,17 +3303,6 @@ /// [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;