Index: DamEngine/trunk/src/Deltares.DamEngine.Interface/FillXmlOutputFromDam.cs
===================================================================
diff -u -r1119 -r1120
--- DamEngine/trunk/src/Deltares.DamEngine.Interface/FillXmlOutputFromDam.cs	(.../FillXmlOutputFromDam.cs)	(revision 1119)
+++ DamEngine/trunk/src/Deltares.DamEngine.Interface/FillXmlOutputFromDam.cs	(.../FillXmlOutputFromDam.cs)	(revision 1120)
@@ -273,20 +273,20 @@
                 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)
+                foreach (var regionalScenarioResult 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 outputRegionalScenarioResult = new RegionalScenarioResult();
+                    outputRegionalScenarioResult.LoadSituation = ConversionHelper.ConvertToOutputLoadSituation(regionalScenarioResult.LoadSituation);
+                    outputRegionalScenarioResult.DikeDrySensitivity = ConversionHelper.ConvertToOutputDikeDrySensitivity(regionalScenarioResult.DikeDrySensitivity);
+                    outputRegionalScenarioResult.HydraulicShortcutType = ConversionHelper.ConvertToOutputHydraulicShortcutType(regionalScenarioResult.HydraulicShortcutType);
+                    outputRegionalScenarioResult.UpliftType = ConversionHelper.ConvertToOutputUpliftType(regionalScenarioResult.UpliftType);
+                    outputRegionalScenarioResult.ModelOption = ConversionHelper.ConvertToOutputMStabModelType(regionalScenarioResult.ModelOption);
+                    outputRegionalScenarioResult.ScenarioType = ConversionHelper.ConvertToOutputScenarioType(regionalScenarioResult.ScenarioType);
+                    outputRegionalScenarioResult.CalculationResult = ConversionHelper.ConvertToOutputCalculationResult(regionalScenarioResult.CalculationResult);
+                    outputRegionalScenarioResult.SafetyFactor = regionalScenarioResult.SafetyFactor;
+                    outputRegionalScenarioResult.RegionalScenarioProfileResults = new RegionalScenarioResultRegionalScenarioProfileResult[regionalScenarioResult.RegionalScenarioProfileResults.Count];
                     var proftel = 0;
-                    foreach (var profileResult in rwScenarioResult.RegionalScenarioProfileResults)
+                    foreach (var profileResult in regionalScenarioResult.RegionalScenarioProfileResults)
                     {
                         var outputProfileResult = new RegionalScenarioResultRegionalScenarioProfileResult();
                         outputProfileResult.LocationName = profileResult.LocationName;
@@ -309,31 +309,8 @@
                         outputLocationResult.RegionalScenariosResult.RegionalScenarioResult[scentel].RegionalScenarioProfileResults[proftel] = outputProfileResult;
                         proftel++;
                     }
-                    outputLocationResult.RegionalScenariosResult.RegionalScenarioResult[scentel] = outputRwScenarioResult;
-                    scentel++;
-
-                    // RWSchematizationFactors Result later
-                    // Note that xsd should be adapted first: the types should be stored as int, not as string! This to be able to reuse the converters
-//                    outputLocationResult.RegionalSchematizationFactorsResult = new CalculationResultsLocationResultRegionalSchematizationFactorsResult();
-//                    outputLocationResult.RegionalSchematizationFactorsResult.RegionalSchematizationFactorResult = new CalculationResultsLocationResultRegionalSchematizationFactorsResultRegionalSchematizationFactorResult[damProjectData.SchematizationFactors.Count];
-//                    var factortel = 0;
-//                    foreach (var rwSchematizationFactorResult in damProjectData.SchematizationFactors)
-//                    {
-//                        var factorResult = new CalculationResultsLocationResultRegionalSchematizationFactorsResultRegionalSchematizationFactorResult();
-//                        factorResult.LocationName = rwSchematizationFactorResult.LocationName;
-//                        factorResult.SchematizationType = rwSchematizationFactorResult.SchematizationType;
-//                        factorResult.SoilProfileName = rwSchematizationFactorResult.SoilProfileName;
-//                        factorResult.OriginalDecisiveSoilProfileName = rwSchematizationFactorResult.OriginalDecisiveSoilProfileName;
-//                        factorResult.SchematizationFactor = rwSchematizationFactorResult.SchematizationFactor;
-//                        factorResult.SummedProfileProbability = rwSchematizationFactorResult.SummedProfileProbability;
-//                        factorResult.DecisiveRegionalScenarioName = rwSchematizationFactorResult.DecisiveScenarioName;
-//                        factorResult.DetrimentFactor = rwSchematizationFactorResult.DetrimentFactor;
-//                        factorResult.SafetyFactor = rwSchematizationFactorResult.SafetyFactor;
-//                        factorResult.CalculationResult = ConversionHelper.ConvertToOutputCalculationResult(rwSchematizationFactorResult.CalculationResult);
-//                        outputLocationResult.RegionalSchematizationFactorsResult.RegionalSchematizationFactorResult[factortel] = factorResult;
-//                        factortel++;
-//                    }
-
+                    outputLocationResult.RegionalScenariosResult.RegionalScenarioResult[scentel] = outputRegionalScenarioResult;
+                    scentel++;                    
                 }
                 output.Results.CalculationResults.LocationResults[jobtel] = outputLocationResult;
                 jobtel++;