Index: dam engine/trunk/src/Deltares.DamEngine.Io/DamOutput.cs
===================================================================
diff -u -r418 -r445
--- dam engine/trunk/src/Deltares.DamEngine.Io/DamOutput.cs (.../DamOutput.cs) (revision 418)
+++ dam engine/trunk/src/Deltares.DamEngine.Io/DamOutput.cs (.../DamOutput.cs) (revision 445)
@@ -322,70 +322,168 @@
[System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)]
public partial class LocationWaternetOptions {
- private double dampingFactorPL3Field;
+ private LocationWaternetOptionsPhreaticLineCreationMethod phreaticLineCreationMethodField;
- private bool dampingFactorPL3FieldSpecified;
+ private double polderLevelField;
- private double dampingFactorPL4Field;
+ private double headPl2Field;
- private bool dampingFactorPL4FieldSpecified;
+ private bool headPl2FieldSpecified;
+ private double headPl3Field;
+
+ private bool headPl3FieldSpecified;
+
+ private double headPl4Field;
+
+ private bool headPl4FieldSpecified;
+
+ private double dampingFactorPL3Field;
+
+ private double dampingFactorPL4Field;
+
private double penetrationLengthField;
- private bool penetrationLengthFieldSpecified;
+ private double slopeDampingFactorField;
- private LocationWaternetOptionsPLLineCreationMethod pLLineCreationMethodField;
+ private double pl1BelowCrestRiversideField;
- public LocationWaternetOptions() {
- this.pLLineCreationMethodField = LocationWaternetOptionsPLLineCreationMethod.ExpertKnowledgeRRD;
+ private double pl1BelowCrestPoldersideField;
+
+ private double pl1BelowShoulderCrestPoldersideField;
+
+ private double pl1BelowToeDikePoldersideField;
+
+ private double pl1BelowCrestMiddleField;
+
+ private bool pl1BelowCrestMiddleFieldSpecified;
+
+ private double pl1FactorBelowShoulderCrestField;
+
+ private bool pl1FactorBelowShoulderCrestFieldSpecified;
+
+ private double dryPl1BelowCrestMiddleField;
+
+ private bool dryPl1BelowCrestMiddleFieldSpecified;
+
+ private double dryPl1FactorBelowShoulderCrestField;
+
+ private bool dryPl1FactorBelowShoulderCrestFieldSpecified;
+
+ private LocationWaternetOptionsIntrusionVerticalWaterPressure intrusionVerticalWaterPressureField;
+
+ ///
+ [System.Xml.Serialization.XmlAttributeAttribute()]
+ public LocationWaternetOptionsPhreaticLineCreationMethod PhreaticLineCreationMethod {
+ get {
+ return this.phreaticLineCreationMethodField;
+ }
+ set {
+ this.phreaticLineCreationMethodField = value;
+ }
}
///
[System.Xml.Serialization.XmlAttributeAttribute()]
- public double DampingFactorPL3 {
+ public double PolderLevel {
get {
- return this.dampingFactorPL3Field;
+ return this.polderLevelField;
}
set {
- this.dampingFactorPL3Field = value;
+ this.polderLevelField = value;
}
}
///
+ [System.Xml.Serialization.XmlAttributeAttribute()]
+ public double HeadPl2 {
+ get {
+ return this.headPl2Field;
+ }
+ set {
+ this.headPl2Field = value;
+ }
+ }
+
+ ///
[System.Xml.Serialization.XmlIgnoreAttribute()]
- public bool DampingFactorPL3Specified {
+ public bool HeadPl2Specified {
get {
- return this.dampingFactorPL3FieldSpecified;
+ return this.headPl2FieldSpecified;
}
set {
- this.dampingFactorPL3FieldSpecified = value;
+ this.headPl2FieldSpecified = value;
}
}
///
[System.Xml.Serialization.XmlAttributeAttribute()]
- public double DampingFactorPL4 {
+ public double HeadPl3 {
get {
- return this.dampingFactorPL4Field;
+ return this.headPl3Field;
}
set {
- this.dampingFactorPL4Field = value;
+ this.headPl3Field = value;
}
}
///
[System.Xml.Serialization.XmlIgnoreAttribute()]
- public bool DampingFactorPL4Specified {
+ public bool HeadPl3Specified {
get {
- return this.dampingFactorPL4FieldSpecified;
+ return this.headPl3FieldSpecified;
}
set {
- this.dampingFactorPL4FieldSpecified = value;
+ this.headPl3FieldSpecified = value;
}
}
///
[System.Xml.Serialization.XmlAttributeAttribute()]
+ public double HeadPl4 {
+ get {
+ return this.headPl4Field;
+ }
+ set {
+ this.headPl4Field = value;
+ }
+ }
+
+ ///
+ [System.Xml.Serialization.XmlIgnoreAttribute()]
+ public bool HeadPl4Specified {
+ get {
+ return this.headPl4FieldSpecified;
+ }
+ set {
+ this.headPl4FieldSpecified = value;
+ }
+ }
+
+ ///
+ [System.Xml.Serialization.XmlAttributeAttribute()]
+ public double DampingFactorPL3 {
+ get {
+ return this.dampingFactorPL3Field;
+ }
+ set {
+ this.dampingFactorPL3Field = value;
+ }
+ }
+
+ ///
+ [System.Xml.Serialization.XmlAttributeAttribute()]
+ public double DampingFactorPL4 {
+ get {
+ return this.dampingFactorPL4Field;
+ }
+ set {
+ this.dampingFactorPL4Field = value;
+ }
+ }
+
+ ///
+ [System.Xml.Serialization.XmlAttributeAttribute()]
public double PenetrationLength {
get {
return this.penetrationLengthField;
@@ -396,34 +494,165 @@
}
///
+ [System.Xml.Serialization.XmlAttributeAttribute()]
+ public double SlopeDampingFactor {
+ get {
+ return this.slopeDampingFactorField;
+ }
+ set {
+ this.slopeDampingFactorField = value;
+ }
+ }
+
+ ///
+ [System.Xml.Serialization.XmlAttributeAttribute()]
+ public double Pl1BelowCrestRiverside {
+ get {
+ return this.pl1BelowCrestRiversideField;
+ }
+ set {
+ this.pl1BelowCrestRiversideField = value;
+ }
+ }
+
+ ///
+ [System.Xml.Serialization.XmlAttributeAttribute()]
+ public double Pl1BelowCrestPolderside {
+ get {
+ return this.pl1BelowCrestPoldersideField;
+ }
+ set {
+ this.pl1BelowCrestPoldersideField = value;
+ }
+ }
+
+ ///
+ [System.Xml.Serialization.XmlAttributeAttribute()]
+ public double Pl1BelowShoulderCrestPolderside {
+ get {
+ return this.pl1BelowShoulderCrestPoldersideField;
+ }
+ set {
+ this.pl1BelowShoulderCrestPoldersideField = value;
+ }
+ }
+
+ ///
+ [System.Xml.Serialization.XmlAttributeAttribute()]
+ public double Pl1BelowToeDikePolderside {
+ get {
+ return this.pl1BelowToeDikePoldersideField;
+ }
+ set {
+ this.pl1BelowToeDikePoldersideField = value;
+ }
+ }
+
+ ///
+ [System.Xml.Serialization.XmlAttributeAttribute()]
+ public double Pl1BelowCrestMiddle {
+ get {
+ return this.pl1BelowCrestMiddleField;
+ }
+ set {
+ this.pl1BelowCrestMiddleField = value;
+ }
+ }
+
+ ///
[System.Xml.Serialization.XmlIgnoreAttribute()]
- public bool PenetrationLengthSpecified {
+ public bool Pl1BelowCrestMiddleSpecified {
get {
- return this.penetrationLengthFieldSpecified;
+ return this.pl1BelowCrestMiddleFieldSpecified;
}
set {
- this.penetrationLengthFieldSpecified = value;
+ this.pl1BelowCrestMiddleFieldSpecified = value;
}
}
///
[System.Xml.Serialization.XmlAttributeAttribute()]
- [System.ComponentModel.DefaultValueAttribute(LocationWaternetOptionsPLLineCreationMethod.ExpertKnowledgeRRD)]
- public LocationWaternetOptionsPLLineCreationMethod PLLineCreationMethod {
+ public double Pl1FactorBelowShoulderCrest {
get {
- return this.pLLineCreationMethodField;
+ return this.pl1FactorBelowShoulderCrestField;
}
set {
- this.pLLineCreationMethodField = value;
+ this.pl1FactorBelowShoulderCrestField = value;
}
}
+
+ ///
+ [System.Xml.Serialization.XmlIgnoreAttribute()]
+ public bool Pl1FactorBelowShoulderCrestSpecified {
+ get {
+ return this.pl1FactorBelowShoulderCrestFieldSpecified;
+ }
+ set {
+ this.pl1FactorBelowShoulderCrestFieldSpecified = value;
+ }
+ }
+
+ ///
+ [System.Xml.Serialization.XmlAttributeAttribute()]
+ public double DryPl1BelowCrestMiddle {
+ get {
+ return this.dryPl1BelowCrestMiddleField;
+ }
+ set {
+ this.dryPl1BelowCrestMiddleField = value;
+ }
+ }
+
+ ///
+ [System.Xml.Serialization.XmlIgnoreAttribute()]
+ public bool DryPl1BelowCrestMiddleSpecified {
+ get {
+ return this.dryPl1BelowCrestMiddleFieldSpecified;
+ }
+ set {
+ this.dryPl1BelowCrestMiddleFieldSpecified = value;
+ }
+ }
+
+ ///
+ [System.Xml.Serialization.XmlAttributeAttribute()]
+ public double DryPl1FactorBelowShoulderCrest {
+ get {
+ return this.dryPl1FactorBelowShoulderCrestField;
+ }
+ set {
+ this.dryPl1FactorBelowShoulderCrestField = value;
+ }
+ }
+
+ ///
+ [System.Xml.Serialization.XmlIgnoreAttribute()]
+ public bool DryPl1FactorBelowShoulderCrestSpecified {
+ get {
+ return this.dryPl1FactorBelowShoulderCrestFieldSpecified;
+ }
+ set {
+ this.dryPl1FactorBelowShoulderCrestFieldSpecified = value;
+ }
+ }
+
+ ///
+ [System.Xml.Serialization.XmlAttributeAttribute()]
+ public LocationWaternetOptionsIntrusionVerticalWaterPressure IntrusionVerticalWaterPressure {
+ get {
+ return this.intrusionVerticalWaterPressureField;
+ }
+ set {
+ this.intrusionVerticalWaterPressureField = value;
+ }
+ }
}
///
[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")]
[System.SerializableAttribute()]
[System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)]
- public enum LocationWaternetOptionsPLLineCreationMethod {
+ public enum LocationWaternetOptionsPhreaticLineCreationMethod {
///
ExpertKnowledgeRRD,
@@ -444,6 +673,28 @@
///
[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")]
[System.SerializableAttribute()]
+ [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)]
+ public enum LocationWaternetOptionsIntrusionVerticalWaterPressure {
+
+ ///
+ Standard,
+
+ ///
+ Linear,
+
+ ///
+ FullHydroStatic,
+
+ ///
+ HydroStatic,
+
+ ///
+ SemiTimeDependent,
+ }
+
+ ///
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")]
+ [System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
[System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)]