Index: Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Service/WaveImpactAsphaltCoverWaveConditionsCalculationActivity.cs
===================================================================
diff -u -rd9c430e627971c179b06df7113a2e8af16f0ffd7 -rfcba59ca3530ada3cf38ae496931676bc98c2c4d
--- Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Service/WaveImpactAsphaltCoverWaveConditionsCalculationActivity.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationActivity.cs) (revision d9c430e627971c179b06df7113a2e8af16f0ffd7)
+++ Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Service/WaveImpactAsphaltCoverWaveConditionsCalculationActivity.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationActivity.cs) (revision fcba59ca3530ada3cf38ae496931676bc98c2c4d)
@@ -34,7 +34,6 @@
internal class WaveImpactAsphaltCoverWaveConditionsCalculationActivity : CalculatableActivity
{
private readonly WaveImpactAsphaltCoverWaveConditionsCalculation calculation;
- private readonly string hlcdFilePath;
private readonly WaveImpactAsphaltCoverFailureMechanism failureMechanism;
private readonly IAssessmentSection assessmentSection;
private readonly WaveImpactAsphaltCoverWaveConditionsCalculationService calculationService;
@@ -43,21 +42,14 @@
/// Creates a new instance of .
///
/// The wave impact asphalt cover wave conditions data used for the calculation.
- /// The directory of the HLCD file that should be used for performing the calculation.
/// The failure mechanism the calculation belongs to.
/// The assessment section the calculation belongs to.
/// Thrown when any input argument is null.
public WaveImpactAsphaltCoverWaveConditionsCalculationActivity(WaveImpactAsphaltCoverWaveConditionsCalculation calculation,
- string hlcdFilePath,
WaveImpactAsphaltCoverFailureMechanism failureMechanism,
IAssessmentSection assessmentSection)
: base(calculation)
{
- if (hlcdFilePath == null)
- {
- throw new ArgumentNullException(nameof(hlcdFilePath));
- }
-
if (failureMechanism == null)
{
throw new ArgumentNullException(nameof(failureMechanism));
@@ -69,7 +61,6 @@
}
this.calculation = calculation;
- this.hlcdFilePath = hlcdFilePath;
this.failureMechanism = failureMechanism;
this.assessmentSection = assessmentSection;
@@ -83,7 +74,7 @@
return WaveImpactAsphaltCoverWaveConditionsCalculationService.Validate(calculation,
assessmentSection.GetAssessmentLevel(calculation.InputParameters.HydraulicBoundaryLocation,
calculation.InputParameters.CategoryType),
- hlcdFilePath,
+ assessmentSection.HydraulicBoundaryDatabase.FilePath,
assessmentSection.HydraulicBoundaryDatabase.EffectivePreprocessorDirectory(),
assessmentSection.GetNorm(calculation.InputParameters.CategoryType));
}
@@ -94,7 +85,7 @@
WaveImpactAsphaltCoverDataSynchronizationService.ClearWaveConditionsCalculationOutput(calculation);
calculationService.Calculate(
- calculation, assessmentSection, failureMechanism.GeneralInput, hlcdFilePath);
+ calculation, assessmentSection, failureMechanism.GeneralInput, assessmentSection.HydraulicBoundaryDatabase.FilePath);
}
protected override void OnCancel()