Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Service/MacroStabilityInwardsCalculationService.cs =================================================================== diff -u -r7a711dc46ad47792f09682dce864494fe150e721 -rfff1d95ef2a08f34f16ac3f7870acc0a0c68eb83 --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Service/MacroStabilityInwardsCalculationService.cs (.../MacroStabilityInwardsCalculationService.cs) (revision 7a711dc46ad47792f09682dce864494fe150e721) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Service/MacroStabilityInwardsCalculationService.cs (.../MacroStabilityInwardsCalculationService.cs) (revision fff1d95ef2a08f34f16ac3f7870acc0a0c68eb83) @@ -140,26 +140,29 @@ } else { + if (macroStabilityInwardsResult.CalculationMessages.Any()) + { + CalculationServiceHelper.LogMessagesAsWarning(new[] + { + Resources.MacroStabilityInwardsCalculationService_Calculate_Warnings_in_MacroStabilityInwards_calculation + Environment.NewLine + + macroStabilityInwardsResult.CalculationMessages + .Where(cm => cm.ResultType == UpliftVanKernelMessageType.Warning) + .Aggregate(string.Empty, (current, logMessage) => current + $"* {logMessage.Message}{Environment.NewLine}").Trim() + }); + } + calculation.Output = new MacroStabilityInwardsOutput( MacroStabilityInwardsSlidingCurveConverter.Convert(macroStabilityInwardsResult.SlidingCurveResult), MacroStabilityInwardsSlipPlaneUpliftVanConverter.Convert(macroStabilityInwardsResult.CalculationGridResult), new MacroStabilityInwardsOutput.ConstructionProperties { - FactorOfStability = macroStabilityInwardsResult.FactorOfStability, ZValue = macroStabilityInwardsResult.ZValue, ForbiddenZonesXEntryMin = macroStabilityInwardsResult.ForbiddenZonesXEntryMin, ForbiddenZonesXEntryMax = macroStabilityInwardsResult.ForbiddenZonesXEntryMax + FactorOfStability = macroStabilityInwardsResult.FactorOfStability, + ZValue = macroStabilityInwardsResult.ZValue, + ForbiddenZonesXEntryMin = macroStabilityInwardsResult.ForbiddenZonesXEntryMin, + ForbiddenZonesXEntryMax = macroStabilityInwardsResult.ForbiddenZonesXEntryMax }); } - if (macroStabilityInwardsResult.CalculationMessages.Any(cm => cm.ResultType == UpliftVanKernelMessageType.Warning)) - { - CalculationServiceHelper.LogMessagesAsWarning(new[] - { - Resources.MacroStabilityInwardsCalculationService_Calculate_Warnings_in_MacroStabilityInwards_calculation + Environment.NewLine + - macroStabilityInwardsResult.CalculationMessages - .Where(cm => cm.ResultType == UpliftVanKernelMessageType.Warning) - .Aggregate(string.Empty, (current, logMessage) => current + $"* {logMessage.Message}{Environment.NewLine}").Trim() - }); - } - CalculationServiceHelper.LogCalculationEnd(); }