Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MultiCoreMacroStabilityTests.cs =================================================================== diff -u -r4908 -r4910 --- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MultiCoreMacroStabilityTests.cs (.../MultiCoreMacroStabilityTests.cs) (revision 4908) +++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MultiCoreMacroStabilityTests.cs (.../MultiCoreMacroStabilityTests.cs) (revision 4910) @@ -183,6 +183,7 @@ [TestCase(4, true)] [TestCase(16, true)] [TestCase(23, true)] + [TestCase(1, false)] [TestCase(4, false)] [TestCase(16, false)] [TestCase(23, false)] @@ -227,15 +228,15 @@ { // This test has to make sure that the results are the same as the single core version of this test // If the values change below, just change them. - Assert.That(output.Results.CalculationResults.Length, Is.EqualTo(9)); - Assert.That(output.Results.CalculationMessages.Length, Is.EqualTo(1762)); + Assert.That(output.Results.CalculationResults, Has.Length.EqualTo(9)); + Assert.That(output.Results.CalculationMessages, Has.Length.EqualTo(1762)); } else { // Note that all results are based on the single core version of this test that can be found at: // DesignBishopOptimizedSlopeAndShoulderAdaptionWithScenariosForHeadPL3CalculatesCorrect in MacroStabilityInwardsTests - Assert.That(output.Results.CalculationResults.Length, Is.EqualTo(12)); - Assert.That(output.Results.CalculationMessages.Length, Is.EqualTo(2477)); + Assert.That(output.Results.CalculationResults, Has.Length.EqualTo(18)); + Assert.That(output.Results.CalculationMessages, Has.Length.EqualTo(2477)); } int resultsFound = CheckLargeResultsSets.CheckResultsDesignBishopAdaptionWithScenariosForHeadPl3CalculatesCorrect( Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/CheckLargeResultsSets.cs =================================================================== diff -u -r4907 -r4910 --- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/CheckLargeResultsSets.cs (.../CheckLargeResultsSets.cs) (revision 4907) +++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/CheckLargeResultsSets.cs (.../CheckLargeResultsSets.cs) (revision 4910) @@ -66,7 +66,7 @@ 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"); + Assert.That(lastEntry.Value, Is.EqualTo(1.419).Within(cTolerance), "The computed safety factory is not correct"); resultsCount++; } @@ -174,28 +174,28 @@ if (designResult.BaseFileName.Equals("Loc(KR093_0013)_Sce(3)_Pro(segment_627_1D2-KR093_0013-2)")) { - Assert.That(designResult.StabilityDesignResults.SafetyFactor, Is.EqualTo(7.023).Within(tolerance)); + Assert.That(designResult.StabilityDesignResults.SafetyFactor, Is.EqualTo(6.991).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_1D2-KR093_0013-2)")) { - Assert.That(designResult.StabilityDesignResults.SafetyFactor, Is.EqualTo(5.968).Within(tolerance)); + Assert.That(designResult.StabilityDesignResults.SafetyFactor, Is.EqualTo(6.080).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_1D3-KR093_0013-3)")) { - Assert.That(designResult.StabilityDesignResults.SafetyFactor, Is.EqualTo(7.555).Within(tolerance)); + Assert.That(designResult.StabilityDesignResults.SafetyFactor, Is.EqualTo(7.990).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_1D3-KR093_0013-3)")) { - Assert.That(designResult.StabilityDesignResults.SafetyFactor, Is.EqualTo(6.477).Within(tolerance)); + Assert.That(designResult.StabilityDesignResults.SafetyFactor, Is.EqualTo(7.244).Within(tolerance)); Assert.That(designResult.ScenarioName, Is.EqualTo("4")); Assert.That(designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, Is.EqualTo(-0.37).Within(tol2Digits)); } @@ -230,14 +230,14 @@ if (designResult.BaseFileName.Equals("Loc(KR093_0018)_Sce(3)_Pro(segment_629_1D3-KR093_0018-3)")) { - Assert.That(designResult.StabilityDesignResults.SafetyFactor, Is.EqualTo(1.608).Within(tolerance)); + Assert.That(designResult.StabilityDesignResults.SafetyFactor, Is.EqualTo(1.404).Within(tolerance)); Assert.That(designResult.ScenarioName, Is.EqualTo("3")); Assert.That(designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, Is.EqualTo(-1.00).Within(tol2Digits)); } if (designResult.BaseFileName.Equals("Loc(KR093_0018)_Sce(4)_Pro(segment_629_1D3-KR093_0018-3)")) { - Assert.That(designResult.StabilityDesignResults.SafetyFactor, Is.EqualTo(1.397).Within(tolerance)); + Assert.That(designResult.StabilityDesignResults.SafetyFactor, Is.EqualTo(1.404).Within(tolerance)); Assert.That(designResult.ScenarioName, Is.EqualTo("4")); Assert.That(designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, Is.EqualTo(-0.37).Within(tol2Digits)); } @@ -272,14 +272,14 @@ if (designResult.BaseFileName.Equals("Loc(KR093_0019)_Sce(3)_Pro(segment_629_1D3-KR093_0019-3)")) { - Assert.That(designResult.StabilityDesignResults.SafetyFactor, Is.EqualTo(4.432).Within(tolerance)); + Assert.That(designResult.StabilityDesignResults.SafetyFactor, Is.EqualTo(4.420).Within(tolerance)); Assert.That(designResult.ScenarioName, Is.EqualTo("3")); Assert.That(designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, Is.EqualTo(-1.03).Within(tol2Digits)); } if (designResult.BaseFileName.Equals("Loc(KR093_0019)_Sce(4)_Pro(segment_629_1D3-KR093_0019-3)")) { - Assert.That(designResult.StabilityDesignResults.SafetyFactor, Is.EqualTo(3.745).Within(tolerance)); + Assert.That(designResult.StabilityDesignResults.SafetyFactor, Is.EqualTo(3.952).Within(tolerance)); Assert.That(designResult.ScenarioName, Is.EqualTo("4")); Assert.That(designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, Is.EqualTo(-0.37).Within(tol2Digits)); }