Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MultiCoreMacroStabilityTests.cs =================================================================== diff -u -r4231 -r4234 --- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MultiCoreMacroStabilityTests.cs (.../MultiCoreMacroStabilityTests.cs) (revision 4231) +++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MultiCoreMacroStabilityTests.cs (.../MultiCoreMacroStabilityTests.cs) (revision 4234) @@ -75,7 +75,7 @@ File.WriteAllText("Output.xml", outputString); Output output = DamXmlSerialization.LoadOutputFromXmlString(outputString); int errorCount = GeneralHelper.DetermineNumberOfCalculationErrors(engineInterface.DamProjectData.CalculationMessages); - Assert.AreEqual(0, errorCount, "There should be nor errors during the calculation."); + Assert.AreEqual(0, errorCount, "There should be no errors during the calculation."); Assert.AreEqual(output.Results.CalculationMessages.Length, engineInterface.DamProjectData.CalculationMessages.Count); if (engineInterface.DamProjectData.DamProjectType == DamProjectType.Design) { @@ -123,7 +123,7 @@ File.WriteAllText("Output.xml", outputString); Output output = DamXmlSerialization.LoadOutputFromXmlString(outputString); int errorCount = GeneralHelper.DetermineNumberOfCalculationErrors(engineInterface.DamProjectData.CalculationMessages); - Assert.AreEqual(0, errorCount, "There should be nor errors during the calculation."); + Assert.AreEqual(0, errorCount, "There should be no errors during the calculation."); Assert.AreEqual(output.Results.CalculationMessages.Length, engineInterface.DamProjectData.CalculationMessages.Count); if (engineInterface.DamProjectData.DamProjectType == DamProjectType.Design) { Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/Deltares.DamEngine.IntegrationTests.csproj =================================================================== diff -u -r4232 -r4234 --- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/Deltares.DamEngine.IntegrationTests.csproj (.../Deltares.DamEngine.IntegrationTests.csproj) (revision 4232) +++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/Deltares.DamEngine.IntegrationTests.csproj (.../Deltares.DamEngine.IntegrationTests.csproj) (revision 4234) @@ -327,15 +327,12 @@ PreserveNewest - + PreserveNewest - + PreserveNewest - - PreserveNewest - Fisheye: Tag 4234 refers to a dead (removed) revision in file `DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/DAMSUP169Bligh.xml'. Fisheye: No comparison available. Pass `N' to diff? Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/WtiPipingSellmeijerRevisedTests.cs =================================================================== diff -u -r4230 -r4234 --- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/WtiPipingSellmeijerRevisedTests.cs (.../WtiPipingSellmeijerRevisedTests.cs) (revision 4230) +++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/WtiPipingSellmeijerRevisedTests.cs (.../WtiPipingSellmeijerRevisedTests.cs) (revision 4234) @@ -286,10 +286,10 @@ [Test] [TestCase(1)] [TestCase(4)] - public void TestDAMSUP_169(int maxCores) + public void TestWtiPipingSellmeijerRevisedWithoutUplift(int maxCores) { Thread.CurrentThread.CurrentCulture = CultureInfo.InvariantCulture; - const string fileName = @"DAMSUP169WtiSellmeijerRevised.xml"; + const string fileName = @"WtiPipingSellmeijerRevisedWithoutUplift.xml"; string inputString = File.ReadAllText(fileName); var engineInterface = new EngineInterface(inputString); Assert.IsNotNull(engineInterface.DamProjectData); @@ -301,7 +301,7 @@ File.WriteAllText(outputName, outputString); Output output = DamXmlSerialization.LoadOutputFromXmlString(outputString); int errorCount = GeneralHelper.DetermineNumberOfCalculationErrors(engineInterface.DamProjectData.CalculationMessages); - Assert.AreEqual(0, errorCount, "There should be nor errors during the calculation."); + Assert.AreEqual(0, errorCount, "There should be no errors during the calculation."); Assert.AreNotEqual(null, output.Results.CalculationResults); Assert.AreEqual(6, output.Results.CalculationResults.Length); Assert.AreEqual(26.006, output.Results.CalculationResults[0].PipingDesignResults.Wti2017FactorOverall, tolerance); Index: DamEngine/trunk/src/Deltares.DamEngine.Data/Design/DesignScenario.cs =================================================================== diff -u -r4224 -r4234 --- DamEngine/trunk/src/Deltares.DamEngine.Data/Design/DesignScenario.cs (.../DesignScenario.cs) (revision 4224) +++ DamEngine/trunk/src/Deltares.DamEngine.Data/Design/DesignScenario.cs (.../DesignScenario.cs) (revision 4234) @@ -400,14 +400,10 @@ $"PlLineOffsetBelowDikeToeAtPolder={PlLineOffsetBelowDikeToeAtPolder} " + $"PlLineOffsetBelowDikeTopAtPolder={PlLineOffsetBelowDikeTopAtPolder} " + $"PlLineOffsetBelowShoulderBaseInside={PlLineOffsetBelowShoulderBaseInside} " + - $"UsePlLineOffsetBelowDikeCrestMiddle {(UsePlLineOffsetBelowDikeCrestMiddle.HasValue ? - UsePlLineOffsetBelowDikeCrestMiddle.ToString() : "?")} " + - $"PlLineOffsetBelowDikeCrestMiddle {(PlLineOffsetBelowDikeCrestMiddle.HasValue ? - PlLineOffsetBelowDikeCrestMiddle.ToString() : "?")} " + - $"UsePlLineOffsetFactorBelowShoulderCrest {(UsePlLineOffsetFactorBelowShoulderCrest.HasValue ? - UsePlLineOffsetFactorBelowShoulderCrest.ToString() : "?")} " + - $"PlLineOffsetFactorBelowShoulderCrest {(PlLineOffsetFactorBelowShoulderCrest.HasValue ? - PlLineOffsetFactorBelowShoulderCrest.ToString() : "?")} " + + $"UsePlLineOffsetBelowDikeCrestMiddle {(UsePlLineOffsetBelowDikeCrestMiddle.HasValue ? UsePlLineOffsetBelowDikeCrestMiddle.ToString() : "?")} " + + $"PlLineOffsetBelowDikeCrestMiddle {(PlLineOffsetBelowDikeCrestMiddle.HasValue ? PlLineOffsetBelowDikeCrestMiddle.ToString() : "?")} " + + $"UsePlLineOffsetFactorBelowShoulderCrest {(UsePlLineOffsetFactorBelowShoulderCrest.HasValue ? UsePlLineOffsetFactorBelowShoulderCrest.ToString() : "?")} " + + $"PlLineOffsetFactorBelowShoulderCrest {(PlLineOffsetFactorBelowShoulderCrest.HasValue ? PlLineOffsetFactorBelowShoulderCrest.ToString() : "?")} " + $"HeadPl2={(HeadPl2.HasValue ? HeadPl2.ToString() : "?")} " + $"HeadPl3={(HeadPl3.HasValue ? HeadPl3.ToString() : "?")} " + $"HeadPl4={(HeadPl4.HasValue ? HeadPl4.ToString() : "?")} " + $"PolderLevel={PolderLevel} "; Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/PipingBlighTests.cs =================================================================== diff -u -r4231 -r4234 --- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/PipingBlighTests.cs (.../PipingBlighTests.cs) (revision 4231) +++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/PipingBlighTests.cs (.../PipingBlighTests.cs) (revision 4234) @@ -255,10 +255,10 @@ [Test] [TestCase(1)] [TestCase(4)] - public void TestDAMSUP_169(int maxCores) + public void TestPipingBlightWithoutUplift(int maxCores) { Thread.CurrentThread.CurrentCulture = CultureInfo.InvariantCulture; - const string fileName = @"DAMSUP169Bligh.xml"; + const string fileName = @"PipingBlighWithoutUplift.xml"; string inputString = File.ReadAllText(fileName); var engineInterface = new EngineInterface(inputString); Assert.IsNotNull(engineInterface.DamProjectData); @@ -270,7 +270,7 @@ File.WriteAllText(outputName, outputString); Output output = DamXmlSerialization.LoadOutputFromXmlString(outputString); int errorCount = GeneralHelper.DetermineNumberOfCalculationErrors(engineInterface.DamProjectData.CalculationMessages); - Assert.AreEqual(0, errorCount, "There should be nor errors during the calculation."); + Assert.AreEqual(0, errorCount, "There should be no errors during the calculation."); Assert.AreNotEqual(null, output.Results.CalculationResults); Assert.AreEqual(6, output.Results.CalculationResults.Length); Assert.AreEqual(17.208, output.Results.CalculationResults[0].PipingDesignResults.BlighFactor, tolerance); Fisheye: Tag 4234 refers to a dead (removed) revision in file `DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/DAMSUP169WtiSellmeijerRevised.xml'. Fisheye: No comparison available. Pass `N' to diff?