Index: Ringtoets/Common/src/Ringtoets.Common.Service/DesignWaterLevelCalculationService.cs =================================================================== diff -u -r533cc8038f03f3acb30f4db787a3d583f93f7008 -rcd7078972189cf51d899754097ef3cbc0ddc26ee --- Ringtoets/Common/src/Ringtoets.Common.Service/DesignWaterLevelCalculationService.cs (.../DesignWaterLevelCalculationService.cs) (revision 533cc8038f03f3acb30f4db787a3d583f93f7008) +++ Ringtoets/Common/src/Ringtoets.Common.Service/DesignWaterLevelCalculationService.cs (.../DesignWaterLevelCalculationService.cs) (revision cd7078972189cf51d899754097ef3cbc0ddc26ee) @@ -74,14 +74,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 norm of the assessment section. + /// The return period 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 norm, + double returnPeriod, ICalculationMessageProvider messageProvider) { string hlcdDirectory = Path.GetDirectoryName(hydraulicBoundaryDatabaseFilePath); @@ -95,13 +95,13 @@ try { - calculator.Calculate(CreateInput(hydraulicBoundaryLocation, norm, hydraulicBoundaryDatabaseFilePath)); + calculator.Calculate(CreateInput(hydraulicBoundaryLocation, returnPeriod, hydraulicBoundaryDatabaseFilePath)); if (string.IsNullOrEmpty(calculator.LastErrorFileContent)) { hydraulicBoundaryLocation.DesignWaterLevel = (RoundedDouble)calculator.DesignWaterLevel; hydraulicBoundaryLocation.DesignWaterLevelCalculationConvergence = - RingtoetsCommonDataCalculationService.CalculationConverged(calculator.ReliabilityIndex, norm); + RingtoetsCommonDataCalculationService.CalculationConverged(calculator.ReliabilityIndex, returnPeriod); if (hydraulicBoundaryLocation.DesignWaterLevelCalculationConvergence != CalculationConvergence.CalculatedConverged) { @@ -153,9 +153,9 @@ } } - private AssessmentLevelCalculationInput CreateInput(HydraulicBoundaryLocation hydraulicBoundaryLocation, double norm, string hydraulicBoundaryDatabaseFilePath) + private AssessmentLevelCalculationInput CreateInput(HydraulicBoundaryLocation hydraulicBoundaryLocation, double returnPeriod, string hydraulicBoundaryDatabaseFilePath) { - var assessmentLevelCalculationInput = new AssessmentLevelCalculationInput(1, hydraulicBoundaryLocation.Id, norm); + var assessmentLevelCalculationInput = new AssessmentLevelCalculationInput(1, hydraulicBoundaryLocation.Id, returnPeriod); HydraRingSettingsDatabaseHelper.AssignSettingsFromDatabase(assessmentLevelCalculationInput, hydraulicBoundaryDatabaseFilePath);