Index: DamEngine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlInput.cs
===================================================================
diff -u -r1563 -r1564
--- DamEngine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlInput.cs	(.../FillDamFromXmlInput.cs)	(revision 1563)
+++ DamEngine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlInput.cs	(.../FillDamFromXmlInput.cs)	(revision 1564)
@@ -80,59 +80,59 @@
             TransferSoilProfiles1D(input.SoilProfiles1D, dike.SoilProfiles, dike.SoilList);
             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);
+            TransferLocations(input.ProjectPath, input.Locations, dike.Locations, dike.SurfaceLines2, damProjectData.Segments);
+            if (input.OperationalInputTimeSeries != null)
+            {
+                dike.InputTimeSerieCollection = new TimeSerieCollection();
+                TransferInputTimeSeries(input.OperationalInputTimeSeries, dike.InputTimeSerieCollection);
+            }
             PostProcess(damProjectData);
 
             return damProjectData;
         }
 
-        private static void TransferInputTimeSeries(TimeSerie[] inputOperationalInputTimeSeries, Dike dike)
+        private static void TransferInputTimeSeries(TimeSerie[] inputOperationalInputTimeSeries, TimeSerieCollection timeSerieCollection)
         {
-            if (inputOperationalInputTimeSeries != null)
+            foreach (var inputTimeSerie in inputOperationalInputTimeSeries)
             {
-                dike.InputTimeSerieCollection = new TimeSerieCollection();
-                foreach (var inputTimeSerie in inputOperationalInputTimeSeries)
+                var 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);
+                for (int i = 0; i < inputTimeSerie.Entries.TimeSerieEntry.Length; i++)
                 {
-                    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()
                     {
-                        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);
-                    }
+                        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);
                 }
             }
         }
@@ -416,7 +416,7 @@
             surfaceLine.Geometry.SyncCalcPoints();
         }
 
-        private static void TransferLocations(string projectPath, Io.XmlInput.Location[] inputLocations, 
+        private static void TransferLocations(string projectPath, Io.XmlInput.Location[] inputLocations,
             IList<Location> dikeLocations, IList<SurfaceLine2> dikeSurfaceLines, IList<Segment> segments)
         {
             for (int i = 0; i < inputLocations.Length; i++)
@@ -469,8 +469,8 @@
                     location.RwBankProtectionBottomLevel = assesmentRegionalOptions.RegionalBankProtectionBottomLevel;
                     location.DredgingDepth = assesmentRegionalOptions.DredgingDepth;
                     location.DetrimentFactor = assesmentRegionalOptions.DetrimentFactor;
-                    location.DikeMaterialType = assesmentRegionalOptions.DikeSoilTypeSpecified ? 
-                        ConversionHelper.ConvertToSoilType(assesmentRegionalOptions.DikeSoilType) : 
+                    location.DikeMaterialType = assesmentRegionalOptions.DikeSoilTypeSpecified ?
+                        ConversionHelper.ConvertToSoilType(assesmentRegionalOptions.DikeSoilType) :
                         SoilType.Clay;
                 }
                 // Design options
@@ -729,20 +729,20 @@
                     switch (soilGeometryProbability.SoilProfileType)
                     {
                         case SoilProfileType.ProfileType1D:
-                        {
-                            soilGeometryProbability.SoilProfile1DName = inputSoilGeometryProbability.SoilProfileName;
-                            break;
-                        }
+                            {
+                                soilGeometryProbability.SoilProfile1DName = inputSoilGeometryProbability.SoilProfileName;
+                                break;
+                            }
                         case SoilProfileType.ProfileType2D:
-                        {
-                            soilGeometryProbability.SoilProfile2DName = inputSoilGeometryProbability.SoilProfileName;
-                            break;
-                        }
+                            {
+                                soilGeometryProbability.SoilProfile2DName = inputSoilGeometryProbability.SoilProfileName;
+                                break;
+                            }
                         case SoilProfileType.ProfileTypeStiFile:
-                        {
-                            soilGeometryProbability.StiFileName = inputSoilGeometryProbability.SoilProfileName;
-                            break;
-                        }
+                            {
+                                soilGeometryProbability.StiFileName = inputSoilGeometryProbability.SoilProfileName;
+                                break;
+                            }
                     }
 
                     segment.SoilProfileProbabilities.Add(soilGeometryProbability);