Index: DamClients/DamUI/trunk/lib/DamEngine/Deltares.DamEngine.Interface.deps.json =================================================================== diff -u -r6095 -r6098 --- DamClients/DamUI/trunk/lib/DamEngine/Deltares.DamEngine.Interface.deps.json (.../Deltares.DamEngine.Interface.deps.json) (revision 6095) +++ DamClients/DamUI/trunk/lib/DamEngine/Deltares.DamEngine.Interface.deps.json (.../Deltares.DamEngine.Interface.deps.json) (revision 6098) @@ -6,11 +6,11 @@ "compilationOptions": {}, "targets": { ".NETCoreApp,Version=v6.0": { - "Deltares.DamEngine.Interface/24.1.0.6077": { + "Deltares.DamEngine.Interface/24.1.0.6097": { "dependencies": { - "Deltares.DamEngine.Calculators": "24.1.0.6077", - "Deltares.DamEngine.Data": "24.1.0.6077", - "Deltares.DamEngine.Io": "24.1.0.6077" + "Deltares.DamEngine.Calculators": "24.1.0.6097", + "Deltares.DamEngine.Data": "24.1.0.6097", + "Deltares.DamEngine.Io": "24.1.0.6097" }, "runtime": { "Deltares.DamEngine.Interface.dll": {} @@ -574,15 +574,15 @@ } }, "System.Threading.Tasks.Extensions/4.5.4": {}, - "Deltares.DamEngine.Calculators/24.1.0.6077": { + "Deltares.DamEngine.Calculators/24.1.0.6097": { "dependencies": { - "Deltares.DamEngine.Data": "24.1.0.6077", + "Deltares.DamEngine.Data": "24.1.0.6097", "Deltares.StixFileWriter": "24.1.0.118" }, "runtime": { "Deltares.DamEngine.Calculators.dll": { - "assemblyVersion": "24.1.0.6077", - "fileVersion": "24.1.0.6077" + "assemblyVersion": "24.1.0.6097", + "fileVersion": "24.1.0.6097" } }, "resources": { @@ -594,11 +594,11 @@ } } }, - "Deltares.DamEngine.Data/24.1.0.6077": { + "Deltares.DamEngine.Data/24.1.0.6097": { "runtime": { "Deltares.DamEngine.Data.dll": { - "assemblyVersion": "24.1.0.6077", - "fileVersion": "24.1.0.6077" + "assemblyVersion": "24.1.0.6097", + "fileVersion": "24.1.0.6097" } }, "resources": { @@ -607,11 +607,11 @@ } } }, - "Deltares.DamEngine.Io/24.1.0.6077": { + "Deltares.DamEngine.Io/24.1.0.6097": { "runtime": { "Deltares.DamEngine.Io.dll": { - "assemblyVersion": "24.1.0.6077", - "fileVersion": "24.1.0.6077" + "assemblyVersion": "24.1.0.6097", + "fileVersion": "24.1.0.6097" } } }, @@ -647,7 +647,7 @@ } }, "libraries": { - "Deltares.DamEngine.Interface/24.1.0.6077": { + "Deltares.DamEngine.Interface/24.1.0.6097": { "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.6077": { + "Deltares.DamEngine.Calculators/24.1.0.6097": { "type": "project", "serviceable": false, "sha512": "" }, - "Deltares.DamEngine.Data/24.1.0.6077": { + "Deltares.DamEngine.Data/24.1.0.6097": { "type": "project", "serviceable": false, "sha512": "" }, - "Deltares.DamEngine.Io/24.1.0.6077": { + "Deltares.DamEngine.Io/24.1.0.6097": { "type": "project", "serviceable": false, "sha512": "" Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DamEngineIo/FillXmlInputFromDamUiTests.cs =================================================================== diff -u -r6068 -r6098 --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DamEngineIo/FillXmlInputFromDamUiTests.cs (.../FillXmlInputFromDamUiTests.cs) (revision 6068) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DamEngineIo/FillXmlInputFromDamUiTests.cs (.../FillXmlInputFromDamUiTests.cs) (revision 6098) @@ -996,11 +996,11 @@ timeSerie.Entries.Add(new TimeSerieEntry { DateTime = new DateTime(2012, 12, 31, 1, j * 10, 0), - Value = j, - Flag = 1, - BasisFileName = $"BasisFileName{i}", - RelativeCalculationPathName = $"RelativeCalculationPathName{i}", - StochastValue = stochastValue + Value = j + // Flag = 1, + // BasisFileName = $"BasisFileName{i}", + // RelativeCalculationPathName = $"RelativeCalculationPathName{i}", + // StochastValue = stochastValue }); } } Index: DamClients/DamUI/trunk/lib/DamEngine/Deltares.DamEngine.Io.dll =================================================================== diff -u -r6095 -r6098 Binary files differ Index: DamClients/DamUI/trunk/lib/DamEngine/Deltares.DamEngine.Io.deps.json =================================================================== diff -u -r6095 -r6098 --- DamClients/DamUI/trunk/lib/DamEngine/Deltares.DamEngine.Io.deps.json (.../Deltares.DamEngine.Io.deps.json) (revision 6095) +++ DamClients/DamUI/trunk/lib/DamEngine/Deltares.DamEngine.Io.deps.json (.../Deltares.DamEngine.Io.deps.json) (revision 6098) @@ -6,15 +6,15 @@ "compilationOptions": {}, "targets": { ".NETCoreApp,Version=v6.0": { - "Deltares.DamEngine.Io/24.1.0.6077": { + "Deltares.DamEngine.Io/24.1.0.6097": { "runtime": { "Deltares.DamEngine.Io.dll": {} } } } }, "libraries": { - "Deltares.DamEngine.Io/24.1.0.6077": { + "Deltares.DamEngine.Io/24.1.0.6097": { "type": "project", "serviceable": false, "sha512": "" Index: DamClients/DamUI/trunk/lib/DamEngine/nl-NL/Deltares.DamEngine.Interface.resources.dll =================================================================== diff -u -r6095 -r6098 Binary files differ Index: DamClients/DamUI/trunk/lib/DamEngine/nl-NL/Deltares.DamEngine.Data.resources.dll =================================================================== diff -u -r6095 -r6098 Binary files differ Index: DamClients/DamUI/trunk/lib/DamEngine/Deltares.DamEngine.Interface.dll =================================================================== diff -u -r6095 -r6098 Binary files differ Index: DamClients/DamUI/trunk/lib/DamEngine/Deltares.DamEngine.Data.dll =================================================================== diff -u -r6095 -r6098 Binary files differ Index: DamClients/DamUI/trunk/lib/DamEngine/nl-NL/Deltares.DamEngine.Calculators.resources.dll =================================================================== diff -u -r6095 -r6098 Binary files differ Index: DamClients/DamUI/trunk/lib/DamEngine/Deltares.DamEngine.Data.deps.json =================================================================== diff -u -r6095 -r6098 --- DamClients/DamUI/trunk/lib/DamEngine/Deltares.DamEngine.Data.deps.json (.../Deltares.DamEngine.Data.deps.json) (revision 6095) +++ DamClients/DamUI/trunk/lib/DamEngine/Deltares.DamEngine.Data.deps.json (.../Deltares.DamEngine.Data.deps.json) (revision 6098) @@ -6,7 +6,7 @@ "compilationOptions": {}, "targets": { ".NETCoreApp,Version=v6.0": { - "Deltares.DamEngine.Data/24.1.0.6077": { + "Deltares.DamEngine.Data/24.1.0.6097": { "runtime": { "Deltares.DamEngine.Data.dll": {} }, @@ -19,7 +19,7 @@ } }, "libraries": { - "Deltares.DamEngine.Data/24.1.0.6077": { + "Deltares.DamEngine.Data/24.1.0.6097": { "type": "project", "serviceable": false, "sha512": "" Index: DamClients/DamUI/trunk/lib/DamEngine/Deltares.DamEngine.Calculators.dll =================================================================== diff -u -r6095 -r6098 Binary files differ Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillXmlOutputFromDamUi.cs =================================================================== diff -u -r6095 -r6098 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillXmlOutputFromDamUi.cs (.../FillXmlOutputFromDamUi.cs) (revision 6095) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillXmlOutputFromDamUi.cs (.../FillXmlOutputFromDamUi.cs) (revision 6098) @@ -94,25 +94,25 @@ var timeSerieEntryIndex = 0; foreach (TimeSerieEntry timestepEntry in damTimeSerie.Entries) { - TimeSerieEntriesTimeSerieEntryStochastValue stochastValue = null; - if (timestepEntry.StochastValue != null) - { - stochastValue = new TimeSerieEntriesTimeSerieEntryStochastValue - { - Distribution = timestepEntry.StochastValue.Distribution, - Mean = timestepEntry.StochastValue.Mean, - StandardDeviation = timestepEntry.StochastValue.StandardDeviation - }; - } + // TimeSerieEntriesTimeSerieEntryStochastValue stochastValue = null; + // if (timestepEntry.StochastValue != null) + // { + // stochastValue = new TimeSerieEntriesTimeSerieEntryStochastValue + // { + // Distribution = timestepEntry.StochastValue.Distribution, + // Mean = timestepEntry.StochastValue.Mean, + // StandardDeviation = timestepEntry.StochastValue.StandardDeviation + // }; + // } var timeStep = new TimeSerieEntriesTimeSerieEntry { DateTime = timestepEntry.DateTime, - Value = timestepEntry.Value, - BasisFileNameWMF = timestepEntry.BasisFileName, - Flagnietechtgebruikt = timestepEntry.Flag, - RelativeCalculationPathName = timestepEntry.RelativeCalculationPathName, - StochastValue = stochastValue + Value = timestepEntry.Value + // BasisFileNameWMF = timestepEntry.BasisFileName, + // Flagnietechtgebruikt = timestepEntry.Flag, + // RelativeCalculationPathName = timestepEntry.RelativeCalculationPathName, + // StochastValue = stochastValue }; outputTimeSerie.Entries.TimeSerieEntry[timeSerieEntryIndex] = timeStep; timeSerieEntryIndex++; Index: DamClients/DamUI/trunk/lib/DamEngine/Deltares.DamEngine.Calculators.deps.json =================================================================== diff -u -r6095 -r6098 --- DamClients/DamUI/trunk/lib/DamEngine/Deltares.DamEngine.Calculators.deps.json (.../Deltares.DamEngine.Calculators.deps.json) (revision 6095) +++ DamClients/DamUI/trunk/lib/DamEngine/Deltares.DamEngine.Calculators.deps.json (.../Deltares.DamEngine.Calculators.deps.json) (revision 6098) @@ -6,9 +6,9 @@ "compilationOptions": {}, "targets": { ".NETCoreApp,Version=v6.0": { - "Deltares.DamEngine.Calculators/24.1.0.6077": { + "Deltares.DamEngine.Calculators/24.1.0.6097": { "dependencies": { - "Deltares.DamEngine.Data": "24.1.0.6077", + "Deltares.DamEngine.Data": "24.1.0.6097", "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.6077": { + "Deltares.DamEngine.Data/24.1.0.6097": { "runtime": { "Deltares.DamEngine.Data.dll": { - "assemblyVersion": "24.1.0.6077", - "fileVersion": "24.1.0.6077" + "assemblyVersion": "24.1.0.6097", + "fileVersion": "24.1.0.6097" } }, "resources": { @@ -620,7 +620,7 @@ } }, "libraries": { - "Deltares.DamEngine.Calculators/24.1.0.6077": { + "Deltares.DamEngine.Calculators/24.1.0.6097": { "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.6077": { + "Deltares.DamEngine.Data/24.1.0.6097": { "type": "project", "serviceable": false, "sha512": "" Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillDamUiFromXmlInput.cs =================================================================== diff -u -r5954 -r6098 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillDamUiFromXmlInput.cs (.../FillDamUiFromXmlInput.cs) (revision 5954) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillDamUiFromXmlInput.cs (.../FillDamUiFromXmlInput.cs) (revision 6098) @@ -188,25 +188,25 @@ for (var i = 0; i < inputTimeSerie.Entries.TimeSerieEntry.Length; i++) { TimeSerieEntriesTimeSerieEntry entry = inputTimeSerie.Entries.TimeSerieEntry[i]; - Stochast stochastValue = null; - if (entry.StochastValue != null) - { - stochastValue = new Stochast - { - Distribution = entry.StochastValue.Distribution, - Mean = entry.StochastValue.Mean, - StandardDeviation = entry.StochastValue.StandardDeviation - }; - } + // Stochast stochastValue = null; + // if (entry.StochastValue != null) + // { + // stochastValue = new Stochast + // { + // Distribution = entry.StochastValue.Distribution, + // Mean = entry.StochastValue.Mean, + // StandardDeviation = entry.StochastValue.StandardDeviation + // }; + // } var timeSerieEntry = new TimeSerieEntry { DateTime = entry.DateTime, - Value = entry.Value, - BasisFileName = entry.BasisFileNameWMF, - Flag = entry.Flagnietechtgebruikt, - RelativeCalculationPathName = entry.RelativeCalculationPathName, - StochastValue = stochastValue + Value = entry.Value + // BasisFileName = entry.BasisFileNameWMF, + // Flag = entry.Flagnietechtgebruikt, + // RelativeCalculationPathName = entry.RelativeCalculationPathName, + // StochastValue = stochastValue }; timeSerie.Entries.Add(timeSerieEntry); } Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillDamUiFromXmlOutput.cs =================================================================== diff -u -r6095 -r6098 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillDamUiFromXmlOutput.cs (.../FillDamUiFromXmlOutput.cs) (revision 6095) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillDamUiFromXmlOutput.cs (.../FillDamUiFromXmlOutput.cs) (revision 6098) @@ -118,25 +118,25 @@ for (var i = 0; i < outputTimeSerie.Entries.TimeSerieEntry.Length; i++) { TimeSerieEntriesTimeSerieEntry entry = outputTimeSerie.Entries.TimeSerieEntry[i]; - Stochast stochastValue = null; - if (entry.StochastValue != null) - { - stochastValue = new Stochast - { - Distribution = entry.StochastValue.Distribution, - Mean = entry.StochastValue.Mean, - StandardDeviation = entry.StochastValue.StandardDeviation - }; - } + // Stochast stochastValue = null; + // if (entry.StochastValue != null) + // { + // stochastValue = new Stochast + // { + // Distribution = entry.StochastValue.Distribution, + // Mean = entry.StochastValue.Mean, + // StandardDeviation = entry.StochastValue.StandardDeviation + // }; + // } var timeSerieEntry = new TimeSerieEntry { DateTime = entry.DateTime, - Value = entry.Value, - BasisFileName = entry.BasisFileNameWMF, - Flag = entry.Flagnietechtgebruikt, - RelativeCalculationPathName = entry.RelativeCalculationPathName, - StochastValue = stochastValue + Value = entry.Value + // BasisFileName = entry.BasisFileNameWMF, + // Flag = entry.Flagnietechtgebruikt, + // RelativeCalculationPathName = entry.RelativeCalculationPathName, + // StochastValue = stochastValue }; timeSerie.Entries.Add(timeSerieEntry); } Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillXmlInputFromDamUi.cs =================================================================== diff -u -r5954 -r6098 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillXmlInputFromDamUi.cs (.../FillXmlInputFromDamUi.cs) (revision 5954) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillXmlInputFromDamUi.cs (.../FillXmlInputFromDamUi.cs) (revision 6098) @@ -254,25 +254,25 @@ var timeSerieEntryIndex = 0; foreach (TimeSerieEntry timestepEntry in timeSerie.Entries) { - TimeSerieEntriesTimeSerieEntryStochastValue stochastValue = null; - if (timestepEntry.StochastValue != null) - { - stochastValue = new TimeSerieEntriesTimeSerieEntryStochastValue - { - Distribution = timestepEntry.StochastValue.Distribution, - Mean = timestepEntry.StochastValue.Mean, - StandardDeviation = timestepEntry.StochastValue.StandardDeviation - }; - } + // TimeSerieEntriesTimeSerieEntryStochastValue stochastValue = null; + // if (timestepEntry.StochastValue != null) + // { + // stochastValue = new TimeSerieEntriesTimeSerieEntryStochastValue + // { + // Distribution = timestepEntry.StochastValue.Distribution, + // Mean = timestepEntry.StochastValue.Mean, + // StandardDeviation = timestepEntry.StochastValue.StandardDeviation + // }; + // } var timeStep = new TimeSerieEntriesTimeSerieEntry { DateTime = timestepEntry.DateTime, - Value = timestepEntry.Value, - BasisFileNameWMF = timestepEntry.BasisFileName, - Flagnietechtgebruikt = timestepEntry.Flag, - RelativeCalculationPathName = timestepEntry.RelativeCalculationPathName, - StochastValue = stochastValue + Value = timestepEntry.Value + // BasisFileNameWMF = timestepEntry.BasisFileName, + // Flagnietechtgebruikt = timestepEntry.Flag, + // RelativeCalculationPathName = timestepEntry.RelativeCalculationPathName, + // StochastValue = stochastValue }; inputTimeSerie.Entries.TimeSerieEntry[timeSerieEntryIndex] = timeStep; timeSerieEntryIndex++; Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DamEngineIo/FillDamUiFromXmlOutputTests.cs =================================================================== diff -u -r6095 -r6098 --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DamEngineIo/FillDamUiFromXmlOutputTests.cs (.../FillDamUiFromXmlOutputTests.cs) (revision 6095) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DamEngineIo/FillDamUiFromXmlOutputTests.cs (.../FillDamUiFromXmlOutputTests.cs) (revision 6098) @@ -273,9 +273,9 @@ timeSerie.Entries.Add(new TimeSerieEntry { DateTime = new DateTime(2012, 12, 31, 1, j * 10, 0), - Value = 1 + j * 0.1, - Flag = 1, - BasisFileName = String.Format("BasisFileName{0}", i) + Value = 1 + j * 0.1 + // Flag = 1, + // BasisFileName = String.Format("BasisFileName{0}", i) }); } }