Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityInwards/MacroStabilityInwardsKernelWrapperTests.cs =================================================================== diff -u -r3307 -r3323 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityInwards/MacroStabilityInwardsKernelWrapperTests.cs (.../MacroStabilityInwardsKernelWrapperTests.cs) (revision 3307) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityInwards/MacroStabilityInwardsKernelWrapperTests.cs (.../MacroStabilityInwardsKernelWrapperTests.cs) (revision 3323) @@ -29,6 +29,7 @@ using Deltares.DamEngine.Data.Design; using Deltares.DamEngine.Data.General; using Deltares.DamEngine.Data.General.Results; +using Deltares.DamEngine.Data.Geotechnics; using Deltares.DamEngine.Data.Standard.Calculation; using Deltares.DamEngine.Interface; using Deltares.DamEngine.Io; @@ -333,16 +334,18 @@ location.SurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DitchPolderSide).X = 62.5; location.SurfaceLine.Geometry.SyncCalcPoints(); + SoilProfile1D soilProfile = DamEngineDataTestFactory.CreateSoilProfile1D(location.SoilList); + SetWaterpressureInterpolationModel(soilProfile.Layers); + // This test is based on a 1D profile, to be combined with the surface line. var subSoilScenario = new SoilGeometryProbability(); subSoilScenario.SoilProfileType = SoilProfileType.ProfileType1D; subSoilScenario.StiFileName = ""; subSoilScenario.FullStiFileName = ""; subSoilScenario.SoilProfile2D = null; subSoilScenario.SegmentFailureMechanismType = SegmentFailureMechanismType.Stability; + subSoilScenario.SoilProfile1D = soilProfile; - subSoilScenario.SoilProfile1D = DamEngineDataTestFactory.CreateSoilProfile1D(location.SoilList); - var damKernelInput = new DamKernelInput { Location = location, @@ -368,5 +371,12 @@ return damKernelInput; } + private static void SetWaterpressureInterpolationModel(IEnumerable layers) + { + foreach (SoilLayer1D layer in layers) + { + layer.WaterpressureInterpolationModel = WaterpressureInterpolationModel.Hydrostatic; + } + } } } Index: DamEngine/trunk/src/Deltares.DamEngine.Data/Geotechnics/WaterpressureInterpolationModel.cs =================================================================== diff -u -r3180 -r3323 --- DamEngine/trunk/src/Deltares.DamEngine.Data/Geotechnics/WaterpressureInterpolationModel.cs (.../WaterpressureInterpolationModel.cs) (revision 3180) +++ DamEngine/trunk/src/Deltares.DamEngine.Data/Geotechnics/WaterpressureInterpolationModel.cs (.../WaterpressureInterpolationModel.cs) (revision 3323) @@ -30,12 +30,12 @@ /// /// Automatic interpolation /// - Automatic=0, + Automatic=1, /// /// Hydrostatic interpolation /// - Hydrostatic=1 + Hydrostatic=2 } } Index: DamEngine/trunk/src/Deltares.DamEngine.Data/Geotechnics/SoilSurfaceProfile.cs =================================================================== diff -u -r3271 -r3323 --- DamEngine/trunk/src/Deltares.DamEngine.Data/Geotechnics/SoilSurfaceProfile.cs (.../SoilSurfaceProfile.cs) (revision 3271) +++ DamEngine/trunk/src/Deltares.DamEngine.Data/Geotechnics/SoilSurfaceProfile.cs (.../SoilSurfaceProfile.cs) (revision 3323) @@ -244,7 +244,10 @@ double maxZCoordinateLayers = soilLayers.Select(l => l.TopLevel).Max(); if (maxZCoordinateLayers < maxZCoordinateSurfaceLine) { - soilLayers.Insert(0, new SoilLayer1D(DikeEmbankmentMaterial, maxZCoordinateSurfaceLine)); + soilLayers.Insert(0, new SoilLayer1D(DikeEmbankmentMaterial, maxZCoordinateSurfaceLine) + { + WaterpressureInterpolationModel = WaterpressureInterpolationModel.Hydrostatic + }); } copiedSoilProfile.EnsureLastLayerHasHeight(); Index: DamEngine/trunk/src/Deltares.DamEngine.Data.Tests/Geotechnics/SoilSurfaceProfileTests.cs =================================================================== diff -u -r3266 -r3323 --- DamEngine/trunk/src/Deltares.DamEngine.Data.Tests/Geotechnics/SoilSurfaceProfileTests.cs (.../SoilSurfaceProfileTests.cs) (revision 3266) +++ DamEngine/trunk/src/Deltares.DamEngine.Data.Tests/Geotechnics/SoilSurfaceProfileTests.cs (.../SoilSurfaceProfileTests.cs) (revision 3323) @@ -743,7 +743,7 @@ SoilLayer2D actualSoilLayer) { Assert.That(actualSoilLayer.IsAquifer, Is.False); - Assert.That(actualSoilLayer.WaterpressureInterpolationModel, Is.EqualTo(default(WaterpressureInterpolationModel))); + Assert.That(actualSoilLayer.WaterpressureInterpolationModel, Is.EqualTo(WaterpressureInterpolationModel.Hydrostatic)); Assert.That(actualSoilLayer.Soil, Is.SameAs(expectedProfile.DikeEmbankmentMaterial)); }