Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/WtiPipingSellmeijerRevisedTests.cs =================================================================== diff -u -r2111 -r2114 --- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/WtiPipingSellmeijerRevisedTests.cs (.../WtiPipingSellmeijerRevisedTests.cs) (revision 2111) +++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/WtiPipingSellmeijerRevisedTests.cs (.../WtiPipingSellmeijerRevisedTests.cs) (revision 2114) @@ -145,7 +145,7 @@ } [Test] - public void CanPerformmWtiDesignNoAdaptionRechterDiezedijk() + public void CanPerformWtiDesignNoAdaptionRechterDiezedijk() { // Based on ".\data\DamEngineTestProjects\Larenstein_AaenMaas\Rechter Diezedijk.damx" // Set Analysis type to "No Adaption" @@ -162,15 +162,18 @@ // The expected values below where calculated with DamEngine rev.2016, Assert.AreEqual(122, output.Results.CalculationResults.Length); // result 1: safety factor = 90.000 + Assert.AreEqual(CalculationResult.Succeeded, ConversionHelper.ConvertToCalculationResult(output.Results.CalculationResults[0].CalculationResult)); Assert.AreEqual(90.000, output.Results.CalculationResults[0].PipingDesignResults.Wti2017FactorOverall, tolerance); // result 2: safety factor = 58.243 + Assert.AreEqual(CalculationResult.Succeeded, ConversionHelper.ConvertToCalculationResult(output.Results.CalculationResults[2].CalculationResult)); Assert.AreEqual(58.241, output.Results.CalculationResults[2].PipingDesignResults.Wti2017FactorOverall, tolerance); - // result 3: safety factor = 90.000 - Assert.AreEqual(90.000, output.Results.CalculationResults[121].PipingDesignResults.Wti2017FactorOverall, tolerance); + // result 3: safety factor = 0 NB. In 18.1.3 it was 90, but now we use Uplift calculation from WBI, before from DAM + Assert.AreEqual(CalculationResult.RunFailed, ConversionHelper.ConvertToCalculationResult(output.Results.CalculationResults[121].CalculationResult)); + Assert.AreEqual(0.000, output.Results.CalculationResults[121].PipingDesignResults.Wti2017FactorOverall, tolerance); } [Test] - // This test runs the same project as CanPerformmWtiDesignNoAdaptionRechterDiezedijk + // This test runs the same project as CanPerformWtiDesignNoAdaptionRechterDiezedijk // except that it runs it with both single core and multi core. // The output of both runs must be the same public void CompareResultFromMultiCoreRunWithSingleCoreRun()