Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Service/GrassCoverErosionOutwardsWaveConditionsCalculationService.cs
===================================================================
diff -u -rb4b93f81c63d098edfd9e50ce1c94e37903e52f6 -rc96deb3a33a6779c640b20b1c866bb93530fad02
--- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Service/GrassCoverErosionOutwardsWaveConditionsCalculationService.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationService.cs) (revision b4b93f81c63d098edfd9e50ce1c94e37903e52f6)
+++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Service/GrassCoverErosionOutwardsWaveConditionsCalculationService.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationService.cs) (revision c96deb3a33a6779c640b20b1c866bb93530fad02)
@@ -44,22 +44,26 @@
/// 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 normative assessment level to use for determining water levels.
/// 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, string preprocessorDirectory)
+ public static bool Validate(GrassCoverErosionOutwardsWaveConditionsCalculation calculation,
+ RoundedDouble normativeAssessmentLevel,
+ string hydraulicBoundaryDatabaseFilePath,
+ string preprocessorDirectory)
{
if (calculation == null)
{
throw new ArgumentNullException(nameof(calculation));
}
- return ValidateWaveConditionsInput(
- calculation.InputParameters,
- hydraulicBoundaryDatabaseFilePath,
- preprocessorDirectory,
- Resources.GrassCoverErosionOutwardsWaveConditionsCalculationService_LogMessage_DesignWaterLevel_name);
+ return ValidateWaveConditionsInput(calculation.InputParameters,
+ normativeAssessmentLevel,
+ hydraulicBoundaryDatabaseFilePath,
+ preprocessorDirectory,
+ Resources.GrassCoverErosionOutwardsWaveConditionsCalculationService_LogMessage_DesignWaterLevel_name);
}
///
@@ -102,10 +106,12 @@
{
throw new ArgumentNullException(nameof(calculation));
}
+
if (failureMechanism == null)
{
throw new ArgumentNullException(nameof(failureMechanism));
}
+
if (assessmentSection == null)
{
throw new ArgumentNullException(nameof(assessmentSection));
Index: Ringtoets/Revetment/src/Ringtoets.Revetment.Service/WaveConditionsCalculationServiceBase.cs
===================================================================
diff -u -ra9d45ffa9451666f8117d7ec083441e388d34349 -rc96deb3a33a6779c640b20b1c866bb93530fad02
--- Ringtoets/Revetment/src/Ringtoets.Revetment.Service/WaveConditionsCalculationServiceBase.cs (.../WaveConditionsCalculationServiceBase.cs) (revision a9d45ffa9451666f8117d7ec083441e388d34349)
+++ Ringtoets/Revetment/src/Ringtoets.Revetment.Service/WaveConditionsCalculationServiceBase.cs (.../WaveConditionsCalculationServiceBase.cs) (revision c96deb3a33a6779c640b20b1c866bb93530fad02)
@@ -71,7 +71,7 @@
/// during the execution of the operation.
///
/// The input of the calculation.
- /// The normative assessment level to use.
+ /// The normative assessment level to use for determining water levels.
/// The file path of the hydraulic boundary
/// database file which to validate.
/// The preprocessor directory to validate.
Index: Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Service/StabilityStoneCoverWaveConditionsCalculationService.cs
===================================================================
diff -u -r80de235bcb060dec1747e166ac28c1c8db92a20a -rc96deb3a33a6779c640b20b1c866bb93530fad02
--- Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Service/StabilityStoneCoverWaveConditionsCalculationService.cs (.../StabilityStoneCoverWaveConditionsCalculationService.cs) (revision 80de235bcb060dec1747e166ac28c1c8db92a20a)
+++ Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Service/StabilityStoneCoverWaveConditionsCalculationService.cs (.../StabilityStoneCoverWaveConditionsCalculationService.cs) (revision c96deb3a33a6779c640b20b1c866bb93530fad02)
@@ -48,22 +48,26 @@
/// 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 normative assessment level to use for determining water levels.
/// 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(StabilityStoneCoverWaveConditionsCalculation calculation, string hydraulicBoundaryDatabaseFilePath, string preprocessorDirectory)
+ public static bool Validate(StabilityStoneCoverWaveConditionsCalculation calculation,
+ RoundedDouble normativeAssessmentLevel,
+ string hydraulicBoundaryDatabaseFilePath,
+ string preprocessorDirectory)
{
if (calculation == null)
{
throw new ArgumentNullException(nameof(calculation));
}
- return ValidateWaveConditionsInput(
- calculation.InputParameters,
- hydraulicBoundaryDatabaseFilePath,
- preprocessorDirectory,
- RingtoetsRevetmentsServicesResources.WaveConditionsCalculationService_ValidateInput_default_DesignWaterLevel_name);
+ return ValidateWaveConditionsInput(calculation.InputParameters,
+ normativeAssessmentLevel,
+ hydraulicBoundaryDatabaseFilePath,
+ preprocessorDirectory,
+ RingtoetsRevetmentsServicesResources.WaveConditionsCalculationService_ValidateInput_default_DesignWaterLevel_name);
}
///
@@ -100,10 +104,12 @@
{
throw new ArgumentNullException(nameof(calculation));
}
+
if (assessmentSection == null)
{
throw new ArgumentNullException(nameof(assessmentSection));
}
+
if (generalWaveConditionsInput == null)
{
throw new ArgumentNullException(nameof(generalWaveConditionsInput));
Index: Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Service/WaveImpactAsphaltCoverWaveConditionsCalculationService.cs
===================================================================
diff -u -r80de235bcb060dec1747e166ac28c1c8db92a20a -rc96deb3a33a6779c640b20b1c866bb93530fad02
--- Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Service/WaveImpactAsphaltCoverWaveConditionsCalculationService.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationService.cs) (revision 80de235bcb060dec1747e166ac28c1c8db92a20a)
+++ Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Service/WaveImpactAsphaltCoverWaveConditionsCalculationService.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationService.cs) (revision c96deb3a33a6779c640b20b1c866bb93530fad02)
@@ -44,22 +44,26 @@
/// 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 normative assessment level to use for determining water levels.
/// 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(WaveImpactAsphaltCoverWaveConditionsCalculation calculation, string hydraulicBoundaryDatabaseFilePath, string preprocessorDirectory)
+ public static bool Validate(WaveImpactAsphaltCoverWaveConditionsCalculation calculation,
+ RoundedDouble normativeAssessmentLevel,
+ string hydraulicBoundaryDatabaseFilePath,
+ string preprocessorDirectory)
{
if (calculation == null)
{
throw new ArgumentNullException(nameof(calculation));
}
- return ValidateWaveConditionsInput(
- calculation.InputParameters,
- hydraulicBoundaryDatabaseFilePath,
- preprocessorDirectory,
- Resources.WaveConditionsCalculationService_ValidateInput_default_DesignWaterLevel_name);
+ return ValidateWaveConditionsInput(calculation.InputParameters,
+ normativeAssessmentLevel,
+ hydraulicBoundaryDatabaseFilePath,
+ preprocessorDirectory,
+ Resources.WaveConditionsCalculationService_ValidateInput_default_DesignWaterLevel_name);
}
///
@@ -96,10 +100,12 @@
{
throw new ArgumentNullException(nameof(calculation));
}
+
if (assessmentSection == null)
{
throw new ArgumentNullException(nameof(assessmentSection));
}
+
if (generalWaveConditionsInput == null)
{
throw new ArgumentNullException(nameof(generalWaveConditionsInput));