Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Importers/LocationCsvColumnNames.cs =================================================================== diff -u -r2135 -r2163 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Importers/LocationCsvColumnNames.cs (.../LocationCsvColumnNames.cs) (revision 2135) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Importers/LocationCsvColumnNames.cs (.../LocationCsvColumnNames.cs) (revision 2163) @@ -231,11 +231,6 @@ public const string DistanceToEntryPointColumnName = "distance_to_entry_point"; /// - /// Dike table height - /// - public const string DikeTableHeightColumnName = "DikeTableHeight"; - - /// /// Stability Design Method /// public const string StabilityDesignMethodColumnName = "StabilityDesignMethod"; Index: DamClients/DamUI/trunk/src/Dam/Tests/CsvImporterTestsNew.cs =================================================================== diff -u -r2135 -r2163 --- DamClients/DamUI/trunk/src/Dam/Tests/CsvImporterTestsNew.cs (.../CsvImporterTestsNew.cs) (revision 2135) +++ DamClients/DamUI/trunk/src/Dam/Tests/CsvImporterTestsNew.cs (.../CsvImporterTestsNew.cs) (revision 2163) @@ -729,7 +729,6 @@ Assert.AreEqual(2.0, locationRecords[1].StabilityShoulderGrowSlope, tolerance); Assert.AreEqual(0.2, locationRecords[1].StabilityShoulderGrowDeltaX, tolerance); Assert.AreEqual(0.5, locationRecords[1].StabilitySlopeAdaptionDeltaX, tolerance); - Assert.AreEqual(3.5, locationRecords[1].DikeTableHeight, tolerance); Assert.AreEqual(0.01, locationRecords[0].SlopeDampingPiezometricHeightPolderSide, tolerance); Assert.AreEqual(0.2, locationRecords[1].SlopeDampingPiezometricHeightPolderSide, tolerance); Assert.AreEqual(StabilityDesignMethod.OptimizedSlopeAndShoulderAdaption, locationRecords[0].StabilityDesignMethod); @@ -1143,8 +1142,7 @@ Assert.AreEqual(0.2, location.PlLineOffsetBelowDikeToeAtPolder, tolerance); Assert.AreEqual(2.0, location.StabilityShoulderGrowSlope, tolerance); Assert.AreEqual(0.2, location.StabilityShoulderGrowDeltaX, tolerance); - Assert.AreEqual(0.5, location.StabilitySlopeAdaptionDeltaX, tolerance); - Assert.AreEqual(3.5, location.DikeTableHeight, tolerance); + Assert.AreEqual(0.5, location.StabilitySlopeAdaptionDeltaX, tolerance); } } } Index: DamClients/DamUI/trunk/src/Dam/Tests/LoadCompatiblityTest.cs =================================================================== diff -u -r2160 -r2163 --- DamClients/DamUI/trunk/src/Dam/Tests/LoadCompatiblityTest.cs (.../LoadCompatiblityTest.cs) (revision 2160) +++ DamClients/DamUI/trunk/src/Dam/Tests/LoadCompatiblityTest.cs (.../LoadCompatiblityTest.cs) (revision 2163) @@ -123,7 +123,6 @@ LayerHeightDeviation = 0.0, DistanceToEntryPoint = 0.0, // actual value StabilityZoneType = MStabZonesType.NoZones, - DikeTableHeight = 0.0, ModelFactors = new ModelFactors { RequiredProbabilityOfFailureStabilityInnerslope = 1.0e-08, Index: DamClients/DamUI/trunk/src/Dam/Tests/DamEngineIo/FillXmlInputFromDamUiTests.cs =================================================================== diff -u -r2135 -r2163 --- DamClients/DamUI/trunk/src/Dam/Tests/DamEngineIo/FillXmlInputFromDamUiTests.cs (.../FillXmlInputFromDamUiTests.cs) (revision 2135) +++ DamClients/DamUI/trunk/src/Dam/Tests/DamEngineIo/FillXmlInputFromDamUiTests.cs (.../FillXmlInputFromDamUiTests.cs) (revision 2163) @@ -351,7 +351,6 @@ location.HeadPL2 = 1.0 * i + 0.28; location.HeadPl3 = 1.0 * i + 0.29; location.HeadPl4 = 1.0 * i + 0.30; - location.DikeTableHeight = 1.0 * i + 0.31; location.LocalXZSurfaceLine2 = surfaceLines[i]; location.Segment = segments[i % 2]; // alternate between the 2 available segments for (int j = 0; j < 3; j++) Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillDamUiFromXmlInput.cs =================================================================== diff -u -r2135 -r2163 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillDamUiFromXmlInput.cs (.../FillDamUiFromXmlInput.cs) (revision 2135) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillDamUiFromXmlInput.cs (.../FillDamUiFromXmlInput.cs) (revision 2163) @@ -414,8 +414,7 @@ location.PlLineOffsetBelowDikeTopAtPolder = waternetOptions.Pl1BelowCrestPolderside; location.PlLineOffsetBelowShoulderBaseInside = waternetOptions.Pl1BelowShoulderCrestPolderside; location.PlLineOffsetBelowDikeToeAtPolder = waternetOptions.Pl1BelowToeDikePolderside; - location.DikeTableHeight = inputLocation.DikeTableHeight; - + SurfaceLine2 surfaceLine = dikeSurfaceLines.First(n => n.Name.Equals(inputLocation.SurfaceLineName)); location.LocalXZSurfaceLine2 = surfaceLine; Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillXmlInputFromDamUi.cs =================================================================== diff -u -r2135 -r2163 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillXmlInputFromDamUi.cs (.../FillXmlInputFromDamUi.cs) (revision 2135) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillXmlInputFromDamUi.cs (.../FillXmlInputFromDamUi.cs) (revision 2163) @@ -591,8 +591,7 @@ waternetOptions.Pl1BelowShoulderCrestPolderside = location.PlLineOffsetBelowShoulderBaseInside; waternetOptions.Pl1BelowToeDikePolderside = location.PlLineOffsetBelowDikeToeAtPolder; inputLocation.WaternetOptions = waternetOptions; - inputLocation.DikeTableHeight = location.DikeTableHeight; - + inputLocation.DesignScenarios = new LocationDesignScenario[location.Scenarios.Count]; for (int j = 0; j < location.Scenarios.Count; j++) { Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/IO/CombineImportedData.cs =================================================================== diff -u -r2135 -r2163 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/IO/CombineImportedData.cs (.../CombineImportedData.cs) (revision 2135) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/IO/CombineImportedData.cs (.../CombineImportedData.cs) (revision 2163) @@ -754,7 +754,6 @@ location.LayerHeightDeviation = locationRecord.LayerHeightDeviation.GetValueOrDefault(location.LayerHeightDeviation); location.LayerHeightDistribution = locationRecord.LayerHeightDistribution.GetValueOrDefault(location.LayerHeightDistribution); location.DistanceToEntryPoint = locationRecord.DistanceToEntryPoint.GetValueOrDefault(location.DistanceToEntryPoint); - location.DikeTableHeight = locationRecord.DikeTableHeight.GetValueOrDefault(location.DikeTableHeight); location.SlopeDampingPiezometricHeightPolderSide = locationRecord.SlopeDampingPiezometricHeightPolderSide.GetValueOrDefault(location.SlopeDampingPiezometricHeightPolderSide); location.StabilityDesignMethod = locationRecord.StabilityDesignMethod.GetValueOrDefault(location.StabilityDesignMethod); location.SlopeAdaptionStartCotangent = locationRecord.SlopeAdaptionStartCotangent.GetValueOrDefault(location.SlopeAdaptionStartCotangent); Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Location.cs =================================================================== diff -u -r2135 -r2163 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Location.cs (.../Location.cs) (revision 2135) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Location.cs (.../Location.cs) (revision 2163) @@ -99,7 +99,6 @@ public const string StabilityZoneType = "StabilityZoneType"; public const string ForbiddenZoneFactor = "ForbiddenZoneFactor"; public const string ZoneAreaRestSlopeCrestWidth = "ZoneAreaRestSlopeCrestWidth"; - public const string DikeTableHeight = "DikeTableHeight"; public const string StabilityDesignMethod = "StabilityDesignMethod"; public const string SlopeAdaptionStartCotangent = "SlopeAdaptionStartCotangent"; public const string SlopeAdaptionEndCotangent = "SlopeAdaptionEndCotangent"; @@ -153,7 +152,6 @@ private string description = ""; private string dikeEmbankmentMaterial = ""; private string dikeRingId = ""; - private double dikeTableHeight = 0.0; private double direction = 0; private double distanceToEntryPoint = 0; private double forbiddenZoneFactor = 1.0; @@ -735,24 +733,6 @@ } } - [Label("Dike table height")] - [Category(DikeCategory)] - [Description("Dike table height")] - [Format("F3")] - public virtual double DikeTableHeight - { - get - { - return dikeTableHeight; - } - set - { - DataEventPublisher.BeforeChange(this, "DikeTableHeight"); - dikeTableHeight = value; - DataEventPublisher.AfterChange(this, "DikeTableHeight"); - } - } - [Label("Dike type")] [ReadOnly(true)] [Category(DikeCategory)] @@ -2388,7 +2368,6 @@ nameValuePairs.Add(LocationParameterNames.ForbiddenZoneFactor, ForbiddenZoneFactor.ToString(numberFormatInfo)); nameValuePairs.Add(LocationParameterNames.ZoneAreaRestSlopeCrestWidth, ZoneAreaRestSlopeCrestWidth.ToString(numberFormatInfo)); - nameValuePairs.Add(LocationParameterNames.DikeTableHeight, DikeTableHeight.ToString(numberFormatInfo)); nameValuePairs.Add(LocationParameterNames.SlopeDampingPiezometricHeightPolderSide, SlopeDampingPiezometricHeightPolderSide.ToString(numberFormatInfo)); nameValuePairs.Add(LocationParameterNames.StabilityDesignMethod, StabilityDesignMethod.ToString()); @@ -2818,10 +2797,6 @@ ZoneAreaRestSlopeCrestWidth = Convert.ToDouble(parameterValue, numberFormatInfo); } - if (parameterName.Equals(LocationParameterNames.DikeTableHeight)) - { - DikeTableHeight = Convert.ToDouble(parameterValue, numberFormatInfo); - } if (parameterName.Equals(LocationParameterNames.SlopeDampingPiezometricHeightPolderSide)) { SlopeDampingPiezometricHeightPolderSide = Convert.ToDouble(parameterValue, numberFormatInfo); @@ -2975,8 +2950,6 @@ case "IntrusionVerticalWaterPressure": return true; case "RedesignDikeHeight": return isDesign; - case "DikeTableHeight": - return false; case "RedesignDikeShoulder": return isDesign; Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/CsvImporters/CsvImporterLocations.cs =================================================================== diff -u -r2135 -r2163 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/CsvImporters/CsvImporterLocations.cs (.../CsvImporterLocations.cs) (revision 2135) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/CsvImporters/CsvImporterLocations.cs (.../CsvImporterLocations.cs) (revision 2163) @@ -92,7 +92,6 @@ public double? StabilityShoulderGrowSlope { get; set; } public double? StabilityShoulderGrowDeltaX { get; set; } public double? StabilitySlopeAdaptionDeltaX { get; set; } - public double? DikeTableHeight { get; set; } public double? SlopeDampingPiezometricHeightPolderSide { get; set; } public StabilityDesignMethod? StabilityDesignMethod { get; set; } public MStabZonesType? StabilityZoneType { get; set; } @@ -189,7 +188,6 @@ int colIndexStabilityShoulderGrowSlope = CsvReaderUtilities.GetHeaderIndexByString(headers, LocationCsvColumnNames.StabilityShoulderGrowSlopeColumnName); int colIndexStabilityShoulderGrowDeltaX = CsvReaderUtilities.GetHeaderIndexByString(headers, LocationCsvColumnNames.StabilityShoulderGrowDeltaXColumnName); int colIndexStabilitySlopeAdaptionDeltaX = CsvReaderUtilities.GetHeaderIndexByString(headers, LocationCsvColumnNames.StabilitySlopeAdaptionDeltaXColumnName); - int colIndexDikeTableHeight = CsvReaderUtilities.GetHeaderIndexByString(headers, LocationCsvColumnNames.DikeTableHeightColumnName); int colIndexSlopeDampingPiezometricHeightPolderSide = CsvReaderUtilities.GetHeaderIndexByString(headers, LocationCsvColumnNames.SlopeDampingPiezometricHeightPolderSideColumnName); int colIndexStabilityDesignMethod = CsvReaderUtilities.GetHeaderIndexByString(headers, LocationCsvColumnNames.StabilityDesignMethodColumnName); int colIndexStabilityZoneType = CsvReaderUtilities.GetHeaderIndexByString(headers, LocationCsvColumnNames.ZoneTypeColumnName); @@ -461,11 +459,6 @@ colIndex = colIndexStabilitySlopeAdaptionDeltaX; locationRecord.StabilitySlopeAdaptionDeltaX = Convert.ToDouble(csv[colIndexStabilitySlopeAdaptionDeltaX]); } - if (colIndexDikeTableHeight > -1) - { - colIndex = colIndexDikeTableHeight; - locationRecord.DikeTableHeight = Convert.ToDouble(csv[colIndexDikeTableHeight]); - } if (colIndexStabilityDesignMethod > -1) { colIndex = colIndexStabilityDesignMethod; Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Importers/LocationShapeFileAttributeMap.cs =================================================================== diff -u -r2135 -r2163 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Importers/LocationShapeFileAttributeMap.cs (.../LocationShapeFileAttributeMap.cs) (revision 2135) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Importers/LocationShapeFileAttributeMap.cs (.../LocationShapeFileAttributeMap.cs) (revision 2163) @@ -418,21 +418,12 @@ public const string DistanceToEntryPointAttributeId = LocationCsvColumnNames.DistanceToEntryPointColumnName; /// - /// DikeTableHeight + /// SlopeDampingPiezometricHeightPolderSideAttributeId /// CustomShape /// DTH.shp /// DTH /// double /// - public const string DikeTableHeightAttributeId = LocationCsvColumnNames.DikeTableHeightColumnName; - - /// - /// DikeTableHeight - /// CustomShape - /// DTH.shp - /// DTH - /// double - /// public const string SlopeDampingPiezometricHeightPolderSideAttributeId = LocationCsvColumnNames.SlopeDampingPiezometricHeightPolderSideColumnName; /// @@ -728,7 +719,6 @@ createItem(UpliftCriterionStabilityAttributeId, "uplift_criterion_stability.shp", "uplstab", (t, value) => t.ModelFactors.UpliftCriterionStability = value.ToType()), createItem(UseOriginalPlLineAssignmentsAttributeId, "use_original_plline_assignments.shp", "IsOrgPLs", (t, value) => t.IsUseOriginalPLLineAssignments = value.ToType()), createItem(XSoilGeometry2DOriginAttributeId, "XSoilGeometry2DOrigin.shp", "XG2DOrg", (t, value) => t.XSoilGeometry2DOrigin = value.ToType()), - createItem(DikeTableHeightAttributeId, "DTH.shp", "DTH", (t, value) => t.DikeTableHeight = value.ToType() ), createItem(SlopeDampingPiezometricHeightPolderSideAttributeId, "SlopeDampingPiezometricHeightPolderSide.shp", "SlopeDampingPiezometricHeightPolderSide", (t, value) => t.SlopeDampingPiezometricHeightPolderSide = value.ToType() ), createItem(StabilityDesignMethodAttributeId, "DesignParameters.shp", "StabilityDesignMethod", (t, value) => t.StabilityDesignMethod = LocationImportHelper.ToStabilityDesignMethod(value) ),