Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MultiCoreMacroStabilityTests.cs
===================================================================
diff -u -r4415 -r4427
--- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MultiCoreMacroStabilityTests.cs	(.../MultiCoreMacroStabilityTests.cs)	(revision 4415)
+++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MultiCoreMacroStabilityTests.cs	(.../MultiCoreMacroStabilityTests.cs)	(revision 4427)
@@ -48,13 +48,13 @@
     [OneTimeSetUp]
     public void Setup()
     {
-        RemoveTestWorkingDirectory(testWorkingFolder); // to be sure no test directory exist from previous tests
+        RemoveTestWorkingDirectory(); // to be sure no test directory exist from previous tests
     }
 
     [OneTimeTearDown]
     public void TearDown()
     {
-        RemoveTestWorkingDirectory(testWorkingFolder); // to be sure no test directory exist after the tests
+        RemoveTestWorkingDirectory(); // to be sure no test directory exist after the tests
     }
 
     [Test, Category("MultiCore")]
@@ -93,8 +93,8 @@
                 numberOfResults += resultSerie.Entries.TimeSerieEntry.Length;
                 foreach (TimeSerieEntriesTimeSerieEntry timeSerieEntriesTimeSerieEntry in resultSerie.Entries.TimeSerieEntry)
                 {
-                    if (!Double.IsNaN(timeSerieEntriesTimeSerieEntry.Value) && (timeSerieEntriesTimeSerieEntry.Value > 0) &&
-                        (timeSerieEntriesTimeSerieEntry.Value < 100000))
+                    if (!Double.IsNaN(timeSerieEntriesTimeSerieEntry.Value) && 
+                        timeSerieEntriesTimeSerieEntry.Value is > 0 and < 100000)
                     {
                         numberOfRealResults++;
                     }
@@ -141,8 +141,8 @@
                 numberOfResults += resultSerie.Entries.TimeSerieEntry.Length;
                 foreach (TimeSerieEntriesTimeSerieEntry timeSerieEntriesTimeSerieEntry in resultSerie.Entries.TimeSerieEntry)
                 {
-                    if (!Double.IsNaN(timeSerieEntriesTimeSerieEntry.Value) && (timeSerieEntriesTimeSerieEntry.Value > 0) &&
-                      (timeSerieEntriesTimeSerieEntry.Value < 100000)) 
+                    if (!Double.IsNaN(timeSerieEntriesTimeSerieEntry.Value) && 
+                        timeSerieEntriesTimeSerieEntry.Value is > 0 and < 100000) 
                     {
                         numberOfRealResults++;
                     }
@@ -278,18 +278,23 @@
         
     }
     
-    [Test]
+    [Test, Category("MultiCore")]
     [TestCase(1)]
     [TestCase(4)]
     [TestCase(16)]
-    public void DesignBishopWithScenariosForHeadPL3CalculatesCorrect(int maxCores)
+    public void DesignBishopWithScenariosForHeadPl3CalculatesCorrect(int maxCores)
     {
         const string inputFilename = "InputFileMultiCoreTestForScenario.xml";
         string fullInputFilename = Path.Combine(mapTestFiles, inputFilename);
         Thread.CurrentThread.CurrentCulture = CultureInfo.InvariantCulture;
         string inputString = File.ReadAllText(fullInputFilename);
-        var engineInterface = new EngineInterface(inputString);
-        engineInterface.DamProjectData.MaxCalculationCores = maxCores;
+        var engineInterface = new EngineInterface(inputString)
+        {
+            DamProjectData =
+            {
+                MaxCalculationCores = maxCores
+            }
+        };
         var calcDir = engineInterface.DamProjectData.CalculationMap + "_Cores_" + maxCores; 
         engineInterface.DamProjectData.CalculationMap = calcDir;
         Assert.IsNotNull(engineInterface.DamProjectData);
@@ -419,21 +424,26 @@
         }
     }
     
-    [Test]
+    [Test, Category("MultiCore")]
     [TestCase(1, true)]
     [TestCase(4, true)]
     [TestCase(16, true)]
     [TestCase(1, false)]
     [TestCase(4, false), Category("Work_In_Progress")]
     [TestCase(16, false), Category("Work_In_Progress")]
-    public void DesignBishopAdaptionWithScenariosForHeadPL3CalculatesCorrect(int maxCores, bool justOneScenario)
+    public void DesignBishopAdaptionWithScenariosForHeadPl3CalculatesCorrect(int maxCores, bool justOneScenario)
     {
         const string inputFilename = "InputFileMultiCoreTestForScenarioAdaption.xml";
         string fullInputFilename = Path.Combine(mapTestFiles, inputFilename);
         Thread.CurrentThread.CurrentCulture = CultureInfo.InvariantCulture;
         string inputString = File.ReadAllText(fullInputFilename);
-        var engineInterface = new EngineInterface(inputString);
-        engineInterface.DamProjectData.MaxCalculationCores = maxCores;
+        var engineInterface = new EngineInterface(inputString)
+        {
+            DamProjectData =
+            {
+                MaxCalculationCores = maxCores
+            }
+        };
         var calcDir = engineInterface.DamProjectData.CalculationMap + "_Cores_" + maxCores;
         if (justOneScenario)
         {
@@ -465,121 +475,150 @@
             Assert.AreEqual(18, output.Results.CalculationResults.Length);
             Assert.AreEqual(3299, output.Results.CalculationMessages.Length);
         }
+
+        int resultsFound = 0;
         foreach (var designResult in output.Results.CalculationResults)
         {
-            if (designResult.BaseFileName.Equals("Loc(KR093_0013)_Sce(3)_Pro(segment_627_1D1-KR093_0013-1)_Ite23"))
+            if (designResult.BaseFileName.Equals("Loc(KR093_0013)_Sce(3)_Pro(segment_627_1D1-KR093_0013-1)_Ite(4)"))
             {
-                Assert.AreEqual(9.300, designResult.StabilityDesignResults.SafetyFactor, tolerance);
+                Assert.AreEqual(5.306, designResult.StabilityDesignResults.SafetyFactor, tolerance);
                 Assert.AreEqual("3", designResult.ScenarioName);
-                Assert.AreEqual(-0.94, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits);                    
+                Assert.AreEqual(-0.94, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits);
+                resultsFound++;
             }
-            if (designResult.BaseFileName.Equals("Loc(KR093_0013)_Sce(4)_Pro(segment_627_1D1-KR093_0013-1)"))
+            if (designResult.BaseFileName.Equals("Loc(KR093_0013)_Sce(4)_Pro(segment_627_1D1-KR093_0013-1)_Ite(4)"))
             {
-                Assert.AreEqual(7.888, designResult.StabilityDesignResults.SafetyFactor, tolerance);
+                Assert.AreEqual(4.986, designResult.StabilityDesignResults.SafetyFactor, tolerance);
                 Assert.AreEqual("4", designResult.ScenarioName);
-                Assert.AreEqual(-0.37, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits);                    
+                Assert.AreEqual(-0.37, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits);
+                resultsFound++;
             }
-            if (designResult.BaseFileName.Equals("Loc(KR093_0013)_Sce(3)_Pro(segment_627_1D2-KR093_0013-2)"))
+            if (designResult.BaseFileName.Equals("Loc(KR093_0013)_Sce(3)_Pro(segment_627_1D2-KR093_0013-2)_Ite(3)"))
             {
-                Assert.AreEqual(7.023, designResult.StabilityDesignResults.SafetyFactor, tolerance);
+                Assert.AreEqual(5.155, designResult.StabilityDesignResults.SafetyFactor, tolerance);
                 Assert.AreEqual("3", designResult.ScenarioName);
-                Assert.AreEqual(-0.94, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits);                    
+                Assert.AreEqual(-0.94, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits);
+                resultsFound++;
             }
-            if (designResult.BaseFileName.Equals("Loc(KR093_0013)_Sce(4)_Pro(segment_627_1D2-KR093_0013-2)"))
+            if (designResult.BaseFileName.Equals("Loc(KR093_0013)_Sce(4)_Pro(segment_627_1D2-KR093_0013-2)_Ite(4)"))
             {
-                Assert.AreEqual(5.968, designResult.StabilityDesignResults.SafetyFactor, tolerance);
+                Assert.AreEqual(5.194, designResult.StabilityDesignResults.SafetyFactor, tolerance);
                 Assert.AreEqual("4", designResult.ScenarioName);
-                Assert.AreEqual(-0.37, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits);                    
+                Assert.AreEqual(-0.37, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits);
+                resultsFound++;
             }
-            if (designResult.BaseFileName.Equals("Loc(KR093_0013)_Sce(3)_Pro(segment_627_1D3-KR093_0013-3)"))
+            if (designResult.BaseFileName.Equals("Loc(KR093_0013)_Sce(3)_Pro(segment_627_1D3-KR093_0013-3)_Ite(3)"))
             {
-                Assert.AreEqual(7.555, designResult.StabilityDesignResults.SafetyFactor, tolerance);
+                Assert.AreEqual(5.188, designResult.StabilityDesignResults.SafetyFactor, tolerance);
                 Assert.AreEqual("3", designResult.ScenarioName);
-                Assert.AreEqual(-0.94, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits);                    
+                Assert.AreEqual(-0.94, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits);
+                resultsFound++;
             }
-            if (designResult.BaseFileName.Equals("Loc(KR093_0013)_Sce(4)_Pro(segment_627_1D3-KR093_0013-3)"))
+            if (designResult.BaseFileName.Equals("Loc(KR093_0013)_Sce(4)_Pro(segment_627_1D3-KR093_0013-3)_Ite(4)"))
             {
-                Assert.AreEqual(6.477, designResult.StabilityDesignResults.SafetyFactor, tolerance);
+                Assert.AreEqual(5.194, designResult.StabilityDesignResults.SafetyFactor, tolerance);
                 Assert.AreEqual("4", designResult.ScenarioName);
-                Assert.AreEqual(-0.37, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits);                    
+                Assert.AreEqual(-0.37, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits);
+                resultsFound++;
             }
-            if (designResult.BaseFileName.Equals("Loc(KR093_0018)_Sce(3)_Pro(segment_629_1D1-KR093_0018-1)"))
+            if (designResult.BaseFileName.Equals("Loc(KR093_0018)_Sce(3)_Pro(segment_629_1D1-KR093_0018-1)_Ite(29)"))
             {
-                Assert.AreEqual(7.353, designResult.StabilityDesignResults.SafetyFactor, tolerance);
+                Assert.AreEqual(1.752, designResult.StabilityDesignResults.SafetyFactor, tolerance);
                 Assert.AreEqual("3", designResult.ScenarioName);
-                Assert.AreEqual(-1.00, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits);                    
+                Assert.AreEqual(-1.00, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits);
+                resultsFound++;
             }
-            if (designResult.BaseFileName.Equals("Loc(KR093_0018)_Sce(4)_Pro(segment_629_1D1-KR093_0018-1)"))
+            if (designResult.BaseFileName.Equals("Loc(KR093_0018)_Sce(4)_Pro(segment_629_1D1-KR093_0018-1)_Ite(29)"))
             {
-                Assert.AreEqual(6.278, designResult.StabilityDesignResults.SafetyFactor, tolerance);
+                Assert.AreEqual(1.270, designResult.StabilityDesignResults.SafetyFactor, tolerance);
                 Assert.AreEqual("4", designResult.ScenarioName);
-                Assert.AreEqual(-0.61, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits);                    
+                Assert.AreEqual(-0.52, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits);
+                resultsFound++;
             }
-            if (designResult.BaseFileName.Equals("Loc(KR093_0018)_Sce(3)_Pro(segment_629_1D2-KR093_0018-2)"))
+            if (designResult.BaseFileName.Equals("Loc(KR093_0018)_Sce(3)_Pro(segment_629_1D2-KR093_0018-2)_Ite(29)"))
             {
-                Assert.AreEqual(5.945, designResult.StabilityDesignResults.SafetyFactor, tolerance);
+                Assert.AreEqual(1.409, designResult.StabilityDesignResults.SafetyFactor, tolerance);
                 Assert.AreEqual("3", designResult.ScenarioName);
-                Assert.AreEqual(-1.00, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits);                    
+                Assert.AreEqual(-1.00, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits);
+                resultsFound++;
             }
-            if (designResult.BaseFileName.Equals("Loc(KR093_0018)_Sce(4)_Pro(segment_629_1D2-KR093_0018-2)"))
+            if (designResult.BaseFileName.Equals("Loc(KR093_0018)_Sce(4)_Pro(segment_629_1D2-KR093_0018-2)_Ite(29)"))
             {
-                Assert.AreEqual(1.225, designResult.StabilityDesignResults.SafetyFactor, tolerance);
+                Assert.AreEqual(1.224, designResult.StabilityDesignResults.SafetyFactor, tolerance);
                 Assert.AreEqual("4", designResult.ScenarioName);
-                Assert.AreEqual(-0.37, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits);                    
+                Assert.AreEqual(-0.37, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits);
+                resultsFound++;
             }
-            if (designResult.BaseFileName.Equals("Loc(KR093_0018)_Sce(3)_Pro(segment_629_1D3-KR093_0018-3)"))
+            if (designResult.BaseFileName.Equals("Loc(KR093_0018)_Sce(3)_Pro(segment_629_1D3-KR093_0018-3)_Ite(29)"))
             {
-                Assert.AreEqual(1.608, designResult.StabilityDesignResults.SafetyFactor, tolerance);
+                Assert.AreEqual(1.598, designResult.StabilityDesignResults.SafetyFactor, tolerance);
                 Assert.AreEqual("3", designResult.ScenarioName);
-                Assert.AreEqual(-1.00, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits);                    
+                Assert.AreEqual(-1.00, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits);
+                resultsFound++;
             }
-            if (designResult.BaseFileName.Equals("Loc(KR093_0018)_Sce(4)_Pro(segment_629_1D3-KR093_0018-3)"))
+            if (designResult.BaseFileName.Equals("Loc(KR093_0018)_Sce(4)_Pro(segment_629_1D3-KR093_0018-3)_Ite(29)"))
             {
-                Assert.AreEqual(1.397, designResult.StabilityDesignResults.SafetyFactor, tolerance);
+                Assert.AreEqual(1.382, designResult.StabilityDesignResults.SafetyFactor, tolerance);
                 Assert.AreEqual("4", designResult.ScenarioName);
-                Assert.AreEqual(-0.37, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits);                    
+                Assert.AreEqual(-0.37, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits);
+                resultsFound++;
             }
-            if (designResult.BaseFileName.Equals("Loc(KR093_0019)_Sce(3)_Pro(segment_629_1D1-KR093_0019-1)"))
+            if (designResult.BaseFileName.Equals("Loc(KR093_0019)_Sce(3)_Pro(segment_629_1D1-KR093_0019-1)_Ite(25)"))
             {
-                Assert.AreEqual(4.557, designResult.StabilityDesignResults.SafetyFactor, tolerance);
+                Assert.AreEqual(5.848, designResult.StabilityDesignResults.SafetyFactor, tolerance);
                 Assert.AreEqual("3", designResult.ScenarioName);
-                Assert.AreEqual(-1.03, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits);                    
+                Assert.AreEqual(-1.03, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits);
+                resultsFound++;
             }
-            if (designResult.BaseFileName.Equals("Loc(KR093_0019)_Sce(4)_Pro(segment_629_1D1-KR093_0019-1)"))
+            if (designResult.BaseFileName.Equals("Loc(KR093_0019)_Sce(4)_Pro(segment_629_1D1-KR093_0019-1)_Ite(25)"))
             {
-                Assert.AreEqual(3.985, designResult.StabilityDesignResults.SafetyFactor, tolerance);
+                Assert.AreEqual(5.848, designResult.StabilityDesignResults.SafetyFactor, tolerance);
                 Assert.AreEqual("4", designResult.ScenarioName);
-                Assert.AreEqual(-0.57, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits);                    
+                Assert.AreEqual(-0.57, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits);
+                resultsFound++;
             }
-            if (designResult.BaseFileName.Equals("Loc(KR093_0019)_Sce(3)_Pro(segment_629_1D2-KR093_0019-2)"))
+            if (designResult.BaseFileName.Equals("Loc(KR093_0019)_Sce(3)_Pro(segment_629_1D2-KR093_0019-2)_Ite(25)"))
             {
-                Assert.AreEqual(4.087, designResult.StabilityDesignResults.SafetyFactor, tolerance);
+                Assert.AreEqual(1.552, designResult.StabilityDesignResults.SafetyFactor, tolerance);
                 Assert.AreEqual("3", designResult.ScenarioName);
-                Assert.AreEqual(-1.03, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits);                    
+                Assert.AreEqual(-1.03, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits);
+                resultsFound++;
             }
-            if (designResult.BaseFileName.Equals("Loc(KR093_0019)_Sce(4)_Pro(segment_629_1D2-KR093_0019-2)"))
+            if (designResult.BaseFileName.Equals("Loc(KR093_0019)_Sce(4)_Pro(segment_629_1D2-KR093_0019-2)_Ite(5)"))
             {
-                Assert.AreEqual(3.418, designResult.StabilityDesignResults.SafetyFactor, tolerance);
+                Assert.AreEqual(2.876, designResult.StabilityDesignResults.SafetyFactor, tolerance);
                 Assert.AreEqual("4", designResult.ScenarioName);
-                Assert.AreEqual(-0.37, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits);                    
+                Assert.AreEqual(-0.37, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits);
+                resultsFound++;
             }
-            if (designResult.BaseFileName.Equals("Loc(KR093_0019)_Sce(3)_Pro(segment_629_1D3-KR093_0019-3)"))
+            if (designResult.BaseFileName.Equals("Loc(KR093_0019)_Sce(3)_Pro(segment_629_1D3-KR093_0019-3)_Ite(25)"))
             {
-                Assert.AreEqual(4.432, designResult.StabilityDesignResults.SafetyFactor, tolerance);
+                Assert.AreEqual(3.538, designResult.StabilityDesignResults.SafetyFactor, tolerance);
                 Assert.AreEqual("3", designResult.ScenarioName);
-                Assert.AreEqual(-1.03, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits);                    
+                Assert.AreEqual(-1.03, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits);
+                resultsFound++;
             }
-            if (designResult.BaseFileName.Equals("Loc(KR093_0019)_Sce(4)_Pro(segment_629_1D3-KR093_0019-3)"))
+            if (designResult.BaseFileName.Equals("Loc(KR093_0019)_Sce(4)_Pro(segment_629_1D3-KR093_0019-3)_Ite(25)"))
             {
-                Assert.AreEqual(3.745, designResult.StabilityDesignResults.SafetyFactor, tolerance);
+                Assert.AreEqual(1.503, designResult.StabilityDesignResults.SafetyFactor, tolerance);
                 Assert.AreEqual("4", designResult.ScenarioName);
-                Assert.AreEqual(-0.37, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits);                    
+                Assert.AreEqual(-0.37, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits);
+                resultsFound++;
             }
         }
+
+        if (justOneScenario)
+        {
+            Assert.AreEqual(9, resultsFound);
+        }
+        else
+        {
+            Assert.AreEqual(18, resultsFound);
+        }
     }
     
 
-    private static void RemoveTestWorkingDirectory(string testWorkingFolder)
+    private static void RemoveTestWorkingDirectory()
     {
         if (Directory.Exists(testWorkingFolder))
         {