Index: Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Service/DuneErosionBoundaryCalculationService.cs =================================================================== diff -u -rf67fc935cc7113eed98fa3bb12ae61188bf59697 -ra6446f4410e56fb44c754aa1ce1d204d43c301f0 --- Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Service/DuneErosionBoundaryCalculationService.cs (.../DuneErosionBoundaryCalculationService.cs) (revision f67fc935cc7113eed98fa3bb12ae61188bf59697) +++ Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Service/DuneErosionBoundaryCalculationService.cs (.../DuneErosionBoundaryCalculationService.cs) (revision a6446f4410e56fb44c754aa1ce1d204d43c301f0) @@ -94,17 +94,15 @@ CalculationServiceHelper.LogCalculationBeginTime(calculationName); - var mechanismSpecificNorm = GetFailureMechanismSpecificNorm(failureMechanism, norm, calculationName); - var exceptionThrown = false; try { - DunesBoundaryConditionsCalculationInput calculationInput = CreateInput(duneLocation, mechanismSpecificNorm, hydraulicBoundaryDatabaseFilePath); + DunesBoundaryConditionsCalculationInput calculationInput = CreateInput(duneLocation, norm, hydraulicBoundaryDatabaseFilePath); calculator.Calculate(calculationInput); if (string.IsNullOrEmpty(calculator.LastErrorFileContent)) { - duneLocation.Output = CreateDuneLocationOutput(duneLocation.Name, calculationInput.Beta, mechanismSpecificNorm); + duneLocation.Output = CreateDuneLocationOutput(duneLocation.Name, calculationInput.Beta, norm); } } catch (HydraRingCalculationException) @@ -155,29 +153,6 @@ canceled = true; } - /// - /// Get the specific norm of the . - /// - /// The failure mechanism to get the norm for. - /// The assessment section norm. - /// The name of the calculation. - /// The failure mechanism specific norm. - /// Thrown when the contribution of the failure mechanism is zero. - private double GetFailureMechanismSpecificNorm(DuneErosionFailureMechanism failureMechanism, - double assessmentSectionNorm, - string calculationName) - { - if (Math.Abs(failureMechanism.Contribution) < 1e-6) - { - string errorMessage = string.Format(Resources.DuneErosionBoundaryCalculationService_Calculate_Contribution_is_zero, calculationName); - log.Error(errorMessage); - FinalizeCalculation(calculationName, false); - throw new ArgumentException(errorMessage); - } - - return failureMechanism.GetMechanismSpecificNorm(assessmentSectionNorm); - } - private void FinalizeCalculation(string calculationName, bool calculationExecuted) { if (calculationExecuted)