Index: DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/StabilityInsideUpliftVanGridTest.cs
===================================================================
diff -u -r4153 -r4162
--- DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/StabilityInsideUpliftVanGridTest.cs	(.../StabilityInsideUpliftVanGridTest.cs)	(revision 4153)
+++ DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/StabilityInsideUpliftVanGridTest.cs	(.../StabilityInsideUpliftVanGridTest.cs)	(revision 4162)
@@ -78,7 +78,6 @@
         GeneralHelper.SetupIntegrationProject(maxCores, testWorkingFolder, testIntegrationDataFolder, input1AFilename,
                                               output1AFilename, calculationParametersIntegrationFilename,
                                               projectIntegrationFilename, out runner, out locations);
-        //SetupStabilityProject(maxCores);
         runner.Initialize();
         runner.MaxCalculationCores = maxCores;
         Assert.IsNotNull(runner);
@@ -88,7 +87,7 @@
         Assert.IsNotNull(runner.CalculationParameters.MStabParameters);
 
         runner.Run();
-        //runner.WriteResultsToFile(outputFile);
+        runner.OutputTimeSeriesCollection.Save("UpliftVanOutputFile"+ GeneralHelper.CMinCores);
 
         GeneralHelper.AssertNoErrors(runner);
 
@@ -111,26 +110,66 @@
                 if (timeSeries.LocationId == "Purmer_PU0042+00_K")
                 {
                     TimeSerieEntry firstEntry = timeSeries.Entries.First();
-                    Assert.AreEqual(1.548, firstEntry.Value, cTolerance, "The computed safety factory is not correct");
+                    Assert.AreEqual(1.456, firstEntry.Value, cTolerance, "The computed safety factory is not correct");
                     TimeSerieEntry lastEntry = timeSeries.Entries.Last();
-                    Assert.AreEqual(1.725, lastEntry.Value, cTolerance, "The computed safety factory is not correct");
+                    Assert.AreEqual(1.583, lastEntry.Value, cTolerance, "The computed safety factory is not correct");
                 }
 
                 if (timeSeries.LocationId == "Purmer_PU0042+00_K_V")
                 {
                     TimeSerieEntry firstEntry = timeSeries.Entries.First();
-                    Assert.AreEqual(1.493, firstEntry.Value, cTolerance, "The computed safety factory is not correct");
+                    Assert.AreEqual(1.366, firstEntry.Value, cTolerance, "The computed safety factory is not correct");
                     TimeSerieEntry lastEntry = timeSeries.Entries.Last();
-                    Assert.AreEqual(1.649, lastEntry.Value, cTolerance, "The computed safety factory is not correct");
+                    Assert.AreEqual(1.480, lastEntry.Value, cTolerance, "The computed safety factory is not correct");
                 }
 
+                if (timeSeries.LocationId == "Purmer_PU0042+00_R")
+                {
+                    TimeSerieEntry firstEntry = timeSeries.Entries.First();
+                    Assert.AreEqual(1.248, firstEntry.Value, cTolerance, "The computed safety factory is not correct");
+                    TimeSerieEntry lastEntry = timeSeries.Entries.Last();
+                    Assert.AreEqual(1.359, lastEntry.Value, cTolerance, "The computed safety factory is not correct");
+                }
+                if (timeSeries.LocationId == "Purmer_PU0042+00_R_V")
+                {
+                    TimeSerieEntry firstEntry = timeSeries.Entries.First();
+                    Assert.AreEqual(1.172, firstEntry.Value, cTolerance, "The computed safety factory is not correct");
+                    TimeSerieEntry lastEntry = timeSeries.Entries.Last();
+                    Assert.AreEqual(1.271, lastEntry.Value, cTolerance, "The computed safety factory is not correct");
+                }
+                
+                if (timeSeries.LocationId == "Purmer_PU0110+20_K")
+                {
+                    TimeSerieEntry firstEntry = timeSeries.Entries.First();
+                    Assert.AreEqual(Double.NaN, firstEntry.Value, cTolerance, "The computed safety factory is not correct");
+                    TimeSerieEntry lastEntry = timeSeries.Entries.Last();
+                    Assert.AreEqual(Double.NaN, lastEntry.Value, cTolerance, "The computed safety factory is not correct");
+                }
+                
+                if (timeSeries.LocationId == "Purmer_PU0110+20_K_V")
+                {
+                    TimeSerieEntry firstEntry = timeSeries.Entries.First();
+                    Assert.AreEqual(Double.NaN, firstEntry.Value, cTolerance, "The computed safety factory is not correct");
+                    TimeSerieEntry lastEntry = timeSeries.Entries.Last();
+                    Assert.AreEqual(Double.NaN, lastEntry.Value, cTolerance, "The computed safety factory is not correct");
+                }
+                
                 if (timeSeries.LocationId == "Purmer_PU0110+20_R")
                 {
                     TimeSerieEntry firstEntry = timeSeries.Entries.First();
-                    Assert.AreEqual(1.317, firstEntry.Value, cTolerance, "The computed safety factory is not correct");
+                    Assert.AreEqual(Double.NaN, firstEntry.Value, cTolerance, "The computed safety factory is not correct");
                     TimeSerieEntry lastEntry = timeSeries.Entries.Last();
-                    Assert.AreEqual(1.462, lastEntry.Value, cTolerance, "The computed safety factory is not correct");
+                    Assert.AreEqual(Double.NaN, lastEntry.Value, cTolerance, "The computed safety factory is not correct");
                 }
+
+                if (timeSeries.LocationId == "Purmer_PU0110+20_R_V")
+                {
+                    TimeSerieEntry firstEntry = timeSeries.Entries.First();
+                    Assert.AreEqual(Double.NaN, firstEntry.Value, cTolerance, "The computed safety factory is not correct");
+                    TimeSerieEntry lastEntry = timeSeries.Entries.Last();
+                    Assert.AreEqual(Double.NaN, lastEntry.Value, cTolerance, "The computed safety factory is not correct");
+                }
+
             }
 
             seriesCount++;