Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/PipingSellmeijerVnkTests.cs
===================================================================
diff -u -r2028 -r2111
--- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/PipingSellmeijerVnkTests.cs	(.../PipingSellmeijerVnkTests.cs)	(revision 2028)
+++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/PipingSellmeijerVnkTests.cs	(.../PipingSellmeijerVnkTests.cs)	(revision 2111)
@@ -64,20 +64,20 @@
             // Heave Factor = 90.0
             Assert.IsNotNull(outputString);
             var output = DamXmlSerialization.LoadOutputFromXmlString(outputString);
-            Assert.AreEqual(0.463, output.Results.CalculationResults.DesignResults[0].PipingDesignResults.SellmeijerVnkFactor, tolerance);
-            Assert.AreEqual(1.759, output.Results.CalculationResults.DesignResults[0].PipingDesignResults.SellmeijerVnkHcritical, tolerance);
-            Assert.AreEqual(35.0, output.Results.CalculationResults.DesignResults[0].PipingDesignResults.ExitPointX, tolerance);
+            Assert.AreEqual(0.463, output.Results.CalculationResults[0].PipingDesignResults.SellmeijerVnkFactor, tolerance);
+            Assert.AreEqual(1.759, output.Results.CalculationResults[0].PipingDesignResults.SellmeijerVnkHcritical, tolerance);
+            Assert.AreEqual(35.0, output.Results.CalculationResults[0].PipingDesignResults.ExitPointX, tolerance);
             // The following values are not the same as in the classic UI
             // The upliftfactor there is 0.351, but that is the Wti Upliftfactor
             // The adjusted PL3/PL4 values there are not 0.0, but those are the values for stability; for piping no adjustment has to be made
-            Assert.AreEqual(0.5825, output.Results.CalculationResults.DesignResults[0].PipingDesignResults.UpliftFactor, tolerance);
-            Assert.AreEqual(true, output.Results.CalculationResults.DesignResults[0].PipingDesignResults.UpliftSituation.IsUplift);
-            Assert.AreEqual(0.0, output.Results.CalculationResults.DesignResults[0].PipingDesignResults.UpliftSituation.Pl3MinUplift, tolerance);
-            Assert.AreEqual(0.0, output.Results.CalculationResults.DesignResults[0].PipingDesignResults.UpliftSituation.Pl3HeadAdjusted, tolerance);
-            Assert.AreEqual(0.0, output.Results.CalculationResults.DesignResults[0].PipingDesignResults.UpliftSituation.Pl3LocationXMinUplift, tolerance);
-            Assert.AreEqual(0.0, output.Results.CalculationResults.DesignResults[0].PipingDesignResults.UpliftSituation.Pl4MinUplift, tolerance);
-            Assert.AreEqual(0.0, output.Results.CalculationResults.DesignResults[0].PipingDesignResults.UpliftSituation.Pl4HeadAdjusted, tolerance);
-            Assert.AreEqual(0.0, output.Results.CalculationResults.DesignResults[0].PipingDesignResults.UpliftSituation.Pl4LocationXMinUplift, tolerance);
+            Assert.AreEqual(0.5825, output.Results.CalculationResults[0].PipingDesignResults.UpliftFactor, tolerance);
+            Assert.AreEqual(true, output.Results.CalculationResults[0].PipingDesignResults.UpliftSituation.IsUplift);
+            Assert.AreEqual(0.0, output.Results.CalculationResults[0].PipingDesignResults.UpliftSituation.Pl3MinUplift, tolerance);
+            Assert.AreEqual(0.0, output.Results.CalculationResults[0].PipingDesignResults.UpliftSituation.Pl3HeadAdjusted, tolerance);
+            Assert.AreEqual(0.0, output.Results.CalculationResults[0].PipingDesignResults.UpliftSituation.Pl3LocationXMinUplift, tolerance);
+            Assert.AreEqual(0.0, output.Results.CalculationResults[0].PipingDesignResults.UpliftSituation.Pl4MinUplift, tolerance);
+            Assert.AreEqual(0.0, output.Results.CalculationResults[0].PipingDesignResults.UpliftSituation.Pl4HeadAdjusted, tolerance);
+            Assert.AreEqual(0.0, output.Results.CalculationResults[0].PipingDesignResults.UpliftSituation.Pl4LocationXMinUplift, tolerance);
         }
 
         [Test]
@@ -97,7 +97,7 @@
             DamProjectData actualDamProjectData = FillDamFromXmlOutput.CreateDamProjectData(null, output);
             SurfaceLine2 redesignedSurfaceLine = actualDamProjectData.DesignCalculations[0].PipingDesignResults.RedesignedSurfaceLine;
             // uplift = true
-            Assert.AreEqual(true, output.Results.CalculationResults.DesignResults[0].PipingDesignResults.UpliftSituation.IsUplift);
+            Assert.AreEqual(true, output.Results.CalculationResults[0].PipingDesignResults.UpliftSituation.IsUplift);
             // shoulder height = 1.995
             Assert.AreEqual(1.995, redesignedSurfaceLine.DetermineShoulderHeight(), tolerance);
             // dike length = 84.486
@@ -107,17 +107,17 @@
             // Read from PipingSellmeijerVNK_Piping_CharacteristicPoints.csv by export surfacelines in Release
             Assert.AreEqual(53.5, redesignedSurfaceLine.DetermineShoulderLength(), tolerance);
 
-            Assert.AreEqual(0.0, output.Results.CalculationResults.DesignResults[0].PipingDesignResults.UpliftSituation.Pl3MinUplift, tolerance);
-            Assert.AreEqual(0.0, output.Results.CalculationResults.DesignResults[0].PipingDesignResults.UpliftSituation.Pl3HeadAdjusted, tolerance);
-            Assert.AreEqual(0.0, output.Results.CalculationResults.DesignResults[0].PipingDesignResults.UpliftSituation.Pl3LocationXMinUplift, tolerance);
-            Assert.AreEqual(0.0, output.Results.CalculationResults.DesignResults[0].PipingDesignResults.UpliftSituation.Pl4MinUplift, tolerance);
-            Assert.AreEqual(0.0, output.Results.CalculationResults.DesignResults[0].PipingDesignResults.UpliftSituation.Pl4HeadAdjusted, tolerance);
-            Assert.AreEqual(0.0, output.Results.CalculationResults.DesignResults[0].PipingDesignResults.UpliftSituation.Pl4LocationXMinUplift, tolerance);
+            Assert.AreEqual(0.0, output.Results.CalculationResults[0].PipingDesignResults.UpliftSituation.Pl3MinUplift, tolerance);
+            Assert.AreEqual(0.0, output.Results.CalculationResults[0].PipingDesignResults.UpliftSituation.Pl3HeadAdjusted, tolerance);
+            Assert.AreEqual(0.0, output.Results.CalculationResults[0].PipingDesignResults.UpliftSituation.Pl3LocationXMinUplift, tolerance);
+            Assert.AreEqual(0.0, output.Results.CalculationResults[0].PipingDesignResults.UpliftSituation.Pl4MinUplift, tolerance);
+            Assert.AreEqual(0.0, output.Results.CalculationResults[0].PipingDesignResults.UpliftSituation.Pl4HeadAdjusted, tolerance);
+            Assert.AreEqual(0.0, output.Results.CalculationResults[0].PipingDesignResults.UpliftSituation.Pl4LocationXMinUplift, tolerance);
 
             // The ExitPointX in Dam 15.1.2.24738 is (incorrectly) not shown
             // ExitPointX = X_Teen dijk binnenwaarts = 94.486
             // Read from PipingSellmeijerVNK_Piping_CharacteristicPoints.csv by export surfacelines in Release
-            Assert.AreEqual(94.486, output.Results.CalculationResults.DesignResults[0].PipingDesignResults.ExitPointX, tolerance);
+            Assert.AreEqual(94.486, output.Results.CalculationResults[0].PipingDesignResults.ExitPointX, tolerance);
 
             // The following values are not the same as in the Dam 15.1.2.24738 release
             // The final piping calculation at the redesigned situation is done at X = 29.014 (the "insteek van de berm"), 
@@ -127,14 +127,14 @@
 
             // The Factor in Dam 15.1.2.24738 is 1.167, but that is not correct, because that is the value at X = 29.014
             // expected value = 1.070
-            Assert.AreEqual(1.070, output.Results.CalculationResults.DesignResults[0].PipingDesignResults.SellmeijerVnkFactor, tolerance);
+            Assert.AreEqual(1.070, output.Results.CalculationResults[0].PipingDesignResults.SellmeijerVnkFactor, tolerance);
             // The Hcritical in Dam 15.1.2.24738 is 2.105, but that is not correct, because that is the value at X = 29.014
             // expected value = 4.067
-            Assert.AreEqual(4.067, output.Results.CalculationResults.DesignResults[0].PipingDesignResults.SellmeijerVnkHcritical, tolerance);
+            Assert.AreEqual(4.067, output.Results.CalculationResults[0].PipingDesignResults.SellmeijerVnkHcritical, tolerance);
 
             // The upliftfactor in Dam 15.1.2.24738 is (incorrectly) not shown
             // expected value = 0.582
-            Assert.AreEqual(0.582, output.Results.CalculationResults.DesignResults[0].PipingDesignResults.UpliftFactor, tolerance);
+            Assert.AreEqual(0.582, output.Results.CalculationResults[0].PipingDesignResults.UpliftFactor, tolerance);
         }
 
         [Test]
@@ -151,11 +151,11 @@
             Assert.IsNotNull(outputString);
             var output = DamXmlSerialization.LoadOutputFromXmlString(outputString);
 
-            Assert.AreEqual(CalculationResult.RunFailed, ConversionHelper.ConvertToCalculationResult(output.Results.CalculationResults.DesignResults[0].CalculationResult));
+            Assert.AreEqual(CalculationResult.RunFailed, ConversionHelper.ConvertToCalculationResult(output.Results.CalculationResults[0].CalculationResult));
             // expected value = -1 because exception was raised for the shoulder length
-            Assert.AreEqual(-1.0, output.Results.CalculationResults.DesignResults[0].PipingDesignResults.SellmeijerVnkFactor, tolerance);
+            Assert.AreEqual(-1.0, output.Results.CalculationResults[0].PipingDesignResults.SellmeijerVnkFactor, tolerance);
             Assert.AreEqual("The new shoulder length is too large to fit in the current surface line.", 
-                output.Results.CalculationResults.DesignResults[0].PipingDesignResults.ResultMessage);
+                output.Results.CalculationResults[0].PipingDesignResults.ResultMessage);
             Assert.AreEqual("Location 'Profiel 1', subsoil scenario 'soilprofile_01', design scenario '1': " +
                             "The calculation failed with error message " +
                             "'The design was not successful. " +
@@ -177,9 +177,9 @@
             Assert.IsNotNull(outputString);
             var output = DamXmlSerialization.LoadOutputFromXmlString(outputString);
 
-            Assert.AreEqual(CalculationResult.Succeeded, ConversionHelper.ConvertToCalculationResult(output.Results.CalculationResults.DesignResults[0].CalculationResult));
-            Assert.AreEqual(true, output.Results.CalculationResults.DesignResults[0].PipingDesignResults.SellmeijerVnkFactor > -1);
-            Assert.AreEqual("", output.Results.CalculationResults.DesignResults[0].PipingDesignResults.ResultMessage);
+            Assert.AreEqual(CalculationResult.Succeeded, ConversionHelper.ConvertToCalculationResult(output.Results.CalculationResults[0].CalculationResult));
+            Assert.AreEqual(true, output.Results.CalculationResults[0].PipingDesignResults.SellmeijerVnkFactor > -1);
+            Assert.AreEqual("", output.Results.CalculationResults[0].PipingDesignResults.ResultMessage);
         }
 
     }