Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/WtiPipingSellmeijerRevised/WtiPipingSellmeijerRevisedKernelWrapper.cs =================================================================== diff -u -r1965 -r1978 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/WtiPipingSellmeijerRevised/WtiPipingSellmeijerRevisedKernelWrapper.cs (.../WtiPipingSellmeijerRevisedKernelWrapper.cs) (revision 1965) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/WtiPipingSellmeijerRevised/WtiPipingSellmeijerRevisedKernelWrapper.cs (.../WtiPipingSellmeijerRevisedKernelWrapper.cs) (revision 1978) @@ -197,14 +197,14 @@ pipingDesignResults.Wti2017UpliftHcritical = damPipingOutput.Hcu; pipingDesignResults.Wti2017UpliftDeltaPhiC = damPipingOutput.DeltaPhiCu; // Add results of the wti-heave calculation - pipingDesignResults.Wti2017HeaveSafetyFactor = Math.Min(damPipingOutput.FoSh, defaultMaxReturnValue); ; + pipingDesignResults.Wti2017HeaveSafetyFactor = Math.Min(damPipingOutput.FoSh, defaultMaxReturnValue); pipingDesignResults.Wti2017HeaveHcritical = damPipingOutput.Hch; pipingDesignResults.Wti2017Gradient = damPipingOutput.Gradient; pipingDesignResults.EffectiveStress = damPipingOutput.EffectiveStress; // Add the overall results for WTI piping kernel (FoS = highest value of FoSh, FoSu and FoSbe; HcO is Hcbe belonging to FoS), see MWDAM-1370 var maxFoS = damPipingOutput.FoSbe; var overallHc = damPipingOutput.Hcbe; - if (damPipingOutput.FoSu > damPipingOutput.FoSbe) + if (damPipingOutput.FoSu > maxFoS) { maxFoS = damPipingOutput.FoSu; overallHc = damPipingOutput.Hcu; @@ -214,8 +214,6 @@ maxFoS = damPipingOutput.FoSh; overallHc = damPipingOutput.Hch; } - // Make sure defaultMaxReturnValue is limit. - maxFoS = Math.Min(maxFoS, defaultMaxReturnValue); pipingDesignResults.Wti2017SafetyFactorOverall = maxFoS; pipingDesignResults.Wti2017HcriticalOverall = overallHc; Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/PipingSellmeijerRevisedTests.cs =================================================================== diff -u -r1974 -r1978 --- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/PipingSellmeijerRevisedTests.cs (.../PipingSellmeijerRevisedTests.cs) (revision 1974) +++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/PipingSellmeijerRevisedTests.cs (.../PipingSellmeijerRevisedTests.cs) (revision 1978) @@ -58,7 +58,7 @@ Assert.IsNotNull(outputString); var output = DamXmlSerialization.LoadOutputFromXmlString(outputString); Assert.AreEqual(0.432, output.Results.CalculationResults.DesignResults[0].PipingDesignResults.Wti2017BackwardErosionFactor, tolerance); - Assert.AreEqual(1.9830328582839827, output.Results.CalculationResults.DesignResults[0].PipingDesignResults.Wti2017BackwardErosionHcritical, tolerance); + Assert.AreEqual(1.9830, output.Results.CalculationResults.DesignResults[0].PipingDesignResults.Wti2017BackwardErosionHcritical, tolerance); Assert.AreEqual(35.0, output.Results.CalculationResults.DesignResults[0].PipingDesignResults.ExitPointX, tolerance); // The following values are not the same as in the classic UI // The upliftfactor there is 0.351, but that is the Wti Upliftfactor