Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillXmlOutputFromDamUi.cs =================================================================== diff -u -r6854 -r6855 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillXmlOutputFromDamUi.cs (.../FillXmlOutputFromDamUi.cs) (revision 6854) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillXmlOutputFromDamUi.cs (.../FillXmlOutputFromDamUi.cs) (revision 6855) @@ -39,6 +39,11 @@ output.Results = new OutputResults(); output.Results.CalculationMessages = new Message[damProjectData.CalculationMessages.Count]; TransferOutputCalculationMessages(damProjectData.CalculationMessages, output.Results); + if (damProjectData.OutputTimeSerieCollection != null) + { + output.Results.OperationalOutputTimeSeries = new TimeSerieOutput[damProjectData.OutputTimeSerieCollection.Series.Count]; + TransferOutputTimeSeries(damProjectData.OutputTimeSerieCollection, output.Results.OperationalOutputTimeSeries); + } if (damProjectData.DesignCalculations != null && damProjectData.DesignCalculations.Count > 0) { @@ -58,6 +63,38 @@ return output; } + private static void TransferOutputTimeSeries(TimeSerieCollection outputTimeSerieCollection, TimeSerieOutput[] outputTimeSeries) + { + var timeSerieIndex = 0; + foreach (TimeSerie damTimeSerie in outputTimeSerieCollection.Series) + { + var outputTimeSerie = new TimeSerieOutput(); + outputTimeSerie.Entries = new TimeSerieOutputEntries(); + outputTimeSerie.Entries.TimeSerieEntryOutput = new TimeSerieOutputEntriesTimeSerieEntryOutput[damTimeSerie.Entries.Count]; + outputTimeSerie.LocationId = damTimeSerie.LocationId; + outputTimeSerie.ParameterId = damTimeSerie.ParameterId; + outputTimeSerie.ForecastDateTime = damTimeSerie.ForecastDateTime; + outputTimeSerie.StartDateTime = damTimeSerie.StartDateTime; + outputTimeSerie.EndDateTime = damTimeSerie.EndDateTime; + outputTimeSerie.MissVal = damTimeSerie.MissVal; + outputTimeSerie.Units = damTimeSerie.Units; + var timeSerieEntryIndex = 0; + foreach (TimeSerieEntry timestepEntry in damTimeSerie.Entries) + { + var timeStep = new TimeSerieOutputEntriesTimeSerieEntryOutput + { + DateTime = timestepEntry.DateTime, + Value = timestepEntry.Value + }; + outputTimeSerie.Entries.TimeSerieEntryOutput[timeSerieEntryIndex] = timeStep; + timeSerieEntryIndex++; + } + + outputTimeSeries[timeSerieIndex] = outputTimeSerie; + timeSerieIndex++; + } + } + private static void TransferOutputCalculationMessages(List calculationMessages, OutputResults outputResults) { //var calculationMessages = damProjectData.CalculationMessages;