Index: DamEngine/trunk/src/Deltares.DamEngine.TestHelpers/Factories/FactoryForDamProjectData.cs
===================================================================
diff -u -r2503 -r2517
--- DamEngine/trunk/src/Deltares.DamEngine.TestHelpers/Factories/FactoryForDamProjectData.cs (.../FactoryForDamProjectData.cs) (revision 2503)
+++ DamEngine/trunk/src/Deltares.DamEngine.TestHelpers/Factories/FactoryForDamProjectData.cs (.../FactoryForDamProjectData.cs) (revision 2517)
@@ -352,17 +352,8 @@
location.ModelParametersForPlLines.DampingFactorPl4 = 1.0 * i + 0.12;
location.ModelParametersForPlLines.DampingFactorPl3 = 1.0 * i + 0.13;
location.ModelParametersForPlLines.PenetrationLength = 1.0 * i + 0.14;
- location.PlLineOffsetBelowDikeCrestMiddle = 1.0 * i + 0.15;
- location.UsePlLineOffsetFactorBelowShoulderCrest = true;
- location.PlLineOffsetFactorBelowShoulderCrest = 1.0 * i + 0.16;
location.SlopeDampingPiezometricHeightPolderSide = 1.0 * i + 0.19;
- location.PlLineOffsetBelowDikeTopAtRiver = 1.0 * i + 0.20;
- 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.28;
- location.HeadPl3 = 1.0 * i + 0.29;
- location.HeadPl4 = 1.0 * i + 0.30;
location.DikeSoilScenario = (DikeSoilScenario)i;
location.SurfaceLine = dike.SurfaceLines2[i];
Index: DamEngine/trunk/src/Deltares.DamEngine.Io/DamInput.cs
===================================================================
diff -u -r2503 -r2517
--- DamEngine/trunk/src/Deltares.DamEngine.Io/DamInput.cs (.../DamInput.cs) (revision 2503)
+++ DamEngine/trunk/src/Deltares.DamEngine.Io/DamInput.cs (.../DamInput.cs) (revision 2517)
@@ -3216,14 +3216,6 @@
private bool headPl2FieldSpecified;
- private double headPl3Field;
-
- private bool headPl3FieldSpecified;
-
- private double headPl4Field;
-
- private bool headPl4FieldSpecified;
-
private double dampingFactorPl3Field;
private double dampingFactorPl4Field;
@@ -3232,22 +3224,6 @@
private double slopeDampingFactorField;
- private double pl1BelowCrestRiversideField;
-
- private double pl1BelowCrestPoldersideField;
-
- private double pl1BelowShoulderCrestPoldersideField;
-
- private double pl1BelowToeDikePoldersideField;
-
- private double pl1BelowCrestMiddleField;
-
- private bool pl1BelowCrestMiddleFieldSpecified;
-
- private double pl1FactorBelowShoulderCrestField;
-
- private bool pl1FactorBelowShoulderCrestFieldSpecified;
-
private LocationWaternetOptionsIntrusionVerticalWaterPressure intrusionVerticalWaterPressureField;
private LocationWaternetOptionsDikeSoilScenario dikeSoilScenarioField;
@@ -3298,50 +3274,6 @@
///
[System.Xml.Serialization.XmlAttributeAttribute()]
- public double HeadPl3 {
- get {
- return this.headPl3Field;
- }
- set {
- this.headPl3Field = value;
- }
- }
-
- ///
- [System.Xml.Serialization.XmlIgnoreAttribute()]
- public bool HeadPl3Specified {
- get {
- return this.headPl3FieldSpecified;
- }
- set {
- 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;
@@ -3386,94 +3318,6 @@
///
[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 Pl1BelowCrestMiddleSpecified {
- get {
- return this.pl1BelowCrestMiddleFieldSpecified;
- }
- set {
- this.pl1BelowCrestMiddleFieldSpecified = value;
- }
- }
-
- ///
- [System.Xml.Serialization.XmlAttributeAttribute()]
- public double Pl1FactorBelowShoulderCrest {
- get {
- return this.pl1FactorBelowShoulderCrestField;
- }
- set {
- this.pl1FactorBelowShoulderCrestField = value;
- }
- }
-
- ///
- [System.Xml.Serialization.XmlIgnoreAttribute()]
- public bool Pl1FactorBelowShoulderCrestSpecified {
- get {
- return this.pl1FactorBelowShoulderCrestFieldSpecified;
- }
- set {
- this.pl1FactorBelowShoulderCrestFieldSpecified = value;
- }
- }
-
- ///
- [System.Xml.Serialization.XmlAttributeAttribute()]
public LocationWaternetOptionsIntrusionVerticalWaterPressure IntrusionVerticalWaterPressure {
get {
return this.intrusionVerticalWaterPressureField;
Index: DamEngine/trunk/xsd/DamLocation.xsd
===================================================================
diff -u -r2494 -r2517
--- DamEngine/trunk/xsd/DamLocation.xsd (.../DamLocation.xsd) (revision 2494)
+++ DamEngine/trunk/xsd/DamLocation.xsd (.../DamLocation.xsd) (revision 2517)
@@ -51,18 +51,10 @@
-
-
-
-
-
-
-
-
Index: DamEngine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlInput.cs
===================================================================
diff -u -r2503 -r2517
--- DamEngine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlInput.cs (.../FillDamFromXmlInput.cs) (revision 2503)
+++ DamEngine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlInput.cs (.../FillDamFromXmlInput.cs) (revision 2517)
@@ -504,18 +504,9 @@
location.ModelParametersForPlLines.DampingFactorPl4 = waternetOptions.DampingFactorPl3;
location.ModelParametersForPlLines.DampingFactorPl3 = waternetOptions.DampingFactorPl4;
location.ModelParametersForPlLines.PenetrationLength = waternetOptions.PenetrationLength;
- location.PlLineOffsetBelowDikeCrestMiddle = (waternetOptions.Pl1BelowCrestMiddleSpecified ? (double?)waternetOptions.Pl1BelowCrestMiddle : null);
- location.UsePlLineOffsetFactorBelowShoulderCrest = waternetOptions.Pl1FactorBelowShoulderCrestSpecified;
- location.PlLineOffsetFactorBelowShoulderCrest = waternetOptions.Pl1FactorBelowShoulderCrest;
location.HeadPl2 = (waternetOptions.HeadPl2Specified ? (double?)waternetOptions.HeadPl2 : null);
- location.HeadPl3 = (waternetOptions.HeadPl3Specified ? (double?)waternetOptions.HeadPl3 : null);
- location.HeadPl4 = (waternetOptions.HeadPl4Specified ? (double?)waternetOptions.HeadPl4 : null);
location.DikeSoilScenario = ConversionHelper.ConvertToDikeSoilScenario(waternetOptions.DikeSoilScenario);
location.SlopeDampingPiezometricHeightPolderSide = waternetOptions.SlopeDampingFactor;
- location.PlLineOffsetBelowDikeTopAtRiver = waternetOptions.Pl1BelowCrestRiverside;
- location.PlLineOffsetBelowDikeTopAtPolder = waternetOptions.Pl1BelowCrestPolderside;
- location.PlLineOffsetBelowShoulderBaseInside = waternetOptions.Pl1BelowShoulderCrestPolderside;
- location.PlLineOffsetBelowDikeToeAtPolder = waternetOptions.Pl1BelowToeDikePolderside;
// Design options
var designOptions = inputLocation.DesignOptions;
Index: DamEngine/trunk/src/Deltares.DamEngine.Interface/FillXmlInputFromDam.cs
===================================================================
diff -u -r2503 -r2517
--- DamEngine/trunk/src/Deltares.DamEngine.Interface/FillXmlInputFromDam.cs (.../FillXmlInputFromDam.cs) (revision 2503)
+++ DamEngine/trunk/src/Deltares.DamEngine.Interface/FillXmlInputFromDam.cs (.../FillXmlInputFromDam.cs) (revision 2517)
@@ -500,22 +500,10 @@
waternetOptions.DampingFactorPl3 = location.ModelParametersForPlLines.DampingFactorPl4;
waternetOptions.DampingFactorPl4 = location.ModelParametersForPlLines.DampingFactorPl3;
waternetOptions.PenetrationLength = location.ModelParametersForPlLines.PenetrationLength;
- waternetOptions.Pl1BelowCrestMiddleSpecified = location.PlLineOffsetBelowDikeCrestMiddle.HasValue;
- waternetOptions.Pl1BelowCrestMiddle = location.PlLineOffsetBelowDikeCrestMiddle ?? 0.0;
- waternetOptions.Pl1FactorBelowShoulderCrestSpecified = location.UsePlLineOffsetFactorBelowShoulderCrest ?? false;
- waternetOptions.Pl1FactorBelowShoulderCrest = location.PlLineOffsetFactorBelowShoulderCrest ?? 0.0;
waternetOptions.HeadPl2Specified = location.HeadPl2.HasValue;
waternetOptions.HeadPl2 = location.HeadPl2 ?? 0.0;
- waternetOptions.HeadPl3Specified = location.HeadPl3.HasValue;
- waternetOptions.HeadPl3 = location.HeadPl3 ?? 0.0;
- waternetOptions.HeadPl4Specified = location.HeadPl4.HasValue;
- waternetOptions.HeadPl4 = location.HeadPl4 ?? 0.0;
waternetOptions.DikeSoilScenario = ConversionHelper.ConvertToInputDikeSoilScenario(location.DikeSoilScenario);
waternetOptions.SlopeDampingFactor = location.SlopeDampingPiezometricHeightPolderSide;
- waternetOptions.Pl1BelowCrestRiverside = location.PlLineOffsetBelowDikeTopAtRiver;
- waternetOptions.Pl1BelowCrestPolderside = location.PlLineOffsetBelowDikeTopAtPolder;
- waternetOptions.Pl1BelowShoulderCrestPolderside = location.PlLineOffsetBelowShoulderBaseInside;
- waternetOptions.Pl1BelowToeDikePolderside = location.PlLineOffsetBelowDikeToeAtPolder;
inputLocation.WaternetOptions = waternetOptions;
// Design options