Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamMacroStabilityCommon/TestData/test.xml
===================================================================
diff -u -r1970 -r2231
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamMacroStabilityCommon/TestData/test.xml (.../test.xml) (revision 1970)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamMacroStabilityCommon/TestData/test.xml (.../test.xml) (revision 2231)
@@ -94,7 +94,7 @@
-
+
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityCommon/MStabXmlDoc.cs
===================================================================
diff -u -r2127 -r2231
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityCommon/MStabXmlDoc.cs (.../MStabXmlDoc.cs) (revision 2127)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityCommon/MStabXmlDoc.cs (.../MStabXmlDoc.cs) (revision 2231)
@@ -115,6 +115,7 @@
failureMechanismParametersMStab.RiverLevel = riverLevelHigh;
failureMechanismParametersMStab.DikeTableHeight = location.SurfaceLine.GetDefaultDikeTableHeight() ?? 0;
failureMechanismParametersMStab.TrafficLoad = location.StabilityOptions.TrafficLoad ?? 0;
+ failureMechanismParametersMStab.TrafficLoadDegreeOfConsolidation = location.StabilityOptions.TrafficLoadDegreeOfConsolidation;
// Horizontal balance;
if (failureMechanismParametersMStab.MStabParameters.Model == MStabModelType.HorizontalBalance)
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamMacroStabilityCommon/DamMStabAssemblerTest.cs
===================================================================
diff -u -r2166 -r2231
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamMacroStabilityCommon/DamMStabAssemblerTest.cs (.../DamMStabAssemblerTest.cs) (revision 2166)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamMacroStabilityCommon/DamMStabAssemblerTest.cs (.../DamMStabAssemblerTest.cs) (revision 2231)
@@ -653,13 +653,17 @@
assembler = new DamMStabAssembler();
surfaceLine1.EnsurePointOfType(30.1, 8.56, CharacteristicPointType.TrafficLoadOutside);
surfaceLine1.EnsurePointOfType(31.2, 8.62, CharacteristicPointType.TrafficLoadInside);
+ damFailureMechanismeCalculationSpecification.FailureMechanismParametersMStab.TrafficLoad = 11.1;
+ damFailureMechanismeCalculationSpecification.FailureMechanismParametersMStab.TrafficLoadDegreeOfConsolidation = 48.5;
var doc = assembler.CreateDataTransferObject(damFailureMechanismeCalculationSpecification.FailureMechanismParametersMStab);
var element = doc.GetFirstOrDefaultElementByLocalName(DamMStabAssembler.XmlElementTrafficLoad);
Assert.IsNotNull(element);
Assert.AreEqual(1, element.Attributes("XCoordinateAtRiver").Count());
Assert.AreEqual(1, element.Attributes("XCoordinateAtPolder").Count());
Assert.AreEqual(1, element.Attributes("Load").Count());
+ Assert.AreEqual(1, element.Attributes("DegreeOfConsolidationSpecified").Count());
+ Assert.AreEqual(1, element.Attributes("DegreeOfConsolidation").Count());
}
///
Index: DamEngine/trunk/src/Deltares.DamEngine.Data/General/FailureMechanismParametersMStab.cs
===================================================================
diff -u -r1974 -r2231
--- DamEngine/trunk/src/Deltares.DamEngine.Data/General/FailureMechanismParametersMStab.cs (.../FailureMechanismParametersMStab.cs) (revision 1974)
+++ DamEngine/trunk/src/Deltares.DamEngine.Data/General/FailureMechanismParametersMStab.cs (.../FailureMechanismParametersMStab.cs) (revision 2231)
@@ -76,6 +76,7 @@
public double RiverLevelDecimateHeight { get; set; }
public double RequiredProbabilityOfFailure { get; set; }
public double TrafficLoad { get; set; }
+ public double? TrafficLoadDegreeOfConsolidation { get; set; }
///
/// Indicates whether in stability calculation a check on uplift will be performed before performin UpliftVan calculation.
/// Default it is false (set in constructor)
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamMacroStabilityCommon/MStabXmlDocTests.cs
===================================================================
diff -u -r2173 -r2231
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamMacroStabilityCommon/MStabXmlDocTests.cs (.../MStabXmlDocTests.cs) (revision 2173)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamMacroStabilityCommon/MStabXmlDocTests.cs (.../MStabXmlDocTests.cs) (revision 2231)
@@ -50,6 +50,7 @@
// Expected1D1.xml was generated with Dam Classic revision 745 with test CanCalculateStabilitySafetyFactorGeometry2D
// In the file that is generated here sometimes value -0 is written instead of 0.
// To compare the two files in an easy way, Expected1D1.xml was manually modified
+ // For issue MWDAM-1452 values for traffic load were manually added in Expected1D1.xml in rev. 2231
var expectedxmlFileName = Path.Combine(TestFolder, "Expected1D1.xml");
var soilGeometry2DName = Path.Combine(TestFolder, "1D1.sti");
var soilDbName = Path.Combine(TestFolder, "soilmaterials.mdb");
@@ -60,11 +61,12 @@
File.Delete(xmlFileName);
}
- var line = FactoryForSurfaceLines.CreateSurfaceLineTutorial1();
+ var line = FactoryForSurfaceLines.CreateSurfaceLineTutorial1(true);
var location = DamMacroStabilityTestHelper.CreateLocation(line);
var scenario = DamMacroStabilityTestHelper.CreateScenario(location);
scenario.Location.StabilityOptions = new StabilityOptions();
scenario.Location.StabilityOptions.TrafficLoad = 10.0;
+ scenario.Location.StabilityOptions.TrafficLoadDegreeOfConsolidation = 49.5;
scenario.Location.StabilityOptions.MinimalCircleDepth = 1.0;
scenario.Location.StabilityOptions.SoilDatabaseName = soilDbName;
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamMacroStabilityCommon/TestData/Expected1D1.xml
===================================================================
diff -u -r877 -r2231
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamMacroStabilityCommon/TestData/Expected1D1.xml (.../Expected1D1.xml) (revision 877)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamMacroStabilityCommon/TestData/Expected1D1.xml (.../Expected1D1.xml) (revision 2231)
@@ -6,6 +6,8 @@
+
+
@@ -18,6 +20,8 @@
+
+
@@ -51,6 +55,7 @@
+
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityCommon/Xsd/DamMStabInputDefinition.xsd
===================================================================
diff -u -r1965 -r2231
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityCommon/Xsd/DamMStabInputDefinition.xsd (.../DamMStabInputDefinition.xsd) (revision 1965)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityCommon/Xsd/DamMStabInputDefinition.xsd (.../DamMStabInputDefinition.xsd) (revision 2231)
@@ -133,6 +133,8 @@
+
+
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityCommon/Assemblers/DamMStabAssembler.cs
===================================================================
diff -u -r2111 -r2231
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityCommon/Assemblers/DamMStabAssembler.cs (.../DamMStabAssembler.cs) (revision 2111)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityCommon/Assemblers/DamMStabAssembler.cs (.../DamMStabAssembler.cs) (revision 2231)
@@ -116,6 +116,8 @@
public const string XmlAttributeXCoordinateAtRiver = "XCoordinateAtRiver";
public const string XmlAttributeXCoordinateAtPolder = "XCoordinateAtPolder";
public const string XmlAttributeLoad = "Load";
+ public const string XmlAttributeDegreeOfConsolidationSpecified = "DegreeOfConsolidationSpecified";
+ public const string XmlAttributeDegreeOfConsolidation = "DegreeOfConsolidation";
///
/// Holds the CalculationOptions xml element and attribute names
@@ -549,7 +551,9 @@
SurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.TrafficLoadOutside).X),
new XAttribute(XmlAttributeXCoordinateAtPolder, failureMechanismParametersMStab.
SurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.TrafficLoadInside).X),
- new XAttribute(XmlAttributeLoad, failureMechanismParametersMStab.TrafficLoad)
+ new XAttribute(XmlAttributeLoad, failureMechanismParametersMStab.TrafficLoad),
+ new XAttribute(XmlAttributeDegreeOfConsolidationSpecified, failureMechanismParametersMStab.TrafficLoadDegreeOfConsolidation != null),
+ new XAttribute(XmlAttributeDegreeOfConsolidation, failureMechanismParametersMStab.TrafficLoadDegreeOfConsolidation ?? 0.0)
);
}