Index: DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/DamLivePulauTekongTests.cs =================================================================== diff -u -r6219 -r7136 --- DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/DamLivePulauTekongTests.cs (.../DamLivePulauTekongTests.cs) (revision 6219) +++ DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/DamLivePulauTekongTests.cs (.../DamLivePulauTekongTests.cs) (revision 7136) @@ -1,4 +1,4 @@ -// Copyright (C) Stichting Deltares 2023. All rights reserved. +// Copyright (C) Stichting Deltares 2026. All rights reserved. // // This file is part of the application DAM - Live. // @@ -22,8 +22,8 @@ using System; using System.Collections.Generic; using System.Linq; -using Deltares.DamLive.Application; using Deltares.Dam.Data; +using Deltares.DamLive.Application; using Deltares.DamLive.TestHelper; using NUnit.Framework; @@ -70,25 +70,29 @@ TimeSerieEntry firstEntry = timeSeries.Entries.First(); Assert.That(firstEntry.Value, Is.EqualTo(1.439).Within(cTolerance), "The computed safety factory is not correct"); } + if (timeSeries.ParameterId == TimeSerieParameters.BishopCircleCentreX.ToString()) { isFirstCircleXFound = true; TimeSerieEntry firstEntry = timeSeries.Entries.First(); Assert.That(firstEntry.Value, Is.EqualTo(32.875).Within(cTolerance), "The computed bishop circle centre X is not correct"); } + if (timeSeries.ParameterId == TimeSerieParameters.BishopCircleCentreZ.ToString()) { isFirstCircleZFound = true; TimeSerieEntry firstEntry = timeSeries.Entries.First(); Assert.That(firstEntry.Value, Is.EqualTo(109.375).Within(cTolerance), "The computed bishop circle centre Z is not correct"); } + if (timeSeries.ParameterId == TimeSerieParameters.BishopCircleRadius.ToString()) { isFirstRadiusFound = true; TimeSerieEntry firstEntry = timeSeries.Entries.First(); Assert.That(firstEntry.Value, Is.EqualTo(13.575).Within(cTolerance), "The computed bishop circle radius is not correct"); } } + if (timeSeries.LocationId == "SD CS3 10-10") { if (timeSeries.ParameterId == TimeSerieParameters.StabilityInsideFactor.ToString()) @@ -98,11 +102,13 @@ Assert.That(firstEntry.Value, Is.EqualTo(0.997).Within(cTolerance), "The computed safety factory is not correct"); } } + seriesCount++; } + Assert.Multiple(() => { - Assert.That(seriesCount, Is.EqualTo(20)); + Assert.That(seriesCount, Is.EqualTo(20)); Assert.That(isFirstResultFound, Is.True, "The first location has no output for stability inside"); Assert.That(isLastResultFound, Is.True, "The last location has no output for stability inside"); Assert.That(isFirstCircleXFound, Is.True, "The first location has no output for bishop circle centre X"); @@ -146,6 +152,7 @@ Assert.That(firstEntry.Value, Is.EqualTo(1.222).Within(cTolerance), "The computed safety factory is not correct"); } } + if (timeSeries.LocationId == "SD CS3 10-10") { if (timeSeries.ParameterId == TimeSerieParameters.StabilityOutsideFactor.ToString()) @@ -155,11 +162,13 @@ Assert.That(firstEntry.Value, Is.EqualTo(1.282).Within(cTolerance), "The computed safety factory is not correct"); } } + seriesCount++; } + Assert.Multiple(() => { - Assert.That(seriesCount, Is.EqualTo(12)); + Assert.That(seriesCount, Is.EqualTo(12)); Assert.That(isFirstResultFound, Is.True, "The first location has no output for stability outside"); Assert.That(isLastResultFound, Is.True, "The last location has no output for stability outside"); }); @@ -179,8 +188,8 @@ private void SetupStabilityProject(string testWorkingFolder, string testStabilityDataFolder) { IoHelper.RemoveTestWorkingDirectory(testWorkingFolder); // to be sure no test directory exist from previous tests - GeneralHelper.SetupIntegrationProject(testWorkingFolder, testStabilityDataFolder, projectStabilityFilename, - out runner, out locations); + GeneralHelper.SetupIntegrationProject(testWorkingFolder, testStabilityDataFolder, projectStabilityFilename, + out runner, out locations); } #endregion Index: DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/FillDomainFromXmlCalculationParametersTests.cs =================================================================== diff -u -r7134 -r7136 --- DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/FillDomainFromXmlCalculationParametersTests.cs (.../FillDomainFromXmlCalculationParametersTests.cs) (revision 7134) +++ DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/FillDomainFromXmlCalculationParametersTests.cs (.../FillDomainFromXmlCalculationParametersTests.cs) (revision 7136) @@ -1,4 +1,4 @@ -// Copyright (C) Stichting Deltares 2023. All rights reserved. +// Copyright (C) Stichting Deltares 2026. All rights reserved. // // This file is part of the application DAM - Live. // Index: DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/PipingWtiInsideTest.cs =================================================================== diff -u -r7134 -r7136 --- DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/PipingWtiInsideTest.cs (.../PipingWtiInsideTest.cs) (revision 7134) +++ DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/PipingWtiInsideTest.cs (.../PipingWtiInsideTest.cs) (revision 7136) @@ -1,4 +1,4 @@ -// Copyright (C) Stichting Deltares 2023. All rights reserved. +// Copyright (C) Stichting Deltares 2026. All rights reserved. // // This file is part of the application DAM - Live. // Index: DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/StabilityInsideUpliftVanGridTest.cs =================================================================== diff -u -r7134 -r7136 --- DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/StabilityInsideUpliftVanGridTest.cs (.../StabilityInsideUpliftVanGridTest.cs) (revision 7134) +++ DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/StabilityInsideUpliftVanGridTest.cs (.../StabilityInsideUpliftVanGridTest.cs) (revision 7136) @@ -1,4 +1,4 @@ -// Copyright (C) Stichting Deltares 2023. All rights reserved. +// Copyright (C) Stichting Deltares 2026. All rights reserved. // // This file is part of the application DAM - Live. // Index: DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/StabilityInside2DTests.cs =================================================================== diff -u -r6953 -r7136 --- DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/StabilityInside2DTests.cs (.../StabilityInside2DTests.cs) (revision 6953) +++ DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/StabilityInside2DTests.cs (.../StabilityInside2DTests.cs) (revision 7136) @@ -1,4 +1,4 @@ -// Copyright (C) Stichting Deltares 2023. All rights reserved. +// Copyright (C) Stichting Deltares 2026. All rights reserved. // // This file is part of the application DAM - Live. // @@ -23,8 +23,8 @@ using System.Collections.Generic; using System.IO; using System.Linq; -using Deltares.DamLive.Application; using Deltares.Dam.Data; +using Deltares.DamLive.Application; using Deltares.DamLive.TestHelper; using NUnit.Framework; @@ -71,11 +71,8 @@ runner.Initialize(); runner.MaxCalculationCores = 1; Assert.That(runner, Is.Not.Null); - Assert.Multiple(() => - { - Assert.That(runner.DamProjectData, Is.Not.Null); - }); - + Assert.Multiple(() => { Assert.That(runner.DamProjectData, Is.Not.Null); }); + runner.StabilityWorkingPath = Path.GetTempPath(); runner.Run(); Index: DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/StabilityInsideUpliftVanBeeSwarmTest.cs =================================================================== diff -u -r6953 -r7136 --- DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/StabilityInsideUpliftVanBeeSwarmTest.cs (.../StabilityInsideUpliftVanBeeSwarmTest.cs) (revision 6953) +++ DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/StabilityInsideUpliftVanBeeSwarmTest.cs (.../StabilityInsideUpliftVanBeeSwarmTest.cs) (revision 7136) @@ -1,4 +1,4 @@ -// Copyright (C) Stichting Deltares 2023. All rights reserved. +// Copyright (C) Stichting Deltares 2026. All rights reserved. // // This file is part of the application DAM - Live. // @@ -25,11 +25,11 @@ using System.IO; using System.Linq; using System.Threading; -using Deltares.DamLive.Application; using Deltares.Dam.Data; using Deltares.DamEngine.Interface; using Deltares.DamEngine.Io; using Deltares.DamEngine.Io.XmlInput; +using Deltares.DamLive.Application; using Deltares.DamLive.TestHelper; using NUnit.Framework; using Location = Deltares.Dam.Data.Location; @@ -80,11 +80,8 @@ runner.Initialize(); runner.MaxCalculationCores = maxCores; Assert.That(runner, Is.Not.Null); - Assert.Multiple(() => - { - Assert.That(runner.DamProjectData, Is.Not.Null); - }); - + Assert.Multiple(() => { Assert.That(runner.DamProjectData, Is.Not.Null); }); + runner.Run(); runner.OutputTimeSeriesCollection.Save("StabilityInsideUpliftVanBeeSwarmOutputFile" + maxCores + ".xml"); @@ -211,7 +208,7 @@ Thread.CurrentThread.CurrentCulture = CultureInfo.InvariantCulture; string inputString = File.ReadAllText(fullInputFilename); string testName = "InputForDebuggingBeeSwarm" + maxCores + " .xml"; - + var engineInterface = new EngineInterface(inputString); Assert.That(engineInterface.DamProjectData, Is.Not.Null); engineInterface.DamProjectData.MaxCalculationCores = maxCores; Index: DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/XmlConversionHelperTests.cs =================================================================== diff -u -r7134 -r7136 --- DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/XmlConversionHelperTests.cs (.../XmlConversionHelperTests.cs) (revision 7134) +++ DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/XmlConversionHelperTests.cs (.../XmlConversionHelperTests.cs) (revision 7136) @@ -1,4 +1,4 @@ -// Copyright (C) Stichting Deltares 2023. All rights reserved. +// Copyright (C) Stichting Deltares 2026. All rights reserved. // // This file is part of the application DAM - Live. // Index: DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/DamLiveHHNKTests.cs =================================================================== diff -u -r7134 -r7136 --- DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/DamLiveHHNKTests.cs (.../DamLiveHHNKTests.cs) (revision 7134) +++ DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/DamLiveHHNKTests.cs (.../DamLiveHHNKTests.cs) (revision 7136) @@ -1,4 +1,4 @@ -// Copyright (C) Stichting Deltares 2023. All rights reserved. +// Copyright (C) Stichting Deltares 2026. All rights reserved. // // This file is part of the application DAM - Live. // Index: DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/StabilityInsideBishopGridTest.cs =================================================================== diff -u -r6953 -r7136 --- DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/StabilityInsideBishopGridTest.cs (.../StabilityInsideBishopGridTest.cs) (revision 6953) +++ DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/StabilityInsideBishopGridTest.cs (.../StabilityInsideBishopGridTest.cs) (revision 7136) @@ -1,4 +1,4 @@ -// Copyright (C) Stichting Deltares 2023. All rights reserved. +// Copyright (C) Stichting Deltares 2026. All rights reserved. // // This file is part of the application DAM - Live. // @@ -23,8 +23,8 @@ using System.Collections.Generic; using System.IO; using System.Linq; -using Deltares.DamLive.Application; using Deltares.Dam.Data; +using Deltares.DamLive.Application; using Deltares.DamLive.TestHelper; using NUnit.Framework; @@ -75,10 +75,7 @@ runner.Initialize(); runner.MaxCalculationCores = maxCores; Assert.That(runner, Is.Not.Null); - Assert.Multiple(() => - { - Assert.That(runner.DamProjectData, Is.Not.Null); - }); + Assert.Multiple(() => { Assert.That(runner.DamProjectData, Is.Not.Null); }); runner.StabilityWorkingPath = Path.GetTempPath(); runner.Run(); Index: DamClients/DamLive/trunk/src/Deltares.DamLive.Io/CalculationParametersXmlSerialization.cs =================================================================== diff -u -r7134 -r7136 --- DamClients/DamLive/trunk/src/Deltares.DamLive.Io/CalculationParametersXmlSerialization.cs (.../CalculationParametersXmlSerialization.cs) (revision 7134) +++ DamClients/DamLive/trunk/src/Deltares.DamLive.Io/CalculationParametersXmlSerialization.cs (.../CalculationParametersXmlSerialization.cs) (revision 7136) @@ -1,4 +1,4 @@ -// Copyright (C) Stichting Deltares 2023. All rights reserved. +// Copyright (C) Stichting Deltares 2026. All rights reserved. // // This file is part of the application DAM - Live. // Index: DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/DamEngineRunnerTest.cs =================================================================== diff -u -r6954 -r7136 --- DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/DamEngineRunnerTest.cs (.../DamEngineRunnerTest.cs) (revision 6954) +++ DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/DamEngineRunnerTest.cs (.../DamEngineRunnerTest.cs) (revision 7136) @@ -1,4 +1,4 @@ -// Copyright (C) Stichting Deltares 2023. All rights reserved. +// Copyright (C) Stichting Deltares 2026. All rights reserved. // // This file is part of the application DAM - Live. // Index: DamClients/DamLive/trunk/src/Deltares.DamLive.Application/app.config =================================================================== diff -u -r6324 -r7136 --- DamClients/DamLive/trunk/src/Deltares.DamLive.Application/app.config (.../app.config) (revision 6324) +++ DamClients/DamLive/trunk/src/Deltares.DamLive.Application/app.config (.../app.config) (revision 7136) @@ -1,10 +1,10 @@