Index: DamEngine/trunk/src/Deltares.DamEngine.Io/DamInput.cs
===================================================================
diff -u -r2111 -r2131
--- DamEngine/trunk/src/Deltares.DamEngine.Io/DamInput.cs (.../DamInput.cs) (revision 2111)
+++ DamEngine/trunk/src/Deltares.DamEngine.Io/DamInput.cs (.../DamInput.cs) (revision 2131)
@@ -3225,10 +3225,6 @@
private double polderLevelField;
- private double polderLevelLowField;
-
- private bool polderLevelLowFieldSpecified;
-
private double headPl2Field;
private bool headPl2FieldSpecified;
@@ -3293,28 +3289,6 @@
///
[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 -r2111 -r2131
--- DamEngine/trunk/xsd/DamLocation.xsd (.../DamLocation.xsd) (revision 2111)
+++ DamEngine/trunk/xsd/DamLocation.xsd (.../DamLocation.xsd) (revision 2131)
@@ -50,7 +50,6 @@
-
Index: DamEngine/trunk/src/Deltares.DamEngine.Interface/FillXmlInputFromDam.cs
===================================================================
diff -u -r2113 -r2131
--- DamEngine/trunk/src/Deltares.DamEngine.Interface/FillXmlInputFromDam.cs (.../FillXmlInputFromDam.cs) (revision 2113)
+++ DamEngine/trunk/src/Deltares.DamEngine.Interface/FillXmlInputFromDam.cs (.../FillXmlInputFromDam.cs) (revision 2131)
@@ -497,8 +497,6 @@
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.Data/General/Location.cs
===================================================================
diff -u -r2113 -r2131
--- DamEngine/trunk/src/Deltares.DamEngine.Data/General/Location.cs (.../Location.cs) (revision 2113)
+++ DamEngine/trunk/src/Deltares.DamEngine.Data/General/Location.cs (.../Location.cs) (revision 2131)
@@ -128,7 +128,6 @@
private double pLLineOffsetBelowDikeTopAtRiver = 0.5;
private double pLLineOffsetBelowShoulderBaseInside = 0.1;
private double polderLevel;
- private double polderLevelLow;
private bool redesignDikeHeight = true;
private bool redesignDikeShoulder = true;
private double scenarioRiverLevel;
@@ -1254,24 +1253,6 @@
}
///
- /// Gets or sets the polder level low.
- ///
- ///
- /// The polder level low.
- ///
- public virtual double PolderLevelLow
- {
- get
- {
- return polderLevelLow;
- }
- set
- {
- polderLevelLow = value;
- }
- }
-
- ///
/// Gets or sets the river level.
///
///
Index: DamEngine/trunk/src/Deltares.DamEngine.TestHelpers/Factories/FactoryForDamProjectData.cs
===================================================================
diff -u -r2111 -r2131
--- DamEngine/trunk/src/Deltares.DamEngine.TestHelpers/Factories/FactoryForDamProjectData.cs (.../FactoryForDamProjectData.cs) (revision 2111)
+++ DamEngine/trunk/src/Deltares.DamEngine.TestHelpers/Factories/FactoryForDamProjectData.cs (.../FactoryForDamProjectData.cs) (revision 2131)
@@ -348,7 +348,6 @@
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;
Index: DamEngine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlInput.cs
===================================================================
diff -u -r2111 -r2131
--- DamEngine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlInput.cs (.../FillDamFromXmlInput.cs) (revision 2111)
+++ DamEngine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlInput.cs (.../FillDamFromXmlInput.cs) (revision 2131)
@@ -498,8 +498,6 @@
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;