Index: DamEngine/trunk/src/Deltares.DamEngine.Interface/FillXmlOutputFromDam.cs
===================================================================
diff -u -r1974 -r2111
--- DamEngine/trunk/src/Deltares.DamEngine.Interface/FillXmlOutputFromDam.cs	(.../FillXmlOutputFromDam.cs)	(revision 1974)
+++ DamEngine/trunk/src/Deltares.DamEngine.Interface/FillXmlOutputFromDam.cs	(.../FillXmlOutputFromDam.cs)	(revision 2111)
@@ -46,9 +46,7 @@
                 Results = new OutputResults
                 {
                     // Calculation messages
-                    CalculationMessages = new Message[damProjectData.CalculationMessages.Count],
-                    // Actual results
-                    CalculationResults = new CalculationResults()
+                    CalculationMessages = new Message[damProjectData.CalculationMessages.Count],                    
                 }
             };
             CreateCalculationMessages(damProjectData, output);
@@ -63,7 +61,7 @@
             var designResults = damProjectData.DesignCalculations;
             if (designResults != null && designResults.Count > 0)
             {
-                output.Results.CalculationResults.DesignResults = new DesignResult[designResults.Count];
+                output.Results.CalculationResults = new DesignResult[designResults.Count];
                 var designResultCount = 0;
                 foreach (var designResult in designResults)
                 {
@@ -86,7 +84,7 @@
                     {
                         CreateDesignResultsStabilityOutput(desResult, designResult);
                     }
-                    output.Results.CalculationResults.DesignResults[designResultCount] = desResult;
+                    output.Results.CalculationResults[designResultCount] = desResult;
                     designResultCount++;
                 }
             }
@@ -305,71 +303,7 @@
         private static void CreateLocationResultsOutput(DamProjectData damProjectData, Output output)
         {
             // Calculation results (per location)
-            output.Results.CalculationResults.LocationResults = new CalculationResultsLocationResult[damProjectData.LocationJobs.Count];
-            var jobtel = 0;
-            foreach (var locationJob in damProjectData.LocationJobs)
-            {
-                var outputLocationResult = new CalculationResultsLocationResult
-                {
-                    // RegionalScenarios results
-                    RegionalScenariosResult = new CalculationResultsLocationResultRegionalScenariosResult()
-                };
-
-                if (locationJob.LocationResult.RegionalScenariosResult != null)
-                {
-                    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 regionalScenarioResult in locationJob.LocationResult.RegionalScenariosResult.RegionalScenarioResults)
-                    {
-                        var outputRegionalScenarioResult = new RegionalScenarioResult
-                        {
-                            LoadSituation = ConversionHelper.ConvertToOutputLoadSituation(regionalScenarioResult.LoadSituation),
-                            DikeDrySensitivity = ConversionHelper.ConvertToOutputDikeDrySensitivity(regionalScenarioResult.DikeDrySensitivity),
-                            HydraulicShortcutType = ConversionHelper.ConvertToOutputHydraulicShortcutType(regionalScenarioResult.HydraulicShortcutType),
-                            UpliftType = ConversionHelper.ConvertToOutputUpliftType(regionalScenarioResult.UpliftType),
-                            ModelOption = ConversionHelper.ConvertToOutputMStabModelType(regionalScenarioResult.ModelOption),
-                            ScenarioType = ConversionHelper.ConvertToOutputScenarioType(regionalScenarioResult.ScenarioType),
-                            CalculationResult = ConversionHelper.ConvertToOutputCalculationResult(regionalScenarioResult.CalculationResult),
-                            SafetyFactor = regionalScenarioResult.SafetyFactor,
-                            RegionalScenarioProfileResults = new RegionalScenarioResultRegionalScenarioProfileResult[regionalScenarioResult.RegionalScenarioProfileResults.Count]
-                        };
-                        var proftel = 0;
-                        foreach (var profileResult in regionalScenarioResult.RegionalScenarioProfileResults)
-                        {
-                            var outputProfileResult = new RegionalScenarioResultRegionalScenarioProfileResult
-                            {
-                                LocationName = profileResult.LocationName,
-                                LoadSituation = ConversionHelper.ConvertToOutputLoadSituation(profileResult.LoadSituation),
-                                DikeDrySensitivity = ConversionHelper.ConvertToOutputDikeDrySensitivity(profileResult.DikeDrySensitivity),
-                                HydraulicShortcutType = ConversionHelper.ConvertToOutputHydraulicShortcutType(profileResult.HydraulicShortcutType),
-                                UpliftType = ConversionHelper.ConvertToOutputUpliftType(profileResult.UpliftType),
-                                MStabModelOption = ConversionHelper.ConvertToOutputMStabModelType(profileResult.MstabModelOption),
-                                PipingModelOption = ConversionHelper.ConvertToOutputPipingModelType(profileResult.PipingModelOption),
-                                ScenarioType = ConversionHelper.ConvertToOutputScenarioType(profileResult.ScenarioType),
-                                SoilProfileName = profileResult.SoilProfileName,
-                                SoilProfileProbability = profileResult.SoilProfileProbability,
-                                FailureMechanismType = ConversionHelper.ConvertToInputFailureMechanismSystemType(profileResult.FailureMechanismType),
-                                BaseFileName = profileResult.BaseFileName,
-                                RegionalResult = new RegionalResult
-                                {
-                                    RegionalResultType = ConversionHelper.ConvertToOutputRegionalResultType(profileResult.RegionalResultType),
-                                    SafetyFactor = profileResult.SafetyFactor,
-                                    ProbabilityOfFailure = profileResult.ProbabilityOfFailure,
-                                    CalculationResult = ConversionHelper.ConvertToOutputCalculationResult(profileResult.CalculationResult)
-                                }
-                            };
-                            outputRegionalScenarioResult.RegionalScenarioProfileResults[proftel] = outputProfileResult;
-                            proftel++;
-                        }
-                        outputLocationResult.RegionalScenariosResult.RegionalScenarioResult[scentel] = outputRegionalScenarioResult;
-                        scentel++;
-                    }
-                    output.Results.CalculationResults.LocationResults[jobtel] = outputLocationResult;
-                    jobtel++;
-                }
-            }
+            //output.Results.CalculationResults.LocationResults = new CalculationResultsLocationResult[damProjectData.LocationJobs.Count];
             if (damProjectData.OutputTimeSerieCollection != null)
             {
                 output.Results.OperationalOutputTimeSeries = new TimeSerie[damProjectData.OutputTimeSerieCollection.Series.Count];