Index: DamEngine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlInput.cs =================================================================== diff -u -r2173 -r2211 --- DamEngine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlInput.cs (.../FillDamFromXmlInput.cs) (revision 2173) +++ DamEngine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlInput.cs (.../FillDamFromXmlInput.cs) (revision 2211) @@ -608,6 +608,10 @@ { location.StabilityOptions.TrafficLoad = inputLocation.StabilityOptions.TrafficLoad; } + if (inputLocation.StabilityOptions.TrafficLoadDegreeOfConsolidationSpecified) + { + location.StabilityOptions.TrafficLoadDegreeOfConsolidation = inputLocation.StabilityOptions.TrafficLoadDegreeOfConsolidation; + } if (inputLocation.StabilityOptions.MinimumCircleDepthSpecified) { location.StabilityOptions.MinimalCircleDepth = inputLocation.StabilityOptions.MinimumCircleDepth; Index: DamEngine/trunk/src/Deltares.DamEngine.Data/General/StabilityOptions.cs =================================================================== diff -u -r1974 -r2211 --- DamEngine/trunk/src/Deltares.DamEngine.Data/General/StabilityOptions.cs (.../StabilityOptions.cs) (revision 1974) +++ DamEngine/trunk/src/Deltares.DamEngine.Data/General/StabilityOptions.cs (.../StabilityOptions.cs) (revision 2211) @@ -27,6 +27,7 @@ private double? zoneAreaRestSlopeCrestWidth = 3.0; private double? minimalCircleDepth = 0; private double? trafficLoad = 0; + private double? trafficLoadDegreeOfConsolidation; /// /// Gets or sets the map for soilgeometries2d (sti-files). @@ -107,6 +108,21 @@ } } + /// Gets or sets the degree of consolidation for the traffic load. + /// The degree of consolidation for traffic load. + public double? TrafficLoadDegreeOfConsolidation + + { + get + { + return trafficLoadDegreeOfConsolidation; + } + set + { + trafficLoadDegreeOfConsolidation = value; + } + } + /// /// Gets or sets the minimal circle depth. /// Index: DamEngine/trunk/src/Deltares.DamEngine.TestHelpers/Factories/FactoryForDamProjectData.cs =================================================================== diff -u -r2173 -r2211 --- DamEngine/trunk/src/Deltares.DamEngine.TestHelpers/Factories/FactoryForDamProjectData.cs (.../FactoryForDamProjectData.cs) (revision 2173) +++ DamEngine/trunk/src/Deltares.DamEngine.TestHelpers/Factories/FactoryForDamProjectData.cs (.../FactoryForDamProjectData.cs) (revision 2211) @@ -378,10 +378,11 @@ { SoilGeometries2DPath = Path.Combine(projectPath, @"Sub\TestMap"), StabilityZoneType = MStabZonesType.ZoneAreas, - ForbiddenZoneFactor = 1.23, - ZoneAreaRestSlopeCrestWidth = 8.23, - TrafficLoad = 11.11, - MinimalCircleDepth = 1.21, + ForbiddenZoneFactor = 10.0 * i + 0.42, + ZoneAreaRestSlopeCrestWidth = 10.0 * i + 0.43, + TrafficLoad = 10.0 * i + 0.44, + TrafficLoadDegreeOfConsolidation = 10.0 * i + 0.45, + MinimalCircleDepth = 10.0 * i + 0.46, SoilDatabaseName = "test.mdb", }; location.RedesignDikeHeight = false; Index: DamEngine/trunk/xsd/DamLocation.xsd =================================================================== diff -u -r2166 -r2211 --- DamEngine/trunk/xsd/DamLocation.xsd (.../DamLocation.xsd) (revision 2166) +++ DamEngine/trunk/xsd/DamLocation.xsd (.../DamLocation.xsd) (revision 2211) @@ -139,6 +139,7 @@ + Index: DamEngine/trunk/src/Deltares.DamEngine.Interface/FillXmlInputFromDam.cs =================================================================== diff -u -r2173 -r2211 --- DamEngine/trunk/src/Deltares.DamEngine.Interface/FillXmlInputFromDam.cs (.../FillXmlInputFromDam.cs) (revision 2173) +++ DamEngine/trunk/src/Deltares.DamEngine.Interface/FillXmlInputFromDam.cs (.../FillXmlInputFromDam.cs) (revision 2211) @@ -632,6 +632,11 @@ { inputLocation.StabilityOptions.TrafficLoad = location.StabilityOptions.TrafficLoad.Value; } + inputLocation.StabilityOptions.TrafficLoadDegreeOfConsolidationSpecified = location.StabilityOptions.TrafficLoadDegreeOfConsolidation.HasValue; + if (inputLocation.StabilityOptions.TrafficLoadDegreeOfConsolidationSpecified) + { + inputLocation.StabilityOptions.TrafficLoadDegreeOfConsolidation = location.StabilityOptions.TrafficLoadDegreeOfConsolidation.Value; + } inputLocation.StabilityOptions.MinimumCircleDepthSpecified = location.StabilityOptions.MinimalCircleDepth.HasValue; if (inputLocation.StabilityOptions.MinimumCircleDepthSpecified) { Index: DamEngine/trunk/src/Deltares.DamEngine.Io/DamInput.cs =================================================================== diff -u -r2173 -r2211 --- DamEngine/trunk/src/Deltares.DamEngine.Io/DamInput.cs (.../DamInput.cs) (revision 2173) +++ DamEngine/trunk/src/Deltares.DamEngine.Io/DamInput.cs (.../DamInput.cs) (revision 2211) @@ -4139,6 +4139,10 @@ private bool minimumCircleDepthFieldSpecified; + private double trafficLoadDegreeOfConsolidationField; + + private bool trafficLoadDegreeOfConsolidationFieldSpecified; + /// [System.Xml.Serialization.XmlAttributeAttribute()] public string MapForSoilgeometries2D { @@ -4259,6 +4263,28 @@ this.minimumCircleDepthFieldSpecified = value; } } + + /// + [System.Xml.Serialization.XmlAttributeAttribute()] + public double TrafficLoadDegreeOfConsolidation { + get { + return this.trafficLoadDegreeOfConsolidationField; + } + set { + this.trafficLoadDegreeOfConsolidationField = value; + } + } + + /// + [System.Xml.Serialization.XmlIgnoreAttribute()] + public bool TrafficLoadDegreeOfConsolidationSpecified { + get { + return this.trafficLoadDegreeOfConsolidationFieldSpecified; + } + set { + this.trafficLoadDegreeOfConsolidationFieldSpecified = value; + } + } } ///