Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/Kernels/Waternet/WaternetExtremeKernelWrapper.cs
===================================================================
diff -u -r68a02d15ccf82acbd454053bdc972e083af866be -r621dfcbd9664fff26da2d0083dc711f950b3a9c1
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/Kernels/Waternet/WaternetExtremeKernelWrapper.cs (.../WaternetExtremeKernelWrapper.cs) (revision 68a02d15ccf82acbd454053bdc972e083af866be)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/Kernels/Waternet/WaternetExtremeKernelWrapper.cs (.../WaternetExtremeKernelWrapper.cs) (revision 621dfcbd9664fff26da2d0083dc711f950b3a9c1)
@@ -19,6 +19,7 @@
// Stichting Deltares and remain full property of Stichting Deltares at all times.
// All rights reserved.
+using Deltares.WTIStability;
using Deltares.WTIStability.Calculation.Wrapper;
namespace Ringtoets.MacroStabilityInwards.KernelWrapper.Kernels.Waternet
@@ -29,5 +30,12 @@
///
internal class WaternetExtremeKernelWrapper : WaternetKernelWrapper
{
+ public override StabilityLocation Location
+ {
+ set
+ {
+ StabilityModel.Location = value;
+ }
+ }
}
}
\ No newline at end of file
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/Kernels/Waternet/WaternetKernelWrapper.cs
===================================================================
diff -u -r68a02d15ccf82acbd454053bdc972e083af866be -r621dfcbd9664fff26da2d0083dc711f950b3a9c1
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/Kernels/Waternet/WaternetKernelWrapper.cs (.../WaternetKernelWrapper.cs) (revision 68a02d15ccf82acbd454053bdc972e083af866be)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/Kernels/Waternet/WaternetKernelWrapper.cs (.../WaternetKernelWrapper.cs) (revision 621dfcbd9664fff26da2d0083dc711f950b3a9c1)
@@ -34,25 +34,19 @@
///
/// Class that wraps for performing a Waternet calculation.
///
- internal class WaternetKernelWrapper : IWaternetKernel
+ internal abstract class WaternetKernelWrapper : IWaternetKernel
{
private readonly StabilityModel stabilityModel;
///
/// Creates a new instance of .
///
- public WaternetKernelWrapper()
+ protected WaternetKernelWrapper()
{
stabilityModel = new StabilityModel();
}
- public virtual StabilityLocation Location
- {
- set
- {
- stabilityModel.Location = value;
- }
- }
+ public abstract StabilityLocation Location { set; }
public SoilModel SoilModel
{
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/Kernels/Waternet/WaternetKernelWrapperTest.cs
===================================================================
diff -u -re2978d1198c3af45bda6e6ec14e26561fc992d71 -r621dfcbd9664fff26da2d0083dc711f950b3a9c1
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/Kernels/Waternet/WaternetKernelWrapperTest.cs (.../WaternetKernelWrapperTest.cs) (revision e2978d1198c3af45bda6e6ec14e26561fc992d71)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/Kernels/Waternet/WaternetKernelWrapperTest.cs (.../WaternetKernelWrapperTest.cs) (revision 621dfcbd9664fff26da2d0083dc711f950b3a9c1)
@@ -34,7 +34,7 @@
public void Constructor_ExpectedValues()
{
// Call
- var kernel = new WaternetKernelWrapper();
+ var kernel = new TestWaternetKernelWrapper();
// Assert
Assert.IsInstanceOf(kernel);
@@ -50,7 +50,7 @@
var surfaceLine = new SurfaceLine2();
// Call
- var kernel = new WaternetKernelWrapper
+ var kernel = new TestWaternetKernelWrapper
{
Location = stabilityLocation,
SoilModel = soilModel,
@@ -74,7 +74,7 @@
public void Calculate_ExceptionInWrappedKernel_ThrowsWaternetKernelWrapperException()
{
// Setup
- var kernel = new WaternetKernelWrapper();
+ var kernel = new TestWaternetKernelWrapper();
// Call
TestDelegate test = () => kernel.Calculate();
@@ -89,7 +89,7 @@
public void Calculate_ExceptionDuringCalculation_OutputPropertiesNotSet()
{
// Setup
- var kernel = new WaternetKernelWrapper();
+ var kernel = new TestWaternetKernelWrapper();
// Call
TestDelegate test = () => kernel.Calculate();
@@ -138,7 +138,7 @@
OuterLoop = loop
};
var soil = new Soil();
- return new WaternetKernelWrapper
+ return new TestWaternetKernelWrapper
{
SurfaceLine = new SurfaceLine2(),
Location = new StabilityLocation(),
@@ -224,5 +224,16 @@
Assert.IsNotNull(stabilityModel.GeotechnicsData);
Assert.AreSame(soilProfile2D.Geometry, stabilityModel.GeotechnicsData.Geometry);
}
+
+ private class TestWaternetKernelWrapper : WaternetKernelWrapper
+ {
+ public override StabilityLocation Location
+ {
+ set
+ {
+ StabilityModel.Location = value;
+ }
+ }
+ }
}
}
\ No newline at end of file