Index: DamClients/DamUI/trunk/src/Dam/Tests/CsvImporterTest.cs =================================================================== diff -u -r2785 -r2798 --- DamClients/DamUI/trunk/src/Dam/Tests/CsvImporterTest.cs (.../CsvImporterTest.cs) (revision 2785) +++ DamClients/DamUI/trunk/src/Dam/Tests/CsvImporterTest.cs (.../CsvImporterTest.cs) (revision 2798) @@ -234,7 +234,6 @@ Assert.AreEqual("1", dike.Locations[0].Segment.Name); Assert.AreEqual(414.950, dike.Locations[0].XRd); Assert.AreEqual(91.850, dike.Locations[0].YRd); - Assert.AreEqual(4.0, dike.Locations[0].HeadPL2); Assert.AreEqual(14.0, dike.Locations[0].XSoilGeometry2DOrigin); Assert.AreEqual("ophoogmateriaaldijk", dike.Locations[0].DikeEmbankmentMaterial); Assert.AreEqual("ophoogmateriaalberm", dike.Locations[0].ShoulderEmbankmentMaterial); Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/EntityFactory.cs =================================================================== diff -u -r2785 -r2798 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/EntityFactory.cs (.../EntityFactory.cs) (revision 2785) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/EntityFactory.cs (.../EntityFactory.cs) (revision 2798) @@ -303,7 +303,6 @@ location1.Name = "Location1"; location1.XRd = 45782; location1.YRd = 143090; - location1.HeadPL2 = 4.0; location1.DikeEmbankmentMaterial = "clay"; location1.ShoulderEmbankmentMaterial = "sand"; location1.StabilityShoulderGrowSlope = 3.1; Index: DamClients/DamUI/trunk/src/Dam/Tests/IO/CombineImportedDataTest.cs =================================================================== diff -u -r2795 -r2798 --- DamClients/DamUI/trunk/src/Dam/Tests/IO/CombineImportedDataTest.cs (.../CombineImportedDataTest.cs) (revision 2795) +++ DamClients/DamUI/trunk/src/Dam/Tests/IO/CombineImportedDataTest.cs (.../CombineImportedDataTest.cs) (revision 2798) @@ -218,7 +218,6 @@ Assert.AreEqual(424173.0, location.YRd, tolerance); Assert.AreEqual(2.0, location.XSoilGeometry2DOrigin, tolerance); //Assert.AreEqual("25-2-2-A-1-A", location.PL1Line.Name); - Assert.AreEqual(0.8727, location.HeadPL2.Value, tolerance); Assert.AreEqual("klei", location.DikeEmbankmentMaterial); Assert.AreEqual("klei2", location.ShoulderEmbankmentMaterial); Assert.AreEqual(1.3, location.PenetrationLength, tolerance); Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/IO/CombineImportedData.cs =================================================================== diff -u -r2795 -r2798 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/IO/CombineImportedData.cs (.../CombineImportedData.cs) (revision 2795) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/IO/CombineImportedData.cs (.../CombineImportedData.cs) (revision 2798) @@ -745,8 +745,6 @@ errorInrecord = true; } - location.HeadPL2 = locationRecord.HeadPl2; - if (null != locationRecord.DikeEmbankmentMaterial) { location.DikeEmbankmentMaterial = locationRecord.DikeEmbankmentMaterial; Index: DamClients/DamUI/trunk/src/Dam/Tests/WaterBoardImporterTests.cs =================================================================== diff -u -r2785 -r2798 --- DamClients/DamUI/trunk/src/Dam/Tests/WaterBoardImporterTests.cs (.../WaterBoardImporterTests.cs) (revision 2785) +++ DamClients/DamUI/trunk/src/Dam/Tests/WaterBoardImporterTests.cs (.../WaterBoardImporterTests.cs) (revision 2798) @@ -227,8 +227,6 @@ //Check locations Assert.AreEqual(2, dike.Locations.Count); - - Assert.IsNull(dike.Locations[0].HeadPL2); } } Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Location.cs =================================================================== diff -u -r2785 -r2798 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Location.cs (.../Location.cs) (revision 2785) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Location.cs (.../Location.cs) (revision 2798) @@ -53,7 +53,6 @@ public const string SegmentId = "SegmentId"; public const string SurfaceLineId = "SurfaceLineId"; public const string PL1LineId = "PL1LineId"; - public const string HeadPL2 = "HeadPL2"; public const string XSoilGeometry2DOrigin = "XSoilGeometry2DOrigin"; public const string DikeEmbankmentMaterial = "DikeEmbankmentMaterial"; public const string ShoulderEmbankmentMaterial = "ShoulderEmbankmentMaterial"; @@ -1729,10 +1728,6 @@ { nameValuePairs.Add(LocationParameterNames.PL1LineId, PL1Line.Name); } - if (HeadPL2.HasValue) - { - nameValuePairs.Add(LocationParameterNames.HeadPL2, HeadPL2.Value.ToString(numberFormatInfo)); - } nameValuePairs.Add(LocationParameterNames.XSoilGeometry2DOrigin, XSoilGeometry2DOrigin.ToString(numberFormatInfo)); nameValuePairs.Add(LocationParameterNames.DikeEmbankmentMaterial, DikeEmbankmentMaterial); nameValuePairs.Add(LocationParameterNames.ShoulderEmbankmentMaterial, ShoulderEmbankmentMaterial); @@ -2019,10 +2014,6 @@ { SurfaceLineId = parameterValue; } - if (parameterName.Equals(LocationParameterNames.HeadPL2)) - { - HeadPL2 = Convert.ToDouble(parameterValue, numberFormatInfo); - } if (parameterName.Equals(LocationParameterNames.XSoilGeometry2DOrigin)) { XSoilGeometry2DOrigin = Convert.ToDouble(parameterValue, numberFormatInfo); @@ -2249,8 +2240,6 @@ return true; case "TL_DegreeOfConsolidation": return true; - case "HeadPL2": - return true; case "DampingFactorPL3": return true; case "DampingFactorPL4": @@ -2326,7 +2315,7 @@ sb.Append(String.Format(" @ Segment {0}", this.Segment.Name)); if (this.SurfaceLine != null) sb.Append(String.Format(" with {0})", this.SurfaceLine.Name)); - sb.Append(String.Format(" | X={0}, Y={1}, PolderLevel={2:F2}, HeadPL2={3:F2}, HeadPl3={4:F2}", this.XRd, this.YRd, this.PolderLevel, this.HeadPL2, this.HeadPl3)); + sb.Append(String.Format(" | X={0}, Y={1}, HeadPl3={4:F2}", this.XRd, this.YRd, this.HeadPl3)); return sb.ToString();*/ }