Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/Configurations/MacroStabilityInwardsCalculationConfiguration.cs
===================================================================
diff -u -r1639c5017fdc9549fb63aaf2b5a178d45bec3c3b -r36755a2f260964ef30be55dcef0f68167421d65f
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/Configurations/MacroStabilityInwardsCalculationConfiguration.cs (.../MacroStabilityInwardsCalculationConfiguration.cs) (revision 1639c5017fdc9549fb63aaf2b5a178d45bec3c3b)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/Configurations/MacroStabilityInwardsCalculationConfiguration.cs (.../MacroStabilityInwardsCalculationConfiguration.cs) (revision 36755a2f260964ef30be55dcef0f68167421d65f)
@@ -77,6 +77,26 @@
public ConfigurationDikeSoilScenario? DikeSoilScenario { get; set; }
///
+ /// Gets or sets the average river water level.
+ ///
+ public double? WaterLevelRiverAverage { get; set; }
+
+ ///
+ /// Gets or sets whether a drainage construction is present.
+ ///
+ public bool? DrainageConstructionPresent { get; set; }
+
+ ///
+ /// Gets or sets the x coordinate of the drainage construction.
+ ///
+ public double? XCoordinateDrainageConstruction { get; set; }
+
+ ///
+ /// Gets or sets the z coordinate of the drainage construction.
+ ///
+ public double? ZCoordinateDrainageConstruction { 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 -r1639c5017fdc9549fb63aaf2b5a178d45bec3c3b -r36755a2f260964ef30be55dcef0f68167421d65f
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/Configurations/MacroStabilityInwardsCalculationConfigurationExporter.cs (.../MacroStabilityInwardsCalculationConfigurationExporter.cs) (revision 1639c5017fdc9549fb63aaf2b5a178d45bec3c3b)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/Configurations/MacroStabilityInwardsCalculationConfigurationExporter.cs (.../MacroStabilityInwardsCalculationConfigurationExporter.cs) (revision 36755a2f260964ef30be55dcef0f68167421d65f)
@@ -60,6 +60,10 @@
var calculationConfiguration = new MacroStabilityInwardsCalculationConfiguration(calculation.Name)
{
+ WaterLevelRiverAverage = input.WaterLevelRiverAverage,
+ DrainageConstructionPresent = input.DrainageConstructionPresent,
+ XCoordinateDrainageConstruction = input.XCoordinateDrainageConstruction,
+ ZCoordinateDrainageConstruction = input.ZCoordinateDrainageConstruction,
Scenario = calculation.ToScenarioConfiguration(),
SlipPlaneMinimumDepth = input.SlipPlaneMinimumDepth,
SlipPlaneMinimumLength = input.SlipPlaneMinimumLength,
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/Configurations/MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.cs
===================================================================
diff -u -r1639c5017fdc9549fb63aaf2b5a178d45bec3c3b -r36755a2f260964ef30be55dcef0f68167421d65f
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/Configurations/MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.cs (.../MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.cs) (revision 1639c5017fdc9549fb63aaf2b5a178d45bec3c3b)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/Configurations/MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.cs (.../MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.cs) (revision 36755a2f260964ef30be55dcef0f68167421d65f)
@@ -71,6 +71,44 @@
///
public const string CreateZones = "bepaling";
+ #region Water stresses
+
+ ///
+ /// The identifier for water stresses elements.
+ ///
+ public const string WaterStressesElement = "waterspanningen";
+
+ ///
+ /// The tag of the element containing the average river water level.
+ ///
+ public const string WaterLevelRiverAverageElement = "ghw";
+
+ #region Drainage
+
+ ///
+ /// The identifier for drainage construction elements.
+ ///
+ public const string DrainageConstructionElement = "drainage";
+
+ ///
+ /// The tag of the element containing the value whether a drainage construction is present.
+ ///
+ public const string DrainageConstructionPresentElement = "aanwezig";
+
+ ///
+ /// The tag of the element containing the x coordinate of the drainage construction.
+ ///
+ public const string XCoordinateDrainageConstructionElement = "x";
+
+ ///
+ /// The tag of the element containing the z coordinate of the drainage construction.
+ ///
+ public const string ZCoordinateDrainageConstructionElement = "z";
+
+ #endregion
+
+ #endregion
+
#region Dike soil scenario
///
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/Configurations/MacroStabilityInwardsCalculationConfigurationWriter.cs
===================================================================
diff -u -r1639c5017fdc9549fb63aaf2b5a178d45bec3c3b -r36755a2f260964ef30be55dcef0f68167421d65f
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/Configurations/MacroStabilityInwardsCalculationConfigurationWriter.cs (.../MacroStabilityInwardsCalculationConfigurationWriter.cs) (revision 1639c5017fdc9549fb63aaf2b5a178d45bec3c3b)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/Configurations/MacroStabilityInwardsCalculationConfigurationWriter.cs (.../MacroStabilityInwardsCalculationConfigurationWriter.cs) (revision 36755a2f260964ef30be55dcef0f68167421d65f)
@@ -85,6 +85,8 @@
MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.DikeSoilScenarioElement,
configuration.DikeSoilScenario);
+ WriteWaterStresses(writer, configuration);
+
WriteElementWhenContentAvailable(writer,
MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.SlipPlaneMinimumDepthElement,
configuration.SlipPlaneMinimumDepth);
@@ -102,6 +104,13 @@
WriteScenarioWhenAvailable(writer, configuration.Scenario);
}
+ ///
+ /// Writes the zone related parameters.
+ ///
+ /// The writer to use for writing.
+ /// The configuration to write.
+ /// Thrown when the
+ /// is closed.
private static void WriteZones(XmlWriter writer, MacroStabilityInwardsCalculationConfiguration configuration)
{
writer.WriteStartElement(MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.ZonesElement);
@@ -137,6 +146,54 @@
typeConverter.ConvertToInvariantString(dikeSoilScenario.Value));
}
+ #region Write water stresses
+
+ ///
+ /// Writes the water stress related parameters.
+ ///
+ /// The writer to use for writing.
+ /// The configuration to write.
+ /// Thrown when the
+ /// is closed.
+ private static void WriteWaterStresses(XmlWriter writer, MacroStabilityInwardsCalculationConfiguration configuration)
+ {
+ writer.WriteStartElement(MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.WaterStressesElement);
+
+ WriteElementWhenContentAvailable(writer,
+ MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.WaterLevelRiverAverageElement,
+ configuration.WaterLevelRiverAverage);
+
+ WriteDrainageConstruction(writer, configuration);
+
+ writer.WriteEndElement();
+ }
+
+ ///
+ /// Writes the drainage construction related parameters.
+ ///
+ /// The writer to use for writing.
+ /// The configuration to write.
+ /// Thrown when the
+ /// is closed.
+ private static void WriteDrainageConstruction(XmlWriter writer, MacroStabilityInwardsCalculationConfiguration configuration)
+ {
+ writer.WriteStartElement(MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.DrainageConstructionElement);
+
+ WriteElementWhenContentAvailable(writer,
+ MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.DrainageConstructionPresentElement,
+ configuration.DrainageConstructionPresent);
+ WriteElementWhenContentAvailable(writer,
+ MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.XCoordinateDrainageConstructionElement,
+ configuration.XCoordinateDrainageConstruction);
+ WriteElementWhenContentAvailable(writer,
+ MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.ZCoordinateDrainageConstructionElement,
+ configuration.ZCoordinateDrainageConstruction);
+
+ writer.WriteEndElement();
+ }
+
+ #endregion
+
#region Write grids
///
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil.Test/MacroStabilityInwardsTestDataGeneratorTest.cs
===================================================================
diff -u -ra4016e43171575322fa28bdeed3cc6713f767011 -r36755a2f260964ef30be55dcef0f68167421d65f
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil.Test/MacroStabilityInwardsTestDataGeneratorTest.cs (.../MacroStabilityInwardsTestDataGeneratorTest.cs) (revision a4016e43171575322fa28bdeed3cc6713f767011)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil.Test/MacroStabilityInwardsTestDataGeneratorTest.cs (.../MacroStabilityInwardsTestDataGeneratorTest.cs) (revision 36755a2f260964ef30be55dcef0f68167421d65f)
@@ -161,6 +161,9 @@
Assert.AreEqual("PK001_0001", input.SurfaceLine.Name);
Assert.AreEqual("PK001_0001_Macrostabiliteit", input.StochasticSoilModel.Name);
Assert.AreEqual("W1-6_0_1D1", input.StochasticSoilProfile.SoilProfile.Name);
+ Assert.IsNaN(input.XCoordinateDrainageConstruction);
+ Assert.IsNaN(input.ZCoordinateDrainageConstruction);
+
Assert.IsNaN(input.SlipPlaneMinimumDepth);
Assert.IsNaN(input.SlipPlaneMinimumLength);
Assert.IsNaN(input.MaximumSliceWidth);
@@ -192,6 +195,9 @@
Assert.AreEqual("PK001_0001 W1-6_0_1D1", calculation.Name);
MacroStabilityInwardsInput input = calculation.InputParameters;
+ Assert.AreEqual(double.PositiveInfinity, input.WaterLevelRiverAverage.Value);
+ Assert.AreEqual(double.PositiveInfinity, input.XCoordinateDrainageConstruction.Value);
+ Assert.AreEqual(double.NegativeInfinity, input.ZCoordinateDrainageConstruction.Value);
Assert.AreEqual(double.NegativeInfinity, input.AssessmentLevel.Value);
Assert.AreEqual("PK001_0001", input.SurfaceLine.Name);
Assert.AreEqual("PK001_0001_Macrostabiliteit", input.StochasticSoilModel.Name);
@@ -227,6 +233,11 @@
Assert.AreEqual("PK001_0001 W1-6_0_1D1", calculation.Name);
MacroStabilityInwardsInput input = calculation.InputParameters;
+ Assert.IsTrue(input.DrainageConstructionPresent);
+ Assert.AreEqual(10.5, input.WaterLevelRiverAverage, input.WaterLevelRiverAverage.GetAccuracy());
+ Assert.AreEqual(10.6, input.XCoordinateDrainageConstruction, input.XCoordinateDrainageConstruction.GetAccuracy());
+ Assert.AreEqual(10.7, input.ZCoordinateDrainageConstruction, input.ZCoordinateDrainageConstruction.GetAccuracy());
+
Assert.AreEqual(0.4, input.SlipPlaneMinimumDepth, input.SlipPlaneMinimumDepth.GetAccuracy());
Assert.AreEqual(0.5, input.SlipPlaneMinimumLength, input.SlipPlaneMinimumLength.GetAccuracy());
Assert.AreEqual(0.6, input.MaximumSliceWidth, input.MaximumSliceWidth.GetAccuracy());
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil/MacroStabilityInwardsTestDataGenerator.cs
===================================================================
diff -u -ra4016e43171575322fa28bdeed3cc6713f767011 -r36755a2f260964ef30be55dcef0f68167421d65f
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil/MacroStabilityInwardsTestDataGenerator.cs (.../MacroStabilityInwardsTestDataGenerator.cs) (revision a4016e43171575322fa28bdeed3cc6713f767011)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil/MacroStabilityInwardsTestDataGenerator.cs (.../MacroStabilityInwardsTestDataGenerator.cs) (revision 36755a2f260964ef30be55dcef0f68167421d65f)
@@ -153,6 +153,10 @@
{
new MacroStabilityInwardsSoilLayer1D(0)
})),
+ WaterLevelRiverAverage = (RoundedDouble) 10.5,
+ DrainageConstructionPresent = true,
+ XCoordinateDrainageConstruction = (RoundedDouble) 10.6,
+ ZCoordinateDrainageConstruction = (RoundedDouble) 10.7,
SlipPlaneMinimumDepth = (RoundedDouble) 0.4,
SlipPlaneMinimumLength = (RoundedDouble) 0.5,
MaximumSliceWidth = (RoundedDouble) 0.6,
@@ -175,6 +179,11 @@
calculation.Contribution = RoundedDouble.NaN;
MacroStabilityInwardsInput input = calculation.InputParameters;
+
+ input.WaterLevelRiverAverage = RoundedDouble.NaN;
+ input.XCoordinateDrainageConstruction = RoundedDouble.NaN;
+ input.ZCoordinateDrainageConstruction = RoundedDouble.NaN;
+
input.AssessmentLevel = RoundedDouble.NaN;
input.SlipPlaneMinimumDepth = RoundedDouble.NaN;
input.SlipPlaneMinimumLength = RoundedDouble.NaN;
@@ -214,6 +223,10 @@
new Point3D(0, double.PositiveInfinity, 0)
});
+ input.WaterLevelRiverAverage = (RoundedDouble) double.PositiveInfinity;
+ input.XCoordinateDrainageConstruction = (RoundedDouble) double.PositiveInfinity;
+ input.ZCoordinateDrainageConstruction = (RoundedDouble) double.NegativeInfinity;
+
input.AssessmentLevel = (RoundedDouble) double.NegativeInfinity;
input.SlipPlaneMinimumDepth = (RoundedDouble) double.NegativeInfinity;
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/Configurations/MacroStabilityInwardsCalculationConfigurationSchemaIdentifiersTest.cs
===================================================================
diff -u -r1639c5017fdc9549fb63aaf2b5a178d45bec3c3b -r36755a2f260964ef30be55dcef0f68167421d65f
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/Configurations/MacroStabilityInwardsCalculationConfigurationSchemaIdentifiersTest.cs (.../MacroStabilityInwardsCalculationConfigurationSchemaIdentifiersTest.cs) (revision 1639c5017fdc9549fb63aaf2b5a178d45bec3c3b)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/Configurations/MacroStabilityInwardsCalculationConfigurationSchemaIdentifiersTest.cs (.../MacroStabilityInwardsCalculationConfigurationSchemaIdentifiersTest.cs) (revision 36755a2f260964ef30be55dcef0f68167421d65f)
@@ -41,6 +41,14 @@
Assert.AreEqual("1B", MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.DikeSoilScenarioClayDikeOnSand);
Assert.AreEqual("2B", MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.DikeSoilScenarioSandDikeOnSand);
+ Assert.AreEqual("waterspanningen", MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.WaterStressesElement);
+ Assert.AreEqual("ghw", MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.WaterLevelRiverAverageElement);
+
+ Assert.AreEqual("drainage", MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.DrainageConstructionElement);
+ Assert.AreEqual("aanwezig", MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.DrainageConstructionPresentElement);
+ Assert.AreEqual("x", MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.XCoordinateDrainageConstructionElement);
+ Assert.AreEqual("z", MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.ZCoordinateDrainageConstructionElement);
+
Assert.AreEqual("minimaleglijvlakdiepte", MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.SlipPlaneMinimumDepthElement);
Assert.AreEqual("minimaleglijvlaklengte", MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.SlipPlaneMinimumLengthElement);
Assert.AreEqual("maximalelamelbreedte", MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.MaximumSliceWidthElement);
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/Configurations/MacroStabilityInwardsCalculationConfigurationTest.cs
===================================================================
diff -u -r1639c5017fdc9549fb63aaf2b5a178d45bec3c3b -r36755a2f260964ef30be55dcef0f68167421d65f
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/Configurations/MacroStabilityInwardsCalculationConfigurationTest.cs (.../MacroStabilityInwardsCalculationConfigurationTest.cs) (revision 1639c5017fdc9549fb63aaf2b5a178d45bec3c3b)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/Configurations/MacroStabilityInwardsCalculationConfigurationTest.cs (.../MacroStabilityInwardsCalculationConfigurationTest.cs) (revision 36755a2f260964ef30be55dcef0f68167421d65f)
@@ -58,6 +58,10 @@
Assert.IsNull(configuration.StochasticSoilProfileName);
Assert.IsNull(configuration.Scenario);
Assert.IsNull(configuration.DikeSoilScenario);
+ Assert.IsNull(configuration.WaterLevelRiverAverage);
+ Assert.IsNull(configuration.DrainageConstructionPresent);
+ Assert.IsNull(configuration.XCoordinateDrainageConstruction);
+ Assert.IsNull(configuration.ZCoordinateDrainageConstruction);
Assert.IsNull(configuration.SlipPlaneMinimumDepth);
Assert.IsNull(configuration.SlipPlaneMinimumLength);
Assert.IsNull(configuration.MaximumSliceWidth);
@@ -83,6 +87,12 @@
const string stochasticSoilModel = "Name of the stochastic soil model";
const string stochasticSoilProfile = "Name of the stochastic soil profile";
const ConfigurationDikeSoilScenario dikeSoilScenario = ConfigurationDikeSoilScenario.SandDikeOnSand;
+
+ const double waterLevelRiverAverage = 1.5;
+ const bool drainageConstructionPresent = true;
+ const double xCoordinateDrainageConstruction = 0.6;
+ const double zCoordinateDrainageConstruction = 0.7;
+
const double slipPlaneMinimumDepth = 2.2;
const double slipPlaneMinimumLength = 3.3;
const double maximumSliceWidth = 4.4;
@@ -108,6 +118,10 @@
StochasticSoilProfileName = stochasticSoilProfile,
Scenario = scenarioConfiguration,
DikeSoilScenario = dikeSoilScenario,
+ WaterLevelRiverAverage = waterLevelRiverAverage,
+ DrainageConstructionPresent = drainageConstructionPresent,
+ XCoordinateDrainageConstruction = xCoordinateDrainageConstruction,
+ ZCoordinateDrainageConstruction = zCoordinateDrainageConstruction,
SlipPlaneMinimumDepth = slipPlaneMinimumDepth,
SlipPlaneMinimumLength = slipPlaneMinimumLength,
MaximumSliceWidth = maximumSliceWidth,
@@ -131,6 +145,10 @@
Assert.AreEqual(stochasticSoilProfile, configuration.StochasticSoilProfileName);
Assert.AreSame(scenarioConfiguration, configuration.Scenario);
Assert.AreEqual(dikeSoilScenario, configuration.DikeSoilScenario);
+ Assert.AreEqual(waterLevelRiverAverage, configuration.WaterLevelRiverAverage);
+ Assert.AreEqual(drainageConstructionPresent, configuration.DrainageConstructionPresent);
+ Assert.AreEqual(xCoordinateDrainageConstruction, configuration.XCoordinateDrainageConstruction);
+ Assert.AreEqual(zCoordinateDrainageConstruction, configuration.ZCoordinateDrainageConstruction);
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 -r1639c5017fdc9549fb63aaf2b5a178d45bec3c3b -r36755a2f260964ef30be55dcef0f68167421d65f
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/Configurations/MacroStabilityInwardsCalculationConfigurationWriterTest.cs (.../MacroStabilityInwardsCalculationConfigurationWriterTest.cs) (revision 1639c5017fdc9549fb63aaf2b5a178d45bec3c3b)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/Configurations/MacroStabilityInwardsCalculationConfigurationWriterTest.cs (.../MacroStabilityInwardsCalculationConfigurationWriterTest.cs) (revision 36755a2f260964ef30be55dcef0f68167421d65f)
@@ -89,6 +89,10 @@
SlipPlaneMinimumDepth = 0.4,
SlipPlaneMinimumLength = 0.5,
MaximumSliceWidth = 0.6,
+ WaterLevelRiverAverage = 20,
+ DrainageConstructionPresent = true,
+ XCoordinateDrainageConstruction = 10.5,
+ ZCoordinateDrainageConstruction = 10.6,
CreateZones = true,
MoveGrid = true,
GridDeterminationType = ConfigurationGridDeterminationType.Automatic,
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationExporter/calculationIrrelevant.xml
===================================================================
diff -u -r1639c5017fdc9549fb63aaf2b5a178d45bec3c3b -r36755a2f260964ef30be55dcef0f68167421d65f
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationExporter/calculationIrrelevant.xml (.../calculationIrrelevant.xml) (revision 1639c5017fdc9549fb63aaf2b5a178d45bec3c3b)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationExporter/calculationIrrelevant.xml (.../calculationIrrelevant.xml) (revision 36755a2f260964ef30be55dcef0f68167421d65f)
@@ -6,6 +6,14 @@
PK001_0001_Macrostabiliteit
W1-6_0_1D1
1A
+
+ 10.5
+
+ true
+ 10.6
+ 10.7
+
+
0.4
0.5
0.6
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationExporter/calculationWithAssessmentLevel.xml
===================================================================
diff -u -r1639c5017fdc9549fb63aaf2b5a178d45bec3c3b -r36755a2f260964ef30be55dcef0f68167421d65f
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationExporter/calculationWithAssessmentLevel.xml (.../calculationWithAssessmentLevel.xml) (revision 1639c5017fdc9549fb63aaf2b5a178d45bec3c3b)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationExporter/calculationWithAssessmentLevel.xml (.../calculationWithAssessmentLevel.xml) (revision 36755a2f260964ef30be55dcef0f68167421d65f)
@@ -6,6 +6,14 @@
PK001_0001_Macrostabiliteit
W1-6_0_1D1
1A
+
+ 10.5
+
+ true
+ 10.6
+ 10.7
+
+
0.4
0.5
0.6
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationExporter/calculationWithInfinities.xml
===================================================================
diff -u -r1639c5017fdc9549fb63aaf2b5a178d45bec3c3b -r36755a2f260964ef30be55dcef0f68167421d65f
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationExporter/calculationWithInfinities.xml (.../calculationWithInfinities.xml) (revision 1639c5017fdc9549fb63aaf2b5a178d45bec3c3b)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationExporter/calculationWithInfinities.xml (.../calculationWithInfinities.xml) (revision 36755a2f260964ef30be55dcef0f68167421d65f)
@@ -6,6 +6,14 @@
PK001_0001_Macrostabiliteit
W1-6_0_1D1
1A
+
+ INF
+
+ true
+ INF
+ -INF
+
+
-INF
INF
-INF
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationExporter/calculationWithNaNs.xml
===================================================================
diff -u -r1639c5017fdc9549fb63aaf2b5a178d45bec3c3b -r36755a2f260964ef30be55dcef0f68167421d65f
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationExporter/calculationWithNaNs.xml (.../calculationWithNaNs.xml) (revision 1639c5017fdc9549fb63aaf2b5a178d45bec3c3b)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationExporter/calculationWithNaNs.xml (.../calculationWithNaNs.xml) (revision 36755a2f260964ef30be55dcef0f68167421d65f)
@@ -6,6 +6,14 @@
PK001_0001_Macrostabiliteit
W1-6_0_1D1
1A
+
+ NaN
+
+ true
+ NaN
+ NaN
+
+
NaN
NaN
NaN
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationExporter/calculationWithoutHydraulicLocation.xml
===================================================================
diff -u -r1639c5017fdc9549fb63aaf2b5a178d45bec3c3b -r36755a2f260964ef30be55dcef0f68167421d65f
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationExporter/calculationWithoutHydraulicLocation.xml (.../calculationWithoutHydraulicLocation.xml) (revision 1639c5017fdc9549fb63aaf2b5a178d45bec3c3b)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationExporter/calculationWithoutHydraulicLocation.xml (.../calculationWithoutHydraulicLocation.xml) (revision 36755a2f260964ef30be55dcef0f68167421d65f)
@@ -5,6 +5,14 @@
PK001_0001_Macrostabiliteit
W1-6_0_1D1
1A
+
+ 10.5
+
+ true
+ 10.6
+ 10.7
+
+
0.4
0.5
0.6
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationExporter/calculationWithoutSoilProfile.xml
===================================================================
diff -u -r1639c5017fdc9549fb63aaf2b5a178d45bec3c3b -r36755a2f260964ef30be55dcef0f68167421d65f
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationExporter/calculationWithoutSoilProfile.xml (.../calculationWithoutSoilProfile.xml) (revision 1639c5017fdc9549fb63aaf2b5a178d45bec3c3b)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationExporter/calculationWithoutSoilProfile.xml (.../calculationWithoutSoilProfile.xml) (revision 36755a2f260964ef30be55dcef0f68167421d65f)
@@ -5,6 +5,14 @@
PK001_0001
PK001_0001_Macrostabiliteit
1A
+
+ 10.5
+
+ true
+ 10.6
+ 10.7
+
+
0.4
0.5
0.6
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationExporter/calculationWithoutSoilmodel.xml
===================================================================
diff -u -r1639c5017fdc9549fb63aaf2b5a178d45bec3c3b -r36755a2f260964ef30be55dcef0f68167421d65f
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationExporter/calculationWithoutSoilmodel.xml (.../calculationWithoutSoilmodel.xml) (revision 1639c5017fdc9549fb63aaf2b5a178d45bec3c3b)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationExporter/calculationWithoutSoilmodel.xml (.../calculationWithoutSoilmodel.xml) (revision 36755a2f260964ef30be55dcef0f68167421d65f)
@@ -4,6 +4,14 @@
PUNT_KAT_18
PK001_0001
1A
+
+ 10.5
+
+ true
+ 10.6
+ 10.7
+
+
0.4
0.5
0.6
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationExporter/calculationWithoutSurfaceline.xml
===================================================================
diff -u -r1639c5017fdc9549fb63aaf2b5a178d45bec3c3b -r36755a2f260964ef30be55dcef0f68167421d65f
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationExporter/calculationWithoutSurfaceline.xml (.../calculationWithoutSurfaceline.xml) (revision 1639c5017fdc9549fb63aaf2b5a178d45bec3c3b)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationExporter/calculationWithoutSurfaceline.xml (.../calculationWithoutSurfaceline.xml) (revision 36755a2f260964ef30be55dcef0f68167421d65f)
@@ -5,6 +5,14 @@
PK001_0001_Macrostabiliteit
W1-6_0_1D1
1A
+
+ 10.5
+
+ true
+ 10.6
+ 10.7
+
+
0.4
0.5
0.6
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationExporter/folderWithSubfolderAndCalculation.xml
===================================================================
diff -u -r1639c5017fdc9549fb63aaf2b5a178d45bec3c3b -r36755a2f260964ef30be55dcef0f68167421d65f
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationExporter/folderWithSubfolderAndCalculation.xml (.../folderWithSubfolderAndCalculation.xml) (revision 1639c5017fdc9549fb63aaf2b5a178d45bec3c3b)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationExporter/folderWithSubfolderAndCalculation.xml (.../folderWithSubfolderAndCalculation.xml) (revision 36755a2f260964ef30be55dcef0f68167421d65f)
@@ -7,6 +7,14 @@
PK001_0001_Macrostabiliteit
W1-6_0_1D1
1A
+
+ 10.5
+
+ true
+ 10.6
+ 10.7
+
+
0.4
0.5
0.6
@@ -51,6 +59,14 @@
PK001_0001_Macrostabiliteit
W1-6_0_1D1
1A
+
+ 10.5
+
+ true
+ 10.6
+ 10.7
+
+
0.4
0.5
0.6
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationWriter/folderWithSubfolderAndCalculation.xml
===================================================================
diff -u -r1639c5017fdc9549fb63aaf2b5a178d45bec3c3b -r36755a2f260964ef30be55dcef0f68167421d65f
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationWriter/folderWithSubfolderAndCalculation.xml (.../folderWithSubfolderAndCalculation.xml) (revision 1639c5017fdc9549fb63aaf2b5a178d45bec3c3b)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationWriter/folderWithSubfolderAndCalculation.xml (.../folderWithSubfolderAndCalculation.xml) (revision 36755a2f260964ef30be55dcef0f68167421d65f)
@@ -8,6 +8,14 @@
PK001_0001_Macrostabiliteit
W1-6_0_1D1
1B
+
+ 20
+
+ true
+ 10.5
+ 10.6
+
+
0.4
0.5
0.6
@@ -47,6 +55,9 @@