Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/Calculators/UpliftVan/Input/UpliftVanCalculatorInput.cs
===================================================================
diff -u -r0e809897e28ca8673b98ec8abb68b42939a3a647 -r3bb68f077093c26b284265bd3d0bd36da1735504
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/Calculators/UpliftVan/Input/UpliftVanCalculatorInput.cs (.../UpliftVanCalculatorInput.cs) (revision 0e809897e28ca8673b98ec8abb68b42939a3a647)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/Calculators/UpliftVan/Input/UpliftVanCalculatorInput.cs (.../UpliftVanCalculatorInput.cs) (revision 3bb68f077093c26b284265bd3d0bd36da1735504)
@@ -46,6 +46,7 @@
AssessmentLevel = properties.AssessmentLevel;
SurfaceLine = properties.SurfaceLine;
SoilProfile = properties.SoilProfile;
+ UpliftVanSoilProfile = properties.UpliftVanSoilProfile;
WaterLevelRiverAverage = properties.WaterLevelRiverAverage;
WaterLevelPolder = properties.WaterLevelPolder;
XCoordinateDrainageConstruction = properties.XCoordinateDrainageConstruction;
@@ -136,6 +137,11 @@
public MacroStabilityInwardsSoilProfileUnderSurfaceLine SoilProfile { internal get; set; }
///
+ /// Gets or sets the profile which contains a definition of soil layers with properties.
+ ///
+ public UpliftVanSoilProfile UpliftVanSoilProfile { internal get; set; }
+
+ ///
/// Gets or sets the dike soil scenario.
///
public MacroStabilityInwardsDikeSoilScenario DikeSoilScenario { internal get; set; }
@@ -344,6 +350,11 @@
public MacroStabilityInwardsSoilProfileUnderSurfaceLine SoilProfile { get; }
///
+ /// Gets the profile which contains a definition of soil layers with properties.
+ ///
+ public UpliftVanSoilProfile UpliftVanSoilProfile { get; }
+
+ ///
/// Gets the dike soil scenario.
///
public MacroStabilityInwardsDikeSoilScenario DikeSoilScenario { get; }
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/Calculators/UpliftVan/Input/UpliftVanCalculatorInputTest.cs
===================================================================
diff -u -rf2821a4b299043f78c93fb0acf5851081f96961b -r3bb68f077093c26b284265bd3d0bd36da1735504
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/Calculators/UpliftVan/Input/UpliftVanCalculatorInputTest.cs (.../UpliftVanCalculatorInputTest.cs) (revision f2821a4b299043f78c93fb0acf5851081f96961b)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/Calculators/UpliftVan/Input/UpliftVanCalculatorInputTest.cs (.../UpliftVanCalculatorInputTest.cs) (revision 3bb68f077093c26b284265bd3d0bd36da1735504)
@@ -61,6 +61,11 @@
new MacroStabilityInwardsSoilLayerPropertiesUnderSurfaceLine.ConstructionProperties()))
}, Enumerable.Empty());
+ var upliftVanSoilProfile = new UpliftVanSoilProfile(new[]
+ {
+ new UpliftVanSoilLayer(new Point2D[0], new Point2D[0][], new UpliftVanSoilLayer.ConstructionProperties()),
+ }, new UpliftVanPreconsolidationStress[0]);
+
double waterLevelRiverAverage = random.Next();
double waterLevelPolder = random.Next();
double xCoordinateDrainageConstruction = random.Next();
@@ -102,6 +107,7 @@
AssessmentLevel = hRiverValue,
SurfaceLine = surfaceLine,
SoilProfile = soilProfile,
+ UpliftVanSoilProfile = upliftVanSoilProfile,
WaterLevelRiverAverage = waterLevelRiverAverage,
WaterLevelPolder = waterLevelPolder,
XCoordinateDrainageConstruction = xCoordinateDrainageConstruction,
@@ -141,6 +147,7 @@
Assert.AreEqual(hRiverValue, input.AssessmentLevel);
Assert.AreSame(surfaceLine, input.SurfaceLine);
Assert.AreSame(soilProfile, input.SoilProfile);
+ Assert.AreSame(upliftVanSoilProfile, input.UpliftVanSoilProfile);
Assert.AreEqual(waterLevelRiverAverage, input.WaterLevelRiverAverage);
Assert.AreEqual(waterLevelPolder, input.WaterLevelPolder);
@@ -190,6 +197,7 @@
// Assert
Assert.IsNull(input.SurfaceLine);
Assert.IsNull(input.SoilProfile);
+ Assert.IsNull(input.UpliftVanSoilProfile);
Assert.IsNull(input.LeftGrid);
Assert.IsNull(input.RightGrid);