Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityOutwards/MacroStabilityOutwardsKernelWrapper.cs =================================================================== diff -u -r5268 -r5372 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityOutwards/MacroStabilityOutwardsKernelWrapper.cs (.../MacroStabilityOutwardsKernelWrapper.cs) (revision 5268) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityOutwards/MacroStabilityOutwardsKernelWrapper.cs (.../MacroStabilityOutwardsKernelWrapper.cs) (revision 5372) @@ -35,6 +35,7 @@ using Deltares.DamEngine.Data.General.Results; using Deltares.DamEngine.Data.Geometry; using Deltares.DamEngine.Data.Geotechnics; +using Deltares.DamEngine.Data.Standard; using Deltares.DamEngine.Data.Standard.Calculation; using Deltares.DamEngine.Data.Standard.Logging; using Deltares.MacroStability.CSharpWrapper; @@ -88,7 +89,8 @@ }; kernelDataOutput = macroStabilityOutput; if (damKernelInput.SubSoilScenario.SegmentFailureMechanismType != null && - damKernelInput.SubSoilScenario.SegmentFailureMechanismType.Value == SegmentFailureMechanismType.Stability) + damKernelInput.SubSoilScenario.SegmentFailureMechanismType.Value.In(SegmentFailureMechanismType.Stability, + SegmentFailureMechanismType.All)) { try { Index: DamEngine/trunk/src/Deltares.DamEngine.Interface/ConversionHelper.cs =================================================================== diff -u -r4562 -r5372 --- DamEngine/trunk/src/Deltares.DamEngine.Interface/ConversionHelper.cs (.../ConversionHelper.cs) (revision 4562) +++ DamEngine/trunk/src/Deltares.DamEngine.Interface/ConversionHelper.cs (.../ConversionHelper.cs) (revision 5372) @@ -62,8 +62,7 @@ public const int InputSegmentFailureMechanismAll = 0; public const int InputSegmentFailureMechanismStability = 1; public const int InputSegmentFailureMechanismPiping = 2; - public const int InputSegmentFailureMechanismLiquefaction = 3; - + /// /// The input zone type no zones /// @@ -737,9 +736,6 @@ }, { SegmentFailureMechanismType.Piping, InputSegmentFailureMechanismPiping - }, - { - SegmentFailureMechanismType.Liquefaction, InputSegmentFailureMechanismLiquefaction } }; return translationTable[segmentFailureMechanismType]; @@ -762,9 +758,6 @@ }, { InputSegmentFailureMechanismPiping, SegmentFailureMechanismType.Piping - }, - { - InputSegmentFailureMechanismLiquefaction, SegmentFailureMechanismType.Liquefaction } }; return translationTable[segmentFailureMechanismSystemType]; Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityInwards/MacroStabilityInwardsKernelWrapper.cs =================================================================== diff -u -r5347 -r5372 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityInwards/MacroStabilityInwardsKernelWrapper.cs (.../MacroStabilityInwardsKernelWrapper.cs) (revision 5347) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityInwards/MacroStabilityInwardsKernelWrapper.cs (.../MacroStabilityInwardsKernelWrapper.cs) (revision 5372) @@ -35,6 +35,7 @@ using Deltares.DamEngine.Data.General.Results; using Deltares.DamEngine.Data.Geometry; using Deltares.DamEngine.Data.Geotechnics; +using Deltares.DamEngine.Data.Standard; using Deltares.DamEngine.Data.Standard.Calculation; using Deltares.DamEngine.Data.Standard.Logging; using Deltares.MacroStability.CSharpWrapper; @@ -90,7 +91,8 @@ }; kernelDataOutput = macroStabilityOutput; if (damKernelInput.SubSoilScenario.SegmentFailureMechanismType != null && - damKernelInput.SubSoilScenario.SegmentFailureMechanismType.Value == SegmentFailureMechanismType.Stability) + damKernelInput.SubSoilScenario.SegmentFailureMechanismType.Value.In(SegmentFailureMechanismType.Stability, + SegmentFailureMechanismType.All)) { try { Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MacroStabilityInwardsTests.cs =================================================================== diff -u -r5370 -r5372 --- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MacroStabilityInwardsTests.cs (.../MacroStabilityInwardsTests.cs) (revision 5370) +++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MacroStabilityInwardsTests.cs (.../MacroStabilityInwardsTests.cs) (revision 5372) @@ -51,7 +51,7 @@ [Test, Category(Categories.Slow)] [Category(Categories.WorkInProgress)] [TestCase(ConversionHelper.InputSegmentFailureMechanismStability)] - //[TestCase(ConversionHelper.InputSegmentFailureMechanismAll)] //ToDo bka: Does not work. Should this be implemented? Or remove it? + [TestCase(ConversionHelper.InputSegmentFailureMechanismAll)] public void TestRunMacroStabilityTutorialDesignBishop(int segmentFailureMechanismType) { // Based on ".data\DamEngineTestProjects\DAM Tutorial Design\DAM Tutorial Design.damx" Index: DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/ConversionHelperTests.cs =================================================================== diff -u -r4624 -r5372 --- DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/ConversionHelperTests.cs (.../ConversionHelperTests.cs) (revision 4624) +++ DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/ConversionHelperTests.cs (.../ConversionHelperTests.cs) (revision 5372) @@ -220,7 +220,6 @@ [TestCase(SegmentFailureMechanismType.All, ConversionHelper.InputSegmentFailureMechanismAll)] [TestCase(SegmentFailureMechanismType.Stability, ConversionHelper.InputSegmentFailureMechanismStability)] [TestCase(SegmentFailureMechanismType.Piping, ConversionHelper.InputSegmentFailureMechanismPiping)] - [TestCase(SegmentFailureMechanismType.Liquefaction, ConversionHelper.InputSegmentFailureMechanismLiquefaction)] public void CanConvertToInputFailureMechanismSystemType(SegmentFailureMechanismType failureMechanismSystemType, int inputFailureMechanismSystemType) { Assert.That(ConversionHelper.ConvertToInputSegmentFailureMechanismSystemType(failureMechanismSystemType), Is.EqualTo(inputFailureMechanismSystemType)); @@ -230,7 +229,6 @@ [TestCase(ConversionHelper.InputSegmentFailureMechanismAll, SegmentFailureMechanismType.All)] [TestCase(ConversionHelper.InputSegmentFailureMechanismStability, SegmentFailureMechanismType.Stability)] [TestCase(ConversionHelper.InputSegmentFailureMechanismPiping, SegmentFailureMechanismType.Piping)] - [TestCase(ConversionHelper.InputSegmentFailureMechanismLiquefaction, SegmentFailureMechanismType.Liquefaction)] public void CanConvertToFailureMechanismSystemType(int inputFailureMechanismSystemType, SegmentFailureMechanismType failureMechanismSystemType) { Assert.That(ConversionHelper.ConvertToSegmentFailureMechanismSystemType(inputFailureMechanismSystemType), Is.EqualTo(failureMechanismSystemType)); Index: DamEngine/trunk/src/Deltares.DamEngine.Data/General/SegmentEnumerations.cs =================================================================== diff -u -r4540 -r5372 --- DamEngine/trunk/src/Deltares.DamEngine.Data/General/SegmentEnumerations.cs (.../SegmentEnumerations.cs) (revision 4540) +++ DamEngine/trunk/src/Deltares.DamEngine.Data/General/SegmentEnumerations.cs (.../SegmentEnumerations.cs) (revision 5372) @@ -28,6 +28,5 @@ { All, Stability, - Piping, - Liquefaction + Piping } \ No newline at end of file