Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MacroStabilityInwardsTests.cs =================================================================== diff -u -r5823 -r5831 --- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MacroStabilityInwardsTests.cs (.../MacroStabilityInwardsTests.cs) (revision 5823) +++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MacroStabilityInwardsTests.cs (.../MacroStabilityInwardsTests.cs) (revision 5831) @@ -943,9 +943,9 @@ [TestCase("DWP_2", "SlopeAdaptionBeforeShoulderAdaption", CalculationResult.RunFailed, 1.5, 1.348, 14, "After height adaption ditch does not fit inside surfaceline anymore.")] [TestCase("DWP_2", "OptimizedSlopeAndShoulderAdaption", CalculationResult.RunFailed, 1.5, 1.072, 17)] [TestCase("DWP_13", "OptimizedSlopeAndShoulderAdaption", CalculationResult.RunFailed, 1.5, 0.943, 23, "The characteristic points of the surfaceline are not ascending in X-direction.")] - [TestCase("DWP_10", "OptimizedSlopeAndShoulderAdaption", CalculationResult.RunFailed, 1.5, 0.0, 7, "Location 'DWP_10', subsoil scenario 'DWP_10.stix', design scenario '3': The calculation failed with error message 'The design was not successful. The design was not successful. Stability calculation failed.'")] + [TestCase("DWP_10", "OptimizedSlopeAndShoulderAdaption", CalculationResult.RunFailed, 1.5, 0.0, 7, "Location 'DWP_10', subsoil scenario 'DWP_10.stix', design scenario '3': The calculation failed with error message 'The design was not successful. The design was not successful. Stability calculation failed.'", "The design was not successful. Stability calculation failed.")] public void GivenTutorialDesign_WhenSpecifiedLocationRunWithGeometryAdaption_ThenGivesExpectedResults(string locationId, string designMethod, - CalculationResult calculationResult, double requiredSafetyFactor, double actualSafetyFactor, int iterationCount, string errorMessage = "") + CalculationResult calculationResult, double requiredSafetyFactor, double actualSafetyFactor, int iterationCount, string errorMessage = "", string firstStabilityMessage = "") { // Create xml with Tutorial project // Select location DWP_1 @@ -980,9 +980,16 @@ { Assert.That(output.Results.CalculationResults[0].StabilityDesignResults.SafetyFactor, Is.GreaterThanOrEqualTo(requiredSafetyFactor)); } - else if (!errorMessage.Equals("")) + else { - Assert.That(output.Results.CalculationMessages.Last().Message1, Does.Contain(errorMessage)); + if (!errorMessage.Equals("")) + { + Assert.That(output.Results.CalculationMessages.Last().Message1, Does.Contain(errorMessage)); + } + if (!firstStabilityMessage.Equals("")) + { + Assert.That(output.Results.CalculationResults[0].StabilityDesignResults.ResultMessage, Does.Contain(firstStabilityMessage)); + } } Assert.That(output.Results.CalculationResults[0].StabilityDesignResults.SafetyFactor, Is.EqualTo(actualSafetyFactor).Within(tolerance)); Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityInwards/MacroStabilityInwardsKernelWrapper.cs =================================================================== diff -u -r5823 -r5831 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityInwards/MacroStabilityInwardsKernelWrapper.cs (.../MacroStabilityInwardsKernelWrapper.cs) (revision 5823) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityInwards/MacroStabilityInwardsKernelWrapper.cs (.../MacroStabilityInwardsKernelWrapper.cs) (revision 5831) @@ -270,6 +270,11 @@ MacroStabilityCommonHelper.FillDesignResult(macroStabilityOutputItem, designResult); designResult.StabilityDesignResults.NumberOfIterations = lastIterationIndex; designResult.StabilityDesignResults.UpliftSituation = macroStabilityOutput.UpliftSituation; + if (macroStabilityOutputItem.CalculationResult != CalculationResult.Succeeded) + { + var subSoilScenario = damKernelInput.SubSoilScenario; + designResult.StabilityDesignResults.ResultMessage = designScenario.GetResultMessage(subSoilScenario.SoilProfile1D, subSoilScenario.SoilProfile2D); + } designResults.Add(designResult); } @@ -332,6 +337,11 @@ MacroStabilityCommonHelper.FillDesignResult(macroStabilityOutputItem, overallResult); overallResult.StabilityDesignResults.UpliftSituation = macroStabilityOutput.UpliftSituation; overallResult.StabilityDesignResults.StabilityModelType = MStabModelType.BishopUpliftVan; + if (macroStabilityOutputItem.CalculationResult != CalculationResult.Succeeded) + { + var subSoilScenario = damKernelInput.SubSoilScenario; + overallResult.StabilityDesignResults.ResultMessage = designScenario.GetResultMessage(subSoilScenario.SoilProfile1D, subSoilScenario.SoilProfile2D); + } designResults.Add(overallResult); } // If not both Bishop and Uplift-Van results are available, this is unexpected. @@ -340,6 +350,8 @@ DesignResult overallResult = MacroStabilityCommonHelper.NewDesignResult(damKernelInput, designScenario); overallResult.StabilityDesignResults.StabilityModelType = MStabModelType.BishopUpliftVan; overallResult.CalculationResult = CalculationResult.UnexpectedError; + var subSoilScenario = damKernelInput.SubSoilScenario; + overallResult.StabilityDesignResults.ResultMessage = designScenario.GetResultMessage(subSoilScenario.SoilProfile1D, subSoilScenario.SoilProfile2D); designResults.Add(overallResult); } }