Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DamEngineIo/FillDamUiFromXmlOutputTests.cs =================================================================== diff -u -r6374 -r6405 --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DamEngineIo/FillDamUiFromXmlOutputTests.cs (.../FillDamUiFromXmlOutputTests.cs) (revision 6374) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DamEngineIo/FillDamUiFromXmlOutputTests.cs (.../FillDamUiFromXmlOutputTests.cs) (revision 6405) @@ -227,7 +227,7 @@ damProjectData.CalculationMessages = new List(); damProjectData.CalculationMessages.Add(new LogMessage(LogMessageType.Error, null, "Error 1")); damProjectData.CalculationMessages.Add(new LogMessage(LogMessageType.Error, null, "Error 2")); - damProjectData.CalculationMessages.Add(new LogMessage(LogMessageType.Error, null, "Error 3")); + damProjectData.CalculationMessages.Add(new LogMessage(LogMessageType.Warning, null, "Warning 1")); FillOutputTimeSeries(damProjectData); return damProjectData; } Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillDamUiFromXmlOutput.cs =================================================================== diff -u -r6374 -r6405 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillDamUiFromXmlOutput.cs (.../FillDamUiFromXmlOutput.cs) (revision 6374) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillDamUiFromXmlOutput.cs (.../FillDamUiFromXmlOutput.cs) (revision 6405) @@ -65,22 +65,20 @@ ); } - // Transfer calculation messages (only the errors) + // Transfer calculation messages if (output?.Results?.CalculationMessages != null) { damProjectData.CalculationMessages = new List(); - foreach (Message validationResult in output.Results.CalculationMessages) + for (var i = 0; i < output.Results.CalculationMessages.Length; i++) { - if (validationResult.MessageType == MessageMessageType.Error) + Message validationResult = output.Results.CalculationMessages[i]; + var logMessage = new LogMessage { - var logMessage = new LogMessage - { - MessageType = ConversionHelper.ConvertToMessageType(validationResult.MessageType), - Subject = null, - Message = validationResult.Message1 - }; - damProjectData.CalculationMessages.Add(logMessage); - } + MessageType = ConversionHelper.ConvertToMessageType(validationResult.MessageType), + Subject = null, + Message = validationResult.Message1 + }; + damProjectData.CalculationMessages.Add(logMessage); } } Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityCommonHelper.cs =================================================================== diff -u -r6404 -r6405 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityCommonHelper.cs (.../MacroStabilityCommonHelper.cs) (revision 6404) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityCommonHelper.cs (.../MacroStabilityCommonHelper.cs) (revision 6405) @@ -371,14 +371,14 @@ /// The macro stability output. /// Name of the file. /// The calculator. - /// The messages. + /// The error messages. public void PerformStabilityCalculation(MacroStabilityInput input, MacroStabilityOutput macroStabilityOutput, - string fileName, Calculator calculator, out List messages) + string fileName, Calculator calculator, out List errorMessages) { macroStabilityOutput.CalculationResult = CalculationResult.NoRun; macroStabilityOutput.StabilityOutputItems ??= []; - messages = new List(); + errorMessages = new List(); try { //string helperFile = fileName.Replace(".skx", ".testIn.xml"); @@ -388,17 +388,18 @@ string outputFileName = fileName.Replace(".skx", ".out.xml"); File.WriteAllText(outputFileName, outputAsXml); FillEngineFromMacroStabilityWrapperOutput.FillEngineDataWithResults(macroStabilityOutputKernel, macroStabilityOutput, - out messages); + out List allMessages); + errorMessages = allMessages.Where(logMessage => logMessage.MessageType == LogMessageType.Error).ToList(); } catch (Exception exceptionDuringCalculation) { macroStabilityOutput.CalculationResult = CalculationResult.UnexpectedError; - messages.Add(new LogMessage(LogMessageType.Error, null, exceptionDuringCalculation.Message)); + errorMessages.Add(new LogMessage(LogMessageType.Error, null, exceptionDuringCalculation.Message)); } if (macroStabilityOutput.CalculationResult != CalculationResult.UnexpectedError) { - StoreResultsAndWriteStixFile(input, macroStabilityOutput, fileName, messages); + StoreResultsAndWriteStixFile(input, macroStabilityOutput, fileName, errorMessages); } }