Index: DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/StabilityInsideBishopGridTest.cs
===================================================================
diff -u -r4923 -r4943
--- DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/StabilityInsideBishopGridTest.cs	(.../StabilityInsideBishopGridTest.cs)	(revision 4923)
+++ DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/StabilityInsideBishopGridTest.cs	(.../StabilityInsideBishopGridTest.cs)	(revision 4943)
@@ -108,80 +108,80 @@
                 if (timeSeries.LocationId == "Purmer_PU0042+00_K")
                 {
                     TimeSerieEntry firstEntry = timeSeries.Entries.First();
-                    Assert.That(firstEntry.Value, Is.EqualTo(1.309).Within(cTolerance), "The computed safety factory is not correct");
+                    Assert.That(firstEntry.Value, Is.EqualTo(1.548).Within(cTolerance), "The computed safety factory is not correct");
                     resultsCount++;
                     TimeSerieEntry lastEntry = timeSeries.Entries.Last();
-                    Assert.That(lastEntry.Value, Is.EqualTo(1.572).Within(cTolerance), "The computed safety factory is not correct");
+                    Assert.That(lastEntry.Value, Is.EqualTo(1.725).Within(cTolerance), "The computed safety factory is not correct");
                     resultsCount++;
                 }
 
                 if (timeSeries.LocationId == "Purmer_PU0042+00_K_V")
                 {
                     TimeSerieEntry firstEntry = timeSeries.Entries.First();
-                    Assert.That(firstEntry.Value, Is.EqualTo(1.246).Within(cTolerance), "The computed safety factory is not correct");
+                    Assert.That(firstEntry.Value, Is.EqualTo(1.493).Within(cTolerance), "The computed safety factory is not correct");
                     resultsCount++;
                     TimeSerieEntry lastEntry = timeSeries.Entries.Last();
-                    Assert.That(lastEntry.Value, Is.EqualTo(1.488).Within(cTolerance), "The computed safety factory is not correct");
+                    Assert.That(lastEntry.Value, Is.EqualTo(1.649).Within(cTolerance), "The computed safety factory is not correct");
                     resultsCount++;
                 }
                 
                 if (timeSeries.LocationId == "Purmer_PU0042+00_R")
                 {
                     TimeSerieEntry firstEntry = timeSeries.Entries.First();
-                    Assert.That(firstEntry.Value, Is.EqualTo(1.120).Within(cTolerance), "The computed safety factory is not correct");
+                    Assert.That(firstEntry.Value, Is.EqualTo(1.324).Within(cTolerance), "The computed safety factory is not correct");
                     resultsCount++;
                     TimeSerieEntry lastEntry = timeSeries.Entries.Last();
-                    Assert.That(lastEntry.Value, Is.EqualTo(1.350).Within(cTolerance), "The computed safety factory is not correct");
+                    Assert.That(lastEntry.Value, Is.EqualTo(1.479).Within(cTolerance), "The computed safety factory is not correct");
                     resultsCount++;
                 }
                 
                 if (timeSeries.LocationId == "Purmer_PU0042+00_R_V")
                 {
                     TimeSerieEntry firstEntry = timeSeries.Entries.First();
-                    Assert.That(firstEntry.Value, Is.EqualTo(1.067).Within(cTolerance), "The computed safety factory is not correct");
+                    Assert.That(firstEntry.Value, Is.EqualTo(1.279).Within(cTolerance), "The computed safety factory is not correct");
                     resultsCount++;
                     TimeSerieEntry lastEntry = timeSeries.Entries.Last();
-                    Assert.That(lastEntry.Value, Is.EqualTo(1.278).Within(cTolerance), "The computed safety factory is not correct");
+                    Assert.That(lastEntry.Value, Is.EqualTo(1.419).Within(cTolerance), "The computed safety factory is not correct");
                     resultsCount++;
                 }
                 
                 if (timeSeries.LocationId == "Purmer_PU0110+20_K")
                 {
                     TimeSerieEntry firstEntry = timeSeries.Entries.First();
-                    Assert.That(firstEntry.Value, Is.EqualTo(1.239).Within(cTolerance), "The computed safety factory is not correct");
+                    Assert.That(firstEntry.Value, Is.EqualTo(1.536).Within(cTolerance), "The computed safety factory is not correct");
                     resultsCount++;
                     TimeSerieEntry lastEntry = timeSeries.Entries.Last();
-                    Assert.That(lastEntry.Value, Is.EqualTo(1.506).Within(cTolerance), "The computed safety factory is not correct");
+                    Assert.That(lastEntry.Value, Is.EqualTo(1.702).Within(cTolerance), "The computed safety factory is not correct");
                     resultsCount++;
                 }
                 
                 if (timeSeries.LocationId == "Purmer_PU0110+20_K_V")
                 {
                     TimeSerieEntry firstEntry = timeSeries.Entries.First();
-                    Assert.That(firstEntry.Value, Is.EqualTo(1.202).Within(cTolerance), "The computed safety factory is not correct");
+                    Assert.That(firstEntry.Value, Is.EqualTo(1.480).Within(cTolerance), "The computed safety factory is not correct");
                     resultsCount++;
                     TimeSerieEntry lastEntry = timeSeries.Entries.Last();
-                    Assert.That(lastEntry.Value, Is.EqualTo(1.453).Within(cTolerance), "The computed safety factory is not correct");
+                    Assert.That(lastEntry.Value, Is.EqualTo(1.636).Within(cTolerance), "The computed safety factory is not correct");
                     resultsCount++;
                 }
                 
                 if (timeSeries.LocationId == "Purmer_PU0110+20_R")
                 {
                     TimeSerieEntry firstEntry = timeSeries.Entries.First();
-                    Assert.That(firstEntry.Value, Is.EqualTo(1.058).Within(cTolerance), "The computed safety factory is not correct");
+                    Assert.That(firstEntry.Value, Is.EqualTo(1.317).Within(cTolerance), "The computed safety factory is not correct");
                     resultsCount++;
                     TimeSerieEntry lastEntry = timeSeries.Entries.Last();
-                    Assert.That(lastEntry.Value, Is.EqualTo(1.291).Within(cTolerance), "The computed safety factory is not correct");
+                    Assert.That(lastEntry.Value, Is.EqualTo(1.462).Within(cTolerance), "The computed safety factory is not correct");
                     resultsCount++;
                 }
                 
                 if (timeSeries.LocationId == "Purmer_PU0110+20_R_V")
                 {
                     TimeSerieEntry firstEntry = timeSeries.Entries.First();
-                    Assert.That(firstEntry.Value, Is.EqualTo(1.027).Within(cTolerance), "The computed safety factory is not correct");
+                    Assert.That(firstEntry.Value, Is.EqualTo(1.270).Within(cTolerance), "The computed safety factory is not correct");
                     resultsCount++;
                     TimeSerieEntry lastEntry = timeSeries.Entries.Last();
-                    Assert.That(lastEntry.Value, Is.EqualTo(1.246).Within(cTolerance), "The computed safety factory is not correct");
+                    Assert.That(lastEntry.Value, Is.EqualTo(1.406).Within(cTolerance), "The computed safety factory is not correct");
                     resultsCount++;
                 }
             }
Index: DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/StabilityInsideUpliftVanBeeSwarmTest.cs
===================================================================
diff -u -r4919 -r4943
--- DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/StabilityInsideUpliftVanBeeSwarmTest.cs	(.../StabilityInsideUpliftVanBeeSwarmTest.cs)	(revision 4919)
+++ DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/StabilityInsideUpliftVanBeeSwarmTest.cs	(.../StabilityInsideUpliftVanBeeSwarmTest.cs)	(revision 4943)
@@ -111,39 +111,39 @@
                 if (timeSeries.LocationId == "Purmer_PU0042+00_K")
                 {
                     TimeSerieEntry firstEntry = timeSeries.Entries.First();
-                    Assert.That(firstEntry.Value, Is.EqualTo(1.185).Within(cTolerance), "The computed safety factory is not correct");
+                    Assert.That(firstEntry.Value, Is.EqualTo(1.442).Within(cTolerance), "The computed safety factory is not correct");
                     resultsCount++;
                     TimeSerieEntry lastEntry = timeSeries.Entries.Last();
-                    Assert.That(lastEntry.Value, Is.EqualTo(1.419).Within(cTolerance), "The computed safety factory is not correct");
+                    Assert.That(lastEntry.Value, Is.EqualTo(1.579).Within(cTolerance), "The computed safety factory is not correct");
                     resultsCount++;
                 }
 
                 if (timeSeries.LocationId == "Purmer_PU0042+00_K_V")
                 {
                     TimeSerieEntry firstEntry = timeSeries.Entries.First();
-                    Assert.That(firstEntry.Value, Is.EqualTo(1.110).Within(cTolerance), "The computed safety factory is not correct");
+                    Assert.That(firstEntry.Value, Is.EqualTo(1.365).Within(cTolerance), "The computed safety factory is not correct");
                     resultsCount++;
                     TimeSerieEntry lastEntry = timeSeries.Entries.Last();
-                    Assert.That(lastEntry.Value, Is.EqualTo(1.326).Within(cTolerance), "The computed safety factory is not correct");
+                    Assert.That(lastEntry.Value, Is.EqualTo(1.481).Within(cTolerance), "The computed safety factory is not correct");
                     resultsCount++;
                 }
 
                 if (timeSeries.LocationId == "Purmer_PU0042+00_R")
                 {
                     TimeSerieEntry firstEntry = timeSeries.Entries.First();
-                    Assert.That(firstEntry.Value, Is.EqualTo(1.012).Within(cTolerance), "The computed safety factory is not correct");
+                    Assert.That(firstEntry.Value, Is.EqualTo(1.239).Within(cTolerance), "The computed safety factory is not correct");
                     resultsCount++;
                     TimeSerieEntry lastEntry = timeSeries.Entries.Last();
-                    Assert.That(lastEntry.Value, Is.EqualTo(1.217).Within(cTolerance), "The computed safety factory is not correct");
+                    Assert.That(lastEntry.Value, Is.EqualTo(1.355).Within(cTolerance), "The computed safety factory is not correct");
                     resultsCount++;
                 }
                 if (timeSeries.LocationId == "Purmer_PU0042+00_R_V")
                 {
                     TimeSerieEntry firstEntry = timeSeries.Entries.First();
-                    Assert.That(firstEntry.Value, Is.EqualTo(0.949).Within(cTolerance), "The computed safety factory is not correct");
+                    Assert.That(firstEntry.Value, Is.EqualTo(1.168).Within(cTolerance), "The computed safety factory is not correct");
                     resultsCount++;
                     TimeSerieEntry lastEntry = timeSeries.Entries.Last();
-                    Assert.That(lastEntry.Value, Is.EqualTo(1.137).Within(cTolerance), "The computed safety factory is not correct");
+                    Assert.That(lastEntry.Value, Is.EqualTo(1.272).Within(cTolerance), "The computed safety factory is not correct");
                     resultsCount++;
                 }
                 
@@ -237,39 +237,39 @@
                 if (timeSeries.LocationId == "Purmer_PU0042+00_K")
                 {
                     DamEngine.Data.General.TimeSeries.TimeSerieEntry firstEntry = timeSeries.Entries.First();
-                    Assert.That(firstEntry.Value, Is.EqualTo(1.185).Within(cTolerance), "The computed safety factory is not correct");
+                    Assert.That(firstEntry.Value, Is.EqualTo(1.442).Within(cTolerance), "The computed safety factory is not correct");
                     resultsCount++;
                     DamEngine.Data.General.TimeSeries.TimeSerieEntry lastEntry = timeSeries.Entries.Last();
-                    Assert.That(lastEntry.Value, Is.EqualTo(1.419).Within(cTolerance), "The computed safety factory is not correct");
+                    Assert.That(lastEntry.Value, Is.EqualTo(1.579).Within(cTolerance), "The computed safety factory is not correct");
                     resultsCount++;
                 }
 
                 if (timeSeries.LocationId == "Purmer_PU0042+00_K_V")
                 {
                     DamEngine.Data.General.TimeSeries.TimeSerieEntry firstEntry = timeSeries.Entries.First();
-                    Assert.That(firstEntry.Value, Is.EqualTo(1.110).Within(cTolerance), "The computed safety factory is not correct");
+                    Assert.That(firstEntry.Value, Is.EqualTo(1.365).Within(cTolerance), "The computed safety factory is not correct");
                     resultsCount++;
                     DamEngine.Data.General.TimeSeries.TimeSerieEntry lastEntry = timeSeries.Entries.Last();
-                    Assert.That(lastEntry.Value, Is.EqualTo(1.326).Within(cTolerance), "The computed safety factory is not correct");
+                    Assert.That(lastEntry.Value, Is.EqualTo(1.481).Within(cTolerance), "The computed safety factory is not correct");
                     resultsCount++;
                 }
 
                 if (timeSeries.LocationId == "Purmer_PU0042+00_R")
                 {
                     DamEngine.Data.General.TimeSeries.TimeSerieEntry firstEntry = timeSeries.Entries.First();
-                    Assert.That(firstEntry.Value, Is.EqualTo(1.012).Within(cTolerance), "The computed safety factory is not correct");
+                    Assert.That(firstEntry.Value, Is.EqualTo(1.239).Within(cTolerance), "The computed safety factory is not correct");
                     resultsCount++;
                     DamEngine.Data.General.TimeSeries.TimeSerieEntry lastEntry = timeSeries.Entries.Last();
-                    Assert.That(lastEntry.Value, Is.EqualTo(1.217).Within(cTolerance), "The computed safety factory is not correct");
+                    Assert.That(lastEntry.Value, Is.EqualTo(1.355).Within(cTolerance), "The computed safety factory is not correct");
                     resultsCount++;
                 }
                 if (timeSeries.LocationId == "Purmer_PU0042+00_R_V")
                 {
                     DamEngine.Data.General.TimeSeries.TimeSerieEntry firstEntry = timeSeries.Entries.First();
-                    Assert.That(firstEntry.Value, Is.EqualTo(0.949).Within(cTolerance), "The computed safety factory is not correct");
+                    Assert.That(firstEntry.Value, Is.EqualTo(1.168).Within(cTolerance), "The computed safety factory is not correct");
                     resultsCount++;
                     DamEngine.Data.General.TimeSeries.TimeSerieEntry lastEntry = timeSeries.Entries.Last();
-                    Assert.That(lastEntry.Value, Is.EqualTo(1.137).Within(cTolerance), "The computed safety factory is not correct");
+                    Assert.That(lastEntry.Value, Is.EqualTo(1.272).Within(cTolerance), "The computed safety factory is not correct");
                     resultsCount++;
                 }
                 
Index: DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/StabilityInsideUpliftVanGridTest.cs
===================================================================
diff -u -r4921 -r4943
--- DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/StabilityInsideUpliftVanGridTest.cs	(.../StabilityInsideUpliftVanGridTest.cs)	(revision 4921)
+++ DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/StabilityInsideUpliftVanGridTest.cs	(.../StabilityInsideUpliftVanGridTest.cs)	(revision 4943)
@@ -104,39 +104,39 @@
                 if (timeSeries.LocationId == "Purmer_PU0042+00_K")
                 {
                     TimeSerieEntry firstEntry = timeSeries.Entries.First();
-                    Assert.That(firstEntry.Value, Is.EqualTo(1.197).Within(cTolerance), "The computed safety factory is not correct");
+                    Assert.That(firstEntry.Value, Is.EqualTo(1.456).Within(cTolerance), "The computed safety factory is not correct");
                     resultsCount++;
                     TimeSerieEntry lastEntry = timeSeries.Entries.Last();
-                    Assert.That(lastEntry.Value, Is.EqualTo(1.429).Within(cTolerance), "The computed safety factory is not correct");
+                    Assert.That(lastEntry.Value, Is.EqualTo(1.583).Within(cTolerance), "The computed safety factory is not correct");
                     resultsCount++;
                 }
 
                 if (timeSeries.LocationId == "Purmer_PU0042+00_K_V")
                 {
                     TimeSerieEntry firstEntry = timeSeries.Entries.First();
-                    Assert.That(firstEntry.Value, Is.EqualTo(1.135).Within(cTolerance), "The computed safety factory is not correct");
+                    Assert.That(firstEntry.Value, Is.EqualTo(1.366).Within(cTolerance), "The computed safety factory is not correct");
                     resultsCount++;
                     TimeSerieEntry lastEntry = timeSeries.Entries.Last();
-                    Assert.That(lastEntry.Value, Is.EqualTo(1.343).Within(cTolerance), "The computed safety factory is not correct");
+                    Assert.That(lastEntry.Value, Is.EqualTo(1.480).Within(cTolerance), "The computed safety factory is not correct");
                     resultsCount++;
                 }
 
                 if (timeSeries.LocationId == "Purmer_PU0042+00_R")
                 {
                     TimeSerieEntry firstEntry = timeSeries.Entries.First();
-                    Assert.That(firstEntry.Value, Is.EqualTo(1.022).Within(cTolerance), "The computed safety factory is not correct");
+                    Assert.That(firstEntry.Value, Is.EqualTo(1.248).Within(cTolerance), "The computed safety factory is not correct");
                     resultsCount++;
                     TimeSerieEntry lastEntry = timeSeries.Entries.Last();
-                    Assert.That(lastEntry.Value, Is.EqualTo(1.224).Within(cTolerance), "The computed safety factory is not correct");
+                    Assert.That(lastEntry.Value, Is.EqualTo(1.359).Within(cTolerance), "The computed safety factory is not correct");
                     resultsCount++;
                 }
                 if (timeSeries.LocationId == "Purmer_PU0042+00_R_V")
                 {
                     TimeSerieEntry firstEntry = timeSeries.Entries.First();
-                    Assert.That(firstEntry.Value, Is.EqualTo(0.970).Within(cTolerance), "The computed safety factory is not correct");
+                    Assert.That(firstEntry.Value, Is.EqualTo(1.172).Within(cTolerance), "The computed safety factory is not correct");
                     resultsCount++;
                     TimeSerieEntry lastEntry = timeSeries.Entries.Last();
-                    Assert.That(lastEntry.Value, Is.EqualTo(1.152).Within(cTolerance), "The computed safety factory is not correct");
+                    Assert.That(lastEntry.Value, Is.EqualTo(1.271).Within(cTolerance), "The computed safety factory is not correct");
                     resultsCount++;
                 }