Index: DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/ConversionHelperTests.cs =================================================================== diff -u -r5960 -r6064 --- DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/ConversionHelperTests.cs (.../ConversionHelperTests.cs) (revision 5960) +++ DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/ConversionHelperTests.cs (.../ConversionHelperTests.cs) (revision 6064) @@ -359,6 +359,7 @@ [Test] [TestCase(TangentLinesDefinition.OnBoundaryLines, ConversionHelper.InputTangentLinesOnBoundaryLines)] [TestCase(TangentLinesDefinition.Specified, ConversionHelper.InputTangentLinesSpecified)] + [TestCase(TangentLinesDefinition.Automatic, ConversionHelper.InputTangentLinesAutomatic)] public void CanConvertToInputTangentLinesDefinition(TangentLinesDefinition tangentLineType, int inputTangentLineType) { Assert.That(ConversionHelper.ConvertToInputTangentLinesDefinition(tangentLineType), Is.EqualTo(inputTangentLineType)); @@ -367,6 +368,7 @@ [Test] [TestCase(ConversionHelper.InputTangentLinesOnBoundaryLines, TangentLinesDefinition.OnBoundaryLines)] [TestCase(ConversionHelper.InputTangentLinesSpecified, TangentLinesDefinition.Specified)] + [TestCase(ConversionHelper.InputTangentLinesAutomatic, TangentLinesDefinition.Automatic)] public void CanConvertToTangentLinesDefinition(int inputTangentLineType, TangentLinesDefinition tangentLineType) { Assert.That(ConversionHelper.ConvertToTangentLinesDefinition(inputTangentLineType), Is.EqualTo(tangentLineType)); @@ -407,25 +409,6 @@ } [Test] - [TestCase(MStabModelType.Bishop, ConversionHelper.MStabModelTypeBishop)] - [TestCase(MStabModelType.UpliftVan, ConversionHelper.MStabModelTypeUpliftVan)] - [TestCase(MStabModelType.BishopUpliftVan, ConversionHelper.MStabModelTypeBishopUpliftVan)] - [TestCase(MStabModelType.UpliftVan, ConversionHelper.MStabModelTypeUpliftVan)] - public void CanConvertToOutputMStabModelType(MStabModelType mStabModelType, int outputMStabModelType) - { - Assert.That(ConversionHelper.ConvertToOutputMStabModelType(mStabModelType), Is.EqualTo(outputMStabModelType)); - } - - [Test] - [TestCase(ConversionHelper.MStabModelTypeBishop, MStabModelType.Bishop)] - [TestCase(ConversionHelper.MStabModelTypeUpliftVan, MStabModelType.UpliftVan)] - [TestCase(ConversionHelper.MStabModelTypeBishopUpliftVan, MStabModelType.BishopUpliftVan)] - public void CanConvertToMStabModelType(int outputMStabModelType, MStabModelType mStabModelType) - { - Assert.That(ConversionHelper.ConvertToMStabModelType(outputMStabModelType), Is.EqualTo(mStabModelType)); - } - - [Test] [TestCase(PipingModelType.Bligh, InputPipingModelType.Bligh)] [TestCase(PipingModelType.Wti2017, InputPipingModelType.WtiSellmeijerRevised)] public void CanConvertToInputPipingModelType(PipingModelType pipingModelType, InputPipingModelType inputPipingModelType) Index: DamEngine/trunk/src/Deltares.DamEngine.Interface/ConversionHelper.cs =================================================================== diff -u -r5960 -r6064 --- DamEngine/trunk/src/Deltares.DamEngine.Interface/ConversionHelper.cs (.../ConversionHelper.cs) (revision 5960) +++ DamEngine/trunk/src/Deltares.DamEngine.Interface/ConversionHelper.cs (.../ConversionHelper.cs) (revision 6064) @@ -112,78 +112,13 @@ /// The input tangent lines specified /// public const int InputTangentLinesSpecified = 1; - + /// - /// The m stab model type bishop + /// The input tangent lines automatic /// - public const int MStabModelTypeBishop = 0; + public const int InputTangentLinesAutomatic = 2; /// - /// The m stab model type spencer - /// - public const int MStabModelTypeSpencer = 1; - - /// - /// The m stab model type fellenius - /// - public const int MStabModelTypeFellenius = 2; - - /// - /// The m stab model type uplift van - /// - public const int MStabModelTypeUpliftVan = 3; - - /// - /// The m stab model type uplift spencer - /// - public const int MStabModelTypeUpliftSpencer = 4; - - /// - /// The m stab model type bishop random field - /// - public const int MStabModelTypeBishopRandomField = 5; - - /// - /// The m stab model type horizontal balance - /// - public const int MStabModelTypeHorizontalBalance = 6; - - /// - /// The m stab model type bishop uplift van - /// - public const int MStabModelTypeBishopUpliftVan = 7; - - /// - /// The m stab model type spencer high - /// - public const int MStabModelTypeSpencerHigh = 8; - - /// - /// The m stab model type spencer low - /// - public const int MStabModelTypeSpencerLow = 9; - - /// - /// The piping model type bligh - /// - public const int PipingModelTypeBligh = 0; - - /// - /// The piping model type sellmeijer - /// - public const int PipingModelTypeSellmeijer = 1; - - /// - /// The piping model type sellmeijer4 forces - /// - public const int PipingModelTypeSellmeijer4Forces = 2; - - /// - /// The piping model type wti2017 - /// - public const int PipingModelTypeWti2017 = 3; - - /// /// Constants for translating to Enums TimeStepUnit /// public const uint TimeStepUnitSecond = 0; @@ -1132,6 +1067,9 @@ }, { TangentLinesDefinition.Specified, InputTangentLinesSpecified + }, + { + TangentLinesDefinition.Automatic, InputTangentLinesAutomatic } }; return translationTable[tangentLineType]; @@ -1264,50 +1202,6 @@ } /// - /// Converts to MStab Model Type. - /// - /// The input MStabModelType. - /// - public static MStabModelType ConvertToMStabModelType(int inputMStabModelType) - { - var translationTable = new Dictionary - { - { - MStabModelTypeBishop, MStabModelType.Bishop - }, - { - MStabModelTypeUpliftVan, MStabModelType.UpliftVan - }, - { - MStabModelTypeBishopUpliftVan, MStabModelType.BishopUpliftVan - } - }; - return translationTable[inputMStabModelType]; - } - - /// - /// Converts to output MStabModelType. - /// - /// The UpliftType. - /// - public static int ConvertToOutputMStabModelType(MStabModelType mStabModelType) - { - var translationTable = new Dictionary - { - { - MStabModelType.Bishop, MStabModelTypeBishop - }, - { - MStabModelType.UpliftVan, MStabModelTypeUpliftVan - }, - { - MStabModelType.BishopUpliftVan, MStabModelTypeBishopUpliftVan - } - }; - return translationTable[mStabModelType]; - } - - /// /// Converts the input TimeStepUnit to the TimeStepUnit. /// /// The time step unit.