Index: Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Service/GrassCoverErosionOutwardsWaveConditionsCalculationService.cs =================================================================== diff -u -r02e5f3c8ea1e170683b3841fdaf81a5642a66376 -r17506fd856b32335623915c1f5cb8864be697f6c --- Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Service/GrassCoverErosionOutwardsWaveConditionsCalculationService.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationService.cs) (revision 02e5f3c8ea1e170683b3841fdaf81a5642a66376) +++ Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Service/GrassCoverErosionOutwardsWaveConditionsCalculationService.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationService.cs) (revision 17506fd856b32335623915c1f5cb8864be697f6c) @@ -27,7 +27,6 @@ using Core.Common.Base.IO; using log4net; using Riskeer.Common.Data.AssessmentSection; -using Riskeer.Common.Data.Hydraulics; using Riskeer.Common.Service; using Riskeer.GrassCoverErosionOutwards.Data; using Riskeer.GrassCoverErosionOutwards.Service.Properties; @@ -113,8 +112,6 @@ calculationInput.CategoryType); double norm = failureMechanism.GetNorm(assessmentSection, calculation.InputParameters.CategoryType); - HydraulicBoundaryDatabase hydraulicBoundaryDatabase = assessmentSection.HydraulicBoundaryDatabase; - DetermineTotalWaterLevelCalculations(calculationInput, assessmentLevel); try @@ -123,7 +120,7 @@ if (ShouldCalculateWaveRunUp(calculationType)) { CurrentCalculationType = Resources.GrassCoverErosionOutwardsWaveConditions_WaveRunUp_DisplayName; - waveRunUpOutput = CalculateWaveRunUp(calculation, failureMechanism, hydraulicBoundaryDatabase, assessmentLevel, norm); + waveRunUpOutput = CalculateWaveRunUp(calculation, failureMechanism, assessmentSection, assessmentLevel, norm); } if (Canceled) @@ -135,14 +132,14 @@ if (ShouldCalculateWaveImpact(calculationType)) { CurrentCalculationType = Resources.GrassCoverErosionOutwardsWaveConditions_WaveImpact_DisplayName; - waveImpactOutput = CalculateWaveImpact(calculation, failureMechanism, hydraulicBoundaryDatabase, assessmentLevel, norm); + waveImpactOutput = CalculateWaveImpact(calculation, failureMechanism, assessmentSection, assessmentLevel, norm); } IEnumerable tailorMadeWaveImpactOutput = null; if (ShouldCalculateTailorMadeWaveImpact(calculationType)) { CurrentCalculationType = Resources.GrassCoverErosionOutwardsWaveConditions_TailorMadeWaveImpact_DisplayName; - tailorMadeWaveImpactOutput = CalculateTailorMadeWaveImpact(calculation, failureMechanism, hydraulicBoundaryDatabase, assessmentLevel, norm); + tailorMadeWaveImpactOutput = CalculateTailorMadeWaveImpact(calculation, failureMechanism, assessmentSection, assessmentLevel, norm); } if (!Canceled) @@ -236,39 +233,39 @@ private IEnumerable CalculateWaveRunUp(GrassCoverErosionOutwardsWaveConditionsCalculation calculation, GrassCoverErosionOutwardsFailureMechanism failureMechanism, - HydraulicBoundaryDatabase hydraulicBoundaryDatabase, + IAssessmentSection assessmentSection, RoundedDouble assessmentLevel, double norm) { - return Calculate(calculation, hydraulicBoundaryDatabase, norm, assessmentLevel, + return Calculate(calculation, assessmentSection, norm, assessmentLevel, failureMechanism.GeneralInput.GeneralWaveRunUpWaveConditionsInput, Resources.GrassCoverErosionOutwardsWaveConditions_WaveRunUp_DisplayName); } private IEnumerable CalculateWaveImpact(GrassCoverErosionOutwardsWaveConditionsCalculation calculation, GrassCoverErosionOutwardsFailureMechanism failureMechanism, - HydraulicBoundaryDatabase hydraulicBoundaryDatabase, + IAssessmentSection assessmentSection, RoundedDouble assessmentLevel, double norm) { - return Calculate(calculation, hydraulicBoundaryDatabase, norm, assessmentLevel, + return Calculate(calculation, assessmentSection, norm, assessmentLevel, failureMechanism.GeneralInput.GeneralWaveImpactWaveConditionsInput, Resources.GrassCoverErosionOutwardsWaveConditions_WaveImpact_DisplayName); } private IEnumerable CalculateTailorMadeWaveImpact(GrassCoverErosionOutwardsWaveConditionsCalculation calculation, GrassCoverErosionOutwardsFailureMechanism failureMechanism, - HydraulicBoundaryDatabase hydraulicBoundaryDatabase, + IAssessmentSection assessmentSection, RoundedDouble assessmentLevel, double norm) { - return Calculate(calculation, hydraulicBoundaryDatabase, norm, assessmentLevel, + return Calculate(calculation, assessmentSection, norm, assessmentLevel, failureMechanism.GeneralInput.GeneralTailorMadeWaveImpactWaveConditionsInput, Resources.GrassCoverErosionOutwardsWaveConditions_TailorMadeWaveImpact_DisplayName); } private IEnumerable Calculate(GrassCoverErosionOutwardsWaveConditionsCalculation calculation, - HydraulicBoundaryDatabase hydraulicBoundaryDatabase, + IAssessmentSection assessmentSection, double norm, RoundedDouble assessmentLevel, GeneralWaveConditionsInput generalInput, @@ -279,7 +276,7 @@ IEnumerable outputs = CalculateWaveConditions(calculation.InputParameters, assessmentLevel, generalInput.A, generalInput.B, generalInput.C, norm, - hydraulicBoundaryDatabase); + assessmentSection); log.InfoFormat(RevetmentServiceResources.WaveConditionsCalculationService_Calculate_calculationType_0_ended, calculationType); return outputs; }