Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamMacroStabilityOutwards/DamMacroStabilityOutwardsKernelWrapperTests.cs =================================================================== diff -u -r1137 -r1142 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamMacroStabilityOutwards/DamMacroStabilityOutwardsKernelWrapperTests.cs (.../DamMacroStabilityOutwardsKernelWrapperTests.cs) (revision 1137) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamMacroStabilityOutwards/DamMacroStabilityOutwardsKernelWrapperTests.cs (.../DamMacroStabilityOutwardsKernelWrapperTests.cs) (revision 1142) @@ -31,6 +31,7 @@ using Deltares.DamEngine.Calculators.KernelWrappers.DamMacroStabilityOutwards; using Deltares.DamEngine.Calculators.KernelWrappers.Interfaces; using Deltares.DamEngine.Calculators.Tests.KernelWrappers.DamMacroStabilityCommon; +using Deltares.DamEngine.Data.Design; using Deltares.DamEngine.Data.General; using Deltares.DamEngine.Data.General.Results; using Deltares.DamEngine.Data.Standard.Calculation; @@ -202,33 +203,48 @@ Assert.AreEqual(LogMessageType.Error, messages[0].MessageType); } - private static DamKernelInput CreateDamKernelInput(bool realOut = false) + private static DesignScenario CreateDesignScenario(Location location) { - var absoluteFolder = Path.GetFullPath(Path.Combine(Directory.GetCurrentDirectory(), testFolder)); + var scenario = DamMacroStabilityTestHelper.CreateScenarioForLocation(location, location.SurfaceLine); + scenario.Location.StabilityOptions = new StabilityOptions + { + TrafficLoad = 10.0, + SoilGeometries2DPath = GetAbsoluteFolder(), + SoilDatabaseName = GetSoilDbName() + }; + scenario.ModelFactors.RequiredSafetyFactorStabilityOuterSlope = 1.1; + scenario.ModelFactors.UpliftCriterionStability = 1.2; + return scenario; + } + + private static string GetSoilDbName() + { var soilDbName = Path.Combine(testFolder, "soilmaterials.mdb"); + return soilDbName; + } + + private static string GetAbsoluteFolder() + { + var absoluteFolder = Path.GetFullPath(Path.Combine(Directory.GetCurrentDirectory(), testFolder)); + return absoluteFolder; + } + + private static DamKernelInput CreateDamKernelInput(bool realOut = false) + { var soilGeometry2DName = "1D1.sti"; - var line = FactoryForSurfaceLines.CreateSurfaceLineTutorial1(); + var surfaceLine = FactoryForSurfaceLines.CreateSurfaceLineTutorial1(); var location = new Location(); + location.SurfaceLine = surfaceLine; if (realOut) { - soilDbName = Path.Combine(absoluteFolder, "soilmaterialsOutwards.mdb"); soilGeometry2DName = "OutwardsZones.sti"; - foreach (var characteristicPoint in line.CharacteristicPoints) + foreach (var characteristicPoint in surfaceLine.CharacteristicPoints) { characteristicPoint.Z = characteristicPoint.Z - 3; } location.PolderLevel = -11; } - var scenario = DamMacroStabilityTestHelper.CreateScenarioForLocation(location, line); - scenario.Location.StabilityOptions = new StabilityOptions - { - TrafficLoad = 10.0, - SoilGeometries2DPath = absoluteFolder, - SoilDatabaseName = soilDbName - }; - scenario.ModelFactors.RequiredSafetyFactorStabilityOuterSlope = 1.1; - scenario.ModelFactors.UpliftCriterionStability = 1.2; var subSoilScenario = new SoilGeometryProbability { @@ -355,8 +371,9 @@ outputItem } }; + DesignScenario designScenario = CreateDesignScenario(damKernelInput.Location); List results; - kernelWrapper.PostProcess(damKernelInput, output, null, "", out results); + kernelWrapper.PostProcess(damKernelInput, output, designScenario, "", out results); Assert.AreEqual(0.9, results[0].StabilityDesignResults.SafetyFactor); Assert.AreEqual(1.1, results[0].StabilityDesignResults.Zone1SafetyFactor); Assert.AreEqual(1.3, results[0].StabilityDesignResults.LocalZone1EntryPointX);