Index: DamEngine/trunk/src/Deltares.DamEngine.Interface/FillXmlOutputFromDam.cs =================================================================== diff -u -r1220 -r1388 --- DamEngine/trunk/src/Deltares.DamEngine.Interface/FillXmlOutputFromDam.cs (.../FillXmlOutputFromDam.cs) (revision 1220) +++ DamEngine/trunk/src/Deltares.DamEngine.Interface/FillXmlOutputFromDam.cs (.../FillXmlOutputFromDam.cs) (revision 1388) @@ -20,6 +20,7 @@ // All rights reserved. using Deltares.DamEngine.Data.General; +using Deltares.DamEngine.Data.Standard.Logging; using Deltares.DamEngine.Io.XmlOutput; namespace Deltares.DamEngine.Interface @@ -55,13 +56,12 @@ Results = new OutputResults { // Calculation messages - // Were do these come from? - CalculationMessages = new Message[0], + CalculationMessages = new Message[damProjectData.CalculationMessages.Count], // Actual results CalculationResults = new CalculationResults() } }; - + CreateCalculationMessages(damProjectData, output); CreateDesignResultsOutput(damProjectData, output); CreateLocationResultsOutput(damProjectData, output); return output; @@ -100,6 +100,10 @@ designResultCount++; } } + } + + private static void CreateCalculationMessages(DamProjectData damProjectData, Output output) + { var calculationMessages = damProjectData.CalculationMessages; if (calculationMessages != null) { @@ -108,9 +112,16 @@ { var message = new Message { - MessageType = ConversionHelper.ConvertToInputMessageType(calculationMessages[i].MessageType), - Message1 = calculationMessages[i].Message + MessageType = ConversionHelper.ConvertToInputMessageType(calculationMessages[i].MessageType) }; + if (calculationMessages[i].Subject != null) + { + message.Message1 = calculationMessages[i].Subject + ": " + calculationMessages[i].Message; + } + else + { + message.Message1 = calculationMessages[i].Message; + } output.Results.CalculationMessages[i] = message; } } Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/DikesAssessmentRegional/RegionalScenariosCalculation.cs =================================================================== diff -u -r1372 -r1388 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators/DikesAssessmentRegional/RegionalScenariosCalculation.cs (.../RegionalScenariosCalculation.cs) (revision 1372) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/DikesAssessmentRegional/RegionalScenariosCalculation.cs (.../RegionalScenariosCalculation.cs) (revision 1388) @@ -73,6 +73,14 @@ public List Execute(DamProjectData aDamProjectData) { damProjectData = aDamProjectData; + if (damProjectData.CalculationMessages == null) + { + damProjectData.CalculationMessages = new List(); + } + else + { + damProjectData.CalculationMessages.Clear(); + } maxCalculationCores = damProjectData.MaxCalculationCores; mStabParameters = damProjectData.DamProjectCalculationSpecification.CurrentSpecification.FailureMechanismParametersMStab.MStabParameters; pipingModelType = damProjectData.DamProjectCalculationSpecification.CurrentSpecification.PipingModelType; @@ -84,7 +92,7 @@ evaluationJob = damProjectData.GetEvaluationJob(); Run(); evaluationJob.AttachResults(aDamProjectData.LocationJobs); - return new List(); + return damProjectData.CalculationMessages; } #region ICalculation Members @@ -673,6 +681,7 @@ private void SendMessage(LogMessage logMessage) { + damProjectData.CalculationMessages.Add(logMessage); if (sendMessageDelegate != null) { sendMessageDelegate(logMessage);