Index: Ringtoets/Common/src/Ringtoets.Common.IO/HydraRing/DesignTablesSettingsProvider.cs =================================================================== diff -u -r1675c950f802ced083b30f850b41489f67ebb184 -ra6cc123a10630d78e283e2fab0f491804b6047e6 --- Ringtoets/Common/src/Ringtoets.Common.IO/HydraRing/DesignTablesSettingsProvider.cs (.../DesignTablesSettingsProvider.cs) (revision 1675c950f802ced083b30f850b41489f67ebb184) +++ Ringtoets/Common/src/Ringtoets.Common.IO/HydraRing/DesignTablesSettingsProvider.cs (.../DesignTablesSettingsProvider.cs) (revision a6cc123a10630d78e283e2fab0f491804b6047e6) @@ -102,7 +102,7 @@ new DesignTablesSetting(10, 50) }, { - HydraRingFailureMechanismType.DikesHeight, + HydraRingFailureMechanismType.HydraulicLoads, new DesignTablesSetting(2, 4) }, { Index: Ringtoets/Common/src/Ringtoets.Common.IO/HydraRing/NumericsSettingsProvider.cs =================================================================== diff -u -rd49770201655964042adccca08d2e9fb2217723d -ra6cc123a10630d78e283e2fab0f491804b6047e6 --- Ringtoets/Common/src/Ringtoets.Common.IO/HydraRing/NumericsSettingsProvider.cs (.../NumericsSettingsProvider.cs) (revision d49770201655964042adccca08d2e9fb2217723d) +++ Ringtoets/Common/src/Ringtoets.Common.IO/HydraRing/NumericsSettingsProvider.cs (.../NumericsSettingsProvider.cs) (revision a6cc123a10630d78e283e2fab0f491804b6047e6) @@ -140,7 +140,7 @@ } }, { - HydraRingFailureMechanismType.DikesHeight, new Dictionary + HydraRingFailureMechanismType.HydraulicLoads, new Dictionary { { 102, numericsSettingFDir Index: Ringtoets/Common/test/Ringtoets.Common.IO.Test/HydraRing/DesignTablesSettingsProviderTest.cs =================================================================== diff -u -r1675c950f802ced083b30f850b41489f67ebb184 -ra6cc123a10630d78e283e2fab0f491804b6047e6 --- Ringtoets/Common/test/Ringtoets.Common.IO.Test/HydraRing/DesignTablesSettingsProviderTest.cs (.../DesignTablesSettingsProviderTest.cs) (revision 1675c950f802ced083b30f850b41489f67ebb184) +++ Ringtoets/Common/test/Ringtoets.Common.IO.Test/HydraRing/DesignTablesSettingsProviderTest.cs (.../DesignTablesSettingsProviderTest.cs) (revision a6cc123a10630d78e283e2fab0f491804b6047e6) @@ -85,7 +85,7 @@ [TestCase(HydraRingFailureMechanismType.WavePeakPeriod, 700138, 1.0, 5.0)] [TestCase(HydraRingFailureMechanismType.WaveSpectralPeriod, 700138, 2.0, 5.0)] [TestCase(HydraRingFailureMechanismType.WaveHeight, 700138, -2.0, 0.0)] - [TestCase(HydraRingFailureMechanismType.DikesHeight, 700132, 2.0, 5.0)] + [TestCase(HydraRingFailureMechanismType.HydraulicLoads, 700132, 2.0, 5.0)] public void GetDesignTablesSetting_KnownLocationIdAndFailureMechanismType_ReturnsExpectedDesignTablesSetting( HydraRingFailureMechanismType failureMechanismType, long locationId, double expectedValueMin, double expectedValueMax) { @@ -107,7 +107,7 @@ [TestCase(HydraRingFailureMechanismType.WaveHeight, -1, 1.0, 4.0)] [TestCase(HydraRingFailureMechanismType.WavePeakPeriod, -1, 5.0, 15.0)] [TestCase(HydraRingFailureMechanismType.WaveSpectralPeriod, -1, 5.0, 15.0)] - [TestCase(HydraRingFailureMechanismType.DikesHeight, -1, 2.0, 4.0)] + [TestCase(HydraRingFailureMechanismType.HydraulicLoads, -1, 2.0, 4.0)] [TestCase(HydraRingFailureMechanismType.DikesOvertopping, 700131, double.NaN, double.NaN)] [TestCase(HydraRingFailureMechanismType.StructuresOvertopping, 700131, double.NaN, double.NaN)] [TestCase(HydraRingFailureMechanismType.StructuresClosure, 700131, double.NaN, double.NaN)] Index: Ringtoets/Common/test/Ringtoets.Common.IO.Test/HydraRing/NumericsSettingsProviderTest.cs =================================================================== diff -u -rf2adc07e0cda72db5ca9b6b7690219626d45397b -ra6cc123a10630d78e283e2fab0f491804b6047e6 --- Ringtoets/Common/test/Ringtoets.Common.IO.Test/HydraRing/NumericsSettingsProviderTest.cs (.../NumericsSettingsProviderTest.cs) (revision f2adc07e0cda72db5ca9b6b7690219626d45397b) +++ Ringtoets/Common/test/Ringtoets.Common.IO.Test/HydraRing/NumericsSettingsProviderTest.cs (.../NumericsSettingsProviderTest.cs) (revision a6cc123a10630d78e283e2fab0f491804b6047e6) @@ -99,8 +99,8 @@ [TestCase(HydraRingFailureMechanismType.WaveHeight, 11, 11, 4, 10000, 40000)] [TestCase(HydraRingFailureMechanismType.WavePeakPeriod, 14, 11, 4, 10000, 40000)] [TestCase(HydraRingFailureMechanismType.WaveSpectralPeriod, 16, 11, 4, 10000, 40000)] - [TestCase(HydraRingFailureMechanismType.DikesHeight, 102, 11, 4, 10000, 40000)] - [TestCase(HydraRingFailureMechanismType.DikesHeight, 103, 11, 4, 10000, 40000)] + [TestCase(HydraRingFailureMechanismType.HydraulicLoads, 102, 11, 4, 10000, 40000)] + [TestCase(HydraRingFailureMechanismType.HydraulicLoads, 103, 11, 4, 10000, 40000)] [TestCase(HydraRingFailureMechanismType.DikesOvertopping, 102, 11, 4, 10000, 40000)] [TestCase(HydraRingFailureMechanismType.DikesOvertopping, 103, 11, 4, 10000, 40000)] [TestCase(HydraRingFailureMechanismType.StructuresOvertopping, 421, 11, 4, 10000, 40000)] Index: Ringtoets/Common/test/Ringtoets.Common.IO.Test/HydraRing/TimeIntegrationSettingsProviderTest.cs =================================================================== diff -u -r974d938888a96c3fa06e6d762d59a0be1f338db7 -ra6cc123a10630d78e283e2fab0f491804b6047e6 --- Ringtoets/Common/test/Ringtoets.Common.IO.Test/HydraRing/TimeIntegrationSettingsProviderTest.cs (.../TimeIntegrationSettingsProviderTest.cs) (revision 974d938888a96c3fa06e6d762d59a0be1f338db7) +++ Ringtoets/Common/test/Ringtoets.Common.IO.Test/HydraRing/TimeIntegrationSettingsProviderTest.cs (.../TimeIntegrationSettingsProviderTest.cs) (revision a6cc123a10630d78e283e2fab0f491804b6047e6) @@ -68,7 +68,7 @@ [TestCase(HydraRingFailureMechanismType.WaveHeight, 700131, 1)] [TestCase(HydraRingFailureMechanismType.WavePeakPeriod, 700131, 1)] [TestCase(HydraRingFailureMechanismType.WaveSpectralPeriod, 700131, 1)] - [TestCase(HydraRingFailureMechanismType.DikesHeight, 700134, 1)] + [TestCase(HydraRingFailureMechanismType.HydraulicLoads, 700134, 1)] [TestCase(HydraRingFailureMechanismType.DikesOvertopping, 700134, 1)] [TestCase(HydraRingFailureMechanismType.StructuresOvertopping, 700134, 1)] [TestCase(HydraRingFailureMechanismType.StructuresClosure, 700134, 1)] @@ -94,7 +94,7 @@ [TestCase(HydraRingFailureMechanismType.WavePeakPeriod, 1)] [TestCase(HydraRingFailureMechanismType.WaveSpectralPeriod, 1)] [TestCase(HydraRingFailureMechanismType.DikesOvertopping, 1)] - [TestCase(HydraRingFailureMechanismType.DikesHeight, 1)] + [TestCase(HydraRingFailureMechanismType.HydraulicLoads, 1)] [TestCase(HydraRingFailureMechanismType.StructuresOvertopping, 1)] [TestCase(HydraRingFailureMechanismType.StructuresClosure, 1)] [TestCase(HydraRingFailureMechanismType.StructuresStructuralFailure, 1)] Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/HydraRingFailureMechanismType.cs =================================================================== diff -u -r47eef16397280688cabfde493dfb4675dfe2f328 -ra6cc123a10630d78e283e2fab0f491804b6047e6 --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/HydraRingFailureMechanismType.cs (.../HydraRingFailureMechanismType.cs) (revision 47eef16397280688cabfde493dfb4675dfe2f328) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/HydraRingFailureMechanismType.cs (.../HydraRingFailureMechanismType.cs) (revision a6cc123a10630d78e283e2fab0f491804b6047e6) @@ -35,7 +35,7 @@ WaveHeight = 2, WavePeakPeriod = 3, WaveSpectralPeriod = 4, - DikesHeight = 5, + HydraulicLoads = 5, DikesOvertopping = 6, StructuresOvertopping = 7, StructuresClosure = 8, Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Hydraulics/HydraulicLoadsCalculationInput.cs =================================================================== diff -u -rf008be722cec66e104191a9566c13eeb9693ad6f -ra6cc123a10630d78e283e2fab0f491804b6047e6 --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Hydraulics/HydraulicLoadsCalculationInput.cs (.../HydraulicLoadsCalculationInput.cs) (revision f008be722cec66e104191a9566c13eeb9693ad6f) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Hydraulics/HydraulicLoadsCalculationInput.cs (.../HydraulicLoadsCalculationInput.cs) (revision a6cc123a10630d78e283e2fab0f491804b6047e6) @@ -96,7 +96,7 @@ { get { - return HydraRingFailureMechanismType.DikesHeight; + return HydraRingFailureMechanismType.HydraulicLoads; } } Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Providers/FailureMechanismDefaultsProvider.cs =================================================================== diff -u -r974d938888a96c3fa06e6d762d59a0be1f338db7 -ra6cc123a10630d78e283e2fab0f491804b6047e6 --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Providers/FailureMechanismDefaultsProvider.cs (.../FailureMechanismDefaultsProvider.cs) (revision 974d938888a96c3fa06e6d762d59a0be1f338db7) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Providers/FailureMechanismDefaultsProvider.cs (.../FailureMechanismDefaultsProvider.cs) (revision a6cc123a10630d78e283e2fab0f491804b6047e6) @@ -75,7 +75,7 @@ }, 6) }, { - HydraRingFailureMechanismType.DikesHeight, new FailureMechanismDefaults(101, new[] + HydraRingFailureMechanismType.HydraulicLoads, new FailureMechanismDefaults(101, new[] { 102, 103 Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Providers/VariableDefaultsProvider.cs =================================================================== diff -u -r974d938888a96c3fa06e6d762d59a0be1f338db7 -ra6cc123a10630d78e283e2fab0f491804b6047e6 --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Providers/VariableDefaultsProvider.cs (.../VariableDefaultsProvider.cs) (revision 974d938888a96c3fa06e6d762d59a0be1f338db7) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Providers/VariableDefaultsProvider.cs (.../VariableDefaultsProvider.cs) (revision a6cc123a10630d78e283e2fab0f491804b6047e6) @@ -100,7 +100,7 @@ } }, { - HydraRingFailureMechanismType.DikesHeight, new Dictionary + HydraRingFailureMechanismType.HydraulicLoads, new Dictionary { { 1, new VariableDefaults(300) Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/HydraRingFailureMechanismTypeTest.cs =================================================================== diff -u -r47eef16397280688cabfde493dfb4675dfe2f328 -ra6cc123a10630d78e283e2fab0f491804b6047e6 --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/HydraRingFailureMechanismTypeTest.cs (.../HydraRingFailureMechanismTypeTest.cs) (revision 47eef16397280688cabfde493dfb4675dfe2f328) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/HydraRingFailureMechanismTypeTest.cs (.../HydraRingFailureMechanismTypeTest.cs) (revision a6cc123a10630d78e283e2fab0f491804b6047e6) @@ -39,7 +39,7 @@ Assert.AreEqual(2, (int) HydraRingFailureMechanismType.WaveHeight, message); Assert.AreEqual(3, (int) HydraRingFailureMechanismType.WavePeakPeriod, message); Assert.AreEqual(4, (int) HydraRingFailureMechanismType.WaveSpectralPeriod, message); - Assert.AreEqual(5, (int) HydraRingFailureMechanismType.DikesHeight, message); + Assert.AreEqual(5, (int) HydraRingFailureMechanismType.HydraulicLoads, message); Assert.AreEqual(6, (int) HydraRingFailureMechanismType.DikesOvertopping, message); Assert.AreEqual(7, (int) HydraRingFailureMechanismType.StructuresOvertopping, message); Assert.AreEqual(8, (int) HydraRingFailureMechanismType.StructuresClosure, message); Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Hydraulics/DikeHeightCalculationInputTest.cs =================================================================== diff -u -rc007ebf4c1db792bf1b57fea744a6af4b2605217 -ra6cc123a10630d78e283e2fab0f491804b6047e6 --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Hydraulics/DikeHeightCalculationInputTest.cs (.../DikeHeightCalculationInputTest.cs) (revision c007ebf4c1db792bf1b57fea744a6af4b2605217) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Hydraulics/DikeHeightCalculationInputTest.cs (.../DikeHeightCalculationInputTest.cs) (revision a6cc123a10630d78e283e2fab0f491804b6047e6) @@ -79,7 +79,7 @@ Assert.IsInstanceOf(input); Assert.AreEqual(9, input.CalculationTypeId); Assert.AreEqual(hydraulicBoundaryLocationId, input.HydraulicBoundaryLocationId); - Assert.AreEqual(HydraRingFailureMechanismType.DikesHeight, input.FailureMechanismType); + Assert.AreEqual(HydraRingFailureMechanismType.HydraulicLoads, input.FailureMechanismType); Assert.AreEqual(1, input.VariableId); Assert.IsNotNull(input.Section); HydraRingDataEqualityHelper.AreEqual(GetDefaultDikeHeightVariables().ToArray(), input.Variables.ToArray()); Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Hydraulics/HydraulicLoadsCalculationInputTest.cs =================================================================== diff -u -rcf68267c3449619bd75f0aea70ab158d74ab24fb -ra6cc123a10630d78e283e2fab0f491804b6047e6 --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Hydraulics/HydraulicLoadsCalculationInputTest.cs (.../HydraulicLoadsCalculationInputTest.cs) (revision cf68267c3449619bd75f0aea70ab158d74ab24fb) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Hydraulics/HydraulicLoadsCalculationInputTest.cs (.../HydraulicLoadsCalculationInputTest.cs) (revision a6cc123a10630d78e283e2fab0f491804b6047e6) @@ -77,7 +77,7 @@ Assert.IsInstanceOf(input); Assert.AreEqual(9, input.CalculationTypeId); Assert.AreEqual(hydraulicBoundaryLocationId, input.HydraulicBoundaryLocationId); - Assert.AreEqual(HydraRingFailureMechanismType.DikesHeight, input.FailureMechanismType); + Assert.AreEqual(HydraRingFailureMechanismType.HydraulicLoads, input.FailureMechanismType); Assert.IsNotNull(input.Section); HydraRingDataEqualityHelper.AreEqual(GetDefaultHydraulicLoadsVariables().ToArray(), input.Variables.ToArray()); CollectionAssert.AreEqual(expectedRingProfilePoints, input.ProfilePoints); Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Hydraulics/OvertoppingRateCalculationInputTest.cs =================================================================== diff -u -r25b96faf582aeda6b257d3f2394b7f0e22b977ba -ra6cc123a10630d78e283e2fab0f491804b6047e6 --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Hydraulics/OvertoppingRateCalculationInputTest.cs (.../OvertoppingRateCalculationInputTest.cs) (revision 25b96faf582aeda6b257d3f2394b7f0e22b977ba) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Hydraulics/OvertoppingRateCalculationInputTest.cs (.../OvertoppingRateCalculationInputTest.cs) (revision a6cc123a10630d78e283e2fab0f491804b6047e6) @@ -78,7 +78,7 @@ Assert.IsInstanceOf(input); Assert.AreEqual(9, input.CalculationTypeId); Assert.AreEqual(hydraulicBoundaryLocationId, input.HydraulicBoundaryLocationId); - Assert.AreEqual(HydraRingFailureMechanismType.DikesHeight, input.FailureMechanismType); + Assert.AreEqual(HydraRingFailureMechanismType.HydraulicLoads, input.FailureMechanismType); Assert.AreEqual(17, input.VariableId); Assert.IsNotNull(input.Section); HydraRingDataEqualityHelper.AreEqual(GetDefaultOvertoppingRateVariables().ToArray(), input.Variables.ToArray()); Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Providers/FailureMechanismDefaultsProviderTest.cs =================================================================== diff -u -r974d938888a96c3fa06e6d762d59a0be1f338db7 -ra6cc123a10630d78e283e2fab0f491804b6047e6 --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Providers/FailureMechanismDefaultsProviderTest.cs (.../FailureMechanismDefaultsProviderTest.cs) (revision 974d938888a96c3fa06e6d762d59a0be1f338db7) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Providers/FailureMechanismDefaultsProviderTest.cs (.../FailureMechanismDefaultsProviderTest.cs) (revision a6cc123a10630d78e283e2fab0f491804b6047e6) @@ -49,7 +49,7 @@ { 5 }, 6)] - [TestCase(HydraRingFailureMechanismType.DikesHeight, 101, new[] + [TestCase(HydraRingFailureMechanismType.HydraulicLoads, 101, new[] { 102, 103 Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Providers/VariableDefaultsProviderTest.cs =================================================================== diff -u -r974d938888a96c3fa06e6d762d59a0be1f338db7 -ra6cc123a10630d78e283e2fab0f491804b6047e6 --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Providers/VariableDefaultsProviderTest.cs (.../VariableDefaultsProviderTest.cs) (revision 974d938888a96c3fa06e6d762d59a0be1f338db7) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Providers/VariableDefaultsProviderTest.cs (.../VariableDefaultsProviderTest.cs) (revision a6cc123a10630d78e283e2fab0f491804b6047e6) @@ -39,14 +39,14 @@ [TestCase(HydraRingFailureMechanismType.QVariant, 117, 300)] [TestCase(HydraRingFailureMechanismType.QVariant, 118, 300)] [TestCase(HydraRingFailureMechanismType.QVariant, 119, 300)] - [TestCase(HydraRingFailureMechanismType.DikesHeight, 1, 300)] - [TestCase(HydraRingFailureMechanismType.DikesHeight, 8, 300)] - [TestCase(HydraRingFailureMechanismType.DikesHeight, 10, 300)] - [TestCase(HydraRingFailureMechanismType.DikesHeight, 11, 300)] - [TestCase(HydraRingFailureMechanismType.DikesHeight, 12, 300)] - [TestCase(HydraRingFailureMechanismType.DikesHeight, 17, 300)] - [TestCase(HydraRingFailureMechanismType.DikesHeight, 120, 300)] - [TestCase(HydraRingFailureMechanismType.DikesHeight, 123, 300)] + [TestCase(HydraRingFailureMechanismType.HydraulicLoads, 1, 300)] + [TestCase(HydraRingFailureMechanismType.HydraulicLoads, 8, 300)] + [TestCase(HydraRingFailureMechanismType.HydraulicLoads, 10, 300)] + [TestCase(HydraRingFailureMechanismType.HydraulicLoads, 11, 300)] + [TestCase(HydraRingFailureMechanismType.HydraulicLoads, 12, 300)] + [TestCase(HydraRingFailureMechanismType.HydraulicLoads, 17, 300)] + [TestCase(HydraRingFailureMechanismType.HydraulicLoads, 120, 300)] + [TestCase(HydraRingFailureMechanismType.HydraulicLoads, 123, 300)] [TestCase(HydraRingFailureMechanismType.DikesOvertopping, 1, 300)] [TestCase(HydraRingFailureMechanismType.DikesOvertopping, 8, 300)] [TestCase(HydraRingFailureMechanismType.DikesOvertopping, 10, 300)] Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Services/HydraRingConfigurationServiceTest.cs =================================================================== diff -u -r416bdb89f8e154bd4108a518d8a3e69f652a6eb0 -ra6cc123a10630d78e283e2fab0f491804b6047e6 --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Services/HydraRingConfigurationServiceTest.cs (.../HydraRingConfigurationServiceTest.cs) (revision 416bdb89f8e154bd4108a518d8a3e69f652a6eb0) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Services/HydraRingConfigurationServiceTest.cs (.../HydraRingConfigurationServiceTest.cs) (revision a6cc123a10630d78e283e2fab0f491804b6047e6) @@ -72,7 +72,7 @@ var hydraRingConfigurationService = new HydraRingConfigurationService("34-1", HydraRingUncertaintiesType.Model); var calculationInput1 = new HydraRingCalculationInputImplementation(1, 2); var calculationInput2 = new HydraRingCalculationInputImplementation(2, 3); - calculationInput2.SetFailureMechanismType(HydraRingFailureMechanismType.DikesHeight); + calculationInput2.SetFailureMechanismType(HydraRingFailureMechanismType.HydraulicLoads); hydraRingConfigurationService.AddHydraRingCalculationInput(calculationInput1);