Index: DamEngine/trunk/src/Deltares.DamEngine.Io/DamInput.cs
===================================================================
diff -u -r1265 -r1268
--- DamEngine/trunk/src/Deltares.DamEngine.Io/DamInput.cs (.../DamInput.cs) (revision 1265)
+++ DamEngine/trunk/src/Deltares.DamEngine.Io/DamInput.cs (.../DamInput.cs) (revision 1268)
@@ -2537,6 +2537,10 @@
private double polderLevelField;
+ private double polderLevelLowField;
+
+ private bool polderLevelLowFieldSpecified;
+
private double headPl2Field;
private bool headPl2FieldSpecified;
@@ -2623,6 +2627,28 @@
///
[System.Xml.Serialization.XmlAttributeAttribute()]
+ public double PolderLevelLow {
+ get {
+ return this.polderLevelLowField;
+ }
+ set {
+ this.polderLevelLowField = value;
+ }
+ }
+
+ ///
+ [System.Xml.Serialization.XmlIgnoreAttribute()]
+ public bool PolderLevelLowSpecified {
+ get {
+ return this.polderLevelLowFieldSpecified;
+ }
+ set {
+ this.polderLevelLowFieldSpecified = value;
+ }
+ }
+
+ ///
+ [System.Xml.Serialization.XmlAttributeAttribute()]
public double HeadPl2 {
get {
return this.headPl2Field;
Index: DamEngine/trunk/xsd/DamLocation.xsd
===================================================================
diff -u -r1265 -r1268
--- DamEngine/trunk/xsd/DamLocation.xsd (.../DamLocation.xsd) (revision 1265)
+++ DamEngine/trunk/xsd/DamLocation.xsd (.../DamLocation.xsd) (revision 1268)
@@ -71,6 +71,7 @@
+
Index: DamEngine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlInput.cs
===================================================================
diff -u -r1265 -r1268
--- DamEngine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlInput.cs (.../FillDamFromXmlInput.cs) (revision 1265)
+++ DamEngine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlInput.cs (.../FillDamFromXmlInput.cs) (revision 1268)
@@ -344,6 +344,8 @@
location.ModelParametersForPlLines.PlLineCreationMethod = ConversionHelper.ConvertToPhreaticLineCreationMethod(waternetOptions.PhreaticLineCreationMethod);
location.IntrusionVerticalWaterPressure = ConversionHelper.ConvertToIntrusionVerticalWaterPressure(waternetOptions.IntrusionVerticalWaterPressure);
location.PolderLevel = waternetOptions.PolderLevel;
+ location.PolderLevelLow = waternetOptions.PolderLevelLow;
+ // waternetOptions.PolderLevelLowSpecified is not used because the value is not a nullable
location.ModelParametersForPlLines.DampingFactorPl4 = waternetOptions.DampingFactorPL3;
location.ModelParametersForPlLines.DampingFactorPl3 = waternetOptions.DampingFactorPL4;
location.ModelParametersForPlLines.PenetrationLength = waternetOptions.PenetrationLength;
Index: DamEngine/trunk/src/Deltares.DamEngine.Interface/FillXmlInputFromDam.cs
===================================================================
diff -u -r1265 -r1268
--- DamEngine/trunk/src/Deltares.DamEngine.Interface/FillXmlInputFromDam.cs (.../FillXmlInputFromDam.cs) (revision 1265)
+++ DamEngine/trunk/src/Deltares.DamEngine.Interface/FillXmlInputFromDam.cs (.../FillXmlInputFromDam.cs) (revision 1268)
@@ -298,6 +298,8 @@
waternetOptions.PhreaticLineCreationMethod = ConversionHelper.ConvertToInputPhreaticLineCreationMethod(location.ModelParametersForPlLines.PlLineCreationMethod);
waternetOptions.IntrusionVerticalWaterPressure = ConversionHelper.ConvertToInputIntrusionVerticalWaterPressure(location.IntrusionVerticalWaterPressure ?? IntrusionVerticalWaterPressureType.Standard);
waternetOptions.PolderLevel = location.PolderLevel;
+ waternetOptions.PolderLevelLow = location.PolderLevelLow;
+ waternetOptions.PolderLevelLowSpecified = true;
waternetOptions.DampingFactorPL3 = location.ModelParametersForPlLines.DampingFactorPl4;
waternetOptions.DampingFactorPL4 = location.ModelParametersForPlLines.DampingFactorPl3;
waternetOptions.PenetrationLength = location.ModelParametersForPlLines.PenetrationLength;
Index: DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/FillDamFromXmlInputTests.cs
===================================================================
diff -u -r1265 -r1268
--- DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/FillDamFromXmlInputTests.cs (.../FillDamFromXmlInputTests.cs) (revision 1265)
+++ DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/FillDamFromXmlInputTests.cs (.../FillDamFromXmlInputTests.cs) (revision 1268)
@@ -245,6 +245,7 @@
location.ModelParametersForPlLines.PlLineCreationMethod = (PlLineCreationMethod) i;
location.IntrusionVerticalWaterPressure = (IntrusionVerticalWaterPressureType) i;
location.PolderLevel = 1.0 * i + 0.11;
+ location.PolderLevelLow = 1.0 * i + 0.09;
location.ModelParametersForPlLines.DampingFactorPl4 = 1.0 * i + 0.12;
location.ModelParametersForPlLines.DampingFactorPl3 = 1.0 * i + 0.13;
location.ModelParametersForPlLines.PenetrationLength = 1.0 * i + 0.14;