Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/Configurations/MacroStabilityInwardsCalculationConfiguration.cs
===================================================================
diff -u -r36755a2f260964ef30be55dcef0f68167421d65f -r2f8dcdec6ecf12ac329a9230d51882adc5ecd837
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/Configurations/MacroStabilityInwardsCalculationConfiguration.cs (.../MacroStabilityInwardsCalculationConfiguration.cs) (revision 36755a2f260964ef30be55dcef0f68167421d65f)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/Configurations/MacroStabilityInwardsCalculationConfiguration.cs (.../MacroStabilityInwardsCalculationConfiguration.cs) (revision 2f8dcdec6ecf12ac329a9230d51882adc5ecd837)
@@ -97,6 +97,11 @@
public double? ZCoordinateDrainageConstruction { get; set; }
///
+ /// Gets or sets whether phreatic line 3 and 4 should be adjusted for Uplift.
+ ///
+ public bool? AdjustPhreaticLine3And4ForUplift { get; set; }
+
+ ///
/// Gets or sets the minimum depth of the slip plane.
///
public double? SlipPlaneMinimumDepth { get; set; }
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/Configurations/MacroStabilityInwardsCalculationConfigurationExporter.cs
===================================================================
diff -u -r36755a2f260964ef30be55dcef0f68167421d65f -r2f8dcdec6ecf12ac329a9230d51882adc5ecd837
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/Configurations/MacroStabilityInwardsCalculationConfigurationExporter.cs (.../MacroStabilityInwardsCalculationConfigurationExporter.cs) (revision 36755a2f260964ef30be55dcef0f68167421d65f)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/Configurations/MacroStabilityInwardsCalculationConfigurationExporter.cs (.../MacroStabilityInwardsCalculationConfigurationExporter.cs) (revision 2f8dcdec6ecf12ac329a9230d51882adc5ecd837)
@@ -64,6 +64,7 @@
DrainageConstructionPresent = input.DrainageConstructionPresent,
XCoordinateDrainageConstruction = input.XCoordinateDrainageConstruction,
ZCoordinateDrainageConstruction = input.ZCoordinateDrainageConstruction,
+ AdjustPhreaticLine3And4ForUplift = input.AdjustPhreaticLine3And4ForUplift,
Scenario = calculation.ToScenarioConfiguration(),
SlipPlaneMinimumDepth = input.SlipPlaneMinimumDepth,
SlipPlaneMinimumLength = input.SlipPlaneMinimumLength,
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/Configurations/MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.cs
===================================================================
diff -u -r36755a2f260964ef30be55dcef0f68167421d65f -r2f8dcdec6ecf12ac329a9230d51882adc5ecd837
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/Configurations/MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.cs (.../MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.cs) (revision 36755a2f260964ef30be55dcef0f68167421d65f)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/Configurations/MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.cs (.../MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.cs) (revision 2f8dcdec6ecf12ac329a9230d51882adc5ecd837)
@@ -83,6 +83,11 @@
///
public const string WaterLevelRiverAverageElement = "ghw";
+ ///
+ /// The tag of the element containing the value indicating whether phreatic line 3 and 4 should be adjusted for Uplift.
+ ///
+ public const string AdjustPhreaticLine3And4ForUpliftElement = "corrigeervooropbarsten";
+
#region Drainage
///
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/Configurations/MacroStabilityInwardsCalculationConfigurationWriter.cs
===================================================================
diff -u -r36755a2f260964ef30be55dcef0f68167421d65f -r2f8dcdec6ecf12ac329a9230d51882adc5ecd837
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/Configurations/MacroStabilityInwardsCalculationConfigurationWriter.cs (.../MacroStabilityInwardsCalculationConfigurationWriter.cs) (revision 36755a2f260964ef30be55dcef0f68167421d65f)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/Configurations/MacroStabilityInwardsCalculationConfigurationWriter.cs (.../MacroStabilityInwardsCalculationConfigurationWriter.cs) (revision 2f8dcdec6ecf12ac329a9230d51882adc5ecd837)
@@ -165,6 +165,10 @@
WriteDrainageConstruction(writer, configuration);
+ WriteElementWhenContentAvailable(writer,
+ MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.AdjustPhreaticLine3And4ForUpliftElement,
+ configuration.AdjustPhreaticLine3And4ForUplift);
+
writer.WriteEndElement();
}
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/Configurations/MacroStabilityInwardsCalculationConfigurationSchemaIdentifiersTest.cs
===================================================================
diff -u -r36755a2f260964ef30be55dcef0f68167421d65f -r2f8dcdec6ecf12ac329a9230d51882adc5ecd837
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/Configurations/MacroStabilityInwardsCalculationConfigurationSchemaIdentifiersTest.cs (.../MacroStabilityInwardsCalculationConfigurationSchemaIdentifiersTest.cs) (revision 36755a2f260964ef30be55dcef0f68167421d65f)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/Configurations/MacroStabilityInwardsCalculationConfigurationSchemaIdentifiersTest.cs (.../MacroStabilityInwardsCalculationConfigurationSchemaIdentifiersTest.cs) (revision 2f8dcdec6ecf12ac329a9230d51882adc5ecd837)
@@ -43,6 +43,7 @@
Assert.AreEqual("waterspanningen", MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.WaterStressesElement);
Assert.AreEqual("ghw", MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.WaterLevelRiverAverageElement);
+ Assert.AreEqual("corrigeervooropbarsten", MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.AdjustPhreaticLine3And4ForUpliftElement);
Assert.AreEqual("drainage", MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.DrainageConstructionElement);
Assert.AreEqual("aanwezig", MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.DrainageConstructionPresentElement);
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/Configurations/MacroStabilityInwardsCalculationConfigurationTest.cs
===================================================================
diff -u -r36755a2f260964ef30be55dcef0f68167421d65f -r2f8dcdec6ecf12ac329a9230d51882adc5ecd837
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/Configurations/MacroStabilityInwardsCalculationConfigurationTest.cs (.../MacroStabilityInwardsCalculationConfigurationTest.cs) (revision 36755a2f260964ef30be55dcef0f68167421d65f)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/Configurations/MacroStabilityInwardsCalculationConfigurationTest.cs (.../MacroStabilityInwardsCalculationConfigurationTest.cs) (revision 2f8dcdec6ecf12ac329a9230d51882adc5ecd837)
@@ -62,6 +62,7 @@
Assert.IsNull(configuration.DrainageConstructionPresent);
Assert.IsNull(configuration.XCoordinateDrainageConstruction);
Assert.IsNull(configuration.ZCoordinateDrainageConstruction);
+ Assert.IsNull(configuration.AdjustPhreaticLine3And4ForUplift);
Assert.IsNull(configuration.SlipPlaneMinimumDepth);
Assert.IsNull(configuration.SlipPlaneMinimumLength);
Assert.IsNull(configuration.MaximumSliceWidth);
@@ -92,6 +93,7 @@
const bool drainageConstructionPresent = true;
const double xCoordinateDrainageConstruction = 0.6;
const double zCoordinateDrainageConstruction = 0.7;
+ const bool adjustPhreaticLine3And4ForUplift = true;
const double slipPlaneMinimumDepth = 2.2;
const double slipPlaneMinimumLength = 3.3;
@@ -122,6 +124,7 @@
DrainageConstructionPresent = drainageConstructionPresent,
XCoordinateDrainageConstruction = xCoordinateDrainageConstruction,
ZCoordinateDrainageConstruction = zCoordinateDrainageConstruction,
+ AdjustPhreaticLine3And4ForUplift = adjustPhreaticLine3And4ForUplift,
SlipPlaneMinimumDepth = slipPlaneMinimumDepth,
SlipPlaneMinimumLength = slipPlaneMinimumLength,
MaximumSliceWidth = maximumSliceWidth,
@@ -149,6 +152,7 @@
Assert.AreEqual(drainageConstructionPresent, configuration.DrainageConstructionPresent);
Assert.AreEqual(xCoordinateDrainageConstruction, configuration.XCoordinateDrainageConstruction);
Assert.AreEqual(zCoordinateDrainageConstruction, configuration.ZCoordinateDrainageConstruction);
+ Assert.AreEqual(adjustPhreaticLine3And4ForUplift, configuration.AdjustPhreaticLine3And4ForUplift);
Assert.AreEqual(slipPlaneMinimumDepth, configuration.SlipPlaneMinimumDepth);
Assert.AreEqual(slipPlaneMinimumLength, configuration.SlipPlaneMinimumLength);
Assert.AreEqual(maximumSliceWidth, configuration.MaximumSliceWidth);
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/Configurations/MacroStabilityInwardsCalculationConfigurationWriterTest.cs
===================================================================
diff -u -r36755a2f260964ef30be55dcef0f68167421d65f -r2f8dcdec6ecf12ac329a9230d51882adc5ecd837
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/Configurations/MacroStabilityInwardsCalculationConfigurationWriterTest.cs (.../MacroStabilityInwardsCalculationConfigurationWriterTest.cs) (revision 36755a2f260964ef30be55dcef0f68167421d65f)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/Configurations/MacroStabilityInwardsCalculationConfigurationWriterTest.cs (.../MacroStabilityInwardsCalculationConfigurationWriterTest.cs) (revision 2f8dcdec6ecf12ac329a9230d51882adc5ecd837)
@@ -93,6 +93,7 @@
DrainageConstructionPresent = true,
XCoordinateDrainageConstruction = 10.5,
ZCoordinateDrainageConstruction = 10.6,
+ AdjustPhreaticLine3And4ForUplift = true,
CreateZones = true,
MoveGrid = true,
GridDeterminationType = ConfigurationGridDeterminationType.Automatic,
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationExporter/calculationIrrelevant.xml
===================================================================
diff -u -r36755a2f260964ef30be55dcef0f68167421d65f -r2f8dcdec6ecf12ac329a9230d51882adc5ecd837
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationExporter/calculationIrrelevant.xml (.../calculationIrrelevant.xml) (revision 36755a2f260964ef30be55dcef0f68167421d65f)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationExporter/calculationIrrelevant.xml (.../calculationIrrelevant.xml) (revision 2f8dcdec6ecf12ac329a9230d51882adc5ecd837)
@@ -13,6 +13,7 @@
10.6
10.7
+ true
0.4
0.5
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationExporter/calculationWithAssessmentLevel.xml
===================================================================
diff -u -r36755a2f260964ef30be55dcef0f68167421d65f -r2f8dcdec6ecf12ac329a9230d51882adc5ecd837
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationExporter/calculationWithAssessmentLevel.xml (.../calculationWithAssessmentLevel.xml) (revision 36755a2f260964ef30be55dcef0f68167421d65f)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationExporter/calculationWithAssessmentLevel.xml (.../calculationWithAssessmentLevel.xml) (revision 2f8dcdec6ecf12ac329a9230d51882adc5ecd837)
@@ -13,6 +13,7 @@
10.6
10.7
+ true
0.4
0.5
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationExporter/calculationWithInfinities.xml
===================================================================
diff -u -r36755a2f260964ef30be55dcef0f68167421d65f -r2f8dcdec6ecf12ac329a9230d51882adc5ecd837
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationExporter/calculationWithInfinities.xml (.../calculationWithInfinities.xml) (revision 36755a2f260964ef30be55dcef0f68167421d65f)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationExporter/calculationWithInfinities.xml (.../calculationWithInfinities.xml) (revision 2f8dcdec6ecf12ac329a9230d51882adc5ecd837)
@@ -13,6 +13,7 @@
INF
-INF
+ true
-INF
INF
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationExporter/calculationWithNaNs.xml
===================================================================
diff -u -r36755a2f260964ef30be55dcef0f68167421d65f -r2f8dcdec6ecf12ac329a9230d51882adc5ecd837
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationExporter/calculationWithNaNs.xml (.../calculationWithNaNs.xml) (revision 36755a2f260964ef30be55dcef0f68167421d65f)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationExporter/calculationWithNaNs.xml (.../calculationWithNaNs.xml) (revision 2f8dcdec6ecf12ac329a9230d51882adc5ecd837)
@@ -13,6 +13,7 @@
NaN
NaN
+ true
NaN
NaN
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationExporter/calculationWithoutHydraulicLocation.xml
===================================================================
diff -u -r36755a2f260964ef30be55dcef0f68167421d65f -r2f8dcdec6ecf12ac329a9230d51882adc5ecd837
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationExporter/calculationWithoutHydraulicLocation.xml (.../calculationWithoutHydraulicLocation.xml) (revision 36755a2f260964ef30be55dcef0f68167421d65f)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationExporter/calculationWithoutHydraulicLocation.xml (.../calculationWithoutHydraulicLocation.xml) (revision 2f8dcdec6ecf12ac329a9230d51882adc5ecd837)
@@ -12,6 +12,7 @@
10.6
10.7
+ true
0.4
0.5
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationExporter/calculationWithoutSoilProfile.xml
===================================================================
diff -u -r36755a2f260964ef30be55dcef0f68167421d65f -r2f8dcdec6ecf12ac329a9230d51882adc5ecd837
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationExporter/calculationWithoutSoilProfile.xml (.../calculationWithoutSoilProfile.xml) (revision 36755a2f260964ef30be55dcef0f68167421d65f)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationExporter/calculationWithoutSoilProfile.xml (.../calculationWithoutSoilProfile.xml) (revision 2f8dcdec6ecf12ac329a9230d51882adc5ecd837)
@@ -12,6 +12,7 @@
10.6
10.7
+ true
0.4
0.5
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationExporter/calculationWithoutSoilmodel.xml
===================================================================
diff -u -r36755a2f260964ef30be55dcef0f68167421d65f -r2f8dcdec6ecf12ac329a9230d51882adc5ecd837
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationExporter/calculationWithoutSoilmodel.xml (.../calculationWithoutSoilmodel.xml) (revision 36755a2f260964ef30be55dcef0f68167421d65f)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationExporter/calculationWithoutSoilmodel.xml (.../calculationWithoutSoilmodel.xml) (revision 2f8dcdec6ecf12ac329a9230d51882adc5ecd837)
@@ -11,6 +11,7 @@
10.6
10.7
+ true
0.4
0.5
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationExporter/calculationWithoutSurfaceline.xml
===================================================================
diff -u -r36755a2f260964ef30be55dcef0f68167421d65f -r2f8dcdec6ecf12ac329a9230d51882adc5ecd837
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationExporter/calculationWithoutSurfaceline.xml (.../calculationWithoutSurfaceline.xml) (revision 36755a2f260964ef30be55dcef0f68167421d65f)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationExporter/calculationWithoutSurfaceline.xml (.../calculationWithoutSurfaceline.xml) (revision 2f8dcdec6ecf12ac329a9230d51882adc5ecd837)
@@ -12,6 +12,7 @@
10.6
10.7
+ true
0.4
0.5
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationExporter/folderWithSubfolderAndCalculation.xml
===================================================================
diff -u -r36755a2f260964ef30be55dcef0f68167421d65f -r2f8dcdec6ecf12ac329a9230d51882adc5ecd837
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationExporter/folderWithSubfolderAndCalculation.xml (.../folderWithSubfolderAndCalculation.xml) (revision 36755a2f260964ef30be55dcef0f68167421d65f)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationExporter/folderWithSubfolderAndCalculation.xml (.../folderWithSubfolderAndCalculation.xml) (revision 2f8dcdec6ecf12ac329a9230d51882adc5ecd837)
@@ -14,6 +14,7 @@
10.6
10.7
+ true
0.4
0.5
@@ -66,6 +67,7 @@
10.6
10.7
+ true
0.4
0.5
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationWriter/folderWithSubfolderAndCalculation.xml
===================================================================
diff -u -r36755a2f260964ef30be55dcef0f68167421d65f -r2f8dcdec6ecf12ac329a9230d51882adc5ecd837
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationWriter/folderWithSubfolderAndCalculation.xml (.../folderWithSubfolderAndCalculation.xml) (revision 36755a2f260964ef30be55dcef0f68167421d65f)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationWriter/folderWithSubfolderAndCalculation.xml (.../folderWithSubfolderAndCalculation.xml) (revision 2f8dcdec6ecf12ac329a9230d51882adc5ecd837)
@@ -15,6 +15,7 @@
10.5
10.6
+ true
0.4
0.5