Index: DamEngine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlOutput.cs
===================================================================
diff -u -r1013 -r1119
--- DamEngine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlOutput.cs	(.../FillDamFromXmlOutput.cs)	(revision 1013)
+++ DamEngine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlOutput.cs	(.../FillDamFromXmlOutput.cs)	(revision 1119)
@@ -23,8 +23,11 @@
 using Deltares.DamEngine.Data.General;
 using Deltares.DamEngine.Data.Geometry;
 using Deltares.DamEngine.Data.Geotechnics;
+using Deltares.DamEngine.Data.RegionalAssessmentResults;
 using Deltares.DamEngine.Data.Standard.Logging;
 using Deltares.DamEngine.Io.XmlOutput;
+using RegionalResult = Deltares.DamEngine.Io.XmlOutput.RegionalResult;
+using RegionalScenarioResult = Deltares.DamEngine.Io.XmlOutput.RegionalScenarioResult;
 
 namespace Deltares.DamEngine.Interface
 {
@@ -41,9 +44,16 @@
         public static DamProjectData CreateDamProjectData(Output output)
         {
             var damProjectData = new DamProjectData();
-            if (output != null && output.Results != null && output.Results.CalculationResults != null && output.Results.CalculationResults.DesignResults != null)
+            if (output != null && output.Results != null && output.Results.CalculationResults != null)
             {
-                CreateDesignResultsOutput(output, damProjectData);
+                if (output.Results.CalculationResults.DesignResults != null)
+                {
+                    CreateDesignResultsOutput(output, damProjectData);
+                }
+                if (output.Results.CalculationResults.LocationResults != null)
+                {
+                    CreateLocationResultsOutput(output, damProjectData);
+                }
             }
             return damProjectData;
         }
@@ -212,5 +222,69 @@
                 desResult.StabilityDesignResults.UpliftSituation = situation;
             }
         }
+
+        private static void CreateLocationResultsOutput(Output output, DamProjectData damProjectData)
+        {
+            // Calculation results (per location)
+            damProjectData.LocationJobs = new List<LocationJob>();
+            var jobtel = 0;
+//            foreach (var outputLocationResult in output.Results.CalculationResults.LocationResults)
+//            {
+//                var locationJob = new LocationJob("hh");
+//                // Stability TimeSerie (later)
+//
+//                // Piping TimeSerie (later)
+//
+//                // RegionalScenarios results
+//                outputLocationResult.RegionalScenariosResult = new CalculationResultsLocationResultRegionalScenariosResult();
+//                outputLocationResult.RegionalScenariosResult.SafetyFactor = locationJob.LocationResult.RegionalScenariosResult.SafetyFactor;
+//                outputLocationResult.RegionalScenariosResult.CalculationResult = ConversionHelper.ConvertToOutputCalculationResult(locationJob.LocationResult.RegionalScenariosResult.CalculationResult);
+//                outputLocationResult.RegionalScenariosResult.RegionalScenarioResult = new RegionalScenarioResult[locationJob.LocationResult.RegionalScenariosResult.RegionalScenarioResults.Count];
+//                var scentel = 0;
+//                foreach (var rwScenarioResult in locationJob.LocationResult.RegionalScenariosResult.RegionalScenarioResults)
+//                {
+//                    var outputRwScenarioResult = new RegionalScenarioResult();
+//                    outputRwScenarioResult.LoadSituation = ConversionHelper.ConvertToOutputLoadSituation(rwScenarioResult.LoadSituation);
+//                    outputRwScenarioResult.DikeDrySensitivity = ConversionHelper.ConvertToOutputDikeDrySensitivity(rwScenarioResult.DikeDrySensitivity);
+//                    outputRwScenarioResult.HydraulicShortcutType = ConversionHelper.ConvertToOutputHydraulicShortcutType(rwScenarioResult.HydraulicShortcutType);
+//                    outputRwScenarioResult.UpliftType = ConversionHelper.ConvertToOutputUpliftType(rwScenarioResult.UpliftType);
+//                    outputRwScenarioResult.ModelOption = ConversionHelper.ConvertToOutputMStabModelType(rwScenarioResult.ModelOption);
+//                    outputRwScenarioResult.ScenarioType = ConversionHelper.ConvertToOutputScenarioType(rwScenarioResult.ScenarioType);
+//                    outputRwScenarioResult.CalculationResult = ConversionHelper.ConvertToOutputCalculationResult(rwScenarioResult.CalculationResult);
+//                    outputRwScenarioResult.SafetyFactor = rwScenarioResult.SafetyFactor;
+//                    outputRwScenarioResult.RegionalScenarioProfileResults = new RegionalScenarioResultRegionalScenarioProfileResult[rwScenarioResult.RegionalScenarioProfileResults.Count];
+//                    var proftel = 0;
+//                    foreach (var profileResult in rwScenarioResult.RegionalScenarioProfileResults)
+//                    {
+//                        var outputProfileResult = new RegionalScenarioResultRegionalScenarioProfileResult();
+//                        outputProfileResult.LocationName = profileResult.LocationName;
+//                        outputProfileResult.LoadSituation = ConversionHelper.ConvertToOutputLoadSituation(profileResult.LoadSituation);
+//                        outputProfileResult.DikeDrySensitivity = ConversionHelper.ConvertToOutputDikeDrySensitivity(profileResult.DikeDrySensitivity);
+//                        outputProfileResult.HydraulicShortcutType = ConversionHelper.ConvertToOutputHydraulicShortcutType(profileResult.HydraulicShortcutType);
+//                        outputProfileResult.UpliftType = ConversionHelper.ConvertToOutputUpliftType(profileResult.UpliftType);
+//                        outputProfileResult.MStabModelOption = ConversionHelper.ConvertToOutputMStabModelType(profileResult.MstabModelOption);
+//                        outputProfileResult.PipingModelOption = ConversionHelper.ConvertToOutputPipingModelType(profileResult.PipingModelOption);
+//                        outputProfileResult.ScenarioType = ConversionHelper.ConvertToOutputScenarioType(profileResult.ScenarioType);
+//                        outputProfileResult.SoilProfileName = profileResult.SoilProfileName;
+//                        outputProfileResult.SoilProfileProbability = profileResult.SoilProfileProbability;
+//                        outputProfileResult.FailureMechanismType = ConversionHelper.ConvertToInputFailureMechanismSystemType(profileResult.FailureMechanismType);
+//                        outputProfileResult.BaseFileName = profileResult.BaseFileName;
+//                        outputProfileResult.RegionalResult = new RegionalResult();
+//                        outputProfileResult.RegionalResult.RegionalResultType = ConversionHelper.ConvertToOutputRegionalResultType(profileResult.RegionalResultType);
+//                        outputProfileResult.RegionalResult.SafetyFactor = profileResult.SafetyFactor;
+//                        outputProfileResult.RegionalResult.ProbabilityOfFailure = profileResult.ProbabilityOfFailure;
+//                        outputProfileResult.RegionalResult.CalculationResult = ConversionHelper.ConvertToOutputCalculationResult(profileResult.CalculationResult);
+//                        outputLocationResult.RegionalScenariosResult.RegionalScenarioResult[scentel].RegionalScenarioProfileResults[proftel] = outputProfileResult;
+//                        proftel++;
+//                    }
+//                    outputLocationResult.RegionalScenariosResult.RegionalScenarioResult[scentel] = outputRwScenarioResult;
+//                    scentel++;
+//
+//                    // RWSchematizationFactors Result later             
+//                }
+//                output.Results.CalculationResults.LocationResults[jobtel] = outputLocationResult;
+//                jobtel++;
+//            }
+        }
     }
 }