Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/WtiPipingSellmeijerRevisedTests.cs
===================================================================
diff -u -r2016 -r2024
--- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/WtiPipingSellmeijerRevisedTests.cs	(.../WtiPipingSellmeijerRevisedTests.cs)	(revision 2016)
+++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/WtiPipingSellmeijerRevisedTests.cs	(.../WtiPipingSellmeijerRevisedTests.cs)	(revision 2024)
@@ -23,42 +23,25 @@
             EngineInterface engineInterface = new EngineInterface(inputString);
             Assert.IsNotNull(engineInterface.DamProjectData);
             string outputString = engineInterface.Run();
-            // values below are the results for Bligh, run with Dam 15.1.2.24738 release
-            // Factor piping = 0.521 
-            // Kritische hoogte = 1.667
-            // Factor opdrijven = 0.582
-            // Kwelweglengte piping = 25.0
-            // Intredepunt x-lokaal = 10.0
-            // Uittredepunt x-lokaal = 35.0
-            // Opdrijven = true
-            // Profielnaam = soilprofile_01
-            // PL3 opdrijven = 0.582
-            // PL3 stijghoogte aangepast = 1.262
-            // PL3 locatie opdrijven lokaal = 35.0
-            // PL4 opdrijven = 0.0
-            // PL4 stijghoogte aangepast = 0.0
-            // PL4 locatie opdrijven lokaal = 0.0
-            // Locatie naam = "profiel 1"
-            // ID locatie scenario = "1"
-            // Heave Factor = 90.0
             Assert.IsNotNull(outputString);
             var output = DamXmlSerialization.LoadOutputFromXmlString(outputString);
             DamProjectData actualDamProjectData = FillDamFromXmlOutput.CreateDamProjectData(null, output);
             SurfaceLine2 redesignedSurfaceLine = actualDamProjectData.DesignCalculations[0].PipingDesignResults.RedesignedSurfaceLine;
-            // When run with WtiSellmeijerRevised, Piping factor = 0.432
+            
+            // The expected values below where calculated with DamEngine rev.2012,
+            // Piping factor = 0.432
             Assert.AreEqual(0.432, output.Results.CalculationResults.DesignResults[0].PipingDesignResults.Wti2017FactorOverall, tolerance);
-            // When run with WtiSellmeijerRevised, H critical = 1.983
+            // H critical = 1.983
             Assert.AreEqual(1.983, output.Results.CalculationResults.DesignResults[0].PipingDesignResults.Wti2017HcriticalOverall, tolerance);
+            // Piping exit point = 35.0
             Assert.AreEqual(35.0, output.Results.CalculationResults.DesignResults[0].PipingDesignResults.ExitPointX, tolerance);
+            // Dike length = 25.00
             Assert.AreEqual(25.00, redesignedSurfaceLine.GetDikeLength(), tolerance);
+            // Uplift = true
             Assert.AreEqual(true, output.Results.CalculationResults.DesignResults[0].PipingDesignResults.UpliftSituation.IsUplift);
-
-            // The following values are not the same as in the Dam 15.1.2.24738 release (but explainable)
-
-            // The upliftfactor in Dam 15.1.2.24738 is 0.351, but that is the Wti Upliftfactor
+            // Uplift factor = 0.582
             Assert.AreEqual(0.582, output.Results.CalculationResults.DesignResults[0].PipingDesignResults.UpliftFactor, tolerance);
-
-            // The adjusted PL3/PL4 values in Dam 15.1.2.24738 are not 0.0, but those are the values for stability; for piping no adjustment has to be made
+            // The adjusted PL3/PL4: for piping no adjustment has to be made
             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);
@@ -82,25 +65,32 @@
             var output = DamXmlSerialization.LoadOutputFromXmlString(outputString);
             DamProjectData actualDamProjectData = FillDamFromXmlOutput.CreateDamProjectData(null, output);
             SurfaceLine2 redesignedSurfaceLine = actualDamProjectData.DesignCalculations[0].PipingDesignResults.RedesignedSurfaceLine;
+
+            // The expected values below where calculated with DamEngine rev.2012,
             Assert.AreEqual(true, output.Results.CalculationResults.DesignResults[0].PipingDesignResults.UpliftSituation.IsUplift);
+            // Shoulder height = 1.995
             Assert.AreEqual(1.995, redesignedSurfaceLine.DetermineShoulderHeight(), tolerance);
-            // When run with WtiSellmeijerRevised, Dike length = 83.986
+            // Dike length = 83.986
             Assert.AreEqual(83.986, redesignedSurfaceLine.GetDikeLength(), tolerance);
-            // When run with WtiSellmeijerRevised, Shoulder length = 53.0
+            // Shoulder length = 53.0
             Assert.AreEqual(53.0, redesignedSurfaceLine.DetermineShoulderLength(), tolerance);
+            // Piping factor = 1.280
+            Assert.AreEqual(1.280, output.Results.CalculationResults.DesignResults[0].PipingDesignResults.Wti2017FactorOverall, tolerance);
+            // H critical = 4.697
+            Assert.AreEqual(4.697, output.Results.CalculationResults.DesignResults[0].PipingDesignResults.Wti2017HcriticalOverall, tolerance);
+            // When run with WtiSellmeijerRevised, Piping exit point X = 93.986
+            Assert.AreEqual(93.986, output.Results.CalculationResults.DesignResults[0].PipingDesignResults.ExitPointX, tolerance);
+            // Uplift = true
+            Assert.AreEqual(true, output.Results.CalculationResults.DesignResults[0].PipingDesignResults.UpliftSituation.IsUplift);
+            // Uplift factor = 0.582
+            Assert.AreEqual(0.5825, output.Results.CalculationResults.DesignResults[0].PipingDesignResults.UpliftFactor, tolerance);
+            // The adjusted PL3/PL4: for piping no adjustment has to be made
             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);
-            // When run with WtiSellmeijerRevised, Piping factor = 1.280
-            Assert.AreEqual(1.280, output.Results.CalculationResults.DesignResults[0].PipingDesignResults.Wti2017FactorOverall, tolerance);
-            // When run with WtiSellmeijerRevised, H critical = 4.697
-            Assert.AreEqual(4.697, output.Results.CalculationResults.DesignResults[0].PipingDesignResults.Wti2017HcriticalOverall, tolerance);
-            Assert.AreEqual(0.5825, output.Results.CalculationResults.DesignResults[0].PipingDesignResults.UpliftFactor, tolerance);
-            // When run with WtiSellmeijerRevised, Piping exit point X = 93.986
-            Assert.AreEqual(93.986, output.Results.CalculationResults.DesignResults[0].PipingDesignResults.ExitPointX, tolerance);
         }
 
         [Test]
@@ -117,12 +107,16 @@
             string outputString = engineInterface.Run();
             Assert.IsNotNull(outputString);
             var output = DamXmlSerialization.LoadOutputFromXmlString(outputString);
+
+            // The expected values below where calculated with DamEngine rev.2016,
             Assert.AreEqual(122, output.Results.CalculationResults.DesignResults.Length);
+            // result 1: safety factor = 90.000
             Assert.AreEqual(90.000, output.Results.CalculationResults.DesignResults[0].PipingDesignResults.Wti2017FactorOverall, tolerance);
+            // result 2: safety factor = 58.243
             Assert.AreEqual(58.241, output.Results.CalculationResults.DesignResults[2].PipingDesignResults.Wti2017FactorOverall, tolerance);
+            // result 3: safety factor = 90.000
             Assert.AreEqual(90.000, output.Results.CalculationResults.DesignResults[121].PipingDesignResults.Wti2017FactorOverall, tolerance);
         }
 
-
     }
 }