Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityInwards/MacroStabilityInwardsKernelWrapperTests.cs =================================================================== diff -u -r4729 -r4907 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityInwards/MacroStabilityInwardsKernelWrapperTests.cs (.../MacroStabilityInwardsKernelWrapperTests.cs) (revision 4729) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityInwards/MacroStabilityInwardsKernelWrapperTests.cs (.../MacroStabilityInwardsKernelWrapperTests.cs) (revision 4907) @@ -630,7 +630,7 @@ Output output = GeneralHelper.RunAfterInputValidation(engineInterface); - Assert.That(output.Results.CalculationResults[0].StabilityDesignResults.SafetyFactor, Is.EqualTo(1.638).Within(0.001)); + Assert.That(output.Results.CalculationResults[0].StabilityDesignResults.SafetyFactor, Is.EqualTo(1.611).Within(0.001)); } [Test] Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/DesignCalculatorTests.cs =================================================================== diff -u -r4627 -r4907 --- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/DesignCalculatorTests.cs (.../DesignCalculatorTests.cs) (revision 4627) +++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/DesignCalculatorTests.cs (.../DesignCalculatorTests.cs) (revision 4907) @@ -96,8 +96,6 @@ Output output = GeneralHelper.RunAfterInputValidation(inputString); - // We get 606 warnings in total when using the official release of the macro stability kernel. When we use the latest trunk version, we get 619 errors - // So as long as the latest version is not (yet) released we have to check both values because otherwise it will either fail locally or on TC. - Assert.That(output.Results.CalculationMessages.Length, Is.EqualTo(606).Or.EqualTo(619), "Number of messages found = " + output.Results.CalculationMessages.Length); + Assert.That(output.Results.CalculationMessages.Length, Is.EqualTo(653), "Number of messages found = " + output.Results.CalculationMessages.Length); } } \ No newline at end of file Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MacroStabilityInwardsTests.cs =================================================================== diff -u -r4898 -r4907 --- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MacroStabilityInwardsTests.cs (.../MacroStabilityInwardsTests.cs) (revision 4898) +++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MacroStabilityInwardsTests.cs (.../MacroStabilityInwardsTests.cs) (revision 4907) @@ -471,7 +471,7 @@ // Calculation Result Assert.That(ConversionHelper.ConvertToCalculationResult(result.CalculationResult), Is.EqualTo(CalculationResult.Succeeded)); // SafetyFactor=2.099 - Assert.That(result.StabilityDesignResults.SafetyFactor, Is.EqualTo(2.099).Within(tolerance)); + Assert.That(result.StabilityDesignResults.SafetyFactor, Is.EqualTo(2.087).Within(tolerance)); result = output.Results.CalculationResults[3]; Assert.That(result.LocationName, Is.EqualTo("6-4-3-B-1-D")); @@ -594,10 +594,10 @@ Assert.Multiple(() => { Assert.That(output.Results.CalculationResults.Length, Is.EqualTo(18)); - Assert.That(output.Results.CalculationMessages.Length, Is.EqualTo(3008)); + Assert.That(output.Results.CalculationMessages.Length, Is.EqualTo(3411)); int resultsFound = CheckLargeResultsSets.CheckResultsDesignBishopAdaptionWithScenariosForHeadPl3CalculatesCorrect( output.Results.CalculationResults); - Assert.That(resultsFound, Is.EqualTo(18)); + Assert.That(resultsFound, Is.EqualTo(15)); }); } @@ -622,7 +622,7 @@ Output output = GeneralHelper.RunAfterInputValidation(inputString); - Assert.That(output.Results.CalculationResults.First().StabilityDesignResults.SafetyFactor, Is.EqualTo(1.724).Within(tolerance)); + Assert.That(output.Results.CalculationResults.First().StabilityDesignResults.SafetyFactor, Is.EqualTo(1.366).Within(tolerance)); } [Test, Category(Categories.Slow), Ignore("This test is not yet implemented, waits on stix implementation.")] @@ -781,7 +781,7 @@ // test safety factor for other profiles result = output.Results.CalculationResults[1]; // SafetyFactor=1.644 - Assert.That(result.StabilityDesignResults.SafetyFactor, Is.EqualTo(1.644).Within(tolerance)); + Assert.That(result.StabilityDesignResults.SafetyFactor, Is.EqualTo(1.624).Within(tolerance)); result = output.Results.CalculationResults[2]; // SafetyFactor=1.682 Assert.That(result.StabilityDesignResults.SafetyFactor, Is.EqualTo(1.682).Within(tolerance)); @@ -841,7 +841,7 @@ DesignResult result = output.Results.CalculationResults[0]; // SafetyFactor=1.638 DSTAB 1.518 (1.079) - Assert.That(result.StabilityDesignResults.SafetyFactor, Is.EqualTo(1.638).Within(tolerance)); + Assert.That(result.StabilityDesignResults.SafetyFactor, Is.EqualTo(1.611).Within(tolerance)); // skip testing some of the results like uplift etc. @@ -850,9 +850,11 @@ // test safety factor for other profiles result = output.Results.CalculationResults[1]; - // SafetyFactor=1.551 DSTAB 1.414. 1.097 - Assert.That(result.StabilityDesignResults.SafetyFactor, Is.EqualTo(1.551).Within(tolerance)); - Assert.That(ConversionHelper.ConvertToCalculationResult(result.CalculationResult), Is.EqualTo(CalculationResult.Succeeded)); + Assert.Multiple(() => + { + Assert.That(result.StabilityDesignResults.SafetyFactor, Is.EqualTo(1.536).Within(tolerance)); + Assert.That(ConversionHelper.ConvertToCalculationResult(result.CalculationResult), Is.EqualTo(CalculationResult.Succeeded)); + }); var fileList = new List { @@ -906,7 +908,7 @@ DesignResult result = output.Results.CalculationResults[0]; // SafetyFactor=1.638 - Assert.That(result.StabilityDesignResults.SafetyFactor, Is.EqualTo(1.638).Within(tolerance)); + Assert.That(result.StabilityDesignResults.SafetyFactor, Is.EqualTo(1.611).Within(tolerance)); // skip testing some of the results like uplift etc. @@ -915,8 +917,7 @@ // test safety factor for other profiles result = output.Results.CalculationResults[1]; - // SafetyFactor=1.551 - Assert.That(result.StabilityDesignResults.SafetyFactor, Is.EqualTo(1.551).Within(tolerance)); + Assert.That(result.StabilityDesignResults.SafetyFactor, Is.EqualTo(1.536).Within(tolerance)); // Stix file var fileList = new List @@ -984,7 +985,7 @@ // test safety factor for other profiles result = output.Results.CalculationResults[1]; // SafetyFactor=1.644 - Assert.That(result.StabilityDesignResults.SafetyFactor, Is.EqualTo(1.644).Within(tolerance)); + Assert.That(result.StabilityDesignResults.SafetyFactor, Is.EqualTo(1.624).Within(tolerance)); // Stix file var existingFilesList = new List Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/CheckLargeResultsSets.cs =================================================================== diff -u -r4627 -r4907 --- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/CheckLargeResultsSets.cs (.../CheckLargeResultsSets.cs) (revision 4627) +++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/CheckLargeResultsSets.cs (.../CheckLargeResultsSets.cs) (revision 4907) @@ -63,7 +63,7 @@ if (timeSeries.LocationId == "Purmer_PU0042+00_K") { TimeSerieEntry firstEntry = timeSeries.Entries.First(); - Assert.That(firstEntry.Value, Is.EqualTo(1.442).Within(cTolerance), "The computed safety factory is not correct"); + Assert.That(firstEntry.Value, Is.EqualTo(1.185).Within(cTolerance), "The computed safety factory is not correct"); resultsCount++; TimeSerieEntry lastEntry = timeSeries.Entries.Last(); Assert.That(lastEntry.Value, Is.EqualTo(1.579).Within(cTolerance), "The computed safety factory is not correct"); @@ -154,16 +154,22 @@ { if (designResult.BaseFileName.Equals("Loc(KR093_0013)_Sce(3)_Pro(segment_627_1D1-KR093_0013-1)")) { - Assert.That(designResult.StabilityDesignResults.SafetyFactor, Is.EqualTo(9.300).Within(tolerance)); - Assert.That(designResult.ScenarioName, Is.EqualTo("3")); - Assert.That(designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, Is.EqualTo(-0.94).Within(tol2Digits)); + Assert.Multiple(() => + { + Assert.That(designResult.StabilityDesignResults.SafetyFactor, Is.EqualTo(9.090).Within(tolerance)); + Assert.That(designResult.ScenarioName, Is.EqualTo("3")); + Assert.That(designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, Is.EqualTo(-0.94).Within(tol2Digits)); + }); } if (designResult.BaseFileName.Equals("Loc(KR093_0013)_Sce(4)_Pro(segment_627_1D1-KR093_0013-1)")) { - Assert.That(designResult.StabilityDesignResults.SafetyFactor, Is.EqualTo(7.888).Within(tolerance)); - Assert.That(designResult.ScenarioName, Is.EqualTo("4")); - Assert.That(designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, Is.EqualTo(-0.37).Within(tol2Digits)); + Assert.Multiple(() => + { + Assert.That(designResult.StabilityDesignResults.SafetyFactor, Is.EqualTo(8.148).Within(tolerance)); + Assert.That(designResult.ScenarioName, Is.EqualTo("4")); + Assert.That(designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, Is.EqualTo(-0.37).Within(tol2Digits)); + }); } if (designResult.BaseFileName.Equals("Loc(KR093_0013)_Sce(3)_Pro(segment_627_1D2-KR093_0013-2)")) @@ -287,113 +293,152 @@ { if (designResult.BaseFileName.Equals("Loc(KR093_0013)_Sce(3)_Pro(segment_627_1D1-KR093_0013-1)_Ite(4)")) { - Assert.That(designResult.StabilityDesignResults.SafetyFactor, Is.EqualTo(5.306).Within(tolerance)); - Assert.That(designResult.ScenarioName, Is.EqualTo("3")); - Assert.That(designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, Is.EqualTo(-0.94).Within(tol2Digits)); + Assert.Multiple(() => + { + Assert.That(designResult.StabilityDesignResults.SafetyFactor, Is.EqualTo(5.306).Within(tolerance)); + Assert.That(designResult.ScenarioName, Is.EqualTo("3")); + Assert.That(designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, Is.EqualTo(-0.94).Within(tol2Digits)); + }); resultsFound++; } if (designResult.BaseFileName.Equals("Loc(KR093_0013)_Sce(4)_Pro(segment_627_1D1-KR093_0013-1)_Ite(4)")) { - Assert.That(designResult.StabilityDesignResults.SafetyFactor, Is.EqualTo(4.986).Within(tolerance)); - Assert.That(designResult.ScenarioName, Is.EqualTo("4")); - Assert.That(designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, Is.EqualTo(-0.37).Within(tol2Digits)); + Assert.Multiple(() => + { + Assert.That(designResult.StabilityDesignResults.SafetyFactor, Is.EqualTo(5.167).Within(tolerance)); + Assert.That(designResult.ScenarioName, Is.EqualTo("4")); + Assert.That(designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, Is.EqualTo(-0.37).Within(tol2Digits)); + }); resultsFound++; } if (designResult.BaseFileName.Equals("Loc(KR093_0013)_Sce(3)_Pro(segment_627_1D2-KR093_0013-2)_Ite(3)")) { - Assert.That(designResult.StabilityDesignResults.SafetyFactor, Is.EqualTo(5.155).Within(tolerance)); - Assert.That(designResult.ScenarioName, Is.EqualTo("3")); - Assert.That(designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, Is.EqualTo(-0.94).Within(tol2Digits)); + Assert.Multiple(() => + { + Assert.That(designResult.StabilityDesignResults.SafetyFactor, Is.EqualTo(5.188).Within(tolerance)); + Assert.That(designResult.ScenarioName, Is.EqualTo("3")); + Assert.That(designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, Is.EqualTo(-0.94).Within(tol2Digits)); + }); resultsFound++; } if (designResult.BaseFileName.Equals("Loc(KR093_0013)_Sce(4)_Pro(segment_627_1D2-KR093_0013-2)_Ite(3)")) { - Assert.That(designResult.StabilityDesignResults.SafetyFactor, Is.EqualTo(4.335).Within(tolerance)); - Assert.That(designResult.ScenarioName, Is.EqualTo("4")); - Assert.That(designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, Is.EqualTo(-0.37).Within(tol2Digits)); + Assert.Multiple(() => + { + Assert.That(designResult.StabilityDesignResults.SafetyFactor, Is.EqualTo(4.420).Within(tolerance)); + Assert.That(designResult.ScenarioName, Is.EqualTo("4")); + Assert.That(designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, Is.EqualTo(-0.37).Within(tol2Digits)); + }); resultsFound++; } if (designResult.BaseFileName.Equals("Loc(KR093_0013)_Sce(3)_Pro(segment_627_1D3-KR093_0013-3)_Ite(3)")) { - Assert.That(designResult.StabilityDesignResults.SafetyFactor, Is.EqualTo(5.188).Within(tolerance)); - Assert.That(designResult.ScenarioName, Is.EqualTo("3")); - Assert.That(designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, Is.EqualTo(-0.94).Within(tol2Digits)); + Assert.Multiple(() => + { + Assert.That(designResult.StabilityDesignResults.SafetyFactor, Is.EqualTo(5.188).Within(tolerance)); + Assert.That(designResult.ScenarioName, Is.EqualTo("3")); + Assert.That(designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, Is.EqualTo(-0.94).Within(tol2Digits)); + }); resultsFound++; } if (designResult.BaseFileName.Equals("Loc(KR093_0013)_Sce(4)_Pro(segment_627_1D3-KR093_0013-3)_Ite(3)")) { - Assert.That(designResult.StabilityDesignResults.SafetyFactor, Is.EqualTo(4.784).Within(tolerance)); - Assert.That(designResult.ScenarioName, Is.EqualTo("4")); - Assert.That(designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, Is.EqualTo(-0.37).Within(tol2Digits)); + Assert.Multiple(() => + { + Assert.That(designResult.StabilityDesignResults.SafetyFactor, Is.EqualTo(4.784).Within(tolerance)); + Assert.That(designResult.ScenarioName, Is.EqualTo("4")); + Assert.That(designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, Is.EqualTo(-0.37).Within(tol2Digits)); + }); resultsFound++; } if (designResult.BaseFileName.Equals("Loc(KR093_0018)_Sce(3)_Pro(segment_629_1D1-KR093_0018-1)_Ite(29)")) { - Assert.That(designResult.StabilityDesignResults.SafetyFactor, Is.EqualTo(1.752).Within(tolerance)); - Assert.That(designResult.ScenarioName, Is.EqualTo("3")); - Assert.That(designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, Is.EqualTo(-1.00).Within(tol2Digits)); + Assert.Multiple(() => + { + Assert.That(designResult.StabilityDesignResults.SafetyFactor, Is.EqualTo(1.752).Within(tolerance)); + Assert.That(designResult.ScenarioName, Is.EqualTo("3")); + Assert.That(designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, Is.EqualTo(-1.00).Within(tol2Digits)); + }); resultsFound++; } if (designResult.BaseFileName.Equals("Loc(KR093_0018)_Sce(4)_Pro(segment_629_1D1-KR093_0018-1)_Ite(29)")) { - Assert.That(designResult.StabilityDesignResults.SafetyFactor, Is.EqualTo(1.270).Within(tolerance)); - Assert.That(designResult.ScenarioName, Is.EqualTo("4")); - Assert.That(designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, Is.EqualTo(-0.52).Within(tol2Digits)); + Assert.Multiple(() => + { + Assert.That(designResult.StabilityDesignResults.SafetyFactor, Is.EqualTo(1.270).Within(tolerance)); + Assert.That(designResult.ScenarioName, Is.EqualTo("4")); + Assert.That(designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, Is.EqualTo(-0.52).Within(tol2Digits)); + }); resultsFound++; } if (designResult.BaseFileName.Equals("Loc(KR093_0018)_Sce(3)_Pro(segment_629_1D2-KR093_0018-2)_Ite(29)")) { - Assert.That(designResult.StabilityDesignResults.SafetyFactor, Is.EqualTo(1.409).Within(tolerance)); - Assert.That(designResult.ScenarioName, Is.EqualTo("3")); - Assert.That(designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, Is.EqualTo(-1.00).Within(tol2Digits)); + Assert.Multiple(() => + { + Assert.That(designResult.StabilityDesignResults.SafetyFactor, Is.EqualTo(1.409).Within(tolerance)); + Assert.That(designResult.ScenarioName, Is.EqualTo("3")); + Assert.That(designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, Is.EqualTo(-1.00).Within(tol2Digits)); + }); resultsFound++; } if (designResult.BaseFileName.Equals("Loc(KR093_0018)_Sce(4)_Pro(segment_629_1D2-KR093_0018-2)_Ite(29)")) { - Assert.That(designResult.StabilityDesignResults.SafetyFactor, Is.EqualTo(1.224).Within(tolerance)); - Assert.That(designResult.ScenarioName, Is.EqualTo("4")); - Assert.That(designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, Is.EqualTo(-0.37).Within(tol2Digits)); + Assert.Multiple(() => + { + Assert.That(designResult.StabilityDesignResults.SafetyFactor, Is.EqualTo(1.224).Within(tolerance)); + Assert.That(designResult.ScenarioName, Is.EqualTo("4")); + Assert.That(designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, Is.EqualTo(-0.37).Within(tol2Digits)); + }); resultsFound++; } if (designResult.BaseFileName.Equals("Loc(KR093_0018)_Sce(3)_Pro(segment_629_1D3-KR093_0018-3)_Ite(29)")) { - Assert.That(designResult.StabilityDesignResults.SafetyFactor, Is.EqualTo(1.598).Within(tolerance)); + Assert.That(designResult.StabilityDesignResults.SafetyFactor, Is.EqualTo(1.391).Within(tolerance)); Assert.That(designResult.ScenarioName, Is.EqualTo("3")); Assert.That(designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, Is.EqualTo(-1.00).Within(tol2Digits)); resultsFound++; } if (designResult.BaseFileName.Equals("Loc(KR093_0018)_Sce(4)_Pro(segment_629_1D3-KR093_0018-3)_Ite(29)")) { - Assert.That(designResult.StabilityDesignResults.SafetyFactor, Is.EqualTo(1.382).Within(tolerance)); - Assert.That(designResult.ScenarioName, Is.EqualTo("4")); - Assert.That(designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, Is.EqualTo(-0.37).Within(tol2Digits)); + Assert.Multiple(() => + { + Assert.That(designResult.StabilityDesignResults.SafetyFactor, Is.EqualTo(1.389).Within(tolerance)); + Assert.That(designResult.ScenarioName, Is.EqualTo("4")); + Assert.That(designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, Is.EqualTo(-0.37).Within(tol2Digits)); + }); resultsFound++; } if (designResult.BaseFileName.Equals("Loc(KR093_0019)_Sce(3)_Pro(segment_629_1D1-KR093_0019-1)_Ite(25)")) { - Assert.That(designResult.StabilityDesignResults.SafetyFactor, Is.EqualTo(5.848).Within(tolerance)); - Assert.That(designResult.ScenarioName, Is.EqualTo("3")); - Assert.That(designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, Is.EqualTo(-1.03).Within(tol2Digits)); + Assert.Multiple(() => + { + Assert.That(designResult.StabilityDesignResults.SafetyFactor, Is.EqualTo(5.848).Within(tolerance)); + Assert.That(designResult.ScenarioName, Is.EqualTo("3")); + Assert.That(designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, Is.EqualTo(-1.03).Within(tol2Digits)); + }); resultsFound++; } if (designResult.BaseFileName.Equals("Loc(KR093_0019)_Sce(4)_Pro(segment_629_1D1-KR093_0019-1)_Ite(25)")) { - Assert.That(designResult.StabilityDesignResults.SafetyFactor, Is.EqualTo(5.848).Within(tolerance)); - Assert.That(designResult.ScenarioName, Is.EqualTo("4")); - Assert.That(designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, Is.EqualTo(-0.57).Within(tol2Digits)); + Assert.Multiple(() => + { + Assert.That(designResult.StabilityDesignResults.SafetyFactor, Is.EqualTo(5.848).Within(tolerance)); + Assert.That(designResult.ScenarioName, Is.EqualTo("4")); + Assert.That(designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, Is.EqualTo(-0.57).Within(tol2Digits)); + }); resultsFound++; } @@ -407,25 +452,34 @@ if (designResult.BaseFileName.Equals("Loc(KR093_0019)_Sce(4)_Pro(segment_629_1D2-KR093_0019-2)_Ite(5)")) { - Assert.That(designResult.StabilityDesignResults.SafetyFactor, Is.EqualTo(2.876).Within(tolerance)); - Assert.That(designResult.ScenarioName, Is.EqualTo("4")); - Assert.That(designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, Is.EqualTo(-0.37).Within(tol2Digits)); + Assert.Multiple(() => + { + Assert.That(designResult.StabilityDesignResults.SafetyFactor, Is.EqualTo(2.876).Within(tolerance)); + Assert.That(designResult.ScenarioName, Is.EqualTo("4")); + Assert.That(designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, Is.EqualTo(-0.37).Within(tol2Digits)); + }); resultsFound++; } if (designResult.BaseFileName.Equals("Loc(KR093_0019)_Sce(3)_Pro(segment_629_1D3-KR093_0019-3)_Ite(25)")) { - Assert.That(designResult.StabilityDesignResults.SafetyFactor, Is.EqualTo(3.538).Within(tolerance)); - Assert.That(designResult.ScenarioName, Is.EqualTo("3")); - Assert.That(designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, Is.EqualTo(-1.03).Within(tol2Digits)); + Assert.Multiple(() => + { + Assert.That(designResult.StabilityDesignResults.SafetyFactor, Is.EqualTo(3.538).Within(tolerance)); + Assert.That(designResult.ScenarioName, Is.EqualTo("3")); + Assert.That(designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, Is.EqualTo(-1.03).Within(tol2Digits)); + }); resultsFound++; } if (designResult.BaseFileName.Equals("Loc(KR093_0019)_Sce(4)_Pro(segment_629_1D3-KR093_0019-3)_Ite(25)")) { - Assert.That(designResult.StabilityDesignResults.SafetyFactor, Is.EqualTo(1.503).Within(tolerance)); - Assert.That(designResult.ScenarioName, Is.EqualTo("4")); - Assert.That(designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, Is.EqualTo(-0.37).Within(tol2Digits)); + Assert.Multiple(() => + { + Assert.That(designResult.StabilityDesignResults.SafetyFactor, Is.EqualTo(1.515).Within(tolerance)); + Assert.That(designResult.ScenarioName, Is.EqualTo("4")); + Assert.That(designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, Is.EqualTo(-0.37).Within(tol2Digits)); + }); resultsFound++; } } Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/WtiPipingSellmeijerRevisedTests.cs =================================================================== diff -u -r4629 -r4907 --- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/WtiPipingSellmeijerRevisedTests.cs (.../WtiPipingSellmeijerRevisedTests.cs) (revision 4629) +++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/WtiPipingSellmeijerRevisedTests.cs (.../WtiPipingSellmeijerRevisedTests.cs) (revision 4907) @@ -262,21 +262,30 @@ Output output = GeneralHelper.RunAfterInputValidation(engineInterface, true, outputName); int errorCount = GeneralHelper.DetermineNumberOfCalculationErrors(engineInterface.DamProjectData.CalculationMessages); - Assert.That(errorCount, Is.EqualTo(0), "There should be no errors during the calculation."); - Assert.That(output.Results.CalculationResults, Is.Not.EqualTo(null)); - Assert.That(output.Results.CalculationResults.Length, Is.EqualTo(6)); - Assert.That(output.Results.CalculationResults[0].PipingDesignResults.Wti2017FactorOverall, Is.EqualTo(26.006).Within(tolerance)); - Assert.That(output.Results.CalculationResults[1].PipingDesignResults.Wti2017FactorOverall, Is.EqualTo(90.000).Within(tolerance)); - Assert.That(output.Results.CalculationResults[2].PipingDesignResults.Wti2017FactorOverall, Is.EqualTo(90.000).Within(tolerance)); - Assert.That(output.Results.CalculationResults[3].PipingDesignResults.Wti2017FactorOverall, Is.EqualTo(90.000).Within(tolerance)); - Assert.That(output.Results.CalculationResults[4].PipingDesignResults.Wti2017FactorOverall, Is.EqualTo(9.316).Within(tolerance)); - Assert.That(output.Results.CalculationResults[5].PipingDesignResults.Wti2017FactorOverall, Is.EqualTo(90.000).Within(tolerance)); - Assert.That(output.Results.CalculationMessages.Length, Is.EqualTo(5)); - Assert.That(output.Results.CalculationMessages[0].Message1, Does.Contain("no uplift")); - Assert.That(output.Results.CalculationMessages[1].Message1, Does.Contain("no uplift")); - Assert.That(output.Results.CalculationMessages[2].Message1, Does.Contain("no uplift")); - Assert.That(output.Results.CalculationMessages[3].Message1, Does.Contain("no uplift")); - Assert.That(output.Results.CalculationMessages[4].Message1, Does.Contain("no uplift")); + Assert.Multiple(() => + { + Assert.That(errorCount, Is.EqualTo(0), "There should be no errors during the calculation."); + Assert.That(output.Results.CalculationResults, Is.Not.EqualTo(null)); + }); + Assert.That(output.Results.CalculationResults, Has.Length.EqualTo(7)); + Assert.Multiple(() => + { + Assert.That(output.Results.CalculationResults[0].PipingDesignResults.Wti2017FactorOverall, Is.EqualTo(26.006).Within(tolerance)); + Assert.That(output.Results.CalculationResults[1].PipingDesignResults.Wti2017FactorOverall, Is.EqualTo(90.000).Within(tolerance)); + Assert.That(output.Results.CalculationResults[2].PipingDesignResults.Wti2017FactorOverall, Is.EqualTo(90.000).Within(tolerance)); + Assert.That(output.Results.CalculationResults[3].PipingDesignResults.Wti2017FactorOverall, Is.EqualTo(90.000).Within(tolerance)); + Assert.That(output.Results.CalculationResults[4].PipingDesignResults.Wti2017FactorOverall, Is.EqualTo(9.316).Within(tolerance)); + Assert.That(output.Results.CalculationResults[5].PipingDesignResults.Wti2017FactorOverall, Is.EqualTo(9.316).Within(tolerance)); + Assert.That(output.Results.CalculationResults[6].PipingDesignResults.Wti2017FactorOverall, Is.EqualTo(90.000).Within(tolerance)); + Assert.That(output.Results.CalculationMessages, Has.Length.EqualTo(4)); + }); + Assert.Multiple(() => + { + Assert.That(output.Results.CalculationMessages[0].Message1, Does.Contain("no uplift")); + Assert.That(output.Results.CalculationMessages[1].Message1, Does.Contain("no uplift")); + Assert.That(output.Results.CalculationMessages[2].Message1, Does.Contain("no uplift")); + Assert.That(output.Results.CalculationMessages[3].Message1, Does.Contain("no uplift")); + }); } private Output RunTestProjectCores(string calcDir, string outputFileName, int coreCount) Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/FillMacroStabilityWrapperInputFromEngine.cs =================================================================== diff -u -r4898 -r4907 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/FillMacroStabilityWrapperInputFromEngine.cs (.../FillMacroStabilityWrapperInputFromEngine.cs) (revision 4898) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/FillMacroStabilityWrapperInputFromEngine.cs (.../FillMacroStabilityWrapperInputFromEngine.cs) (revision 4907) @@ -26,6 +26,7 @@ using Deltares.DamEngine.Data.General; using Deltares.DamEngine.Data.Geometry; using Deltares.DamEngine.Data.Geotechnics; +using Deltares.DamEngine.Data.Standard; using Deltares.MacroStability.CSharpWrapper; using Deltares.MacroStability.CSharpWrapper.Input; using Deltares.MacroStability.CSharpWrapper.Water; @@ -274,14 +275,13 @@ { var kernelCharPoint = new SurfaceLineCharacteristicPoint(); kernelCharPoint.CharacteristicPointType = - ConversionHelper.ConvertToMacroStabilityCharacteristicPointType( - damCharPoint.CharacteristicPointType); + ConversionHelper.ConvertToMacroStabilityCharacteristicPointType(damCharPoint.CharacteristicPointType); kernelCharPoint.GeometryPoint = new KernelPoint2D(damCharPoint.X, damCharPoint.Z); kernelSurfaceLine.CharacteristicPoints.Add(kernelCharPoint); } } - private void TransferWaternet(Waternet damWaternet, KernelWaternet kernelWaternet) + private static void TransferWaternet(Waternet damWaternet, KernelWaternet kernelWaternet) { var headLineMapping = new Dictionary(); @@ -291,7 +291,7 @@ PhreaticLine phreaticLine = damWaternet.PhreaticLine; kernelWaternet.PhreaticLine = CreateLine(phreaticLine); headLineMapping.Add(damWaternet.PhreaticLine, kernelWaternet.PhreaticLine); - + // Head Lines foreach (HeadLine damHeadLine in damWaternet.HeadLineList) { @@ -304,9 +304,8 @@ foreach (WaternetLine damWaternetLine in damWaternet.WaternetLineList) { var kernelWaternetLine = CreateLine(damWaternetLine); - kernelWaternetLine.AssociatedHeadLine = headLineMapping[damWaternetLine.HeadLine]; - - kernelWaternet.ReferenceLines.Add(kernelWaternetLine); // .WaternetLines + kernelWaternetLine.AssociatedHeadLine = damWaternetLine.HeadLine.Name.Contains("PL 1") ? headLineMapping[damWaternet.PhreaticLine] : headLineMapping[damWaternetLine.HeadLine]; + kernelWaternet.ReferenceLines.Add(kernelWaternetLine); } } Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/PipingBlighTests.cs =================================================================== diff -u -r4629 -r4907 --- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/PipingBlighTests.cs (.../PipingBlighTests.cs) (revision 4629) +++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/PipingBlighTests.cs (.../PipingBlighTests.cs) (revision 4907) @@ -252,20 +252,29 @@ Output output = GeneralHelper.RunAfterInputValidation(engineInterface, true, outputName); int errorCount = GeneralHelper.DetermineNumberOfCalculationErrors(engineInterface.DamProjectData.CalculationMessages); - Assert.That(errorCount, Is.EqualTo(0), "There should be no errors during the calculation."); - Assert.That(output.Results.CalculationResults, Is.Not.EqualTo(null)); - Assert.That(output.Results.CalculationResults.Length, Is.EqualTo(6)); - Assert.That(output.Results.CalculationResults[0].PipingDesignResults.BlighFactor, Is.EqualTo(17.208).Within(tolerance)); - Assert.That(output.Results.CalculationResults[1].PipingDesignResults.BlighFactor, Is.EqualTo(90.000).Within(tolerance)); - Assert.That(output.Results.CalculationResults[2].PipingDesignResults.BlighFactor, Is.EqualTo(90.000).Within(tolerance)); - Assert.That(output.Results.CalculationResults[3].PipingDesignResults.BlighFactor, Is.EqualTo(90.000).Within(tolerance)); - Assert.That(output.Results.CalculationResults[4].PipingDesignResults.BlighFactor, Is.EqualTo(7.041).Within(tolerance)); - Assert.That(output.Results.CalculationResults[5].PipingDesignResults.BlighFactor, Is.EqualTo(90.000).Within(tolerance)); - Assert.That(output.Results.CalculationMessages.Length, Is.EqualTo(5)); - Assert.That(output.Results.CalculationMessages[0].Message1, Does.Contain("no uplift")); - Assert.That(output.Results.CalculationMessages[1].Message1, Does.Contain("no uplift")); - Assert.That(output.Results.CalculationMessages[2].Message1, Does.Contain("no uplift")); - Assert.That(output.Results.CalculationMessages[3].Message1, Does.Contain("no uplift")); - Assert.That(output.Results.CalculationMessages[4].Message1, Does.Contain("no uplift")); + Assert.Multiple(() => + { + Assert.That(errorCount, Is.EqualTo(0), "There should be no errors during the calculation."); + Assert.That(output.Results.CalculationResults, Is.Not.EqualTo(null)); + }); + Assert.That(output.Results.CalculationResults, Has.Length.EqualTo(7)); + Assert.Multiple(() => + { + Assert.That(output.Results.CalculationResults[0].PipingDesignResults.BlighFactor, Is.EqualTo(17.208).Within(tolerance)); + Assert.That(output.Results.CalculationResults[1].PipingDesignResults.BlighFactor, Is.EqualTo(90.000).Within(tolerance)); + Assert.That(output.Results.CalculationResults[2].PipingDesignResults.BlighFactor, Is.EqualTo(90.000).Within(tolerance)); + Assert.That(output.Results.CalculationResults[3].PipingDesignResults.BlighFactor, Is.EqualTo(90.000).Within(tolerance)); + Assert.That(output.Results.CalculationResults[4].PipingDesignResults.BlighFactor, Is.EqualTo(7.041).Within(tolerance)); + Assert.That(output.Results.CalculationResults[5].PipingDesignResults.BlighFactor, Is.EqualTo(7.041).Within(tolerance)); + Assert.That(output.Results.CalculationResults[6].PipingDesignResults.BlighFactor, Is.EqualTo(90.000).Within(tolerance)); + Assert.That(output.Results.CalculationMessages, Has.Length.EqualTo(4)); + }); + Assert.Multiple(() => + { + Assert.That(output.Results.CalculationMessages[0].Message1, Does.Contain("no uplift")); + Assert.That(output.Results.CalculationMessages[1].Message1, Does.Contain("no uplift")); + Assert.That(output.Results.CalculationMessages[2].Message1, Does.Contain("no uplift")); + Assert.That(output.Results.CalculationMessages[3].Message1, Does.Contain("no uplift")); + }); } } \ No newline at end of file