Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/Creators/SoilCreator.cs =================================================================== diff -u -reb77464397a17cc0a006933b6d9bfeb5cfba3d66 -r3678f8db830d30b1d0e6518ea3b71ce5465e93fe --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/Creators/SoilCreator.cs (.../SoilCreator.cs) (revision eb77464397a17cc0a006933b6d9bfeb5cfba3d66) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/Creators/SoilCreator.cs (.../SoilCreator.cs) (revision 3678f8db830d30b1d0e6518ea3b71ce5465e93fe) @@ -66,7 +66,8 @@ FrictionAngle = properties.FrictionAngleDesignVariable, RatioCuPc = properties.ShearStrengthRatioDesignVariable, StrengthIncreaseExponent = properties.StrengthIncreaseExponentDesignVariable, - PoP = properties.PopDesignVariable + PoP = properties.PopDesignVariable, + DilatancyType = DilatancyType.Zero }; }).ToArray(); } Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/Creators/SoilProfileCreator.cs =================================================================== diff -u -reb77464397a17cc0a006933b6d9bfeb5cfba3d66 -r3678f8db830d30b1d0e6518ea3b71ce5465e93fe --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/Creators/SoilProfileCreator.cs (.../SoilProfileCreator.cs) (revision eb77464397a17cc0a006933b6d9bfeb5cfba3d66) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/Creators/SoilProfileCreator.cs (.../SoilProfileCreator.cs) (revision 3678f8db830d30b1d0e6518ea3b71ce5465e93fe) @@ -21,6 +21,7 @@ using System; using System.Collections.Generic; +using System.Linq; using Deltares.WTIStability.Data.Geo; using Ringtoets.MacroStabilityInwards.Primitives; using Ringtoets.MacroStabilityInwards.Primitives.MacroStabilityInwardsSoilUnderSurfaceLine; @@ -62,6 +63,10 @@ }); } + geometryData.Left = geometryData.Points.Min(gp => gp.X); + geometryData.Right = geometryData.Points.Max(gp => gp.X); + geometryData.Bottom = geometryData.Points.Min(gp => gp.Z); + profile.Geometry = geometryData; return profile; Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/SubCalculator/UpliftVanCalculator.cs =================================================================== diff -u -rb8a87d12087e3af75515ecbf7ddf5004108e826d -r3678f8db830d30b1d0e6518ea3b71ce5465e93fe --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/SubCalculator/UpliftVanCalculator.cs (.../UpliftVanCalculator.cs) (revision b8a87d12087e3af75515ecbf7ddf5004108e826d) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/SubCalculator/UpliftVanCalculator.cs (.../UpliftVanCalculator.cs) (revision 3678f8db830d30b1d0e6518ea3b71ce5465e93fe) @@ -45,7 +45,12 @@ { ModelOption = ModelOptions.UpliftVan, SearchAlgorithm = SearchAlgorithm.Grid, - GridOrientation = GridOrientation.Inwards + GridOrientation = GridOrientation.Inwards, + SlipPlaneConstraints = new SlipPlaneConstraints + { + AutomaticForbiddenZones = true, + CreateZones = true + } }; } @@ -105,7 +110,7 @@ wrappedCalculator.InitializeForDeterministic(WTISerializer.Serialize(calculatorInput)); string messages = wrappedCalculator.Validate(); - wrappedCalculator.Run(); + string result = wrappedCalculator.Run(); } catch (Exception e) { Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/Creators/SoilCreatorTest.cs =================================================================== diff -u -reb77464397a17cc0a006933b6d9bfeb5cfba3d66 -r3678f8db830d30b1d0e6518ea3b71ce5465e93fe --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/Creators/SoilCreatorTest.cs (.../SoilCreatorTest.cs) (revision eb77464397a17cc0a006933b6d9bfeb5cfba3d66) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/Creators/SoilCreatorTest.cs (.../SoilCreatorTest.cs) (revision 3678f8db830d30b1d0e6518ea3b71ce5465e93fe) @@ -108,6 +108,11 @@ CollectionAssert.AreEqual(profile.LayersUnderSurfaceLine.Select(l => l.Properties.ShearStrengthRatioDesignVariable.Value), soils.Select(s => s.RatioCuPc)); CollectionAssert.AreEqual(profile.LayersUnderSurfaceLine.Select(l => l.Properties.StrengthIncreaseExponentDesignVariable.Value), soils.Select(s => s.StrengthIncreaseExponent)); CollectionAssert.AreEqual(profile.LayersUnderSurfaceLine.Select(l => l.Properties.PopDesignVariable.Value), soils.Select(s => s.PoP)); + + foreach (Soil soil in soils) + { + Assert.AreEqual(DilatancyType.Zero, soil.DilatancyType); + } } [Test] Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/Creators/SoilProfileCreatorTest.cs =================================================================== diff -u -reb77464397a17cc0a006933b6d9bfeb5cfba3d66 -r3678f8db830d30b1d0e6518ea3b71ce5465e93fe --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/Creators/SoilProfileCreatorTest.cs (.../SoilProfileCreatorTest.cs) (revision eb77464397a17cc0a006933b6d9bfeb5cfba3d66) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/Creators/SoilProfileCreatorTest.cs (.../SoilProfileCreatorTest.cs) (revision 3678f8db830d30b1d0e6518ea3b71ce5465e93fe) @@ -26,7 +26,6 @@ using NUnit.Framework; using Ringtoets.MacroStabilityInwards.KernelWrapper.Creators; using Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil; -using Ringtoets.MacroStabilityInwards.Primitives; using Ringtoets.MacroStabilityInwards.Primitives.MacroStabilityInwardsSoilUnderSurfaceLine; using Point2D = Core.Common.Base.Geometry.Point2D; using WTIStabilityPoint2D = Deltares.WTIStability.Data.Geo.Point2D; @@ -177,6 +176,10 @@ expectedInnerLoop1, expectedInnerLoop2 }, surface.GeometrySurface.InnerLoops, new WTIStabilityGeometryLoopComparer()); + + Assert.AreEqual(0, profile.Geometry.Left); + Assert.AreEqual(0, profile.Geometry.Bottom); + Assert.AreEqual(10, profile.Geometry.Right); } } } \ No newline at end of file