Index: DamEngine/trunk/src/Deltares.DamEngine.Interface/FillXmlInputFromDam.cs
===================================================================
diff -u -r1188 -r1265
--- DamEngine/trunk/src/Deltares.DamEngine.Interface/FillXmlInputFromDam.cs (.../FillXmlInputFromDam.cs) (revision 1188)
+++ DamEngine/trunk/src/Deltares.DamEngine.Interface/FillXmlInputFromDam.cs (.../FillXmlInputFromDam.cs) (revision 1265)
@@ -320,6 +320,14 @@
waternetOptions.Pl1BelowCrestPolderside = location.PlLineOffsetBelowDikeTopAtPolder;
waternetOptions.Pl1BelowShoulderCrestPolderside = location.PlLineOffsetBelowShoulderBaseInside;
waternetOptions.Pl1BelowToeDikePolderside = location.PlLineOffsetBelowDikeToeAtPolder;
+ waternetOptions.DryPl1BelowDikeTopAtRiver = location.PlLineOffsetDryBelowDikeTopAtRiver;
+ waternetOptions.DryPl1BelowDikeTopAtRiverSpecified = true;
+ waternetOptions.DryPl1DryBelowDikeTopAtPolder = location.PlLineOffsetDryBelowDikeTopAtPolder;
+ waternetOptions.DryPl1DryBelowDikeTopAtPolderSpecified = true;
+ waternetOptions.DryPl1BelowShoulderBaseInside = location.PlLineOffsetDryBelowShoulderBaseInside;
+ waternetOptions.DryPl1BelowShoulderBaseInsideSpecified = true;
+ waternetOptions.DryPl1DryBelowDikeToeAtPolder = location.PlLineOffsetDryBelowDikeToeAtPolder;
+ waternetOptions.DryPl1DryBelowDikeToeAtPolderSpecified = true;
inputLocation.WaternetOptions = waternetOptions;
// Regional settings
Index: DamEngine/trunk/src/Deltares.DamEngine.Io/DamInput.cs
===================================================================
diff -u -r1192 -r1265
--- DamEngine/trunk/src/Deltares.DamEngine.Io/DamInput.cs (.../DamInput.cs) (revision 1192)
+++ DamEngine/trunk/src/Deltares.DamEngine.Io/DamInput.cs (.../DamInput.cs) (revision 1265)
@@ -2581,6 +2581,22 @@
private bool dryPl1FactorBelowShoulderCrestFieldSpecified;
+ private double dryPl1BelowDikeTopAtRiverField;
+
+ private bool dryPl1BelowDikeTopAtRiverFieldSpecified;
+
+ private double dryPl1DryBelowDikeTopAtPolderField;
+
+ private bool dryPl1DryBelowDikeTopAtPolderFieldSpecified;
+
+ private double dryPl1BelowShoulderBaseInsideField;
+
+ private bool dryPl1BelowShoulderBaseInsideFieldSpecified;
+
+ private double dryPl1DryBelowDikeToeAtPolderField;
+
+ private bool dryPl1DryBelowDikeToeAtPolderFieldSpecified;
+
private LocationWaternetOptionsIntrusionVerticalWaterPressure intrusionVerticalWaterPressureField;
///
@@ -2849,6 +2865,94 @@
///
[System.Xml.Serialization.XmlAttributeAttribute()]
+ public double DryPl1BelowDikeTopAtRiver {
+ get {
+ return this.dryPl1BelowDikeTopAtRiverField;
+ }
+ set {
+ this.dryPl1BelowDikeTopAtRiverField = value;
+ }
+ }
+
+ ///
+ [System.Xml.Serialization.XmlIgnoreAttribute()]
+ public bool DryPl1BelowDikeTopAtRiverSpecified {
+ get {
+ return this.dryPl1BelowDikeTopAtRiverFieldSpecified;
+ }
+ set {
+ this.dryPl1BelowDikeTopAtRiverFieldSpecified = value;
+ }
+ }
+
+ ///
+ [System.Xml.Serialization.XmlAttributeAttribute()]
+ public double DryPl1DryBelowDikeTopAtPolder {
+ get {
+ return this.dryPl1DryBelowDikeTopAtPolderField;
+ }
+ set {
+ this.dryPl1DryBelowDikeTopAtPolderField = value;
+ }
+ }
+
+ ///
+ [System.Xml.Serialization.XmlIgnoreAttribute()]
+ public bool DryPl1DryBelowDikeTopAtPolderSpecified {
+ get {
+ return this.dryPl1DryBelowDikeTopAtPolderFieldSpecified;
+ }
+ set {
+ this.dryPl1DryBelowDikeTopAtPolderFieldSpecified = value;
+ }
+ }
+
+ ///
+ [System.Xml.Serialization.XmlAttributeAttribute()]
+ public double DryPl1BelowShoulderBaseInside {
+ get {
+ return this.dryPl1BelowShoulderBaseInsideField;
+ }
+ set {
+ this.dryPl1BelowShoulderBaseInsideField = value;
+ }
+ }
+
+ ///
+ [System.Xml.Serialization.XmlIgnoreAttribute()]
+ public bool DryPl1BelowShoulderBaseInsideSpecified {
+ get {
+ return this.dryPl1BelowShoulderBaseInsideFieldSpecified;
+ }
+ set {
+ this.dryPl1BelowShoulderBaseInsideFieldSpecified = value;
+ }
+ }
+
+ ///
+ [System.Xml.Serialization.XmlAttributeAttribute()]
+ public double DryPl1DryBelowDikeToeAtPolder {
+ get {
+ return this.dryPl1DryBelowDikeToeAtPolderField;
+ }
+ set {
+ this.dryPl1DryBelowDikeToeAtPolderField = value;
+ }
+ }
+
+ ///
+ [System.Xml.Serialization.XmlIgnoreAttribute()]
+ public bool DryPl1DryBelowDikeToeAtPolderSpecified {
+ get {
+ return this.dryPl1DryBelowDikeToeAtPolderFieldSpecified;
+ }
+ set {
+ this.dryPl1DryBelowDikeToeAtPolderFieldSpecified = value;
+ }
+ }
+
+ ///
+ [System.Xml.Serialization.XmlAttributeAttribute()]
public LocationWaternetOptionsIntrusionVerticalWaterPressure IntrusionVerticalWaterPressure {
get {
return this.intrusionVerticalWaterPressureField;
Index: DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/FillDamFromXmlInputTests.cs
===================================================================
diff -u -r1188 -r1265
--- DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/FillDamFromXmlInputTests.cs (.../FillDamFromXmlInputTests.cs) (revision 1188)
+++ DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/FillDamFromXmlInputTests.cs (.../FillDamFromXmlInputTests.cs) (revision 1265)
@@ -259,17 +259,21 @@
location.PlLineOffsetBelowDikeTopAtPolder = 1.0 * i + 0.21;
location.PlLineOffsetBelowShoulderBaseInside = 1.0 * i + 0.22;
location.PlLineOffsetBelowDikeToeAtPolder = 1.0 * i + 0.23;
- location.HeadPl2 = 1.0 * i + 0.24;
- location.HeadPl3 = 1.0 * i + 0.25;
- location.HeadPl4 = 1.0 * i + 0.26;
+ location.PlLineOffsetDryBelowDikeTopAtRiver = 1.0 * i + 0.24;
+ location.PlLineOffsetDryBelowDikeTopAtPolder = 1.0 * i + 0.25;
+ location.PlLineOffsetDryBelowShoulderBaseInside = 1.0 * i + 0.26;
+ location.PlLineOffsetDryBelowDikeToeAtPolder = 1.0 * i + 0.27;
+ location.HeadPl2 = 1.0 * i + 0.28;
+ location.HeadPl3 = 1.0 * i + 0.29;
+ location.HeadPl4 = 1.0 * i + 0.30;
// Used for regional assessment
- location.DikeTableHeight = 1.0 * i + 0.27;
- location.BoezemLevelHbp = 1.0 * i + 0.28;
- location.BoezemLevelLbp = 1.0 * i + 0.29;
- location.BoezemLevelTp = 1.0 * i + 0.30;
- location.RwBankProtectionBottomLevel = 1.0 * i + 0.31;
- location.DredgingDepth = 1.0 * i + 0.32;
- location.DetrimentFactor = 1.0 * i + 0.33;
+ location.DikeTableHeight = 1.0 * i + 0.31;
+ location.BoezemLevelHbp = 1.0 * i + 0.32;
+ location.BoezemLevelLbp = 1.0 * i + 0.33;
+ location.BoezemLevelTp = 1.0 * i + 0.34;
+ location.RwBankProtectionBottomLevel = 1.0 * i + 0.35;
+ location.DredgingDepth = 1.0 * i + 0.36;
+ location.DetrimentFactor = 1.0 * i + 0.37;
location.DikeMaterialType = SoilType.Loam;
location.SurfaceLine = dike.SurfaceLines2[i];
Index: DamEngine/trunk/xsd/DamLocation.xsd
===================================================================
diff -u -r1183 -r1265
--- DamEngine/trunk/xsd/DamLocation.xsd (.../DamLocation.xsd) (revision 1183)
+++ DamEngine/trunk/xsd/DamLocation.xsd (.../DamLocation.xsd) (revision 1265)
@@ -86,6 +86,10 @@
+
+
+
+
Index: DamEngine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlInput.cs
===================================================================
diff -u -r1188 -r1265
--- DamEngine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlInput.cs (.../FillDamFromXmlInput.cs) (revision 1188)
+++ DamEngine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlInput.cs (.../FillDamFromXmlInput.cs) (revision 1265)
@@ -361,6 +361,14 @@
location.PlLineOffsetBelowDikeTopAtPolder = waternetOptions.Pl1BelowCrestPolderside;
location.PlLineOffsetBelowShoulderBaseInside = waternetOptions.Pl1BelowShoulderCrestPolderside;
location.PlLineOffsetBelowDikeToeAtPolder = waternetOptions.Pl1BelowToeDikePolderside;
+ location.PlLineOffsetDryBelowDikeTopAtRiver = waternetOptions.DryPl1BelowDikeTopAtRiver;
+ // waternetOptions.DryPl1BelowDikeTopAtRiverSpecified is not used because the value is not a nullable
+ location.PlLineOffsetDryBelowDikeTopAtPolder = waternetOptions.DryPl1DryBelowDikeTopAtPolder;
+ // waternetOptions.DryPl1DryBelowDikeTopAtPolderSpecified is not used because the value is not a nullable
+ location.PlLineOffsetDryBelowShoulderBaseInside = waternetOptions.DryPl1BelowShoulderBaseInside;
+ // waternetOptions.DryPl1BelowShoulderBaseInsideSpecified is not used because the value is not a nullable
+ location.PlLineOffsetDryBelowDikeToeAtPolder = waternetOptions.DryPl1DryBelowDikeToeAtPolder;
+ // waternetOptions.DryPl1DryBelowDikeToeAtPolderSpecified is not used because the value is not a nullable
// Regional settings
location.DikeTableHeight = inputLocation.DikeTableHeight;