Index: DamClients/DamUI/trunk/lib/DamEngine/Deltares.DamEngine.Interface.dll =================================================================== diff -u -r6172 -r6199 Binary files differ Index: DamClients/DamUI/trunk/lib/DamEngine/Deltares.DamEngine.Data.dll =================================================================== diff -u -r6172 -r6199 Binary files differ Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillDamUiFromXmlInput.cs =================================================================== diff -u -r6173 -r6199 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillDamUiFromXmlInput.cs (.../FillDamUiFromXmlInput.cs) (revision 6173) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillDamUiFromXmlInput.cs (.../FillDamUiFromXmlInput.cs) (revision 6199) @@ -24,7 +24,6 @@ using System.Linq; using Deltares.Dam.Data.Sensors; using Deltares.DamEngine.Io.XmlInput; -using Deltares.Geotechnics; using Deltares.Geotechnics.Soils; using Deltares.Geotechnics.SurfaceLines; using Deltares.Standard.Extensions; @@ -169,44 +168,17 @@ TimeSerie timeSerie = timeSerieCollection.AddNewSeries(inputTimeSerie.LocationId); timeSerie.ParameterId = inputTimeSerie.ParameterId; timeSerie.ForecastDateTime = inputTimeSerie.ForecastDateTime; - timeSerie.Type = inputTimeSerie.Type; timeSerie.StartDateTime = inputTimeSerie.StartDateTime; timeSerie.EndDateTime = inputTimeSerie.EndDateTime; timeSerie.MissVal = inputTimeSerie.MissVal; - timeSerie.LongName = inputTimeSerie.LongName; - timeSerie.StationName = inputTimeSerie.StationName; timeSerie.Units = inputTimeSerie.Units; - timeSerie.SourceOrganisation = inputTimeSerie.SourceOrganisation; - timeSerie.SourceSystem = inputTimeSerie.SourceSystem; - timeSerie.FileDescription = inputTimeSerie.FileDescription; - timeSerie.Region = inputTimeSerie.Region; - timeSerie.TimeStep.Multiplier = inputTimeSerie.TimeStep.Multiplier; - timeSerie.TimeStep.Divider = inputTimeSerie.TimeStep.Divider; - timeSerie.TimeStep.MultiplierSpecified = inputTimeSerie.TimeStep.MultiplierSpecified1; - timeSerie.TimeStep.DividerSpecified = inputTimeSerie.TimeStep.DividerSpecified1; - timeSerie.TimeStep.Unit = ConversionHelper.ConvertToTimeStepUnit(inputTimeSerie.TimeStep.TimeStepUnit); 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 - // }; - // } - var timeSerieEntry = new TimeSerieEntry { DateTime = entry.DateTime, Value = entry.Value - // BasisFileName = entry.BasisFileNameWMF, - // Flag = entry.Flagnietechtgebruikt, - // RelativeCalculationPathName = entry.RelativeCalculationPathName, - // StochastValue = stochastValue }; timeSerie.Entries.Add(timeSerieEntry); } Index: DamClients/DamUI/trunk/lib/DamEngine/nl-NL/Deltares.DamEngine.Interface.resources.dll =================================================================== diff -u -r6172 -r6199 Binary files differ Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DamEngineIo/FillDamUiFromXmlOutputTests.cs =================================================================== diff -u -r6098 -r6199 --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DamEngineIo/FillDamUiFromXmlOutputTests.cs (.../FillDamUiFromXmlOutputTests.cs) (revision 6098) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DamEngineIo/FillDamUiFromXmlOutputTests.cs (.../FillDamUiFromXmlOutputTests.cs) (revision 6199) @@ -255,27 +255,16 @@ TimeSerie timeSerie = damProjectData.OutputTimeSerieCollection.AddNewSeries(locationId); timeSerie.ParameterId = (i % 2 == 0) ? idPipingBligh : idStabilityInsideFactor; timeSerie.ForecastDateTime = DateTime.Now; - timeSerie.Type = "instantaneous"; timeSerie.StartDateTime = new DateTime(2012, 12, 31); timeSerie.EndDateTime = new DateTime(2012, 12, 31, 1, 0, 0); timeSerie.MissVal = -9999.0; - timeSerie.LongName = timeSerie.LocationId + "long"; - timeSerie.StationName = String.Format("station{0}", i); timeSerie.Units = "m"; - timeSerie.SourceOrganisation = String.Format("organisation{0}", i); - timeSerie.SourceSystem = String.Format("system{0}", i); - timeSerie.FileDescription = String.Format("filedescription{0}", i); - timeSerie.Region = String.Format("region{0}", i); - timeSerie.TimeStep.Multiplier = 3600; - timeSerie.TimeStep.Unit = TimeStepUnit.Second; for (var j = 0; j < timeEntriesCount; j++) { 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) }); } } Index: DamClients/DamUI/trunk/lib/DamEngine/nl-NL/Deltares.DamEngine.Data.resources.dll =================================================================== diff -u -r6172 -r6199 Binary files differ Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DamEngineIo/FillXmlInputFromDamUiTests.cs =================================================================== diff -u -r6173 -r6199 --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DamEngineIo/FillXmlInputFromDamUiTests.cs (.../FillXmlInputFromDamUiTests.cs) (revision 6173) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DamEngineIo/FillXmlInputFromDamUiTests.cs (.../FillXmlInputFromDamUiTests.cs) (revision 6199) @@ -988,20 +988,10 @@ for (var j = 0; j < timeEntriesCount; j++) { - var stochastValue = new Stochast - { - Mean = 1.0 * j, - Distribution = j, - StandardDeviation = 0.1 * j - }; 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 }); } } Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillDamUiFromXmlOutput.cs =================================================================== diff -u -r6121 -r6199 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillDamUiFromXmlOutput.cs (.../FillDamUiFromXmlOutput.cs) (revision 6121) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillDamUiFromXmlOutput.cs (.../FillDamUiFromXmlOutput.cs) (revision 6199) @@ -98,50 +98,23 @@ return damProjectData; } - private static void TransferOutputTimeSeries(DamEngine.Io.XmlOutput.TimeSerie[] outputTimeSeries, TimeSerieCollection outputTimeSerieCollection, string parameterId = "") + private static void TransferOutputTimeSeries(DamEngine.Io.XmlOutput.TimeSerieOutput[] outputTimeSeries, TimeSerieCollection outputTimeSerieCollection, string parameterId = "") { - foreach (DamEngine.Io.XmlOutput.TimeSerie outputTimeSerie in outputTimeSeries) + foreach (DamEngine.Io.XmlOutput.TimeSerieOutput outputTimeSerie in outputTimeSeries) { TimeSerie timeSerie = outputTimeSerieCollection.AddNewSeries(outputTimeSerie.LocationId); timeSerie.ParameterId = parameterId == "" ? outputTimeSerie.ParameterId : parameterId; timeSerie.ForecastDateTime = outputTimeSerie.ForecastDateTime; - timeSerie.Type = outputTimeSerie.Type; timeSerie.StartDateTime = outputTimeSerie.StartDateTime; timeSerie.EndDateTime = outputTimeSerie.EndDateTime; timeSerie.MissVal = outputTimeSerie.MissVal; - timeSerie.LongName = outputTimeSerie.LongName; - timeSerie.StationName = outputTimeSerie.StationName; timeSerie.Units = outputTimeSerie.Units; - timeSerie.SourceOrganisation = outputTimeSerie.SourceOrganisation; - timeSerie.SourceSystem = outputTimeSerie.SourceSystem; - timeSerie.FileDescription = outputTimeSerie.FileDescription; - timeSerie.Region = outputTimeSerie.Region; - timeSerie.TimeStep.Multiplier = outputTimeSerie.TimeStep.Multiplier; - timeSerie.TimeStep.Divider = outputTimeSerie.TimeStep.Divider; - timeSerie.TimeStep.MultiplierSpecified = outputTimeSerie.TimeStep.MultiplierSpecified1; - timeSerie.TimeStep.DividerSpecified = outputTimeSerie.TimeStep.DividerSpecified1; - timeSerie.TimeStep.Unit = ConversionHelper.ConvertToTimeStepUnit(outputTimeSerie.TimeStep.TimeStepUnit); - for (var i = 0; i < outputTimeSerie.Entries.TimeSerieEntry.Length; i++) + for (var i = 0; i < outputTimeSerie.Entries.TimeSerieEntryOutput.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 - // }; - // } - + TimeSerieOutputEntriesTimeSerieEntryOutput entry = outputTimeSerie.Entries.TimeSerieEntryOutput[i]; var timeSerieEntry = new TimeSerieEntry { DateTime = entry.DateTime - // BasisFileName = entry.BasisFileNameWMF, - // Flag = entry.Flagnietechtgebruikt, - // RelativeCalculationPathName = entry.RelativeCalculationPathName, - // StochastValue = stochastValue }; if (parameterId == "") { Index: DamClients/DamUI/trunk/lib/DamEngine/Deltares.DamEngine.Calculators.deps.json =================================================================== diff -u -r6172 -r6199 --- DamClients/DamUI/trunk/lib/DamEngine/Deltares.DamEngine.Calculators.deps.json (.../Deltares.DamEngine.Calculators.deps.json) (revision 6172) +++ DamClients/DamUI/trunk/lib/DamEngine/Deltares.DamEngine.Calculators.deps.json (.../Deltares.DamEngine.Calculators.deps.json) (revision 6199) @@ -6,9 +6,9 @@ "compilationOptions": {}, "targets": { ".NETCoreApp,Version=v6.0": { - "Deltares.DamEngine.Calculators/24.1.0.6171": { + "Deltares.DamEngine.Calculators/24.1.0.6194": { "dependencies": { - "Deltares.DamEngine.Data": "24.1.0.6171", + "Deltares.DamEngine.Data": "24.1.0.6194", "Deltares.StixFileWriter": "24.1.0.118", "Deltares.WTIPiping": "24.1.500.10" }, @@ -574,11 +574,11 @@ } }, "System.Threading.Tasks.Extensions/4.5.4": {}, - "Deltares.DamEngine.Data/24.1.0.6171": { + "Deltares.DamEngine.Data/24.1.0.6194": { "runtime": { "Deltares.DamEngine.Data.dll": { - "assemblyVersion": "24.1.0.6171", - "fileVersion": "24.1.0.6171" + "assemblyVersion": "24.1.0.6194", + "fileVersion": "24.1.0.6194" } }, "resources": { @@ -606,7 +606,7 @@ } }, "libraries": { - "Deltares.DamEngine.Calculators/24.1.0.6171": { + "Deltares.DamEngine.Calculators/24.1.0.6194": { "type": "project", "serviceable": false, "sha512": "" @@ -1087,7 +1087,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.6171": { + "Deltares.DamEngine.Data/24.1.0.6194": { "type": "project", "serviceable": false, "sha512": "" Index: DamClients/DamUI/trunk/lib/DamEngine/Deltares.DamEngine.Interface.deps.json =================================================================== diff -u -r6172 -r6199 --- DamClients/DamUI/trunk/lib/DamEngine/Deltares.DamEngine.Interface.deps.json (.../Deltares.DamEngine.Interface.deps.json) (revision 6172) +++ DamClients/DamUI/trunk/lib/DamEngine/Deltares.DamEngine.Interface.deps.json (.../Deltares.DamEngine.Interface.deps.json) (revision 6199) @@ -6,11 +6,11 @@ "compilationOptions": {}, "targets": { ".NETCoreApp,Version=v6.0": { - "Deltares.DamEngine.Interface/24.1.0.6171": { + "Deltares.DamEngine.Interface/24.1.0.6194": { "dependencies": { - "Deltares.DamEngine.Calculators": "24.1.0.6171", - "Deltares.DamEngine.Data": "24.1.0.6171", - "Deltares.DamEngine.Io": "24.1.0.6171" + "Deltares.DamEngine.Calculators": "24.1.0.6194", + "Deltares.DamEngine.Data": "24.1.0.6194", + "Deltares.DamEngine.Io": "24.1.0.6194" }, "runtime": { "Deltares.DamEngine.Interface.dll": {} @@ -574,15 +574,15 @@ } }, "System.Threading.Tasks.Extensions/4.5.4": {}, - "Deltares.DamEngine.Calculators/24.1.0.6171": { + "Deltares.DamEngine.Calculators/24.1.0.6194": { "dependencies": { - "Deltares.DamEngine.Data": "24.1.0.6171", + "Deltares.DamEngine.Data": "24.1.0.6194", "Deltares.StixFileWriter": "24.1.0.118" }, "runtime": { "Deltares.DamEngine.Calculators.dll": { - "assemblyVersion": "24.1.0.6171", - "fileVersion": "24.1.0.6171" + "assemblyVersion": "24.1.0.6194", + "fileVersion": "24.1.0.6194" } }, "resources": { @@ -591,11 +591,11 @@ } } }, - "Deltares.DamEngine.Data/24.1.0.6171": { + "Deltares.DamEngine.Data/24.1.0.6194": { "runtime": { "Deltares.DamEngine.Data.dll": { - "assemblyVersion": "24.1.0.6171", - "fileVersion": "24.1.0.6171" + "assemblyVersion": "24.1.0.6194", + "fileVersion": "24.1.0.6194" } }, "resources": { @@ -604,11 +604,11 @@ } } }, - "Deltares.DamEngine.Io/24.1.0.6171": { + "Deltares.DamEngine.Io/24.1.0.6194": { "runtime": { "Deltares.DamEngine.Io.dll": { - "assemblyVersion": "24.1.0.6171", - "fileVersion": "24.1.0.6171" + "assemblyVersion": "24.1.0.6194", + "fileVersion": "24.1.0.6194" } } }, @@ -631,7 +631,7 @@ } }, "libraries": { - "Deltares.DamEngine.Interface/24.1.0.6171": { + "Deltares.DamEngine.Interface/24.1.0.6194": { "type": "project", "serviceable": false, "sha512": "" @@ -1112,17 +1112,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.6171": { + "Deltares.DamEngine.Calculators/24.1.0.6194": { "type": "project", "serviceable": false, "sha512": "" }, - "Deltares.DamEngine.Data/24.1.0.6171": { + "Deltares.DamEngine.Data/24.1.0.6194": { "type": "project", "serviceable": false, "sha512": "" }, - "Deltares.DamEngine.Io/24.1.0.6171": { + "Deltares.DamEngine.Io/24.1.0.6194": { "type": "project", "serviceable": false, "sha512": "" Index: DamClients/DamUI/trunk/lib/DamEngine/Deltares.DamEngine.Io.deps.json =================================================================== diff -u -r6172 -r6199 --- DamClients/DamUI/trunk/lib/DamEngine/Deltares.DamEngine.Io.deps.json (.../Deltares.DamEngine.Io.deps.json) (revision 6172) +++ DamClients/DamUI/trunk/lib/DamEngine/Deltares.DamEngine.Io.deps.json (.../Deltares.DamEngine.Io.deps.json) (revision 6199) @@ -6,15 +6,15 @@ "compilationOptions": {}, "targets": { ".NETCoreApp,Version=v6.0": { - "Deltares.DamEngine.Io/24.1.0.6171": { + "Deltares.DamEngine.Io/24.1.0.6194": { "runtime": { "Deltares.DamEngine.Io.dll": {} } } } }, "libraries": { - "Deltares.DamEngine.Io/24.1.0.6171": { + "Deltares.DamEngine.Io/24.1.0.6194": { "type": "project", "serviceable": false, "sha512": "" Index: DamClients/DamUI/trunk/lib/DamEngine/nl-NL/Deltares.DamEngine.Calculators.resources.dll =================================================================== diff -u -r6172 -r6199 Binary files differ Index: DamClients/DamUI/trunk/lib/DamEngine/Deltares.DamEngine.Calculators.dll =================================================================== diff -u -r6172 -r6199 Binary files differ Index: DamClients/DamUI/trunk/lib/DamEngine/Deltares.DamEngine.Data.deps.json =================================================================== diff -u -r6172 -r6199 --- DamClients/DamUI/trunk/lib/DamEngine/Deltares.DamEngine.Data.deps.json (.../Deltares.DamEngine.Data.deps.json) (revision 6172) +++ DamClients/DamUI/trunk/lib/DamEngine/Deltares.DamEngine.Data.deps.json (.../Deltares.DamEngine.Data.deps.json) (revision 6199) @@ -6,7 +6,7 @@ "compilationOptions": {}, "targets": { ".NETCoreApp,Version=v6.0": { - "Deltares.DamEngine.Data/24.1.0.6171": { + "Deltares.DamEngine.Data/24.1.0.6194": { "runtime": { "Deltares.DamEngine.Data.dll": {} }, @@ -19,7 +19,7 @@ } }, "libraries": { - "Deltares.DamEngine.Data/24.1.0.6171": { + "Deltares.DamEngine.Data/24.1.0.6194": { "type": "project", "serviceable": false, "sha512": "" Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillXmlOutputFromDamUi.cs =================================================================== diff -u -r6098 -r6199 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillXmlOutputFromDamUi.cs (.../FillXmlOutputFromDamUi.cs) (revision 6098) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillXmlOutputFromDamUi.cs (.../FillXmlOutputFromDamUi.cs) (revision 6199) @@ -41,7 +41,7 @@ TransferOutputCalculationMessages(damProjectData.CalculationMessages, output.Results); if (damProjectData.OutputTimeSerieCollection != null) { - output.Results.OperationalOutputTimeSeries = new DamEngine.Io.XmlOutput.TimeSerie[damProjectData.OutputTimeSerieCollection.Series.Count]; + output.Results.OperationalOutputTimeSeries = new DamEngine.Io.XmlOutput.TimeSerieOutput[damProjectData.OutputTimeSerieCollection.Series.Count]; TransferOutputTimeSeries(damProjectData.OutputTimeSerieCollection, output.Results.OperationalOutputTimeSeries); } @@ -63,61 +63,32 @@ return output; } - private static void TransferOutputTimeSeries(TimeSerieCollection outputTimeSerieCollection, DamEngine.Io.XmlOutput.TimeSerie[] outputTimeSeries) + private static void TransferOutputTimeSeries(TimeSerieCollection outputTimeSerieCollection, DamEngine.Io.XmlOutput.TimeSerieOutput[] outputTimeSeries) { var timeSerieIndex = 0; foreach (TimeSerie damTimeSerie in outputTimeSerieCollection.Series) { - var outputTimeSerie = new DamEngine.Io.XmlOutput.TimeSerie(); - outputTimeSerie.Entries = new TimeSerieEntries(); - outputTimeSerie.Entries.TimeSerieEntry = new TimeSerieEntriesTimeSerieEntry[damTimeSerie.Entries.Count]; - outputTimeSerie.TimeStep = new TimeSerieTimeStep(); + var outputTimeSerie = new DamEngine.Io.XmlOutput.TimeSerieOutput(); + outputTimeSerie.Entries = new TimeSerieOutputEntries(); + outputTimeSerie.Entries.TimeSerieEntryOutput = new TimeSerieOutputEntriesTimeSerieEntryOutput[damTimeSerie.Entries.Count]; outputTimeSerie.LocationId = damTimeSerie.LocationId; outputTimeSerie.ParameterId = damTimeSerie.ParameterId; outputTimeSerie.ForecastDateTime = damTimeSerie.ForecastDateTime; - outputTimeSerie.Type = damTimeSerie.Type; outputTimeSerie.StartDateTime = damTimeSerie.StartDateTime; outputTimeSerie.EndDateTime = damTimeSerie.EndDateTime; outputTimeSerie.MissVal = damTimeSerie.MissVal; - outputTimeSerie.LongName = damTimeSerie.LongName; - outputTimeSerie.StationName = damTimeSerie.StationName; outputTimeSerie.Units = damTimeSerie.Units; - outputTimeSerie.SourceOrganisation = damTimeSerie.SourceOrganisation; - outputTimeSerie.SourceSystem = damTimeSerie.SourceSystem; - outputTimeSerie.FileDescription = damTimeSerie.FileDescription; - outputTimeSerie.Region = damTimeSerie.Region; - outputTimeSerie.TimeStep.Multiplier = damTimeSerie.TimeStep.Multiplier; - outputTimeSerie.TimeStep.Divider = damTimeSerie.TimeStep.Divider; - outputTimeSerie.TimeStep.MultiplierSpecified1 = damTimeSerie.TimeStep.MultiplierSpecified; - outputTimeSerie.TimeStep.DividerSpecified1 = damTimeSerie.TimeStep.DividerSpecified; - outputTimeSerie.TimeStep.TimeStepUnit = ConversionHelper.ConvertToInputTimeStepUnit(damTimeSerie.TimeStep.Unit); 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 - // }; - // } - - var timeStep = new TimeSerieEntriesTimeSerieEntry + var timeStep = new TimeSerieOutputEntriesTimeSerieEntryOutput { DateTime = timestepEntry.DateTime, Value = timestepEntry.Value - // BasisFileNameWMF = timestepEntry.BasisFileName, - // Flagnietechtgebruikt = timestepEntry.Flag, - // RelativeCalculationPathName = timestepEntry.RelativeCalculationPathName, - // StochastValue = stochastValue }; - outputTimeSerie.Entries.TimeSerieEntry[timeSerieEntryIndex] = timeStep; + outputTimeSerie.Entries.TimeSerieEntryOutput[timeSerieEntryIndex] = timeStep; timeSerieEntryIndex++; } - outputTimeSeries[timeSerieIndex] = outputTimeSerie; timeSerieIndex++; } Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillXmlInputFromDamUi.cs =================================================================== diff -u -r6173 -r6199 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillXmlInputFromDamUi.cs (.../FillXmlInputFromDamUi.cs) (revision 6173) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillXmlInputFromDamUi.cs (.../FillXmlInputFromDamUi.cs) (revision 6199) @@ -230,53 +230,24 @@ var inputTimeSerie = new DamEngine.Io.XmlInput.TimeSerie(); inputTimeSerie.Entries = new TimeSerieEntries(); inputTimeSerie.Entries.TimeSerieEntry = new TimeSerieEntriesTimeSerieEntry[timeSerie.Entries.Count]; - inputTimeSerie.TimeStep = new TimeSerieTimeStep(); inputTimeSerie.LocationId = timeSerie.LocationId; inputTimeSerie.ParameterId = timeSerie.ParameterId; inputTimeSerie.ForecastDateTime = timeSerie.ForecastDateTime; - inputTimeSerie.Type = timeSerie.Type; inputTimeSerie.StartDateTime = timeSerie.StartDateTime; inputTimeSerie.EndDateTime = timeSerie.EndDateTime; inputTimeSerie.MissVal = timeSerie.MissVal; - inputTimeSerie.LongName = timeSerie.LongName; - inputTimeSerie.StationName = timeSerie.StationName; inputTimeSerie.Units = timeSerie.Units; - inputTimeSerie.SourceOrganisation = timeSerie.SourceOrganisation; - inputTimeSerie.SourceSystem = timeSerie.SourceSystem; - inputTimeSerie.FileDescription = timeSerie.FileDescription; - inputTimeSerie.Region = timeSerie.Region; - inputTimeSerie.TimeStep.Multiplier = timeSerie.TimeStep.Multiplier; - inputTimeSerie.TimeStep.Divider = timeSerie.TimeStep.Divider; - inputTimeSerie.TimeStep.MultiplierSpecified1 = timeSerie.TimeStep.MultiplierSpecified; - inputTimeSerie.TimeStep.DividerSpecified1 = timeSerie.TimeStep.DividerSpecified; - inputTimeSerie.TimeStep.TimeStepUnit = ConversionHelper.ConvertToInputTimeStepUnit(timeSerie.TimeStep.Unit); 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 - // }; - // } - var timeStep = new TimeSerieEntriesTimeSerieEntry { DateTime = timestepEntry.DateTime, Value = timestepEntry.Value - // BasisFileNameWMF = timestepEntry.BasisFileName, - // Flagnietechtgebruikt = timestepEntry.Flag, - // RelativeCalculationPathName = timestepEntry.RelativeCalculationPathName, - // StochastValue = stochastValue }; inputTimeSerie.Entries.TimeSerieEntry[timeSerieEntryIndex] = timeStep; timeSerieEntryIndex++; } - operationalInputTimeSeries[timeSerieIndex] = inputTimeSerie; timeSerieIndex++; } Index: DamClients/DamUI/trunk/lib/DamEngine/Deltares.DamEngine.Io.dll =================================================================== diff -u -r6172 -r6199 Binary files differ