Index: Ringtoets/Revetment/src/Ringtoets.Revetment.Service/WaveConditionsCalculationServiceBase.cs =================================================================== diff -u -r6836b668105d755b71835b56716b3254815b5c92 -r3ad0828133cb882ea12cce0a0392c772a523fbc9 --- Ringtoets/Revetment/src/Ringtoets.Revetment.Service/WaveConditionsCalculationServiceBase.cs (.../WaveConditionsCalculationServiceBase.cs) (revision 6836b668105d755b71835b56716b3254815b5c92) +++ Ringtoets/Revetment/src/Ringtoets.Revetment.Service/WaveConditionsCalculationServiceBase.cs (.../WaveConditionsCalculationServiceBase.cs) (revision 3ad0828133cb882ea12cce0a0392c772a523fbc9) @@ -71,7 +71,7 @@ /// during the execution of the operation. /// /// The input of the calculation. - /// The normative assessment level to use for determining water levels. + /// The 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. @@ -80,7 +80,7 @@ /// Thrown when /// or is null. protected static bool ValidateWaveConditionsInput(WaveConditionsInput waveConditionsInput, - RoundedDouble normativeAssessmentLevel, + RoundedDouble assessmentLevel, string hydraulicBoundaryDatabaseFilePath, string preprocessorDirectory, string designWaterLevelName) @@ -100,7 +100,7 @@ string[] messages = ValidateInput(hydraulicBoundaryDatabaseFilePath, preprocessorDirectory, waveConditionsInput, - normativeAssessmentLevel, + assessmentLevel, designWaterLevelName); CalculationServiceHelper.LogMessagesAsError(messages); @@ -117,7 +117,7 @@ /// /// The that holds all the information /// required to perform the calculation. - /// The normative assessment level to use for determining water levels. + /// The assessment level to use for determining water levels. /// The 'a' factor decided on failure mechanism level. /// The 'b' factor decided on failure mechanism level. /// The 'c' factor decided on failure mechanism level. @@ -142,7 +142,7 @@ /// Thrown when an error occurs during /// the calculations. protected IEnumerable CalculateWaveConditions(WaveConditionsInput waveConditionsInput, - RoundedDouble normativeAssessmentLevel, + RoundedDouble assessmentLevel, RoundedDouble a, RoundedDouble b, RoundedDouble c, @@ -158,7 +158,7 @@ var calculationsFailed = 0; var outputs = new List(); - RoundedDouble[] waterLevels = waveConditionsInput.GetWaterLevels(normativeAssessmentLevel).ToArray(); + RoundedDouble[] waterLevels = waveConditionsInput.GetWaterLevels(assessmentLevel).ToArray(); foreach (RoundedDouble waterLevel in waterLevels.TakeWhile(waterLevel => !Canceled)) { try @@ -210,7 +210,7 @@ private static string[] ValidateInput(string hydraulicBoundaryDatabaseFilePath, string preprocessorDirectory, WaveConditionsInput input, - RoundedDouble normativeAssessmentLevel, + RoundedDouble assessmentLevel, string designWaterLevelName) { var validationResults = new List(); @@ -233,7 +233,7 @@ return validationResults.ToArray(); } - validationResults.AddRange(ValidateWaveConditionsInput(input, normativeAssessmentLevel, designWaterLevelName)); + validationResults.AddRange(ValidateWaveConditionsInput(input, assessmentLevel, designWaterLevelName)); return validationResults.ToArray(); } @@ -396,7 +396,7 @@ } private static IEnumerable ValidateWaveConditionsInput(WaveConditionsInput input, - RoundedDouble normativeAssessmentLevel, + RoundedDouble assessmentLevel, string designWaterLevelName) { var messages = new List(); @@ -405,15 +405,15 @@ { messages.Add(Resources.WaveConditionsCalculationService_ValidateInput_No_HydraulicBoundaryLocation_selected); } - else if (double.IsNaN(normativeAssessmentLevel)) + else if (double.IsNaN(assessmentLevel)) { messages.Add(string.Format(CultureInfo.CurrentCulture, Resources.WaveConditionsCalculationService_ValidateInput_No_0_DesignWaterLevel_calculated, designWaterLevelName)); } else { - if (!input.GetWaterLevels(normativeAssessmentLevel).Any()) + if (!input.GetWaterLevels(assessmentLevel).Any()) { messages.Add(Resources.WaveConditionsCalculationService_ValidateInput_No_derived_WaterLevels); }