Index: Ringtoets/Common/src/Ringtoets.Common.Service/WaveHeightCalculationService.cs
===================================================================
diff -u -rcd7078972189cf51d899754097ef3cbc0ddc26ee -r24e18b63dccdb718dac61c69cc55289553cbaa47
--- Ringtoets/Common/src/Ringtoets.Common.Service/WaveHeightCalculationService.cs (.../WaveHeightCalculationService.cs) (revision cd7078972189cf51d899754097ef3cbc0ddc26ee)
+++ Ringtoets/Common/src/Ringtoets.Common.Service/WaveHeightCalculationService.cs (.../WaveHeightCalculationService.cs) (revision 24e18b63dccdb718dac61c69cc55289553cbaa47)
@@ -75,14 +75,14 @@
/// The hydraulic boundary location used in the calculation.
/// The path which points to the hydraulic boundary database file.
/// The id of the assessment section.
- /// The return period of the assessment section.
+ /// The norm of the assessment section.
/// The object which is used to build log messages.
/// Thrown when an error occurs during parsing of the Hydra-Ring output.
/// Thrown when an error occurs during the calculation.
public void Calculate(HydraulicBoundaryLocation hydraulicBoundaryLocation,
string hydraulicBoundaryDatabaseFilePath,
string ringId,
- double returnPeriod,
+ double norm,
ICalculationMessageProvider messageProvider)
{
string hlcdDirectory = Path.GetDirectoryName(hydraulicBoundaryDatabaseFilePath);
@@ -96,13 +96,13 @@
try
{
- calculator.Calculate(CreateInput(hydraulicBoundaryLocation, returnPeriod, hydraulicBoundaryDatabaseFilePath));
+ calculator.Calculate(CreateInput(hydraulicBoundaryLocation, norm, hydraulicBoundaryDatabaseFilePath));
if (string.IsNullOrEmpty(calculator.LastErrorFileContent))
{
hydraulicBoundaryLocation.WaveHeight = (RoundedDouble) calculator.WaveHeight;
hydraulicBoundaryLocation.WaveHeightCalculationConvergence =
- RingtoetsCommonDataCalculationService.CalculationConverged(calculator.ReliabilityIndex, returnPeriod);
+ RingtoetsCommonDataCalculationService.CalculationConverged(calculator.ReliabilityIndex, norm);
if (hydraulicBoundaryLocation.WaveHeightCalculationConvergence != CalculationConvergence.CalculatedConverged)
{
@@ -154,9 +154,9 @@
}
}
- private WaveHeightCalculationInput CreateInput(HydraulicBoundaryLocation hydraulicBoundaryLocation, double returnPeriod, string hydraulicBoundaryDatabaseFilePath)
+ private WaveHeightCalculationInput CreateInput(HydraulicBoundaryLocation hydraulicBoundaryLocation, double norm, string hydraulicBoundaryDatabaseFilePath)
{
- var waveHeightCalculationInput = new WaveHeightCalculationInput(1, hydraulicBoundaryLocation.Id, returnPeriod);
+ var waveHeightCalculationInput = new WaveHeightCalculationInput(1, hydraulicBoundaryLocation.Id, norm);
HydraRingSettingsDatabaseHelper.AssignSettingsFromDatabase(waveHeightCalculationInput, hydraulicBoundaryDatabaseFilePath);