Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityCommon/ConversionHelperTests.cs
===================================================================
diff -u -r2172 -r2822
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityCommon/ConversionHelperTests.cs (.../ConversionHelperTests.cs) (revision 2172)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityCommon/ConversionHelperTests.cs (.../ConversionHelperTests.cs) (revision 2822)
@@ -69,14 +69,18 @@
#region ModelType
[Test]
+ [TestCase(ModelOptions.Bishop, MStabModelType.BishopWti)]
[TestCase(ModelOptions.UpliftVan, MStabModelType.UpliftVanWti)]
+ [TestCase(ModelOptions.UpliftSpencer, MStabModelType.UpliftSpencerWti)]
public void CanConvertToMStabModelType(ModelOptions modelOption, MStabModelType mStabModelType)
{
Assert.AreEqual(mStabModelType, ConversionHelper.ConvertToMStabModelType(modelOption));
}
[Test]
+ [TestCase(MStabModelType.BishopWti, ModelOptions.Bishop)]
[TestCase(MStabModelType.UpliftVanWti, ModelOptions.UpliftVan)]
+ [TestCase(MStabModelType.UpliftSpencerWti, ModelOptions.UpliftSpencer)]
public void CanConvertToModelOptions(MStabModelType mStabModelType, ModelOptions modelOption)
{
Assert.AreEqual(modelOption, ConversionHelper.ConvertToModelOptions(mStabModelType));
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/ConversionHelper.cs
===================================================================
diff -u -r2038 -r2822
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/ConversionHelper.cs (.../ConversionHelper.cs) (revision 2038)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/ConversionHelper.cs (.../ConversionHelper.cs) (revision 2822)
@@ -74,14 +74,17 @@
#region ModelType
/// Converts ModelOption to the MStabModelType.
+ /// This comes back from the kernel side so any model that can be matched is OK.
/// The model option.
/// the Dam MStabModelType
public static MStabModelType ConvertToMStabModelType(ModelOptions modelOption)
{
- // For the macrostability kernel, the only supported option for now is UpliftVan.
+ // For the macrostability kernel, the only really supported option for now is UpliftVan. But the other two could be options in future version
var translationTable = new Dictionary()
{
- {ModelOptions.UpliftVan, MStabModelType.UpliftVanWti}
+ {ModelOptions.Bishop, MStabModelType.BishopWti},
+ {ModelOptions.UpliftVan, MStabModelType.UpliftVanWti },
+ {ModelOptions.UpliftSpencer, MStabModelType.UpliftSpencerWti}
};
return translationTable[modelOption];
}