Index: DamEngine/trunk/src/Deltares.DamEngine.Interface/FillXmlOutputFromDam.cs
===================================================================
diff -u -r1181 -r1220
--- DamEngine/trunk/src/Deltares.DamEngine.Interface/FillXmlOutputFromDam.cs	(.../FillXmlOutputFromDam.cs)	(revision 1181)
+++ DamEngine/trunk/src/Deltares.DamEngine.Interface/FillXmlOutputFromDam.cs	(.../FillXmlOutputFromDam.cs)	(revision 1220)
@@ -37,28 +37,31 @@
         public static Output CreateOutput(DamProjectData damProjectData)
         {
             // Echo of the input
-            Output output = new Output();
-
-            // Validation will be done using a static logmanager and passing logmessages. But this has still to be implemented.
-            // Validation using Attributes must be removed, using explicit validation methods (ValidatioResult) replaced. Still to be done.
-            output.ValidationResults = new Message[0];
-            //            var mestel = 0;
-            //            foreach (var res in valres)
-            //            {
-            //                var mes = new Message();
-            //                mes.Message1 = res.Text;
-            //                mes.MessageType = res.MessageType;
-            //                output.ValidationResults[mestel] = mes;
-            //                mestel++;
-            //            }
-
-            // Results
-            output.Results = new OutputResults();
-            // Calculation messages
-            output.Results.CalculationMessages = new Message[0]; // Were do these come from?
-            // Actual results
-            output.Results.CalculationResults = new CalculationResults();
-
+            Output output = new Output
+            {
+                // Validation will be done using a static logmanager and passing logmessages. But this has still to be implemented.
+                // Validation using Attributes must be removed, using explicit validation methods (ValidatioResult) replaced. Still to be done.
+                //            var mestel = 0;
+                //            foreach (var res in valres)
+                //            {
+                //                var mes = new Message();
+                //                mes.Message1 = res.Text;
+                //                mes.MessageType = res.MessageType;
+                //                output.ValidationResults[mestel] = mes;
+                //                mestel++;
+                //            }
+                ValidationResults = new Message[0],
+                // Results
+                Results = new OutputResults
+                {
+                    // Calculation messages
+                    // Were do these come from?
+                    CalculationMessages = new Message[0],
+                    // Actual results
+                    CalculationResults = new CalculationResults()
+                }
+            };
+            
             CreateDesignResultsOutput(damProjectData, output);
             CreateLocationResultsOutput(damProjectData, output);
             return output;
@@ -81,9 +84,9 @@
                         LocationName = designResult.LocationName,
                         ScenarioName = designResult.ScenarioName,
                         ProfileName = designResult.ProfileName,
+                        CalculationResult = ConversionHelper.ConvertToOutputCalculationResult(designResult.CalculationResult),
                     };
 
-                    desResult.CalculationResult = ConversionHelper.ConvertToOutputCalculationResult(designResult.CalculationResult);
 
                     if (designResult.PipingDesignResults != null)
                     {
@@ -103,12 +106,13 @@
                 output.Results.CalculationMessages = new Message[calculationMessages.Count];
                 for (int i = 0; i < calculationMessages.Count; i++)
                 {
-                    var message = new Message();
-                    message.MessageType = ConversionHelper.ConvertToInputMessageType(calculationMessages[i].MessageType);
-                    message.Message1 = calculationMessages[i].Message;
+                    var message = new Message
+                    {
+                        MessageType = ConversionHelper.ConvertToInputMessageType(calculationMessages[i].MessageType),
+                        Message1 = calculationMessages[i].Message
+                    };
                     output.Results.CalculationMessages[i] = message;
                 }
-
             }
         }
 
@@ -120,10 +124,11 @@
             };
             if (designResult.PipingDesignResults.RedesignedSurfaceLine != null)
             {
-                desResult.PipingDesignResults.RedesignedSurfaceLine = new SurfaceLine();
-                desResult.PipingDesignResults.RedesignedSurfaceLine.Name = designResult.PipingDesignResults.RedesignedSurfaceLine.Name;
-                desResult.PipingDesignResults.RedesignedSurfaceLine.Points =
-                    new SurfaceLinePoint[designResult.PipingDesignResults.RedesignedSurfaceLine.CharacteristicPoints.Count];
+                desResult.PipingDesignResults.RedesignedSurfaceLine = new SurfaceLine
+                {
+                    Name = designResult.PipingDesignResults.RedesignedSurfaceLine.Name,
+                    Points = new SurfaceLinePoint[designResult.PipingDesignResults.RedesignedSurfaceLine.CharacteristicPoints.Count]
+                };
                 for (int j = 0; j < designResult.PipingDesignResults.RedesignedSurfaceLine.CharacteristicPoints.Count; j++)
                 {
                     var characteristicPoint = designResult.PipingDesignResults.RedesignedSurfaceLine.CharacteristicPoints[j];
@@ -267,14 +272,13 @@
             var jobtel = 0;
             foreach (var locationJob in damProjectData.LocationJobs)
             {
-                var outputLocationResult = new CalculationResultsLocationResult();
+                var outputLocationResult = new CalculationResultsLocationResult
+                {
+                    // Stability TimeSerie and Piping TimeSerie (later)
+                    // RegionalScenarios results
+                    RegionalScenariosResult = new CalculationResultsLocationResultRegionalScenariosResult()
+                };
 
-                // Stability TimeSerie (later)
-
-                // Piping TimeSerie (later)
-
-                // RegionalScenarios results
-                outputLocationResult.RegionalScenariosResult = new CalculationResultsLocationResultRegionalScenariosResult();
                 if (locationJob.LocationResult.RegionalScenariosResult != null)
                 {
                     outputLocationResult.RegionalScenariosResult.SafetyFactor = locationJob.LocationResult.RegionalScenariosResult.SafetyFactor;
@@ -283,37 +287,43 @@
                     var scentel = 0;
                     foreach (var regionalScenarioResult in locationJob.LocationResult.RegionalScenariosResult.RegionalScenarioResults)
                     {
-                        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 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();
-                            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);
+                            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++;
                         }