Index: Riskeer/Revetment/src/Riskeer.Revetment.Service/WaveConditionsCalculationServiceBase.cs
===================================================================
diff -u -r90115a949727163c13f28631988b860fdda5e355 -r5861c5b404ff54af03dbec7116413c46fde37e02
--- Riskeer/Revetment/src/Riskeer.Revetment.Service/WaveConditionsCalculationServiceBase.cs (.../WaveConditionsCalculationServiceBase.cs) (revision 90115a949727163c13f28631988b860fdda5e355)
+++ Riskeer/Revetment/src/Riskeer.Revetment.Service/WaveConditionsCalculationServiceBase.cs (.../WaveConditionsCalculationServiceBase.cs) (revision 5861c5b404ff54af03dbec7116413c46fde37e02)
@@ -121,7 +121,7 @@
/// The 'a' factor decided on failure mechanism level.
/// The 'b' factor decided on failure mechanism level.
/// The 'c' factor decided on failure mechanism level.
- /// The norm to use as the target.
+ /// The target probability to use.
/// The hydraulic boundary database to perform the calculations with.
/// An of .
/// Preprocessing is disabled when the preprocessor directory equals .
@@ -144,7 +144,7 @@
RoundedDouble a,
RoundedDouble b,
RoundedDouble c,
- double norm,
+ double targetProbability,
HydraulicBoundaryDatabase hydraulicBoundaryDatabase)
{
if (waveConditionsInput == null)
@@ -172,7 +172,7 @@
NotifyProgress(waterLevel, currentStep++, TotalWaterLevelCalculations);
WaveConditionsOutput output = CalculateWaterLevel(waterLevel,
- a, b, c, norm,
+ a, b, c, targetProbability,
waveConditionsInput,
HydraulicBoundaryCalculationSettingsFactory.CreateSettings(hydraulicBoundaryDatabase));
@@ -183,7 +183,7 @@
else
{
calculationsFailed++;
- outputs.Add(WaveConditionsOutputFactory.CreateFailedOutput(waterLevel, norm));
+ outputs.Add(WaveConditionsOutputFactory.CreateFailedOutput(waterLevel, targetProbability));
}
}
finally
@@ -222,7 +222,7 @@
{
validationResults.Add(preprocessorDirectoryValidationProblem);
}
-
+
if (validationResults.Any())
{
return validationResults.ToArray();
@@ -246,7 +246,7 @@
/// The 'a' factor decided on failure mechanism level.
/// The 'b' factor decided on failure mechanism level.
/// The 'c' factor decided on failure mechanism level.
- /// The norm to use as the target.
+ /// The target probability to use.
/// The input that is different per calculation.
/// The containing all data
/// to perform a hydraulic boundary calculation.
@@ -266,13 +266,13 @@
RoundedDouble a,
RoundedDouble b,
RoundedDouble c,
- double norm,
+ double targetProbability,
WaveConditionsInput input,
HydraulicBoundaryCalculationSettings calculationSettings)
{
HydraRingCalculationSettings settings = HydraRingCalculationSettingsFactory.CreateSettings(calculationSettings);
calculator = HydraRingCalculatorFactory.Instance.CreateWaveConditionsCosineCalculator(settings);
- WaveConditionsCosineCalculationInput calculationInput = CreateInput(waterLevel, a, b, c, norm, input, calculationSettings);
+ WaveConditionsCosineCalculationInput calculationInput = CreateInput(waterLevel, a, b, c, targetProbability, input, calculationSettings);
WaveConditionsOutput output;
var exceptionThrown = false;
@@ -285,7 +285,7 @@
calculator.WavePeakPeriod,
calculator.WaveAngle,
calculator.WaveDirection,
- norm,
+ targetProbability,
calculator.ReliabilityIndex,
calculator.Converged);
}
@@ -345,7 +345,7 @@
/// The 'a' factor decided on failure mechanism level.
/// The 'b' factor decided on failure mechanism level.
/// The 'c' factor decided on failure mechanism level.
- /// The norm to use as the target.
+ /// The target probability to use.
/// The input that is different per calculation.
/// The containing all data
/// to perform a hydraulic boundary calculation.
@@ -364,15 +364,15 @@
RoundedDouble a,
RoundedDouble b,
RoundedDouble c,
- double norm,
+ double targetProbability,
WaveConditionsInput input,
HydraulicBoundaryCalculationSettings calculationSettings)
{
var waveConditionsCosineCalculationInput = new WaveConditionsCosineCalculationInput(
1,
input.Orientation,
input.HydraulicBoundaryLocation.Id,
- norm,
+ targetProbability,
HydraRingInputParser.ParseForeshore(input),
HydraRingInputParser.ParseBreakWater(input),
waterLevel,