Index: DamClients/DamLive/trunk/data/IntegerationTests/StabilityInsideUpliftVanGrid/live.ParametersFile.xml =================================================================== diff -u -r4088 -r4162 --- DamClients/DamLive/trunk/data/IntegerationTests/StabilityInsideUpliftVanGrid/live.ParametersFile.xml (.../live.ParametersFile.xml) (revision 4088) +++ DamClients/DamLive/trunk/data/IntegerationTests/StabilityInsideUpliftVanGrid/live.ParametersFile.xml (.../live.ParametersFile.xml) (revision 4162) @@ -1,4 +1,4 @@ - + 1 @@ -7,7 +7,7 @@ 0 - Bishop + UpliftVan Grid 2 Index: DamClients/DamLive/trunk/lib/DamEngine/nl-NL/Deltares.DamEngine.Data.resources.dll =================================================================== diff -u -r4117 -r4162 Binary files differ Index: DamClients/DamLive/trunk/lib/DamEngine/Deltares.DamPiping.BlighCalculator.pdb =================================================================== diff -u -r3226 -r4162 Binary files differ Index: DamClients/DamLive/trunk/lib/DamEngine/nl-NL/Deltares.DamEngine.Calculators.resources.dll =================================================================== diff -u -r4117 -r4162 Binary files differ Index: DamClients/DamLive/trunk/lib/DamEngine/Deltares.DamPiping.Sellmeijer4ForcesCalculator.pdb =================================================================== diff -u -r3226 -r4162 Binary files differ Index: DamClients/DamLive/trunk/lib/DamEngine/Deltares.DamEngine.Io.dll =================================================================== diff -u -r4117 -r4162 Binary files differ Index: DamClients/DamLive/trunk/lib/DamEngine/nl-NL/Deltares.DamEngine.Interface.resources.dll =================================================================== diff -u -r4117 -r4162 Binary files differ Index: DamClients/DamLive/trunk/data/IntegerationTests/StabilityInsideUpliftVanBeeSwarm/live.ParametersFile.xml =================================================================== diff -u -r4092 -r4162 --- DamClients/DamLive/trunk/data/IntegerationTests/StabilityInsideUpliftVanBeeSwarm/live.ParametersFile.xml (.../live.ParametersFile.xml) (revision 4092) +++ DamClients/DamLive/trunk/data/IntegerationTests/StabilityInsideUpliftVanBeeSwarm/live.ParametersFile.xml (.../live.ParametersFile.xml) (revision 4162) @@ -1,4 +1,4 @@ - + 1 @@ -8,7 +8,7 @@ UpliftVan - Grid + BeeSwarm 2 \ No newline at end of file Index: DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/StabilityInsideBishopGridTest.cs =================================================================== diff -u -r4154 -r4162 --- DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/StabilityInsideBishopGridTest.cs (.../StabilityInsideBishopGridTest.cs) (revision 4154) +++ DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/StabilityInsideBishopGridTest.cs (.../StabilityInsideBishopGridTest.cs) (revision 4162) @@ -55,8 +55,8 @@ [TearDown] public void TearDownFixture() { - IoHelper.RemoveTestWorkingDirectory(testWorkingFolder + GeneralHelper.CMinCores); - IoHelper.RemoveTestWorkingDirectory(testWorkingFolder + GeneralHelper.CMaxCores); + //IoHelper.RemoveTestWorkingDirectory(testWorkingFolder + GeneralHelper.CMinCores); + //IoHelper.RemoveTestWorkingDirectory(testWorkingFolder + GeneralHelper.CMaxCores); } [TearDown] @@ -90,7 +90,7 @@ runner.StabilityWorkingPath = Path.GetTempPath(); runner.Run(); - //runner.WriteResultsToFile(outputFile); + //runner.OutputTimeSeriesCollection.Save("BishopGridOutputFile"+ GeneralHelper.CMinCores); GeneralHelper.AssertNoErrors(runner); @@ -114,23 +114,65 @@ { TimeSerieEntry firstEntry = timeSeries.Entries.First(); Assert.AreEqual(1.548, 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"); } if (timeSeries.LocationId == "Purmer_PU0042+00_K_V") { TimeSerieEntry firstEntry = timeSeries.Entries.First(); - // Following value was 0.590 in the previous DamLive version, but that has to do with how the - // reference level Su is handled in D-GeoStability 18.1 and D-GeoStability 15.1 Assert.AreEqual(1.493, 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"); } - + + if (timeSeries.LocationId == "Purmer_PU0042+00_R") + { + TimeSerieEntry firstEntry = timeSeries.Entries.First(); + Assert.AreEqual(1.324, firstEntry.Value, cTolerance, "The computed safety factory is not correct"); + TimeSerieEntry lastEntry = timeSeries.Entries.Last(); + Assert.AreEqual(1.479, 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.279, firstEntry.Value, cTolerance, "The computed safety factory is not correct"); + TimeSerieEntry lastEntry = timeSeries.Entries.Last(); + Assert.AreEqual(1.419, lastEntry.Value, cTolerance, "The computed safety factory is not correct"); + } + + if (timeSeries.LocationId == "Purmer_PU0110+20_K") + { + TimeSerieEntry firstEntry = timeSeries.Entries.First(); + Assert.AreEqual(1.536, firstEntry.Value, cTolerance, "The computed safety factory is not correct"); + TimeSerieEntry lastEntry = timeSeries.Entries.Last(); + Assert.AreEqual(1.702, 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(1.480, firstEntry.Value, cTolerance, "The computed safety factory is not correct"); + TimeSerieEntry lastEntry = timeSeries.Entries.Last(); + Assert.AreEqual(1.636, lastEntry.Value, cTolerance, "The computed safety factory is not correct"); + } + if (timeSeries.LocationId == "Purmer_PU0110+20_R") { TimeSerieEntry firstEntry = timeSeries.Entries.First(); - // Following value was 0.590 in the previous DamLive version, but that has to do with how the - // reference level Su is handled in D-GeoStability 18.1 and D-GeoStability 15.1 Assert.AreEqual(1.317, 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"); } + + if (timeSeries.LocationId == "Purmer_PU0110+20_R_V") + { + TimeSerieEntry firstEntry = timeSeries.Entries.First(); + Assert.AreEqual(1.270, firstEntry.Value, cTolerance, "The computed safety factory is not correct"); + TimeSerieEntry lastEntry = timeSeries.Entries.Last(); + Assert.AreEqual(1.406, lastEntry.Value, cTolerance, "The computed safety factory is not correct"); + } } seriesCount++; Index: DamClients/DamLive/trunk/lib/DamEngine/Deltares.DamPiping.Sellmeijer4ForcesCalculator.dll =================================================================== diff -u -r4117 -r4162 Binary files differ Index: DamClients/DamLive/trunk/lib/DamEngine/Deltares.DamEngine.Calculators.dll =================================================================== diff -u -r4117 -r4162 Binary files differ Index: DamClients/DamLive/trunk/lib/DamEngine/Deltares.DamEngine.Data.dll =================================================================== diff -u -r4117 -r4162 Binary files differ Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/PL1Line.cs =================================================================== diff -u -r4070 -r4162 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/PL1Line.cs (.../PL1Line.cs) (revision 4070) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/PL1Line.cs (.../PL1Line.cs) (revision 4162) @@ -42,7 +42,7 @@ } } - public PL1Line Clone() + public new PL1Line Clone() { var newPL1Line = new PL1Line(); Index: DamClients/DamLive/trunk/lib/DamEngine/Deltares.DamPiping.SellmeijerVNKCalculator.dll =================================================================== diff -u -r4117 -r4162 Binary files differ Index: DamClients/DamLive/trunk/lib/DamEngine/Deltares.DamPiping.BlighCalculator.dll =================================================================== diff -u -r4117 -r4162 Binary files differ Index: DamClients/DamLive/trunk/lib/DamEngine/Deltares.DamEngine.Interface.dll =================================================================== diff -u -r4117 -r4162 Binary files differ Index: DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/StabilityInsideUpliftVanBeeSwarmTest.cs =================================================================== diff -u -r4155 -r4162 --- DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/StabilityInsideUpliftVanBeeSwarmTest.cs (.../StabilityInsideUpliftVanBeeSwarmTest.cs) (revision 4155) +++ DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/StabilityInsideUpliftVanBeeSwarmTest.cs (.../StabilityInsideUpliftVanBeeSwarmTest.cs) (revision 4162) @@ -86,7 +86,7 @@ Assert.IsNotNull(runner.CalculationParameters.MStabParameters); runner.Run(); - //runner.WriteResultsToFile(outputFile); + runner.OutputTimeSeriesCollection.Save("UpliftVanBeeSwarmOutputFile"+ GeneralHelper.CMinCores); GeneralHelper.AssertNoErrors(runner); @@ -109,26 +109,65 @@ if (timeSeries.LocationId == "Purmer_PU0042+00_K") { TimeSerieEntry firstEntry = timeSeries.Entries.First(); - Assert.AreEqual(1.456, firstEntry.Value, cTolerance, "The computed safety factory is not correct"); + Assert.AreEqual(1.442, firstEntry.Value, cTolerance, "The computed safety factory is not correct"); TimeSerieEntry lastEntry = timeSeries.Entries.Last(); - Assert.AreEqual(1.583, lastEntry.Value, cTolerance, "The computed safety factory is not correct"); + Assert.AreEqual(1.579, 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.366, firstEntry.Value, cTolerance, "The computed safety factory is not correct"); + Assert.AreEqual(1.365, firstEntry.Value, cTolerance, "The computed safety factory is not correct"); TimeSerieEntry lastEntry = timeSeries.Entries.Last(); - Assert.AreEqual(1.480, lastEntry.Value, cTolerance, "The computed safety factory is not correct"); + Assert.AreEqual(1.481, 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.239, firstEntry.Value, cTolerance, "The computed safety factory is not correct"); + TimeSerieEntry lastEntry = timeSeries.Entries.Last(); + Assert.AreEqual(1.355, 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.168, firstEntry.Value, cTolerance, "The computed safety factory is not correct"); + TimeSerieEntry lastEntry = timeSeries.Entries.Last(); + Assert.AreEqual(1.272, 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(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_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++; 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++;