Index: DamEngine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlInput.cs =================================================================== diff -u -r6191 -r6194 --- DamEngine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlInput.cs (.../FillDamFromXmlInput.cs) (revision 6191) +++ DamEngine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlInput.cs (.../FillDamFromXmlInput.cs) (revision 6194) @@ -21,15 +21,13 @@ using System; using System.Collections.Generic; -using System.IO; using System.Linq; using Deltares.DamEngine.Data.Design; using Deltares.DamEngine.Data.General; using Deltares.DamEngine.Data.General.Sensors; using Deltares.DamEngine.Data.General.TimeSeries; using Deltares.DamEngine.Data.Geometry; using Deltares.DamEngine.Data.Geotechnics; -using Deltares.DamEngine.Data.Standard.Logging; using Deltares.DamEngine.Interface.Properties; using Deltares.DamEngine.Io.XmlInput; using Location = Deltares.DamEngine.Data.General.Location; @@ -200,46 +198,19 @@ Data.General.TimeSeries.TimeSerie timeSerie = timeSerieCollection.AddNewSeries(inputTimeSerie.LocationId); timeSerie.ParameterId = inputTimeSerie.ParameterId; timeSerie.ForecastDateTime = inputTimeSerie.ForecastDateTime; - timeSerie.Type = inputTimeSerie.Type; timeSerie.StartDateTime = inputTimeSerie.StartDateTime; timeSerie.EndDateTime = inputTimeSerie.EndDateTime; timeSerie.MissVal = inputTimeSerie.MissVal; - timeSerie.LongName = inputTimeSerie.LongName; - timeSerie.StationName = inputTimeSerie.StationName; timeSerie.Units = inputTimeSerie.Units; - timeSerie.SourceOrganisation = inputTimeSerie.SourceOrganisation; - timeSerie.SourceSystem = inputTimeSerie.SourceSystem; - timeSerie.FileDescription = inputTimeSerie.FileDescription; - timeSerie.Region = inputTimeSerie.Region; - timeSerie.TimeStep.Multiplier = inputTimeSerie.TimeStep.Multiplier; - timeSerie.TimeStep.Divider = inputTimeSerie.TimeStep.Divider; - timeSerie.TimeStep.MultiplierSpecified = inputTimeSerie.TimeStep.MultiplierSpecified1; - timeSerie.TimeStep.DividerSpecified = inputTimeSerie.TimeStep.DividerSpecified1; - timeSerie.TimeStep.Unit = ConversionHelper.ConvertToTimeStepUnit(inputTimeSerie.TimeStep.TimeStepUnit); if (inputTimeSerie.Entries.TimeSerieEntry != null) { for (var i = 0; i < inputTimeSerie.Entries.TimeSerieEntry.Length; i++) { TimeSerieEntriesTimeSerieEntry entry = inputTimeSerie.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 - // }; - // } - var timeSerieEntry = new TimeSerieEntry { DateTime = entry.DateTime, Value = entry.Value - // BasisFileName = entry.BasisFileNameWMF, - // Flag = entry.Flagnietechtgebruikt, - // RelativeCalculationPathName = entry.RelativeCalculationPathName, - // StochastValue = stochastValue }; timeSerie.Entries.Add(timeSerieEntry); }