Index: DamEngine/trunk/src/Deltares.DamEngine.Interface/FillXmlOutputFromDam.cs
===================================================================
diff -u -r6120 -r6194
--- DamEngine/trunk/src/Deltares.DamEngine.Interface/FillXmlOutputFromDam.cs	(.../FillXmlOutputFromDam.cs)	(revision 6120)
+++ DamEngine/trunk/src/Deltares.DamEngine.Interface/FillXmlOutputFromDam.cs	(.../FillXmlOutputFromDam.cs)	(revision 6194)
@@ -27,7 +27,7 @@
 using Deltares.DamEngine.Data.Standard.Logging;
 using Deltares.DamEngine.Io.XmlOutput;
 using DesignResult = Deltares.DamEngine.Io.XmlOutput.DesignResult;
-using TimeSerie = Deltares.DamEngine.Io.XmlOutput.TimeSerie;
+using TimeSerie = Deltares.DamEngine.Io.XmlOutput.TimeSerieOutput;
 using UpliftSituation = Deltares.DamEngine.Data.General.UpliftSituation;
 
 namespace Deltares.DamEngine.Interface;
@@ -465,50 +465,22 @@
         foreach (Data.General.TimeSeries.TimeSerie damTimeSerie in outputTimeSerieCollection.Series)
         {
             var outputTimeSerie = new TimeSerie();
-            outputTimeSerie.Entries = new TimeSerieEntries();
-            outputTimeSerie.Entries.TimeSerieEntry = new TimeSerieEntriesTimeSerieEntry[damTimeSerie.Entries.Count];
-            outputTimeSerie.TimeStep = new TimeSerieTimeStep();
+            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.Type = damTimeSerie.Type;
             outputTimeSerie.StartDateTime = damTimeSerie.StartDateTime;
             outputTimeSerie.EndDateTime = damTimeSerie.EndDateTime;
             outputTimeSerie.MissVal = damTimeSerie.MissVal;
-            outputTimeSerie.LongName = damTimeSerie.LongName;
-            outputTimeSerie.StationName = damTimeSerie.StationName;
             outputTimeSerie.Units = damTimeSerie.Units;
-            outputTimeSerie.SourceOrganisation = damTimeSerie.SourceOrganisation;
-            outputTimeSerie.SourceSystem = damTimeSerie.SourceSystem;
-            outputTimeSerie.FileDescription = damTimeSerie.FileDescription;
-            outputTimeSerie.Region = damTimeSerie.Region;
-            outputTimeSerie.TimeStep.Multiplier = damTimeSerie.TimeStep.Multiplier;
-            outputTimeSerie.TimeStep.Divider = damTimeSerie.TimeStep.Divider;
-            outputTimeSerie.TimeStep.MultiplierSpecified1 = damTimeSerie.TimeStep.MultiplierSpecified;
-            outputTimeSerie.TimeStep.DividerSpecified1 = damTimeSerie.TimeStep.DividerSpecified;
-            outputTimeSerie.TimeStep.TimeStepUnit = ConversionHelper.ConvertToInputTimeStepUnit(damTimeSerie.TimeStep.Unit);
             var timeSerieEntryIndex = 0;
             foreach (TimeSerieEntry timestepEntry in damTimeSerie.Entries)
             {
-                // TimeSerieEntriesTimeSerieEntryStochastValue stochastValue = null;
-                // if (timestepEntry.StochastValue != null)
-                // {
-                //     stochastValue = new TimeSerieEntriesTimeSerieEntryStochastValue
-                //     {
-                //         Distribution = timestepEntry.StochastValue.Distribution,
-                //         Mean = timestepEntry.StochastValue.Mean,
-                //         StandardDeviation = timestepEntry.StochastValue.StandardDeviation
-                //     };
-                // }
-
-                var timeStep = new TimeSerieEntriesTimeSerieEntry
+                var timeStep = new TimeSerieOutputEntriesTimeSerieEntryOutput
                 {
                     DateTime = timestepEntry.DateTime,
                     Value = timestepEntry.Value
-                    // BasisFileNameWMF = timestepEntry.BasisFileName,
-                    // Flagnietechtgebruikt = timestepEntry.Flag,
-                    // RelativeCalculationPathName = timestepEntry.RelativeCalculationPathName,
-                    // StochastValue = stochastValue
                 };
                 if (timestepEntry.BishopCircleX.HasValue && timestepEntry.BishopCircleZ.HasValue && timestepEntry.BishopRadius.HasValue)
                 {
@@ -523,10 +495,9 @@
                         Radius = (double) timestepEntry.BishopRadius
                     };
                 }
-                outputTimeSerie.Entries.TimeSerieEntry[timeSerieEntryIndex] = timeStep;
+                outputTimeSerie.Entries.TimeSerieEntryOutput[timeSerieEntryIndex] = timeStep;
                 timeSerieEntryIndex++;
             }
-
             outputTimeSeries[timeSerieIndex] = outputTimeSerie;
             timeSerieIndex++;
         }