Index: DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/TestData/IntegrationTests/StabilityInside2D/DAMLive.damx =================================================================== diff -u -r6024 -r6047 --- DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/TestData/IntegrationTests/StabilityInside2D/DAMLive.damx (.../DAMLive.damx) (revision 6024) +++ DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/TestData/IntegrationTests/StabilityInside2D/DAMLive.damx (.../DAMLive.damx) (revision 6047) @@ -1,5 +1,5 @@  - + @@ -19,92 +19,92 @@ - + - - - - - - - - - - - + + + + + + + - + - + - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + @@ -121,114 +121,114 @@ - + - - - - - - - + + + + + + + - - + + - + - - + + - + - - - - - - - - - - + + + + + + - + - + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + @@ -245,200 +245,196 @@ - + - + - - + + - - + + - + - - + + - + - - - - - - - - - - - + + + + + + + - + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - + + + - - - - - + + + + + - - - - - - - + + + + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - + + + - - - - - + + + + + - - - - - - - + + + + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - + + + - - - - - + + + + + - - - - - - - + + + + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - + + + - - - - - + + + + + - - - - - - - + + + + + + + @@ -447,106 +443,110 @@ - - + + - - + + - + - - - + + + - - - - - - - - - - - - + + + + + + + + + + + + - + - + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + @@ -563,117 +563,113 @@ - + - - - - - - - + + + + + + + - - + + - + - - + + - + - - - - - - - - - - + + + + + + - + - + - + - + - + - - - - + + + + - - + + - - - + + + - + - - + + - + - - + + - - - - + + + + - + @@ -683,10 +679,10 @@ - - - - + + + + @@ -695,241 +691,241 @@ - - - - - + - + - + - + - + - + - + - + - + - + - + - + - - - - + + + - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + - - - - - - - + + + + + + + + - + - - + + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + - + @@ -980,164 +976,166 @@ - - - - - + - + - + - + - + - + + + - - + + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + - + @@ -1188,52 +1186,446 @@ - - - - - + - + - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - - - - - + + + \ No newline at end of file Index: DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/StabilityInside2DTests.cs =================================================================== diff -u -r6024 -r6047 --- DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/StabilityInside2DTests.cs (.../StabilityInside2DTests.cs) (revision 6024) +++ DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/StabilityInside2DTests.cs (.../StabilityInside2DTests.cs) (revision 6047) @@ -107,20 +107,20 @@ case "LocationOnlyPL3": { TimeSerieEntry firstEntry = timeSeries.Entries.First(); - Assert.That(firstEntry.Value, Is.EqualTo(1.502).Within(cTolerance), "The computed safety factory is not correct"); + Assert.That(firstEntry.Value, Is.EqualTo(1.433).Within(cTolerance), "The computed safety factory is not correct"); resultsCount++; TimeSerieEntry lastEntry = timeSeries.Entries.Last(); - Assert.That(lastEntry.Value, Is.EqualTo(1.519).Within(cTolerance), "The computed safety factory is not correct"); + Assert.That(lastEntry.Value, Is.EqualTo(1.327).Within(cTolerance), "The computed safety factory is not correct"); resultsCount++; break; } case "LocationPL3AndPL4": { TimeSerieEntry firstEntry = timeSeries.Entries.First(); - Assert.That(firstEntry.Value, Is.EqualTo(1.228).Within(cTolerance), "The computed safety factory is not correct"); + Assert.That(firstEntry.Value, Is.EqualTo(1.518).Within(cTolerance), "The computed safety factory is not correct"); resultsCount++; TimeSerieEntry lastEntry = timeSeries.Entries.Last(); - Assert.That(lastEntry.Value, Is.EqualTo(1.260).Within(cTolerance), "The computed safety factory is not correct"); + Assert.That(lastEntry.Value, Is.EqualTo(1.536).Within(cTolerance), "The computed safety factory is not correct"); resultsCount++; break; } @@ -133,7 +133,7 @@ Assert.Multiple(() => { - Assert.That(seriesCount, Is.GreaterThan(0), "No output time series"); + Assert.That(seriesCount, Is.EqualTo(2), "Incorrect number of time series"); Assert.That(resultsCount, Is.EqualTo(4), "Incorrect number of results"); }); } Index: DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/TestData/IntegrationTests/StabilityInside2D/live.InputTimeSeriesMHW.xml =================================================================== diff -u -r5866 -r6047 --- DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/TestData/IntegrationTests/StabilityInside2D/live.InputTimeSeriesMHW.xml (.../live.InputTimeSeriesMHW.xml) (revision 5866) +++ DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/TestData/IntegrationTests/StabilityInside2D/live.InputTimeSeriesMHW.xml (.../live.InputTimeSeriesMHW.xml) (revision 6047) @@ -20,62 +20,32 @@
instantaneous - SensorLoc1_PL1_DikeToeAtRiver + SensorLoc1_PL1_DikeMiddleCrest H.meting NaN - SensorLoc1_PL1_DikeToeAtRiver + SensorLoc1_PL1_DikeMiddleCrest mNAP
- - - - -
- instantaneous - SensorLoc1_PL1_DikeTopAtRiver - H.meting - - - - NaN - SensorLoc1_PL1_DikeTopAtRiver - mNAP -
- +
instantaneous - SensorLoc1_PL1_DikeTopAtPolder + SensorLoc1_PL1_Ditch H.meting NaN - SensorLoc1_PL1_DikeTopAtPolder + SensorLoc1_PL1_Ditch mNAP
- - - - -
- instantaneous - SensorLoc1_PL1_DikeToeAtPolder - H.meting - - - - NaN - SensorLoc1_PL1_DikeToeAtPolder - mNAP -
- +
@@ -90,7 +60,7 @@ mNAP
- +
@@ -110,66 +80,36 @@
instantaneous - SensorLoc1_PL3_DikeToeAtRiver + SensorLoc1_PL3_DikeMiddleCrest H.meting NaN - SensorLoc1_PL3_DikeToeAtRiver + SensorLoc1_PL3_DikeMiddleCrest mNAP
- +
instantaneous - SensorLoc1_PL3_DikeTopAtRiver + SensorLoc1_PL3_Ditch H.meting NaN - SensorLoc1_PL3_DikeTopAtRiver + SensorLoc1_PL3_Ditch mNAP
- - + +
instantaneous - SensorLoc1_PL3_DikeTopAtPolder - H.meting - - - - NaN - SensorLoc1_PL3_DikeTopAtPolder - mNAP -
- - - - -
- instantaneous - SensorLoc1_PL3_DikeToeAtPolder - H.meting - - - - NaN - SensorLoc1_PL3_DikeToeAtPolder - mNAP -
- - - - -
- instantaneous SensorLoc1_PL3_Polder H.meting @@ -200,32 +140,32 @@
instantaneous - SensorLoc2_PL1_DikeTopAtRiver + SensorLoc2_PL1_DikeMiddleCrest H.meting NaN - SensorLoc2_PL1_DikeTopAtRiver + SensorLoc2_PL1_DikeMiddleCrest mNAP
- - + +
instantaneous - SensorLoc2_PL1_DikeToeAtPolder + SensorLoc2_PL1_Ditch H.meting NaN - SensorLoc2_PL1_DikeToeAtPolder + SensorLoc2_PL1_Ditch mNAP
- - + +
@@ -260,32 +200,32 @@
instantaneous - SensorLoc2_PL3_DikeToeAtRiver + SensorLoc2_PL3_DikeMiddleCrest H.meting NaN - SensorLoc2_PL3_DikeToeAtRiver + SensorLoc2_PL3_DikeMiddleCrest mNAP
- - + +
instantaneous - SensorLoc2_PL3_DikeTopAtPolder + SensorLoc2_PL3_Ditch H.meting NaN - SensorLoc2_PL3_DikeTopAtPolder + SensorLoc2_PL3_Ditch mNAP
- - + +
@@ -320,13 +260,13 @@
instantaneous - SensorLoc2_PL4_DikeToeAtRiver + SensorLoc2_PL4_DikeMiddleCrest H.meting NaN - SensorLoc2_PL4_DikeToeAtRiver + SensorLoc2_PL4_DikeMiddleCrest mNAP
@@ -335,17 +275,17 @@
instantaneous - SensorLoc2_PL4_DikeTopAtPolder + SensorLoc2_PL4_Ditch H.meting NaN - SensorLoc2_PL4_DikeTopAtPolder + SensorLoc2_PL4_Ditch mNAP
- - + +
@@ -359,7 +299,7 @@ SensorLoc2_PL4_Polder mNAP
- - + + \ No newline at end of file Index: DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/TestData/IntegrationTests/StabilityInside2D/Sensordata.xls =================================================================== diff -u -r5866 -r6047 Binary files differ Index: DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/TestData/IntegrationTests/StabilityInside2D/live.OutputTimeSeriesMHW.xml =================================================================== diff -u -r5866 -r6047 --- DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/TestData/IntegrationTests/StabilityInside2D/live.OutputTimeSeriesMHW.xml (.../live.OutputTimeSeriesMHW.xml) (revision 5866) +++ DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/TestData/IntegrationTests/StabilityInside2D/live.OutputTimeSeriesMHW.xml (.../live.OutputTimeSeriesMHW.xml) (revision 6047) @@ -4,129 +4,33 @@
instantaneous - Purmer_PU0042+00_K + LocationOnlyPL3 StabilityInsideFactor NaN - MPN-AS-1743 + SensorLoc1_PL1_River mNAP
- - + +
instantaneous - Purmer_PU0042+00_K_V + LocationPL3AndPL4 StabilityInsideFactor NaN - MPN-AS-1743 + SensorLoc1_PL1_River mNAP
- - + + - -
- instantaneous - Purmer_PU0042+00_R - StabilityInsideFactor - - - - NaN - MPN-AS-1743 - mNAP -
- - - - - -
- instantaneous - Purmer_PU0042+00_R_V - StabilityInsideFactor - - - - NaN - MPN-AS-1743 - mNAP -
- - - - - -
- instantaneous - Purmer_PU0110+20_K - StabilityInsideFactor - - - - NaN - MPN-AS-1743 - mNAP -
- - - - - -
- instantaneous - Purmer_PU0110+20_K_V - StabilityInsideFactor - - - - NaN - MPN-AS-1743 - mNAP -
- - - - - -
- instantaneous - Purmer_PU0110+20_R - StabilityInsideFactor - - - - NaN - MPN-AS-1743 - mNAP -
- - - - - -
- instantaneous - Purmer_PU0110+20_R_V - StabilityInsideFactor - - - - NaN - MPN-AS-1743 - mNAP -
- - - - \ No newline at end of file