Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/DikesOperational/OperationalCalculator.cs =================================================================== diff -u -r3522 -r3663 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators/DikesOperational/OperationalCalculator.cs (.../OperationalCalculator.cs) (revision 3522) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/DikesOperational/OperationalCalculator.cs (.../OperationalCalculator.cs) (revision 3663) @@ -354,8 +354,6 @@ string parameter = ""; switch (currentSpecification.FailureMechanismSystemType) { - case FailureMechanismSystemType.HorizontalBalance: - throw new NotImplementedException(); case FailureMechanismSystemType.StabilityOutside: if (currentSpecification.StabilityModelType == MStabModelType.Bishop) { Index: DamEngine/trunk/xsd/DamInput.xsd =================================================================== diff -u -r2111 -r3663 --- DamEngine/trunk/xsd/DamInput.xsd (.../DamInput.xsd) (revision 2111) +++ DamEngine/trunk/xsd/DamInput.xsd (.../DamInput.xsd) (revision 3663) @@ -118,7 +118,6 @@ - @@ -138,7 +137,6 @@ - Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/Common/KernelWrapperHelper.cs =================================================================== diff -u -r3630 -r3663 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/Common/KernelWrapperHelper.cs (.../KernelWrapperHelper.cs) (revision 3630) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/Common/KernelWrapperHelper.cs (.../KernelWrapperHelper.cs) (revision 3663) @@ -47,9 +47,6 @@ IKernelWrapper kernelWrapper = null; switch (currentSpecification.FailureMechanismSystemType) { - case FailureMechanismSystemType.HorizontalBalance: - // TODO: Hook this up with the new MacroStability kernel wrapper - break; case FailureMechanismSystemType.StabilityInside: switch (currentSpecification.StabilityModelType) { Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/DebuggingTest.cs =================================================================== diff -u -r3520 -r3663 --- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/DebuggingTest.cs (.../DebuggingTest.cs) (revision 3520) +++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/DebuggingTest.cs (.../DebuggingTest.cs) (revision 3663) @@ -42,7 +42,7 @@ [Test, Ignore("This test is only used for debugging XML files generated by Dam UI")] public void DebugWithXmlInputFile() { - const string inputFilename = "DebuggingInputFile.xml";//"InputForDebugging.xml"; + const string inputFilename = "InputFileBka.xml";//"InputForDebugging.xml"; string fullInputFilename = Path.Combine(mapTestFiles, inputFilename); Thread.CurrentThread.CurrentCulture = System.Globalization.CultureInfo.InvariantCulture; string inputString = File.ReadAllText(fullInputFilename); Index: DamEngine/trunk/src/Deltares.DamEngine.Data/General/ProjectEnumerations.cs =================================================================== diff -u -r3522 -r3663 --- DamEngine/trunk/src/Deltares.DamEngine.Data/General/ProjectEnumerations.cs (.../ProjectEnumerations.cs) (revision 3522) +++ DamEngine/trunk/src/Deltares.DamEngine.Data/General/ProjectEnumerations.cs (.../ProjectEnumerations.cs) (revision 3663) @@ -46,7 +46,6 @@ { StabilityInside, StabilityOutside, - Piping, - HorizontalBalance + Piping } } Index: DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/ConversionHelperTests.cs =================================================================== diff -u -r3649 -r3663 --- DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/ConversionHelperTests.cs (.../ConversionHelperTests.cs) (revision 3649) +++ DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/ConversionHelperTests.cs (.../ConversionHelperTests.cs) (revision 3663) @@ -203,7 +203,6 @@ [TestCase(FailureMechanismSystemType.StabilityInside, ConversionHelper.InputFailureMechanismStabilityInside)] [TestCase(FailureMechanismSystemType.StabilityOutside, ConversionHelper.InputFailureMechanismStabilityOutside)] [TestCase(FailureMechanismSystemType.Piping, ConversionHelper.InputFailureMechanismPiping)] - [TestCase(FailureMechanismSystemType.HorizontalBalance, ConversionHelper.InputFailureMechanismHorizontalBalance)] public void CanConvertToInputFailureMechanismSystemType(FailureMechanismSystemType failureMechanismSystemType, int inputFailureMechanismSystemType) { Assert.AreEqual(inputFailureMechanismSystemType, ConversionHelper.ConvertToInputFailureMechanismSystemType(failureMechanismSystemType)); @@ -213,7 +212,6 @@ [TestCase(ConversionHelper.InputFailureMechanismStabilityInside, FailureMechanismSystemType.StabilityInside)] [TestCase(ConversionHelper.InputFailureMechanismStabilityOutside, FailureMechanismSystemType.StabilityOutside)] [TestCase(ConversionHelper.InputFailureMechanismPiping, FailureMechanismSystemType.Piping)] - [TestCase(ConversionHelper.InputFailureMechanismHorizontalBalance, FailureMechanismSystemType.HorizontalBalance)] public void CanConvertToFailureMechanismSystemType(int inputFailureMechanismSystemType, FailureMechanismSystemType failureMechanismSystemType) { Assert.AreEqual(failureMechanismSystemType, ConversionHelper.ConvertToFailureMechanismSystemType(inputFailureMechanismSystemType)); Index: DamEngine/trunk/src/Deltares.DamEngine.Data.Tests/General/ConversionHelperTests.cs =================================================================== diff -u -r3520 -r3663 --- DamEngine/trunk/src/Deltares.DamEngine.Data.Tests/General/ConversionHelperTests.cs (.../ConversionHelperTests.cs) (revision 3520) +++ DamEngine/trunk/src/Deltares.DamEngine.Data.Tests/General/ConversionHelperTests.cs (.../ConversionHelperTests.cs) (revision 3663) @@ -30,7 +30,6 @@ [Test] [TestCase(FailureMechanismSystemType.StabilityInside, SegmentFailureMechanismType.Stability)] [TestCase(FailureMechanismSystemType.StabilityOutside, SegmentFailureMechanismType.Stability)] - [TestCase(FailureMechanismSystemType.HorizontalBalance, SegmentFailureMechanismType.Stability)] [TestCase(FailureMechanismSystemType.Piping, SegmentFailureMechanismType.Piping)] public void GivenFailureMechanismSystemTypeWhenConvertingThenReturnsCorrectSegmentFailureMechanismType( FailureMechanismSystemType failureMechanismSystemType, SegmentFailureMechanismType segmentFailureMechanismType) Index: DamEngine/trunk/src/Deltares.DamEngine.Io/DamInput.cs =================================================================== diff -u -r3617 -r3663 --- DamEngine/trunk/src/Deltares.DamEngine.Io/DamInput.cs (.../DamInput.cs) (revision 3617) +++ DamEngine/trunk/src/Deltares.DamEngine.Io/DamInput.cs (.../DamInput.cs) (revision 3663) @@ -4204,9 +4204,6 @@ /// BishopUpliftVan, - - /// - UpliftVanWti, } /// Index: DamEngine/trunk/src/Deltares.DamEngine.Data/General/ConversionHelper.cs =================================================================== diff -u -r3522 -r3663 --- DamEngine/trunk/src/Deltares.DamEngine.Data/General/ConversionHelper.cs (.../ConversionHelper.cs) (revision 3522) +++ DamEngine/trunk/src/Deltares.DamEngine.Data/General/ConversionHelper.cs (.../ConversionHelper.cs) (revision 3663) @@ -34,7 +34,6 @@ { {FailureMechanismSystemType.StabilityInside, SegmentFailureMechanismType.Stability}, {FailureMechanismSystemType.StabilityOutside, SegmentFailureMechanismType.Stability}, - {FailureMechanismSystemType.HorizontalBalance, SegmentFailureMechanismType.Stability}, {FailureMechanismSystemType.Piping, SegmentFailureMechanismType.Piping} }; return translationTable[failureMechanismSystemType]; Index: DamEngine/trunk/src/Deltares.DamEngine.Data/General/Results/DesignResult.cs =================================================================== diff -u -r3522 -r3663 --- DamEngine/trunk/src/Deltares.DamEngine.Data/General/Results/DesignResult.cs (.../DesignResult.cs) (revision 3522) +++ DamEngine/trunk/src/Deltares.DamEngine.Data/General/Results/DesignResult.cs (.../DesignResult.cs) (revision 3663) @@ -63,7 +63,6 @@ { case FailureMechanismSystemType.StabilityInside: case FailureMechanismSystemType.StabilityOutside: - case FailureMechanismSystemType.HorizontalBalance: return StabilityDesignResults.SafetyFactor; case FailureMechanismSystemType.Piping: return PipingDesignResults.SafetyFactor; @@ -152,7 +151,6 @@ switch (damFailureMechanismeCalculationSpecification.FailureMechanismSystemType) { case FailureMechanismSystemType.StabilityInside: - case FailureMechanismSystemType.HorizontalBalance: case FailureMechanismSystemType.StabilityOutside: profileName = soilGeometry2DName; break; Index: DamEngine/trunk/src/Deltares.DamEngine.Interface/ConversionHelper.cs =================================================================== diff -u -r3649 -r3663 --- DamEngine/trunk/src/Deltares.DamEngine.Interface/ConversionHelper.cs (.../ConversionHelper.cs) (revision 3649) +++ DamEngine/trunk/src/Deltares.DamEngine.Interface/ConversionHelper.cs (.../ConversionHelper.cs) (revision 3663) @@ -336,7 +336,6 @@ public const int InputFailureMechanismStabilityInside = 0; public const int InputFailureMechanismStabilityOutside = 1; public const int InputFailureMechanismPiping = 2; - public const int InputFailureMechanismHorizontalBalance = 3; /// /// Converts the Dam failure mechanism type to the input failure mechanism type . @@ -349,8 +348,7 @@ { {FailureMechanismSystemType.StabilityInside, InputFailureMechanismStabilityInside}, {FailureMechanismSystemType.StabilityOutside, InputFailureMechanismStabilityOutside}, - {FailureMechanismSystemType.Piping, InputFailureMechanismPiping}, - {FailureMechanismSystemType.HorizontalBalance, InputFailureMechanismHorizontalBalance} + {FailureMechanismSystemType.Piping, InputFailureMechanismPiping} }; return translationTable[segmentFailureMechanismType]; } @@ -366,8 +364,7 @@ { {InputFailureMechanismStabilityInside, FailureMechanismSystemType.StabilityInside}, {InputFailureMechanismStabilityOutside, FailureMechanismSystemType.StabilityOutside}, - {InputFailureMechanismPiping, FailureMechanismSystemType.Piping}, - {InputFailureMechanismHorizontalBalance, FailureMechanismSystemType.HorizontalBalance} + {InputFailureMechanismPiping, FailureMechanismSystemType.Piping} }; return translationTable[failureMechanismSystemType]; }