Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/Properties/Resources.resx
===================================================================
diff -u -r1137 -r1141
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/Properties/Resources.resx	(.../Resources.resx)	(revision 1137)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/Properties/Resources.resx	(.../Resources.resx)	(revision 1141)
@@ -241,7 +241,7 @@
     <value>The new shoulder width is too large to fit in the current surface line.</value>
   </data>
   <data name="DamPipingBlighKernelWrapper_NoDamInputObjectDefinedForBligh" xml:space="preserve">
-    <value>No input object defined for Bligh</value>
+    <value>No Dam input object defined for Bligh</value>
   </data>
   <data name="DesignUnsuccessful" xml:space="preserve">
     <value>The design was not successful in location '{0}', soilprofile '{1}'</value>
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamPipingBligh/DamPipingBlighKernelWrapperTests.cs
===================================================================
diff -u -r1137 -r1141
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamPipingBligh/DamPipingBlighKernelWrapperTests.cs	(.../DamPipingBlighKernelWrapperTests.cs)	(revision 1137)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamPipingBligh/DamPipingBlighKernelWrapperTests.cs	(.../DamPipingBlighKernelWrapperTests.cs)	(revision 1141)
@@ -58,11 +58,6 @@
                 }
             };
 
-            var designScenario = new DesignScenario
-            {
-                LocationScenarioID = "1",
-                Location = location,
-            };
             var damFailureMechanismeCalculationSpecification = new DamFailureMechanismeCalculationSpecification()
             {
                 FailureMechanismSystemType = FailureMechanismSystemType.Piping,
@@ -100,8 +95,13 @@
             Assert.AreEqual(2.25, damPipingOutput.Hc, diff);
 
             // Fill the design results
+            var designScenario = new DesignScenario
+            {
+                LocationScenarioID = "1",
+                Location = location,
+            };
             List<DesignResult> results;
-            kernelWrapper.PostProcess(damKernelInput, damPipingOutput, null, "", out results);
+            kernelWrapper.PostProcess(damKernelInput, damPipingOutput, designScenario, "", out results);
             foreach (var result in results)
             {
                 Assert.AreEqual(FailureMechanismSystemType.Piping, result.DamFailureMechanismeCalculation.FailureMechanismSystemType);
@@ -220,8 +220,13 @@
                 CalculationResult = calculationResult
             };
 
+            var designScenario = new DesignScenario
+            {
+                LocationScenarioID = "1",
+                Location = new Location(),
+            };
             List<DesignResult> results;
-            kernelWrapper.PostProcess(input, output, null, "", out results);
+            kernelWrapper.PostProcess(input, output, designScenario, "", out results);
             foreach (var result in results)
             {
                 Assert.AreEqual(output.FoSp, result.PipingDesignResults.BlighFactor);
@@ -267,7 +272,7 @@
         }
 
         [Test]
-        [ExpectedException(typeof(NoNullAllowedException), ExpectedMessage = "Geen invoer object gedefinieerd voor Bligh")]
+        [ExpectedException(typeof(NoNullAllowedException), ExpectedMessage = "Geen Dam invoer object gedefinieerd voor Bligh")]
         [SetUICulture("nl-NL")]
         public void TestThrowsExceptionInPostProcessWhenInputIsNull()
         {
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamPipingSellmeijer4Forces/DamPipingSellmeijer4ForcesKernelWrapperTests.cs
===================================================================
diff -u -r1137 -r1141
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamPipingSellmeijer4Forces/DamPipingSellmeijer4ForcesKernelWrapperTests.cs	(.../DamPipingSellmeijer4ForcesKernelWrapperTests.cs)	(revision 1137)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamPipingSellmeijer4Forces/DamPipingSellmeijer4ForcesKernelWrapperTests.cs	(.../DamPipingSellmeijer4ForcesKernelWrapperTests.cs)	(revision 1141)
@@ -54,17 +54,17 @@
 
             var location = new Location("Location 1")
             {
-                SurfaceLine = FactoryForSurfaceLines.CreateSurfaceLineTutorial1()
+                SurfaceLine = FactoryForSurfaceLines.CreateSurfaceLineTutorial1(),
+                ModelFactors =
+                {
+                    UpliftCriterionPiping = 1.0
+                }
             };
 
             var designScenario = new DesignScenario
             {
                 LocationScenarioID = "1", 
                 Location = location,
-                ModelFactors =
-                {
-                    UpliftCriterionPiping = 1.0
-                }
             };
 
             var subSoilScenario = new SoilGeometryProbability();
@@ -104,7 +104,7 @@
 
             // Fill the design results
             List<DesignResult> results;
-            kernelWrapper.PostProcess(damKernelInput, damPipingOutput, null, "", out results);
+            kernelWrapper.PostProcess(damKernelInput, damPipingOutput, designScenario, "", out results);
             foreach (var result in results)
             {
                 Assert.AreEqual(FailureMechanismSystemType.Piping, result.DamFailureMechanismeCalculation.FailureMechanismSystemType);
@@ -129,13 +129,15 @@
         {
             const double diff = 0.0001;
 
-            var designScenario = new DesignScenario();
-            designScenario.Location = new Location();
-            designScenario.ModelFactors.UpliftCriterionPiping = 1.0;
+            var location = new Location
+            {
+                SurfaceLine = FactoryForSurfaceLines.CreateSurfaceLineTutorial1(),
+                ModelFactors =
+                {
+                    UpliftCriterionPiping = 1.0
+                }
+            };
 
-            var location = new Location();
-            location.SurfaceLine = FactoryForSurfaceLines.CreateSurfaceLineTutorial1();
-
             var subSoilScenario = new SoilGeometryProbability();
             subSoilScenario.SoilProfile1D = FactoryForSoilProfiles.CreatePipingSellmeijerProfileWithOneSandlayer();
             subSoilScenario.SegmentFailureMechanismType = FailureMechanismSystemType.Piping;
@@ -235,8 +237,12 @@
                 CalculationResult = calculationResult
             };
 
+            var designScenario = new DesignScenario
+            {
+                Location = input.Location
+            };
             List<DesignResult> results;
-            kernelWrapper.PostProcess(input, output, null, "", out results);
+            kernelWrapper.PostProcess(input, output, designScenario, "", out results);
             foreach (var result in results)
             {
                 Assert.AreEqual(output.FoSp, result.PipingDesignResults.Sellmeijer4ForcesFactor);
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamPipingSellmeijerVnk/DamPipingSellmeijerVnkKernelWrapperTests.cs
===================================================================
diff -u -r1137 -r1141
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamPipingSellmeijerVnk/DamPipingSellmeijerVnkKernelWrapperTests.cs	(.../DamPipingSellmeijerVnkKernelWrapperTests.cs)	(revision 1137)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamPipingSellmeijerVnk/DamPipingSellmeijerVnkKernelWrapperTests.cs	(.../DamPipingSellmeijerVnkKernelWrapperTests.cs)	(revision 1141)
@@ -77,7 +77,11 @@
 
             var location = new Location("Location 1")
             {
-                SurfaceLine = FactoryForSurfaceLines.CreateSurfaceLineTutorial1()
+                SurfaceLine = FactoryForSurfaceLines.CreateSurfaceLineTutorial1(),
+                ModelFactors =
+                {
+                    UpliftCriterionPiping = 1.0
+                }
             };
 
             var designScenario = new DesignScenario
@@ -127,7 +131,7 @@
 
             // Fill the design results
             List<DesignResult> results;
-            kernelWrapper.PostProcess(damKernelInput, damPipingOutput, null, "", out results);
+            kernelWrapper.PostProcess(damKernelInput, damPipingOutput, designScenario, "", out results);
             foreach (var result in results)
             {
                 Assert.AreEqual(FailureMechanismSystemType.Piping, result.DamFailureMechanismeCalculation.FailureMechanismSystemType);
@@ -156,8 +160,14 @@
             designScenario.Location = new Location();
             designScenario.ModelFactors.UpliftCriterionPiping = 1.0;
 
-            var location = new Location();
-            location.SurfaceLine = FactoryForSurfaceLines.CreateSurfaceLineTutorial1();
+            var location = new Location
+            {
+                SurfaceLine = FactoryForSurfaceLines.CreateSurfaceLineTutorial1(),
+                ModelFactors =
+                {
+                    UpliftCriterionPiping = 1.0
+                }
+            };
 
             var subSoilScenario = new SoilGeometryProbability();
             subSoilScenario.SoilProfile1D = FactoryForSoilProfiles.CreatePipingSellmeijerProfileWithTwoSandlayers();
@@ -268,8 +278,12 @@
                 CalculationResult = calculationResult
             };
 
+            var designScenario = new DesignScenario
+            {
+                Location = input.Location
+            };
             List<DesignResult> results;
-            kernelWrapper.PostProcess(input, output, null, "", out results);
+            kernelWrapper.PostProcess(input, output, designScenario, "", out results);
             foreach (var result in results)
             {
                 Assert.AreEqual(output.FoSp, result.PipingDesignResults.SellmeijerVnkFactor);
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/Properties/Resources.Designer.cs
===================================================================
diff -u -r1137 -r1141
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 1137)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 1141)
@@ -117,7 +117,7 @@
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to No input object defined for Bligh.
+        ///   Looks up a localized string similar to No Dam input object defined for Bligh.
         /// </summary>
         internal static string DamPipingBlighKernelWrapper_NoDamInputObjectDefinedForBligh {
             get {