Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/Configurations/MacroStabilityInwardsCalculationConfiguration.cs =================================================================== diff -u -ra4016e43171575322fa28bdeed3cc6713f767011 -r1639c5017fdc9549fb63aaf2b5a178d45bec3c3b --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/Configurations/MacroStabilityInwardsCalculationConfiguration.cs (.../MacroStabilityInwardsCalculationConfiguration.cs) (revision a4016e43171575322fa28bdeed3cc6713f767011) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/Configurations/MacroStabilityInwardsCalculationConfiguration.cs (.../MacroStabilityInwardsCalculationConfiguration.cs) (revision 1639c5017fdc9549fb63aaf2b5a178d45bec3c3b) @@ -92,6 +92,11 @@ public double? MaximumSliceWidth { get; set; } /// + /// Gets or sets whether zones should be created. + /// + public bool? CreateZones { get; set; } + + /// /// Gets or sets the name for the calculation. /// /// Thrown when is null. Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/Configurations/MacroStabilityInwardsCalculationConfigurationExporter.cs =================================================================== diff -u -ra4016e43171575322fa28bdeed3cc6713f767011 -r1639c5017fdc9549fb63aaf2b5a178d45bec3c3b --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/Configurations/MacroStabilityInwardsCalculationConfigurationExporter.cs (.../MacroStabilityInwardsCalculationConfigurationExporter.cs) (revision a4016e43171575322fa28bdeed3cc6713f767011) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/Configurations/MacroStabilityInwardsCalculationConfigurationExporter.cs (.../MacroStabilityInwardsCalculationConfigurationExporter.cs) (revision 1639c5017fdc9549fb63aaf2b5a178d45bec3c3b) @@ -64,6 +64,7 @@ SlipPlaneMinimumDepth = input.SlipPlaneMinimumDepth, SlipPlaneMinimumLength = input.SlipPlaneMinimumLength, MaximumSliceWidth = input.MaximumSliceWidth, + CreateZones = input.CreateZones, TangentLineZTop = input.TangentLineZTop, TangentLineZBottom = input.TangentLineZBottom, TangentLineNumber = input.TangentLineNumber, Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/Configurations/MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.cs =================================================================== diff -u -r70f394c6adf27b214edff141987ef5d05a26e54f -r1639c5017fdc9549fb63aaf2b5a178d45bec3c3b --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/Configurations/MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.cs (.../MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.cs) (revision 70f394c6adf27b214edff141987ef5d05a26e54f) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/Configurations/MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.cs (.../MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.cs) (revision 1639c5017fdc9549fb63aaf2b5a178d45bec3c3b) @@ -61,6 +61,16 @@ /// public const string MaximumSliceWidthElement = "maximalelamelbreedte"; + /// + /// The identifier for zones elements. + /// + public const string ZonesElement = "zonering"; + + /// + /// The tag of the element containing the value indicating if zones should be created automatically. + /// + public const string CreateZones = "bepaling"; + #region Dike soil scenario /// Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/Configurations/MacroStabilityInwardsCalculationConfigurationWriter.cs =================================================================== diff -u -ra4016e43171575322fa28bdeed3cc6713f767011 -r1639c5017fdc9549fb63aaf2b5a178d45bec3c3b --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/Configurations/MacroStabilityInwardsCalculationConfigurationWriter.cs (.../MacroStabilityInwardsCalculationConfigurationWriter.cs) (revision a4016e43171575322fa28bdeed3cc6713f767011) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/Configurations/MacroStabilityInwardsCalculationConfigurationWriter.cs (.../MacroStabilityInwardsCalculationConfigurationWriter.cs) (revision 1639c5017fdc9549fb63aaf2b5a178d45bec3c3b) @@ -95,11 +95,24 @@ MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.MaximumSliceWidthElement, configuration.MaximumSliceWidth); + WriteZones(writer, configuration); + WriteGrid(writer, configuration); WriteScenarioWhenAvailable(writer, configuration.Scenario); } + private static void WriteZones(XmlWriter writer, MacroStabilityInwardsCalculationConfiguration configuration) + { + writer.WriteStartElement(MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.ZonesElement); + + WriteElementWhenContentAvailable(writer, + MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.CreateZones, + configuration.CreateZones); + + writer.WriteEndElement(); + } + /// /// Writes the in XML format to file. /// @@ -140,7 +153,6 @@ WriteElementWhenContentAvailable(writer, MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.MoveGrid, configuration.MoveGrid); - WriteGridDeterminationTypeWhenAvailable(writer, MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.GridDeterminationTypeElement, configuration.GridDeterminationType); Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/Configurations/MacroStabilityInwardsCalculationConfigurationSchemaIdentifiersTest.cs =================================================================== diff -u -r70f394c6adf27b214edff141987ef5d05a26e54f -r1639c5017fdc9549fb63aaf2b5a178d45bec3c3b --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/Configurations/MacroStabilityInwardsCalculationConfigurationSchemaIdentifiersTest.cs (.../MacroStabilityInwardsCalculationConfigurationSchemaIdentifiersTest.cs) (revision 70f394c6adf27b214edff141987ef5d05a26e54f) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/Configurations/MacroStabilityInwardsCalculationConfigurationSchemaIdentifiersTest.cs (.../MacroStabilityInwardsCalculationConfigurationSchemaIdentifiersTest.cs) (revision 1639c5017fdc9549fb63aaf2b5a178d45bec3c3b) @@ -45,6 +45,9 @@ Assert.AreEqual("minimaleglijvlaklengte", MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.SlipPlaneMinimumLengthElement); Assert.AreEqual("maximalelamelbreedte", MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.MaximumSliceWidthElement); + Assert.AreEqual("zonering", MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.ZonesElement); + Assert.AreEqual("bepaling", MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.CreateZones); + Assert.AreEqual("grids", MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.GridElement); Assert.AreEqual("verplaatsgrid", MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.MoveGrid); Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/Configurations/MacroStabilityInwardsCalculationConfigurationTest.cs =================================================================== diff -u -r70f394c6adf27b214edff141987ef5d05a26e54f -r1639c5017fdc9549fb63aaf2b5a178d45bec3c3b --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/Configurations/MacroStabilityInwardsCalculationConfigurationTest.cs (.../MacroStabilityInwardsCalculationConfigurationTest.cs) (revision 70f394c6adf27b214edff141987ef5d05a26e54f) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/Configurations/MacroStabilityInwardsCalculationConfigurationTest.cs (.../MacroStabilityInwardsCalculationConfigurationTest.cs) (revision 1639c5017fdc9549fb63aaf2b5a178d45bec3c3b) @@ -61,6 +61,7 @@ Assert.IsNull(configuration.SlipPlaneMinimumDepth); Assert.IsNull(configuration.SlipPlaneMinimumLength); Assert.IsNull(configuration.MaximumSliceWidth); + Assert.IsNull(configuration.CreateZones); Assert.IsNull(configuration.GridDeterminationType); Assert.IsNull(configuration.MoveGrid); Assert.IsNull(configuration.TangentLineDeterminationType); @@ -85,6 +86,7 @@ const double slipPlaneMinimumDepth = 2.2; const double slipPlaneMinimumLength = 3.3; const double maximumSliceWidth = 4.4; + const bool createZones = true; var scenarioConfiguration = new ScenarioConfiguration(); const bool movegrid = true; @@ -109,6 +111,7 @@ SlipPlaneMinimumDepth = slipPlaneMinimumDepth, SlipPlaneMinimumLength = slipPlaneMinimumLength, MaximumSliceWidth = maximumSliceWidth, + CreateZones = createZones, MoveGrid = movegrid, GridDeterminationType = gridDeterminationType, TangentLineDeterminationType = tangentLineDeterminationType, @@ -131,6 +134,7 @@ Assert.AreEqual(slipPlaneMinimumDepth, configuration.SlipPlaneMinimumDepth); Assert.AreEqual(slipPlaneMinimumLength, configuration.SlipPlaneMinimumLength); Assert.AreEqual(maximumSliceWidth, configuration.MaximumSliceWidth); + Assert.AreEqual(createZones, configuration.CreateZones); Assert.AreEqual(movegrid, configuration.MoveGrid); Assert.AreEqual(gridDeterminationType, configuration.GridDeterminationType); Assert.AreEqual(tangentLineDeterminationType, configuration.TangentLineDeterminationType); Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/Configurations/MacroStabilityInwardsCalculationConfigurationWriterTest.cs =================================================================== diff -u -ra4016e43171575322fa28bdeed3cc6713f767011 -r1639c5017fdc9549fb63aaf2b5a178d45bec3c3b --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/Configurations/MacroStabilityInwardsCalculationConfigurationWriterTest.cs (.../MacroStabilityInwardsCalculationConfigurationWriterTest.cs) (revision a4016e43171575322fa28bdeed3cc6713f767011) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/Configurations/MacroStabilityInwardsCalculationConfigurationWriterTest.cs (.../MacroStabilityInwardsCalculationConfigurationWriterTest.cs) (revision 1639c5017fdc9549fb63aaf2b5a178d45bec3c3b) @@ -89,6 +89,7 @@ SlipPlaneMinimumDepth = 0.4, SlipPlaneMinimumLength = 0.5, MaximumSliceWidth = 0.6, + CreateZones = true, MoveGrid = true, GridDeterminationType = ConfigurationGridDeterminationType.Automatic, TangentLineDeterminationType = ConfigurationTangentLineDeterminationType.Specified, Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationExporter/calculationIrrelevant.xml =================================================================== diff -u -ra4016e43171575322fa28bdeed3cc6713f767011 -r1639c5017fdc9549fb63aaf2b5a178d45bec3c3b --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationExporter/calculationIrrelevant.xml (.../calculationIrrelevant.xml) (revision a4016e43171575322fa28bdeed3cc6713f767011) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationExporter/calculationIrrelevant.xml (.../calculationIrrelevant.xml) (revision 1639c5017fdc9549fb63aaf2b5a178d45bec3c3b) @@ -9,6 +9,9 @@ 0.4 0.5 0.6 + + true + true automatisch Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationExporter/calculationWithAssessmentLevel.xml =================================================================== diff -u -ra4016e43171575322fa28bdeed3cc6713f767011 -r1639c5017fdc9549fb63aaf2b5a178d45bec3c3b --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationExporter/calculationWithAssessmentLevel.xml (.../calculationWithAssessmentLevel.xml) (revision a4016e43171575322fa28bdeed3cc6713f767011) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationExporter/calculationWithAssessmentLevel.xml (.../calculationWithAssessmentLevel.xml) (revision 1639c5017fdc9549fb63aaf2b5a178d45bec3c3b) @@ -9,6 +9,9 @@ 0.4 0.5 0.6 + + true + true automatisch Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationExporter/calculationWithInfinities.xml =================================================================== diff -u -ra4016e43171575322fa28bdeed3cc6713f767011 -r1639c5017fdc9549fb63aaf2b5a178d45bec3c3b --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationExporter/calculationWithInfinities.xml (.../calculationWithInfinities.xml) (revision a4016e43171575322fa28bdeed3cc6713f767011) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationExporter/calculationWithInfinities.xml (.../calculationWithInfinities.xml) (revision 1639c5017fdc9549fb63aaf2b5a178d45bec3c3b) @@ -9,6 +9,9 @@ -INF INF -INF + + true + true automatisch Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationExporter/calculationWithNaNs.xml =================================================================== diff -u -ra4016e43171575322fa28bdeed3cc6713f767011 -r1639c5017fdc9549fb63aaf2b5a178d45bec3c3b --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationExporter/calculationWithNaNs.xml (.../calculationWithNaNs.xml) (revision a4016e43171575322fa28bdeed3cc6713f767011) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationExporter/calculationWithNaNs.xml (.../calculationWithNaNs.xml) (revision 1639c5017fdc9549fb63aaf2b5a178d45bec3c3b) @@ -9,6 +9,9 @@ NaN NaN NaN + + true + true automatisch Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationExporter/calculationWithoutHydraulicLocation.xml =================================================================== diff -u -ra4016e43171575322fa28bdeed3cc6713f767011 -r1639c5017fdc9549fb63aaf2b5a178d45bec3c3b --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationExporter/calculationWithoutHydraulicLocation.xml (.../calculationWithoutHydraulicLocation.xml) (revision a4016e43171575322fa28bdeed3cc6713f767011) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationExporter/calculationWithoutHydraulicLocation.xml (.../calculationWithoutHydraulicLocation.xml) (revision 1639c5017fdc9549fb63aaf2b5a178d45bec3c3b) @@ -8,6 +8,9 @@ 0.4 0.5 0.6 + + true + true automatisch Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationExporter/calculationWithoutSoilProfile.xml =================================================================== diff -u -ra4016e43171575322fa28bdeed3cc6713f767011 -r1639c5017fdc9549fb63aaf2b5a178d45bec3c3b --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationExporter/calculationWithoutSoilProfile.xml (.../calculationWithoutSoilProfile.xml) (revision a4016e43171575322fa28bdeed3cc6713f767011) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationExporter/calculationWithoutSoilProfile.xml (.../calculationWithoutSoilProfile.xml) (revision 1639c5017fdc9549fb63aaf2b5a178d45bec3c3b) @@ -8,6 +8,9 @@ 0.4 0.5 0.6 + + true + true automatisch Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationExporter/calculationWithoutSoilmodel.xml =================================================================== diff -u -ra4016e43171575322fa28bdeed3cc6713f767011 -r1639c5017fdc9549fb63aaf2b5a178d45bec3c3b --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationExporter/calculationWithoutSoilmodel.xml (.../calculationWithoutSoilmodel.xml) (revision a4016e43171575322fa28bdeed3cc6713f767011) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationExporter/calculationWithoutSoilmodel.xml (.../calculationWithoutSoilmodel.xml) (revision 1639c5017fdc9549fb63aaf2b5a178d45bec3c3b) @@ -7,6 +7,9 @@ 0.4 0.5 0.6 + + true + true automatisch Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationExporter/calculationWithoutSurfaceline.xml =================================================================== diff -u -ra4016e43171575322fa28bdeed3cc6713f767011 -r1639c5017fdc9549fb63aaf2b5a178d45bec3c3b --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationExporter/calculationWithoutSurfaceline.xml (.../calculationWithoutSurfaceline.xml) (revision a4016e43171575322fa28bdeed3cc6713f767011) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationExporter/calculationWithoutSurfaceline.xml (.../calculationWithoutSurfaceline.xml) (revision 1639c5017fdc9549fb63aaf2b5a178d45bec3c3b) @@ -8,6 +8,9 @@ 0.4 0.5 0.6 + + true + true automatisch Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationExporter/folderWithSubfolderAndCalculation.xml =================================================================== diff -u -ra4016e43171575322fa28bdeed3cc6713f767011 -r1639c5017fdc9549fb63aaf2b5a178d45bec3c3b --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationExporter/folderWithSubfolderAndCalculation.xml (.../folderWithSubfolderAndCalculation.xml) (revision a4016e43171575322fa28bdeed3cc6713f767011) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationExporter/folderWithSubfolderAndCalculation.xml (.../folderWithSubfolderAndCalculation.xml) (revision 1639c5017fdc9549fb63aaf2b5a178d45bec3c3b) @@ -10,6 +10,9 @@ 0.4 0.5 0.6 + + true + true automatisch @@ -51,6 +54,9 @@ 0.4 0.5 0.6 + + true + true automatisch Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationWriter/folderWithSubfolderAndCalculation.xml =================================================================== diff -u -ra4016e43171575322fa28bdeed3cc6713f767011 -r1639c5017fdc9549fb63aaf2b5a178d45bec3c3b --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationWriter/folderWithSubfolderAndCalculation.xml (.../folderWithSubfolderAndCalculation.xml) (revision a4016e43171575322fa28bdeed3cc6713f767011) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationWriter/folderWithSubfolderAndCalculation.xml (.../folderWithSubfolderAndCalculation.xml) (revision 1639c5017fdc9549fb63aaf2b5a178d45bec3c3b) @@ -11,6 +11,9 @@ 0.4 0.5 0.6 + + true + true automatisch @@ -44,6 +47,7 @@ +