Index: DamEngine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlInput.cs =================================================================== diff -u -r1554 -r1559 --- DamEngine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlInput.cs (.../FillDamFromXmlInput.cs) (revision 1554) +++ DamEngine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlInput.cs (.../FillDamFromXmlInput.cs) (revision 1559) @@ -81,61 +81,16 @@ TransferSoilProfiles2D(input.SoilProfiles2D, dike.SoilProfiles2D, dike.SoilList); TransferSegments(input.Segments, damProjectData.Segments); TransferLocations(input.ProjectPath ,input.Locations, dike.Locations, dike.SurfaceLines2, damProjectData.Segments); - TransferInputTimeSeries(input.OperationalInputTimeSeries, dike); + if (input.OperationalInputTimeSeries != null) + { + dike.InputTimeSerieCollection = new TimeSerieCollection(); + FillDamFromXmlCommon.TransferTimeSeries(input.OperationalInputTimeSeries, dike.InputTimeSerieCollection); + } PostProcess(damProjectData); return damProjectData; } - private static void TransferInputTimeSeries(TimeSerie[] inputOperationalInputTimeSeries, Dike dike) - { - if (inputOperationalInputTimeSeries != null) - { - dike.InputTimeSerieCollection = new TimeSerieCollection(); - foreach (var inputTimeSerie in inputOperationalInputTimeSeries) - { - var timeSerie = dike.InputTimeSerieCollection.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); - for (int i = 0; i < inputTimeSerie.Entries.TimeSerieEntry.Length; i++) - { - var entry = inputTimeSerie.Entries.TimeSerieEntry[i]; - Stochast stochastValue = new Stochast() - { - Distribution = entry.StochastValue.Distribution, - Mean = entry.StochastValue.Mean, - StandardDeviation = entry.StochastValue.StandardDeviation - }; - TimeSerieEntry timeSerieEntry = new TimeSerieEntry() - { - DateTime = entry.DateTime, - Value = entry.Value, - BasisFileName = entry.BasisFileNameWMF, - Flag = entry.Flagnietechtgebruikt, - RelativeCalculationPathName = entry.RelativeCalculationPathName, - StochastValue = stochastValue - }; - timeSerie.Entries.Add(timeSerieEntry); - } - } - } - } private static List TransferAquiferSoils(InputAquiferSoil[] inputAquiferSoils, SoilList soilList) {