Index: DamEngine/trunk/src/Deltares.DamEngine.Data/General/TimeSeries/TimeSerie.cs =================================================================== diff -u -r6110 -r6194 --- DamEngine/trunk/src/Deltares.DamEngine.Data/General/TimeSeries/TimeSerie.cs (.../TimeSerie.cs) (revision 6110) +++ DamEngine/trunk/src/Deltares.DamEngine.Data/General/TimeSeries/TimeSerie.cs (.../TimeSerie.cs) (revision 6194) @@ -31,11 +31,7 @@ /// public const string WaterLevelParameterId = "Waterlevel"; - public const string WaterLevelMeanParameterId = "WaterlevelMean"; - public const string WaterLevelStdParameterId = "WaterlevelStdev"; - public const string WaterLevelDistParameterId = "WaterlevelDistribution"; public const string WaterPressureParameterId = "Waterpressure"; - public const string PiezoMetricHeadId = "PiezoMetricHead"; public const double DefaultMissingValue = -999.0; @@ -44,27 +40,18 @@ public TimeSerie() { - TimeStep = new TimeStep(); entries = new List(); ForecastDateTime = DateTime.MinValue; } - public string Type { get; set; } public string LocationId { get; set; } public string ParameterId { get; set; } - public TimeStep TimeStep { get; } public DateTime StartDateTime { get; set; } public DateTime EndDateTime { get; set; } public DateTime ForecastDateTime { get; set; } public double MissVal { get; set; } - public string LongName { get; set; } - public string StationName { get; set; } public string Units { get; set; } - public string SourceOrganisation { get; set; } - public string SourceSystem { get; set; } - public string FileDescription { get; set; } public DateTime? CreationDateTime { get; set; } - public string Region { get; set; } public virtual IList Entries { @@ -157,27 +144,14 @@ { var serie = new TimeSerie { - Type = Type, ParameterId = ParameterId, LocationId = LocationId, StartDateTime = StartDateTime, EndDateTime = EndDateTime, ForecastDateTime = ForecastDateTime, MissVal = MissVal, - LongName = LongName, - StationName = StationName, - SourceOrganisation = SourceOrganisation, - SourceSystem = SourceSystem, - FileDescription = FileDescription, CreationDateTime = CreationDateTime, - Region = Region, - Units = Units, - TimeStep = - { - Multiplier = TimeStep.Multiplier, - Divider = TimeStep.Divider, - Unit = TimeStep.Unit - } + Units = Units }; serie.Entries.Clear(); @@ -191,8 +165,6 @@ MissVal = DefaultMissingValue, ParameterId = WaterLevelParameterId, LocationId = locationId, - StationName = locationId, - Type = "instantaneous", Units = "m", Comment = "" }; @@ -229,21 +201,4 @@ return -1; } -// public string GetNearestBasisFileName(DateTime dateTime) -// { -// var res = ""; -// var mindiff = 1e99; -// double diff; -// foreach (TimeSerieEntry entry in Entries) -// { -// diff = Math.Abs(entry.DateTime.ToFileTimeUtc() - dateTime.ToFileTimeUtc()); -// if (diff < mindiff) -// { -// res = entry.BasisFileName; -// mindiff = diff; -// } -// } -// -// return res; -// } } \ No newline at end of file Index: DamEngine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlOutput.cs =================================================================== diff -u -r6109 -r6194 --- DamEngine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlOutput.cs (.../FillDamFromXmlOutput.cs) (revision 6109) +++ DamEngine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlOutput.cs (.../FillDamFromXmlOutput.cs) (revision 6194) @@ -28,7 +28,7 @@ using Deltares.DamEngine.Data.Standard.Logging; using Deltares.DamEngine.Io.XmlOutput; using DesignResult = Deltares.DamEngine.Io.XmlOutput.DesignResult; -using TimeSerie = Deltares.DamEngine.Io.XmlOutput.TimeSerie; +using TimeSerie = Deltares.DamEngine.Io.XmlOutput.TimeSerieOutput; using UpliftSituation = Deltares.DamEngine.Io.XmlOutput.UpliftSituation; namespace Deltares.DamEngine.Interface; @@ -76,44 +76,17 @@ Data.General.TimeSeries.TimeSerie timeSerie = outputTimeSerieCollection.AddNewSeries(outputTimeSerie.LocationId); timeSerie.ParameterId = outputTimeSerie.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, Value = entry.Value - // BasisFileName = entry.BasisFileNameWMF, - // Flag = entry.Flagnietechtgebruikt, - // RelativeCalculationPathName = entry.RelativeCalculationPathName, - // StochastValue = stochastValue }; if (entry.BishopCalculatedSlipPlane != null) { Index: DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/FillXmlOutputFromDamTests.cs =================================================================== diff -u -r6135 -r6194 --- DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/FillXmlOutputFromDamTests.cs (.../FillXmlOutputFromDamTests.cs) (revision 6135) +++ DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/FillXmlOutputFromDamTests.cs (.../FillXmlOutputFromDamTests.cs) (revision 6194) @@ -297,19 +297,10 @@ 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 = $"station{i}"; timeSerie.Units = "m"; - timeSerie.SourceOrganisation = $"organisation{i}"; - timeSerie.SourceSystem = $"system{i}"; - timeSerie.FileDescription = $"filedescription{i}"; - timeSerie.Region = $"region{i}"; - timeSerie.TimeStep.Multiplier = 3600; - timeSerie.TimeStep.Unit = TimeStepUnit.Second; for (var j = 0; j < timeEntriesCount; j++) { timeSerie.Entries.Add(new TimeSerieEntry @@ -319,8 +310,6 @@ BishopCircleX = 2 + j * 0.2, BishopCircleZ = 3 + j * 0.3, BishopRadius = 4 + j * 0.4 - // Flag = 1, - // BasisFileName = $"BasisFileName{i}" }); } } Index: DamEngine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlInput.cs =================================================================== diff -u -r6191 -r6194 --- DamEngine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlInput.cs (.../FillDamFromXmlInput.cs) (revision 6191) +++ DamEngine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlInput.cs (.../FillDamFromXmlInput.cs) (revision 6194) @@ -21,15 +21,13 @@ using System; using System.Collections.Generic; -using System.IO; using System.Linq; using Deltares.DamEngine.Data.Design; using Deltares.DamEngine.Data.General; using Deltares.DamEngine.Data.General.Sensors; using Deltares.DamEngine.Data.General.TimeSeries; using Deltares.DamEngine.Data.Geometry; using Deltares.DamEngine.Data.Geotechnics; -using Deltares.DamEngine.Data.Standard.Logging; using Deltares.DamEngine.Interface.Properties; using Deltares.DamEngine.Io.XmlInput; using Location = Deltares.DamEngine.Data.General.Location; @@ -200,46 +198,19 @@ Data.General.TimeSeries.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); if (inputTimeSerie.Entries.TimeSerieEntry != null) { 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: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/OperationalWtiPipingTests.cs =================================================================== diff -u -r6095 -r6194 --- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/OperationalWtiPipingTests.cs (.../OperationalWtiPipingTests.cs) (revision 6095) +++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/OperationalWtiPipingTests.cs (.../OperationalWtiPipingTests.cs) (revision 6194) @@ -53,11 +53,11 @@ Assert.That(output.Results.OperationalOutputTimeSeries, Has.Length.EqualTo(8)); Assert.Multiple(() => { - Assert.That(output.Results.OperationalOutputTimeSeries[0].Entries.TimeSerieEntry, Has.Length.EqualTo(2)); - Assert.That(output.Results.OperationalOutputTimeSeries[0].Entries.TimeSerieEntry[0].Value, Is.EqualTo(0.7396).Within(tolerance)); - Assert.That(output.Results.OperationalOutputTimeSeries[0].Entries.TimeSerieEntry[1].Value, Is.EqualTo(0.6795).Within(tolerance)); - Assert.That(output.Results.OperationalOutputTimeSeries[7].Entries.TimeSerieEntry[0].Value, Is.NaN); - Assert.That(output.Results.OperationalOutputTimeSeries[7].Entries.TimeSerieEntry[1].Value, Is.NaN); + Assert.That(output.Results.OperationalOutputTimeSeries[0].Entries.TimeSerieEntryOutput, Has.Length.EqualTo(2)); + Assert.That(output.Results.OperationalOutputTimeSeries[0].Entries.TimeSerieEntryOutput[0].Value, Is.EqualTo(0.7396).Within(tolerance)); + Assert.That(output.Results.OperationalOutputTimeSeries[0].Entries.TimeSerieEntryOutput[1].Value, Is.EqualTo(0.6795).Within(tolerance)); + Assert.That(output.Results.OperationalOutputTimeSeries[7].Entries.TimeSerieEntryOutput[0].Value, Is.NaN); + Assert.That(output.Results.OperationalOutputTimeSeries[7].Entries.TimeSerieEntryOutput[1].Value, Is.NaN); }); } } \ No newline at end of file Index: DamEngine/trunk/src/Deltares.DamEngine.Interface/FillXmlInputFromDam.cs =================================================================== diff -u -r6171 -r6194 --- DamEngine/trunk/src/Deltares.DamEngine.Interface/FillXmlInputFromDam.cs (.../FillXmlInputFromDam.cs) (revision 6171) +++ DamEngine/trunk/src/Deltares.DamEngine.Interface/FillXmlInputFromDam.cs (.../FillXmlInputFromDam.cs) (revision 6194) @@ -21,7 +21,6 @@ using System; using System.Collections.Generic; -using System.IO; using System.Linq; using Deltares.DamEngine.Data.Design; using Deltares.DamEngine.Data.General; @@ -184,48 +183,20 @@ var inputTimeSerie = new 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++; Index: DamEngine/trunk/src/Deltares.DamEngine.Io/DamInput.cs =================================================================== diff -u -r6171 -r6194 --- DamEngine/trunk/src/Deltares.DamEngine.Io/DamInput.cs (.../DamInput.cs) (revision 6171) +++ DamEngine/trunk/src/Deltares.DamEngine.Io/DamInput.cs (.../DamInput.cs) (revision 6194) @@ -9,14 +9,14 @@ //------------------------------------------------------------------------------ // -// This source code was auto-generated by xsd, Version=4.8.3928.0. +// This source code was auto-generated by xsd, Version=4.8.4084.0. // namespace Deltares.DamEngine.Io.XmlInput { using System.Xml.Serialization; /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -312,7 +312,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -471,7 +471,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -505,7 +505,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -527,7 +527,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -665,7 +665,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -738,7 +738,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -760,20 +760,16 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] public partial class TimeSerie { - private TimeSerieTimeStep timeStepField; - private TimeSerieEntries entriesField; private System.DateTime forecastDateTimeField; - private string typeField; - private string locationIdField; private string parameterIdField; @@ -784,37 +780,15 @@ private double missValField; - private string longNameField; - - private string stationNameField; - private string unitsField; - private string sourceOrganisationField; - - private string sourceSystemField; - - private string fileDescriptionField; - - private string regionField; - private string commentField; private System.DateTime creationDateTimeField; private bool creationDateTimeFieldSpecified; /// - public TimeSerieTimeStep TimeStep { - get { - return this.timeStepField; - } - set { - this.timeStepField = value; - } - } - - /// public TimeSerieEntries Entries { get { return this.entriesField; @@ -837,17 +811,6 @@ /// [System.Xml.Serialization.XmlAttributeAttribute()] - public string Type { - get { - return this.typeField; - } - set { - this.typeField = value; - } - } - - /// - [System.Xml.Serialization.XmlAttributeAttribute()] public string LocationId { get { return this.locationIdField; @@ -903,28 +866,6 @@ /// [System.Xml.Serialization.XmlAttributeAttribute()] - public string LongName { - get { - return this.longNameField; - } - set { - this.longNameField = value; - } - } - - /// - [System.Xml.Serialization.XmlAttributeAttribute()] - public string StationName { - get { - return this.stationNameField; - } - set { - this.stationNameField = value; - } - } - - /// - [System.Xml.Serialization.XmlAttributeAttribute()] public string Units { get { return this.unitsField; @@ -936,50 +877,6 @@ /// [System.Xml.Serialization.XmlAttributeAttribute()] - public string SourceOrganisation { - get { - return this.sourceOrganisationField; - } - set { - this.sourceOrganisationField = value; - } - } - - /// - [System.Xml.Serialization.XmlAttributeAttribute()] - public string SourceSystem { - get { - return this.sourceSystemField; - } - set { - this.sourceSystemField = value; - } - } - - /// - [System.Xml.Serialization.XmlAttributeAttribute()] - public string FileDescription { - get { - return this.fileDescriptionField; - } - set { - this.fileDescriptionField = value; - } - } - - /// - [System.Xml.Serialization.XmlAttributeAttribute()] - public string Region { - get { - return this.regionField; - } - set { - this.regionField = value; - } - } - - /// - [System.Xml.Serialization.XmlAttributeAttribute()] public string Comment { get { return this.commentField; @@ -1013,85 +910,11 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)] - public partial class TimeSerieTimeStep { - - private uint dividerField; - - private uint multiplierField; - - private bool dividerSpecified1Field; - - private bool multiplierSpecified1Field; - - private uint timeStepUnitField; - - /// - [System.Xml.Serialization.XmlAttributeAttribute()] - public uint Divider { - get { - return this.dividerField; - } - set { - this.dividerField = value; - } - } - - /// - [System.Xml.Serialization.XmlAttributeAttribute()] - public uint Multiplier { - get { - return this.multiplierField; - } - set { - this.multiplierField = value; - } - } - - /// - [System.Xml.Serialization.XmlAttributeAttribute("DividerSpecified")] - public bool DividerSpecified1 { - get { - return this.dividerSpecified1Field; - } - set { - this.dividerSpecified1Field = value; - } - } - - /// - [System.Xml.Serialization.XmlAttributeAttribute("MultiplierSpecified")] - public bool MultiplierSpecified1 { - get { - return this.multiplierSpecified1Field; - } - set { - this.multiplierSpecified1Field = value; - } - } - - /// - [System.Xml.Serialization.XmlAttributeAttribute()] - public uint TimeStepUnit { - get { - return this.timeStepUnitField; - } - set { - this.timeStepUnitField = value; - } - } - } - - /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] - [System.SerializableAttribute()] - [System.Diagnostics.DebuggerStepThroughAttribute()] - [System.ComponentModel.DesignerCategoryAttribute("code")] - [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)] public partial class TimeSerieEntries { private TimeSerieEntriesTimeSerieEntry[] timeSerieEntryField; @@ -1109,23 +932,13 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)] public partial class TimeSerieEntriesTimeSerieEntry { - private WaternetType waternetField; - - private BishopCalculationGridType bishopCalculationGridField; - - private UpliftVanCalculationGridType upliftVanCalculationGridField; - - private BishopCalculatedSlipPlaneType bishopCalculatedSlipPlaneField; - - private UpliftVanCalculatedSlipPlaneType upliftVanCalculatedSlipPlaneField; - private System.DateTime dateTimeField; private double valueField; @@ -1135,56 +948,6 @@ private bool isUpliftFieldSpecified; /// - public WaternetType Waternet { - get { - return this.waternetField; - } - set { - this.waternetField = value; - } - } - - /// - public BishopCalculationGridType BishopCalculationGrid { - get { - return this.bishopCalculationGridField; - } - set { - this.bishopCalculationGridField = value; - } - } - - /// - public UpliftVanCalculationGridType UpliftVanCalculationGrid { - get { - return this.upliftVanCalculationGridField; - } - set { - this.upliftVanCalculationGridField = value; - } - } - - /// - public BishopCalculatedSlipPlaneType BishopCalculatedSlipPlane { - get { - return this.bishopCalculatedSlipPlaneField; - } - set { - this.bishopCalculatedSlipPlaneField = value; - } - } - - /// - public UpliftVanCalculatedSlipPlaneType UpliftVanCalculatedSlipPlane { - get { - return this.upliftVanCalculatedSlipPlaneField; - } - set { - this.upliftVanCalculatedSlipPlaneField = value; - } - } - - /// [System.Xml.Serialization.XmlAttributeAttribute()] public System.DateTime DateTime { get { @@ -1230,162 +993,10 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] - public partial class WaternetType { - - private HeadLineType phreaticLineField; - - private HeadLineType[] headLinesField; - - private WaternetTypeWaternetLine[] waternetLinesField; - - private string nameField; - - private double unitWeightWaterField; - - private bool unitWeightWaterFieldSpecified; - - /// - public HeadLineType PhreaticLine { - get { - return this.phreaticLineField; - } - set { - this.phreaticLineField = value; - } - } - - /// - [System.Xml.Serialization.XmlArrayItemAttribute("HeadLine", IsNullable=false)] - public HeadLineType[] HeadLines { - get { - return this.headLinesField; - } - set { - this.headLinesField = value; - } - } - - /// - [System.Xml.Serialization.XmlArrayItemAttribute("WaternetLine", IsNullable=false)] - public WaternetTypeWaternetLine[] WaternetLines { - get { - return this.waternetLinesField; - } - set { - this.waternetLinesField = value; - } - } - - /// - [System.Xml.Serialization.XmlAttributeAttribute()] - public string Name { - get { - return this.nameField; - } - set { - this.nameField = value; - } - } - - /// - [System.Xml.Serialization.XmlAttributeAttribute()] - public double UnitWeightWater { - get { - return this.unitWeightWaterField; - } - set { - this.unitWeightWaterField = value; - } - } - - /// - [System.Xml.Serialization.XmlIgnoreAttribute()] - public bool UnitWeightWaterSpecified { - get { - return this.unitWeightWaterFieldSpecified; - } - set { - this.unitWeightWaterFieldSpecified = value; - } - } - } - - /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] - [System.SerializableAttribute()] - [System.Diagnostics.DebuggerStepThroughAttribute()] - [System.ComponentModel.DesignerCategoryAttribute("code")] - public partial class HeadLineType { - - private WaternetLineType waternetLineField; - - private int keyField; - - /// - public WaternetLineType WaternetLine { - get { - return this.waternetLineField; - } - set { - this.waternetLineField = value; - } - } - - /// - [System.Xml.Serialization.XmlAttributeAttribute()] - public int Key { - get { - return this.keyField; - } - set { - this.keyField = value; - } - } - } - - /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] - [System.SerializableAttribute()] - [System.Diagnostics.DebuggerStepThroughAttribute()] - [System.ComponentModel.DesignerCategoryAttribute("code")] - public partial class WaternetLineType { - - private Point2DType[] pointsField; - - private string nameField; - - /// - [System.Xml.Serialization.XmlArrayItemAttribute("Point", IsNullable=false)] - public Point2DType[] Points { - get { - return this.pointsField; - } - set { - this.pointsField = value; - } - } - - /// - [System.Xml.Serialization.XmlAttributeAttribute()] - public string Name { - get { - return this.nameField; - } - set { - this.nameField = value; - } - } - } - - /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] - [System.SerializableAttribute()] - [System.Diagnostics.DebuggerStepThroughAttribute()] - [System.ComponentModel.DesignerCategoryAttribute("code")] public partial class Point2DType { private double xField; @@ -1416,378 +1027,10 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] - [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)] - public partial class WaternetTypeWaternetLine : WaternetLineType { - - private int associatedHeadLineField; - - private bool associatedHeadLineFieldSpecified; - - /// - [System.Xml.Serialization.XmlAttributeAttribute()] - public int AssociatedHeadLine { - get { - return this.associatedHeadLineField; - } - set { - this.associatedHeadLineField = value; - } - } - - /// - [System.Xml.Serialization.XmlIgnoreAttribute()] - public bool AssociatedHeadLineSpecified { - get { - return this.associatedHeadLineFieldSpecified; - } - set { - this.associatedHeadLineFieldSpecified = value; - } - } - } - - /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] - [System.SerializableAttribute()] - [System.Diagnostics.DebuggerStepThroughAttribute()] - [System.ComponentModel.DesignerCategoryAttribute("code")] - public partial class BishopCalculationGridType { - - private CalculationGridType gridField; - - private double[] tangentLinesField; - - private bool useFixedPointField; - - private double fixedPointXField; - - private bool fixedPointXFieldSpecified; - - private double fixedPointZField; - - private bool fixedPointZFieldSpecified; - - /// - public CalculationGridType Grid { - get { - return this.gridField; - } - set { - this.gridField = value; - } - } - - /// - [System.Xml.Serialization.XmlArrayItemAttribute("BoundaryHeight", IsNullable=false)] - public double[] TangentLines { - get { - return this.tangentLinesField; - } - set { - this.tangentLinesField = value; - } - } - - /// - [System.Xml.Serialization.XmlAttributeAttribute()] - public bool UseFixedPoint { - get { - return this.useFixedPointField; - } - set { - this.useFixedPointField = value; - } - } - - /// - [System.Xml.Serialization.XmlAttributeAttribute()] - public double FixedPointX { - get { - return this.fixedPointXField; - } - set { - this.fixedPointXField = value; - } - } - - /// - [System.Xml.Serialization.XmlIgnoreAttribute()] - public bool FixedPointXSpecified { - get { - return this.fixedPointXFieldSpecified; - } - set { - this.fixedPointXFieldSpecified = value; - } - } - - /// - [System.Xml.Serialization.XmlAttributeAttribute()] - public double FixedPointZ { - get { - return this.fixedPointZField; - } - set { - this.fixedPointZField = value; - } - } - - /// - [System.Xml.Serialization.XmlIgnoreAttribute()] - public bool FixedPointZSpecified { - get { - return this.fixedPointZFieldSpecified; - } - set { - this.fixedPointZFieldSpecified = value; - } - } - } - - /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] - [System.SerializableAttribute()] - [System.Diagnostics.DebuggerStepThroughAttribute()] - [System.ComponentModel.DesignerCategoryAttribute("code")] - public partial class CalculationGridType { - - private double gridXLeftField; - - private double gridXRightField; - - private double gridZTopField; - - private double gridZBottomField; - - private int gridXNumberField; - - private int gridZNumberField; - - /// - [System.Xml.Serialization.XmlAttributeAttribute()] - public double GridXLeft { - get { - return this.gridXLeftField; - } - set { - this.gridXLeftField = value; - } - } - - /// - [System.Xml.Serialization.XmlAttributeAttribute()] - public double GridXRight { - get { - return this.gridXRightField; - } - set { - this.gridXRightField = value; - } - } - - /// - [System.Xml.Serialization.XmlAttributeAttribute()] - public double GridZTop { - get { - return this.gridZTopField; - } - set { - this.gridZTopField = value; - } - } - - /// - [System.Xml.Serialization.XmlAttributeAttribute()] - public double GridZBottom { - get { - return this.gridZBottomField; - } - set { - this.gridZBottomField = value; - } - } - - /// - [System.Xml.Serialization.XmlAttributeAttribute()] - public int GridXNumber { - get { - return this.gridXNumberField; - } - set { - this.gridXNumberField = value; - } - } - - /// - [System.Xml.Serialization.XmlAttributeAttribute()] - public int GridZNumber { - get { - return this.gridZNumberField; - } - set { - this.gridZNumberField = value; - } - } - } - - /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] - [System.SerializableAttribute()] - [System.Diagnostics.DebuggerStepThroughAttribute()] - [System.ComponentModel.DesignerCategoryAttribute("code")] - public partial class UpliftVanCalculationGridType { - - private CalculationGridType leftGridField; - - private CalculationGridType rightGridField; - - private double[] tangentLinesField; - - /// - public CalculationGridType LeftGrid { - get { - return this.leftGridField; - } - set { - this.leftGridField = value; - } - } - - /// - public CalculationGridType RightGrid { - get { - return this.rightGridField; - } - set { - this.rightGridField = value; - } - } - - /// - [System.Xml.Serialization.XmlArrayItemAttribute("BoundaryHeight", IsNullable=false)] - public double[] TangentLines { - get { - return this.tangentLinesField; - } - set { - this.tangentLinesField = value; - } - } - } - - /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] - [System.SerializableAttribute()] - [System.Diagnostics.DebuggerStepThroughAttribute()] - [System.ComponentModel.DesignerCategoryAttribute("code")] - public partial class BishopCalculatedSlipPlaneType { - - private Point2DType centerField; - - private double radiusField; - - private double safetyFactorField; - - /// - public Point2DType Center { - get { - return this.centerField; - } - set { - this.centerField = value; - } - } - - /// - [System.Xml.Serialization.XmlAttributeAttribute()] - public double Radius { - get { - return this.radiusField; - } - set { - this.radiusField = value; - } - } - - /// - [System.Xml.Serialization.XmlAttributeAttribute()] - public double SafetyFactor { - get { - return this.safetyFactorField; - } - set { - this.safetyFactorField = value; - } - } - } - - /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] - [System.SerializableAttribute()] - [System.Diagnostics.DebuggerStepThroughAttribute()] - [System.ComponentModel.DesignerCategoryAttribute("code")] - public partial class UpliftVanCalculatedSlipPlaneType { - - private Point2DType leftCenterField; - - private Point2DType rightCenterField; - - private double tangentHeightField; - - private double safetyFactorField; - - /// - public Point2DType LeftCenter { - get { - return this.leftCenterField; - } - set { - this.leftCenterField = value; - } - } - - /// - public Point2DType RightCenter { - get { - return this.rightCenterField; - } - set { - this.rightCenterField = value; - } - } - - /// - [System.Xml.Serialization.XmlAttributeAttribute()] - public double TangentHeight { - get { - return this.tangentHeightField; - } - set { - this.tangentHeightField = value; - } - } - - /// - [System.Xml.Serialization.XmlAttributeAttribute()] - public double SafetyFactor { - get { - return this.safetyFactorField; - } - set { - this.safetyFactorField = value; - } - } - } - - /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] - [System.SerializableAttribute()] - [System.Diagnostics.DebuggerStepThroughAttribute()] - [System.ComponentModel.DesignerCategoryAttribute("code")] public partial class StabilityParameters { private int searchMethodField; @@ -2221,7 +1464,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -2268,7 +1511,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -2328,7 +1571,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -2363,7 +1606,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -2398,7 +1641,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -2433,7 +1676,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -2494,7 +1737,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -2541,7 +1784,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -2615,7 +1858,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -2649,7 +1892,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -2723,7 +1966,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -3056,7 +2299,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -3091,7 +2334,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -3126,7 +2369,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")] [System.SerializableAttribute()] [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)] public enum SoilShearStrengthModel { @@ -3145,7 +2388,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -3179,7 +2422,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -3227,7 +2470,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -3639,7 +2882,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")] [System.SerializableAttribute()] [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)] public enum LocationDesignOptionsStabilityDesignMethod { @@ -3652,7 +2895,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -3752,7 +2995,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")] [System.SerializableAttribute()] [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)] public enum LocationWaternetOptionsPhreaticLineCreationMethod { @@ -3774,7 +3017,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")] [System.SerializableAttribute()] [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)] public enum LocationWaternetOptionsIntrusionVerticalWaterPressure { @@ -3796,7 +3039,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")] [System.SerializableAttribute()] [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)] public enum LocationWaternetOptionsDikeSoilScenario { @@ -3815,7 +3058,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -3915,7 +3158,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -4262,7 +3505,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -4388,7 +3631,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -4423,7 +3666,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -4471,7 +3714,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")] [System.SerializableAttribute()] [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)] public enum InputDamProjectType { @@ -4484,7 +3727,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")] [System.SerializableAttribute()] [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)] public enum InputPipingModelType { @@ -4503,7 +3746,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")] [System.SerializableAttribute()] [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)] public enum InputStabilityModelType { @@ -4519,7 +3762,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")] [System.SerializableAttribute()] [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)] public enum InputAnalysisType { Index: DamEngine/trunk/src/Deltares.DamEngine.Interface/FillXmlOutputFromDam.cs =================================================================== diff -u -r6120 -r6194 --- DamEngine/trunk/src/Deltares.DamEngine.Interface/FillXmlOutputFromDam.cs (.../FillXmlOutputFromDam.cs) (revision 6120) +++ DamEngine/trunk/src/Deltares.DamEngine.Interface/FillXmlOutputFromDam.cs (.../FillXmlOutputFromDam.cs) (revision 6194) @@ -27,7 +27,7 @@ using Deltares.DamEngine.Data.Standard.Logging; using Deltares.DamEngine.Io.XmlOutput; using DesignResult = Deltares.DamEngine.Io.XmlOutput.DesignResult; -using TimeSerie = Deltares.DamEngine.Io.XmlOutput.TimeSerie; +using TimeSerie = Deltares.DamEngine.Io.XmlOutput.TimeSerieOutput; using UpliftSituation = Deltares.DamEngine.Data.General.UpliftSituation; namespace Deltares.DamEngine.Interface; @@ -465,50 +465,22 @@ foreach (Data.General.TimeSeries.TimeSerie damTimeSerie in outputTimeSerieCollection.Series) { var outputTimeSerie = new TimeSerie(); - outputTimeSerie.Entries = new TimeSerieEntries(); - outputTimeSerie.Entries.TimeSerieEntry = new TimeSerieEntriesTimeSerieEntry[damTimeSerie.Entries.Count]; - outputTimeSerie.TimeStep = new TimeSerieTimeStep(); + 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 }; if (timestepEntry.BishopCircleX.HasValue && timestepEntry.BishopCircleZ.HasValue && timestepEntry.BishopRadius.HasValue) { @@ -523,10 +495,9 @@ Radius = (double) timestepEntry.BishopRadius }; } - outputTimeSerie.Entries.TimeSerieEntry[timeSerieEntryIndex] = timeStep; + outputTimeSerie.Entries.TimeSerieEntryOutput[timeSerieEntryIndex] = timeStep; timeSerieEntryIndex++; } - outputTimeSeries[timeSerieIndex] = outputTimeSerie; timeSerieIndex++; } Fisheye: Tag 6194 refers to a dead (removed) revision in file `DamEngine/trunk/src/Deltares.DamEngine.Data/General/TimeSeries/TimeStep.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: DamEngine/trunk/src/Deltares.DamEngine.TestHelpers/Factories/FactoryForDamProjectData.cs =================================================================== diff -u -r6171 -r6194 --- DamEngine/trunk/src/Deltares.DamEngine.TestHelpers/Factories/FactoryForDamProjectData.cs (.../FactoryForDamProjectData.cs) (revision 6171) +++ DamEngine/trunk/src/Deltares.DamEngine.TestHelpers/Factories/FactoryForDamProjectData.cs (.../FactoryForDamProjectData.cs) (revision 6194) @@ -167,44 +167,16 @@ TimeSerie timeSerie = dike.InputTimeSerieCollection.AddNewSeries(locationId); timeSerie.ParameterId = (i % 2 == 0) ? idWaterLevel : idWaterPressure; 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 = $"station{i}"; timeSerie.Units = "m"; - timeSerie.SourceOrganisation = $"organisation{i}"; - timeSerie.SourceSystem = $"system{i}"; - timeSerie.FileDescription = $"filedescription{i}"; - timeSerie.Region = $"region{i}"; - if ((i % 2 == 0)) - { - timeSerie.TimeStep.Multiplier = 3600; - timeSerie.TimeStep.Unit = TimeStepUnit.Second; - } - else - { - timeSerie.TimeStep.Divider = 24; - timeSerie.TimeStep.Unit = TimeStepUnit.Day; - } - 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: DamEngine/trunk/src/Deltares.DamEngine.Data/General/TimeSeries/TimeSerieEntry.cs =================================================================== diff -u -r6110 -r6194 --- DamEngine/trunk/src/Deltares.DamEngine.Data/General/TimeSeries/TimeSerieEntry.cs (.../TimeSerieEntry.cs) (revision 6110) +++ DamEngine/trunk/src/Deltares.DamEngine.Data/General/TimeSeries/TimeSerieEntry.cs (.../TimeSerieEntry.cs) (revision 6194) @@ -39,22 +39,12 @@ public virtual double? BishopCircleX { get; set; } public virtual double? BishopCircleZ { get; set; } public virtual double? BishopRadius { get; set; } - // public virtual string BasisFileName { get; set; } - // public string RelativeCalculationPathName { get; set; } - // public Stochast StochastValue { get; set; } - // - // public int Flag { get; set; } - public TimeSerieEntry GetShallowCopy() { return new TimeSerieEntry { DateTime = DateTime, - // Flag = Flag, - // BasisFileName = BasisFileName, - // RelativeCalculationPathName = RelativeCalculationPathName, - // StochastValue = StochastValue, Value = Value }; } @@ -83,8 +73,5 @@ { DateTime = entry.DateTime; Value = entry.Value; - // BasisFileName = entry.BasisFileName; - // StochastValue = entry.StochastValue; - // Flag = entry.Flag; } } \ No newline at end of file Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/OperationalPulauTekongTests.cs =================================================================== diff -u -r6095 -r6194 --- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/OperationalPulauTekongTests.cs (.../OperationalPulauTekongTests.cs) (revision 6095) +++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/OperationalPulauTekongTests.cs (.../OperationalPulauTekongTests.cs) (revision 6194) @@ -54,12 +54,12 @@ Assert.That(output.Results.OperationalOutputTimeSeries, Has.Length.EqualTo(5)); Assert.Multiple(() => { - Assert.That(output.Results.OperationalOutputTimeSeries[0].Entries.TimeSerieEntry, Has.Length.EqualTo(1)); - Assert.That(output.Results.OperationalOutputTimeSeries[0].Entries.TimeSerieEntry[0].Value, Is.EqualTo(1.439).Within(tolerance)); - Assert.That(output.Results.OperationalOutputTimeSeries[1].Entries.TimeSerieEntry[0].Value, Is.EqualTo(1.218).Within(tolerance)); - Assert.That(output.Results.OperationalOutputTimeSeries[2].Entries.TimeSerieEntry[0].Value, Is.EqualTo(1.375).Within(tolerance)); - Assert.That(output.Results.OperationalOutputTimeSeries[3].Entries.TimeSerieEntry[0].Value, Is.EqualTo(1.395).Within(tolerance)); - Assert.That(output.Results.OperationalOutputTimeSeries[4].Entries.TimeSerieEntry[0].Value, Is.EqualTo(0.997).Within(tolerance)); + Assert.That(output.Results.OperationalOutputTimeSeries[0].Entries.TimeSerieEntryOutput, Has.Length.EqualTo(1)); + Assert.That(output.Results.OperationalOutputTimeSeries[0].Entries.TimeSerieEntryOutput[0].Value, Is.EqualTo(1.439).Within(tolerance)); + Assert.That(output.Results.OperationalOutputTimeSeries[1].Entries.TimeSerieEntryOutput[0].Value, Is.EqualTo(1.218).Within(tolerance)); + Assert.That(output.Results.OperationalOutputTimeSeries[2].Entries.TimeSerieEntryOutput[0].Value, Is.EqualTo(1.375).Within(tolerance)); + Assert.That(output.Results.OperationalOutputTimeSeries[3].Entries.TimeSerieEntryOutput[0].Value, Is.EqualTo(1.395).Within(tolerance)); + Assert.That(output.Results.OperationalOutputTimeSeries[4].Entries.TimeSerieEntryOutput[0].Value, Is.EqualTo(0.997).Within(tolerance)); }); } @@ -85,10 +85,10 @@ Assert.That(output.Results.OperationalOutputTimeSeries, Has.Length.EqualTo(3)); Assert.Multiple(() => { - Assert.That(output.Results.OperationalOutputTimeSeries[0].Entries.TimeSerieEntry, Has.Length.EqualTo(1)); - Assert.That(output.Results.OperationalOutputTimeSeries[0].Entries.TimeSerieEntry[0].Value, Is.EqualTo(1.222).Within(tolerance)); - Assert.That(output.Results.OperationalOutputTimeSeries[1].Entries.TimeSerieEntry[0].Value, Is.EqualTo(1.231).Within(tolerance)); - Assert.That(output.Results.OperationalOutputTimeSeries[2].Entries.TimeSerieEntry[0].Value, Is.EqualTo(1.282).Within(tolerance)); + Assert.That(output.Results.OperationalOutputTimeSeries[0].Entries.TimeSerieEntryOutput, Has.Length.EqualTo(1)); + Assert.That(output.Results.OperationalOutputTimeSeries[0].Entries.TimeSerieEntryOutput[0].Value, Is.EqualTo(1.222).Within(tolerance)); + Assert.That(output.Results.OperationalOutputTimeSeries[1].Entries.TimeSerieEntryOutput[0].Value, Is.EqualTo(1.231).Within(tolerance)); + Assert.That(output.Results.OperationalOutputTimeSeries[2].Entries.TimeSerieEntryOutput[0].Value, Is.EqualTo(1.282).Within(tolerance)); }); } } \ No newline at end of file Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/OperationalMultiCoreTests.cs =================================================================== diff -u -r6095 -r6194 --- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/OperationalMultiCoreTests.cs (.../OperationalMultiCoreTests.cs) (revision 6095) +++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/OperationalMultiCoreTests.cs (.../OperationalMultiCoreTests.cs) (revision 6194) @@ -148,10 +148,10 @@ { var numberOfResults = 0; var numberOfRealResults = 0; - foreach (TimeSerie resultSerie in output.Results.OperationalOutputTimeSeries) + foreach (TimeSerieOutput resultSerie in output.Results.OperationalOutputTimeSeries) { - numberOfResults += resultSerie.Entries.TimeSerieEntry.Length; - foreach (TimeSerieEntriesTimeSerieEntry timeSerieEntriesTimeSerieEntry in resultSerie.Entries.TimeSerieEntry) + numberOfResults += resultSerie.Entries.TimeSerieEntryOutput.Length; + foreach (TimeSerieOutputEntriesTimeSerieEntryOutput timeSerieEntriesTimeSerieEntry in resultSerie.Entries.TimeSerieEntryOutput) { if (!double.IsNaN(timeSerieEntriesTimeSerieEntry.Value) && timeSerieEntriesTimeSerieEntry.Value is > 0 and < 100000) Index: DamEngine/trunk/src/Deltares.DamEngine.Io/DamOutput.cs =================================================================== diff -u -r6119 -r6194 --- DamEngine/trunk/src/Deltares.DamEngine.Io/DamOutput.cs (.../DamOutput.cs) (revision 6119) +++ DamEngine/trunk/src/Deltares.DamEngine.Io/DamOutput.cs (.../DamOutput.cs) (revision 6194) @@ -63,7 +63,7 @@ private OutputResultsOperationalLocationsStaticData operationalLocationsStaticDataField; - private TimeSerie[] operationalOutputTimeSeriesField; + private TimeSerieOutput[] operationalOutputTimeSeriesField; private Message[] calculationMessagesField; @@ -101,8 +101,8 @@ /// [System.Xml.Serialization.XmlArrayAttribute(IsNullable=true)] - [System.Xml.Serialization.XmlArrayItemAttribute(IsNullable=false)] - public TimeSerie[] OperationalOutputTimeSeries { + [System.Xml.Serialization.XmlArrayItemAttribute("TimeSerie", IsNullable=false)] + public TimeSerieOutput[] OperationalOutputTimeSeries { get { return this.operationalOutputTimeSeriesField; } @@ -1077,16 +1077,12 @@ [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] - public partial class TimeSerie { + public partial class TimeSerieOutput { - private TimeSerieTimeStep timeStepField; + private TimeSerieOutputEntries entriesField; - private TimeSerieEntries entriesField; - private System.DateTime forecastDateTimeField; - private string typeField; - private string locationIdField; private string parameterIdField; @@ -1097,39 +1093,17 @@ private double missValField; - private string longNameField; - - private string stationNameField; - private string unitsField; - private string sourceOrganisationField; - - private string sourceSystemField; - - private string fileDescriptionField; - - private string regionField; - private string commentField; private System.DateTime creationDateTimeField; private bool creationDateTimeFieldSpecified; /// - public TimeSerieTimeStep TimeStep { + public TimeSerieOutputEntries Entries { get { - return this.timeStepField; - } - set { - this.timeStepField = value; - } - } - - /// - public TimeSerieEntries Entries { - get { return this.entriesField; } set { @@ -1150,17 +1124,6 @@ /// [System.Xml.Serialization.XmlAttributeAttribute()] - public string Type { - get { - return this.typeField; - } - set { - this.typeField = value; - } - } - - /// - [System.Xml.Serialization.XmlAttributeAttribute()] public string LocationId { get { return this.locationIdField; @@ -1216,28 +1179,6 @@ /// [System.Xml.Serialization.XmlAttributeAttribute()] - public string LongName { - get { - return this.longNameField; - } - set { - this.longNameField = value; - } - } - - /// - [System.Xml.Serialization.XmlAttributeAttribute()] - public string StationName { - get { - return this.stationNameField; - } - set { - this.stationNameField = value; - } - } - - /// - [System.Xml.Serialization.XmlAttributeAttribute()] public string Units { get { return this.unitsField; @@ -1249,50 +1190,6 @@ /// [System.Xml.Serialization.XmlAttributeAttribute()] - public string SourceOrganisation { - get { - return this.sourceOrganisationField; - } - set { - this.sourceOrganisationField = value; - } - } - - /// - [System.Xml.Serialization.XmlAttributeAttribute()] - public string SourceSystem { - get { - return this.sourceSystemField; - } - set { - this.sourceSystemField = value; - } - } - - /// - [System.Xml.Serialization.XmlAttributeAttribute()] - public string FileDescription { - get { - return this.fileDescriptionField; - } - set { - this.fileDescriptionField = value; - } - } - - /// - [System.Xml.Serialization.XmlAttributeAttribute()] - public string Region { - get { - return this.regionField; - } - set { - this.regionField = value; - } - } - - /// - [System.Xml.Serialization.XmlAttributeAttribute()] public string Comment { get { return this.commentField; @@ -1331,72 +1228,20 @@ [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)] - public partial class TimeSerieTimeStep { + public partial class TimeSerieOutputEntries { - private uint dividerField; + private TimeSerieOutputEntriesTimeSerieEntryOutput[] timeSerieEntryOutputField; - private uint multiplierField; - - private bool dividerSpecified1Field; - - private bool multiplierSpecified1Field; - - private uint timeStepUnitField; - /// - [System.Xml.Serialization.XmlAttributeAttribute()] - public uint Divider { + [System.Xml.Serialization.XmlElementAttribute("TimeSerieEntryOutput")] + public TimeSerieOutputEntriesTimeSerieEntryOutput[] TimeSerieEntryOutput { get { - return this.dividerField; + return this.timeSerieEntryOutputField; } set { - this.dividerField = value; + this.timeSerieEntryOutputField = value; } } - - /// - [System.Xml.Serialization.XmlAttributeAttribute()] - public uint Multiplier { - get { - return this.multiplierField; - } - set { - this.multiplierField = value; - } - } - - /// - [System.Xml.Serialization.XmlAttributeAttribute("DividerSpecified")] - public bool DividerSpecified1 { - get { - return this.dividerSpecified1Field; - } - set { - this.dividerSpecified1Field = value; - } - } - - /// - [System.Xml.Serialization.XmlAttributeAttribute("MultiplierSpecified")] - public bool MultiplierSpecified1 { - get { - return this.multiplierSpecified1Field; - } - set { - this.multiplierSpecified1Field = value; - } - } - - /// - [System.Xml.Serialization.XmlAttributeAttribute()] - public uint TimeStepUnit { - get { - return this.timeStepUnitField; - } - set { - this.timeStepUnitField = value; - } - } } /// @@ -1405,30 +1250,8 @@ [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)] - public partial class TimeSerieEntries { + public partial class TimeSerieOutputEntriesTimeSerieEntryOutput { - private TimeSerieEntriesTimeSerieEntry[] timeSerieEntryField; - - /// - [System.Xml.Serialization.XmlElementAttribute("TimeSerieEntry")] - public TimeSerieEntriesTimeSerieEntry[] TimeSerieEntry { - get { - return this.timeSerieEntryField; - } - set { - this.timeSerieEntryField = value; - } - } - } - - /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")] - [System.SerializableAttribute()] - [System.Diagnostics.DebuggerStepThroughAttribute()] - [System.ComponentModel.DesignerCategoryAttribute("code")] - [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)] - public partial class TimeSerieEntriesTimeSerieEntry { - private WaternetType waternetField; private BishopCalculationGridType bishopCalculationGridField; Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/OperationalHHNKTests.cs =================================================================== diff -u -r6095 -r6194 --- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/OperationalHHNKTests.cs (.../OperationalHHNKTests.cs) (revision 6095) +++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/OperationalHHNKTests.cs (.../OperationalHHNKTests.cs) (revision 6194) @@ -56,16 +56,16 @@ Assert.That(output.Results.OperationalOutputTimeSeries, Has.Length.EqualTo(8)); Assert.Multiple(() => { - Assert.That(output.Results.OperationalOutputTimeSeries[0].Entries.TimeSerieEntry, Has.Length.EqualTo(1)); - Assert.That(output.Results.OperationalOutputTimeSeries[0].Entries.TimeSerieEntry[0].Value, Is.EqualTo(0.932).Within(tolerance)); - Assert.That(output.Results.OperationalOutputTimeSeries[1].Entries.TimeSerieEntry[0].Value, Is.EqualTo(0.862).Within(tolerance)); - Assert.That(output.Results.OperationalOutputTimeSeries[2].Entries.TimeSerieEntry[0].Value, Is.EqualTo(0.803).Within(tolerance)); - Assert.That(output.Results.OperationalOutputTimeSeries[3].Entries.TimeSerieEntry[0].Value, Is.EqualTo(0.747).Within(tolerance)); + Assert.That(output.Results.OperationalOutputTimeSeries[0].Entries.TimeSerieEntryOutput, Has.Length.EqualTo(1)); + Assert.That(output.Results.OperationalOutputTimeSeries[0].Entries.TimeSerieEntryOutput[0].Value, Is.EqualTo(0.932).Within(tolerance)); + Assert.That(output.Results.OperationalOutputTimeSeries[1].Entries.TimeSerieEntryOutput[0].Value, Is.EqualTo(0.862).Within(tolerance)); + Assert.That(output.Results.OperationalOutputTimeSeries[2].Entries.TimeSerieEntryOutput[0].Value, Is.EqualTo(0.803).Within(tolerance)); + Assert.That(output.Results.OperationalOutputTimeSeries[3].Entries.TimeSerieEntryOutput[0].Value, Is.EqualTo(0.747).Within(tolerance)); // The following values are NaN due to no uplift - Assert.That(output.Results.OperationalOutputTimeSeries[4].Entries.TimeSerieEntry[0].Value, Is.NaN); - Assert.That(output.Results.OperationalOutputTimeSeries[5].Entries.TimeSerieEntry[0].Value, Is.NaN); - Assert.That(output.Results.OperationalOutputTimeSeries[6].Entries.TimeSerieEntry[0].Value, Is.NaN); - Assert.That(output.Results.OperationalOutputTimeSeries[7].Entries.TimeSerieEntry[0].Value, Is.NaN); + Assert.That(output.Results.OperationalOutputTimeSeries[4].Entries.TimeSerieEntryOutput[0].Value, Is.NaN); + Assert.That(output.Results.OperationalOutputTimeSeries[5].Entries.TimeSerieEntryOutput[0].Value, Is.NaN); + Assert.That(output.Results.OperationalOutputTimeSeries[6].Entries.TimeSerieEntryOutput[0].Value, Is.NaN); + Assert.That(output.Results.OperationalOutputTimeSeries[7].Entries.TimeSerieEntryOutput[0].Value, Is.NaN); }); } } \ No newline at end of file