Index: DamEngine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlOutput.cs =================================================================== diff -u -r6109 -r6194 --- DamEngine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlOutput.cs (.../FillDamFromXmlOutput.cs) (revision 6109) +++ DamEngine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlOutput.cs (.../FillDamFromXmlOutput.cs) (revision 6194) @@ -28,7 +28,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.Io.XmlOutput.UpliftSituation; namespace Deltares.DamEngine.Interface; @@ -76,44 +76,17 @@ Data.General.TimeSeries.TimeSerie timeSerie = outputTimeSerieCollection.AddNewSeries(outputTimeSerie.LocationId); timeSerie.ParameterId = outputTimeSerie.ParameterId; timeSerie.ForecastDateTime = outputTimeSerie.ForecastDateTime; - timeSerie.Type = outputTimeSerie.Type; timeSerie.StartDateTime = outputTimeSerie.StartDateTime; timeSerie.EndDateTime = outputTimeSerie.EndDateTime; timeSerie.MissVal = outputTimeSerie.MissVal; - timeSerie.LongName = outputTimeSerie.LongName; - timeSerie.StationName = outputTimeSerie.StationName; timeSerie.Units = outputTimeSerie.Units; - timeSerie.SourceOrganisation = outputTimeSerie.SourceOrganisation; - timeSerie.SourceSystem = outputTimeSerie.SourceSystem; - timeSerie.FileDescription = outputTimeSerie.FileDescription; - timeSerie.Region = outputTimeSerie.Region; - timeSerie.TimeStep.Multiplier = outputTimeSerie.TimeStep.Multiplier; - timeSerie.TimeStep.Divider = outputTimeSerie.TimeStep.Divider; - timeSerie.TimeStep.MultiplierSpecified = outputTimeSerie.TimeStep.MultiplierSpecified1; - timeSerie.TimeStep.DividerSpecified = outputTimeSerie.TimeStep.DividerSpecified1; - timeSerie.TimeStep.Unit = ConversionHelper.ConvertToTimeStepUnit(outputTimeSerie.TimeStep.TimeStepUnit); - for (var i = 0; i < outputTimeSerie.Entries.TimeSerieEntry.Length; i++) + for (var i = 0; i < outputTimeSerie.Entries.TimeSerieEntryOutput.Length; i++) { - TimeSerieEntriesTimeSerieEntry entry = outputTimeSerie.Entries.TimeSerieEntry[i]; - // Stochast stochastValue = null; - // if (entry.StochastValue != null) - // { - // stochastValue = new Stochast - // { - // Distribution = entry.StochastValue.Distribution, - // Mean = entry.StochastValue.Mean, - // StandardDeviation = entry.StochastValue.StandardDeviation - // }; - // } - + TimeSerieOutputEntriesTimeSerieEntryOutput entry = outputTimeSerie.Entries.TimeSerieEntryOutput[i]; var timeSerieEntry = new TimeSerieEntry { DateTime = entry.DateTime, Value = entry.Value - // BasisFileName = entry.BasisFileNameWMF, - // Flag = entry.Flagnietechtgebruikt, - // RelativeCalculationPathName = entry.RelativeCalculationPathName, - // StochastValue = stochastValue }; if (entry.BishopCalculatedSlipPlane != null) {