Index: DamEngine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlOutput.cs
===================================================================
diff -u -r1974 -r2111
--- DamEngine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlOutput.cs	(.../FillDamFromXmlOutput.cs)	(revision 1974)
+++ DamEngine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlOutput.cs	(.../FillDamFromXmlOutput.cs)	(revision 2111)
@@ -26,8 +26,6 @@
 using Deltares.DamEngine.Data.General.TimeSeries;
 using Deltares.DamEngine.Data.Geometry;
 using Deltares.DamEngine.Data.Geotechnics;
-using Deltares.DamEngine.Data.RegionalAssessmentResults;
-using Deltares.DamEngine.Data.Standard;
 using Deltares.DamEngine.Data.Standard.Logging;
 using Deltares.DamEngine.Io.XmlOutput;
 using DesignResult = Deltares.DamEngine.Io.XmlOutput.DesignResult;
@@ -55,14 +53,10 @@
             //var damProjectData = new DamProjectData();
             if (output != null && output.Results != null && output.Results.CalculationResults != null)
             {
-                if (output.Results.CalculationResults.DesignResults != null)
+                if (output.Results.CalculationResults != null)
                 {
                     CreateDesignResultsOutput(output, damProjectData);
-                }
-                if (output.Results.CalculationResults.LocationResults != null)
-                {
-                    CreateLocationResultsOutput(output, damProjectData);
-                }
+                }                
             }
             if (output.Results.OperationalOutputTimeSeries != null)
             {
@@ -126,9 +120,9 @@
         {
             // Design results
             damProjectData.DesignCalculations = new List<Data.General.Results.DesignResult>();
-            for (int i = 0; i < output.Results.CalculationResults.DesignResults.Length; i++)
+            for (int i = 0; i < output.Results.CalculationResults.Length; i++)
             {
-                var designResult = output.Results.CalculationResults.DesignResults[i];
+                var designResult = output.Results.CalculationResults[i];
                 var desResult = new Data.General.Results.DesignResult(designResult.LocationName, designResult.ScenarioName)
                 {
                     BaseFileName = designResult.BaseFileName,
@@ -318,77 +312,6 @@
             {
                 desResult.StabilityDesignResults.StabilityModelType = ConversionHelper.ConvertToStabilityModelType(designResult.StabilityDesignResults.StabilityModelType);
             }
-        }
-
-        private static void CreateLocationResultsOutput(Output output, DamProjectData damProjectData)
-        {
-            // Calculation results (per location)
-            damProjectData.LocationJobs = new List<LocationJob>();
-            foreach (var outputLocationResult in output.Results.CalculationResults.LocationResults)
-            {
-                var locationJob = new LocationJob(null)
-                {
-                    LocationResult = new LocationResult()
-                };
-
-                Location location = null;
-                if (outputLocationResult.RegionalScenariosResult != null)
-                {
-                    locationJob.LocationResult.RegionalScenariosResult = new RegionalScenariosResult
-                    {
-                        CalculationResult = ConversionHelper.ConvertToCalculationResult(outputLocationResult.RegionalScenariosResult.CalculationResult),
-                        SafetyFactor = outputLocationResult.RegionalScenariosResult.SafetyFactor
-                    };
-                    var regionalScenarioResults = new List<Data.RegionalAssessmentResults.RegionalScenarioResult>();
-                    foreach (var outPutRegionalScenarioResult in outputLocationResult.RegionalScenariosResult.RegionalScenarioResult)
-                    {
-                        var regionalScenarioResult = new Data.RegionalAssessmentResults.RegionalScenarioResult
-                        {
-                            CalculationResult = ConversionHelper.ConvertToCalculationResult(outPutRegionalScenarioResult.CalculationResult),
-                            DikeDrySensitivity = ConversionHelper.ConvertToDikeDrySensitivity(outPutRegionalScenarioResult.DikeDrySensitivity),
-                            HydraulicShortcutType = ConversionHelper.ConvertToHydraulicShortcutType(outPutRegionalScenarioResult.HydraulicShortcutType),
-                            LoadSituation = ConversionHelper.ConvertToLoadSituation(outPutRegionalScenarioResult.LoadSituation),
-                            ModelOption = ConversionHelper.ConvertToMStabModelType(outPutRegionalScenarioResult.ModelOption),
-                            SafetyFactor = outPutRegionalScenarioResult.SafetyFactor,
-                            ScenarioType = ConversionHelper.ConvertToScenarioType(outPutRegionalScenarioResult.ScenarioType),
-                            UpliftType = ConversionHelper.ConvertToUpliftType(outPutRegionalScenarioResult.UpliftType)
-                        };
-                        var regionalScenarioProfileResults = new List<RegionalScenarioProfileJob>();
-                        foreach (var outPutRegionalScenarioProfileResult in outPutRegionalScenarioResult.RegionalScenarioProfileResults)
-                        {
-                            
-                            var locationName = outPutRegionalScenarioProfileResult.LocationName;
-                            location = damProjectData.Dike.Locations.FirstOrDefault(x => x.Name == locationName);                                
-                            var spName = outPutRegionalScenarioProfileResult.SoilProfileName;
-                            var soilGeometryProbability = location.Segment.SoilProfileProbabilities.FirstOrDefault(s => ((s.SegmentFailureMechanismType == null) ||
-                                                                                                                            (s.SegmentFailureMechanismType.Value == FailureMechanismSystemType.StabilityInside)) &&
-                                                                                                                        (s.SoilProfile1DName == spName));
-                            var regionalScenarioProfileResult = new RegionalScenarioProfileJob(location, soilGeometryProbability)
-                            {
-                                LoadSituation = ConversionHelper.ConvertToLoadSituation(outPutRegionalScenarioProfileResult.LoadSituation),
-                                DikeDrySensitivity = ConversionHelper.ConvertToDikeDrySensitivity(outPutRegionalScenarioProfileResult.DikeDrySensitivity),
-                                HydraulicShortcutType = ConversionHelper.ConvertToHydraulicShortcutType(outPutRegionalScenarioProfileResult.HydraulicShortcutType),
-                                UpliftType = ConversionHelper.ConvertToUpliftType(outPutRegionalScenarioProfileResult.UpliftType),
-                                MstabModelOption = ConversionHelper.ConvertToMStabModelType(outPutRegionalScenarioProfileResult.MStabModelOption),
-                                PipingModelOption = ConversionHelper.ConvertToPipingModelType(outPutRegionalScenarioProfileResult.PipingModelOption),
-                                ScenarioType = ConversionHelper.ConvertToScenarioType(outPutRegionalScenarioProfileResult.ScenarioType),
-                                FailureMechanismType = ConversionHelper.ConvertToFailureMechanismSystemType(outPutRegionalScenarioProfileResult.FailureMechanismType),
-                                BaseFileName = outPutRegionalScenarioProfileResult.BaseFileName,
-                                RegionalResultType = ConversionHelper.ConvertToRegionalResultType(outPutRegionalScenarioProfileResult.RegionalResult.RegionalResultType),
-                                SafetyFactor = outPutRegionalScenarioProfileResult.RegionalResult.SafetyFactor,
-                                ProbabilityOfFailure = outPutRegionalScenarioProfileResult.RegionalResult.ProbabilityOfFailure,
-                                CalculationResult = ConversionHelper.ConvertToCalculationResult(outPutRegionalScenarioProfileResult.RegionalResult.CalculationResult)
-                            };
-                            regionalScenarioProfileResults.Add(regionalScenarioProfileResult);                            
-                        }
-                        regionalScenarioResult.RegionalScenarioProfileResults.AddRange(regionalScenarioProfileResults);
-                        regionalScenarioResults.Add(regionalScenarioResult);                        
-                    }                    
-                    locationJob.LocationResult.RegionalScenariosResult.RegionalScenarioResults.AddRange(regionalScenarioResults);
-                }
-                locationJob.Location = location;
-                damProjectData.LocationJobs.Add(locationJob);
-            }
-        }
+        }        
     }
 }