Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/PipingBlighTests.cs =================================================================== diff -u -r5242 -r5246 --- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/PipingBlighTests.cs (.../PipingBlighTests.cs) (revision 5242) +++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/PipingBlighTests.cs (.../PipingBlighTests.cs) (revision 5246) @@ -119,7 +119,7 @@ Output output = GeneralHelper.RunAfterInputValidation(inputString); - Assert.That(output.Results.CalculationResults, Has.Length.EqualTo(104)); + Assert.That(output.Results.CalculationResults, Has.Length.EqualTo(112)); Assert.Multiple(() => { Assert.That(output.Results.CalculationResults[0].PipingDesignResults.BlighFactor, Is.EqualTo(0.936).Within(tolerance)); @@ -167,7 +167,7 @@ Assert.That(output.Results.CalculationResults[0].PipingDesignResults.ExitPointX, Is.EqualTo(73.486).Within(tolerance)); } - [Test, Category(Categories.WorkInProgress)] + [Test] public void CanPerformBlighDesignWithAdaptionRechterDiezedijk1Location() { // Based on ".\data\DamEngineTestProjects\Larenstein_AaenMaas\Rechter Diezedijk.damx" @@ -185,7 +185,7 @@ Assert.That(output.Results.CalculationResults.Length, Is.EqualTo((locationIndex + 1) * 2)); } - [Test, Category(Categories.WorkInProgress)] + [Test] [SetUICulture("en-US")] public void CanPerformBlighFailingDesignWithAdaptionRechterDiezedijk1Location() { @@ -211,7 +211,7 @@ "The new shoulder length is too large to fit in the current surface line.'")); } - [Test, Category(Categories.WorkInProgress)] + [Test] public void CanPerformBlighDesignWithAdaptionRechterDiezedijk() { // Based on ".\data\DamEngineTestProjects\Larenstein_AaenMaas\Rechter Diezedijk.damx" Index: DamEngine/trunk/src/Deltares.DamEngine.Data/Geotechnics/SoilProfileHelper.cs =================================================================== diff -u -r5239 -r5246 --- DamEngine/trunk/src/Deltares.DamEngine.Data/Geotechnics/SoilProfileHelper.cs (.../SoilProfileHelper.cs) (revision 5239) +++ DamEngine/trunk/src/Deltares.DamEngine.Data/Geotechnics/SoilProfileHelper.cs (.../SoilProfileHelper.cs) (revision 5246) @@ -60,7 +60,10 @@ Soil = originalSoilProfile1D.Layers[bottom].Soil, SoilProfile = soilProfile, IsAquifer = originalSoilProfile1D.Layers[bottom].IsAquifer, - BottomLevel = originalSoilProfile1D.Layers[bottom].BottomLevel + BottomLevel = originalSoilProfile1D.Layers[bottom].BottomLevel, + SoilName = originalSoilProfile1D.Layers[bottom].SoilName, + WaterpressureInterpolationModel = originalSoilProfile1D.Layers[bottom].WaterpressureInterpolationModel, + Name = originalSoilProfile1D.Layers[bottom].Name }; soilProfile.Layers.Insert(0, topLayer); } Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/WtiPipingSellmeijerRevisedTests.cs =================================================================== diff -u -r5241 -r5246 --- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/WtiPipingSellmeijerRevisedTests.cs (.../WtiPipingSellmeijerRevisedTests.cs) (revision 5241) +++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/WtiPipingSellmeijerRevisedTests.cs (.../WtiPipingSellmeijerRevisedTests.cs) (revision 5246) @@ -194,19 +194,19 @@ Assert.Multiple(() => { // The expected values below where calculated with DamEngine rev.2016, - Assert.That(output.Results.CalculationResults, Has.Length.EqualTo(104)); + Assert.That(output.Results.CalculationResults, Has.Length.EqualTo(112)); Assert.That(ConversionHelper.ConvertToCalculationResult(output.Results.CalculationResults[0].CalculationResult), Is.EqualTo(CalculationResult.Succeeded)); }); Assert.Multiple(() => { // result 1: safety factor = 90.000 - Assert.That(output.Results.CalculationResults[0].PipingDesignResults.Wti2017FactorOverall, Is.EqualTo(58.241).Within(tolerance)); + Assert.That(output.Results.CalculationResults[0].PipingDesignResults.Wti2017FactorOverall, Is.EqualTo(90.000).Within(tolerance)); // result 2: safety factor = 58.243 Assert.That(ConversionHelper.ConvertToCalculationResult(output.Results.CalculationResults[2].CalculationResult), Is.EqualTo(CalculationResult.Succeeded)); - Assert.That(output.Results.CalculationResults[2].PipingDesignResults.Wti2017FactorOverall, Is.EqualTo(54.544).Within(tolerance)); + Assert.That(output.Results.CalculationResults[2].PipingDesignResults.Wti2017FactorOverall, Is.EqualTo(58.241).Within(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.That(ConversionHelper.ConvertToCalculationResult(output.Results.CalculationResults[103].CalculationResult), Is.EqualTo(CalculationResult.Succeeded)); - Assert.That(output.Results.CalculationResults[103].PipingDesignResults.Wti2017FactorOverall, Is.EqualTo(49.046).Within(tolerance)); + Assert.That(output.Results.CalculationResults[103].PipingDesignResults.Wti2017FactorOverall, Is.EqualTo(56.011).Within(tolerance)); }); } @@ -229,7 +229,7 @@ Assert.That(outputMultiCore, Is.EqualTo(outputSingleCore)); } - [Test, Category(Categories.WorkInProgress)] + [Test] [SetUICulture("en-US")] public void CanPerformWtiSellmeijerRevisedFailingDesignRechterDiezedijk1Location() {