Index: DamClients/DamLive/branches/DamLive 19.2/src/Deltares.DamLive.Tests/DamLiveGrebbedijkTest.cs =================================================================== diff -u -r3272 -r3304 --- DamClients/DamLive/branches/DamLive 19.2/src/Deltares.DamLive.Tests/DamLiveGrebbedijkTest.cs (.../DamLiveGrebbedijkTest.cs) (revision 3272) +++ DamClients/DamLive/branches/DamLive 19.2/src/Deltares.DamLive.Tests/DamLiveGrebbedijkTest.cs (.../DamLiveGrebbedijkTest.cs) (revision 3304) @@ -25,7 +25,9 @@ using System.Linq; using Deltares.Dam.Application.Live; using Deltares.Dam.Data; +//using Deltares.DamEngine.Data.Geotechnics; using Deltares.DamLive.TestHelper; +using Deltares.Geotechnics.SurfaceLines; using Deltares.Standard.IO; using NUnit.Framework; @@ -91,10 +93,21 @@ outputFile = Path.Combine(actualTestPath, output1aFilename); parameterFile = Path.Combine(actualTestPath, calculationParametersStabilityFilename); projectFile = Path.Combine(actualTestPath, projectStabilityFilename); - DamProject.SetTestProgramVersion("19.1"); + DamProject.SetTestProgramVersion("19.2"); var damData = DamProject.LoadData(projectFile); locations = damData.Locations; - + foreach (var dikeLocation in locations) + { + var scenario = new Scenario(); + scenario.RiverLevel = dikeLocation.SurfaceLine2.CharacteristicPoints + .GetGeometryPoint(CharacteristicPointType.DikeToeAtRiver).Z + 1.5; + scenario.PolderLevel = dikeLocation.SurfaceLine2.CharacteristicPoints + .GetGeometryPoint(CharacteristicPointType.DikeToeAtPolder).Z - 0.6; + scenario.HeadPl3 = 1; + scenario.HeadPl4 = scenario.PolderLevel; + scenario.RequiredSafetyFactorStabilityInnerSlope = 1.2; + dikeLocation.Scenarios.Add(scenario); + } // Load the sensor time serie data (see input file for details) var inputTimeSeries = TimeSerieCollection.LoadFromFile(inputFile); ShortenTimeSeries(inputTimeSeries); Index: DamClients/DamLive/branches/DamLive 19.2/src/Deltares.DamLive.Tests/DamLiveIntegrationTest.cs =================================================================== diff -u -r3272 -r3304 --- DamClients/DamLive/branches/DamLive 19.2/src/Deltares.DamLive.Tests/DamLiveIntegrationTest.cs (.../DamLiveIntegrationTest.cs) (revision 3272) +++ DamClients/DamLive/branches/DamLive 19.2/src/Deltares.DamLive.Tests/DamLiveIntegrationTest.cs (.../DamLiveIntegrationTest.cs) (revision 3304) @@ -29,6 +29,8 @@ using Deltares.DamLive.TestHelper; using Deltares.Standard.IO; using NUnit.Framework; +using Deltares.DamEngine.Data.Design; +using Deltares.DamEngine.Data.Geotechnics; namespace Deltares.DamLive.Tests { @@ -83,9 +85,21 @@ projectFile = Path.Combine(actualTestPath, "output.damx"); var soilDatabasFile = Path.Combine(actualTestPath, "output0.soilmaterials.mdb"); - DamProject.SetTestProgramVersion("19.1"); + DamProject.SetTestProgramVersion("19.2"); damProjectData = DamProject.LoadData(projectFile); locations = damProjectData.Locations; + foreach (var dikeLocation in locations) + { + var scenario = new Scenario(); + scenario.RiverLevel = dikeLocation.SurfaceLine2.CharacteristicPoints + .GetGeometryPoint((Geotechnics.SurfaceLines.CharacteristicPointType) CharacteristicPointType.DikeToeAtRiver).Z + 1.5; + scenario.PolderLevel = dikeLocation.SurfaceLine2.CharacteristicPoints + .GetGeometryPoint((Geotechnics.SurfaceLines.CharacteristicPointType) CharacteristicPointType.DikeToeAtPolder).Z - 0.6; + scenario.HeadPl3 = 1; + scenario.HeadPl4 = scenario.PolderLevel; + scenario.RequiredSafetyFactorStabilityInnerSlope = 1.2; + dikeLocation.Scenarios.Add(scenario); + } #region Sensor data setup Index: DamClients/DamLive/branches/DamLive 19.2/src/Deltares.DamLive.Tests/Deltares.DamLive.Tests.csproj =================================================================== diff -u -r3272 -r3304 --- DamClients/DamLive/branches/DamLive 19.2/src/Deltares.DamLive.Tests/Deltares.DamLive.Tests.csproj (.../Deltares.DamLive.Tests.csproj) (revision 3272) +++ DamClients/DamLive/branches/DamLive 19.2/src/Deltares.DamLive.Tests/Deltares.DamLive.Tests.csproj (.../Deltares.DamLive.Tests.csproj) (revision 3304) @@ -31,10 +31,22 @@ MinimumRecommendedRules.ruleset + + False + ..\..\lib\DamEngine\Deltares.DamEngine.Data.dll + False ..\..\lib\DSL-Geographic\Deltares.Geographic.dll + + False + ..\..\lib\DSL-Geo\Deltares.Geometry.dll + + + False + ..\..\lib\DSL-Geo\Deltares.Geotechnics.dll + False ..\..\lib\DSL-Geographic\Deltares.Standard.dll Index: DamClients/DamLive/branches/DamLive 19.2/src/Deltares.DamLive.Tests/DamLivePipingGrebbedijkTest.cs =================================================================== diff -u -r3295 -r3304 --- DamClients/DamLive/branches/DamLive 19.2/src/Deltares.DamLive.Tests/DamLivePipingGrebbedijkTest.cs (.../DamLivePipingGrebbedijkTest.cs) (revision 3295) +++ DamClients/DamLive/branches/DamLive 19.2/src/Deltares.DamLive.Tests/DamLivePipingGrebbedijkTest.cs (.../DamLivePipingGrebbedijkTest.cs) (revision 3304) @@ -91,7 +91,7 @@ outputFile = Path.Combine(actualTestPath, output1aFilename); parameterFile = Path.Combine(actualTestPath, calculationParametersStabilityFilename); projectFile = Path.Combine(actualTestPath, projectStabilityFilename); - DamProject.SetTestProgramVersion("19.1"); + DamProject.SetTestProgramVersion("19.2"); var damData = DamProject.LoadData(projectFile); locations = damData.Locations; Index: DamClients/DamLive/branches/DamLive 19.2/src/Deltares.DamLive.Tests/TestData/DamLive/Set2/output.damx =================================================================== diff -u -r3272 -r3304 --- DamClients/DamLive/branches/DamLive 19.2/src/Deltares.DamLive.Tests/TestData/DamLive/Set2/output.damx (.../output.damx) (revision 3272) +++ DamClients/DamLive/branches/DamLive 19.2/src/Deltares.DamLive.Tests/TestData/DamLive/Set2/output.damx (.../output.damx) (revision 3304) @@ -38,9 +38,9 @@ - + - + Index: DamClients/DamLive/branches/DamLive 19.2/src/Deltares.DamLive.Tests/DamLiveUsingCompleteDataSetTest.cs =================================================================== diff -u -r3272 -r3304 --- DamClients/DamLive/branches/DamLive 19.2/src/Deltares.DamLive.Tests/DamLiveUsingCompleteDataSetTest.cs (.../DamLiveUsingCompleteDataSetTest.cs) (revision 3272) +++ DamClients/DamLive/branches/DamLive 19.2/src/Deltares.DamLive.Tests/DamLiveUsingCompleteDataSetTest.cs (.../DamLiveUsingCompleteDataSetTest.cs) (revision 3304) @@ -87,7 +87,7 @@ parameterFile = Path.Combine(actualTestPath, "live.ParametersFile.xml"); projectFile = Path.Combine(actualTestPath, "output.damx"); - DamProject.SetTestProgramVersion("19.1"); + DamProject.SetTestProgramVersion("19.2"); var damData = DamProject.LoadData(projectFile); locations = damData.Locations; Index: DamClients/DamLive/branches/DamLive 19.2/src/Deltares.DamLive.Tests/DamLivePulauTekongStabilityOutwardTest.cs =================================================================== diff -u -r3272 -r3304 --- DamClients/DamLive/branches/DamLive 19.2/src/Deltares.DamLive.Tests/DamLivePulauTekongStabilityOutwardTest.cs (.../DamLivePulauTekongStabilityOutwardTest.cs) (revision 3272) +++ DamClients/DamLive/branches/DamLive 19.2/src/Deltares.DamLive.Tests/DamLivePulauTekongStabilityOutwardTest.cs (.../DamLivePulauTekongStabilityOutwardTest.cs) (revision 3304) @@ -92,7 +92,7 @@ outputFileFullname = Path.Combine(actualTestPath, outputFilename); parameterFile = Path.Combine(actualTestPath, calculationParametersStabilityFilename); projectFile = Path.Combine(actualTestPath, projectStabilityFilename); - DamProject.SetTestProgramVersion("19.1"); + DamProject.SetTestProgramVersion("19.2"); var damData = DamProject.LoadData(projectFile); locations = damData.Locations; Index: DamClients/DamLive/branches/DamLive 19.2/src/Deltares.DamLive.Tests/DamLivePulauTekongMissingValuesTest.cs =================================================================== diff -u -r3276 -r3304 --- DamClients/DamLive/branches/DamLive 19.2/src/Deltares.DamLive.Tests/DamLivePulauTekongMissingValuesTest.cs (.../DamLivePulauTekongMissingValuesTest.cs) (revision 3276) +++ DamClients/DamLive/branches/DamLive 19.2/src/Deltares.DamLive.Tests/DamLivePulauTekongMissingValuesTest.cs (.../DamLivePulauTekongMissingValuesTest.cs) (revision 3304) @@ -94,7 +94,7 @@ outputFileFullname = Path.Combine(actualTestPath, outputFilename); parameterFile = Path.Combine(actualTestPath, calculationParametersStabilityFilename); projectFile = Path.Combine(actualTestPath, projectStabilityFilename); - DamProject.SetTestProgramVersion("19.1"); + DamProject.SetTestProgramVersion("19.2"); var damData = DamProject.LoadData(projectFile); locations = damData.Locations; Index: DamClients/DamLive/branches/DamLive 19.2/src/Deltares.DamLive.Tests/DamLiveStabilityDrainedTest.cs =================================================================== diff -u -r3272 -r3304 --- DamClients/DamLive/branches/DamLive 19.2/src/Deltares.DamLive.Tests/DamLiveStabilityDrainedTest.cs (.../DamLiveStabilityDrainedTest.cs) (revision 3272) +++ DamClients/DamLive/branches/DamLive 19.2/src/Deltares.DamLive.Tests/DamLiveStabilityDrainedTest.cs (.../DamLiveStabilityDrainedTest.cs) (revision 3304) @@ -91,7 +91,7 @@ outputFile = Path.Combine(actualTestPath, output1aFilename); parameterFile = Path.Combine(actualTestPath, calculationParametersStabilityFilename); projectFile = Path.Combine(actualTestPath, projectStabilityFilename); - DamProject.SetTestProgramVersion("19.1"); + DamProject.SetTestProgramVersion("19.2"); var damData = DamProject.LoadData(projectFile); locations = damData.Locations; Index: DamClients/DamLive/branches/DamLive 19.2/src/Deltares.DamLive.Tests/ModelRunnerTest.cs =================================================================== diff -u -r3272 -r3304 --- DamClients/DamLive/branches/DamLive 19.2/src/Deltares.DamLive.Tests/ModelRunnerTest.cs (.../ModelRunnerTest.cs) (revision 3272) +++ DamClients/DamLive/branches/DamLive 19.2/src/Deltares.DamLive.Tests/ModelRunnerTest.cs (.../ModelRunnerTest.cs) (revision 3304) @@ -75,7 +75,7 @@ var actualTestPath = Guid.NewGuid().ToString().Replace("-", ""); actualTestPath = Path.Combine(TestWorkingFolder, actualTestPath); damProjectData = new DamProjectData(); - DamProject.SetTestProgramVersion("19.1"); + DamProject.SetTestProgramVersion("19.2"); runner = new ModelRunner { WorkingPath = actualTestPath, @@ -215,7 +215,7 @@ public void Process_UsingDefaultTestData_OutputCollectionShouldContainResults() { damProjectData.Dispose(); - DamProject.SetTestProgramVersion("19.1"); + DamProject.SetTestProgramVersion("19.2"); damProjectData = DamProject.LoadData(projectFile); runner.CalculationParameters = CalculationParameters.LoadFromFile(paramFile); Index: DamClients/DamLive/branches/DamLive 19.2/src/Deltares.Dam.Application.Live/Program.cs =================================================================== diff -u -r3272 -r3304 --- DamClients/DamLive/branches/DamLive 19.2/src/Deltares.Dam.Application.Live/Program.cs (.../Program.cs) (revision 3272) +++ DamClients/DamLive/branches/DamLive 19.2/src/Deltares.Dam.Application.Live/Program.cs (.../Program.cs) (revision 3304) @@ -72,7 +72,7 @@ commandLineArguments.TimeSeriesOutputFileName, Path.GetDirectoryName(commandLineArguments.TimeSeriesOutputFileName)); - Logger.LogInfo("v19.1 - Deltares 2019"); + Logger.LogInfo("v19.2 - Deltares 2019"); Logger.LogInfo("Model runner started"); Console.WriteLine(); program.StartCalculations( @@ -155,7 +155,7 @@ DamXFile = new FileInfo(damXFile), Filter = filter, }; - DamProject.SetTestProgramVersion("19.1"); + DamProject.SetTestProgramVersion("19.2"); damEngineRunner.Run(); } } Index: DamClients/DamLive/branches/DamLive 19.2/src/Deltares.DamLive.Version/GlobalAssembly.cs.svn =================================================================== diff -u -r3272 -r3304 --- DamClients/DamLive/branches/DamLive 19.2/src/Deltares.DamLive.Version/GlobalAssembly.cs.svn (.../GlobalAssembly.cs.svn) (revision 3272) +++ DamClients/DamLive/branches/DamLive 19.2/src/Deltares.DamLive.Version/GlobalAssembly.cs.svn (.../GlobalAssembly.cs.svn) (revision 3304) @@ -9,5 +9,5 @@ [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] -[assembly: AssemblyVersion("19.1.0.SVNREV")] -[assembly: AssemblyFileVersion("19.1.0.SVNREV")] \ No newline at end of file +[assembly: AssemblyVersion("19.2.0.SVNREV")] +[assembly: AssemblyFileVersion("19.2.0.SVNREV")] \ No newline at end of file