Index: DamClients/DamUI/trunk/src/Dam/Tests/LoadCompatiblityTest.cs
===================================================================
diff -u -r2785 -r2806
--- DamClients/DamUI/trunk/src/Dam/Tests/LoadCompatiblityTest.cs (.../LoadCompatiblityTest.cs) (revision 2785)
+++ DamClients/DamUI/trunk/src/Dam/Tests/LoadCompatiblityTest.cs (.../LoadCompatiblityTest.cs) (revision 2806)
@@ -91,7 +91,6 @@
XRd = 111232.178664511,
YRd = 507197.06382921,
SegmentId = "234",
- HeadPL2 = -1.3,
XSoilGeometry2DOrigin = 0.0, // actual value
DikeEmbankmentMaterial = "HHNK1_Bfg",
ShoulderEmbankmentMaterial = "HHNK1_Bfl",
Index: DamClients/DamUI/trunk/src/Dam/Tests/DamEngineIo/FillXmlInputFromDamUiTests.cs
===================================================================
diff -u -r2645 -r2806
--- DamClients/DamUI/trunk/src/Dam/Tests/DamEngineIo/FillXmlInputFromDamUiTests.cs (.../FillXmlInputFromDamUiTests.cs) (revision 2645)
+++ DamClients/DamUI/trunk/src/Dam/Tests/DamEngineIo/FillXmlInputFromDamUiTests.cs (.../FillXmlInputFromDamUiTests.cs) (revision 2806)
@@ -342,7 +342,6 @@
location.DampingFactorPL3 = 1.0 * i + 0.13;
location.PenetrationLength = 1.0 * i + 0.14;
location.SlopeDampingPiezometricHeightPolderSide = 1.0 * i + 0.19;
- location.HeadPL2 = 1.0 * i + 0.28;
location.LocalXZSurfaceLine2 = surfaceLines[i];
location.Segment = segments[i % 2]; // alternate between the 2 available segments
for (int j = 0; j < 3; j++)
@@ -415,6 +414,8 @@
designScenario.RequiredSafetyFactorStabilityInnerSlope = 1.0 * factor + 0.64;
designScenario.RequiredSafetyFactorStabilityOuterSlope = 1.0 * factor + 0.65;
designScenario.RequiredSafetyFactorPiping = 1.0 * factor + 0.66;
+ designScenario.PolderLevel = 1.0 * factor + 0.67;
+ designScenario.HeadPl2 = 1.0 * factor + 0.68;
return designScenario;
}
Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Location.cs
===================================================================
diff -u -r2798 -r2806
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Location.cs (.../Location.cs) (revision 2798)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Location.cs (.../Location.cs) (revision 2806)
@@ -1537,33 +1537,6 @@
}
///
- /// Gets or sets the head pl 2.
- ///
- ///
- /// The head pl 2.
- ///
- [Unit(UnitType.Length)]
- [Label("Head PL2")]
- [Description("Head level for PL2")]
- [Format("F3")]
- [Category(WaterCategory)]
- [PropertyOrder(2, 8)]
- [Clearable]
- public virtual double? HeadPL2
- {
- get
- {
- return headPL2;
- }
- set
- {
- DataEventPublisher.BeforeChange(this, "HeadPL2");
- headPL2 = value;
- DataEventPublisher.AfterChange(this, "HeadPL2");
- }
- }
-
- ///
/// Gets or sets the damping factor pl 3.
///
///