Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/PipingBlighTests.cs
===================================================================
diff -u -r3893 -r4000
--- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/PipingBlighTests.cs	(.../PipingBlighTests.cs)	(revision 3893)
+++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/PipingBlighTests.cs	(.../PipingBlighTests.cs)	(revision 4000)
@@ -19,13 +19,15 @@
 // Stichting Deltares and remain full property of Stichting Deltares at all times.
 // All rights reserved.
 
+using System.Globalization;
 using System.IO;
 using System.Threading;
 using Deltares.DamEngine.Data.General;
 using Deltares.DamEngine.Data.Geotechnics;
 using Deltares.DamEngine.Data.Standard.Calculation;
 using Deltares.DamEngine.Interface;
 using Deltares.DamEngine.Io;
+using Deltares.DamEngine.Io.XmlOutput;
 using Deltares.DamEngine.TestHelpers;
 using NUnit.Framework;
 using ConversionHelper = Deltares.DamEngine.Interface.ConversionHelper;
@@ -50,7 +52,7 @@
             const string fileName = @"PipingVoorbeeld1_BlighInputFile.xml";
             string inputString = File.ReadAllText(fileName);
             inputString = XmlAdapter.ChangeValueInXml(inputString, "SegmentFailureMechanismType", segmentFailureMechanismType.ToString());
-            EngineInterface engineInterface = new EngineInterface(inputString);
+            var engineInterface = new EngineInterface(inputString);
             Assert.IsNotNull(engineInterface.DamProjectData);
             string outputString = engineInterface.Run();
             // Factor piping = 0.521
@@ -71,7 +73,7 @@
             // ID locatie scenario = "1"
             // Heave Factor = 90.0
             Assert.IsNotNull(outputString);
-            var output = DamXmlSerialization.LoadOutputFromXmlString(outputString);
+            Output output = DamXmlSerialization.LoadOutputFromXmlString(outputString);
             Assert.IsNotNull(output.Results.CalculationResults, "No results available");
             DamProjectData actualDamProjectData = FillDamFromXmlOutput.CreateDamProjectData(null, output);
             SurfaceLine2 redesignedSurfaceLine = actualDamProjectData.DesignCalculations[0].PipingDesignResults.RedesignedSurfaceLine;
@@ -104,11 +106,11 @@
             // Select all locations
             const string fileName = @"Rechter Diezedijk_BlighInputFile.xml";
             string inputString = File.ReadAllText(fileName);
-            EngineInterface engineInterface = new EngineInterface(inputString);
+            var engineInterface = new EngineInterface(inputString);
             Assert.IsNotNull(engineInterface.DamProjectData);
             string outputString = engineInterface.Run();
             Assert.IsNotNull(outputString);
-            var output = DamXmlSerialization.LoadOutputFromXmlString(outputString);
+            Output output = DamXmlSerialization.LoadOutputFromXmlString(outputString);
             Assert.AreEqual(112, output.Results.CalculationResults.Length);
             Assert.AreEqual(0.782, output.Results.CalculationResults[0].PipingDesignResults.BlighFactor, tolerance);
             Assert.AreEqual(0.809, output.Results.CalculationResults[111].PipingDesignResults.BlighFactor, tolerance);
@@ -122,11 +124,11 @@
             // Set Analysis type to "Adapt geometry"
             const string fileName = @"PipingVoorbeeld1_BlighDesignInputFile.xml";
             string inputString = File.ReadAllText(fileName);
-            EngineInterface engineInterface = new EngineInterface(inputString);
+            var engineInterface = new EngineInterface(inputString);
             Assert.IsNotNull(engineInterface.DamProjectData);
             string outputString = engineInterface.Run();
             Assert.IsNotNull(outputString);
-            var output = DamXmlSerialization.LoadOutputFromXmlString(outputString);
+            Output output = DamXmlSerialization.LoadOutputFromXmlString(outputString);
             DamProjectData actualDamProjectData = FillDamFromXmlOutput.CreateDamProjectData(null, output);
             SurfaceLine2 redesignedSurfaceLine = actualDamProjectData.DesignCalculations[0].PipingDesignResults.RedesignedSurfaceLine;
             Assert.AreEqual(true, output.Results.CalculationResults[0].PipingDesignResults.UpliftSituation.IsUplift);
@@ -165,12 +167,12 @@
             // Select second location (101)
             const string fileName = @"Rechter Diezedijk_BlighDesignInputFile_1Location.xml";
             string inputString = File.ReadAllText(fileName);
-            EngineInterface engineInterface = new EngineInterface(inputString);
+            var engineInterface = new EngineInterface(inputString);
             Assert.IsNotNull(engineInterface.DamProjectData);
             string outputString = engineInterface.Run();
             Assert.IsNotNull(outputString);
-            var output = DamXmlSerialization.LoadOutputFromXmlString(outputString);
-            int locationIndex = 0;
+            Output output = DamXmlSerialization.LoadOutputFromXmlString(outputString);
+            var locationIndex = 0;
             Assert.AreEqual(1.313, output.Results.CalculationResults[locationIndex * 2 + 0].PipingDesignResults.BlighFactor, tolerance);
             Assert.AreEqual(1.295, output.Results.CalculationResults[locationIndex * 2 + 1].PipingDesignResults.BlighFactor, tolerance);
             Assert.AreEqual((locationIndex + 1) * 2, output.Results.CalculationResults.Length);
@@ -185,13 +187,13 @@
             // Set Analysis type to "Adapt Geometry"
             // Select second location (101)
             // Set for this location in location scenario Required safety factor for piping to 8.0
-            Thread.CurrentThread.CurrentCulture = System.Globalization.CultureInfo.InvariantCulture;
+            Thread.CurrentThread.CurrentCulture = CultureInfo.InvariantCulture;
             const string fileName = @"Rechter Diezedijk_BlighFailedDesignInputFile_1Location.xml";
             string inputString = File.ReadAllText(fileName);
-            EngineInterface engineInterface = new EngineInterface(inputString);
+            var engineInterface = new EngineInterface(inputString);
             Assert.IsNotNull(engineInterface.DamProjectData);
             string outputString = engineInterface.Run();
-            var output = DamXmlSerialization.LoadOutputFromXmlString(outputString);
+            Output output = DamXmlSerialization.LoadOutputFromXmlString(outputString);
             Assert.AreEqual(2, output.Results.CalculationResults.Length);
             Assert.AreEqual("The new shoulder length is too large to fit in the current surface line.", output.Results.CalculationResults[1].PipingDesignResults.ResultMessage);
             Assert.AreEqual(CalculationResult.RunFailed, ConversionHelper.ConvertToCalculationResult(output.Results.CalculationResults[1].CalculationResult));
@@ -200,8 +202,7 @@
                             "The calculation failed with error message " +
                             "'The design was not successful. " +
                             "The new shoulder length is too large to fit in the current surface line.'",
-                output.Results.CalculationMessages[0].Message1);
-
+                            output.Results.CalculationMessages[0].Message1);
         }
 
         [Test]
@@ -213,12 +214,12 @@
             // Select first 5 locations (100, 101, 102, 103 and 104)
             const string fileName = @"Rechter Diezedijk_BlighDesignInputFile.xml";
             string inputString = File.ReadAllText(fileName);
-            EngineInterface engineInterface = new EngineInterface(inputString);
+            var engineInterface = new EngineInterface(inputString);
             Assert.IsNotNull(engineInterface.DamProjectData);
             string outputString = engineInterface.Run();
             Assert.IsNotNull(outputString);
-            var output = DamXmlSerialization.LoadOutputFromXmlString(outputString);
-            int locationIndex = 0;
+            Output output = DamXmlSerialization.LoadOutputFromXmlString(outputString);
+            var locationIndex = 0;
             Assert.AreEqual(1.516, output.Results.CalculationResults[locationIndex + 0].PipingDesignResults.BlighFactor, tolerance);
             Assert.AreEqual(1.497, output.Results.CalculationResults[locationIndex + 1].PipingDesignResults.BlighFactor, tolerance);
             locationIndex++;
@@ -235,6 +236,5 @@
             Assert.AreEqual(1.311, output.Results.CalculationResults[locationIndex * 2 + 1].PipingDesignResults.BlighFactor, tolerance);
             Assert.AreEqual((locationIndex + 1) * 2, output.Results.CalculationResults.Length);
         }
-
     }
-}
+}
\ No newline at end of file