Index: dam engine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamPipingSellmeijerVnk/DamPipingSellmeijerVnkKernelWrapperTests.cs =================================================================== diff -u -r818 -r825 --- dam engine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamPipingSellmeijerVnk/DamPipingSellmeijerVnkKernelWrapperTests.cs (.../DamPipingSellmeijerVnkKernelWrapperTests.cs) (revision 818) +++ dam engine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamPipingSellmeijerVnk/DamPipingSellmeijerVnkKernelWrapperTests.cs (.../DamPipingSellmeijerVnkKernelWrapperTests.cs) (revision 825) @@ -145,7 +145,7 @@ [Test] public void TestPrepare() { - const double diff = 0.0001; + const double diff = 0.000001; var designScenario = new DesignScenario(); designScenario.Location = new Location(); @@ -176,12 +176,10 @@ Assert.AreEqual(0.0, damPipingInput.SurfaceLevel, diff); Assert.AreEqual(0.3, damPipingInput.Rc, diff); Assert.AreEqual(2.0, damPipingInput.DTotal, diff); - // TODO JN: Navragen bij Esther was 2.0 Assert.AreEqual(1.99, damPipingInput.DInBetweenAquiferlayer, diff); Assert.AreEqual(6.0, damPipingInput.DBottomAquiferlayer, diff); Assert.AreEqual(0.0001, damPipingInput.PermeabilityInBetweenAquiferlayer, diff); - // TODO JN: Navragen bij Esther was 0.0002 - Assert.AreEqual(0.0001, damPipingInput.PermeabilityBottomAquiferlayer, diff); + Assert.AreEqual(0.0002, damPipingInput.PermeabilityBottomAquiferlayer, diff); Assert.AreEqual(40.5, damPipingInput.SeepageLength, diff); Assert.AreEqual(200.0, damPipingInput.D70, diff); Assert.AreEqual(0.25, damPipingInput.WhitesConstant, diff); Index: dam engine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamPipingSellmeijerVnk/DamPipingSellmeijerVnkKernelWrapper.cs =================================================================== diff -u -r817 -r825 --- dam engine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamPipingSellmeijerVnk/DamPipingSellmeijerVnkKernelWrapper.cs (.../DamPipingSellmeijerVnkKernelWrapper.cs) (revision 817) +++ dam engine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamPipingSellmeijerVnk/DamPipingSellmeijerVnkKernelWrapper.cs (.../DamPipingSellmeijerVnkKernelWrapper.cs) (revision 825) @@ -151,15 +151,16 @@ Rc = defaultFluidisationGradient, DTotal = dCoverLayer, SeepageLength = seepageLength, - D70 = d70, + D70 = inBetweenAquiferlayerSoil.DiameterD70 * Physics.FactorMeterToMicroMeter, WhitesConstant = inBetweenAquiferlayerSoil.WhitesConstant, BeddingAngle = inBetweenAquiferlayerSoil.BeddingAngle, PermeabilityKx = permeabilityKx, - WaterViscosity = 1.33e-06, + WaterViscosity = Physics.WaterViscosity, SurfaceLevel = surfaceLevel, DInBetweenAquiferlayer = soilProfile1D.GetLayerHeight(soilProfile1D.InBetweenAquiferLayer), DBottomAquiferlayer = soilProfile1D.GetLayerHeight(soilProfile1D.BottomAquiferLayer), PermeabilityInBetweenAquiferlayer = inBetweenAquiferlayerSoil.PermeabKx, + PermeabilityBottomAquiferlayer = soilProfile1D.BottomAquiferLayer.Soil.PermeabKx, }; damOutput.ExitPointX = xExit; damOutput.UpliftFactor = upliftFactor;