Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.CalculatedInput/WaternetCalculationService.cs
===================================================================
diff -u -r68f204f50eaf5f1e881c18fb2d878a17c722f75a -re77815b31b213789da306754de0867d6cb2de105
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.CalculatedInput/WaternetCalculationService.cs (.../WaternetCalculationService.cs) (revision 68f204f50eaf5f1e881c18fb2d878a17c722f75a)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.CalculatedInput/WaternetCalculationService.cs (.../WaternetCalculationService.cs) (revision e77815b31b213789da306754de0867d6cb2de105)
@@ -20,6 +20,7 @@
// All rights reserved.
using System;
+using Core.Common.Base.Data;
using Ringtoets.MacroStabilityInwards.CalculatedInput.Converters;
using Ringtoets.MacroStabilityInwards.KernelWrapper.Calculators;
using Ringtoets.MacroStabilityInwards.KernelWrapper.Calculators.Input;
@@ -42,12 +43,13 @@
/// of the .
///
/// The input to get the values from.
+ /// The assessment level to use.
/// A calculated ,
/// or an empty when the Waternet
/// could not be calculated.
/// Thrown when
/// is null.
- public static MacroStabilityInwardsWaternet CalculateExtreme(IMacroStabilityInwardsWaternetInput input)
+ public static MacroStabilityInwardsWaternet CalculateExtreme(IMacroStabilityInwardsWaternetInput input, RoundedDouble assessmentLevel)
{
if (input == null)
{
@@ -56,7 +58,7 @@
IWaternetCalculator calculator = MacroStabilityInwardsCalculatorFactory.Instance
.CreateWaternetExtremeCalculator(
- CreateExtremeCalculatorInput(input),
+ CreateExtremeCalculatorInput(input, assessmentLevel),
MacroStabilityInwardsKernelWrapperFactory.Instance);
try
@@ -116,11 +118,11 @@
return new WaternetCalculatorInput(properties);
}
- private static WaternetCalculatorInput CreateExtremeCalculatorInput(IMacroStabilityInwardsWaternetInput input)
+ private static WaternetCalculatorInput CreateExtremeCalculatorInput(IMacroStabilityInwardsWaternetInput input, RoundedDouble assessmentLevel)
{
WaternetCalculatorInput.ConstructionProperties properties = CreateCalculatorInputConstructionProperties(input);
properties.PhreaticLineOffsets = PhreaticLineOffsetsConverter.Convert(input.LocationInputExtreme);
- properties.AssessmentLevel = input.AssessmentLevel;
+ properties.AssessmentLevel = assessmentLevel;
properties.WaterLevelPolder = input.LocationInputExtreme.WaterLevelPolder;
properties.PenetrationLength = input.LocationInputExtreme.PenetrationLength;
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Primitives/IMacroStabilityInwardsWaternetInput.cs
===================================================================
diff -u -r90a9502badff5788374461a1b2179a5dd0e866a2 -re77815b31b213789da306754de0867d6cb2de105
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Primitives/IMacroStabilityInwardsWaternetInput.cs (.../IMacroStabilityInwardsWaternetInput.cs) (revision 90a9502badff5788374461a1b2179a5dd0e866a2)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Primitives/IMacroStabilityInwardsWaternetInput.cs (.../IMacroStabilityInwardsWaternetInput.cs) (revision e77815b31b213789da306754de0867d6cb2de105)
@@ -35,12 +35,6 @@
MacroStabilityInwardsSurfaceLine SurfaceLine { get; }
///
- /// Gets the outside high water level.
- /// [m+NAP]
- ///
- RoundedDouble AssessmentLevel { get; }
-
- ///
/// Gets the profile which contains a 2 dimensional definition of soil layers with properties.
///
IMacroStabilityInwardsSoilProfileUnderSurfaceLine SoilProfileUnderSurfaceLine { get; }