Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Views/GrassCoverErosionOutwardsWaveHeightLocationsView.cs
===================================================================
diff -u -re468a5451f59115ec6ca32c014da1baaa38866e8 -rf5bac1f11df4ee4881109371c50120763e303642
--- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Views/GrassCoverErosionOutwardsWaveHeightLocationsView.cs (.../GrassCoverErosionOutwardsWaveHeightLocationsView.cs) (revision e468a5451f59115ec6ca32c014da1baaa38866e8)
+++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Views/GrassCoverErosionOutwardsWaveHeightLocationsView.cs (.../GrassCoverErosionOutwardsWaveHeightLocationsView.cs) (revision f5bac1f11df4ee4881109371c50120763e303642)
@@ -19,11 +19,9 @@
// Stichting Deltares and remain full property of Stichting Deltares at all times.
// All rights reserved.
-using System;
using System.Collections.Generic;
using Core.Common.Base;
using Core.Common.Utils.Reflection;
-using log4net;
using Ringtoets.Common.Data.AssessmentSection;
using Ringtoets.Common.Data.Hydraulics;
using Ringtoets.Common.Forms.Views;
@@ -39,7 +37,6 @@
/// for the
public class GrassCoverErosionOutwardsWaveHeightLocationsView : HydraulicBoundaryLocationsView
{
- private readonly ILog log = LogManager.GetLogger(typeof(GrassCoverErosionOutwardsWaveHeightLocationsView));
private readonly Observer hydraulicBoundaryLocationObserver;
///
@@ -94,20 +91,17 @@
return;
}
- var mechanismSpecificNorm = GetMechanismSpecificNorm();
+ var mechanismSpecificNorm = FailureMechanism.GetMechanismSpecificNorm(AssessmentSection);
- if (!double.IsNaN(mechanismSpecificNorm))
- {
- bool successFullCalculation = CalculationGuiService.CalculateWaveHeights(AssessmentSection.HydraulicBoundaryDatabase.FilePath,
- locations,
- AssessmentSection.Id,
- mechanismSpecificNorm,
- new GrassCoverErosionOutwardsWaveHeightCalculationMessageProvider());
+ bool successFullCalculation = CalculationGuiService.CalculateWaveHeights(AssessmentSection.HydraulicBoundaryDatabase.FilePath,
+ locations,
+ AssessmentSection.Id,
+ mechanismSpecificNorm,
+ new GrassCoverErosionOutwardsWaveHeightCalculationMessageProvider());
- if (successFullCalculation)
- {
- ((IObservable) Data).NotifyObservers();
- }
+ if (successFullCalculation)
+ {
+ ((IObservable) Data).NotifyObservers();
}
}
@@ -154,19 +148,5 @@
}
return false;
}
-
- private double GetMechanismSpecificNorm()
- {
- var mechanismSpecificNorm = double.NaN;
- try
- {
- mechanismSpecificNorm = FailureMechanism.GetMechanismSpecificNorm(AssessmentSection);
- }
- catch (ArgumentException e)
- {
- log.ErrorFormat(e.Message);
- }
- return mechanismSpecificNorm;
- }
}
}
\ No newline at end of file