Index: DamEngine/trunk/src/Deltares.DamEngine.Interface/FillXmlOutputFromDam.cs =================================================================== diff -u -r2873 -r3405 --- DamEngine/trunk/src/Deltares.DamEngine.Interface/FillXmlOutputFromDam.cs (.../FillXmlOutputFromDam.cs) (revision 2873) +++ DamEngine/trunk/src/Deltares.DamEngine.Interface/FillXmlOutputFromDam.cs (.../FillXmlOutputFromDam.cs) (revision 3405) @@ -269,6 +269,43 @@ } } + if (designResult.StabilityDesignResults != null) + { + switch(designResult.StabilityDesignResults.StabilityModelType) + { + case MStabModelType.Bishop: + desResult.StabilityDesignResults.SlipCircleDefinition = new SlidingCircleMinimumSafetyCurveType(); + var sl = (SlidingCircleMinimumSafetyCurveType) desResult.StabilityDesignResults.SlipCircleDefinition; + + sl.Center = new Point2DType() + { + X = designResult.StabilityDesignResults.ActiveCenterPoint.X, + Z = designResult.StabilityDesignResults.ActiveCenterPoint.Z + }; + sl.Radius = designResult.StabilityDesignResults.ActiveCenterPointRadius; + break; + + case MStabModelType.UpliftVan: + desResult.StabilityDesignResults.SlipCircleDefinition = new DualSlidingCircleMinimumSafetyCurveType(); + var dsl = (DualSlidingCircleMinimumSafetyCurveType) desResult.StabilityDesignResults.SlipCircleDefinition; + dsl.ActiveCircleCenter = new Point2DType() + { + X = designResult.StabilityDesignResults.ActiveCenterPoint.X, + Z = designResult.StabilityDesignResults.ActiveCenterPoint.Z + }; + dsl.ActiveCircleRadius = designResult.StabilityDesignResults.ActiveCenterPointRadius; + + dsl.PassiveCircleCenter = new Point2DType() + { + X = designResult.StabilityDesignResults.PassiveCenterPoint.X, + Z = designResult.StabilityDesignResults.PassiveCenterPoint.Z + }; + dsl.PassiveCircleRadius = designResult.StabilityDesignResults.PassiveCenterPointRadius; + break; + } + } + + desResult.StabilityDesignResults.SafetyFactorSpecified = designResult.StabilityDesignResults.SafetyFactor.HasValue; if (designResult.StabilityDesignResults.SafetyFactor.HasValue) desResult.StabilityDesignResults.SafetyFactor = designResult.StabilityDesignResults.SafetyFactor.Value; Index: DamEngine/trunk/src/Deltares.DamEngine.Data/General/Results/StabilityDesignResults.cs =================================================================== diff -u -r1974 -r3405 --- DamEngine/trunk/src/Deltares.DamEngine.Data/General/Results/StabilityDesignResults.cs (.../StabilityDesignResults.cs) (revision 1974) +++ DamEngine/trunk/src/Deltares.DamEngine.Data/General/Results/StabilityDesignResults.cs (.../StabilityDesignResults.cs) (revision 3405) @@ -19,6 +19,7 @@ // Stichting Deltares and remain full property of Stichting Deltares at all times. // All rights reserved. +using Deltares.DamEngine.Data.Geometry; using Deltares.DamEngine.Data.Geotechnics; namespace Deltares.DamEngine.Data.General.Results @@ -257,5 +258,37 @@ } } + /// + /// Gets or sets the location (X,Z) of the center point of the active slip circle. + /// + /// + /// The location (X,Z) of the center point of the active slip circle. + /// + public Point2D ActiveCenterPoint { get; set; } + + /// + /// Gets or sets the radius of the active slip circle. + /// + /// + /// The radius of the active slip circle. + /// + public double ActiveCenterPointRadius { get; set; } + + /// + /// Gets or sets the location (X,Z) of the center point of the passive slip circle. + /// + /// + /// The location (X,Z) of the center point of the passive slip circle. + /// + public Point2D PassiveCenterPoint { get; set; } + + /// + /// Gets or sets the radius of the passive slip circle. + /// + /// + /// The radius of the passive slip circle. + /// + public double PassiveCenterPointRadius { get; set; } + } } Index: DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/FillXmlOutputFromDamTests.cs =================================================================== diff -u -r3307 -r3405 --- DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/FillXmlOutputFromDamTests.cs (.../FillXmlOutputFromDamTests.cs) (revision 3307) +++ DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/FillXmlOutputFromDamTests.cs (.../FillXmlOutputFromDamTests.cs) (revision 3405) @@ -202,15 +202,23 @@ result.PipingDesignResults.RedesignedSurfaceLine = surfaceline; result.PipingDesignResults.UpliftSituation = situation; + var stabilityMStabModelTypes = new[] + { + MStabModelType.Bishop, + MStabModelType.UpliftVan, + MStabModelType.BishopUpliftVan + }; + result.StabilityDesignResults = new StabilityDesignResults { ResultMessage = "no problemo", SafetyFactor = (i + 1) * 0.66, NumberOfIterations = (i + 1) * 3, UpliftSituation = situation, RedesignedSurfaceLine = surfaceline, - StabilityModelType = MStabModelType.BishopUpliftVan + StabilityModelType = stabilityMStabModelTypes[i], }; + CreateSlipCircleResults(result.StabilityDesignResults); damProjectData.DesignCalculations.Add(result); } @@ -237,6 +245,35 @@ return damProjectData; } + private void CreateSlipCircleResults(StabilityDesignResults stabilityDesignResults) + { + switch (stabilityDesignResults.StabilityModelType) + { + case MStabModelType.Bishop: + stabilityDesignResults.ActiveCenterPoint = new Point2D() + { + X = 100, + Z = -10 + }; + stabilityDesignResults.ActiveCenterPointRadius = 50; + break; + case MStabModelType.UpliftVan: + stabilityDesignResults.ActiveCenterPoint = new Point2D() + { + X = 100, + Z = -10 + }; + stabilityDesignResults.ActiveCenterPointRadius = 50; + stabilityDesignResults.PassiveCenterPoint = new Point2D() + { + X = 101, + Z = -11 + }; + stabilityDesignResults.PassiveCenterPointRadius = 51; + break; + } + } + private void FillOutputTimeSeries(DamProjectData damProjectData) { const int timeSeriesCount = 2; @@ -295,7 +332,11 @@ StabilityModelType = random.Next(0, 2) == 1 ? supportedModelTypeValues[random.Next(supportedModelTypeValues.Length - 1)] : (MStabModelType?) null, - RedesignedSurfaceLine = random.Next(0, 2) == 1 ? CreateSurfaceLine(seed) : null + RedesignedSurfaceLine = random.Next(0, 2) == 1 ? CreateSurfaceLine(seed) : null, + ActiveCenterPoint = CreatePoint2D(seed), + ActiveCenterPointRadius = random.NextDouble(), + PassiveCenterPoint = CreatePoint2D(seed), + PassiveCenterPointRadius = random.NextDouble() }; return new DesignResult @@ -373,6 +414,16 @@ return surfaceLine; } + private static Point2D CreatePoint2D(int seed) + { + var random = new Random(seed); + return new Point2D() + { + X = random.NextDouble(), + Z = random.NextDouble() + }; + } + private static DesignResultStabilityDesignResultsStabilityModelType? Convert(MStabModelType? stabilityModelType) { if (stabilityModelType.HasValue) Index: DamEngine/trunk/src/Deltares.DamEngine.Io/DamInput.cs =================================================================== diff -u -r2951 -r3405 --- DamEngine/trunk/src/Deltares.DamEngine.Io/DamInput.cs (.../DamInput.cs) (revision 2951) +++ DamEngine/trunk/src/Deltares.DamEngine.Io/DamInput.cs (.../DamInput.cs) (revision 3405) @@ -9,14 +9,14 @@ //------------------------------------------------------------------------------ // -// This source code was auto-generated by xsd, Version=4.6.1055.0. +// This source code was auto-generated by xsd, Version=4.8.3928.0. // namespace Deltares.DamEngine.Io.XmlInput { using System.Xml.Serialization; /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -312,7 +312,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -497,7 +497,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -531,7 +531,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -553,7 +553,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -691,7 +691,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -764,7 +764,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -786,7 +786,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -1039,7 +1039,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -1113,7 +1113,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -1135,7 +1135,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -1221,7 +1221,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -1269,7 +1269,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -1719,7 +1719,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -1766,7 +1766,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -1826,7 +1826,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -1861,7 +1861,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -1896,7 +1896,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -1931,7 +1931,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -1992,7 +1992,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -2039,7 +2039,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -2113,7 +2113,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -2147,7 +2147,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -2221,7 +2221,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -2710,7 +2710,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] [System.SerializableAttribute()] [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)] public enum SoilShearStrengthModel { @@ -2744,7 +2744,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] [System.SerializableAttribute()] [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)] public enum SoilDilatancyType { @@ -2760,7 +2760,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -2794,7 +2794,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -2842,7 +2842,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -3254,7 +3254,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] [System.SerializableAttribute()] [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)] public enum LocationDesignOptionsStabilityDesignMethod { @@ -3267,7 +3267,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -3367,7 +3367,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] [System.SerializableAttribute()] [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)] public enum LocationWaternetOptionsPhreaticLineCreationMethod { @@ -3389,7 +3389,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] [System.SerializableAttribute()] [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)] public enum LocationWaternetOptionsIntrusionVerticalWaterPressure { @@ -3411,7 +3411,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] [System.SerializableAttribute()] [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)] public enum LocationWaternetOptionsDikeSoilScenario { @@ -3430,7 +3430,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -3530,7 +3530,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -3877,7 +3877,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -4055,7 +4055,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -4090,7 +4090,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -4138,7 +4138,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] [System.SerializableAttribute()] [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)] public enum InputDamProjectType { @@ -4151,7 +4151,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] [System.SerializableAttribute()] [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)] public enum InputPipingModelType { @@ -4170,7 +4170,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] [System.SerializableAttribute()] [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)] public enum InputStabilityModelType { @@ -4189,7 +4189,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] [System.SerializableAttribute()] [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)] public enum InputAnalysisType { Index: DamEngine/trunk/src/Deltares.DamEngine.Io/DamOutput.cs =================================================================== diff -u -r3307 -r3405 --- DamEngine/trunk/src/Deltares.DamEngine.Io/DamOutput.cs (.../DamOutput.cs) (revision 3307) +++ DamEngine/trunk/src/Deltares.DamEngine.Io/DamOutput.cs (.../DamOutput.cs) (revision 3405) @@ -9,14 +9,14 @@ //------------------------------------------------------------------------------ // -// This source code was auto-generated by xsd, Version=4.6.1055.0. +// This source code was auto-generated by xsd, Version=4.8.3928.0. // namespace Deltares.DamEngine.Io.XmlOutput { using System.Xml.Serialization; /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -50,7 +50,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -99,7 +99,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -209,7 +209,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -220,6 +220,8 @@ private SurfaceLine redesignedSurfaceLineField; + private MinimumSafetyCurveBaseType slipCircleDefinitionField; + private string resultMessageField; private double safetyFactorField; @@ -255,6 +257,16 @@ } /// + public MinimumSafetyCurveBaseType SlipCircleDefinition { + get { + return this.slipCircleDefinitionField; + } + set { + this.slipCircleDefinitionField = value; + } + } + + /// [System.Xml.Serialization.XmlAttributeAttribute()] public string ResultMessage { get { @@ -333,7 +345,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -432,7 +444,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -466,7 +478,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] [System.SerializableAttribute()] [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)] public enum MessageMessageType { @@ -482,7 +494,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -735,7 +747,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -809,7 +821,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -831,7 +843,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -917,7 +929,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -965,10 +977,1674 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] + [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; + + 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.3928.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class SliceType { + + private Point2DType topLeftPointField; + + private Point2DType topRightPointField; + + private Point2DType bottomLeftPointField; + + private Point2DType bottomRightPointField; + + private string nameField; + + private double widthField; + + private double arcLengthField; + + private double topAngleField; + + private double bottomAngleField; + + private double cohesionInputField; + + private double cohesionField; + + private double cohesionCalculatedField; + + private double frictionAngleInputField; + + private double frictionAngleField; + + private double yieldStressField; + + private double oCRField; + + private double pOPField; + + private double degreeOfConsolidationPorePressureField; + + private double porePressureDueToDegreeOfConsolidationLoadField; + + private double dilatancyInputField; + + private double dilatancyField; + + private double externalLoadField; + + private double hydrostaticPorePressureField; + + private double leftForceField; + + private double leftForceAngleField; + + private double leftForceYField; + + private double rightForceField; + + private double rightForceAngleField; + + private double rightForceYField; + + private double loadStressField; + + private double normalStressField; + + private double porePressureField; + + private double horizontalPorePressureField; + + private double verticalPorePressureField; + + private double piezometricPorePressureField; + + private double effectiveStressField; + + private double excessPorePressureField; + + private double shearStressField; + + private double soilStressField; + + private double totalPorePressureField; + + private double totalStressField; + + private double weightField; + + private double suField; + + private bool suFieldSpecified; + + private ShearStrengthModelType shearStrengthModelField; + + private double horizontalSoilQuakeStressField; + + private bool horizontalSoilQuakeStressFieldSpecified; + + private double strengthIncreaseExponentField; + + private bool strengthIncreaseExponentFieldSpecified; + + private double upliftFactorField; + + private bool upliftFactorFieldSpecified; + + private double verticalSoilQuakeStressField; + + private bool verticalSoilQuakeStressFieldSpecified; + + private double waterQuakeStressField; + + private bool waterQuakeStressFieldSpecified; + + private double upliftReductionFactorField; + + private bool upliftReductionFactorFieldSpecified; + + private double ratioCuPcField; + + private bool ratioCuPcFieldSpecified; + + private double resultantForceField; + + private bool resultantForceFieldSpecified; + + private double resultantMomentField; + + private bool resultantMomentFieldSpecified; + + private double resultantAngleField; + + private bool resultantAngleFieldSpecified; + + /// + public Point2DType TopLeftPoint { + get { + return this.topLeftPointField; + } + set { + this.topLeftPointField = value; + } + } + + /// + public Point2DType TopRightPoint { + get { + return this.topRightPointField; + } + set { + this.topRightPointField = value; + } + } + + /// + public Point2DType BottomLeftPoint { + get { + return this.bottomLeftPointField; + } + set { + this.bottomLeftPointField = value; + } + } + + /// + public Point2DType BottomRightPoint { + get { + return this.bottomRightPointField; + } + set { + this.bottomRightPointField = value; + } + } + + /// + [System.Xml.Serialization.XmlAttributeAttribute()] + public string Name { + get { + return this.nameField; + } + set { + this.nameField = value; + } + } + + /// + [System.Xml.Serialization.XmlAttributeAttribute()] + public double Width { + get { + return this.widthField; + } + set { + this.widthField = value; + } + } + + /// + [System.Xml.Serialization.XmlAttributeAttribute()] + public double ArcLength { + get { + return this.arcLengthField; + } + set { + this.arcLengthField = value; + } + } + + /// + [System.Xml.Serialization.XmlAttributeAttribute()] + public double TopAngle { + get { + return this.topAngleField; + } + set { + this.topAngleField = value; + } + } + + /// + [System.Xml.Serialization.XmlAttributeAttribute()] + public double BottomAngle { + get { + return this.bottomAngleField; + } + set { + this.bottomAngleField = value; + } + } + + /// + [System.Xml.Serialization.XmlAttributeAttribute()] + public double CohesionInput { + get { + return this.cohesionInputField; + } + set { + this.cohesionInputField = value; + } + } + + /// + [System.Xml.Serialization.XmlAttributeAttribute()] + public double Cohesion { + get { + return this.cohesionField; + } + set { + this.cohesionField = value; + } + } + + /// + [System.Xml.Serialization.XmlAttributeAttribute()] + public double CohesionCalculated { + get { + return this.cohesionCalculatedField; + } + set { + this.cohesionCalculatedField = value; + } + } + + /// + [System.Xml.Serialization.XmlAttributeAttribute()] + public double FrictionAngleInput { + get { + return this.frictionAngleInputField; + } + set { + this.frictionAngleInputField = value; + } + } + + /// + [System.Xml.Serialization.XmlAttributeAttribute()] + public double FrictionAngle { + get { + return this.frictionAngleField; + } + set { + this.frictionAngleField = value; + } + } + + /// + [System.Xml.Serialization.XmlAttributeAttribute()] + public double YieldStress { + get { + return this.yieldStressField; + } + set { + this.yieldStressField = value; + } + } + + /// + [System.Xml.Serialization.XmlAttributeAttribute()] + public double OCR { + get { + return this.oCRField; + } + set { + this.oCRField = value; + } + } + + /// + [System.Xml.Serialization.XmlAttributeAttribute()] + public double POP { + get { + return this.pOPField; + } + set { + this.pOPField = value; + } + } + + /// + [System.Xml.Serialization.XmlAttributeAttribute()] + public double DegreeOfConsolidationPorePressure { + get { + return this.degreeOfConsolidationPorePressureField; + } + set { + this.degreeOfConsolidationPorePressureField = value; + } + } + + /// + [System.Xml.Serialization.XmlAttributeAttribute()] + public double PorePressureDueToDegreeOfConsolidationLoad { + get { + return this.porePressureDueToDegreeOfConsolidationLoadField; + } + set { + this.porePressureDueToDegreeOfConsolidationLoadField = value; + } + } + + /// + [System.Xml.Serialization.XmlAttributeAttribute()] + public double DilatancyInput { + get { + return this.dilatancyInputField; + } + set { + this.dilatancyInputField = value; + } + } + + /// + [System.Xml.Serialization.XmlAttributeAttribute()] + public double Dilatancy { + get { + return this.dilatancyField; + } + set { + this.dilatancyField = value; + } + } + + /// + [System.Xml.Serialization.XmlAttributeAttribute()] + public double ExternalLoad { + get { + return this.externalLoadField; + } + set { + this.externalLoadField = value; + } + } + + /// + [System.Xml.Serialization.XmlAttributeAttribute()] + public double HydrostaticPorePressure { + get { + return this.hydrostaticPorePressureField; + } + set { + this.hydrostaticPorePressureField = value; + } + } + + /// + [System.Xml.Serialization.XmlAttributeAttribute()] + public double LeftForce { + get { + return this.leftForceField; + } + set { + this.leftForceField = value; + } + } + + /// + [System.Xml.Serialization.XmlAttributeAttribute()] + public double LeftForceAngle { + get { + return this.leftForceAngleField; + } + set { + this.leftForceAngleField = value; + } + } + + /// + [System.Xml.Serialization.XmlAttributeAttribute()] + public double LeftForceY { + get { + return this.leftForceYField; + } + set { + this.leftForceYField = value; + } + } + + /// + [System.Xml.Serialization.XmlAttributeAttribute()] + public double RightForce { + get { + return this.rightForceField; + } + set { + this.rightForceField = value; + } + } + + /// + [System.Xml.Serialization.XmlAttributeAttribute()] + public double RightForceAngle { + get { + return this.rightForceAngleField; + } + set { + this.rightForceAngleField = value; + } + } + + /// + [System.Xml.Serialization.XmlAttributeAttribute()] + public double RightForceY { + get { + return this.rightForceYField; + } + set { + this.rightForceYField = value; + } + } + + /// + [System.Xml.Serialization.XmlAttributeAttribute()] + public double LoadStress { + get { + return this.loadStressField; + } + set { + this.loadStressField = value; + } + } + + /// + [System.Xml.Serialization.XmlAttributeAttribute()] + public double NormalStress { + get { + return this.normalStressField; + } + set { + this.normalStressField = value; + } + } + + /// + [System.Xml.Serialization.XmlAttributeAttribute()] + public double PorePressure { + get { + return this.porePressureField; + } + set { + this.porePressureField = value; + } + } + + /// + [System.Xml.Serialization.XmlAttributeAttribute()] + public double HorizontalPorePressure { + get { + return this.horizontalPorePressureField; + } + set { + this.horizontalPorePressureField = value; + } + } + + /// + [System.Xml.Serialization.XmlAttributeAttribute()] + public double VerticalPorePressure { + get { + return this.verticalPorePressureField; + } + set { + this.verticalPorePressureField = value; + } + } + + /// + [System.Xml.Serialization.XmlAttributeAttribute()] + public double PiezometricPorePressure { + get { + return this.piezometricPorePressureField; + } + set { + this.piezometricPorePressureField = value; + } + } + + /// + [System.Xml.Serialization.XmlAttributeAttribute()] + public double EffectiveStress { + get { + return this.effectiveStressField; + } + set { + this.effectiveStressField = value; + } + } + + /// + [System.Xml.Serialization.XmlAttributeAttribute()] + public double ExcessPorePressure { + get { + return this.excessPorePressureField; + } + set { + this.excessPorePressureField = value; + } + } + + /// + [System.Xml.Serialization.XmlAttributeAttribute()] + public double ShearStress { + get { + return this.shearStressField; + } + set { + this.shearStressField = value; + } + } + + /// + [System.Xml.Serialization.XmlAttributeAttribute()] + public double SoilStress { + get { + return this.soilStressField; + } + set { + this.soilStressField = value; + } + } + + /// + [System.Xml.Serialization.XmlAttributeAttribute()] + public double TotalPorePressure { + get { + return this.totalPorePressureField; + } + set { + this.totalPorePressureField = value; + } + } + + /// + [System.Xml.Serialization.XmlAttributeAttribute()] + public double TotalStress { + get { + return this.totalStressField; + } + set { + this.totalStressField = value; + } + } + + /// + [System.Xml.Serialization.XmlAttributeAttribute()] + public double Weight { + get { + return this.weightField; + } + set { + this.weightField = value; + } + } + + /// + [System.Xml.Serialization.XmlAttributeAttribute()] + public double Su { + get { + return this.suField; + } + set { + this.suField = value; + } + } + + /// + [System.Xml.Serialization.XmlIgnoreAttribute()] + public bool SuSpecified { + get { + return this.suFieldSpecified; + } + set { + this.suFieldSpecified = value; + } + } + + /// + [System.Xml.Serialization.XmlAttributeAttribute()] + public ShearStrengthModelType ShearStrengthModel { + get { + return this.shearStrengthModelField; + } + set { + this.shearStrengthModelField = value; + } + } + + /// + [System.Xml.Serialization.XmlAttributeAttribute()] + public double HorizontalSoilQuakeStress { + get { + return this.horizontalSoilQuakeStressField; + } + set { + this.horizontalSoilQuakeStressField = value; + } + } + + /// + [System.Xml.Serialization.XmlIgnoreAttribute()] + public bool HorizontalSoilQuakeStressSpecified { + get { + return this.horizontalSoilQuakeStressFieldSpecified; + } + set { + this.horizontalSoilQuakeStressFieldSpecified = value; + } + } + + /// + [System.Xml.Serialization.XmlAttributeAttribute()] + public double StrengthIncreaseExponent { + get { + return this.strengthIncreaseExponentField; + } + set { + this.strengthIncreaseExponentField = value; + } + } + + /// + [System.Xml.Serialization.XmlIgnoreAttribute()] + public bool StrengthIncreaseExponentSpecified { + get { + return this.strengthIncreaseExponentFieldSpecified; + } + set { + this.strengthIncreaseExponentFieldSpecified = value; + } + } + + /// + [System.Xml.Serialization.XmlAttributeAttribute()] + public double UpliftFactor { + get { + return this.upliftFactorField; + } + set { + this.upliftFactorField = value; + } + } + + /// + [System.Xml.Serialization.XmlIgnoreAttribute()] + public bool UpliftFactorSpecified { + get { + return this.upliftFactorFieldSpecified; + } + set { + this.upliftFactorFieldSpecified = value; + } + } + + /// + [System.Xml.Serialization.XmlAttributeAttribute()] + public double VerticalSoilQuakeStress { + get { + return this.verticalSoilQuakeStressField; + } + set { + this.verticalSoilQuakeStressField = value; + } + } + + /// + [System.Xml.Serialization.XmlIgnoreAttribute()] + public bool VerticalSoilQuakeStressSpecified { + get { + return this.verticalSoilQuakeStressFieldSpecified; + } + set { + this.verticalSoilQuakeStressFieldSpecified = value; + } + } + + /// + [System.Xml.Serialization.XmlAttributeAttribute()] + public double WaterQuakeStress { + get { + return this.waterQuakeStressField; + } + set { + this.waterQuakeStressField = value; + } + } + + /// + [System.Xml.Serialization.XmlIgnoreAttribute()] + public bool WaterQuakeStressSpecified { + get { + return this.waterQuakeStressFieldSpecified; + } + set { + this.waterQuakeStressFieldSpecified = value; + } + } + + /// + [System.Xml.Serialization.XmlAttributeAttribute()] + public double UpliftReductionFactor { + get { + return this.upliftReductionFactorField; + } + set { + this.upliftReductionFactorField = value; + } + } + + /// + [System.Xml.Serialization.XmlIgnoreAttribute()] + public bool UpliftReductionFactorSpecified { + get { + return this.upliftReductionFactorFieldSpecified; + } + set { + this.upliftReductionFactorFieldSpecified = value; + } + } + + /// + [System.Xml.Serialization.XmlAttributeAttribute()] + public double RatioCuPc { + get { + return this.ratioCuPcField; + } + set { + this.ratioCuPcField = value; + } + } + + /// + [System.Xml.Serialization.XmlIgnoreAttribute()] + public bool RatioCuPcSpecified { + get { + return this.ratioCuPcFieldSpecified; + } + set { + this.ratioCuPcFieldSpecified = value; + } + } + + /// + [System.Xml.Serialization.XmlAttributeAttribute()] + public double ResultantForce { + get { + return this.resultantForceField; + } + set { + this.resultantForceField = value; + } + } + + /// + [System.Xml.Serialization.XmlIgnoreAttribute()] + public bool ResultantForceSpecified { + get { + return this.resultantForceFieldSpecified; + } + set { + this.resultantForceFieldSpecified = value; + } + } + + /// + [System.Xml.Serialization.XmlAttributeAttribute()] + public double ResultantMoment { + get { + return this.resultantMomentField; + } + set { + this.resultantMomentField = value; + } + } + + /// + [System.Xml.Serialization.XmlIgnoreAttribute()] + public bool ResultantMomentSpecified { + get { + return this.resultantMomentFieldSpecified; + } + set { + this.resultantMomentFieldSpecified = value; + } + } + + /// + [System.Xml.Serialization.XmlAttributeAttribute()] + public double ResultantAngle { + get { + return this.resultantAngleField; + } + set { + this.resultantAngleField = value; + } + } + + /// + [System.Xml.Serialization.XmlIgnoreAttribute()] + public bool ResultantAngleSpecified { + get { + return this.resultantAngleFieldSpecified; + } + set { + this.resultantAngleFieldSpecified = value; + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] + [System.SerializableAttribute()] + public enum ShearStrengthModelType { + + /// + MohrCoulomb, + + /// + Shansep, + + /// + SuTable, + } + + /// + [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.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public abstract partial class MinimumSafetyCurveBaseType { + + private MinimumSafetyCurveBaseTypeSlice[] slicesField; + + private double safetyFactorField; + + /// + [System.Xml.Serialization.XmlArrayItemAttribute("Slice", IsNullable=false)] + public MinimumSafetyCurveBaseTypeSlice[] Slices { + get { + return this.slicesField; + } + set { + this.slicesField = 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")] + [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)] + public partial class MinimumSafetyCurveBaseTypeSlice : SliceType { + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class SlidingPlaneMinimumSafetyCurveType : MinimumSafetyCurveBaseType { + + private Point2DType[] spencerSlipPlaneField; + + /// + [System.Xml.Serialization.XmlArrayItemAttribute("SlipPlanePoint", IsNullable=false)] + public Point2DType[] SpencerSlipPlane { + get { + return this.spencerSlipPlaneField; + } + set { + this.spencerSlipPlaneField = value; + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class DualSlidingCircleMinimumSafetyCurveType : MinimumSafetyCurveBaseType { + + private Point2DType activeCircleCenterField; + + private double activeCircleRadiusField; + + private Point2DType passiveCircleCenterField; + + private double passiveCircleRadiusField; + + private double nailMomentField; + + private bool nailMomentFieldSpecified; + + private double geoTextileMomentField; + + private bool geoTextileMomentFieldSpecified; + + private double resistingPassiveMomentField; + + private bool resistingPassiveMomentFieldSpecified; + + private double resistingActiveMomentField; + + private bool resistingActiveMomentFieldSpecified; + + private double drivingPassiveMomentField; + + private bool drivingPassiveMomentFieldSpecified; + + private double drivingActiveMomentField; + + private bool drivingActiveMomentFieldSpecified; + + private double iteratedPassiveForceField; + + private bool iteratedPassiveForceFieldSpecified; + + private double iteratedActiveForceField; + + private bool iteratedActiveForceFieldSpecified; + + private double iteratedHorizontalForceField; + + private bool iteratedHorizontalForceFieldSpecified; + + private double nonIteratedPassiveForceField; + + private bool nonIteratedPassiveForceFieldSpecified; + + private double nonIteratedActiveForceField; + + private bool nonIteratedActiveForceFieldSpecified; + + private double tangentLineField; + + private double nonIteratedHorizontalForceField; + + private bool nonIteratedHorizontalForceFieldSpecified; + + /// + public Point2DType ActiveCircleCenter { + get { + return this.activeCircleCenterField; + } + set { + this.activeCircleCenterField = value; + } + } + + /// + public double ActiveCircleRadius { + get { + return this.activeCircleRadiusField; + } + set { + this.activeCircleRadiusField = value; + } + } + + /// + public Point2DType PassiveCircleCenter { + get { + return this.passiveCircleCenterField; + } + set { + this.passiveCircleCenterField = value; + } + } + + /// + public double PassiveCircleRadius { + get { + return this.passiveCircleRadiusField; + } + set { + this.passiveCircleRadiusField = value; + } + } + + /// + [System.Xml.Serialization.XmlAttributeAttribute()] + public double NailMoment { + get { + return this.nailMomentField; + } + set { + this.nailMomentField = value; + } + } + + /// + [System.Xml.Serialization.XmlIgnoreAttribute()] + public bool NailMomentSpecified { + get { + return this.nailMomentFieldSpecified; + } + set { + this.nailMomentFieldSpecified = value; + } + } + + /// + [System.Xml.Serialization.XmlAttributeAttribute()] + public double GeoTextileMoment { + get { + return this.geoTextileMomentField; + } + set { + this.geoTextileMomentField = value; + } + } + + /// + [System.Xml.Serialization.XmlIgnoreAttribute()] + public bool GeoTextileMomentSpecified { + get { + return this.geoTextileMomentFieldSpecified; + } + set { + this.geoTextileMomentFieldSpecified = value; + } + } + + /// + [System.Xml.Serialization.XmlAttributeAttribute()] + public double ResistingPassiveMoment { + get { + return this.resistingPassiveMomentField; + } + set { + this.resistingPassiveMomentField = value; + } + } + + /// + [System.Xml.Serialization.XmlIgnoreAttribute()] + public bool ResistingPassiveMomentSpecified { + get { + return this.resistingPassiveMomentFieldSpecified; + } + set { + this.resistingPassiveMomentFieldSpecified = value; + } + } + + /// + [System.Xml.Serialization.XmlAttributeAttribute()] + public double ResistingActiveMoment { + get { + return this.resistingActiveMomentField; + } + set { + this.resistingActiveMomentField = value; + } + } + + /// + [System.Xml.Serialization.XmlIgnoreAttribute()] + public bool ResistingActiveMomentSpecified { + get { + return this.resistingActiveMomentFieldSpecified; + } + set { + this.resistingActiveMomentFieldSpecified = value; + } + } + + /// + [System.Xml.Serialization.XmlAttributeAttribute()] + public double DrivingPassiveMoment { + get { + return this.drivingPassiveMomentField; + } + set { + this.drivingPassiveMomentField = value; + } + } + + /// + [System.Xml.Serialization.XmlIgnoreAttribute()] + public bool DrivingPassiveMomentSpecified { + get { + return this.drivingPassiveMomentFieldSpecified; + } + set { + this.drivingPassiveMomentFieldSpecified = value; + } + } + + /// + [System.Xml.Serialization.XmlAttributeAttribute()] + public double DrivingActiveMoment { + get { + return this.drivingActiveMomentField; + } + set { + this.drivingActiveMomentField = value; + } + } + + /// + [System.Xml.Serialization.XmlIgnoreAttribute()] + public bool DrivingActiveMomentSpecified { + get { + return this.drivingActiveMomentFieldSpecified; + } + set { + this.drivingActiveMomentFieldSpecified = value; + } + } + + /// + [System.Xml.Serialization.XmlAttributeAttribute()] + public double IteratedPassiveForce { + get { + return this.iteratedPassiveForceField; + } + set { + this.iteratedPassiveForceField = value; + } + } + + /// + [System.Xml.Serialization.XmlIgnoreAttribute()] + public bool IteratedPassiveForceSpecified { + get { + return this.iteratedPassiveForceFieldSpecified; + } + set { + this.iteratedPassiveForceFieldSpecified = value; + } + } + + /// + [System.Xml.Serialization.XmlAttributeAttribute()] + public double IteratedActiveForce { + get { + return this.iteratedActiveForceField; + } + set { + this.iteratedActiveForceField = value; + } + } + + /// + [System.Xml.Serialization.XmlIgnoreAttribute()] + public bool IteratedActiveForceSpecified { + get { + return this.iteratedActiveForceFieldSpecified; + } + set { + this.iteratedActiveForceFieldSpecified = value; + } + } + + /// + [System.Xml.Serialization.XmlAttributeAttribute()] + public double IteratedHorizontalForce { + get { + return this.iteratedHorizontalForceField; + } + set { + this.iteratedHorizontalForceField = value; + } + } + + /// + [System.Xml.Serialization.XmlIgnoreAttribute()] + public bool IteratedHorizontalForceSpecified { + get { + return this.iteratedHorizontalForceFieldSpecified; + } + set { + this.iteratedHorizontalForceFieldSpecified = value; + } + } + + /// + [System.Xml.Serialization.XmlAttributeAttribute()] + public double NonIteratedPassiveForce { + get { + return this.nonIteratedPassiveForceField; + } + set { + this.nonIteratedPassiveForceField = value; + } + } + + /// + [System.Xml.Serialization.XmlIgnoreAttribute()] + public bool NonIteratedPassiveForceSpecified { + get { + return this.nonIteratedPassiveForceFieldSpecified; + } + set { + this.nonIteratedPassiveForceFieldSpecified = value; + } + } + + /// + [System.Xml.Serialization.XmlAttributeAttribute()] + public double NonIteratedActiveForce { + get { + return this.nonIteratedActiveForceField; + } + set { + this.nonIteratedActiveForceField = value; + } + } + + /// + [System.Xml.Serialization.XmlIgnoreAttribute()] + public bool NonIteratedActiveForceSpecified { + get { + return this.nonIteratedActiveForceFieldSpecified; + } + set { + this.nonIteratedActiveForceFieldSpecified = value; + } + } + + /// + [System.Xml.Serialization.XmlAttributeAttribute()] + public double TangentLine { + get { + return this.tangentLineField; + } + set { + this.tangentLineField = value; + } + } + + /// + [System.Xml.Serialization.XmlAttributeAttribute()] + public double NonIteratedHorizontalForce { + get { + return this.nonIteratedHorizontalForceField; + } + set { + this.nonIteratedHorizontalForceField = value; + } + } + + /// + [System.Xml.Serialization.XmlIgnoreAttribute()] + public bool NonIteratedHorizontalForceSpecified { + get { + return this.nonIteratedHorizontalForceFieldSpecified; + } + set { + this.nonIteratedHorizontalForceFieldSpecified = value; + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class SlidingCircleMinimumSafetyCurveType : MinimumSafetyCurveBaseType { + + private Point2DType centerField; + + private double radiusField; + + private double drivingMomentField; + + private double loadMomentField; + + private bool loadMomentFieldSpecified; + + private double earthquakeMomentField; + + private bool earthquakeMomentFieldSpecified; + + private double horizontalEarthquakeMomentField; + + private bool horizontalEarthquakeMomentFieldSpecified; + + private double verticalEarthquakeMomentField; + + private bool verticalEarthquakeMomentFieldSpecified; + + private double freeWaterEarthquakeMomentField; + + private bool freeWaterEarthquakeMomentFieldSpecified; + + private double resistingMomentField; + + private double nonIteratedResistingMomentField; + + private bool nonIteratedResistingMomentFieldSpecified; + + private double soilMomentField; + + private bool soilMomentFieldSpecified; + + private double waterMomentField; + + private bool waterMomentFieldSpecified; + + private double nailMomentField; + + private bool nailMomentFieldSpecified; + + private double geoTextileMomentField; + + private bool geoTextileMomentFieldSpecified; + + /// + public Point2DType Center { + get { + return this.centerField; + } + set { + this.centerField = value; + } + } + + /// + public double Radius { + get { + return this.radiusField; + } + set { + this.radiusField = value; + } + } + + /// + [System.Xml.Serialization.XmlAttributeAttribute()] + public double DrivingMoment { + get { + return this.drivingMomentField; + } + set { + this.drivingMomentField = value; + } + } + + /// + [System.Xml.Serialization.XmlAttributeAttribute()] + public double LoadMoment { + get { + return this.loadMomentField; + } + set { + this.loadMomentField = value; + } + } + + /// + [System.Xml.Serialization.XmlIgnoreAttribute()] + public bool LoadMomentSpecified { + get { + return this.loadMomentFieldSpecified; + } + set { + this.loadMomentFieldSpecified = value; + } + } + + /// + [System.Xml.Serialization.XmlAttributeAttribute()] + public double EarthquakeMoment { + get { + return this.earthquakeMomentField; + } + set { + this.earthquakeMomentField = value; + } + } + + /// + [System.Xml.Serialization.XmlIgnoreAttribute()] + public bool EarthquakeMomentSpecified { + get { + return this.earthquakeMomentFieldSpecified; + } + set { + this.earthquakeMomentFieldSpecified = value; + } + } + + /// + [System.Xml.Serialization.XmlAttributeAttribute()] + public double HorizontalEarthquakeMoment { + get { + return this.horizontalEarthquakeMomentField; + } + set { + this.horizontalEarthquakeMomentField = value; + } + } + + /// + [System.Xml.Serialization.XmlIgnoreAttribute()] + public bool HorizontalEarthquakeMomentSpecified { + get { + return this.horizontalEarthquakeMomentFieldSpecified; + } + set { + this.horizontalEarthquakeMomentFieldSpecified = value; + } + } + + /// + [System.Xml.Serialization.XmlAttributeAttribute()] + public double VerticalEarthquakeMoment { + get { + return this.verticalEarthquakeMomentField; + } + set { + this.verticalEarthquakeMomentField = value; + } + } + + /// + [System.Xml.Serialization.XmlIgnoreAttribute()] + public bool VerticalEarthquakeMomentSpecified { + get { + return this.verticalEarthquakeMomentFieldSpecified; + } + set { + this.verticalEarthquakeMomentFieldSpecified = value; + } + } + + /// + [System.Xml.Serialization.XmlAttributeAttribute()] + public double FreeWaterEarthquakeMoment { + get { + return this.freeWaterEarthquakeMomentField; + } + set { + this.freeWaterEarthquakeMomentField = value; + } + } + + /// + [System.Xml.Serialization.XmlIgnoreAttribute()] + public bool FreeWaterEarthquakeMomentSpecified { + get { + return this.freeWaterEarthquakeMomentFieldSpecified; + } + set { + this.freeWaterEarthquakeMomentFieldSpecified = value; + } + } + + /// + [System.Xml.Serialization.XmlAttributeAttribute()] + public double ResistingMoment { + get { + return this.resistingMomentField; + } + set { + this.resistingMomentField = value; + } + } + + /// + [System.Xml.Serialization.XmlAttributeAttribute()] + public double NonIteratedResistingMoment { + get { + return this.nonIteratedResistingMomentField; + } + set { + this.nonIteratedResistingMomentField = value; + } + } + + /// + [System.Xml.Serialization.XmlIgnoreAttribute()] + public bool NonIteratedResistingMomentSpecified { + get { + return this.nonIteratedResistingMomentFieldSpecified; + } + set { + this.nonIteratedResistingMomentFieldSpecified = value; + } + } + + /// + [System.Xml.Serialization.XmlAttributeAttribute()] + public double SoilMoment { + get { + return this.soilMomentField; + } + set { + this.soilMomentField = value; + } + } + + /// + [System.Xml.Serialization.XmlIgnoreAttribute()] + public bool SoilMomentSpecified { + get { + return this.soilMomentFieldSpecified; + } + set { + this.soilMomentFieldSpecified = value; + } + } + + /// + [System.Xml.Serialization.XmlAttributeAttribute()] + public double WaterMoment { + get { + return this.waterMomentField; + } + set { + this.waterMomentField = value; + } + } + + /// + [System.Xml.Serialization.XmlIgnoreAttribute()] + public bool WaterMomentSpecified { + get { + return this.waterMomentFieldSpecified; + } + set { + this.waterMomentFieldSpecified = value; + } + } + + /// + [System.Xml.Serialization.XmlAttributeAttribute()] + public double NailMoment { + get { + return this.nailMomentField; + } + set { + this.nailMomentField = value; + } + } + + /// + [System.Xml.Serialization.XmlIgnoreAttribute()] + public bool NailMomentSpecified { + get { + return this.nailMomentFieldSpecified; + } + set { + this.nailMomentFieldSpecified = value; + } + } + + /// + [System.Xml.Serialization.XmlAttributeAttribute()] + public double GeoTextileMoment { + get { + return this.geoTextileMomentField; + } + set { + this.geoTextileMomentField = value; + } + } + + /// + [System.Xml.Serialization.XmlIgnoreAttribute()] + public bool GeoTextileMomentSpecified { + get { + return this.geoTextileMomentFieldSpecified; + } + set { + this.geoTextileMomentFieldSpecified = value; + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] public partial class SurfaceLine { private SurfaceLinePoint[] pointsField; @@ -999,7 +2675,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -1047,7 +2723,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] [System.SerializableAttribute()] [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)] public enum DesignResultStabilityDesignResultsStabilityModelType { @@ -1063,7 +2739,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] Index: DamEngine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlOutput.cs =================================================================== diff -u -r2873 -r3405 --- DamEngine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlOutput.cs (.../FillDamFromXmlOutput.cs) (revision 2873) +++ DamEngine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlOutput.cs (.../FillDamFromXmlOutput.cs) (revision 3405) @@ -20,7 +20,6 @@ // All rights reserved. using System.Collections.Generic; -using System.Linq; using Deltares.DamEngine.Data.General; using Deltares.DamEngine.Data.General.Results; using Deltares.DamEngine.Data.General.TimeSeries; @@ -300,6 +299,25 @@ { desResult.StabilityDesignResults.StabilityModelType = ConversionHelper.ConvertToStabilityModelType(designResult.StabilityDesignResults.StabilityModelType); } + + if (designResult.StabilityDesignResults.SlipCircleDefinition != null) + { + switch (designResult.StabilityDesignResults.StabilityModelType) + { + case DesignResultStabilityDesignResultsStabilityModelType.Bishop: + var sl = (SlidingCircleMinimumSafetyCurveType)designResult.StabilityDesignResults.SlipCircleDefinition; + desResult.StabilityDesignResults.ActiveCenterPoint = new Point2D(sl.Center.X, sl.Center.Z); + desResult.StabilityDesignResults.ActiveCenterPointRadius = sl.Radius; + break; + case DesignResultStabilityDesignResultsStabilityModelType.UpliftVan: + var dsl = (DualSlidingCircleMinimumSafetyCurveType)designResult.StabilityDesignResults.SlipCircleDefinition; + desResult.StabilityDesignResults.ActiveCenterPoint = new Point2D(dsl.ActiveCircleCenter.X, dsl.ActiveCircleCenter.Z); + desResult.StabilityDesignResults.ActiveCenterPointRadius = dsl.ActiveCircleRadius; + desResult.StabilityDesignResults.PassiveCenterPoint = new Point2D(dsl.PassiveCircleCenter.X, dsl.PassiveCircleCenter.Z); + desResult.StabilityDesignResults.PassiveCenterPointRadius = dsl.PassiveCircleRadius; + break; + } + } } } } Index: DamEngine/trunk/xsd/DamDesignResult.xsd =================================================================== diff -u -r3399 -r3405 --- DamEngine/trunk/xsd/DamDesignResult.xsd (.../DamDesignResult.xsd) (revision 3399) +++ DamEngine/trunk/xsd/DamDesignResult.xsd (.../DamDesignResult.xsd) (revision 3405) @@ -23,7 +23,6 @@ -