Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/CsvImporters/CsvImporterScenarios.cs =================================================================== diff -u -r2464 -r2468 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/CsvImporters/CsvImporterScenarios.cs (.../CsvImporterScenarios.cs) (revision 2464) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/CsvImporters/CsvImporterScenarios.cs (.../CsvImporterScenarios.cs) (revision 2468) @@ -62,8 +62,6 @@ public double? WaterHeight { get; set; } //v public double? WaterHeightLow { get; set; } //o public double? DikeTableHeight { get; set; } //v - public double? WaterHeightDecimeringsHoogte { get; set; } //o - public double? MaxWaterHeight { get; set; } //o public double ProbabilityOfFailureStabilityInnerSlope { get; set; } //o public double ProbabilityOfFailureStabilityOuterSlope { get; set; } //o public double ProbabilityOfFailurePiping { get; set; } //o @@ -153,9 +151,6 @@ int colIndexDikeTableHeight = CsvReaderUtilities.GetHeaderIndexByString(headers, fieldDikeTableHeight); CheckColumn(colIndexDikeTableHeight, fileName, fieldDikeTableHeight); - int colIndexWaterHeightDecimeringsHoogte = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.WaterHeightDecimeringsHoogteColumnName); - int colIndexMaxWaterHeight = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.MaxWaterHeightColumnName); - int colIndexSafetyFactorPiping = CsvReaderUtilities.GetHeaderIndexByString(headers, ModelFactorCsvIdentifiers.SafetyFactorPiping); int colIndexSafetyFactorStabilityInnerSlope = CsvReaderUtilities.GetHeaderIndexByString(headers, ModelFactorCsvIdentifiers.SafetyFactorStabilityInnerslope); int colIndexSafetyFactorStabilityOuterSlope = CsvReaderUtilities.GetHeaderIndexByString(headers, ModelFactorCsvIdentifiers.SafetyFactorStabilityOuterslope); @@ -208,16 +203,6 @@ } colIndex = colIndexDikeTableHeight; scenario.DikeTableHeight = Convert.ToDouble(csv[colIndexDikeTableHeight]); - if (colIndexWaterHeightDecimeringsHoogte > -1) - { - colIndex = colIndexWaterHeightDecimeringsHoogte; - scenario.WaterHeightDecimeringsHoogte = Convert.ToDouble(csv[colIndex]); - } - if (colIndexMaxWaterHeight > -1) - { - colIndex = colIndexMaxWaterHeight; - scenario.MaxWaterHeight = Convert.ToDouble(csv[colIndex]); - } if (colIndexSafetyFactorPiping > -1) { colIndex = colIndexSafetyFactorPiping; Index: DamClients/DamUI/trunk/src/Dam/Tests/DamEngineIo/FillXmlInputFromDamUiTests.cs =================================================================== diff -u -r2422 -r2468 --- DamClients/DamUI/trunk/src/Dam/Tests/DamEngineIo/FillXmlInputFromDamUiTests.cs (.../FillXmlInputFromDamUiTests.cs) (revision 2422) +++ DamClients/DamUI/trunk/src/Dam/Tests/DamEngineIo/FillXmlInputFromDamUiTests.cs (.../FillXmlInputFromDamUiTests.cs) (revision 2468) @@ -405,7 +405,7 @@ UpliftCriterionStability = 10.0 * i + 0.68, UpliftCriterionPiping = 10.0 * i + 0.69 }; - // DikeTableHeight, WaterHeight, WaterHeightLow, WaterHeightDecimeringsHoogte, MaxWaterHeight + // DikeTableHeight, WaterHeight, WaterHeightLow // are not written to the xml in waternetoptions, therefore don't set values for them here dike.Locations.Add(location); } Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/IO/CombineImportedData.cs =================================================================== diff -u -r2454 -r2468 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/IO/CombineImportedData.cs (.../CombineImportedData.cs) (revision 2454) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/IO/CombineImportedData.cs (.../CombineImportedData.cs) (revision 2468) @@ -716,11 +716,7 @@ scenarioRecord.WaterHeight : dikeLocation.WaterHeight; scenario.RiverLevelLow = scenarioRecord.WaterHeightLow.HasValue ? scenarioRecord.WaterHeightLow : dikeLocation.WaterHeightLow; - scenario.WaterHeightDecimeringsHoogte = scenarioRecord.WaterHeightDecimeringsHoogte.HasValue ? - scenarioRecord.WaterHeightDecimeringsHoogte : dikeLocation.WaterHeightDecimeringsHoogte; - scenario.MaxWaterLevel = scenarioRecord.MaxWaterHeight.HasValue ? - scenarioRecord.MaxWaterHeight : dikeLocation.MaxWaterHeight; - + dikeLocation.Scenarios.Add(scenario); } } @@ -880,9 +876,7 @@ location.DikeTableHeight = locationRecord.DikeTableHeight; location.WaterHeight = locationRecord.WaterHeight; location.WaterHeightLow = locationRecord.WaterHeightLow; - location.WaterHeightDecimeringsHoogte = locationRecord.WaterHeightDecimeringsHoogte; - location.MaxWaterHeight = locationRecord.MaxWaterHeight; - + if (!errorInrecord) { dike.Locations.Add(location); Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Location.cs =================================================================== diff -u -r2466 -r2468 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Location.cs (.../Location.cs) (revision 2466) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Location.cs (.../Location.cs) (revision 2468) @@ -122,9 +122,7 @@ public const string IntrusionVerticalWaterPressure = "IntrusionVerticalWaterPressure"; public const string DikeTableHeight = "DikeTableHeight"; public const string WaterHeight = "WaterHeight"; - public const string WaterHeightLow = "WaterHeightLow"; - public const string WaterHeightDecimeringsHoogte = "WaterHeightDecimeringsHoogte"; - public const string MaxWaterHeight = "MaxWaterHeight"; + public const string WaterHeightLow = "WaterHeightLow"; } [TrackChanges] @@ -235,10 +233,8 @@ private double? dikeTableHeight = null; private double? waterHeight = null; private double? waterHeightLow = null; - private double? waterHeightDecimeringsHoogte = null; - private double? maxWaterHeight = null; + - public Location() { SoilList = null; @@ -2214,48 +2210,6 @@ } } - [Unit(UnitType.Length)] - [Label("WaterHeightDecimeringsHoogte")] - [Description("Water height decimeringshoogte")] - [Format("F3")] - [Category(WaterCategory)] - [PropertyOrder(2, 17)] - [Clearable] - public virtual double? WaterHeightDecimeringsHoogte - { - get - { - return waterHeightDecimeringsHoogte; - } - set - { - DataEventPublisher.BeforeChange(this, "WaterHeightDecimeringsHoogte"); - waterHeightDecimeringsHoogte = value; - DataEventPublisher.AfterChange(this, "WaterHeightDecimeringsHoogte"); - } - } - - [Unit(UnitType.Length)] - [Label("MaxWaterHeight")] - [Description("Maximum water height")] - [Format("F3")] - [Category(WaterCategory)] - [PropertyOrder(2, 18)] - [Clearable] - public virtual double? MaxWaterHeight - { - get - { - return maxWaterHeight; - } - set - { - DataEventPublisher.BeforeChange(this, "MaxWaterHeight"); - maxWaterHeight = value; - DataEventPublisher.AfterChange(this, "MaxWaterHeight"); - } - } - #endregion /// @@ -2423,25 +2377,9 @@ { nameValuePairs.Add(LocationParameterNames.WaterHeightLow, WaterHeightLow.Value.ToString(numberFormatInfo)); } - if (WaterHeightDecimeringsHoogte.HasValue) - { - nameValuePairs.Add(LocationParameterNames.WaterHeightDecimeringsHoogte, WaterHeightDecimeringsHoogte.Value.ToString(numberFormatInfo)); - } - if (MaxWaterHeight.HasValue) - { - nameValuePairs.Add(LocationParameterNames.MaxWaterHeight, MaxWaterHeight.Value.ToString(numberFormatInfo)); - } return nameValuePairs; } - public void SetParametersByNameValuepairs(Dictionary nameValuePairs) - { - foreach (var nameValuePair in nameValuePairs) - { - SetParameterFromNameValuePair(nameValuePair.Key, nameValuePair.Value); - } - } - public void AddNewSensorData() { var factory = new SensorFactory(); @@ -2957,28 +2895,9 @@ if (parameterName.Equals(LocationParameterNames.WaterHeightLow)) { WaterHeightLow = Convert.ToDouble(parameterValue, numberFormatInfo); - } - if (parameterName.Equals(LocationParameterNames.WaterHeightDecimeringsHoogte)) - { - WaterHeightDecimeringsHoogte = Convert.ToDouble(parameterValue, numberFormatInfo); - } - if (parameterName.Equals(LocationParameterNames.MaxWaterHeight)) - { - MaxWaterHeight = Convert.ToDouble(parameterValue, numberFormatInfo); - } + } } - public ModelParametersForPLLines CreateModelParametersForPLLines() - { - return new ModelParametersForPLLines - { - PenetrationLength = PenetrationLength, - DampingFactorPL3 = DampingFactorPL3, - DampingFactorPL4 = DampingFactorPL4, - PLLineCreationMethod = PLLineCreationMethod - }; - } - #region IVisibleEnabled Members public bool IsEnabled(string property) @@ -3130,11 +3049,7 @@ return !isDesign; case "WaterHeightLow": return !isDesign; - case "WaterHeightDecimeringsHoogte": - return !isDesign; - case "MaxWaterHeight": - return !isDesign; - + default: return true; } Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/CsvImporters/CsvImporterLocations.cs =================================================================== diff -u -r2464 -r2468 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/CsvImporters/CsvImporterLocations.cs (.../CsvImporterLocations.cs) (revision 2464) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/CsvImporters/CsvImporterLocations.cs (.../CsvImporterLocations.cs) (revision 2468) @@ -119,9 +119,7 @@ public double? NewDepthDitch { get; set; } public double? DikeTableHeight { get; set; } public double? WaterHeight { get; set; } - public double? WaterHeightLow { get; set; } - public double? WaterHeightDecimeringsHoogte { get; set; } - public double? MaxWaterHeight { get; set; } + public double? WaterHeightLow { get; set; } } public CsvImporterLocations(string fileName) @@ -222,9 +220,7 @@ int colIndexDikeTableHeight = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.DikeTableHeightColumnName); int colIndexWaterHeight = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.WaterHeightColumnName); int colIndexWaterHeightLow = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.WaterHeightLowColumnName); - int colIndexWaterHeightDecimeringsHoogte = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.WaterHeightDecimeringsHoogteColumnName); - int colIndexMaxWaterHeight = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.MaxWaterHeightColumnName); - + var index = 1; while (csv.ReadNextRecord()) { @@ -619,16 +615,6 @@ colIndex = colIndexWaterHeightLow; locationRecord.WaterHeightLow = Convert.ToDouble(csv[colIndexWaterHeightLow]); } - if (colIndexWaterHeightDecimeringsHoogte > -1) - { - colIndex = colIndexWaterHeightDecimeringsHoogte; - locationRecord.WaterHeightDecimeringsHoogte = Convert.ToDouble(csv[colIndexWaterHeightDecimeringsHoogte]); - } - if (colIndexMaxWaterHeight > -1) - { - colIndex = colIndexMaxWaterHeight; - locationRecord.MaxWaterHeight = Convert.ToDouble(csv[colIndexMaxWaterHeight]); - } locationRecords.Add(locationRecord); } catch (Exception e) Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Importers/LocationShapeFileAttributeMap.cs =================================================================== diff -u -r2464 -r2468 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Importers/LocationShapeFileAttributeMap.cs (.../LocationShapeFileAttributeMap.cs) (revision 2464) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Importers/LocationShapeFileAttributeMap.cs (.../LocationShapeFileAttributeMap.cs) (revision 2468) @@ -683,24 +683,6 @@ /// public const string WaterHeightLowAttributeId = CsvColumnNames.WaterHeightLowColumnName; - /// - /// water_height_decimerings_hoogte - /// CustomShape - /// WaterHeightDecimeringsHoogte.shp - /// WaterHeightDecimeringsHoogte - /// double - /// - public const string WaterHeightDecimeringsHoogteAttributeId = CsvColumnNames.WaterHeightDecimeringsHoogteColumnName; - - /// - /// max_waterheight - /// CustomShape - /// MaxWaterHeight.shp - /// MaxWaterHeight - /// double - /// - public const string MaxWaterHeightAttributeId = CsvColumnNames.MaxWaterHeightColumnName; - #endregion internal static readonly IDictionary AttributePropertyMap; @@ -774,9 +756,7 @@ createItem(DikeTableHeightAttributeId, "DikeTableHeight.shp", "DikeTableHeight", (t, value) => t.DikeTableHeight = value.ToType() ), createItem(WaterHeightAttributeId, "WaterHeight.shp", "WaterHeight", (t, value) => t.WaterHeight = value.ToType() ), createItem(WaterHeightLowAttributeId, "WaterHeightLow.shp", "WaterHeightLow", (t, value) => t.WaterHeightLow = value.ToType() ), - createItem(WaterHeightDecimeringsHoogteAttributeId, "WaterHeightDecimeringsHoogte.shp", "WaterHeightDecimeringsHoogte", (t, value) => t.WaterHeightDecimeringsHoogte = value.ToType() ), - createItem(MaxWaterHeightAttributeId, "MaxWaterHeight.shp", "MaxWaterHeight", (t, value) => t.MaxWaterHeight = value.ToType() ), - + createItem(StabilityDesignMethodAttributeId, "DesignParameters.shp", "StabilityDesignMethod", (t, value) => t.StabilityDesignMethod = LocationImportHelper.ToStabilityDesignMethod(value) ), createItem(SlopeAdaptionStartCotangentAttributeId, "DesignParameters.shp", "SlopeAdaptionStartCotangent", (t, value) => t.SlopeAdaptionStartCotangent = value.ToType() ), createItem(SlopeAdaptionEndCotangentAttributeId, "DesignParameters.shp", "SlopeAdaptionEndCotangent", (t, value) => t.SlopeAdaptionEndCotangent = value.ToType() ), Index: DamClients/DamUI/trunk/src/Dam/Tests/IO/CombineImportedDataTest.cs =================================================================== diff -u -r2455 -r2468 --- DamClients/DamUI/trunk/src/Dam/Tests/IO/CombineImportedDataTest.cs (.../CombineImportedDataTest.cs) (revision 2455) +++ DamClients/DamUI/trunk/src/Dam/Tests/IO/CombineImportedDataTest.cs (.../CombineImportedDataTest.cs) (revision 2468) @@ -240,8 +240,6 @@ Assert.AreEqual(3.5, location.DikeTableHeight, tolerance); Assert.AreEqual(3.6, location.WaterHeight, tolerance); Assert.AreEqual(3.7, location.WaterHeightLow, tolerance); - Assert.AreEqual(3.8, location.WaterHeightDecimeringsHoogte, tolerance); - Assert.AreEqual(3.9, location.MaxWaterHeight, tolerance); } } Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Scenario.cs =================================================================== diff -u -r2441 -r2468 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Scenario.cs (.../Scenario.cs) (revision 2441) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Scenario.cs (.../Scenario.cs) (revision 2468) @@ -86,8 +86,6 @@ private static readonly Expression> ExpressionPlLineOffsetFactorBelowShoulderCrest = x => x.PlLineOffsetFactorBelowShoulderCrest; private static readonly Expression> ExpressionHeadPl3 = x => x.HeadPl3; private static readonly Expression> ExpressionHeadPl4 = x => x.HeadPl4; - private static readonly Expression> ExpressionWaterHeightDecimeringsHoogte = x => x.WaterHeightDecimeringsHoogte; - private static readonly Expression> ExpressionMaxWaterLevel = x => x.MaxWaterLevel; #endregion @@ -118,9 +116,7 @@ private double? plLineOffsetFactorBelowShoulderCrest; private double? headPl3; private double? headPl4; - private double? waterHeightDecimeringsHoogte; - private double? maxWaterLevel; - + [Browsable(false)] public CalculationResult CalculationResult { @@ -600,55 +596,7 @@ } } - /// - /// Gets or sets the water height decimeringshoogte. - /// - /// - /// The water height decimeringshoogte. - /// [Browsable(false)] - [Unit(UnitType.Length)] - [Format("F2")] - [Label("Water height decimeringshoogte")] - public double? WaterHeightDecimeringsHoogte - { - get - { - return waterHeightDecimeringsHoogte; - } - set - { - DataEventPublisher.BeforeChange(this, ExpressionWaterHeightDecimeringsHoogte); - waterHeightDecimeringsHoogte = value; - DataEventPublisher.AfterChange(this, ExpressionWaterHeightDecimeringsHoogte); - } - } - - /// - /// Gets or sets the maximum water level. - /// - /// - /// The maximum water level. - /// - [Browsable(false)] - [Unit(UnitType.Length)] - [Format("F2")] - [Label("Max water level")] - public double? MaxWaterLevel - { - get - { - return maxWaterLevel; - } - set - { - DataEventPublisher.BeforeChange(this, ExpressionMaxWaterLevel); - maxWaterLevel = value; - DataEventPublisher.AfterChange(this, ExpressionMaxWaterLevel); - } - } - - [Browsable(false)] public ModelFactors ModelFactors { get; set; } /// Aggregation relationship. @@ -1164,18 +1112,16 @@ /// public override string ToString() { - return String.Format("Location={0}, ID={1} RiverLevel={2} RiverLevelLow={3} DikeTableHeight={4} SafetyFactorStabilityInnerSlope={5} RequiredSafetyFactorStabilityOuterSlope={6} WaterHeightDecimeringsHoogte= {7} MaxWaterheight={8} ProbabilityOfFailureStabilityInnerslope={9} ProbabilityOfFailurePiping={10} PlLineOffsetBelowDikeTopAtRiver={11} PlLineOffsetBelowDikeToeAtPolder={12} PlLineOffsetBelowDikeTopAtPolder={13} PlLineOffsetBelowShoulderBaseInside={14} UsePlLineOffsetBelowDikeCrestMiddle {15} PlLineOffsetBelowDikeCrestMiddle {16} UsePlLineOffsetFactorBelowShoulderCrest {17} PlLineOffsetFactorBelowShoulderCrest {18} HeadPl3={19} HeadPl4={20}", + return String.Format("Location={0}, ID={1} RiverLevel={2} RiverLevelLow={3} DikeTableHeight={4} SafetyFactorStabilityInnerSlope={5} RequiredSafetyFactorStabilityOuterSlope={6} ProbabilityOfFailureStabilityInnerslope={7} ProbabilityOfFailurePiping={8} PlLineOffsetBelowDikeTopAtRiver={9} PlLineOffsetBelowDikeToeAtPolder={10} PlLineOffsetBelowDikeTopAtPolder={11} PlLineOffsetBelowShoulderBaseInside={12} UsePlLineOffsetBelowDikeCrestMiddle {13} PlLineOffsetBelowDikeCrestMiddle {14} UsePlLineOffsetFactorBelowShoulderCrest {15} PlLineOffsetFactorBelowShoulderCrest {16} HeadPl3={17} HeadPl4={18}", Location.Name, LocationScenarioID, RiverLevel, RiverLevelLow.HasValue ? RiverLevelLow.ToString() : "?", DikeTableHeight.HasValue ? DikeTableHeight.ToString() : "?", ModelFactors.RequiredSafetyFactorStabilityInnerSlope.HasValue ? ModelFactors.RequiredSafetyFactorStabilityInnerSlope.ToString() : "?", ModelFactors.RequiredSafetyFactorStabilityOuterSlope.HasValue ? ModelFactors.RequiredSafetyFactorStabilityOuterSlope.ToString() : "?", - WaterHeightDecimeringsHoogte.HasValue ? WaterHeightDecimeringsHoogte.ToString() : "?", - MaxWaterLevel.HasValue ? MaxWaterLevel.ToString() : "?", ModelFactors.RequiredProbabilityOfFailureStabilityInnerslope.HasValue ? ModelFactors.RequiredProbabilityOfFailureStabilityInnerslope.ToString() : "?", ModelFactors.RequiredProbabilityOfFailurePiping.HasValue ? ModelFactors.RequiredProbabilityOfFailurePiping.ToString() : "?", PlLineOffsetBelowDikeTopAtRiver.HasValue ? PlLineOffsetBelowDikeToeAtPolder.ToString() : "?", - PlLineOffsetBelowDikeToeAtPolder.HasValue ? MaxWaterLevel.ToString() : "?", + PlLineOffsetBelowDikeToeAtPolder.HasValue ? PlLineOffsetBelowDikeToeAtPolder.ToString() : "?", PlLineOffsetBelowDikeTopAtPolder.HasValue ? PlLineOffsetBelowDikeTopAtPolder.ToString() : "?", PlLineOffsetBelowShoulderBaseInside.HasValue ? PlLineOffsetBelowShoulderBaseInside.ToString() : "?", UsePlLineOffsetBelowDikeCrestMiddle.HasValue ? UsePlLineOffsetBelowDikeCrestMiddle.ToString() : "?", @@ -1186,45 +1132,6 @@ HeadPl4.HasValue ? HeadPl4.ToString() : "?"); } - /// - /// Determine waterlevels based on waterlevel, max waterlevel and decimatingheight - /// - /// - public double[] DetermineProperWaterlevelsForProbabilisticAdvanced() - { - double[] waterLevels = new double[3]; - - waterLevels[0] = (double)MaxWaterLevel; - waterLevels[1] = (double)MaxWaterLevel; - waterLevels[2] = (double)MaxWaterLevel; - - if (MaxWaterLevel > RiverLevel + WaterHeightDecimeringsHoogte) - { - waterLevels[0] = (double)(RiverLevel + WaterHeightDecimeringsHoogte); - waterLevels[1] = (double)RiverLevel; - waterLevels[2] = (double)(RiverLevel - WaterHeightDecimeringsHoogte); - } - else - { - if (MaxWaterLevel > RiverLevel) - { - waterLevels[0] = (double)MaxWaterLevel; - waterLevels[1] = (double)RiverLevel; - waterLevels[2] = (double)(RiverLevel - WaterHeightDecimeringsHoogte); - } - else - { - if (MaxWaterLevel > RiverLevel - WaterHeightDecimeringsHoogte) - { - waterLevels[0] = (double)MaxWaterLevel; - waterLevels[1] = (double)MaxWaterLevel; - waterLevels[2] = (double)(RiverLevel - WaterHeightDecimeringsHoogte); - } - } - } - return waterLevels; - } - public Dictionary GetParametersAsNameValuePairs() { var numberFormatInfo = new NumberFormatInfo(); @@ -1240,14 +1147,6 @@ { nameValuePairs.Add(ScenarioParameterNames.DikeTableHeight, DikeTableHeight.Value.ToString(numberFormatInfo)); } - if (WaterHeightDecimeringsHoogte != null) - { - nameValuePairs.Add(ScenarioParameterNames.WaterHeightDecimeringsHoogte, WaterHeightDecimeringsHoogte.Value.ToString(numberFormatInfo)); - } - if (MaxWaterLevel != null) - { - nameValuePairs.Add(ScenarioParameterNames.MaxWaterLevel, MaxWaterLevel.Value.ToString(numberFormatInfo)); - } if (ModelFactors != null) { if (ModelFactors.RequiredSafetyFactorStabilityInnerSlope != null) @@ -1338,10 +1237,6 @@ RiverLevelLow = Convert.ToDouble(parameterValue, numberFormatInfo); if (parameterName.Equals(ScenarioParameterNames.DikeTableHeight)) DikeTableHeight = Convert.ToDouble(parameterValue, numberFormatInfo); - if (parameterName.Equals(ScenarioParameterNames.WaterHeightDecimeringsHoogte)) - WaterHeightDecimeringsHoogte = Convert.ToDouble(parameterValue, numberFormatInfo); - if (parameterName.Equals(ScenarioParameterNames.MaxWaterLevel)) - MaxWaterLevel = Convert.ToDouble(parameterValue, numberFormatInfo); if (parameterName.Equals(ScenarioParameterNames.RequiredSafetyFactorStabilityInnerSlope)) ModelFactors.RequiredSafetyFactorStabilityInnerSlope = Convert.ToDouble(parameterValue, numberFormatInfo); if (parameterName.Equals(ScenarioParameterNames.RequiredSafetyFactorStabilityOuterSlope)) @@ -1443,9 +1338,7 @@ public const string RiverLevel = "RiverLevel"; public const string RiverLevelLow = "RiverLevelLow"; public const string DikeTableHeight = "DikeTableHeight"; - public const string WaterHeightDecimeringsHoogte = "WaterHeightDecimeringsHoogte"; - public const string MaxWaterLevel = "MaxWaterLevel"; - + public const string RequiredSafetyFactorStabilityInnerSlope = "RequiredSafetyFactorStabilityInnerSlope"; public const string RequiredSafetyFactorStabilityOuterSlope = "RequiredSafetyFactorStabilityOuterSlope"; public const string RequiredSafetyFactorPiping = "RequiredSafetyFactorPiping"; Index: DamClients/DamUI/trunk/src/Dam/Tests/Importers/LocationPropertyImporterTest.cs =================================================================== diff -u -r2422 -r2468 --- DamClients/DamUI/trunk/src/Dam/Tests/Importers/LocationPropertyImporterTest.cs (.../LocationPropertyImporterTest.cs) (revision 2422) +++ DamClients/DamUI/trunk/src/Dam/Tests/Importers/LocationPropertyImporterTest.cs (.../LocationPropertyImporterTest.cs) (revision 2468) @@ -255,9 +255,7 @@ NewSlopeAngleDitch = doubleInitialValue, DikeTableHeight = doubleInitialValue, WaterHeight = doubleInitialValue, - WaterHeightLow = doubleInitialValue, - WaterHeightDecimeringsHoogte = doubleInitialValue, - MaxWaterHeight = doubleInitialValue, + WaterHeightLow = doubleInitialValue }) { mockImporter.Targets = new List { location }; @@ -344,9 +342,7 @@ Assert.AreEqual(doubleTestValue, location.DikeTableHeight); Assert.AreEqual(doubleTestValue, location.WaterHeight); Assert.AreEqual(doubleTestValue, location.WaterHeightLow); - Assert.AreEqual(doubleTestValue, location.WaterHeightDecimeringsHoogte); - Assert.AreEqual(doubleTestValue, location.MaxWaterHeight); - + mocks.VerifyAll(); } } @@ -490,9 +486,7 @@ IntrusionVerticalWaterPressure = IntrusionVerticalWaterPressureType.Standard, DikeTableHeight = doubleInitialValue, WaterHeight = doubleInitialValue, - WaterHeightLow = doubleInitialValue, - WaterHeightDecimeringsHoogte = doubleInitialValue, - MaxWaterHeight = doubleInitialValue, + WaterHeightLow = doubleInitialValue }) { mockImporter.Targets = new List { location }; @@ -575,8 +569,6 @@ Assert.AreEqual(doubleTestValue, location.DikeTableHeight); Assert.AreEqual(doubleTestValue, location.WaterHeight); Assert.AreEqual(doubleTestValue, location.WaterHeightLow); - Assert.AreEqual(doubleTestValue, location.WaterHeightDecimeringsHoogte); - Assert.AreEqual(doubleTestValue, location.MaxWaterHeight); mocks.VerifyAll(); } Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Importers/CsvColumnNames.cs =================================================================== diff -u -r2464 -r2468 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Importers/CsvColumnNames.cs (.../CsvColumnNames.cs) (revision 2464) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Importers/CsvColumnNames.cs (.../CsvColumnNames.cs) (revision 2468) @@ -424,17 +424,7 @@ /// /// water_height_low /// - public const string WaterHeightLowColumnName = "water_height_low"; + public const string WaterHeightLowColumnName = "water_height_low"; - /// - /// water_height_decimerings_hoogte - /// - public const string WaterHeightDecimeringsHoogteColumnName = "water_height_decimerings_hoogte"; - - /// - /// max_waterheight - /// - public const string MaxWaterHeightColumnName = "max_waterheight"; - } } \ No newline at end of file Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/EntityFactory.cs =================================================================== diff -u -r2422 -r2468 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/EntityFactory.cs (.../EntityFactory.cs) (revision 2422) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/EntityFactory.cs (.../EntityFactory.cs) (revision 2468) @@ -343,9 +343,7 @@ location1.DikeTableHeight = 0.1; location1.WaterHeight = 0.2; location1.WaterHeightLow = 0.3; - location1.WaterHeightDecimeringsHoogte = 0.4; - location1.MaxWaterHeight = 0.5; - + dike.Locations.Add(location1); Location location2 = new Location(); location2.Name = "Location2"; Index: DamClients/DamUI/trunk/src/Dam/Tests/CsvImporterTest.cs =================================================================== diff -u -r2422 -r2468 --- DamClients/DamUI/trunk/src/Dam/Tests/CsvImporterTest.cs (.../CsvImporterTest.cs) (revision 2422) +++ DamClients/DamUI/trunk/src/Dam/Tests/CsvImporterTest.cs (.../CsvImporterTest.cs) (revision 2468) @@ -249,9 +249,7 @@ Assert.IsNotNull(dike.SurfaceLines2[0].CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.BottomDitchPolderSide)); Assert.AreEqual(null, dike.Locations[0].DikeTableHeight); Assert.AreEqual(null, dike.Locations[0].WaterHeight); - Assert.AreEqual(null, dike.Locations[0].WaterHeightLow); - Assert.AreEqual(null, dike.Locations[0].WaterHeightDecimeringsHoogte); - Assert.AreEqual(null, dike.Locations[0].MaxWaterHeight); + Assert.AreEqual(null, dike.Locations[0].WaterHeightLow); } } Index: DamClients/DamUI/trunk/src/Dam/Tests/CsvImporterTestsNew.cs =================================================================== diff -u -r2465 -r2468 --- DamClients/DamUI/trunk/src/Dam/Tests/CsvImporterTestsNew.cs (.../CsvImporterTestsNew.cs) (revision 2465) +++ DamClients/DamUI/trunk/src/Dam/Tests/CsvImporterTestsNew.cs (.../CsvImporterTestsNew.cs) (revision 2468) @@ -791,11 +791,7 @@ Assert.AreEqual(1.2, locationRecords[0].WaterHeight, tolerance); Assert.AreEqual(2.2, locationRecords[1].WaterHeight, tolerance); Assert.AreEqual(1.3, locationRecords[0].WaterHeightLow, tolerance); - Assert.AreEqual(2.3, locationRecords[1].WaterHeightLow, tolerance); - Assert.AreEqual(1.4, locationRecords[0].WaterHeightDecimeringsHoogte, tolerance); - Assert.AreEqual(2.4, locationRecords[1].WaterHeightDecimeringsHoogte, tolerance); - Assert.AreEqual(1.5, locationRecords[0].MaxWaterHeight, tolerance); - Assert.AreEqual(2.5, locationRecords[1].MaxWaterHeight, tolerance); + Assert.AreEqual(2.3, locationRecords[1].WaterHeightLow, tolerance); } [Test] @@ -813,8 +809,6 @@ Assert.AreEqual(0.0, scenarioRecords[0].WaterHeight); Assert.AreEqual(0.680, scenarioRecords[0].WaterHeightLow); Assert.AreEqual(21.110, scenarioRecords[0].DikeTableHeight); - Assert.AreEqual(0.0, scenarioRecords[0].WaterHeightDecimeringsHoogte); - Assert.AreEqual(1.120, scenarioRecords[0].MaxWaterHeight); Assert.AreEqual(31.600, scenarioRecords[0].SafetyFactorPiping); Assert.AreEqual(0.0, scenarioRecords[0].SafetyFactorStabilityInnerSlope); Assert.AreEqual(1.300, scenarioRecords[0].SafetyFactorStabilityOuterSlope); @@ -829,8 +823,6 @@ Assert.AreEqual(0.0, scenarioRecords[1].WaterHeight); Assert.AreEqual(1.680, scenarioRecords[1].WaterHeightLow); Assert.AreEqual(22.110, scenarioRecords[1].DikeTableHeight); - Assert.AreEqual(2.0, scenarioRecords[1].WaterHeightDecimeringsHoogte); - Assert.AreEqual(1.220, scenarioRecords[1].MaxWaterHeight); Assert.AreEqual(32.600, scenarioRecords[1].SafetyFactorPiping); Assert.AreEqual(1.0, scenarioRecords[1].SafetyFactorStabilityInnerSlope); Assert.AreEqual(1.400, scenarioRecords[1].SafetyFactorStabilityOuterSlope); @@ -856,8 +848,6 @@ Assert.AreEqual(0.0, scenarioRecords[0].WaterHeight); Assert.AreEqual(0.680, scenarioRecords[0].WaterHeightLow); Assert.AreEqual(21.110, scenarioRecords[0].DikeTableHeight); - Assert.AreEqual(0.0, scenarioRecords[0].WaterHeightDecimeringsHoogte); - Assert.AreEqual(1.120, scenarioRecords[0].MaxWaterHeight); Assert.AreEqual(31.600, scenarioRecords[0].SafetyFactorPiping); Assert.AreEqual(0.0, scenarioRecords[0].SafetyFactorStabilityInnerSlope); Assert.AreEqual(1.300, scenarioRecords[0].SafetyFactorStabilityOuterSlope); @@ -882,8 +872,6 @@ Assert.AreEqual(0.0, scenarioRecords[1].WaterHeight); Assert.AreEqual(1.680, scenarioRecords[1].WaterHeightLow); Assert.AreEqual(22.110, scenarioRecords[1].DikeTableHeight); - Assert.AreEqual(2.0, scenarioRecords[1].WaterHeightDecimeringsHoogte); - Assert.AreEqual(1.220, scenarioRecords[1].MaxWaterHeight); Assert.AreEqual(32.600, scenarioRecords[1].SafetyFactorPiping); Assert.AreEqual(1.0, scenarioRecords[1].SafetyFactorStabilityInnerSlope); Assert.AreEqual(1.400, scenarioRecords[1].SafetyFactorStabilityOuterSlope);