Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/Configurations/MacroStabilityInwardsCalculationConfiguration.cs =================================================================== diff -u -r2ef33b18220a8c8682c261ae78f261e85ce9a21a -rcbfda96c30eb17a999ebf82ec545dcbae8935dcc --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/Configurations/MacroStabilityInwardsCalculationConfiguration.cs (.../MacroStabilityInwardsCalculationConfiguration.cs) (revision 2ef33b18220a8c8682c261ae78f261e85ce9a21a) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/Configurations/MacroStabilityInwardsCalculationConfiguration.cs (.../MacroStabilityInwardsCalculationConfiguration.cs) (revision cbfda96c30eb17a999ebf82ec545dcbae8935dcc) @@ -158,6 +158,11 @@ public bool? AdjustPhreaticLine3And4ForUplift { get; set; } /// + /// Gets or sets the phreatic line configuration for phreatic line 2. + /// + public PhreaticLineConfiguration PhreaticLine2 { get; set; } + + /// /// Gets or sets the phreatic line configuration for phreatic line 3. /// public PhreaticLineConfiguration PhreaticLine3 { get; set; } Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/Configurations/MacroStabilityInwardsCalculationConfigurationExporter.cs =================================================================== diff -u -r2ef33b18220a8c8682c261ae78f261e85ce9a21a -rcbfda96c30eb17a999ebf82ec545dcbae8935dcc --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/Configurations/MacroStabilityInwardsCalculationConfigurationExporter.cs (.../MacroStabilityInwardsCalculationConfigurationExporter.cs) (revision 2ef33b18220a8c8682c261ae78f261e85ce9a21a) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/Configurations/MacroStabilityInwardsCalculationConfigurationExporter.cs (.../MacroStabilityInwardsCalculationConfigurationExporter.cs) (revision cbfda96c30eb17a999ebf82ec545dcbae8935dcc) @@ -67,6 +67,11 @@ MinimumLevelPhreaticLineAtDikeTopPolder = input.MinimumLevelPhreaticLineAtDikeTopPolder, MinimumLevelPhreaticLineAtDikeTopRiver = input.MinimumLevelPhreaticLineAtDikeTopRiver, AdjustPhreaticLine3And4ForUplift = input.AdjustPhreaticLine3And4ForUplift, + PhreaticLine2 = new PhreaticLineConfiguration + { + Inwards = input.PiezometricHeadPhreaticLine2Inwards, + Outwards = input.PiezometricHeadPhreaticLine2Outwards + }, PhreaticLine3 = new PhreaticLineConfiguration { Inwards = input.LeakageLengthInwardsPhreaticLine3, Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/Configurations/MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.cs =================================================================== diff -u -r2ef33b18220a8c8682c261ae78f261e85ce9a21a -rcbfda96c30eb17a999ebf82ec545dcbae8935dcc --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/Configurations/MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.cs (.../MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.cs) (revision 2ef33b18220a8c8682c261ae78f261e85ce9a21a) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/Configurations/MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.cs (.../MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.cs) (revision cbfda96c30eb17a999ebf82ec545dcbae8935dcc) @@ -126,6 +126,11 @@ public const string LeakageLengthElement = "leklengtes"; /// + /// The identifier for piezometric head elements. + /// + public const string PiezometricHeadElement = "stijghoogtes"; + + /// /// The tag of the element containing the value indicating the phreatic line inwards leakage length or piezometric head. /// public const string PhreaticLineInwardsElement = "binnenwaarts"; Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/Configurations/MacroStabilityInwardsCalculationConfigurationWriter.cs =================================================================== diff -u -r2ef33b18220a8c8682c261ae78f261e85ce9a21a -rcbfda96c30eb17a999ebf82ec545dcbae8935dcc --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/Configurations/MacroStabilityInwardsCalculationConfigurationWriter.cs (.../MacroStabilityInwardsCalculationConfigurationWriter.cs) (revision 2ef33b18220a8c8682c261ae78f261e85ce9a21a) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/Configurations/MacroStabilityInwardsCalculationConfigurationWriter.cs (.../MacroStabilityInwardsCalculationConfigurationWriter.cs) (revision cbfda96c30eb17a999ebf82ec545dcbae8935dcc) @@ -166,13 +166,15 @@ WriteDrainageConstruction(writer, configuration); WriteMinimumLevelPhreaticLine(writer, configuration); - + WriteElementWhenContentAvailable(writer, MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.AdjustPhreaticLine3And4ForUpliftElement, configuration.AdjustPhreaticLine3And4ForUplift); WriteLeakageLength(writer, configuration); + WritePiezometricHead(writer, configuration); + writer.WriteEndElement(); } @@ -198,6 +200,24 @@ } /// + /// Writes the piezometric head related parameters. + /// + /// The writer to use for writing. + /// The configuration to write. + /// Thrown when the + /// is closed. + private static void WritePiezometricHead(XmlWriter writer, MacroStabilityInwardsCalculationConfiguration configuration) + { + writer.WriteStartElement(MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.PiezometricHeadElement); + + WritePhreaticLineConfiguration(writer, + MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.PhreaticLine2Element, + configuration.PhreaticLine2); + + writer.WriteEndElement(); + } + + /// /// Writes a phreatic line configuration. /// /// The writer to use for writing. Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil.Test/MacroStabilityInwardsTestDataGeneratorTest.cs =================================================================== diff -u -raf341ae554425a1832b712c219f5eff86c5d2282 -rcbfda96c30eb17a999ebf82ec545dcbae8935dcc --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil.Test/MacroStabilityInwardsTestDataGeneratorTest.cs (.../MacroStabilityInwardsTestDataGeneratorTest.cs) (revision af341ae554425a1832b712c219f5eff86c5d2282) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil.Test/MacroStabilityInwardsTestDataGeneratorTest.cs (.../MacroStabilityInwardsTestDataGeneratorTest.cs) (revision cbfda96c30eb17a999ebf82ec545dcbae8935dcc) @@ -161,10 +161,13 @@ 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.MinimumLevelPhreaticLineAtDikeTopPolder); Assert.IsNaN(input.MinimumLevelPhreaticLineAtDikeTopRiver); + Assert.IsNaN(input.PiezometricHeadPhreaticLine2Inwards.Value); + Assert.IsNaN(input.PiezometricHeadPhreaticLine2Outwards.Value); Assert.IsNaN(input.SlipPlaneMinimumDepth); Assert.IsNaN(input.SlipPlaneMinimumLength); @@ -203,6 +206,8 @@ Assert.AreEqual(double.PositiveInfinity, input.MinimumLevelPhreaticLineAtDikeTopPolder.Value); Assert.AreEqual(double.NegativeInfinity, input.MinimumLevelPhreaticLineAtDikeTopRiver.Value); + Assert.AreEqual(double.PositiveInfinity, input.PiezometricHeadPhreaticLine2Inwards.Value); + Assert.AreEqual(double.NegativeInfinity, input.PiezometricHeadPhreaticLine2Outwards.Value); Assert.AreEqual(double.NegativeInfinity, input.AssessmentLevel.Value); Assert.AreEqual("PK001_0001", input.SurfaceLine.Name); Assert.AreEqual("PK001_0001_Macrostabiliteit", input.StochasticSoilModel.Name); @@ -244,6 +249,8 @@ Assert.AreEqual(10.7, input.ZCoordinateDrainageConstruction, input.ZCoordinateDrainageConstruction.GetAccuracy()); Assert.AreEqual(10.8, input.MinimumLevelPhreaticLineAtDikeTopPolder, input.MinimumLevelPhreaticLineAtDikeTopPolder.GetAccuracy()); Assert.AreEqual(10.9, input.MinimumLevelPhreaticLineAtDikeTopRiver, input.MinimumLevelPhreaticLineAtDikeTopRiver.GetAccuracy()); + Assert.AreEqual(20.1, input.PiezometricHeadPhreaticLine2Inwards, input.PiezometricHeadPhreaticLine2Inwards.GetAccuracy()); + Assert.AreEqual(20.2, input.PiezometricHeadPhreaticLine2Outwards, input.PiezometricHeadPhreaticLine2Outwards.GetAccuracy()); Assert.AreEqual(0.4, input.SlipPlaneMinimumDepth, input.SlipPlaneMinimumDepth.GetAccuracy()); Assert.AreEqual(0.5, input.SlipPlaneMinimumLength, input.SlipPlaneMinimumLength.GetAccuracy()); Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil/MacroStabilityInwardsTestDataGenerator.cs =================================================================== diff -u -r2ef33b18220a8c8682c261ae78f261e85ce9a21a -rcbfda96c30eb17a999ebf82ec545dcbae8935dcc --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil/MacroStabilityInwardsTestDataGenerator.cs (.../MacroStabilityInwardsTestDataGenerator.cs) (revision 2ef33b18220a8c8682c261ae78f261e85ce9a21a) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil/MacroStabilityInwardsTestDataGenerator.cs (.../MacroStabilityInwardsTestDataGenerator.cs) (revision cbfda96c30eb17a999ebf82ec545dcbae8935dcc) @@ -163,6 +163,8 @@ LeakageLengthOutwardsPhreaticLine3 = (RoundedDouble) 10.2, LeakageLengthInwardsPhreaticLine4 = (RoundedDouble) 10.3, LeakageLengthOutwardsPhreaticLine4 = (RoundedDouble) 10.4, + PiezometricHeadPhreaticLine2Inwards = (RoundedDouble) 20.1, + PiezometricHeadPhreaticLine2Outwards = (RoundedDouble) 20.2, SlipPlaneMinimumDepth = (RoundedDouble) 0.4, SlipPlaneMinimumLength = (RoundedDouble) 0.5, MaximumSliceWidth = (RoundedDouble) 0.6, @@ -197,6 +199,8 @@ input.LeakageLengthOutwardsPhreaticLine3 = RoundedDouble.NaN; input.LeakageLengthInwardsPhreaticLine4 = RoundedDouble.NaN; input.LeakageLengthOutwardsPhreaticLine4 = RoundedDouble.NaN; + input.PiezometricHeadPhreaticLine2Inwards = RoundedDouble.NaN; + input.PiezometricHeadPhreaticLine2Outwards = RoundedDouble.NaN; input.AssessmentLevel = RoundedDouble.NaN; input.SlipPlaneMinimumDepth = RoundedDouble.NaN; @@ -248,6 +252,8 @@ input.LeakageLengthOutwardsPhreaticLine3 = (RoundedDouble) double.NegativeInfinity; input.LeakageLengthInwardsPhreaticLine4 = (RoundedDouble) double.PositiveInfinity; input.LeakageLengthOutwardsPhreaticLine4 = (RoundedDouble) double.NegativeInfinity; + input.PiezometricHeadPhreaticLine2Inwards = (RoundedDouble) double.PositiveInfinity; + input.PiezometricHeadPhreaticLine2Outwards = (RoundedDouble) double.NegativeInfinity; input.AssessmentLevel = (RoundedDouble) double.NegativeInfinity; Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/Configurations/MacroStabilityInwardsCalculationConfigurationSchemaIdentifiersTest.cs =================================================================== diff -u -r2ef33b18220a8c8682c261ae78f261e85ce9a21a -rcbfda96c30eb17a999ebf82ec545dcbae8935dcc --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/Configurations/MacroStabilityInwardsCalculationConfigurationSchemaIdentifiersTest.cs (.../MacroStabilityInwardsCalculationConfigurationSchemaIdentifiersTest.cs) (revision 2ef33b18220a8c8682c261ae78f261e85ce9a21a) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/Configurations/MacroStabilityInwardsCalculationConfigurationSchemaIdentifiersTest.cs (.../MacroStabilityInwardsCalculationConfigurationSchemaIdentifiersTest.cs) (revision cbfda96c30eb17a999ebf82ec545dcbae8935dcc) @@ -51,6 +51,7 @@ Assert.AreEqual("buitenkruin", MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.MinimumLevelPhreaticLineAtDikeTopRiverElement); Assert.AreEqual("binnenkruin", MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.MinimumLevelPhreaticLineAtDikeTopPolderElement); Assert.AreEqual("leklengtes", MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.LeakageLengthElement); + Assert.AreEqual("stijghoogtes", MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.PiezometricHeadElement); Assert.AreEqual("binnenwaarts", MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.PhreaticLineInwardsElement); Assert.AreEqual("buitenwaarts", MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.PhreaticLineOutwardsElement); Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/Configurations/MacroStabilityInwardsCalculationConfigurationTest.cs =================================================================== diff -u -r2ef33b18220a8c8682c261ae78f261e85ce9a21a -rcbfda96c30eb17a999ebf82ec545dcbae8935dcc --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/Configurations/MacroStabilityInwardsCalculationConfigurationTest.cs (.../MacroStabilityInwardsCalculationConfigurationTest.cs) (revision 2ef33b18220a8c8682c261ae78f261e85ce9a21a) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/Configurations/MacroStabilityInwardsCalculationConfigurationTest.cs (.../MacroStabilityInwardsCalculationConfigurationTest.cs) (revision cbfda96c30eb17a999ebf82ec545dcbae8935dcc) @@ -65,6 +65,7 @@ Assert.IsNull(configuration.MinimumLevelPhreaticLineAtDikeTopRiver); Assert.IsNull(configuration.MinimumLevelPhreaticLineAtDikeTopPolder); Assert.IsNull(configuration.AdjustPhreaticLine3And4ForUplift); + Assert.IsNull(configuration.PhreaticLine2); Assert.IsNull(configuration.PhreaticLine3); Assert.IsNull(configuration.PhreaticLine4); Assert.IsNull(configuration.SlipPlaneMinimumDepth); @@ -102,6 +103,7 @@ const double minimumLevelPhreaticLineAtDikeTopPolder = 0.9; const bool adjustPhreaticLine3And4ForUplift = true; + var phreaticLine2 = new PhreaticLineConfiguration(); var phreaticLine3 = new PhreaticLineConfiguration(); var phreaticLine4 = new PhreaticLineConfiguration(); @@ -137,6 +139,7 @@ MinimumLevelPhreaticLineAtDikeTopRiver = minimumLevelPhreaticLineAtDikeTopRiver, MinimumLevelPhreaticLineAtDikeTopPolder = minimumLevelPhreaticLineAtDikeTopPolder, AdjustPhreaticLine3And4ForUplift = adjustPhreaticLine3And4ForUplift, + PhreaticLine2 = phreaticLine2, PhreaticLine3 = phreaticLine3, PhreaticLine4 = phreaticLine4, SlipPlaneMinimumDepth = slipPlaneMinimumDepth, @@ -169,6 +172,7 @@ Assert.AreEqual(minimumLevelPhreaticLineAtDikeTopRiver, configuration.MinimumLevelPhreaticLineAtDikeTopRiver); Assert.AreEqual(minimumLevelPhreaticLineAtDikeTopPolder, configuration.MinimumLevelPhreaticLineAtDikeTopPolder); Assert.AreEqual(adjustPhreaticLine3And4ForUplift, configuration.AdjustPhreaticLine3And4ForUplift); + Assert.AreSame(phreaticLine2, configuration.PhreaticLine2); Assert.AreSame(phreaticLine3, configuration.PhreaticLine3); Assert.AreSame(phreaticLine4, configuration.PhreaticLine4); Assert.AreEqual(slipPlaneMinimumDepth, configuration.SlipPlaneMinimumDepth); Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/Configurations/MacroStabilityInwardsCalculationConfigurationWriterTest.cs =================================================================== diff -u -r2ef33b18220a8c8682c261ae78f261e85ce9a21a -rcbfda96c30eb17a999ebf82ec545dcbae8935dcc --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/Configurations/MacroStabilityInwardsCalculationConfigurationWriterTest.cs (.../MacroStabilityInwardsCalculationConfigurationWriterTest.cs) (revision 2ef33b18220a8c8682c261ae78f261e85ce9a21a) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/Configurations/MacroStabilityInwardsCalculationConfigurationWriterTest.cs (.../MacroStabilityInwardsCalculationConfigurationWriterTest.cs) (revision cbfda96c30eb17a999ebf82ec545dcbae8935dcc) @@ -95,6 +95,11 @@ ZCoordinateDrainageConstruction = 10.6, MinimumLevelPhreaticLineAtDikeTopPolder = 11.1, MinimumLevelPhreaticLineAtDikeTopRiver = 11.2, + PhreaticLine2 = new PhreaticLineConfiguration + { + Inwards = 60.1, + Outwards = 60.2 + }, PhreaticLine3 = new PhreaticLineConfiguration { Inwards = 70.1, Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationExporter/calculationIrrelevant.xml =================================================================== diff -u -r2ef33b18220a8c8682c261ae78f261e85ce9a21a -rcbfda96c30eb17a999ebf82ec545dcbae8935dcc --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationExporter/calculationIrrelevant.xml (.../calculationIrrelevant.xml) (revision 2ef33b18220a8c8682c261ae78f261e85ce9a21a) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationExporter/calculationIrrelevant.xml (.../calculationIrrelevant.xml) (revision cbfda96c30eb17a999ebf82ec545dcbae8935dcc) @@ -30,6 +30,12 @@ 10.4 + + + 20.1 + 20.2 + + 0.4 0.5 Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationExporter/calculationWithAssessmentLevel.xml =================================================================== diff -u -r2ef33b18220a8c8682c261ae78f261e85ce9a21a -rcbfda96c30eb17a999ebf82ec545dcbae8935dcc --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationExporter/calculationWithAssessmentLevel.xml (.../calculationWithAssessmentLevel.xml) (revision 2ef33b18220a8c8682c261ae78f261e85ce9a21a) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationExporter/calculationWithAssessmentLevel.xml (.../calculationWithAssessmentLevel.xml) (revision cbfda96c30eb17a999ebf82ec545dcbae8935dcc) @@ -30,6 +30,12 @@ 10.4 + + + 20.1 + 20.2 + + 0.4 0.5 Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationExporter/calculationWithInfinities.xml =================================================================== diff -u -r2ef33b18220a8c8682c261ae78f261e85ce9a21a -rcbfda96c30eb17a999ebf82ec545dcbae8935dcc --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationExporter/calculationWithInfinities.xml (.../calculationWithInfinities.xml) (revision 2ef33b18220a8c8682c261ae78f261e85ce9a21a) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationExporter/calculationWithInfinities.xml (.../calculationWithInfinities.xml) (revision cbfda96c30eb17a999ebf82ec545dcbae8935dcc) @@ -30,6 +30,12 @@ -INF + + + INF + -INF + + -INF INF Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationExporter/calculationWithNaNs.xml =================================================================== diff -u -r2ef33b18220a8c8682c261ae78f261e85ce9a21a -rcbfda96c30eb17a999ebf82ec545dcbae8935dcc --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationExporter/calculationWithNaNs.xml (.../calculationWithNaNs.xml) (revision 2ef33b18220a8c8682c261ae78f261e85ce9a21a) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationExporter/calculationWithNaNs.xml (.../calculationWithNaNs.xml) (revision cbfda96c30eb17a999ebf82ec545dcbae8935dcc) @@ -30,6 +30,12 @@ NaN + + + NaN + NaN + + NaN NaN Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationExporter/calculationWithoutHydraulicLocation.xml =================================================================== diff -u -r2ef33b18220a8c8682c261ae78f261e85ce9a21a -rcbfda96c30eb17a999ebf82ec545dcbae8935dcc --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationExporter/calculationWithoutHydraulicLocation.xml (.../calculationWithoutHydraulicLocation.xml) (revision 2ef33b18220a8c8682c261ae78f261e85ce9a21a) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationExporter/calculationWithoutHydraulicLocation.xml (.../calculationWithoutHydraulicLocation.xml) (revision cbfda96c30eb17a999ebf82ec545dcbae8935dcc) @@ -29,6 +29,12 @@ 10.4 + + + 20.1 + 20.2 + + 0.4 0.5 Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationExporter/calculationWithoutSoilProfile.xml =================================================================== diff -u -r2ef33b18220a8c8682c261ae78f261e85ce9a21a -rcbfda96c30eb17a999ebf82ec545dcbae8935dcc --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationExporter/calculationWithoutSoilProfile.xml (.../calculationWithoutSoilProfile.xml) (revision 2ef33b18220a8c8682c261ae78f261e85ce9a21a) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationExporter/calculationWithoutSoilProfile.xml (.../calculationWithoutSoilProfile.xml) (revision cbfda96c30eb17a999ebf82ec545dcbae8935dcc) @@ -29,6 +29,12 @@ 10.4 + + + 20.1 + 20.2 + + 0.4 0.5 Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationExporter/calculationWithoutSoilmodel.xml =================================================================== diff -u -r2ef33b18220a8c8682c261ae78f261e85ce9a21a -rcbfda96c30eb17a999ebf82ec545dcbae8935dcc --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationExporter/calculationWithoutSoilmodel.xml (.../calculationWithoutSoilmodel.xml) (revision 2ef33b18220a8c8682c261ae78f261e85ce9a21a) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationExporter/calculationWithoutSoilmodel.xml (.../calculationWithoutSoilmodel.xml) (revision cbfda96c30eb17a999ebf82ec545dcbae8935dcc) @@ -28,6 +28,12 @@ 10.4 + + + 20.1 + 20.2 + + 0.4 0.5 Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationExporter/calculationWithoutSurfaceline.xml =================================================================== diff -u -r2ef33b18220a8c8682c261ae78f261e85ce9a21a -rcbfda96c30eb17a999ebf82ec545dcbae8935dcc --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationExporter/calculationWithoutSurfaceline.xml (.../calculationWithoutSurfaceline.xml) (revision 2ef33b18220a8c8682c261ae78f261e85ce9a21a) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationExporter/calculationWithoutSurfaceline.xml (.../calculationWithoutSurfaceline.xml) (revision cbfda96c30eb17a999ebf82ec545dcbae8935dcc) @@ -29,6 +29,12 @@ 10.4 + + + 20.1 + 20.2 + + 0.4 0.5 Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationExporter/folderWithSubfolderAndCalculation.xml =================================================================== diff -u -r2ef33b18220a8c8682c261ae78f261e85ce9a21a -rcbfda96c30eb17a999ebf82ec545dcbae8935dcc --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationExporter/folderWithSubfolderAndCalculation.xml (.../folderWithSubfolderAndCalculation.xml) (revision 2ef33b18220a8c8682c261ae78f261e85ce9a21a) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationExporter/folderWithSubfolderAndCalculation.xml (.../folderWithSubfolderAndCalculation.xml) (revision cbfda96c30eb17a999ebf82ec545dcbae8935dcc) @@ -31,6 +31,12 @@ 10.4 + + + 20.1 + 20.2 + + 0.4 0.5 @@ -100,6 +106,12 @@ 10.4 + + + 20.1 + 20.2 + + 0.4 0.5 Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationWriter/folderWithSubfolderAndCalculation.xml =================================================================== diff -u -r2ef33b18220a8c8682c261ae78f261e85ce9a21a -rcbfda96c30eb17a999ebf82ec545dcbae8935dcc --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationWriter/folderWithSubfolderAndCalculation.xml (.../folderWithSubfolderAndCalculation.xml) (revision 2ef33b18220a8c8682c261ae78f261e85ce9a21a) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationWriter/folderWithSubfolderAndCalculation.xml (.../folderWithSubfolderAndCalculation.xml) (revision cbfda96c30eb17a999ebf82ec545dcbae8935dcc) @@ -32,6 +32,12 @@ 80.2 + + + 60.1 + 60.2 + + 0.4 0.5 @@ -78,6 +84,7 @@ +