Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Service/GrassCoverErosionOutwardsWaveConditionsCalculationService.cs
===================================================================
diff -u -r92210258706d0f57e05552037b676bd941a6fe19 -rf8c28b3b04cdabb62ea37772efcb1f4ebbbf2b9e
--- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Service/GrassCoverErosionOutwardsWaveConditionsCalculationService.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationService.cs) (revision 92210258706d0f57e05552037b676bd941a6fe19)
+++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Service/GrassCoverErosionOutwardsWaveConditionsCalculationService.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationService.cs) (revision f8c28b3b04cdabb62ea37772efcb1f4ebbbf2b9e)
@@ -25,6 +25,7 @@
using Core.Common.Base.Data;
using Core.Common.Base.IO;
using Ringtoets.Common.Data.AssessmentSection;
+using Ringtoets.Common.Data.Hydraulics;
using Ringtoets.Common.Service;
using Ringtoets.GrassCoverErosionOutwards.Data;
using Ringtoets.GrassCoverErosionOutwards.Service.Properties;
@@ -40,14 +41,14 @@
public class GrassCoverErosionOutwardsWaveConditionsCalculationService : WaveConditionsCalculationServiceBase
{
///
- /// Performs validation over the values on the given and .
- /// Error and status information is logged during the execution of the operation.
+ /// Performs validation over the input parameters. Error and status information is logged during the execution of the operation.
///
/// The for which to validate the values.
/// The file path of the hydraulic boundary database file which to validate.
+ /// The preprocessor directory to validate.
/// True if there were no validation errors; False otherwise.
/// Thrown when is null.
- public static bool Validate(GrassCoverErosionOutwardsWaveConditionsCalculation calculation, string hydraulicBoundaryDatabaseFilePath)
+ public static bool Validate(GrassCoverErosionOutwardsWaveConditionsCalculation calculation, string hydraulicBoundaryDatabaseFilePath, string preprocessorDirectory)
{
if (calculation == null)
{
@@ -57,6 +58,7 @@
return ValidateWaveConditionsInput(
calculation.InputParameters,
hydraulicBoundaryDatabaseFilePath,
+ preprocessorDirectory,
Resources.GrassCoverErosionOutwardsWaveConditionsCalculationService_LogMessage_DesignWaterLevel_name);
}
@@ -119,12 +121,13 @@
assessmentSection.FailureMechanismContribution.Norm,
failureMechanism.Contribution,
failureMechanism.GeneralInput.N);
+ string preprocessorDirectory = assessmentSection.HydraulicBoundaryDatabase.EffectivePreprocessorDirectory();
TotalWaterLevelCalculations = calculation.InputParameters.WaterLevels.Count();
try
{
- IEnumerable outputs = CalculateWaveConditions(calculation.InputParameters, a, b, c, mechanismSpecificNorm, hlcdFilePath);
+ IEnumerable outputs = CalculateWaveConditions(calculation.InputParameters, a, b, c, mechanismSpecificNorm, hlcdFilePath, preprocessorDirectory);
if (!Canceled)
{