Index: DamEngine/trunk/src/Deltares.DamEngine.Interface/FillXmlOutputFromDam.cs =================================================================== diff -u -r6087 -r6088 --- DamEngine/trunk/src/Deltares.DamEngine.Interface/FillXmlOutputFromDam.cs (.../FillXmlOutputFromDam.cs) (revision 6087) +++ DamEngine/trunk/src/Deltares.DamEngine.Interface/FillXmlOutputFromDam.cs (.../FillXmlOutputFromDam.cs) (revision 6088) @@ -474,25 +474,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 + SafetyFactor = timestepEntry.Value, + // BasisFileNameWMF = timestepEntry.BasisFileName, + // Flagnietechtgebruikt = timestepEntry.Flag, + // RelativeCalculationPathName = timestepEntry.RelativeCalculationPathName, + // StochastValue = stochastValue }; outputTimeSerie.Entries.TimeSerieEntry[timeSerieEntryIndex] = timeStep; timeSerieEntryIndex++; Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/OperationalPulauTekongTests.cs =================================================================== diff -u -r6073 -r6088 --- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/OperationalPulauTekongTests.cs (.../OperationalPulauTekongTests.cs) (revision 6073) +++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/OperationalPulauTekongTests.cs (.../OperationalPulauTekongTests.cs) (revision 6088) @@ -55,11 +55,11 @@ 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.TimeSerieEntry[0].SafetyFactor, Is.EqualTo(1.439).Within(tolerance)); + Assert.That(output.Results.OperationalOutputTimeSeries[1].Entries.TimeSerieEntry[0].SafetyFactor, Is.EqualTo(1.218).Within(tolerance)); + Assert.That(output.Results.OperationalOutputTimeSeries[2].Entries.TimeSerieEntry[0].SafetyFactor, Is.EqualTo(1.375).Within(tolerance)); + Assert.That(output.Results.OperationalOutputTimeSeries[3].Entries.TimeSerieEntry[0].SafetyFactor, Is.EqualTo(1.395).Within(tolerance)); + Assert.That(output.Results.OperationalOutputTimeSeries[4].Entries.TimeSerieEntry[0].SafetyFactor, Is.EqualTo(0.997).Within(tolerance)); }); } @@ -86,9 +86,9 @@ 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.TimeSerieEntry[0].SafetyFactor, Is.EqualTo(1.222).Within(tolerance)); + Assert.That(output.Results.OperationalOutputTimeSeries[1].Entries.TimeSerieEntry[0].SafetyFactor, Is.EqualTo(1.231).Within(tolerance)); + Assert.That(output.Results.OperationalOutputTimeSeries[2].Entries.TimeSerieEntry[0].SafetyFactor, Is.EqualTo(1.282).Within(tolerance)); }); } } \ No newline at end of file Index: DamEngine/trunk/xsd/DamOutput.xsd =================================================================== diff -u -r1658 -r6088 --- DamEngine/trunk/xsd/DamOutput.xsd (.../DamOutput.xsd) (revision 1658) +++ DamEngine/trunk/xsd/DamOutput.xsd (.../DamOutput.xsd) (revision 6088) @@ -4,12 +4,35 @@ + + + + + + + + + + + + + + + + + + + + + + + Index: DamEngine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlOutput.cs =================================================================== diff -u -r6087 -r6088 --- DamEngine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlOutput.cs (.../FillDamFromXmlOutput.cs) (revision 6087) +++ DamEngine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlOutput.cs (.../FillDamFromXmlOutput.cs) (revision 6088) @@ -95,25 +95,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.SafetyFactor, + // BasisFileName = entry.BasisFileNameWMF, + // Flag = entry.Flagnietechtgebruikt, + // RelativeCalculationPathName = entry.RelativeCalculationPathName, + // StochastValue = stochastValue }; timeSerie.Entries.Add(timeSerieEntry); } Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/OperationalStabilityProfile2DTests.cs =================================================================== diff -u -r6063 -r6088 --- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/OperationalStabilityProfile2DTests.cs (.../OperationalStabilityProfile2DTests.cs) (revision 6063) +++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/OperationalStabilityProfile2DTests.cs (.../OperationalStabilityProfile2DTests.cs) (revision 6088) @@ -33,6 +33,8 @@ using NUnit.Framework; using CharacteristicPointType = Deltares.DamEngine.Data.Geotechnics.CharacteristicPointType; using SurfaceLinePoint = Deltares.DamEngine.Io.XmlInput.SurfaceLinePoint; +using WaternetLineType = Deltares.MacroStability.Io.XmlInput.WaternetLineType; +using WaternetType = Deltares.MacroStability.Io.XmlInput.WaternetType; namespace Deltares.DamEngine.IntegrationTests.IntegrationTests; Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/OperationalMultiCoreTests.cs =================================================================== diff -u -r5908 -r6088 --- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/OperationalMultiCoreTests.cs (.../OperationalMultiCoreTests.cs) (revision 5908) +++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/OperationalMultiCoreTests.cs (.../OperationalMultiCoreTests.cs) (revision 6088) @@ -153,8 +153,8 @@ numberOfResults += resultSerie.Entries.TimeSerieEntry.Length; foreach (TimeSerieEntriesTimeSerieEntry timeSerieEntriesTimeSerieEntry in resultSerie.Entries.TimeSerieEntry) { - if (!double.IsNaN(timeSerieEntriesTimeSerieEntry.Value) && - timeSerieEntriesTimeSerieEntry.Value is > 0 and < 100000) + if (!double.IsNaN(timeSerieEntriesTimeSerieEntry.SafetyFactor) && + timeSerieEntriesTimeSerieEntry.SafetyFactor is > 0 and < 100000) { numberOfRealResults++; } Index: DamEngine/trunk/src/Deltares.DamEngine.Io/DamOutput.cs =================================================================== diff -u -r4562 -r6088 --- DamEngine/trunk/src/Deltares.DamEngine.Io/DamOutput.cs (.../DamOutput.cs) (revision 4562) +++ DamEngine/trunk/src/Deltares.DamEngine.Io/DamOutput.cs (.../DamOutput.cs) (revision 6088) @@ -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.XmlOutput { 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")] @@ -50,7 +50,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")] @@ -59,6 +59,10 @@ private DesignResult[] calculationResultsField; + private OutputResultsOperationalStaticData operationalStaticDataField; + + private OutputResultsOperationalLocationsStaticData operationalLocationsStaticDataField; + private TimeSerie[] operationalOutputTimeSeriesField; private Message[] calculationMessagesField; @@ -75,6 +79,27 @@ } /// + public OutputResultsOperationalStaticData OperationalStaticData { + get { + return this.operationalStaticDataField; + } + set { + this.operationalStaticDataField = value; + } + } + + /// + [System.Xml.Serialization.XmlElementAttribute(IsNullable=true)] + public OutputResultsOperationalLocationsStaticData OperationalLocationsStaticData { + get { + return this.operationalLocationsStaticDataField; + } + set { + this.operationalLocationsStaticDataField = value; + } + } + + /// [System.Xml.Serialization.XmlArrayAttribute(IsNullable=true)] [System.Xml.Serialization.XmlArrayItemAttribute(IsNullable=false)] public TimeSerie[] OperationalOutputTimeSeries { @@ -99,7 +124,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")] @@ -209,7 +234,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")] @@ -345,7 +370,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")] @@ -444,7 +469,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")] @@ -478,7 +503,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 MessageMessageType { @@ -494,10 +519,564 @@ } /// - [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 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.4084.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class Point2DType { + + private double xField; + + private double zField; + + /// + [System.Xml.Serialization.XmlAttributeAttribute()] + public double X { + get { + return this.xField; + } + set { + this.xField = value; + } + } + + /// + [System.Xml.Serialization.XmlAttributeAttribute()] + public double Z { + get { + return this.zField; + } + set { + this.zField = value; + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.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.4084.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.4084.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.4084.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.4084.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.4084.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.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.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.4084.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] public partial class TimeSerie { private TimeSerieTimeStep timeStepField; @@ -747,7 +1326,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")] @@ -821,7 +1400,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")] @@ -843,176 +1422,257 @@ } /// - [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 TimeSerieEntriesTimeSerieEntryStochastValue stochastValueField; + private WaternetType waternetField; + private BishopCalculationGridType bishopCalculationGridField; + + private UpliftVanCalculationGridType upliftVanCalculationGridField; + + private BishopCalculatedSlipPlaneType bishopCalculatedSlipPlaneField; + + private UpliftVanCalculatedSlipPlaneType upliftVanCalculatedSlipPlaneField; + private System.DateTime dateTimeField; - private double valueField; + private double safetyFactorField; - private int flagnietechtgebruiktField; + private bool isUpliftField; - private string basisFileNameWMFField; + private bool isUpliftFieldSpecified; - private string relativeCalculationPathNameField; + /// + public WaternetType Waternet { + get { + return this.waternetField; + } + set { + this.waternetField = value; + } + } /// - public TimeSerieEntriesTimeSerieEntryStochastValue StochastValue { + public BishopCalculationGridType BishopCalculationGrid { get { - return this.stochastValueField; + return this.bishopCalculationGridField; } set { - this.stochastValueField = value; + this.bishopCalculationGridField = value; } } /// - [System.Xml.Serialization.XmlAttributeAttribute()] - public System.DateTime DateTime { + public UpliftVanCalculationGridType UpliftVanCalculationGrid { get { - return this.dateTimeField; + return this.upliftVanCalculationGridField; } set { - this.dateTimeField = value; + this.upliftVanCalculationGridField = value; } } /// - [System.Xml.Serialization.XmlAttributeAttribute()] - public double Value { + public BishopCalculatedSlipPlaneType BishopCalculatedSlipPlane { get { - return this.valueField; + return this.bishopCalculatedSlipPlaneField; } set { - this.valueField = value; + this.bishopCalculatedSlipPlaneField = value; } } /// - [System.Xml.Serialization.XmlAttributeAttribute("Flag-nietechtgebruikt")] - public int Flagnietechtgebruikt { + public UpliftVanCalculatedSlipPlaneType UpliftVanCalculatedSlipPlane { get { - return this.flagnietechtgebruiktField; + return this.upliftVanCalculatedSlipPlaneField; } set { - this.flagnietechtgebruiktField = value; + this.upliftVanCalculatedSlipPlaneField = value; } } /// [System.Xml.Serialization.XmlAttributeAttribute()] - public string BasisFileNameWMF { + public System.DateTime DateTime { get { - return this.basisFileNameWMFField; + return this.dateTimeField; } set { - this.basisFileNameWMFField = value; + this.dateTimeField = value; } } /// [System.Xml.Serialization.XmlAttributeAttribute()] - public string RelativeCalculationPathName { + public double SafetyFactor { get { - return this.relativeCalculationPathNameField; + return this.safetyFactorField; } set { - this.relativeCalculationPathNameField = value; + this.safetyFactorField = value; } } + + /// + [System.Xml.Serialization.XmlAttributeAttribute()] + public bool IsUplift { + get { + return this.isUpliftField; + } + set { + this.isUpliftField = value; + } + } + + /// + [System.Xml.Serialization.XmlIgnoreAttribute()] + public bool IsUpliftSpecified { + get { + return this.isUpliftFieldSpecified; + } + set { + this.isUpliftFieldSpecified = value; + } + } } /// - [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 TimeSerieEntriesTimeSerieEntryStochastValue { + public partial class OperationalStaticData { - private double meanField; + private OperationalStaticDataFailureMechanismSystemType failureMechanismSystemTypeField; - private double standardDeviationField; + private bool failureMechanismSystemTypeFieldSpecified; - private int distributionField; + private OperationalStaticDataStabilityModel stabilityModelField; + private bool stabilityModelFieldSpecified; + + private OperationalStaticDataSearchAlgorithm searchAlgorithmField; + + private bool searchAlgorithmFieldSpecified; + /// [System.Xml.Serialization.XmlAttributeAttribute()] - public double Mean { + public OperationalStaticDataFailureMechanismSystemType FailureMechanismSystemType { get { - return this.meanField; + return this.failureMechanismSystemTypeField; } set { - this.meanField = value; + this.failureMechanismSystemTypeField = value; } } /// - [System.Xml.Serialization.XmlAttributeAttribute()] - public double StandardDeviation { + [System.Xml.Serialization.XmlIgnoreAttribute()] + public bool FailureMechanismSystemTypeSpecified { get { - return this.standardDeviationField; + return this.failureMechanismSystemTypeFieldSpecified; } set { - this.standardDeviationField = value; + this.failureMechanismSystemTypeFieldSpecified = value; } } /// [System.Xml.Serialization.XmlAttributeAttribute()] - public int Distribution { + public OperationalStaticDataStabilityModel StabilityModel { get { - return this.distributionField; + return this.stabilityModelField; } set { - this.distributionField = value; + this.stabilityModelField = 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; + /// + [System.Xml.Serialization.XmlIgnoreAttribute()] + public bool StabilityModelSpecified { + get { + return this.stabilityModelFieldSpecified; + } + set { + this.stabilityModelFieldSpecified = value; + } + } - private double zField; - /// [System.Xml.Serialization.XmlAttributeAttribute()] - public double X { + public OperationalStaticDataSearchAlgorithm SearchAlgorithm { get { - return this.xField; + return this.searchAlgorithmField; } set { - this.xField = value; + this.searchAlgorithmField = value; } } /// - [System.Xml.Serialization.XmlAttributeAttribute()] - public double Z { + [System.Xml.Serialization.XmlIgnoreAttribute()] + public bool SearchAlgorithmSpecified { get { - return this.zField; + return this.searchAlgorithmFieldSpecified; } set { - this.zField = value; + this.searchAlgorithmFieldSpecified = value; } } } /// - [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 OperationalStaticDataFailureMechanismSystemType { + + /// + StabilityInside, + + /// + StabilityOutside, + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")] + [System.SerializableAttribute()] + [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)] + public enum OperationalStaticDataStabilityModel { + + /// + Bishop, + + /// + UpliftVan, + + /// + BishopUpliftVan, + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")] + [System.SerializableAttribute()] + [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)] + public enum OperationalStaticDataSearchAlgorithm { + + /// + Grid, + + /// + Beeswarm, + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")] + [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] public partial class SliceType { @@ -1860,7 +2520,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")] [System.SerializableAttribute()] public enum ShearStrengthModelType { @@ -1878,7 +2538,7 @@ [System.Xml.Serialization.XmlIncludeAttribute(typeof(SlidingPlaneMinimumSafetyCurveType))] [System.Xml.Serialization.XmlIncludeAttribute(typeof(DualSlidingCircleMinimumSafetyCurveType))] [System.Xml.Serialization.XmlIncludeAttribute(typeof(SlidingCircleMinimumSafetyCurveType))] - [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")] @@ -1912,7 +2572,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")] @@ -1921,7 +2581,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")] @@ -1942,7 +2602,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")] @@ -2323,7 +2983,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")] @@ -2641,7 +3301,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")] @@ -2675,7 +3335,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 +3383,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 DesignResultStabilityDesignResultsStabilityModelType { @@ -2739,7 +3399,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")] @@ -3381,4 +4041,156 @@ } } } + + /// + [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 OutputResultsOperationalStaticData { + + private OperationalStaticData operationalStaticDataField; + + /// + public OperationalStaticData OperationalStaticData { + get { + return this.operationalStaticDataField; + } + set { + this.operationalStaticDataField = 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 OutputResultsOperationalLocationsStaticData { + + private OutputResultsOperationalLocationsStaticDataOperationalLocationStaticData[] operationalLocationStaticDataField; + + /// + [System.Xml.Serialization.XmlElementAttribute("OperationalLocationStaticData")] + public OutputResultsOperationalLocationsStaticDataOperationalLocationStaticData[] OperationalLocationStaticData { + get { + return this.operationalLocationStaticDataField; + } + set { + this.operationalLocationStaticDataField = 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 OutputResultsOperationalLocationsStaticDataOperationalLocationStaticData { + + private TrafficLoadTypeTrafficLoad[] trafficLoadField; + + /// + [System.Xml.Serialization.XmlArrayItemAttribute("TrafficLoad", IsNullable=false)] + public TrafficLoadTypeTrafficLoad[] TrafficLoad { + get { + return this.trafficLoadField; + } + set { + this.trafficLoadField = 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 TrafficLoadTypeTrafficLoad { + + private int keyField; + + private double magnitudeField; + + private double distributionAngleField; + + private string loadTypeField; + + private double xStartField; + + private double xEndField; + + /// + [System.Xml.Serialization.XmlAttributeAttribute()] + public int Key { + get { + return this.keyField; + } + set { + this.keyField = value; + } + } + + /// + [System.Xml.Serialization.XmlAttributeAttribute()] + public double Magnitude { + get { + return this.magnitudeField; + } + set { + this.magnitudeField = value; + } + } + + /// + [System.Xml.Serialization.XmlAttributeAttribute()] + public double DistributionAngle { + get { + return this.distributionAngleField; + } + set { + this.distributionAngleField = value; + } + } + + /// + [System.Xml.Serialization.XmlAttributeAttribute()] + public string LoadType { + get { + return this.loadTypeField; + } + set { + this.loadTypeField = value; + } + } + + /// + [System.Xml.Serialization.XmlAttributeAttribute()] + public double XStart { + get { + return this.xStartField; + } + set { + this.xStartField = value; + } + } + + /// + [System.Xml.Serialization.XmlAttributeAttribute()] + public double XEnd { + get { + return this.xEndField; + } + set { + this.xEndField = value; + } + } + } } Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/OperationalWtiPipingTests.cs =================================================================== diff -u -r6076 -r6088 --- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/OperationalWtiPipingTests.cs (.../OperationalWtiPipingTests.cs) (revision 6076) +++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/OperationalWtiPipingTests.cs (.../OperationalWtiPipingTests.cs) (revision 6088) @@ -54,10 +54,10 @@ 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.TimeSerieEntry[0].SafetyFactor, Is.EqualTo(0.7396).Within(tolerance)); + Assert.That(output.Results.OperationalOutputTimeSeries[0].Entries.TimeSerieEntry[1].SafetyFactor, Is.EqualTo(0.6795).Within(tolerance)); + Assert.That(output.Results.OperationalOutputTimeSeries[7].Entries.TimeSerieEntry[0].SafetyFactor, Is.NaN); + Assert.That(output.Results.OperationalOutputTimeSeries[7].Entries.TimeSerieEntry[1].SafetyFactor, Is.NaN); }); } } \ No newline at end of file Index: DamEngine/trunk/xsd/DamTimeSerie.xsd =================================================================== diff -u -r1554 -r6088 --- DamEngine/trunk/xsd/DamTimeSerie.xsd (.../DamTimeSerie.xsd) (revision 1554) +++ DamEngine/trunk/xsd/DamTimeSerie.xsd (.../DamTimeSerie.xsd) (revision 6088) @@ -1,6 +1,12 @@ + + + + + + @@ -31,19 +37,15 @@ - - - - - - - + + + + + - - - - + + Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/OperationalHHNKTests.cs =================================================================== diff -u -r6073 -r6088 --- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/OperationalHHNKTests.cs (.../OperationalHHNKTests.cs) (revision 6073) +++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/OperationalHHNKTests.cs (.../OperationalHHNKTests.cs) (revision 6088) @@ -57,15 +57,15 @@ 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.TimeSerieEntry[0].SafetyFactor, Is.EqualTo(0.932).Within(tolerance)); + Assert.That(output.Results.OperationalOutputTimeSeries[1].Entries.TimeSerieEntry[0].SafetyFactor, Is.EqualTo(0.862).Within(tolerance)); + Assert.That(output.Results.OperationalOutputTimeSeries[2].Entries.TimeSerieEntry[0].SafetyFactor, Is.EqualTo(0.803).Within(tolerance)); + Assert.That(output.Results.OperationalOutputTimeSeries[3].Entries.TimeSerieEntry[0].SafetyFactor, 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.TimeSerieEntry[0].SafetyFactor, Is.NaN); + Assert.That(output.Results.OperationalOutputTimeSeries[5].Entries.TimeSerieEntry[0].SafetyFactor, Is.NaN); + Assert.That(output.Results.OperationalOutputTimeSeries[6].Entries.TimeSerieEntry[0].SafetyFactor, Is.NaN); + Assert.That(output.Results.OperationalOutputTimeSeries[7].Entries.TimeSerieEntry[0].SafetyFactor, Is.NaN); }); } } \ No newline at end of file Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/OperationalStabilityProfile1DTests.cs =================================================================== diff -u -r6032 -r6088 --- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/OperationalStabilityProfile1DTests.cs (.../OperationalStabilityProfile1DTests.cs) (revision 6032) +++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/OperationalStabilityProfile1DTests.cs (.../OperationalStabilityProfile1DTests.cs) (revision 6088) @@ -33,6 +33,7 @@ using KellermanSoftware.CompareNetObjects; using NUnit.Framework; using Point2DType = Deltares.DamEngine.Io.XmlOutput.Point2DType; +using WaternetType = Deltares.MacroStability.Io.XmlInput.WaternetType; namespace Deltares.DamEngine.IntegrationTests.IntegrationTests;