Index: Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Data/GeneralGrassCoverErosionOutwardsInput.cs =================================================================== diff -u -r87bd836d55d336e37e3d80f9a1521feb83ddc475 -r229883cef2d430554ef437720205d7c7d78418af --- Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Data/GeneralGrassCoverErosionOutwardsInput.cs (.../GeneralGrassCoverErosionOutwardsInput.cs) (revision 87bd836d55d336e37e3d80f9a1521feb83ddc475) +++ Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Data/GeneralGrassCoverErosionOutwardsInput.cs (.../GeneralGrassCoverErosionOutwardsInput.cs) (revision 229883cef2d430554ef437720205d7c7d78418af) @@ -46,7 +46,7 @@ n = new RoundedDouble(numberOfDecimalPlacesN, 2.0); GeneralWaveImpactWaveConditionsInput = new GeneralWaveConditionsInput(1.0, 0.67, 0.0); GeneralWaveRunUpWaveConditionsInput = new GeneralWaveConditionsInput(1.0, 1.7, 0.3); - GeneralTailorMadeWaveImpactWaveConditionsInput = new GeneralWaveConditionsInput(1.0, 0.67, 0.67); + GeneralWaveImpactWithWaveDirectionWaveConditionsInput = new GeneralWaveConditionsInput(1.0, 0.67, 0.67); } /// @@ -60,9 +60,9 @@ public GeneralWaveConditionsInput GeneralWaveRunUpWaveConditionsInput { get; } /// - /// Gets the general input parameter used in wave conditions calculations for tailor made wave impact. + /// Gets the general input parameter used in wave conditions calculations for wave impact with a wave direction. /// - public GeneralWaveConditionsInput GeneralTailorMadeWaveImpactWaveConditionsInput { get; } + public GeneralWaveConditionsInput GeneralWaveImpactWithWaveDirectionWaveConditionsInput { get; } #region Probability assessment Index: Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Forms/PropertyClasses/GrassCoverErosionOutwardsHydraulicLoadsProperties.cs =================================================================== diff -u -r53721462b03e2de9b909eda6b07cc24a063ad525 -r229883cef2d430554ef437720205d7c7d78418af --- Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Forms/PropertyClasses/GrassCoverErosionOutwardsHydraulicLoadsProperties.cs (.../GrassCoverErosionOutwardsHydraulicLoadsProperties.cs) (revision 53721462b03e2de9b909eda6b07cc24a063ad525) +++ Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Forms/PropertyClasses/GrassCoverErosionOutwardsHydraulicLoadsProperties.cs (.../GrassCoverErosionOutwardsHydraulicLoadsProperties.cs) (revision 229883cef2d430554ef437720205d7c7d78418af) @@ -94,13 +94,13 @@ [ResourcesCategory(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.Categories_ModelSettings))] [ResourcesDisplayName(typeof(Resources), nameof(Resources.GrassCoverErosionOutwardsFailureMechanismProperties_TailorMadeWaveImpact_DisplayName))] [ResourcesDescription(typeof(Resources), nameof(Resources.GrassCoverErosionOutwardsFailureMechanismProperties_TailorMadeWaveImpact_Description))] - public GeneralWaveConditionsInputProperties TailorMadeWaveImpact + public GeneralWaveConditionsInputProperties WaveImpactWithWaveDirection { get { return new GeneralWaveConditionsInputProperties { - Data = data.GeneralInput.GeneralTailorMadeWaveImpactWaveConditionsInput + Data = data.GeneralInput.GeneralWaveImpactWithWaveDirectionWaveConditionsInput }; } } Index: Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Service/GrassCoverErosionOutwardsWaveConditionsCalculationService.cs =================================================================== diff -u -rd684ded3287e757d166f51600a5e25b6f78c8464 -r229883cef2d430554ef437720205d7c7d78418af --- Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Service/GrassCoverErosionOutwardsWaveConditionsCalculationService.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationService.cs) (revision d684ded3287e757d166f51600a5e25b6f78c8464) +++ Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Service/GrassCoverErosionOutwardsWaveConditionsCalculationService.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationService.cs) (revision 229883cef2d430554ef437720205d7c7d78418af) @@ -262,7 +262,7 @@ double targetProbability) { return Calculate(calculation, hydraulicBoundaryDatabase, targetProbability, assessmentLevel, - failureMechanism.GeneralInput.GeneralTailorMadeWaveImpactWaveConditionsInput, + failureMechanism.GeneralInput.GeneralWaveImpactWithWaveDirectionWaveConditionsInput, Resources.GrassCoverErosionOutwardsWaveConditions_TailorMadeWaveImpact_DisplayName); } Index: Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Data.Test/GeneralGrassCoverErosionOutwardsInputTest.cs =================================================================== diff -u -r87bd836d55d336e37e3d80f9a1521feb83ddc475 -r229883cef2d430554ef437720205d7c7d78418af --- Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Data.Test/GeneralGrassCoverErosionOutwardsInputTest.cs (.../GeneralGrassCoverErosionOutwardsInputTest.cs) (revision 87bd836d55d336e37e3d80f9a1521feb83ddc475) +++ Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Data.Test/GeneralGrassCoverErosionOutwardsInputTest.cs (.../GeneralGrassCoverErosionOutwardsInputTest.cs) (revision 229883cef2d430554ef437720205d7c7d78418af) @@ -51,10 +51,10 @@ Assert.AreEqual(1.7, generalWaveRunUpWaveConditionsInput.B, generalWaveRunUpWaveConditionsInput.B.GetAccuracy()); Assert.AreEqual(0.3, generalWaveRunUpWaveConditionsInput.C, generalWaveRunUpWaveConditionsInput.C.GetAccuracy()); - GeneralWaveConditionsInput generalTailorMadeWaveImpactWaveConditionsInput = inputParameters.GeneralTailorMadeWaveImpactWaveConditionsInput; - Assert.AreEqual(1.0, generalTailorMadeWaveImpactWaveConditionsInput.A, generalTailorMadeWaveImpactWaveConditionsInput.A.GetAccuracy()); - Assert.AreEqual(0.67, generalTailorMadeWaveImpactWaveConditionsInput.B, generalTailorMadeWaveImpactWaveConditionsInput.B.GetAccuracy()); - Assert.AreEqual(0.67, generalTailorMadeWaveImpactWaveConditionsInput.C, generalTailorMadeWaveImpactWaveConditionsInput.C.GetAccuracy()); + GeneralWaveConditionsInput generalWaveImpactWithWaveDirectionWaveConditionsInput = inputParameters.GeneralWaveImpactWithWaveDirectionWaveConditionsInput; + Assert.AreEqual(1.0, generalWaveImpactWithWaveDirectionWaveConditionsInput.A, generalWaveImpactWithWaveDirectionWaveConditionsInput.A.GetAccuracy()); + Assert.AreEqual(0.67, generalWaveImpactWithWaveDirectionWaveConditionsInput.B, generalWaveImpactWithWaveDirectionWaveConditionsInput.B.GetAccuracy()); + Assert.AreEqual(0.67, generalWaveImpactWithWaveDirectionWaveConditionsInput.C, generalWaveImpactWithWaveDirectionWaveConditionsInput.C.GetAccuracy()); } [Test] Index: Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Forms.Test/PropertyClasses/GrassCoverErosionOutwardsHydraulicLoadsPropertiesTest.cs =================================================================== diff -u -r53721462b03e2de9b909eda6b07cc24a063ad525 -r229883cef2d430554ef437720205d7c7d78418af --- Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Forms.Test/PropertyClasses/GrassCoverErosionOutwardsHydraulicLoadsPropertiesTest.cs (.../GrassCoverErosionOutwardsHydraulicLoadsPropertiesTest.cs) (revision 53721462b03e2de9b909eda6b07cc24a063ad525) +++ Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Forms.Test/PropertyClasses/GrassCoverErosionOutwardsHydraulicLoadsPropertiesTest.cs (.../GrassCoverErosionOutwardsHydraulicLoadsPropertiesTest.cs) (revision 229883cef2d430554ef437720205d7c7d78418af) @@ -57,7 +57,7 @@ GeneralGrassCoverErosionOutwardsInput generalInput = failureMechanism.GeneralInput; Assert.AreSame(generalInput.GeneralWaveRunUpWaveConditionsInput, properties.WaveRunUp.Data); Assert.AreSame(generalInput.GeneralWaveImpactWaveConditionsInput, properties.WaveImpact.Data); - Assert.AreSame(generalInput.GeneralTailorMadeWaveImpactWaveConditionsInput, properties.TailorMadeWaveImpact.Data); + Assert.AreSame(generalInput.GeneralWaveImpactWithWaveDirectionWaveConditionsInput, properties.WaveImpactWithWaveDirection.Data); } [Test] Index: Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Service.Test/GrassCoverErosionOutwardsWaveConditionsCalculationServiceTest.cs =================================================================== diff -u -r60051f2e130e94f8005499c5c6d84ac48b59a1d3 -r229883cef2d430554ef437720205d7c7d78418af --- Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Service.Test/GrassCoverErosionOutwardsWaveConditionsCalculationServiceTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationServiceTest.cs) (revision 60051f2e130e94f8005499c5c6d84ac48b59a1d3) +++ Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Service.Test/GrassCoverErosionOutwardsWaveConditionsCalculationServiceTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationServiceTest.cs) (revision 229883cef2d430554ef437720205d7c7d78418af) @@ -464,9 +464,9 @@ input.ForeshoreProfile.Geometry.Select(c => new HydraRingForelandPoint(c.X, c.Y)), new HydraRingBreakWater(BreakWaterTypeHelper.GetHydraRingBreakWaterType(breakWaterType), input.BreakWater.Height), GetWaterLevels(calculation, assessmentSection).ElementAt(waterLevelIndex++), - generalInput.GeneralTailorMadeWaveImpactWaveConditionsInput.A, - generalInput.GeneralTailorMadeWaveImpactWaveConditionsInput.B, - generalInput.GeneralTailorMadeWaveImpactWaveConditionsInput.C); + generalInput.GeneralWaveImpactWithWaveDirectionWaveConditionsInput.A, + generalInput.GeneralWaveImpactWithWaveDirectionWaveConditionsInput.B, + generalInput.GeneralWaveImpactWithWaveDirectionWaveConditionsInput.C); HydraRingDataEqualityHelper.AreEqual(expectedInput, waveConditionsInputs[i]); }