Index: Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Service/StabilityStoneCoverWaveConditionsCalculationService.cs
===================================================================
diff -u -r2a81f01756e227d5ce93717b21b87e8a5cd5fcbb -r1b2f308e90780fcde51b1ffb06233fc7d211fa9e
--- Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Service/StabilityStoneCoverWaveConditionsCalculationService.cs (.../StabilityStoneCoverWaveConditionsCalculationService.cs) (revision 2a81f01756e227d5ce93717b21b87e8a5cd5fcbb)
+++ Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Service/StabilityStoneCoverWaveConditionsCalculationService.cs (.../StabilityStoneCoverWaveConditionsCalculationService.cs) (revision 1b2f308e90780fcde51b1ffb06233fc7d211fa9e)
@@ -52,13 +52,12 @@
/// The that holds all the information required to perform the calculation.
/// The that holds information about the norm used in the calculation.
/// Calculation input parameters that apply to all instances.
- /// The path of the HLCD file that should be used for performing the calculation.
/// Thrown when ,
/// or is null.
- /// Thrown when the contains invalid characters.
+ /// Thrown when the hydraulic boundary database file path contains invalid characters.
/// Thrown when:
///
- /// - No settings database file could be found at the location of
+ ///
- No settings database file could be found at the location of the hydraulic boundary database file path
/// with the same name.
/// - Unable to open settings database file.
/// - Unable to read required data from database file.
@@ -70,8 +69,7 @@
/// Thrown when an error occurs during the calculation.
public void Calculate(StabilityStoneCoverWaveConditionsCalculation calculation,
IAssessmentSection assessmentSection,
- GeneralStabilityStoneCoverWaveConditionsInput generalWaveConditionsInput,
- string hlcdFilePath)
+ GeneralStabilityStoneCoverWaveConditionsInput generalWaveConditionsInput)
{
if (calculation == null)
{
@@ -99,7 +97,6 @@
RoundedDouble cColumns = generalWaveConditionsInput.GeneralColumnsWaveConditionsInput.C;
double norm = assessmentSection.GetNorm(calculation.InputParameters.CategoryType);
- string preprocessorDirectory = assessmentSection.HydraulicBoundaryDatabase.EffectivePreprocessorDirectory();
RoundedDouble assessmentLevel = assessmentSection.GetAssessmentLevel(calculation.InputParameters.HydraulicBoundaryLocation,
calculation.InputParameters.CategoryType);
@@ -115,8 +112,7 @@
bBlocks,
cBlocks,
norm,
- hlcdFilePath,
- preprocessorDirectory);
+ assessmentSection.HydraulicBoundaryDatabase);
log.InfoFormat(Resources.StabilityStoneCoverWaveConditionsCalculationService_Calculate_Calculation_for_blocks_finished);
IEnumerable columnsOutputs = null;
@@ -129,8 +125,7 @@
bColumns,
cColumns,
norm,
- hlcdFilePath,
- preprocessorDirectory);
+ assessmentSection.HydraulicBoundaryDatabase);
log.InfoFormat(Resources.StabilityStoneCoverWaveConditionsCalculationService_Calculate_Calculation_for_columns_finished);
}