Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/CheckLargeResultsSets.cs =================================================================== diff -u -r4929 -r5022 --- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/CheckLargeResultsSets.cs (.../CheckLargeResultsSets.cs) (revision 4929) +++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/CheckLargeResultsSets.cs (.../CheckLargeResultsSets.cs) (revision 5022) @@ -361,7 +361,7 @@ { Assert.Multiple(() => { - Assert.That(designResult.StabilityDesignResults.SafetyFactor, Is.EqualTo(1.752).Within(tolerance)); + Assert.That(designResult.StabilityDesignResults.SafetyFactor, Is.EqualTo(1.312).Within(tolerance)); Assert.That(designResult.ScenarioName, Is.EqualTo("3")); Assert.That(designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, Is.EqualTo(-1.00).Within(tol2Digits)); }); @@ -372,7 +372,7 @@ { Assert.Multiple(() => { - Assert.That(designResult.StabilityDesignResults.SafetyFactor, Is.EqualTo(1.270).Within(tolerance)); + Assert.That(designResult.StabilityDesignResults.SafetyFactor, Is.EqualTo(1.291).Within(tolerance)); Assert.That(designResult.ScenarioName, Is.EqualTo("4")); Assert.That(designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, Is.EqualTo(-0.52).Within(tol2Digits)); }); @@ -383,7 +383,7 @@ { Assert.Multiple(() => { - Assert.That(designResult.StabilityDesignResults.SafetyFactor, Is.EqualTo(1.409).Within(tolerance)); + Assert.That(designResult.StabilityDesignResults.SafetyFactor, Is.EqualTo(1.231).Within(tolerance)); Assert.That(designResult.ScenarioName, Is.EqualTo("3")); Assert.That(designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, Is.EqualTo(-1.00).Within(tol2Digits)); }); @@ -394,7 +394,7 @@ { Assert.Multiple(() => { - Assert.That(designResult.StabilityDesignResults.SafetyFactor, Is.EqualTo(1.224).Within(tolerance)); + Assert.That(designResult.StabilityDesignResults.SafetyFactor, Is.EqualTo(1.231).Within(tolerance)); Assert.That(designResult.ScenarioName, Is.EqualTo("4")); Assert.That(designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, Is.EqualTo(-0.37).Within(tol2Digits)); }); @@ -449,7 +449,7 @@ { Assert.Multiple(() => { - Assert.That(designResult.StabilityDesignResults.SafetyFactor, Is.EqualTo(1.552).Within(tolerance)); + Assert.That(designResult.StabilityDesignResults.SafetyFactor, Is.EqualTo(1.333).Within(tolerance)); Assert.That(designResult.ScenarioName, Is.EqualTo("3")); Assert.That(designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, Is.EqualTo(-1.03).Within(tol2Digits)); }); Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MultiCoreMacroStabilityTests.cs =================================================================== diff -u -r4929 -r5022 --- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MultiCoreMacroStabilityTests.cs (.../MultiCoreMacroStabilityTests.cs) (revision 4929) +++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MultiCoreMacroStabilityTests.cs (.../MultiCoreMacroStabilityTests.cs) (revision 5022) @@ -230,7 +230,7 @@ // 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, Has.Length.EqualTo(9)); - Assert.That(output.Results.CalculationMessages, Has.Length.EqualTo(1762)); + Assert.That(output.Results.CalculationMessages, Has.Length.EqualTo(1758)); }); } else @@ -240,7 +240,7 @@ // 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, Has.Length.EqualTo(18)); - Assert.That(output.Results.CalculationMessages, Has.Length.EqualTo(3411)); + Assert.That(output.Results.CalculationMessages, Has.Length.EqualTo(3278)); }); } @@ -252,7 +252,7 @@ } else { - Assert.That(resultsFound, Is.EqualTo(15)); + Assert.That(resultsFound, Is.EqualTo(14)); CheckLargeResultsSets.CheckBasicResultsBasedOnReferenceResultsFile( "TestFiles\\DesignBishopAdaptionWithScenariosForHeadPl3_Results.xml", outputFileName, output.Results.CalculationResults); Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MacroStabilityInwardsTests.cs =================================================================== diff -u -r4999 -r5022 --- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MacroStabilityInwardsTests.cs (.../MacroStabilityInwardsTests.cs) (revision 4999) +++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MacroStabilityInwardsTests.cs (.../MacroStabilityInwardsTests.cs) (revision 5022) @@ -432,7 +432,7 @@ // Calculation Result Assert.That(ConversionHelper.ConvertToCalculationResult(result.CalculationResult), Is.EqualTo(CalculationResult.Succeeded)); // SafetyFactor=1.814 - Assert.That(result.StabilityDesignResults.SafetyFactor, Is.EqualTo(1.814).Within(tolerance)); + Assert.That(result.StabilityDesignResults.SafetyFactor, Is.EqualTo(1.816).Within(tolerance)); result = output.Results.CalculationResults[1]; Assert.That(result.LocationName, Is.EqualTo("6-4-3-A-1-C")); @@ -571,10 +571,10 @@ Assert.Multiple(() => { Assert.That(output.Results.CalculationResults.Length, Is.EqualTo(18)); - Assert.That(output.Results.CalculationMessages.Length, Is.EqualTo(3411)); + Assert.That(output.Results.CalculationMessages.Length, Is.EqualTo(3278)); int resultsFound = CheckLargeResultsSets.CheckResultsDesignBishopAdaptionWithScenariosForHeadPl3CalculatesCorrect( output.Results.CalculationResults); - Assert.That(resultsFound, Is.EqualTo(15)); + Assert.That(resultsFound, Is.EqualTo(14)); }); }