Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/Configurations/MacroStabilityInwardsCalculationConfigurationImporter.cs
===================================================================
diff -u -r120c0735a3c22ff8772394362cb25e1ba28daa37 -r6677bd4cf1803da9d7eeb8e945f2fb3f82b32c6e
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/Configurations/MacroStabilityInwardsCalculationConfigurationImporter.cs (.../MacroStabilityInwardsCalculationConfigurationImporter.cs) (revision 120c0735a3c22ff8772394362cb25e1ba28daa37)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/Configurations/MacroStabilityInwardsCalculationConfigurationImporter.cs (.../MacroStabilityInwardsCalculationConfigurationImporter.cs) (revision 6677bd4cf1803da9d7eeb8e945f2fb3f82b32c6e)
@@ -94,9 +94,11 @@
&& TrySetStochasticSoilProfile(calculationConfiguration, calculation)
&& TrySetScenarioParameters(calculationConfiguration.Scenario, calculation))
{
- SetDikeSoilScenario(calculationConfiguration, calculation);
- SetGridDeterminationType(calculationConfiguration, calculation);
- SetTangentLineDeterminationType(calculationConfiguration, calculation);
+ SetSimpleProperties(calculationConfiguration, calculation.InputParameters);
+
+ SetDikeSoilScenario(calculationConfiguration, calculation.InputParameters);
+ SetGridDeterminationType(calculationConfiguration, calculation.InputParameters);
+ SetTangentLineDeterminationType(calculationConfiguration, calculation.InputParameters);
return calculation;
}
return null;
@@ -258,12 +260,76 @@
}
///
+ /// Assigns the simple properties of .
+ ///
+ /// The calculation read from the imported file.
+ /// The calculation input to configure.
+ private static void SetSimpleProperties(MacroStabilityInwardsCalculationConfiguration calculationConfiguration,
+ MacroStabilityInwardsInput input)
+ {
+ if (calculationConfiguration.WaterLevelRiverAverage.HasValue)
+ {
+ input.WaterLevelRiverAverage = (RoundedDouble) calculationConfiguration.WaterLevelRiverAverage.Value;
+ }
+
+ if (calculationConfiguration.DrainageConstructionPresent.HasValue)
+ {
+ input.DrainageConstructionPresent = calculationConfiguration.DrainageConstructionPresent.Value;
+ }
+ if (calculationConfiguration.XCoordinateDrainageConstruction.HasValue)
+ {
+ input.XCoordinateDrainageConstruction = (RoundedDouble) calculationConfiguration.XCoordinateDrainageConstruction.Value;
+ }
+ if (calculationConfiguration.ZCoordinateDrainageConstruction.HasValue)
+ {
+ input.ZCoordinateDrainageConstruction = (RoundedDouble) calculationConfiguration.ZCoordinateDrainageConstruction.Value;
+ }
+
+ if (calculationConfiguration.MinimumLevelPhreaticLineAtDikeTopRiver.HasValue)
+ {
+ input.MinimumLevelPhreaticLineAtDikeTopRiver = (RoundedDouble) calculationConfiguration.MinimumLevelPhreaticLineAtDikeTopRiver.Value;
+ }
+ if (calculationConfiguration.MinimumLevelPhreaticLineAtDikeTopPolder.HasValue)
+ {
+ input.MinimumLevelPhreaticLineAtDikeTopPolder = (RoundedDouble) calculationConfiguration.MinimumLevelPhreaticLineAtDikeTopPolder.Value;
+ }
+
+ if (calculationConfiguration.AdjustPhreaticLine3And4ForUplift.HasValue)
+ {
+ input.AdjustPhreaticLine3And4ForUplift = calculationConfiguration.AdjustPhreaticLine3And4ForUplift.Value;
+ }
+
+ if (calculationConfiguration.SlipPlaneMinimumDepth.HasValue)
+ {
+ input.SlipPlaneMinimumDepth = (RoundedDouble) calculationConfiguration.SlipPlaneMinimumDepth.Value;
+ }
+ if (calculationConfiguration.SlipPlaneMinimumLength.HasValue)
+ {
+ input.SlipPlaneMinimumLength = (RoundedDouble) calculationConfiguration.SlipPlaneMinimumLength.Value;
+ }
+ if (calculationConfiguration.MaximumSliceWidth.HasValue)
+ {
+ input.MaximumSliceWidth = (RoundedDouble) calculationConfiguration.MaximumSliceWidth.Value;
+ }
+
+ if (calculationConfiguration.CreateZones.HasValue)
+ {
+ input.CreateZones = calculationConfiguration.CreateZones.Value;
+ }
+
+ if (calculationConfiguration.MoveGrid.HasValue)
+ {
+ input.MoveGrid = calculationConfiguration.MoveGrid.Value;
+ }
+ }
+
+ ///
/// Assigns the dike soil scenario.
///
/// The read calculation read.
- /// The calculation to configure.
+ /// The calculation input to configure.
private static void SetDikeSoilScenario(MacroStabilityInwardsCalculationConfiguration configuration,
- MacroStabilityInwardsCalculationScenario calculation)
+ MacroStabilityInwardsInput input)
{
if (!configuration.DikeSoilScenario.HasValue)
{
@@ -275,17 +341,17 @@
if (dikeSoilScenario.HasValue)
{
- calculation.InputParameters.DikeSoilScenario = dikeSoilScenario.Value;
+ input.DikeSoilScenario = dikeSoilScenario.Value;
}
}
///
/// Assigns the grid determination type.
///
/// The read calculation read.
- /// The calculation to configure.
+ /// The calculation input to configure.
private static void SetGridDeterminationType(MacroStabilityInwardsCalculationConfiguration configuration,
- MacroStabilityInwardsCalculationScenario calculation)
+ MacroStabilityInwardsInput input)
{
if (!configuration.GridDeterminationType.HasValue)
{
@@ -297,17 +363,17 @@
if (gridDeterminationType.HasValue)
{
- calculation.InputParameters.GridDeterminationType = gridDeterminationType.Value;
+ input.GridDeterminationType = gridDeterminationType.Value;
}
}
///
/// Assigns the tangent line determination type.
///
/// The read calculation read.
- /// The calculation to configure.
+ /// The calculation input to configure.
private static void SetTangentLineDeterminationType(MacroStabilityInwardsCalculationConfiguration configuration,
- MacroStabilityInwardsCalculationScenario calculation)
+ MacroStabilityInwardsInput input)
{
if (!configuration.TangentLineDeterminationType.HasValue)
{
@@ -319,7 +385,7 @@
if (tangentLineDeterminationType.HasValue)
{
- calculation.InputParameters.TangentLineDeterminationType = tangentLineDeterminationType.Value;
+ input.TangentLineDeterminationType = tangentLineDeterminationType.Value;
}
}
}
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/Configurations/MacroStabilityInwardsCalculationConfigurationImporterTest.cs
===================================================================
diff -u -r120c0735a3c22ff8772394362cb25e1ba28daa37 -r6677bd4cf1803da9d7eeb8e945f2fb3f82b32c6e
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/Configurations/MacroStabilityInwardsCalculationConfigurationImporterTest.cs (.../MacroStabilityInwardsCalculationConfigurationImporterTest.cs) (revision 120c0735a3c22ff8772394362cb25e1ba28daa37)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/Configurations/MacroStabilityInwardsCalculationConfigurationImporterTest.cs (.../MacroStabilityInwardsCalculationConfigurationImporterTest.cs) (revision 6677bd4cf1803da9d7eeb8e945f2fb3f82b32c6e)
@@ -430,6 +430,18 @@
SurfaceLine = surfaceLine,
StochasticSoilModel = stochasticSoilModel,
StochasticSoilProfile = stochasticSoilProfile,
+ WaterLevelRiverAverage = (RoundedDouble) 10.5,
+ DrainageConstructionPresent = true,
+ XCoordinateDrainageConstruction = (RoundedDouble) 10.6,
+ ZCoordinateDrainageConstruction = (RoundedDouble) 10.7,
+ MinimumLevelPhreaticLineAtDikeTopRiver = (RoundedDouble) 10.9,
+ MinimumLevelPhreaticLineAtDikeTopPolder = (RoundedDouble) 10.8,
+ AdjustPhreaticLine3And4ForUplift = true,
+ SlipPlaneMinimumDepth = (RoundedDouble) 0.4,
+ SlipPlaneMinimumLength = (RoundedDouble) 0.5,
+ MaximumSliceWidth = (RoundedDouble) 0.6,
+ CreateZones = true,
+ MoveGrid = true,
DikeSoilScenario = MacroStabilityInwardsDikeSoilScenario.SandDikeOnClay,
GridDeterminationType = MacroStabilityInwardsGridDeterminationType.Automatic,
TangentLineDeterminationType = MacroStabilityInwardsTangentLineDeterminationType.LayerSeparated
@@ -465,6 +477,22 @@
Assert.AreSame(expectedInput.SurfaceLine, actualInput.SurfaceLine);
Assert.AreSame(expectedInput.StochasticSoilModel, actualInput.StochasticSoilModel);
Assert.AreSame(expectedInput.StochasticSoilProfile, actualInput.StochasticSoilProfile);
+
+ Assert.AreEqual(expectedInput.WaterLevelRiverAverage, actualInput.WaterLevelRiverAverage);
+ Assert.AreEqual(expectedInput.DrainageConstructionPresent, actualInput.DrainageConstructionPresent);
+ Assert.AreEqual(expectedInput.XCoordinateDrainageConstruction, actualInput.XCoordinateDrainageConstruction);
+ Assert.AreEqual(expectedInput.ZCoordinateDrainageConstruction, actualInput.ZCoordinateDrainageConstruction);
+ Assert.AreEqual(expectedInput.MinimumLevelPhreaticLineAtDikeTopRiver, actualInput.MinimumLevelPhreaticLineAtDikeTopRiver);
+ Assert.AreEqual(expectedInput.MinimumLevelPhreaticLineAtDikeTopPolder, actualInput.MinimumLevelPhreaticLineAtDikeTopPolder);
+ Assert.AreEqual(expectedInput.AdjustPhreaticLine3And4ForUplift, actualInput.AdjustPhreaticLine3And4ForUplift);
+
+ Assert.AreEqual(expectedInput.SlipPlaneMinimumDepth, actualInput.SlipPlaneMinimumDepth);
+ Assert.AreEqual(expectedInput.SlipPlaneMinimumLength, actualInput.SlipPlaneMinimumLength);
+ Assert.AreEqual(expectedInput.MaximumSliceWidth, actualInput.MaximumSliceWidth);
+
+ Assert.AreEqual(expectedInput.CreateZones, actualInput.CreateZones);
+ Assert.AreEqual(expectedInput.MoveGrid, actualInput.MoveGrid);
+
Assert.AreEqual(expectedInput.DikeSoilScenario, actualInput.DikeSoilScenario);
Assert.AreEqual(expectedInput.GridDeterminationType, actualInput.GridDeterminationType);
Assert.AreEqual(expectedInput.TangentLineDeterminationType, actualInput.TangentLineDeterminationType);