Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityCommon/MacroStabilityIoTests.cs =================================================================== diff -u -r6533 -r6674 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityCommon/MacroStabilityIoTests.cs (.../MacroStabilityIoTests.cs) (revision 6533) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityCommon/MacroStabilityIoTests.cs (.../MacroStabilityIoTests.cs) (revision 6674) @@ -74,7 +74,9 @@ { Pressure = 0.44, XStart = expectedSurfaceLine2D.CharacteristicPoints.GetPoint2D(CharacteristicPointType.TrafficLoadOutside).X, - XEnd = expectedSurfaceLine2D.CharacteristicPoints.GetPoint2D(CharacteristicPointType.TrafficLoadInside).X + XEnd = expectedSurfaceLine2D.CharacteristicPoints.GetPoint2D(CharacteristicPointType.TrafficLoadInside).X, + DistributionAngle = 0.45 + }; var fillMacroStabilityWrapperInputFromEngine = new FillMacroStabilityWrapperInputFromEngine(); var damKernelInput = new DamKernelInput Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/FillMacroStabilityWrapperInputFromEngine.cs =================================================================== diff -u -r6533 -r6674 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/FillMacroStabilityWrapperInputFromEngine.cs (.../FillMacroStabilityWrapperInputFromEngine.cs) (revision 6533) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/FillMacroStabilityWrapperInputFromEngine.cs (.../FillMacroStabilityWrapperInputFromEngine.cs) (revision 6674) @@ -465,7 +465,7 @@ XStart = damTrafficLoad.XStart, XEnd = damTrafficLoad.XEnd, Pressure = damTrafficLoad.Pressure, - DistributionAngle = 0.0 + DistributionAngle = damTrafficLoad.DistributionAngle }); } } Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/TrafficLoad.cs =================================================================== diff -u -r6404 -r6674 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/TrafficLoad.cs (.../TrafficLoad.cs) (revision 6404) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/TrafficLoad.cs (.../TrafficLoad.cs) (revision 6674) @@ -35,4 +35,9 @@ /// Gets or sets the x end. /// The x end. public double XEnd { get; set; } + + /// + /// Gets or sets the distribution angle of the load. + /// + public double DistributionAngle { get; set; } } \ No newline at end of file Index: DamEngine/trunk/src/Deltares.DamEngine.Io/DamInput.cs =================================================================== diff -u -r6216 -r6674 --- DamEngine/trunk/src/Deltares.DamEngine.Io/DamInput.cs (.../DamInput.cs) (revision 6216) +++ DamEngine/trunk/src/Deltares.DamEngine.Io/DamInput.cs (.../DamInput.cs) (revision 6674) @@ -9,14 +9,14 @@ //------------------------------------------------------------------------------ // -// This source code was auto-generated by xsd, Version=4.8.3928.0. +// This source code was auto-generated by xsd, Version=4.8.4084.0. // namespace Deltares.DamEngine.Io.XmlInput { using System.Xml.Serialization; /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -312,7 +312,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -471,7 +471,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -505,7 +505,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -527,7 +527,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -665,7 +665,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -738,7 +738,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -760,7 +760,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")] @@ -910,7 +910,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")] @@ -932,7 +932,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")] @@ -993,7 +993,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")] @@ -1027,7 +1027,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")] @@ -1464,7 +1464,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 StabilityParametersSearchMethod { @@ -1477,7 +1477,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 StabilityParametersBishopSearchAreaDetermination { @@ -1490,7 +1490,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 StabilityParametersUpliftVanGridDetermination { @@ -1503,7 +1503,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 StabilityParametersUpliftVanTangentLinesDefinition { @@ -1519,7 +1519,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")] @@ -1566,7 +1566,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")] @@ -1626,7 +1626,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")] @@ -1661,7 +1661,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")] @@ -1696,7 +1696,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")] @@ -1731,7 +1731,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")] @@ -1792,7 +1792,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")] @@ -1839,7 +1839,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")] @@ -1913,7 +1913,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")] @@ -1947,7 +1947,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")] @@ -2021,7 +2021,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 SegmentSoilGeometryProbabilitySoilProfileType { @@ -2034,7 +2034,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 SegmentSoilGeometryProbabilitySegmentFailureMechanismType { @@ -2050,7 +2050,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")] @@ -2383,7 +2383,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")] @@ -2418,7 +2418,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")] @@ -2453,7 +2453,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")] [System.SerializableAttribute()] [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)] public enum SoilShearStrengthModel { @@ -2472,7 +2472,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")] @@ -2506,7 +2506,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")] @@ -2554,7 +2554,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")] @@ -2966,7 +2966,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")] [System.SerializableAttribute()] [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)] public enum LocationDesignOptionsStabilityDesignMethod { @@ -2979,7 +2979,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")] @@ -3066,7 +3066,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")] [System.SerializableAttribute()] [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)] public enum LocationWaternetOptionsPhreaticLineCreationMethod { @@ -3088,7 +3088,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")] [System.SerializableAttribute()] [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)] public enum LocationWaternetOptionsIntrusionVerticalWaterPressure { @@ -3110,7 +3110,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")] @@ -3210,7 +3210,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")] @@ -3557,7 +3557,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")] @@ -3578,9 +3578,9 @@ private bool minimumCircleDepthFieldSpecified; - private double trafficLoadDegreeOfConsolidationField; + private double trafficLoadDistributionAngleField; - private bool trafficLoadDegreeOfConsolidationFieldSpecified; + private bool trafficLoadDistributionAngleFieldSpecified; /// [System.Xml.Serialization.XmlAttributeAttribute()] @@ -3661,29 +3661,29 @@ /// [System.Xml.Serialization.XmlAttributeAttribute()] - public double TrafficLoadDegreeOfConsolidation { + public double TrafficLoadDistributionAngle { get { - return this.trafficLoadDegreeOfConsolidationField; + return this.trafficLoadDistributionAngleField; } set { - this.trafficLoadDegreeOfConsolidationField = value; + this.trafficLoadDistributionAngleField = value; } } /// [System.Xml.Serialization.XmlIgnoreAttribute()] - public bool TrafficLoadDegreeOfConsolidationSpecified { + public bool TrafficLoadDistributionAngleSpecified { get { - return this.trafficLoadDegreeOfConsolidationFieldSpecified; + return this.trafficLoadDistributionAngleFieldSpecified; } set { - this.trafficLoadDegreeOfConsolidationFieldSpecified = value; + this.trafficLoadDistributionAngleFieldSpecified = 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 LocationStabilityOptionsZoneType { @@ -3696,7 +3696,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")] @@ -3731,7 +3731,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")] @@ -3779,7 +3779,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")] [System.SerializableAttribute()] [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)] public enum InputDamProjectType { @@ -3792,7 +3792,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 InputFailureMechanismSystemType { @@ -3808,7 +3808,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")] [System.SerializableAttribute()] [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)] public enum InputPipingModelType { @@ -3821,7 +3821,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")] [System.SerializableAttribute()] [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)] public enum InputStabilityModelType { @@ -3837,7 +3837,7 @@ } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.4084.0")] [System.SerializableAttribute()] [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)] public enum InputAnalysisType { Index: DamEngine/trunk/src/Deltares.DamEngine.TestHelpers/Factories/FactoryForDamProjectData.cs =================================================================== diff -u -r6523 -r6674 --- DamEngine/trunk/src/Deltares.DamEngine.TestHelpers/Factories/FactoryForDamProjectData.cs (.../FactoryForDamProjectData.cs) (revision 6523) +++ DamEngine/trunk/src/Deltares.DamEngine.TestHelpers/Factories/FactoryForDamProjectData.cs (.../FactoryForDamProjectData.cs) (revision 6674) @@ -381,7 +381,7 @@ StabilityZoneType = StabilityZoneType.ForbiddenZone, ForbiddenZoneFactor = 10.0 * i + 0.42, TrafficLoad = 10.0 * i + 0.44, - TrafficLoadDegreeOfConsolidation = 10.0 * i + 0.45, + TrafficLoadDistributionAngle = 10.0 * i + 0.45, MinimalCircleDepth = 10.0 * i + 0.46 }; location.RedesignDikeHeight = false; Index: DamEngine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlInput.cs =================================================================== diff -u -r6404 -r6674 --- DamEngine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlInput.cs (.../FillDamFromXmlInput.cs) (revision 6404) +++ DamEngine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlInput.cs (.../FillDamFromXmlInput.cs) (revision 6674) @@ -694,9 +694,9 @@ location.StabilityOptions.TrafficLoad = inputLocation.StabilityOptions.TrafficLoad; } - if (inputLocation.StabilityOptions.TrafficLoadDegreeOfConsolidationSpecified) + if (inputLocation.StabilityOptions.TrafficLoadDistributionAngleSpecified) { - location.StabilityOptions.TrafficLoadDegreeOfConsolidation = inputLocation.StabilityOptions.TrafficLoadDegreeOfConsolidation; + location.StabilityOptions.TrafficLoadDistributionAngle = inputLocation.StabilityOptions.TrafficLoadDistributionAngle; } if (inputLocation.StabilityOptions.MinimumCircleDepthSpecified) Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityCommonHelper.cs =================================================================== diff -u -r6673 -r6674 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityCommonHelper.cs (.../MacroStabilityCommonHelper.cs) (revision 6673) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityCommonHelper.cs (.../MacroStabilityCommonHelper.cs) (revision 6674) @@ -102,7 +102,8 @@ XEnd = damKernelInput.Location.SurfaceLine .CharacteristicPoints.GetPoint2D(CharacteristicPointType.TrafficLoadInside).X, XStart = damKernelInput.Location.SurfaceLine - .CharacteristicPoints.GetPoint2D(CharacteristicPointType.TrafficLoadOutside).X + .CharacteristicPoints.GetPoint2D(CharacteristicPointType.TrafficLoadOutside).X, + DistributionAngle = damKernelInput.Location.StabilityOptions.TrafficLoadDistributionAngle.Value }; } Index: DamEngine/trunk/src/Deltares.DamEngine.Interface/FillXmlInputFromDam.cs =================================================================== diff -u -r6404 -r6674 --- DamEngine/trunk/src/Deltares.DamEngine.Interface/FillXmlInputFromDam.cs (.../FillXmlInputFromDam.cs) (revision 6404) +++ DamEngine/trunk/src/Deltares.DamEngine.Interface/FillXmlInputFromDam.cs (.../FillXmlInputFromDam.cs) (revision 6674) @@ -618,10 +618,10 @@ inputLocation.StabilityOptions.TrafficLoad = location.StabilityOptions.TrafficLoad.Value; } - inputLocation.StabilityOptions.TrafficLoadDegreeOfConsolidationSpecified = location.StabilityOptions.TrafficLoadDegreeOfConsolidation.HasValue; - if (inputLocation.StabilityOptions.TrafficLoadDegreeOfConsolidationSpecified) + inputLocation.StabilityOptions.TrafficLoadDistributionAngleSpecified = location.StabilityOptions.TrafficLoadDistributionAngle.HasValue; + if (inputLocation.StabilityOptions.TrafficLoadDistributionAngleSpecified) { - inputLocation.StabilityOptions.TrafficLoadDegreeOfConsolidation = location.StabilityOptions.TrafficLoadDegreeOfConsolidation.Value; + inputLocation.StabilityOptions.TrafficLoadDistributionAngle = location.StabilityOptions.TrafficLoadDistributionAngle.Value; } inputLocation.StabilityOptions.MinimumCircleDepthSpecified = location.StabilityOptions.MinimalCircleDepth.HasValue; Index: DamEngine/trunk/src/Deltares.DamEngine.Data/General/StabilityOptions.cs =================================================================== diff -u -r6404 -r6674 --- DamEngine/trunk/src/Deltares.DamEngine.Data/General/StabilityOptions.cs (.../StabilityOptions.cs) (revision 6404) +++ DamEngine/trunk/src/Deltares.DamEngine.Data/General/StabilityOptions.cs (.../StabilityOptions.cs) (revision 6674) @@ -47,9 +47,9 @@ /// public double? TrafficLoad { get; set; } = 0; - /// Gets or sets the degree of consolidation for the traffic load. - /// The degree of consolidation for traffic load. - public double? TrafficLoadDegreeOfConsolidation { get; set; } + /// Gets or sets the distribution angle of the traffic load. + /// The distribution angle of traffic load. + public double? TrafficLoadDistributionAngle { get; set; } /// /// Gets or sets the minimal circle depth. Index: DamEngine/trunk/xsd/DamLocation.xsd =================================================================== diff -u -r6215 -r6674 --- DamEngine/trunk/xsd/DamLocation.xsd (.../DamLocation.xsd) (revision 6215) +++ DamEngine/trunk/xsd/DamLocation.xsd (.../DamLocation.xsd) (revision 6674) @@ -116,7 +116,7 @@ - + Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/EngineToMacroStabilityKernelInputTests.cs =================================================================== diff -u -r6533 -r6674 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/EngineToMacroStabilityKernelInputTests.cs (.../EngineToMacroStabilityKernelInputTests.cs) (revision 6533) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/EngineToMacroStabilityKernelInputTests.cs (.../EngineToMacroStabilityKernelInputTests.cs) (revision 6674) @@ -183,6 +183,7 @@ Assert.That(actualTrafficLoad.XStart, Is.EqualTo(expectedTrafficLoad.XStart).Within(GeometryConstants.Tolerance)); Assert.That(actualTrafficLoad.XEnd, Is.EqualTo(expectedTrafficLoad.XEnd).Within(GeometryConstants.Tolerance)); Assert.That(actualTrafficLoad.Pressure, Is.EqualTo(expectedTrafficLoad.Pressure).Within(GeometryConstants.Tolerance)); + Assert.That(actualTrafficLoad.DistributionAngle, Is.EqualTo(expectedTrafficLoad.DistributionAngle).Within(GeometryConstants.Tolerance)); }); } Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/FillMacroStabilityKernelInputFromEngine.cs =================================================================== diff -u -r6533 -r6674 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/FillMacroStabilityKernelInputFromEngine.cs (.../FillMacroStabilityKernelInputFromEngine.cs) (revision 6533) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/FillMacroStabilityKernelInputFromEngine.cs (.../FillMacroStabilityKernelInputFromEngine.cs) (revision 6674) @@ -603,7 +603,7 @@ XStart = damTrafficLoad.XStart, XEnd = damTrafficLoad.XEnd, Pressure = damTrafficLoad.Pressure, - DistributionAngle = 0.0, + DistributionAngle = damTrafficLoad.DistributionAngle, Key = registry.GetId(damTrafficLoad) }; kernelUniformLoads[0] = kernelUniformLoad; Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/FillEngineFromMacroStabilityWrapperInput.cs =================================================================== diff -u -r6404 -r6674 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/FillEngineFromMacroStabilityWrapperInput.cs (.../FillEngineFromMacroStabilityWrapperInput.cs) (revision 6404) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/FillEngineFromMacroStabilityWrapperInput.cs (.../FillEngineFromMacroStabilityWrapperInput.cs) (revision 6674) @@ -121,7 +121,8 @@ { XStart = kernelUniformLoad.XStart, XEnd = kernelUniformLoad.XEnd, - Pressure = kernelUniformLoad.Pressure + Pressure = kernelUniformLoad.Pressure, + DistributionAngle = kernelUniformLoad.DistributionAngle }; } }