Index: dam engine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamPipingBligh/DamPipingBlighKernelWrapperTests.cs =================================================================== diff -u -r745 -r751 --- dam engine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamPipingBligh/DamPipingBlighKernelWrapperTests.cs (.../DamPipingBlighKernelWrapperTests.cs) (revision 745) +++ dam engine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamPipingBligh/DamPipingBlighKernelWrapperTests.cs (.../DamPipingBlighKernelWrapperTests.cs) (revision 751) @@ -29,6 +29,7 @@ using Deltares.DamEngine.Data.General.Results; using Deltares.DamEngine.Data.Geometry; using Deltares.DamEngine.Data.Geotechnics; +using Deltares.DamEngine.Data.Standard.Calculation; using Deltares.DamEngine.Data.Standard.Logging; using NUnit.Framework; @@ -185,16 +186,30 @@ }; input.DesignScenario.Location = new Location(); + var upliftSituation = new UpliftSituation(); + upliftSituation.IsUplift = true; + var calculationResult = CalculationResult.Succeeded; DamPipingBlighOutput output = new DamPipingBlighOutput { FoSp = 1.1, - Hc = 2.2 + Hc = 2.2, + ExitPointX = 3.3, + UpliftFactor = 4.4, + UpliftSituation = upliftSituation, + CalculationResult = calculationResult }; DesignResult result; kernelWrapper.PostProcess(input, output, "", out result); Assert.AreEqual(output.FoSp, result.PipingDesignResults.BlighFactor); Assert.AreEqual(output.Hc, result.PipingDesignResults.BlighHcritical); + + Assert.AreEqual(output.ExitPointX, result.PipingDesignResults.LocalExitPointX); + Assert.AreEqual(output.UpliftFactor, result.PipingDesignResults.UpliftFactor); + Assert.AreEqual(output.UpliftSituation, result.PipingDesignResults.UpliftSituation); + Assert.AreEqual(output.CalculationResult, result.CalculationResult); + + Assert.AreEqual(input.Location.SurfaceLine, result.PipingDesignResults.RedesignedSurfaceLine); } [Test] Index: dam engine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamPipingSellmeijer4Forces/DamPipingSellmeijer4ForcesKernelWrapperTests.cs =================================================================== diff -u -r740 -r751 --- dam engine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamPipingSellmeijer4Forces/DamPipingSellmeijer4ForcesKernelWrapperTests.cs (.../DamPipingSellmeijer4ForcesKernelWrapperTests.cs) (revision 740) +++ dam engine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamPipingSellmeijer4Forces/DamPipingSellmeijer4ForcesKernelWrapperTests.cs (.../DamPipingSellmeijer4ForcesKernelWrapperTests.cs) (revision 751) @@ -29,6 +29,7 @@ using Deltares.DamEngine.Data.General.Results; using Deltares.DamEngine.Data.Geometry; using Deltares.DamEngine.Data.Geotechnics; +using Deltares.DamEngine.Data.Standard.Calculation; using Deltares.DamEngine.Data.Standard.Logging; using NUnit.Framework; @@ -198,16 +199,30 @@ }; input.DesignScenario.Location = new Location(); + var upliftSituation = new UpliftSituation(); + upliftSituation.IsUplift = true; + var calculationResult = CalculationResult.Succeeded; DamPipingSellmeijer4ForcesOutput output = new DamPipingSellmeijer4ForcesOutput { FoSp = 1.1, - Hc = 2.2 + Hc = 2.2, + ExitPointX = 3.3, + UpliftFactor = 4.4, + UpliftSituation = upliftSituation, + CalculationResult = calculationResult }; DesignResult result; kernelWrapper.PostProcess(input, output, "", out result); Assert.AreEqual(output.FoSp, result.PipingDesignResults.Sellmeijer4ForcesFactor); Assert.AreEqual(output.Hc, result.PipingDesignResults.Sellmeijer4ForcesHcritical); + + Assert.AreEqual(output.ExitPointX, result.PipingDesignResults.LocalExitPointX); + Assert.AreEqual(output.UpliftFactor, result.PipingDesignResults.UpliftFactor); + Assert.AreEqual(output.UpliftSituation, result.PipingDesignResults.UpliftSituation); + Assert.AreEqual(output.CalculationResult, result.CalculationResult); + + Assert.AreEqual(input.Location.SurfaceLine, result.PipingDesignResults.RedesignedSurfaceLine); } [Test] Index: dam engine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamPipingSellmeijerVnk/DamPipingSellmeijerVnkKernelWrapperTests.cs =================================================================== diff -u -r748 -r751 --- dam engine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamPipingSellmeijerVnk/DamPipingSellmeijerVnkKernelWrapperTests.cs (.../DamPipingSellmeijerVnkKernelWrapperTests.cs) (revision 748) +++ dam engine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamPipingSellmeijerVnk/DamPipingSellmeijerVnkKernelWrapperTests.cs (.../DamPipingSellmeijerVnkKernelWrapperTests.cs) (revision 751) @@ -31,6 +31,7 @@ using Deltares.DamEngine.Data.General.Results; using Deltares.DamEngine.Data.Geometry; using Deltares.DamEngine.Data.Geotechnics; +using Deltares.DamEngine.Data.Standard.Calculation; using Deltares.DamEngine.Data.Standard.Logging; using NUnit.Framework; @@ -225,19 +226,34 @@ SubSoilScenario = subSoilScenario }; input.DesignScenario.Location = new Location(); - + + var upliftSituation = new UpliftSituation(); + upliftSituation.IsUplift = true; + var calculationResult = CalculationResult.Succeeded; + // DamPipingSellmeijerVnkOutput output = new DamPipingSellmeijerVnkOutput // { // FoSp = 1.1, -// Hc = 2.2 +// Hc = 2.2, +// ExitPointX = 3.3, +// UpliftFactor = 4.4, +// UpliftSituation = upliftSituation, +// CalculationResult = calculationResult // }; - + DesignResult result; // kernelWrapper.PostProcess(input, output, "", out result); // Assert.AreEqual(output.FoSp, result.PipingDesignResults.SellmeijerVnkFactor); // Assert.AreEqual(output.Hc, result.PipingDesignResults.SellmeijerVnkHcritical); + +// Assert.AreEqual(output.ExitPointX, result.PipingDesignResults.LocalExitPointX); +// Assert.AreEqual(output.UpliftFactor, result.PipingDesignResults.UpliftFactor); +// Assert.AreEqual(output.UpliftSituation, result.PipingDesignResults.UpliftSituation); +// Assert.AreEqual(output.CalculationResult, result.CalculationResult); +// +// Assert.AreEqual(input.Location.SurfaceLine, result.PipingDesignResults.RedesignedSurfaceLine); } - + [Test] [Category(Categories.WorkInProgress)] [ExpectedException(typeof(NoNullAllowedException), ExpectedMessage = "Geen invoer object gedefinieerd voor Sellmeijer VNK")]