Index: DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/StabilityInside2DTests.cs =================================================================== diff -u -r6047 -r6114 --- DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/StabilityInside2DTests.cs (.../StabilityInside2DTests.cs) (revision 6047) +++ DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/StabilityInside2DTests.cs (.../StabilityInside2DTests.cs) (revision 6114) @@ -84,7 +84,7 @@ runner.StabilityWorkingPath = Path.GetTempPath(); runner.Run(); - runner.OutputTimeSeriesCollection.Save("StabilityInside2DOutputFile"); + runner.OutputTimeSeriesCollection.Save("StabilityInside2DOutputFile.xml"); GeneralHelper.AssertNoErrors(runner); List series = runner.OutputTimeSeriesCollection.Series; @@ -133,7 +133,7 @@ Assert.Multiple(() => { - Assert.That(seriesCount, Is.EqualTo(2), "Incorrect number of time series"); + Assert.That(seriesCount, Is.EqualTo(8), "Incorrect number of time series"); Assert.That(resultsCount, Is.EqualTo(4), "Incorrect number of results"); }); } Index: DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/StabilityInsideUpliftVanGridTest.cs =================================================================== diff -u -r6072 -r6114 --- DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/StabilityInsideUpliftVanGridTest.cs (.../StabilityInsideUpliftVanGridTest.cs) (revision 6072) +++ DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/StabilityInsideUpliftVanGridTest.cs (.../StabilityInsideUpliftVanGridTest.cs) (revision 6114) @@ -88,7 +88,7 @@ }); runner.Run(); - runner.OutputTimeSeriesCollection.Save("UpliftVanOutputFile" + maxCores); + runner.OutputTimeSeriesCollection.Save("StabilityInsideUpliftVanOutputFile" + maxCores + ".xml"); GeneralHelper.AssertNoErrors(runner); Index: DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/DamLiveHHNKTests.cs =================================================================== diff -u -r5844 -r6114 --- DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/DamLiveHHNKTests.cs (.../DamLiveHHNKTests.cs) (revision 5844) +++ DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/DamLiveHHNKTests.cs (.../DamLiveHHNKTests.cs) (revision 6114) @@ -37,7 +37,7 @@ [Test] [Category("Integration")] - public void CalculateStabilityUsingTestFilesHasExpectedResultsInOutputFile() + public void CalculateStability2DUpliftVanUsingTestFilesHasExpectedResultsInOutputFile() { SetupStabilityProject(); GeneralHelper.InitializeRunner(runner, 1); Index: DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/PipingWtiInsideTest.cs =================================================================== diff -u -r6074 -r6114 --- DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/PipingWtiInsideTest.cs (.../PipingWtiInsideTest.cs) (revision 6074) +++ DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/PipingWtiInsideTest.cs (.../PipingWtiInsideTest.cs) (revision 6114) @@ -84,7 +84,7 @@ Assert.That(runner.CalculationParameters.CalculationModules, Is.Not.Null); runner.Run(); - runner.OutputTimeSeriesCollection.Save("WtiPipingOutputFile" + maxCores); + runner.OutputTimeSeriesCollection.Save("WtiPipingOutputFile" + maxCores + ".xml"); GeneralHelper.AssertNoErrors(runner); Index: DamClients/DamLive/trunk/lib/DamEngine/nl-NL/Deltares.DamEngine.Data.resources.dll =================================================================== diff -u -r6099 -r6114 Binary files differ Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DAMEnumerations.cs =================================================================== diff -u -r6019 -r6114 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DAMEnumerations.cs (.../DAMEnumerations.cs) (revision 6019) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DAMEnumerations.cs (.../DAMEnumerations.cs) (revision 6114) @@ -189,7 +189,10 @@ OvertoppingErosion, StabilityInsideFactor, StabilityOutsideFactor, - PipingFactor + PipingFactor, + BishopCircleX, + BishopCircleZ, + BishopRadius } public enum UpliftType Index: DamClients/DamLive/trunk/lib/DamEngine/Deltares.DamEngine.Interface.dll =================================================================== diff -u -r6099 -r6114 Binary files differ Index: DamClients/DamLive/trunk/lib/DamEngine/Deltares.DamEngine.Io.deps.json =================================================================== diff -u -r6099 -r6114 --- DamClients/DamLive/trunk/lib/DamEngine/Deltares.DamEngine.Io.deps.json (.../Deltares.DamEngine.Io.deps.json) (revision 6099) +++ DamClients/DamLive/trunk/lib/DamEngine/Deltares.DamEngine.Io.deps.json (.../Deltares.DamEngine.Io.deps.json) (revision 6114) @@ -6,15 +6,15 @@ "compilationOptions": {}, "targets": { ".NETCoreApp,Version=v6.0": { - "Deltares.DamEngine.Io/24.1.0.6097": { + "Deltares.DamEngine.Io/24.1.0.6113": { "runtime": { "Deltares.DamEngine.Io.dll": {} } } } }, "libraries": { - "Deltares.DamEngine.Io/24.1.0.6097": { + "Deltares.DamEngine.Io/24.1.0.6113": { "type": "project", "serviceable": false, "sha512": "" Index: DamClients/DamLive/trunk/lib/DamEngine/Deltares.DamEngine.Io.dll =================================================================== diff -u -r6099 -r6114 Binary files differ Index: DamClients/DamLive/trunk/lib/DamEngine/Deltares.DamEngine.Calculators.dll =================================================================== diff -u -r6099 -r6114 Binary files differ Index: DamClients/DamLive/trunk/lib/DamEngine/Deltares.DamEngine.Data.deps.json =================================================================== diff -u -r6099 -r6114 --- DamClients/DamLive/trunk/lib/DamEngine/Deltares.DamEngine.Data.deps.json (.../Deltares.DamEngine.Data.deps.json) (revision 6099) +++ DamClients/DamLive/trunk/lib/DamEngine/Deltares.DamEngine.Data.deps.json (.../Deltares.DamEngine.Data.deps.json) (revision 6114) @@ -6,7 +6,7 @@ "compilationOptions": {}, "targets": { ".NETCoreApp,Version=v6.0": { - "Deltares.DamEngine.Data/24.1.0.6097": { + "Deltares.DamEngine.Data/24.1.0.6113": { "runtime": { "Deltares.DamEngine.Data.dll": {} }, @@ -19,7 +19,7 @@ } }, "libraries": { - "Deltares.DamEngine.Data/24.1.0.6097": { + "Deltares.DamEngine.Data/24.1.0.6113": { "type": "project", "serviceable": false, "sha512": "" Index: DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/StabilityInsideUpliftVanBeeSwarmTest.cs =================================================================== diff -u -r6072 -r6114 --- DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/StabilityInsideUpliftVanBeeSwarmTest.cs (.../StabilityInsideUpliftVanBeeSwarmTest.cs) (revision 6072) +++ DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/StabilityInsideUpliftVanBeeSwarmTest.cs (.../StabilityInsideUpliftVanBeeSwarmTest.cs) (revision 6114) @@ -94,7 +94,7 @@ }); runner.Run(); - runner.OutputTimeSeriesCollection.Save("UpliftVanBeeSwarmOutputFile" + maxCores); + runner.OutputTimeSeriesCollection.Save("StabilityInsideUpliftVanBeeSwarmOutputFile" + maxCores + ".xml"); GeneralHelper.AssertNoErrors(runner); Index: DamClients/DamLive/trunk/lib/DamEngine/Deltares.DamEngine.Interface.deps.json =================================================================== diff -u -r6099 -r6114 --- DamClients/DamLive/trunk/lib/DamEngine/Deltares.DamEngine.Interface.deps.json (.../Deltares.DamEngine.Interface.deps.json) (revision 6099) +++ DamClients/DamLive/trunk/lib/DamEngine/Deltares.DamEngine.Interface.deps.json (.../Deltares.DamEngine.Interface.deps.json) (revision 6114) @@ -6,11 +6,11 @@ "compilationOptions": {}, "targets": { ".NETCoreApp,Version=v6.0": { - "Deltares.DamEngine.Interface/24.1.0.6097": { + "Deltares.DamEngine.Interface/24.1.0.6113": { "dependencies": { - "Deltares.DamEngine.Calculators": "24.1.0.6097", - "Deltares.DamEngine.Data": "24.1.0.6097", - "Deltares.DamEngine.Io": "24.1.0.6097" + "Deltares.DamEngine.Calculators": "24.1.0.6113", + "Deltares.DamEngine.Data": "24.1.0.6113", + "Deltares.DamEngine.Io": "24.1.0.6113" }, "runtime": { "Deltares.DamEngine.Interface.dll": {} @@ -574,15 +574,15 @@ } }, "System.Threading.Tasks.Extensions/4.5.4": {}, - "Deltares.DamEngine.Calculators/24.1.0.6097": { + "Deltares.DamEngine.Calculators/24.1.0.6113": { "dependencies": { - "Deltares.DamEngine.Data": "24.1.0.6097", + "Deltares.DamEngine.Data": "24.1.0.6113", "Deltares.StixFileWriter": "24.1.0.118" }, "runtime": { "Deltares.DamEngine.Calculators.dll": { - "assemblyVersion": "24.1.0.6097", - "fileVersion": "24.1.0.6097" + "assemblyVersion": "24.1.0.6113", + "fileVersion": "24.1.0.6113" } }, "resources": { @@ -594,11 +594,11 @@ } } }, - "Deltares.DamEngine.Data/24.1.0.6097": { + "Deltares.DamEngine.Data/24.1.0.6113": { "runtime": { "Deltares.DamEngine.Data.dll": { - "assemblyVersion": "24.1.0.6097", - "fileVersion": "24.1.0.6097" + "assemblyVersion": "24.1.0.6113", + "fileVersion": "24.1.0.6113" } }, "resources": { @@ -607,11 +607,11 @@ } } }, - "Deltares.DamEngine.Io/24.1.0.6097": { + "Deltares.DamEngine.Io/24.1.0.6113": { "runtime": { "Deltares.DamEngine.Io.dll": { - "assemblyVersion": "24.1.0.6097", - "fileVersion": "24.1.0.6097" + "assemblyVersion": "24.1.0.6113", + "fileVersion": "24.1.0.6113" } } }, @@ -647,7 +647,7 @@ } }, "libraries": { - "Deltares.DamEngine.Interface/24.1.0.6097": { + "Deltares.DamEngine.Interface/24.1.0.6113": { "type": "project", "serviceable": false, "sha512": "" @@ -1128,17 +1128,17 @@ "path": "system.threading.tasks.extensions/4.5.4", "hashPath": "system.threading.tasks.extensions.4.5.4.nupkg.sha512" }, - "Deltares.DamEngine.Calculators/24.1.0.6097": { + "Deltares.DamEngine.Calculators/24.1.0.6113": { "type": "project", "serviceable": false, "sha512": "" }, - "Deltares.DamEngine.Data/24.1.0.6097": { + "Deltares.DamEngine.Data/24.1.0.6113": { "type": "project", "serviceable": false, "sha512": "" }, - "Deltares.DamEngine.Io/24.1.0.6097": { + "Deltares.DamEngine.Io/24.1.0.6113": { "type": "project", "serviceable": false, "sha512": "" Index: DamClients/DamLive/trunk/lib/DamEngine/Deltares.DamEngine.Data.dll =================================================================== diff -u -r6099 -r6114 Binary files differ Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillDamUiFromXmlOutput.cs =================================================================== diff -u -r6098 -r6114 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillDamUiFromXmlOutput.cs (.../FillDamUiFromXmlOutput.cs) (revision 6098) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillDamUiFromXmlOutput.cs (.../FillDamUiFromXmlOutput.cs) (revision 6114) @@ -87,17 +87,27 @@ { damProjectData.OutputTimeSerieCollection = new TimeSerieCollection(); TransferOutputTimeSeries(output.Results.OperationalOutputTimeSeries, damProjectData.OutputTimeSerieCollection); + // todo OperationalStaticData is not filled in the xml output (problem in the engine) + //if (output.Results.OperationalStaticData is { OperationalStaticData.StabilityModel: OperationalStaticDataStabilityModel.Bishop }) + if (damProjectData.DamProjectCalculationSpecification.CurrentSpecification.FailureMechanismSystemType + is FailureMechanismSystemType.StabilityInside or FailureMechanismSystemType.StabilityOutside + && damProjectData.DamProjectCalculationSpecification.CurrentSpecification.StabilityModelType == MStabModelType.Bishop) + { + TransferOutputTimeSeries(output.Results.OperationalOutputTimeSeries, damProjectData.OutputTimeSerieCollection, TimeSerieParameters.BishopCircleX.ToString()); + TransferOutputTimeSeries(output.Results.OperationalOutputTimeSeries, damProjectData.OutputTimeSerieCollection, TimeSerieParameters.BishopCircleZ.ToString()); + TransferOutputTimeSeries(output.Results.OperationalOutputTimeSeries, damProjectData.OutputTimeSerieCollection, TimeSerieParameters.BishopRadius.ToString()); + } } return damProjectData; } - private static void TransferOutputTimeSeries(DamEngine.Io.XmlOutput.TimeSerie[] outputTimeSeries, TimeSerieCollection outputTimeSerieCollection) + private static void TransferOutputTimeSeries(DamEngine.Io.XmlOutput.TimeSerie[] outputTimeSeries, TimeSerieCollection outputTimeSerieCollection, string parameterId = "") { foreach (DamEngine.Io.XmlOutput.TimeSerie outputTimeSerie in outputTimeSeries) { TimeSerie timeSerie = outputTimeSerieCollection.AddNewSeries(outputTimeSerie.LocationId); - timeSerie.ParameterId = outputTimeSerie.ParameterId; + timeSerie.ParameterId = parameterId == "" ? outputTimeSerie.ParameterId : parameterId; timeSerie.ForecastDateTime = outputTimeSerie.ForecastDateTime; timeSerie.Type = outputTimeSerie.Type; timeSerie.StartDateTime = outputTimeSerie.StartDateTime; @@ -131,13 +141,28 @@ var timeSerieEntry = new TimeSerieEntry { - DateTime = entry.DateTime, - Value = entry.Value + DateTime = entry.DateTime // BasisFileName = entry.BasisFileNameWMF, // Flag = entry.Flagnietechtgebruikt, // RelativeCalculationPathName = entry.RelativeCalculationPathName, // StochastValue = stochastValue }; + if (parameterId == "") + { + timeSerieEntry.Value = entry.Value; + } + if (parameterId == TimeSerieParameters.BishopCircleX.ToString()) + { + timeSerieEntry.Value = entry.BishopCalculatedSlipPlane is { Center: not null } ? entry.BishopCalculatedSlipPlane.Center.X : double.NaN; + } + if (parameterId == TimeSerieParameters.BishopCircleZ.ToString()) + { + timeSerieEntry.Value = entry.BishopCalculatedSlipPlane is { Center: not null } ? entry.BishopCalculatedSlipPlane.Center.Z : double.NaN; + } + if (parameterId == TimeSerieParameters.BishopRadius.ToString()) + { + timeSerieEntry.Value = entry.BishopCalculatedSlipPlane?.Radius ?? double.NaN; + } timeSerie.Entries.Add(timeSerieEntry); } } Index: DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/DamLivePulauTekongTests.cs =================================================================== diff -u -r5844 -r6114 --- DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/DamLivePulauTekongTests.cs (.../DamLivePulauTekongTests.cs) (revision 5844) +++ DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/DamLivePulauTekongTests.cs (.../DamLivePulauTekongTests.cs) (revision 6114) @@ -36,7 +36,7 @@ [Test] [Category("Integration")] - public void CalculateStability2DInsideUsingTestFilesHasExpectedResultsInOutputFile() + public void CalculateStability2DBishopInsideUsingTestFilesHasExpectedResultsInOutputFile() { const string testWorkingFolder = @".\damLivePulauTekongInside"; const string testStabilityDataFolder = @"..\..\..\..\data\PulauTekong\PulauTekong_inside"; @@ -51,6 +51,9 @@ var seriesCount = 0; var isFirstResultFound = false; var isLastResultFound = false; + var isFirstCircleXFound = false; + var isFirstCircleZFound = false; + var isFirstRadiusFound = false; string[] validParameterIDs = Enum.GetNames(typeof(TimeSerieParameters)); foreach (TimeSerie timeSeries in series) { @@ -59,33 +62,58 @@ Assert.That(validParameterIDs.Any(n => n == timeSeries.ParameterId), Is.True); Assert.That(locations.Any(l => l.Name == timeSeries.LocationId), Is.True); }); - // StabilityInside check - Assert.That(timeSeries.ParameterId, Is.EqualTo(TimeSerieParameters.StabilityInsideFactor.ToString())); if (timeSeries.LocationId == "CD CS1 X1") { - isFirstResultFound = true; - 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.StabilityInsideFactor.ToString()) + { + isFirstResultFound = true; + 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.BishopCircleX.ToString()) + { + isFirstCircleXFound = true; + TimeSerieEntry firstEntry = timeSeries.Entries.First(); + Assert.That(firstEntry.Value, Is.EqualTo(32.875).Within(cTolerance), "The computed safety factory is not correct"); + } + if (timeSeries.ParameterId == TimeSerieParameters.BishopCircleZ.ToString()) + { + isFirstCircleZFound = true; + TimeSerieEntry firstEntry = timeSeries.Entries.First(); + Assert.That(firstEntry.Value, Is.EqualTo(109.375).Within(cTolerance), "The computed safety factory is not correct"); + } + if (timeSeries.ParameterId == TimeSerieParameters.BishopRadius.ToString()) + { + isFirstRadiusFound = true; + TimeSerieEntry firstEntry = timeSeries.Entries.First(); + Assert.That(firstEntry.Value, Is.EqualTo(13.575).Within(cTolerance), "The computed safety factory is not correct"); + } } if (timeSeries.LocationId == "SD CS3 10-10") { - isLastResultFound = true; - TimeSerieEntry firstEntry = timeSeries.Entries.First(); - Assert.That(firstEntry.Value, Is.EqualTo(0.997).Within(cTolerance), "The computed safety factory is not correct"); + if (timeSeries.ParameterId == TimeSerieParameters.StabilityInsideFactor.ToString()) + { + isLastResultFound = true; + TimeSerieEntry firstEntry = timeSeries.Entries.First(); + 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(5)); + 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 X"); + Assert.That(isFirstCircleZFound, Is.True, "The first location has no output for bishop circle Z"); + Assert.That(isFirstRadiusFound, Is.True, "The first location has no output for bishop radius"); }); } [Test] [Category("Integration")] - public void CalculateStability2DOutsideUsingTestFilesHasExpectedResultsInOutputFile() + public void CalculateStability2DBishopOutsideUsingTestFilesHasExpectedResultsInOutputFile() { const string testWorkingFolder = @".\damLivePulauTekongOutside"; const string testStabilityDataFolder = @"..\..\..\..\data\PulauTekong\PulauTekong_outside"; @@ -109,25 +137,29 @@ Assert.That(validParameterIDs.Any(n => n == timeSeries.ParameterId), Is.True); Assert.That(locations.Any(l => l.Name == timeSeries.LocationId), Is.True); }); - // StabilityOutside check - Assert.That(timeSeries.ParameterId, Is.EqualTo(TimeSerieParameters.StabilityOutsideFactor.ToString())); if (timeSeries.LocationId == "SD CS1 3-3") { - isFirstResultFound = true; - TimeSerieEntry firstEntry = timeSeries.Entries.First(); - Assert.That(firstEntry.Value, Is.EqualTo(1.222).Within(cTolerance), "The computed safety factory is not correct"); + if (timeSeries.ParameterId == TimeSerieParameters.StabilityOutsideFactor.ToString()) + { + isFirstResultFound = true; + TimeSerieEntry firstEntry = timeSeries.Entries.First(); + Assert.That(firstEntry.Value, Is.EqualTo(1.222).Within(cTolerance), "The computed safety factory is not correct"); + } } if (timeSeries.LocationId == "SD CS3 10-10") { - isLastResultFound = true; - TimeSerieEntry firstEntry = timeSeries.Entries.First(); - Assert.That(firstEntry.Value, Is.EqualTo(1.282).Within(cTolerance), "The computed safety factory is not correct"); + if (timeSeries.ParameterId == TimeSerieParameters.StabilityOutsideFactor.ToString()) + { + isLastResultFound = true; + TimeSerieEntry firstEntry = timeSeries.Entries.First(); + 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(3)); + 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"); }); Index: DamClients/DamLive/trunk/lib/DamEngine/Deltares.DamEngine.Calculators.deps.json =================================================================== diff -u -r6099 -r6114 --- DamClients/DamLive/trunk/lib/DamEngine/Deltares.DamEngine.Calculators.deps.json (.../Deltares.DamEngine.Calculators.deps.json) (revision 6099) +++ DamClients/DamLive/trunk/lib/DamEngine/Deltares.DamEngine.Calculators.deps.json (.../Deltares.DamEngine.Calculators.deps.json) (revision 6114) @@ -6,9 +6,9 @@ "compilationOptions": {}, "targets": { ".NETCoreApp,Version=v6.0": { - "Deltares.DamEngine.Calculators/24.1.0.6097": { + "Deltares.DamEngine.Calculators/24.1.0.6113": { "dependencies": { - "Deltares.DamEngine.Data": "24.1.0.6097", + "Deltares.DamEngine.Data": "24.1.0.6113", "Deltares.StixFileWriter": "24.1.0.118", "Deltares.DamPiping.BlighCalculator": "23.2.0.4623", "Deltares.WTIPiping": "24.1.500.10" @@ -575,11 +575,11 @@ } }, "System.Threading.Tasks.Extensions/4.5.4": {}, - "Deltares.DamEngine.Data/24.1.0.6097": { + "Deltares.DamEngine.Data/24.1.0.6113": { "runtime": { "Deltares.DamEngine.Data.dll": { - "assemblyVersion": "24.1.0.6097", - "fileVersion": "24.1.0.6097" + "assemblyVersion": "24.1.0.6113", + "fileVersion": "24.1.0.6113" } }, "resources": { @@ -620,7 +620,7 @@ } }, "libraries": { - "Deltares.DamEngine.Calculators/24.1.0.6097": { + "Deltares.DamEngine.Calculators/24.1.0.6113": { "type": "project", "serviceable": false, "sha512": "" @@ -1101,7 +1101,7 @@ "path": "system.threading.tasks.extensions/4.5.4", "hashPath": "system.threading.tasks.extensions.4.5.4.nupkg.sha512" }, - "Deltares.DamEngine.Data/24.1.0.6097": { + "Deltares.DamEngine.Data/24.1.0.6113": { "type": "project", "serviceable": false, "sha512": "" Index: DamClients/DamLive/trunk/lib/DamEngine/nl-NL/Deltares.DamEngine.Interface.resources.dll =================================================================== diff -u -r6099 -r6114 Binary files differ Index: DamClients/DamLive/trunk/lib/DamEngine/nl-NL/Deltares.DamEngine.Calculators.resources.dll =================================================================== diff -u -r6099 -r6114 Binary files differ Index: DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/StabilityInsideBishopGridTest.cs =================================================================== diff -u -r6072 -r6114 --- DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/StabilityInsideBishopGridTest.cs (.../StabilityInsideBishopGridTest.cs) (revision 6072) +++ DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/StabilityInsideBishopGridTest.cs (.../StabilityInsideBishopGridTest.cs) (revision 6114) @@ -90,7 +90,7 @@ runner.StabilityWorkingPath = Path.GetTempPath(); runner.Run(); - runner.OutputTimeSeriesCollection.Save("BishopGridOutputFile" + maxCores); + runner.OutputTimeSeriesCollection.Save("StabilityInsideBishopGridOutputFile" + maxCores + ".xml"); GeneralHelper.AssertNoErrors(runner);