Index: Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Service/GrassCoverErosionOutwardsWaveConditionsCalculationService.cs =================================================================== diff -u -ra79c1bc928ca6d7dd1765f39421b062eee1461ad -r1a77d259209a62203b61ca212b55318ffab3a49f --- Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Service/GrassCoverErosionOutwardsWaveConditionsCalculationService.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationService.cs) (revision a79c1bc928ca6d7dd1765f39421b062eee1461ad) +++ Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Service/GrassCoverErosionOutwardsWaveConditionsCalculationService.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationService.cs) (revision 1a77d259209a62203b61ca212b55318ffab3a49f) @@ -137,16 +137,16 @@ waveImpactOutput = CalculateWaveImpact(calculation, failureMechanism, hydraulicBoundaryDatabase, assessmentLevel, targetProbability); } - IEnumerable tailorMadeWaveImpactOutput = null; + IEnumerable waveImpactWithWaveDirectionOutput = null; if (ShouldCalculateTailorMadeWaveImpact(calculationType)) { - CurrentCalculationType = Resources.GrassCoverErosionOutwardsWaveConditions_TailorMadeWaveImpact_DisplayName; - tailorMadeWaveImpactOutput = CalculateTailorMadeWaveImpact(calculation, failureMechanism, hydraulicBoundaryDatabase, assessmentLevel, targetProbability); + CurrentCalculationType = Resources.GrassCoverErosionOutwardsWaveConditions_WaveImpactWithWaveDirection_DisplayName; + waveImpactWithWaveDirectionOutput = CalculateWaveImpactWithWaveDirection(calculation, failureMechanism, hydraulicBoundaryDatabase, assessmentLevel, targetProbability); } if (!Canceled) { - calculation.Output = CreateOutput(calculationType, waveRunUpOutput, waveImpactOutput, tailorMadeWaveImpactOutput); + calculation.Output = CreateOutput(calculationType, waveRunUpOutput, waveImpactOutput, waveImpactWithWaveDirectionOutput); } } finally @@ -255,15 +255,15 @@ Resources.GrassCoverErosionOutwardsWaveConditions_WaveImpact_DisplayName); } - private IEnumerable CalculateTailorMadeWaveImpact(GrassCoverErosionOutwardsWaveConditionsCalculation calculation, + private IEnumerable CalculateWaveImpactWithWaveDirection(GrassCoverErosionOutwardsWaveConditionsCalculation calculation, GrassCoverErosionOutwardsFailureMechanism failureMechanism, HydraulicBoundaryDatabase hydraulicBoundaryDatabase, RoundedDouble assessmentLevel, double targetProbability) { return Calculate(calculation, hydraulicBoundaryDatabase, targetProbability, assessmentLevel, failureMechanism.GeneralInput.GeneralWaveImpactWithWaveDirectionWaveConditionsInput, - Resources.GrassCoverErosionOutwardsWaveConditions_TailorMadeWaveImpact_DisplayName); + Resources.GrassCoverErosionOutwardsWaveConditions_WaveImpactWithWaveDirection_DisplayName); } private IEnumerable Calculate(GrassCoverErosionOutwardsWaveConditionsCalculation calculation, Index: Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Service/Properties/Resources.Designer.cs =================================================================== diff -u -r87bd836d55d336e37e3d80f9a1521feb83ddc475 -r1a77d259209a62203b61ca212b55318ffab3a49f --- Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Service/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 87bd836d55d336e37e3d80f9a1521feb83ddc475) +++ Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Service/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 1a77d259209a62203b61ca212b55318ffab3a49f) @@ -82,20 +82,20 @@ } /// - /// Looks up a localized string similar to golfklap voor toets op maat. + /// Looks up a localized string similar to golfklap. /// - internal static string GrassCoverErosionOutwardsWaveConditions_TailorMadeWaveImpact_DisplayName { + internal static string GrassCoverErosionOutwardsWaveConditions_WaveImpact_DisplayName { get { - return ResourceManager.GetString("GrassCoverErosionOutwardsWaveConditions_TailorMadeWaveImpact_DisplayName", resourceCulture); + return ResourceManager.GetString("GrassCoverErosionOutwardsWaveConditions_WaveImpact_DisplayName", resourceCulture); } } /// - /// Looks up a localized string similar to golfklap. + /// Looks up a localized string similar to golfklap met golfrichting. /// - internal static string GrassCoverErosionOutwardsWaveConditions_WaveImpact_DisplayName { + internal static string GrassCoverErosionOutwardsWaveConditions_WaveImpactWithWaveDirection_DisplayName { get { - return ResourceManager.GetString("GrassCoverErosionOutwardsWaveConditions_WaveImpact_DisplayName", resourceCulture); + return ResourceManager.GetString("GrassCoverErosionOutwardsWaveConditions_WaveImpactWithWaveDirection_DisplayName", resourceCulture); } } Index: Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Service/Properties/Resources.resx =================================================================== diff -u -r60d9978c65aaad43c83b8a7eb040f8c509f09b56 -r1a77d259209a62203b61ca212b55318ffab3a49f --- Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Service/Properties/Resources.resx (.../Resources.resx) (revision 60d9978c65aaad43c83b8a7eb040f8c509f09b56) +++ Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Service/Properties/Resources.resx (.../Resources.resx) (revision 1a77d259209a62203b61ca212b55318ffab3a49f) @@ -123,7 +123,7 @@ golfoploop - - golfklap voor toets op maat + + golfklap met golfrichting \ No newline at end of file Index: Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Service.Test/GrassCoverErosionOutwardsWaveConditionsCalculationServiceTest.cs =================================================================== diff -u -ra79c1bc928ca6d7dd1765f39421b062eee1461ad -r1a77d259209a62203b61ca212b55318ffab3a49f --- Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Service.Test/GrassCoverErosionOutwardsWaveConditionsCalculationServiceTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationServiceTest.cs) (revision a79c1bc928ca6d7dd1765f39421b062eee1461ad) +++ Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Service.Test/GrassCoverErosionOutwardsWaveConditionsCalculationServiceTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationServiceTest.cs) (revision 1a77d259209a62203b61ca212b55318ffab3a49f) @@ -197,7 +197,7 @@ AssertCalculationLogs(msgs, GetWaterLevels(calculation, assessmentSection), "golfoploop", 1); AssertCalculationLogs(msgs, GetWaterLevels(calculation, assessmentSection), "golfklap", 9); - AssertCalculationLogs(msgs, GetWaterLevels(calculation, assessmentSection), "golfklap voor toets op maat", 17); + AssertCalculationLogs(msgs, GetWaterLevels(calculation, assessmentSection), "golfklap met golfrichting", 17); CalculationServiceTestHelper.AssertCalculationEndMessage(msgs[expectedNrOfMessages - 1]); }); @@ -264,7 +264,7 @@ AssertCalculationLogs(msgs, GetWaterLevels(calculation, assessmentSection), "golfoploop", 1); AssertCalculationLogs(msgs, GetWaterLevels(calculation, assessmentSection), "golfklap", 9); - AssertCalculationLogs(msgs, GetWaterLevels(calculation, assessmentSection), "golfklap voor toets op maat", 17); + AssertCalculationLogs(msgs, GetWaterLevels(calculation, assessmentSection), "golfklap met golfrichting", 17); CalculationServiceTestHelper.AssertCalculationEndMessage(msgs[expectedNrOfMessages - 1]); }); @@ -355,7 +355,7 @@ countStart += messageBlockSize * 2; } - AssertCalculationLogs(msgs, waterLevels, "golfklap voor toets op maat", countStart); + AssertCalculationLogs(msgs, waterLevels, "golfklap met golfrichting", countStart); } CalculationServiceTestHelper.AssertCalculationEndMessage(msgs[expectedMessageCount - 1]); @@ -774,7 +774,7 @@ Assert.AreEqual("Berekening voor golfklap is beƫindigd.", msgs[23]); - AssertCalculationLogs(msgs, waterLevels, "golfklap voor toets op maat", 24); + AssertCalculationLogs(msgs, waterLevels, "golfklap met golfrichting", 24); CalculationServiceTestHelper.AssertCalculationEndMessage(msgs[35]); }); @@ -962,7 +962,7 @@ || calculationType == GrassCoverErosionOutwardsWaveConditionsCalculationType.WaveImpactWithWaveDirection || step > waterLevels.Length && calculationType == GrassCoverErosionOutwardsWaveConditionsCalculationType.WaveRunUpAndWaveImpactWithWaveDirection) { - revetmentType = "golfklap voor toets op maat"; + revetmentType = "golfklap met golfrichting"; } var text = $"Waterstand '{waterLevels[(step - 1) % waterLevels.Length]}' [m+NAP] voor {revetmentType} berekenen.";