Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/DikesDesign/DesignCalculatorShoulderPerPoint.cs =================================================================== diff -u -r1377 -r1389 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators/DikesDesign/DesignCalculatorShoulderPerPoint.cs (.../DesignCalculatorShoulderPerPoint.cs) (revision 1377) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/DikesDesign/DesignCalculatorShoulderPerPoint.cs (.../DesignCalculatorShoulderPerPoint.cs) (revision 1389) @@ -30,6 +30,7 @@ using Deltares.DamEngine.Data.General.Results; using Deltares.DamEngine.Data.Geometry; using Deltares.DamEngine.Data.Geotechnics; +using Deltares.DamEngine.Data.Standard.Calculation; using Deltares.DamEngine.Data.Standard.Logging; namespace Deltares.DamEngine.Calculators.DikesDesign @@ -150,6 +151,7 @@ string resultMessage = exception.Message; kernelWrapper.PostProcess(damKernelInput, kernelDataOutput, designScenario, resultMessage, out designResults); ChangeSafetyFactor(designResults, -1); + ChangeCalculationResult(designResults, CalculationResult.RunFailed); throw new DesignCalculatorException(Resources.DesignUnsuccessful + " " + resultMessage); } finally @@ -163,13 +165,17 @@ private static void ChangeSafetyFactor(List designResults, double safetyFactor) { - designResults[0].SafetyFactor = 1; + foreach (var designResult in designResults) + { + designResult.SafetyFactor = safetyFactor; + } + } + private static void ChangeCalculationResult(List designResults, CalculationResult calculationResult) + { foreach (var designResult in designResults) { - var factor = designResult.SafetyFactor; - factor = safetyFactor; - designResult.SafetyFactor = factor; + designResult.CalculationResult = calculationResult; } } Index: DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/PipingSellmeijerVnkTests.cs =================================================================== diff -u -r1363 -r1389 --- DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/PipingSellmeijerVnkTests.cs (.../PipingSellmeijerVnkTests.cs) (revision 1363) +++ DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/PipingSellmeijerVnkTests.cs (.../PipingSellmeijerVnkTests.cs) (revision 1389) @@ -147,7 +147,7 @@ Assert.IsNotNull(outputString); var output = DamXmlSerialization.LoadOutputFromXmlString(outputString); - Assert.AreEqual(CalculationResult.Succeeded, ConversionHelper.ConvertToCalculationResult(output.Results.CalculationResults.DesignResults[0].CalculationResult)); + Assert.AreEqual(CalculationResult.RunFailed, ConversionHelper.ConvertToCalculationResult(output.Results.CalculationResults.DesignResults[0].CalculationResult)); // expected value = -1 because exception was raised for the shoulder length Assert.AreEqual(-1.0, output.Results.CalculationResults.DesignResults[0].PipingDesignResults.SellmeijerVnkFactor, tolerance); Assert.AreEqual("The new shoulder length is too large to fit in the current surface line.",