Index: DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/ConversionHelperTests.cs =================================================================== diff -u -r1573 -r1589 --- DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/ConversionHelperTests.cs (.../ConversionHelperTests.cs) (revision 1573) +++ DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/ConversionHelperTests.cs (.../ConversionHelperTests.cs) (revision 1589) @@ -538,6 +538,26 @@ } [Test] + [TestCase(PipingModelType.Bligh, InputPipingModelType.Bligh)] + [TestCase(PipingModelType.SellmeijerVnk, InputPipingModelType.SellmeijerVnk)] + [TestCase(PipingModelType.Sellmeijer4Forces, InputPipingModelType.Sellmeijer4Forces)] + [TestCase(PipingModelType.Wti2017, InputPipingModelType.WbiSellmeijerRevised)] + public void CanConvertToInputPipingModelType(PipingModelType pipingModelType, InputPipingModelType outputPipingModelType) + { + Assert.AreEqual(outputPipingModelType, ConversionHelper.ConvertToInputPipingModelType(pipingModelType)); + } + + [Test] + [TestCase(InputPipingModelType.Bligh, PipingModelType.Bligh)] + [TestCase(InputPipingModelType.SellmeijerVnk, PipingModelType.SellmeijerVnk)] + [TestCase(InputPipingModelType.Sellmeijer4Forces, PipingModelType.Sellmeijer4Forces)] + [TestCase(InputPipingModelType.WbiSellmeijerRevised, PipingModelType.Wti2017)] + public void CanConvertToPipingModelType(InputPipingModelType outputPipingModelType, PipingModelType pipingModelType) + { + Assert.AreEqual(pipingModelType, ConversionHelper.ConvertToPipingModelType(outputPipingModelType)); + } + + [Test] [TestCase(RegionalResultType.ProbabilityOfFailure, 0)] [TestCase(RegionalResultType.SafetyFactor, 1)] public void CanConvertToOutputRegionalResultType(RegionalResultType regionalResultType, int outputRegionalResultType) Index: DamEngine/trunk/src/Deltares.DamEngine.Interface/ConversionHelper.cs =================================================================== diff -u -r1573 -r1589 --- DamEngine/trunk/src/Deltares.DamEngine.Interface/ConversionHelper.cs (.../ConversionHelper.cs) (revision 1573) +++ DamEngine/trunk/src/Deltares.DamEngine.Interface/ConversionHelper.cs (.../ConversionHelper.cs) (revision 1589) @@ -383,7 +383,8 @@ { {PipingModelType.Bligh, InputPipingModelType.Bligh}, {PipingModelType.SellmeijerVnk, InputPipingModelType.SellmeijerVnk}, - {PipingModelType.Sellmeijer4Forces, InputPipingModelType.Sellmeijer4Forces} + {PipingModelType.Sellmeijer4Forces, InputPipingModelType.Sellmeijer4Forces}, + {PipingModelType.Wti2017, InputPipingModelType.WbiSellmeijerRevised} }; return translationTable[pipingModelType]; } @@ -399,7 +400,8 @@ { {InputPipingModelType.Bligh, PipingModelType.Bligh}, {InputPipingModelType.SellmeijerVnk, PipingModelType.SellmeijerVnk}, - {InputPipingModelType.Sellmeijer4Forces, PipingModelType.Sellmeijer4Forces} + {InputPipingModelType.Sellmeijer4Forces, PipingModelType.Sellmeijer4Forces}, + {InputPipingModelType.WbiSellmeijerRevised, PipingModelType.Wti2017} }; return translationTable[inputPipingModelType]; } Index: DamEngine/trunk/src/Deltares.DamEngine.Io/DamInput.cs =================================================================== diff -u -r1578 -r1589 --- DamEngine/trunk/src/Deltares.DamEngine.Io/DamInput.cs (.../DamInput.cs) (revision 1578) +++ DamEngine/trunk/src/Deltares.DamEngine.Io/DamInput.cs (.../DamInput.cs) (revision 1589) @@ -4482,6 +4482,9 @@ /// Sellmeijer4Forces, + + /// + WbiSellmeijerRevised, } ///