Index: DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/FillXmlOutputFromDamTests.cs =================================================================== diff -u -r2878 -r3307 --- DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/FillXmlOutputFromDamTests.cs (.../FillXmlOutputFromDamTests.cs) (revision 2878) +++ DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/FillXmlOutputFromDamTests.cs (.../FillXmlOutputFromDamTests.cs) (revision 3307) @@ -283,7 +283,6 @@ var supportedModelTypeValues = new[] { MStabModelType.Bishop, - MStabModelType.UpliftVanWti, MStabModelType.UpliftVan, MStabModelType.BishopUpliftVan }; Index: DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/ConversionHelperTests.cs =================================================================== diff -u -r3077 -r3307 --- DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/ConversionHelperTests.cs (.../ConversionHelperTests.cs) (revision 3077) +++ DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/ConversionHelperTests.cs (.../ConversionHelperTests.cs) (revision 3307) @@ -242,7 +242,7 @@ [TestCase(MStabModelType.Bishop, InputStabilityModelType.Bishop)] [TestCase(MStabModelType.UpliftVan, InputStabilityModelType.UpliftVan)] [TestCase(MStabModelType.BishopUpliftVan, InputStabilityModelType.BishopUpliftVan)] - [TestCase(MStabModelType.UpliftVanWti, InputStabilityModelType.UpliftVanWti)] + [TestCase(MStabModelType.UpliftVan, InputStabilityModelType.UpliftVan)] public void CanConvertToInputStabilityModelType(MStabModelType mStabModelType, InputStabilityModelType inputStabilityModelType) { Assert.AreEqual(inputStabilityModelType, ConversionHelper.ConvertToInputStabilityModelType(mStabModelType)); @@ -252,7 +252,7 @@ [TestCase(InputStabilityModelType.Bishop, MStabModelType.Bishop)] [TestCase(InputStabilityModelType.UpliftVan, MStabModelType.UpliftVan)] [TestCase(InputStabilityModelType.BishopUpliftVan, MStabModelType.BishopUpliftVan)] - [TestCase(InputStabilityModelType.UpliftVanWti, MStabModelType.UpliftVanWti)] + [TestCase(InputStabilityModelType.UpliftVan, MStabModelType.UpliftVan)] public void CanConvertToMStabModelType(InputStabilityModelType inputStabilityModelType, MStabModelType mStabModelType) { Assert.AreEqual(mStabModelType, ConversionHelper.ConvertToStabilityModelType(inputStabilityModelType)); @@ -436,7 +436,7 @@ [TestCase(MStabModelType.BishopUpliftVan, ConversionHelper.MStabModelTypeBishopUpliftVan)] [TestCase(MStabModelType.SpencerHigh, ConversionHelper.MStabModelTypeSpencerHigh)] [TestCase(MStabModelType.SpencerLow, ConversionHelper.MStabModelTypeSpencerLow)] - [TestCase(MStabModelType.UpliftVanWti, ConversionHelper.MStabModelTypeUpliftVanWti)] + [TestCase(MStabModelType.UpliftVan, ConversionHelper.MStabModelTypeUpliftVan)] public void CanConvertToOutputMStabModelType(MStabModelType mStabModelType, int outputMStabModelType) { Assert.AreEqual(outputMStabModelType, ConversionHelper.ConvertToOutputMStabModelType(mStabModelType)); @@ -453,7 +453,6 @@ [TestCase(ConversionHelper.MStabModelTypeBishopUpliftVan, MStabModelType.BishopUpliftVan)] [TestCase(ConversionHelper.MStabModelTypeSpencerHigh, MStabModelType.SpencerHigh)] [TestCase(ConversionHelper.MStabModelTypeSpencerLow, MStabModelType.SpencerLow)] - [TestCase(ConversionHelper.MStabModelTypeUpliftVanWti, MStabModelType.UpliftVanWti)] public void CanConvertToMStabModelType(int outputMStabModelType, MStabModelType mStabModelType) { Assert.AreEqual(mStabModelType, ConversionHelper.ConvertToMStabModelType(outputMStabModelType)); @@ -503,7 +502,7 @@ [TestCase(DesignResultStabilityDesignResultsStabilityModelType.Bishop, MStabModelType.Bishop)] [TestCase(DesignResultStabilityDesignResultsStabilityModelType.UpliftVan, MStabModelType.UpliftVan)] [TestCase(DesignResultStabilityDesignResultsStabilityModelType.BishopUpliftVan, MStabModelType.BishopUpliftVan)] - [TestCase(DesignResultStabilityDesignResultsStabilityModelType.UpliftVanWti, MStabModelType.UpliftVanWti)] + [TestCase(DesignResultStabilityDesignResultsStabilityModelType.UpliftVan, MStabModelType.UpliftVan)] public void CanConvertToOutputStabilityModelType(DesignResultStabilityDesignResultsStabilityModelType outputStabilityModelType, MStabModelType stabilityModelType) { @@ -514,7 +513,7 @@ [TestCase(MStabModelType.Bishop, DesignResultStabilityDesignResultsStabilityModelType.Bishop)] [TestCase(MStabModelType.UpliftVan, DesignResultStabilityDesignResultsStabilityModelType.UpliftVan)] [TestCase(MStabModelType.BishopUpliftVan, DesignResultStabilityDesignResultsStabilityModelType.BishopUpliftVan)] - [TestCase(MStabModelType.UpliftVanWti, DesignResultStabilityDesignResultsStabilityModelType.UpliftVanWti)] + [TestCase(MStabModelType.UpliftVan, DesignResultStabilityDesignResultsStabilityModelType.UpliftVan)] public void CanConvertToStabilityModelType(MStabModelType stabilityModelType, DesignResultStabilityDesignResultsStabilityModelType outputStabilityModelType) { Index: DamEngine/trunk/src/Deltares.DamEngine.Data/General/StabilityEnumerations.cs =================================================================== diff -u -r2227 -r3307 --- DamEngine/trunk/src/Deltares.DamEngine.Data/General/StabilityEnumerations.cs (.../StabilityEnumerations.cs) (revision 2227) +++ DamEngine/trunk/src/Deltares.DamEngine.Data/General/StabilityEnumerations.cs (.../StabilityEnumerations.cs) (revision 3307) @@ -37,7 +37,6 @@ SpencerHigh, // #Bka added SpencerHigh/SpencerLow as quick fix. Should be replaced with options for Spencer later! These enums should be removed. SpencerLow, BishopWti, // #Bka: for now, only UpliftVanWti is to be used of all Wti options. - UpliftVanWti, UpliftSpencerWti } Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/Common/KernelWrapperHelper.cs =================================================================== diff -u -r3180 -r3307 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/Common/KernelWrapperHelper.cs (.../KernelWrapperHelper.cs) (revision 3180) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/Common/KernelWrapperHelper.cs (.../KernelWrapperHelper.cs) (revision 3307) @@ -58,7 +58,6 @@ // TODO: Hook this up with the new MacroStability kernel wrapper break; case MStabModelType.UpliftVan: - case MStabModelType.UpliftVanWti: kernelWrapper = new MacroStabilityInwardsKernelWrapper(); var wtiMacroStabilityInwardsKernelWrapper = (MacroStabilityInwardsKernelWrapper)kernelWrapper; wtiMacroStabilityInwardsKernelWrapper.FailureMechanismParametersMStab = currentSpecification.FailureMechanismParametersMStab.Copy(); Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/ConversionHelper.cs =================================================================== diff -u -r3220 -r3307 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/ConversionHelper.cs (.../ConversionHelper.cs) (revision 3220) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/ConversionHelper.cs (.../ConversionHelper.cs) (revision 3307) @@ -89,7 +89,7 @@ var translationTable = new Dictionary() { //{StabilityModelOptionOutput.Bishop, MStabModelType.BishopWti}, - {StabilityModelOptionType.UpliftVan, MStabModelType.UpliftVanWti }, + {StabilityModelOptionType.UpliftVan, MStabModelType.UpliftVan }, //{MacroStability.CSharpWrapper.Output.StabilityModelOption.Spencer, MStabModelType.UpliftSpencerWti} }; return translationTable[modelOption]; @@ -102,13 +102,13 @@ public static StabilityModelOptionType ConvertToModelOptions(MStabModelType mStabModelType) { // For the macrostability kernel, the only supported option for now is UpliftVan. - if (mStabModelType != MStabModelType.UpliftVanWti) + if (mStabModelType != MStabModelType.UpliftVan) { throw new ArgumentException(String.Format("Unsupported MStabModelType: {0}", mStabModelType)); } var translationTable = new Dictionary() { - {MStabModelType.UpliftVanWti, StabilityModelOptionType.UpliftVan} + {MStabModelType.UpliftVan, StabilityModelOptionType.UpliftVan} }; return translationTable[mStabModelType]; } @@ -123,7 +123,7 @@ var translationTable = new Dictionary() { {StabilityModelOptionType.Bishop, MStabModelType.BishopWti}, - {StabilityModelOptionType.UpliftVan, MStabModelType.UpliftVanWti }, + {StabilityModelOptionType.UpliftVan, MStabModelType.UpliftVan }, //{MacroStability.CSharpWrapper.Output.StabilityModelOption.Spencer, MStabModelType.UpliftSpencerWti} }; return translationTable[modelOption]; @@ -136,13 +136,13 @@ public static StabilityModelOptionType ConvertToModelOptionsOutput(MStabModelType mStabModelType) { // For the macrostability kernel, the only supported option for now is UpliftVan. - if (mStabModelType != MStabModelType.UpliftVanWti) + if (mStabModelType != MStabModelType.UpliftVan) { throw new ArgumentException(String.Format("Unsupported MStabModelType: {0}", mStabModelType)); } var translationTable = new Dictionary() { - {MStabModelType.UpliftVanWti, StabilityModelOptionType.UpliftVan} + {MStabModelType.UpliftVan, StabilityModelOptionType.UpliftVan} }; return translationTable[mStabModelType]; } Index: DamEngine/trunk/src/Deltares.DamEngine.Interface/ConversionHelper.cs =================================================================== diff -u -r3077 -r3307 --- DamEngine/trunk/src/Deltares.DamEngine.Interface/ConversionHelper.cs (.../ConversionHelper.cs) (revision 3077) +++ DamEngine/trunk/src/Deltares.DamEngine.Interface/ConversionHelper.cs (.../ConversionHelper.cs) (revision 3307) @@ -457,7 +457,6 @@ {MStabModelType.Bishop, InputStabilityModelType.Bishop}, {MStabModelType.UpliftVan, InputStabilityModelType.UpliftVan}, {MStabModelType.BishopUpliftVan, InputStabilityModelType.BishopUpliftVan}, - {MStabModelType.UpliftVanWti, InputStabilityModelType.UpliftVanWti}, }; return translationTable[stabilityModelType]; } @@ -474,7 +473,6 @@ {InputStabilityModelType.Bishop, MStabModelType.Bishop}, {InputStabilityModelType.UpliftVan, MStabModelType.UpliftVan}, {InputStabilityModelType.BishopUpliftVan, MStabModelType.BishopUpliftVan}, - {InputStabilityModelType.UpliftVanWti, MStabModelType.UpliftVanWti}, }; return translationTable[inputStabilityModelType]; } @@ -491,7 +489,6 @@ {MStabModelType.Bishop, DesignResultStabilityDesignResultsStabilityModelType.Bishop}, {MStabModelType.UpliftVan, DesignResultStabilityDesignResultsStabilityModelType.UpliftVan}, {MStabModelType.BishopUpliftVan, DesignResultStabilityDesignResultsStabilityModelType.BishopUpliftVan}, - {MStabModelType.UpliftVanWti, DesignResultStabilityDesignResultsStabilityModelType.UpliftVanWti} }; return translationTable[stabilityModelType]; } @@ -508,7 +505,6 @@ {DesignResultStabilityDesignResultsStabilityModelType.Bishop, MStabModelType.Bishop}, {DesignResultStabilityDesignResultsStabilityModelType.UpliftVan, MStabModelType.UpliftVan}, {DesignResultStabilityDesignResultsStabilityModelType.BishopUpliftVan, MStabModelType.BishopUpliftVan}, - {DesignResultStabilityDesignResultsStabilityModelType.UpliftVanWti, MStabModelType.UpliftVanWti} }; return translationTable[outputStabilityModelType]; } @@ -903,11 +899,6 @@ public const int MStabModelTypeSpencerLow = 9; /// - /// The m stab model type uplift van Wti - /// - public const int MStabModelTypeUpliftVanWti = 10; - - /// /// Converts to MStab Model Type. /// /// The input MStabModelType. @@ -926,7 +917,6 @@ {MStabModelTypeBishopUpliftVan, MStabModelType.BishopUpliftVan}, {MStabModelTypeSpencerHigh, MStabModelType.SpencerHigh}, {MStabModelTypeSpencerLow, MStabModelType.SpencerLow}, - {MStabModelTypeUpliftVanWti, MStabModelType.UpliftVanWti} }; return translationTable[inputMStabModelType]; } @@ -950,7 +940,6 @@ {MStabModelType.BishopUpliftVan, MStabModelTypeBishopUpliftVan}, {MStabModelType.SpencerHigh, MStabModelTypeSpencerHigh}, {MStabModelType.SpencerLow, MStabModelTypeSpencerLow}, - {MStabModelType.UpliftVanWti, MStabModelTypeUpliftVanWti} }; return translationTable[mStabModelType]; } Index: DamEngine/trunk/src/Deltares.DamEngine.Io/DamOutput.cs =================================================================== diff -u -r2873 -r3307 --- DamEngine/trunk/src/Deltares.DamEngine.Io/DamOutput.cs (.../DamOutput.cs) (revision 2873) +++ DamEngine/trunk/src/Deltares.DamEngine.Io/DamOutput.cs (.../DamOutput.cs) (revision 3307) @@ -1060,9 +1060,6 @@ /// BishopUpliftVan, - - /// - UpliftVanWti, } /// Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityCommon/ConversionHelperTests.cs =================================================================== diff -u -r3221 -r3307 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityCommon/ConversionHelperTests.cs (.../ConversionHelperTests.cs) (revision 3221) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityCommon/ConversionHelperTests.cs (.../ConversionHelperTests.cs) (revision 3307) @@ -70,37 +70,36 @@ #region ModelType [Test] //[TestCase(StabilityModelOption.Bishop, MStabModelType.BishopWti)] - [TestCase(StabilityModelOptionType.UpliftVan, MStabModelType.UpliftVanWti)] + [TestCase(StabilityModelOptionType.UpliftVan, MStabModelType.UpliftVan)] public void CanConvertToMStabModelType(StabilityModelOptionType modelOption, MStabModelType mStabModelType) { Assert.AreEqual(mStabModelType, ConversionHelper.ConvertToMStabModelType(modelOption)); } [Test] [TestCase(StabilityModelOptionType.Bishop, MStabModelType.BishopWti)] - [TestCase(StabilityModelOptionType.UpliftVan, MStabModelType.UpliftVanWti)] + [TestCase(StabilityModelOptionType.UpliftVan, MStabModelType.UpliftVan)] public void CanConvertToMStabModelTypeFromOutput(StabilityModelOptionType modelOption, MStabModelType mStabModelType) { Assert.AreEqual(mStabModelType, ConversionHelper.ConvertToMStabModelTypeFromOutput(modelOption)); } [Test] - [TestCase(MStabModelType.UpliftVanWti, StabilityModelOptionType.UpliftVan)] + [TestCase(MStabModelType.UpliftVan, StabilityModelOptionType.UpliftVan)] public void CanConvertToModelOptions(MStabModelType mStabModelType, StabilityModelOptionType modelOption) { Assert.AreEqual(modelOption, ConversionHelper.ConvertToModelOptions(mStabModelType)); } [Test] - [TestCase(MStabModelType.UpliftVanWti, StabilityModelOptionType.UpliftVan)] + [TestCase(MStabModelType.UpliftVan, StabilityModelOptionType.UpliftVan)] public void CanConvertToModelOptionsOutput(MStabModelType mStabModelType, StabilityModelOptionType modelOption) { Assert.AreEqual(modelOption, ConversionHelper.ConvertToModelOptionsOutput(mStabModelType)); } [ExpectedException(typeof(ArgumentException))] [TestCase(MStabModelType.Bishop)] - [TestCase(MStabModelType.UpliftVan)] [TestCase(MStabModelType.UpliftSpencer)] [TestCase(MStabModelType.SpencerLow)] [TestCase(MStabModelType.SpencerHigh)] @@ -118,7 +117,6 @@ [ExpectedException(typeof(ArgumentException))] [TestCase(MStabModelType.Bishop)] - [TestCase(MStabModelType.UpliftVan)] [TestCase(MStabModelType.UpliftSpencer)] [TestCase(MStabModelType.SpencerLow)] [TestCase(MStabModelType.SpencerHigh)] Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/FillMacroStabilityWrapperInputFromEngine.cs =================================================================== diff -u -r3238 -r3307 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/FillMacroStabilityWrapperInputFromEngine.cs (.../FillMacroStabilityWrapperInputFromEngine.cs) (revision 3238) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/FillMacroStabilityWrapperInputFromEngine.cs (.../FillMacroStabilityWrapperInputFromEngine.cs) (revision 3307) @@ -72,7 +72,7 @@ macroStabilityInput.PreprocessingInput = new PreprocessingInput(); // ToDo check whether this is needed. macroStabilityInput.StabilityModel.UpliftVanCalculationGrid = new KernelUpliftVanCalculationGrid(); - failureMechanismParametersMStab.MStabParameters.Model = MStabModelType.UpliftVanWti; + failureMechanismParametersMStab.MStabParameters.Model = MStabModelType.UpliftVan; TransferStabilityModelProperties(failureMechanismParametersMStab, macroStabilityInput.StabilityModel); TransferSoils(damKernelInput.Location.SoilList, macroStabilityInput.StabilityModel.Soils); Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityInwards/MacroStabilityInwardsKernelWrapperTests.cs =================================================================== diff -u -r3267 -r3307 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityInwards/MacroStabilityInwardsKernelWrapperTests.cs (.../MacroStabilityInwardsKernelWrapperTests.cs) (revision 3267) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityInwards/MacroStabilityInwardsKernelWrapperTests.cs (.../MacroStabilityInwardsKernelWrapperTests.cs) (revision 3307) @@ -274,7 +274,7 @@ EngineInterface engineInterface = new EngineInterface(inputString); Assert.IsNotNull(engineInterface.DamProjectData); engineInterface.DamProjectData.DamProjectCalculationSpecification.CurrentSpecification.StabilityModelType = - MStabModelType.UpliftVanWti; + MStabModelType.UpliftVan; string outputString = engineInterface.Run(); Assert.IsNotNull(outputString);