Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Importers/LocationShapeFileAttributeMap.cs =================================================================== diff -u -r2508 -r2512 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Importers/LocationShapeFileAttributeMap.cs (.../LocationShapeFileAttributeMap.cs) (revision 2508) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Importers/LocationShapeFileAttributeMap.cs (.../LocationShapeFileAttributeMap.cs) (revision 2512) @@ -581,20 +581,20 @@ /// /// water_height /// CustomShape - /// WaterHeight.shp - /// WaterHeight + /// RiverLevel.shp + /// RiverLevel /// double /// - public const string WaterHeightAttributeId = CsvColumnNames.WaterHeightColumnName; + public const string RiverLevelAttributeId = CsvColumnNames.RiverLevelColumnName; /// /// water_height_low /// CustomShape - /// WaterHeightLow.shp - /// WaterHeightLow + /// RiverLevelLow.shp + /// RiverLevelLow /// double /// - public const string WaterHeightLowAttributeId = CsvColumnNames.WaterHeightLowColumnName; + public const string RiverLevelLowAttributeId = CsvColumnNames.RiverLevelLowColumnName; #endregion @@ -657,8 +657,8 @@ createItem(XSoilGeometry2DOriginAttributeId, "XSoilGeometry2DOrigin.shp", "XG2DOrg", (t, value) => t.XSoilGeometry2DOrigin = value.ToType()), createItem(SlopeDampingPiezometricHeightPolderSideAttributeId, "SlopeDampingPiezometricHeightPolderSide.shp", "SlopeDampingPiezometricHeightPolderSide", (t, value) => t.SlopeDampingPiezometricHeightPolderSide = value.ToType() ), 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(RiverLevelAttributeId, "RiverLevel.shp", "RiverLevel", (t, value) => t.RiverLevel = value.ToType() ), + createItem(RiverLevelLowAttributeId, "RiverLevelLow.shp", "RiverLevelLow", (t, value) => t.RiverLevelLow = 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() ), Index: DamClients/DamUI/trunk/src/Dam/Tests/DamEngineIo/FillXmlInputFromDamUiTests.cs =================================================================== diff -u -r2510 -r2512 --- DamClients/DamUI/trunk/src/Dam/Tests/DamEngineIo/FillXmlInputFromDamUiTests.cs (.../FillXmlInputFromDamUiTests.cs) (revision 2510) +++ DamClients/DamUI/trunk/src/Dam/Tests/DamEngineIo/FillXmlInputFromDamUiTests.cs (.../FillXmlInputFromDamUiTests.cs) (revision 2512) @@ -405,7 +405,7 @@ UpliftCriterionStability = 10.0 * i + 0.68, UpliftCriterionPiping = 10.0 * i + 0.69 }; - // DikeTableHeight, WaterHeight, WaterHeightLow + // DikeTableHeight, RiverLevel, RiverLevelLow // are not written to the xml in waternetoptions, therefore don't set values for them here dike.Locations.Add(location); } @@ -636,7 +636,6 @@ input = DamXmlSerialization.LoadInputFromXmlString(xmlString); DamProjectData actualDamProjectData = FillDamUiFromXmlInput.CreateDamProjectData(input); CompareDamProjectData(actualDamProjectData, expectedDamProjectData); - } } } Index: DamClients/DamUI/trunk/src/Dam/Tests/CsvImporterTest.cs =================================================================== diff -u -r2508 -r2512 --- DamClients/DamUI/trunk/src/Dam/Tests/CsvImporterTest.cs (.../CsvImporterTest.cs) (revision 2508) +++ DamClients/DamUI/trunk/src/Dam/Tests/CsvImporterTest.cs (.../CsvImporterTest.cs) (revision 2512) @@ -245,8 +245,8 @@ Assert.AreEqual(13, dike.SurfaceLines2[0].CharacteristicPoints.Count(cp => cp.CharacteristicPointType != CharacteristicPointType.None)); 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].RiverLevel); + Assert.AreEqual(null, dike.Locations[0].RiverLevelLow); } } Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/CsvImporters/CsvImporterLocations.cs =================================================================== diff -u -r2508 -r2512 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/CsvImporters/CsvImporterLocations.cs (.../CsvImporterLocations.cs) (revision 2508) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/CsvImporters/CsvImporterLocations.cs (.../CsvImporterLocations.cs) (revision 2512) @@ -107,8 +107,8 @@ public double? NewSlopeAngleDitch { get; set; } public double? NewDepthDitch { get; set; } public double? DikeTableHeight { get; set; } - public double? WaterHeight { get; set; } - public double? WaterHeightLow { get; set; } + public double? RiverLevel { get; set; } + public double? RiverLevelLow { get; set; } } public CsvImporterLocations(string fileName) @@ -196,8 +196,8 @@ int colIndexNewSlopeAngleDitch = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.NewSlopeAngleDitchColumnName); int colIndexNewDepthDitch = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.NewDepthDitchColumnName); int colIndexDikeTableHeight = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.DikeTableHeightColumnName); - int colIndexWaterHeight = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.WaterHeightColumnName); - int colIndexWaterHeightLow = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.WaterHeightLowColumnName); + int colIndexRiverLevel = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.RiverLevelColumnName); + int colIndexRiverLevelLow = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.RiverLevelLowColumnName); var index = 1; while (csv.ReadNextRecord()) @@ -528,15 +528,15 @@ colIndex = colIndexDikeTableHeight; locationRecord.DikeTableHeight = Convert.ToDouble(csv[colIndexDikeTableHeight]); } - if (colIndexWaterHeight > -1) + if (colIndexRiverLevel > -1) { - colIndex = colIndexWaterHeight; - locationRecord.WaterHeight = Convert.ToDouble(csv[colIndexWaterHeight]); + colIndex = colIndexRiverLevel; + locationRecord.RiverLevel = Convert.ToDouble(csv[colIndexRiverLevel]); } - if (colIndexWaterHeightLow > -1) + if (colIndexRiverLevelLow > -1) { - colIndex = colIndexWaterHeightLow; - locationRecord.WaterHeightLow = Convert.ToDouble(csv[colIndexWaterHeightLow]); + colIndex = colIndexRiverLevelLow; + locationRecord.RiverLevelLow = Convert.ToDouble(csv[colIndexRiverLevelLow]); } locationRecords.Add(locationRecord); } Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/CsvImporters/CsvImporterScenarios.cs =================================================================== diff -u -r2491 -r2512 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/CsvImporters/CsvImporterScenarios.cs (.../CsvImporterScenarios.cs) (revision 2491) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/CsvImporters/CsvImporterScenarios.cs (.../CsvImporterScenarios.cs) (revision 2512) @@ -59,8 +59,8 @@ public int ScenarioRecordId { get; set; } public string LocationId { get; set; } //required public string LocationScenarioId { get; set; } //required - public double? WaterHeight { get; set; } //optional - public double? WaterHeightLow { get; set; } //optional + public double? RiverLevel { get; set; } //optional + public double? RiverLevelLow { get; set; } //optional public double? DikeTableHeight { get; set; } //optional public double? PlLineOffsetBelowDikeTopAtRiver { get; set; } //optional public double? PlLineOffsetBelowDikeTopAtPolder { get; set; } //optional @@ -141,8 +141,8 @@ int colIndexLocationScenarioId = CsvReaderUtilities.GetHeaderIndexByString(headers, fieldLocationScenarioId); CheckColumn(colIndexLocationScenarioId, fileName, fieldLocationScenarioId); - int colIndexWaterHeight = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.WaterHeightColumnName); - int colIndexWaterHeightLow = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.WaterHeightLowColumnName); + int colIndexRiverLevel = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.RiverLevelColumnName); + int colIndexRiverLevelLow = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.RiverLevelLowColumnName); int colIndexDikeTableHeight = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.DikeTableHeightColumnName); int colIndexSafetyFactorPiping = CsvReaderUtilities.GetHeaderIndexByString(headers, ModelFactorCsvIdentifiers.SafetyFactorPiping); @@ -178,19 +178,19 @@ string value = csv[colIndexLocationScenarioId]; scenario.LocationScenarioId = string.IsNullOrWhiteSpace(value) ? null : value; - if (colIndexWaterHeight > -1) + if (colIndexRiverLevel > -1) { - colIndex = colIndexWaterHeight; - scenario.WaterHeight = Convert.ToDouble(csv[colIndexWaterHeight]); + colIndex = colIndexRiverLevel; + scenario.RiverLevel = Convert.ToDouble(csv[colIndexRiverLevel]); } - if (colIndexWaterHeightLow > -1) + if (colIndexRiverLevelLow > -1) { - colIndex = colIndexWaterHeightLow; - scenario.WaterHeightLow = Convert.ToDouble(csv[colIndex]); + colIndex = colIndexRiverLevelLow; + scenario.RiverLevelLow = Convert.ToDouble(csv[colIndex]); } else { - scenario.WaterHeightLow = scenario.WaterHeight; + scenario.RiverLevelLow = scenario.RiverLevel; } if (colIndexDikeTableHeight > -1) { Index: DamClients/DamUI/trunk/src/Dam/Tests/IO/CombineImportedDataTest.cs =================================================================== diff -u -r2508 -r2512 --- DamClients/DamUI/trunk/src/Dam/Tests/IO/CombineImportedDataTest.cs (.../CombineImportedDataTest.cs) (revision 2508) +++ DamClients/DamUI/trunk/src/Dam/Tests/IO/CombineImportedDataTest.cs (.../CombineImportedDataTest.cs) (revision 2512) @@ -227,8 +227,8 @@ Assert.AreEqual(0.2, location.StabilityShoulderGrowDeltaX, tolerance); Assert.AreEqual(0.5, location.StabilitySlopeAdaptionDeltaX, tolerance); Assert.AreEqual(3.5, location.DikeTableHeight, tolerance); - Assert.AreEqual(3.6, location.WaterHeight, tolerance); - Assert.AreEqual(3.7, location.WaterHeightLow, tolerance); + Assert.AreEqual(3.6, location.RiverLevel, tolerance); + Assert.AreEqual(3.7, location.RiverLevelLow, tolerance); } } Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Importers/CsvColumnNames.cs =================================================================== diff -u -r2508 -r2512 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Importers/CsvColumnNames.cs (.../CsvColumnNames.cs) (revision 2508) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Importers/CsvColumnNames.cs (.../CsvColumnNames.cs) (revision 2512) @@ -364,12 +364,12 @@ /// /// water_height /// - public const string WaterHeightColumnName = "water_height"; + public const string RiverLevelColumnName = "water_height"; /// /// water_height_low /// - public const string WaterHeightLowColumnName = "water_height_low"; + public const string RiverLevelLowColumnName = "water_height_low"; } } \ No newline at end of file Index: DamClients/DamUI/trunk/src/Dam/Tests/Sensors/SensorLocationTests.cs =================================================================== diff -u -r2422 -r2512 --- DamClients/DamUI/trunk/src/Dam/Tests/Sensors/SensorLocationTests.cs (.../SensorLocationTests.cs) (revision 2422) +++ DamClients/DamUI/trunk/src/Dam/Tests/Sensors/SensorLocationTests.cs (.../SensorLocationTests.cs) (revision 2512) @@ -786,8 +786,8 @@ var sensorValues = new Dictionary { { sensor, testValue } }; var sensorLocation = CreateValidSensorLocation(); - location.WaterHeight = testValue; - Assert.AreEqual(testValue, location.WaterHeight); + location.RiverLevel = testValue; + Assert.AreEqual(testValue, location.RiverLevel); sensorLocation.SourceTypePl1WaterLevelAtRiver = DataSourceTypeSensors.LocationData; Index: DamClients/DamUI/trunk/src/Dam/Tests/Importers/LocationPropertyImporterTest.cs =================================================================== diff -u -r2508 -r2512 --- DamClients/DamUI/trunk/src/Dam/Tests/Importers/LocationPropertyImporterTest.cs (.../LocationPropertyImporterTest.cs) (revision 2508) +++ DamClients/DamUI/trunk/src/Dam/Tests/Importers/LocationPropertyImporterTest.cs (.../LocationPropertyImporterTest.cs) (revision 2512) @@ -233,8 +233,8 @@ NewDepthDitch = doubleInitialValue, NewSlopeAngleDitch = doubleInitialValue, DikeTableHeight = doubleInitialValue, - WaterHeight = doubleInitialValue, - WaterHeightLow = doubleInitialValue + RiverLevel = doubleInitialValue, + RiverLevelLow = doubleInitialValue }) { mockImporter.Targets = new List { location }; @@ -309,8 +309,8 @@ Assert.AreEqual(doubleTestValue, location.SlopeAdaptionEndCotangent); Assert.AreEqual(doubleTestValue, location.SlopeAdaptionStepCotangent); Assert.AreEqual(doubleTestValue, location.DikeTableHeight); - Assert.AreEqual(doubleTestValue, location.WaterHeight); - Assert.AreEqual(doubleTestValue, location.WaterHeightLow); + Assert.AreEqual(doubleTestValue, location.RiverLevel); + Assert.AreEqual(doubleTestValue, location.RiverLevelLow); mocks.VerifyAll(); } @@ -432,8 +432,8 @@ SlopeDampingPiezometricHeightPolderSide = doubleInitialValue, IntrusionVerticalWaterPressure = IntrusionVerticalWaterPressureType.Standard, DikeTableHeight = doubleInitialValue, - WaterHeight = doubleInitialValue, - WaterHeightLow = doubleInitialValue + RiverLevel = doubleInitialValue, + RiverLevelLow = doubleInitialValue }) { mockImporter.Targets = new List { location }; @@ -504,8 +504,8 @@ Assert.AreEqual(doubleTestValue, location.SlopeAdaptionEndCotangent); Assert.AreEqual(doubleTestValue, location.SlopeAdaptionStepCotangent); Assert.AreEqual(doubleTestValue, location.DikeTableHeight); - Assert.AreEqual(doubleTestValue, location.WaterHeight); - Assert.AreEqual(doubleTestValue, location.WaterHeightLow); + Assert.AreEqual(doubleTestValue, location.RiverLevel); + Assert.AreEqual(doubleTestValue, location.RiverLevelLow); mocks.VerifyAll(); } Index: DamClients/DamUI/trunk/src/Dam/Tests/DataPluginImporterTests.cs =================================================================== diff -u -r2506 -r2512 --- DamClients/DamUI/trunk/src/Dam/Tests/DataPluginImporterTests.cs (.../DataPluginImporterTests.cs) (revision 2506) +++ DamClients/DamUI/trunk/src/Dam/Tests/DataPluginImporterTests.cs (.../DataPluginImporterTests.cs) (revision 2512) @@ -261,12 +261,12 @@ } } - private void CreateLocationsFileWithWaterHeight(string importFile) + private void CreateLocationsFileWithRiverLevel(string importFile) { // A valid locations.csv has at least 3 columns // Required are location_id, surfaceline_id, segment_id. // For the test we need dikering_id as well. - // Include column for WaterHeight + // Include column for RiverLevel=water_height if (File.Exists(importFile)) File.Delete(importFile); using (var writer = File.CreateText(importFile)) @@ -277,12 +277,12 @@ } } - private void CreateLocationsFileWithoutWaterHeight(string importFile) + private void CreateLocationsFileWithoutRiverLevel(string importFile) { // A valid locations.csv has at least 3 columns // Required are location_id, surfaceline_id, segment_id. // For the test we need dikering_id as well. - // Do NOT include column for WaterHeight + // Do NOT include column for RiverLevel=water_height if (File.Exists(importFile)) File.Delete(importFile); using (var writer = File.CreateText(importFile)) @@ -293,11 +293,11 @@ } } - private void CreateScenariosFileWithWaterHeight(string importFile) + private void CreateScenariosFileWithRiverLevel(string importFile) { // A valid scenarios.csv has at least 2 columns // Required are location_id, location_scenario_id - // Include column for WaterHeight + // Include column for RiverLevel=water_height if (File.Exists(importFile)) File.Delete(importFile); using (var writer = File.CreateText(importFile)) @@ -308,11 +308,11 @@ } } - private void CreateScenariosFileWithoutWaterHeight(string importFile) + private void CreateScenariosFileWithoutRiverLevel(string importFile) { // A valid scenarios.csv has at least 2 columns // Required are location_id, location_scenario_id - // Do NOT include column for WaterHeight + // Do NOT include column for RiverLevel=water_height if (File.Exists(importFile)) File.Delete(importFile); using (var writer = File.CreateText(importFile)) @@ -324,12 +324,12 @@ } [Test] - // WaterHeight must be specified in locations.csv, shapefile or scenarios.csv - // In this test reading from shapefile is skipped, WaterHeight is defined in locations, not in scenarios - public void ImportWaterHeightFromLocationsTest() + // RiverLevel must be specified in locations.csv, shapefile or scenarios.csv + // In this test reading from shapefile is skipped, RiverLevel is defined in locations, not in scenarios + public void ImportRiverLevelFromLocationsTest() { - // Setup folder for situation where WaterHeight is specified in locations - var importFolder = Path.Combine(Directory.GetCurrentDirectory(), "TmpImportFilesWaterHeightFromLocations"); + // Setup folder for situation where RiverLevel is specified in locations + var importFolder = Path.Combine(Directory.GetCurrentDirectory(), "TmpImportFilesRiverLevelFromLocations"); if (!Directory.Exists(importFolder)) Directory.CreateDirectory(importFolder); srcDataSources = new List @@ -342,12 +342,12 @@ }; // Create basic datafiles that are needed to succeed the import method CreateBasicDataFiles(importFolder); - // Create locations.csv that includes waterheight + // Create locations.csv that includes RiverLevel string importLocationsFile = importFolder + "\\locations.csv"; - CreateLocationsFileWithWaterHeight(importLocationsFile); - // Create scenarios.csv that does NOT include waterheight + CreateLocationsFileWithRiverLevel(importLocationsFile); + // Create scenarios.csv that does NOT include RiverLevel var importScenarioFile = importFolder + "\\scenarios.csv"; - CreateScenariosFileWithoutWaterHeight(importScenarioFile); + CreateScenariosFileWithoutRiverLevel(importScenarioFile); dataPluginImporter = new DataPluginImporter(); dataPluginImporter.SetDataSources("", srcDataSources); @@ -368,12 +368,12 @@ } [Test] - // WaterHeight must be specified in locations.csv, shapefile or scenarios.csv - // In this test reading from shapefile is skipped, WaterHeight is defined in locations and in scenarios - public void ImportWaterHeightFromScenariosTest() + // RiverLevel must be specified in locations.csv, shapefile or scenarios.csv + // In this test reading from shapefile is skipped, RiverLevel is defined in locations and in scenarios + public void ImportRiverLevelFromScenariosTest() { - // Setup folder for situation where WaterHeight is specified in locations and scenarios - var importFolder = Path.Combine(Directory.GetCurrentDirectory(), "TmpImportFilesWaterHeightFromScenarios"); + // Setup folder for situation where RiverLevel is specified in locations and scenarios + var importFolder = Path.Combine(Directory.GetCurrentDirectory(), "TmpImportFilesRiverLevelFromScenarios"); if (!Directory.Exists(importFolder)) Directory.CreateDirectory(importFolder); srcDataSources = new List @@ -386,12 +386,12 @@ }; // Create basic datafiles that are needed to succeed the import method CreateBasicDataFiles(importFolder); - // Create locations.csv that includes waterheight + // Create locations.csv that includes RiverLevel string importLocationsFile = importFolder + "\\locations.csv"; - CreateLocationsFileWithWaterHeight(importLocationsFile); - // Create scenarios.csv that includes waterheight + CreateLocationsFileWithRiverLevel(importLocationsFile); + // Create scenarios.csv that includes RiverLevel var importScenarioFile = importFolder + "\\scenarios.csv"; - CreateScenariosFileWithWaterHeight(importScenarioFile); + CreateScenariosFileWithRiverLevel(importScenarioFile); dataPluginImporter = new DataPluginImporter(); dataPluginImporter.SetDataSources("", srcDataSources); @@ -412,12 +412,12 @@ } [Test] - // WaterHeight must be specified in locations.csv, shapefile or scenarios.csv - // In this test reading from shapefile is skipped, WaterHeight is NOT defined in locations or scenarios - public void ImportWaterHeightNotSpecifiedTest() + // RiverLevel must be specified in locations.csv, shapefile or scenarios.csv + // In this test reading from shapefile is skipped, RiverLevel is NOT defined in locations or scenarios + public void ImportRiverLevelNotSpecifiedTest() { - // Setup folder for situation where WaterHeight is NOT specified in locations and scenarios - var importFolder = Path.Combine(Directory.GetCurrentDirectory(), "TmpImportFilesWaterHeightNotSpecified"); + // Setup folder for situation where RiverLevel is NOT specified in locations and scenarios + var importFolder = Path.Combine(Directory.GetCurrentDirectory(), "TmpImportFilesRiverLevelNotSpecified"); if (!Directory.Exists(importFolder)) Directory.CreateDirectory(importFolder); srcDataSources = new List @@ -430,12 +430,12 @@ }; // Create basic datafiles that are needed to succeed the import method CreateBasicDataFiles(importFolder); - // Create locations.csv that includes waterheight + // Create locations.csv that includes RiverLevel string importLocationsFile = importFolder + "\\locations.csv"; - CreateLocationsFileWithoutWaterHeight(importLocationsFile); - // Create scenarios.csv that includes waterheight + CreateLocationsFileWithoutRiverLevel(importLocationsFile); + // Create scenarios.csv that includes RiverLevel var importScenarioFile = importFolder + "\\scenarios.csv"; - CreateScenariosFileWithoutWaterHeight(importScenarioFile); + CreateScenariosFileWithoutRiverLevel(importScenarioFile); dataPluginImporter = new DataPluginImporter(); dataPluginImporter.SetDataSources("", srcDataSources); Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/IO/CombineImportedData.cs =================================================================== diff -u -r2508 -r2512 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/IO/CombineImportedData.cs (.../CombineImportedData.cs) (revision 2508) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/IO/CombineImportedData.cs (.../CombineImportedData.cs) (revision 2512) @@ -685,10 +685,10 @@ scenarioRecord.HeadPl4 : dikeLocation.HeadPl4; scenario.DikeTableHeight = scenarioRecord.DikeTableHeight.HasValue ? scenarioRecord.DikeTableHeight : dikeLocation.DikeTableHeight; - scenario.RiverLevel = scenarioRecord.WaterHeight.HasValue ? - scenarioRecord.WaterHeight : dikeLocation.WaterHeight; - scenario.RiverLevelLow = scenarioRecord.WaterHeightLow.HasValue ? - scenarioRecord.WaterHeightLow : dikeLocation.WaterHeightLow; + scenario.RiverLevel = scenarioRecord.RiverLevel.HasValue ? + scenarioRecord.RiverLevel : dikeLocation.RiverLevel; + scenario.RiverLevelLow = scenarioRecord.RiverLevelLow.HasValue ? + scenarioRecord.RiverLevelLow : dikeLocation.RiverLevelLow; dikeLocation.Scenarios.Add(scenario); } @@ -837,8 +837,8 @@ location.UseNewShoulderTopSlope = locationRecord.UseNewShoulderTopSlope.GetValueOrDefault(location.UseNewShoulderTopSlope); location.DikeTableHeight = locationRecord.DikeTableHeight; - location.WaterHeight = locationRecord.WaterHeight; - location.WaterHeightLow = locationRecord.WaterHeightLow; + location.RiverLevel = locationRecord.RiverLevel; + location.RiverLevelLow = locationRecord.RiverLevelLow; if (!errorInrecord) { Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Location.cs =================================================================== diff -u -r2511 -r2512 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Location.cs (.../Location.cs) (revision 2511) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Location.cs (.../Location.cs) (revision 2512) @@ -112,8 +112,8 @@ public const string UseNewShoulderTopSlope = "UseNewShoulderTopSlope"; public const string IntrusionVerticalWaterPressure = "IntrusionVerticalWaterPressure"; public const string DikeTableHeight = "DikeTableHeight"; - public const string WaterHeight = "WaterHeight"; - public const string WaterHeightLow = "WaterHeightLow"; + public const string RiverLevel = "RiverLevel"; + public const string RiverLevelLow = "RiverLevelLow"; } [TrackChanges] @@ -215,8 +215,8 @@ private IntrusionVerticalWaterPressureType? intrusionVerticalWaterPressure = IntrusionVerticalWaterPressureType.Standard; private double? dikeTableHeight = null; - private double? waterHeight = null; - private double? waterHeightLow = null; + private double? riverLevel = null; + private double? riverLevelLow = null; public Location() @@ -2049,65 +2049,65 @@ } [Unit(UnitType.Length)] - [Label("DikeTableHeight")] - [Description("Dike table height")] + [Label("River level")] + [Description("Water level in river")] [Format("F3")] [Category(WaterCategory)] - [PropertyOrder(2, 14)] + [PropertyOrder(2, 6)] [Clearable] - public virtual double? DikeTableHeight + public virtual double? RiverLevel { get { - return dikeTableHeight; + return riverLevel; } set { - DataEventPublisher.BeforeChange(this, "DikeTableHeight"); - dikeTableHeight = value; - DataEventPublisher.AfterChange(this, "DikeTableHeight"); + DataEventPublisher.BeforeChange(this, "RiverLevel"); + riverLevel = value; + DataEventPublisher.AfterChange(this, "RiverLevel"); } } [Unit(UnitType.Length)] - [Label("WaterHeight")] - [Description("Water height")] + [Label("River level low")] + [Description("Water height low")] [Format("F3")] [Category(WaterCategory)] - [PropertyOrder(2, 15)] + [PropertyOrder(2, 7)] [Clearable] - public virtual double? WaterHeight + public virtual double? RiverLevelLow { get { - return waterHeight; + return riverLevelLow; } set { - DataEventPublisher.BeforeChange(this, "WaterHeight"); - waterHeight = value; - DataEventPublisher.AfterChange(this, "WaterHeight"); + DataEventPublisher.BeforeChange(this, "RiverLevelLow"); + riverLevelLow = value; + DataEventPublisher.AfterChange(this, "RiverLevelLow"); } } [Unit(UnitType.Length)] - [Label("WaterHeightLow")] - [Description("Water height low")] + [Label("Dike table height")] + [Description("Dike table height")] [Format("F3")] [Category(WaterCategory)] - [PropertyOrder(2, 16)] + [PropertyOrder(2, 8)] [Clearable] - public virtual double? WaterHeightLow + public virtual double? DikeTableHeight { get { - return waterHeightLow; + return dikeTableHeight; } set { - DataEventPublisher.BeforeChange(this, "WaterHeightLow"); - waterHeightLow = value; - DataEventPublisher.AfterChange(this, "WaterHeightLow"); + DataEventPublisher.BeforeChange(this, "DikeTableHeight"); + dikeTableHeight = value; + DataEventPublisher.AfterChange(this, "DikeTableHeight"); } } @@ -2259,13 +2259,13 @@ { nameValuePairs.Add(LocationParameterNames.DikeTableHeight, DikeTableHeight.Value.ToString(numberFormatInfo)); } - if (WaterHeight.HasValue) + if (RiverLevel.HasValue) { - nameValuePairs.Add(LocationParameterNames.WaterHeight, WaterHeight.Value.ToString(numberFormatInfo)); + nameValuePairs.Add(LocationParameterNames.RiverLevel, RiverLevel.Value.ToString(numberFormatInfo)); } - if (WaterHeightLow.HasValue) + if (RiverLevelLow.HasValue) { - nameValuePairs.Add(LocationParameterNames.WaterHeightLow, WaterHeightLow.Value.ToString(numberFormatInfo)); + nameValuePairs.Add(LocationParameterNames.RiverLevelLow, RiverLevelLow.Value.ToString(numberFormatInfo)); } return nameValuePairs; } @@ -2745,13 +2745,13 @@ { DikeTableHeight = Convert.ToDouble(parameterValue, numberFormatInfo); } - if (parameterName.Equals(LocationParameterNames.WaterHeight)) + if (parameterName.Equals(LocationParameterNames.RiverLevel)) { - WaterHeight = Convert.ToDouble(parameterValue, numberFormatInfo); + RiverLevel = Convert.ToDouble(parameterValue, numberFormatInfo); } - if (parameterName.Equals(LocationParameterNames.WaterHeightLow)) + if (parameterName.Equals(LocationParameterNames.RiverLevelLow)) { - WaterHeightLow = Convert.ToDouble(parameterValue, numberFormatInfo); + RiverLevelLow = Convert.ToDouble(parameterValue, numberFormatInfo); } } @@ -2877,8 +2877,8 @@ case "HeadPl3": case "HeadPl4": case "DikeTableHeight": - case "WaterHeight": - case "WaterHeightLow": + case "RiverLevel": + case "RiverLevelLow": return !isDesign; default: Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Sensors/SensorLocation.cs =================================================================== diff -u -r2422 -r2512 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Sensors/SensorLocation.cs (.../SensorLocation.cs) (revision 2422) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Sensors/SensorLocation.cs (.../SensorLocation.cs) (revision 2512) @@ -273,9 +273,9 @@ } [Browsable(false)] - public double? WaterHeight + public double? RiverLevel { - get { return Location.WaterHeight; } + get { return Location.RiverLevel; } } [Browsable(false)] @@ -423,7 +423,7 @@ if (memberName == MemberNames.WaterLevelAtRiver) { if (SourceTypePl1WaterLevelAtRiver == DataSourceTypeSensors.LocationData) - return Location.WaterHeight; + return Location.RiverLevel; if (SourceTypePl1WaterLevelAtRiver == DataSourceTypeSensors.Sensor) return sensorValues[sensor]; Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/EntityFactory.cs =================================================================== diff -u -r2508 -r2512 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/EntityFactory.cs (.../EntityFactory.cs) (revision 2508) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/EntityFactory.cs (.../EntityFactory.cs) (revision 2512) @@ -330,8 +330,8 @@ location1.ModelFactors.UpliftCriterionPiping = 1.14; location1.ModelFactors.UpliftCriterionStability = 1.15; location1.DikeTableHeight = 0.1; - location1.WaterHeight = 0.2; - location1.WaterHeightLow = 0.3; + location1.RiverLevel = 0.2; + location1.RiverLevelLow = 0.3; dike.Locations.Add(location1); Location location2 = new Location(); Index: DamClients/DamUI/trunk/src/Dam/Tests/LocationTest.cs =================================================================== diff -u -r2495 -r2512 --- DamClients/DamUI/trunk/src/Dam/Tests/LocationTest.cs (.../LocationTest.cs) (revision 2495) +++ DamClients/DamUI/trunk/src/Dam/Tests/LocationTest.cs (.../LocationTest.cs) (revision 2512) @@ -109,10 +109,10 @@ { // setup const double expected = 1.1; - using (var location = new Location("test") {WaterHeight = expected}) + using (var location = new Location("test") {RiverLevel = expected}) { // checks - Assert.AreEqual(expected, location.WaterHeight); + Assert.AreEqual(expected, location.RiverLevel); } } Index: DamClients/DamUI/trunk/src/Dam/Tests/CsvImporterTestsNew.cs =================================================================== diff -u -r2508 -r2512 --- DamClients/DamUI/trunk/src/Dam/Tests/CsvImporterTestsNew.cs (.../CsvImporterTestsNew.cs) (revision 2508) +++ DamClients/DamUI/trunk/src/Dam/Tests/CsvImporterTestsNew.cs (.../CsvImporterTestsNew.cs) (revision 2512) @@ -775,10 +775,10 @@ Assert.AreEqual(IntrusionVerticalWaterPressureType.SemiTimeDependent, locationRecords[1].IntrusionVerticalWaterPressure); Assert.AreEqual(3.5, locationRecords[0].DikeTableHeight, tolerance); Assert.AreEqual(3.5, locationRecords[1].DikeTableHeight, tolerance); - 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.2, locationRecords[0].RiverLevel, tolerance); + Assert.AreEqual(2.2, locationRecords[1].RiverLevel, tolerance); + Assert.AreEqual(1.3, locationRecords[0].RiverLevelLow, tolerance); + Assert.AreEqual(2.3, locationRecords[1].RiverLevelLow, tolerance); } [Test] @@ -793,8 +793,8 @@ Assert.AreEqual("D1", scenarioRecords[0].LocationId); Assert.AreEqual("1", scenarioRecords[0].LocationScenarioId); - Assert.AreEqual(0.0, scenarioRecords[0].WaterHeight); - Assert.AreEqual(0.680, scenarioRecords[0].WaterHeightLow); + Assert.AreEqual(0.0, scenarioRecords[0].RiverLevel); + Assert.AreEqual(0.680, scenarioRecords[0].RiverLevelLow); Assert.AreEqual(21.110, scenarioRecords[0].DikeTableHeight); Assert.AreEqual(31.600, scenarioRecords[0].SafetyFactorPiping); Assert.AreEqual(0.0, scenarioRecords[0].SafetyFactorStabilityInnerSlope); @@ -804,8 +804,8 @@ Assert.AreEqual("D2", scenarioRecords[1].LocationId); Assert.AreEqual("1", scenarioRecords[1].LocationScenarioId); - Assert.AreEqual(0.0, scenarioRecords[1].WaterHeight); - Assert.AreEqual(1.680, scenarioRecords[1].WaterHeightLow); + Assert.AreEqual(0.0, scenarioRecords[1].RiverLevel); + Assert.AreEqual(1.680, scenarioRecords[1].RiverLevelLow); Assert.AreEqual(22.110, scenarioRecords[1].DikeTableHeight); Assert.AreEqual(32.600, scenarioRecords[1].SafetyFactorPiping); Assert.AreEqual(1.0, scenarioRecords[1].SafetyFactorStabilityInnerSlope); @@ -826,8 +826,8 @@ Assert.AreEqual("D1", scenarioRecords[0].LocationId); Assert.AreEqual("1", scenarioRecords[0].LocationScenarioId); - Assert.AreEqual(0.0, scenarioRecords[0].WaterHeight); - Assert.AreEqual(0.680, scenarioRecords[0].WaterHeightLow); + Assert.AreEqual(0.0, scenarioRecords[0].RiverLevel); + Assert.AreEqual(0.680, scenarioRecords[0].RiverLevelLow); Assert.AreEqual(21.110, scenarioRecords[0].DikeTableHeight); Assert.AreEqual(31.600, scenarioRecords[0].SafetyFactorPiping); Assert.AreEqual(0.0, scenarioRecords[0].SafetyFactorStabilityInnerSlope); @@ -847,8 +847,8 @@ Assert.AreEqual("D2", scenarioRecords[1].LocationId); Assert.AreEqual("1", scenarioRecords[1].LocationScenarioId); - Assert.AreEqual(0.0, scenarioRecords[1].WaterHeight); - Assert.AreEqual(1.680, scenarioRecords[1].WaterHeightLow); + Assert.AreEqual(0.0, scenarioRecords[1].RiverLevel); + Assert.AreEqual(1.680, scenarioRecords[1].RiverLevelLow); Assert.AreEqual(22.110, scenarioRecords[1].DikeTableHeight); Assert.AreEqual(32.600, scenarioRecords[1].SafetyFactorPiping); Assert.AreEqual(1.0, scenarioRecords[1].SafetyFactorStabilityInnerSlope);