Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DamEngineIo/ConversionHelperTests.cs =================================================================== diff -u -r4377 -r4419 --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DamEngineIo/ConversionHelperTests.cs (.../ConversionHelperTests.cs) (revision 4377) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DamEngineIo/ConversionHelperTests.cs (.../ConversionHelperTests.cs) (revision 4419) @@ -338,30 +338,16 @@ } [Test] - [TestCase(ShearStrengthModel.None, SoilShearStrengthModel.None)] [TestCase(ShearStrengthModel.CPhi, SoilShearStrengthModel.CPhi)] - [TestCase(ShearStrengthModel.StressTable, SoilShearStrengthModel.StressTable)] - [TestCase(ShearStrengthModel.PseudoValues, SoilShearStrengthModel.PseudoValues)] - [TestCase(ShearStrengthModel.CuMeasured, SoilShearStrengthModel.SuMeasured)] [TestCase(ShearStrengthModel.CuCalculated, SoilShearStrengthModel.SuCalculated)] - [TestCase(ShearStrengthModel.CuGradient, SoilShearStrengthModel.SuGradient)] - [TestCase(ShearStrengthModel.CuCalculatedYield, SoilShearStrengthModel.SuCalculatedWithYield)] - [TestCase(ShearStrengthModel.CPhiOrCuCalculated, SoilShearStrengthModel.CPhiOrSuCalculated)] public void CanConvertToSoilShearStrengthModel(ShearStrengthModel shearStrengthModel, SoilShearStrengthModel soilShearStrengthModel) { Assert.AreEqual(soilShearStrengthModel, ConversionHelper.ConvertToSoilShearStrengthModel(shearStrengthModel)); } [Test] - [TestCase(SoilShearStrengthModel.None, ShearStrengthModel.None)] [TestCase(SoilShearStrengthModel.CPhi, ShearStrengthModel.CPhi)] - [TestCase(SoilShearStrengthModel.StressTable, ShearStrengthModel.StressTable)] - [TestCase(SoilShearStrengthModel.PseudoValues, ShearStrengthModel.PseudoValues)] - [TestCase(SoilShearStrengthModel.SuMeasured, ShearStrengthModel.CuMeasured)] [TestCase(SoilShearStrengthModel.SuCalculated, ShearStrengthModel.CuCalculated)] - [TestCase(SoilShearStrengthModel.SuGradient, ShearStrengthModel.CuGradient)] - [TestCase(SoilShearStrengthModel.SuCalculatedWithYield, ShearStrengthModel.CuCalculatedYield)] - [TestCase(SoilShearStrengthModel.CPhiOrSuCalculated, ShearStrengthModel.CPhiOrCuCalculated)] public void CanConvertToShearStrengthModel(SoilShearStrengthModel soilShearStrengthModel, ShearStrengthModel shearStrengthModel) { Assert.AreEqual(shearStrengthModel, ConversionHelper.ConvertToShearStrengthModel(soilShearStrengthModel)); Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/ConversionHelper.cs =================================================================== diff -u -r4377 -r4419 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/ConversionHelper.cs (.../ConversionHelper.cs) (revision 4377) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/ConversionHelper.cs (.../ConversionHelper.cs) (revision 4419) @@ -1248,31 +1248,10 @@ var translationTable = new Dictionary { { - ShearStrengthModel.None, SoilShearStrengthModel.None - }, - { ShearStrengthModel.CPhi, SoilShearStrengthModel.CPhi }, { - ShearStrengthModel.StressTable, SoilShearStrengthModel.StressTable - }, - { - ShearStrengthModel.PseudoValues, SoilShearStrengthModel.PseudoValues - }, - { - ShearStrengthModel.CuMeasured, SoilShearStrengthModel.SuMeasured - }, - { ShearStrengthModel.CuCalculated, SoilShearStrengthModel.SuCalculated - }, - { - ShearStrengthModel.CuGradient, SoilShearStrengthModel.SuGradient - }, - { - ShearStrengthModel.CuCalculatedYield, SoilShearStrengthModel.SuCalculatedWithYield - }, - { - ShearStrengthModel.CPhiOrCuCalculated, SoilShearStrengthModel.CPhiOrSuCalculated } }; return translationTable[shearStrengthModel]; @@ -1288,31 +1267,10 @@ var translationTable = new Dictionary { { - SoilShearStrengthModel.None, ShearStrengthModel.None - }, - { SoilShearStrengthModel.CPhi, ShearStrengthModel.CPhi }, { - SoilShearStrengthModel.StressTable, ShearStrengthModel.StressTable - }, - { - SoilShearStrengthModel.PseudoValues, ShearStrengthModel.PseudoValues - }, - { - SoilShearStrengthModel.SuMeasured, ShearStrengthModel.CuMeasured - }, - { SoilShearStrengthModel.SuCalculated, ShearStrengthModel.CuCalculated - }, - { - SoilShearStrengthModel.SuGradient, ShearStrengthModel.CuGradient - }, - { - SoilShearStrengthModel.SuCalculatedWithYield, ShearStrengthModel.CuCalculatedYield - }, - { - SoilShearStrengthModel.CPhiOrSuCalculated, ShearStrengthModel.CPhiOrCuCalculated } }; return translationTable[soilShearStrengthModel];