Index: DamEngine/trunk/lib/FailureMechanisms/MacrostabilityCSharpWrapper/Deltares.MacroStability.Preprocessing.dll
===================================================================
diff -u -r3063 -r3220
Binary files differ
Index: DamEngine/trunk/lib/FailureMechanisms/MacrostabilityCSharpWrapper/Deltares.MacroStability.Kernel.dll
===================================================================
diff -u -r3063 -r3220
Binary files differ
Index: DamEngine/trunk/lib/FailureMechanisms/MacrostabilityCSharpWrapper/Deltares.MacroStability.CSharpWrapper.dll
===================================================================
diff -u -r3063 -r3220
Binary files differ
Index: DamEngine/trunk/lib/FailureMechanisms/MacrostabilityCSharpWrapper/Deltares.SoilStress.Data.dll
===================================================================
diff -u -r3063 -r3220
Binary files differ
Index: DamEngine/trunk/lib/FailureMechanisms/MacrostabilityCSharpWrapper/Deltares.MacroStability.WaternetCreator.dll
===================================================================
diff -u -r3063 -r3220
Binary files differ
Index: DamEngine/trunk/lib/FailureMechanisms/MacrostabilityCSharpWrapper/Deltares.SearchAlgorithms.dll
===================================================================
diff -u -r3063 -r3220
Binary files differ
Index: DamEngine/trunk/lib/FailureMechanisms/MacrostabilityCSharpWrapper/Deltares.MacroStability.Geometry.dll
===================================================================
diff -u -r3063 -r3220
Binary files differ
Index: DamEngine/trunk/lib/FailureMechanisms/MacrostabilityCSharpWrapper/Deltares.MacroStability.Io.dll
===================================================================
diff -u -r3063 -r3220
Binary files differ
Index: DamEngine/trunk/lib/FailureMechanisms/MacrostabilityCSharpWrapper/Deltares.MacroStability.Reliability.CSharpWrapper.dll
===================================================================
diff -u -r3063 -r3220
Binary files differ
Index: DamEngine/trunk/lib/FailureMechanisms/MacrostabilityCSharpWrapper/Deltares.MacroStability.Interface.dll
===================================================================
diff -u -r3063 -r3220
Binary files differ
Index: DamEngine/trunk/lib/FailureMechanisms/MacrostabilityCSharpWrapper/Deltares.MacroStability.Data.dll
===================================================================
diff -u -r3063 -r3220
Binary files differ
Index: DamEngine/trunk/lib/FailureMechanisms/MacrostabilityCSharpWrapper/Deltares.MacroStability.Reliability.dll
===================================================================
diff -u -r3063 -r3220
Binary files differ
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityCommon/ConversionHelperTests.cs
===================================================================
diff -u -r3025 -r3220
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityCommon/ConversionHelperTests.cs	(.../ConversionHelperTests.cs)	(revision 3025)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityCommon/ConversionHelperTests.cs	(.../ConversionHelperTests.cs)	(revision 3220)
@@ -167,8 +167,9 @@
                 Dilatancy = 0,
                 RRatio = 1.05,
                 RatioCuPc = 1.06,
+                ShearStrengthAbovePhreaticLevelModel = MacroStability.CSharpWrapper.ShearStrengthModelType.MohrCoulomb,
+                ShearStrengthBelowPhreaticLevelModel = MacroStability.CSharpWrapper.ShearStrengthModelType.MohrCoulomb,
                 //RheologicalCoefficient = 1.07, Not yet to be used
-                ShearStrengthModel = MacroStability.CSharpWrapper.ShearStrengthModelType.CPhiOrCuCalculated,
                 StrengthIncreaseExponent = 1.08,
                 UseSoilClassification = false, // must be false
                 BondStressCurve = null // must be null
@@ -206,18 +207,16 @@
         #endregion
 
         #region ShearStrengthModel
-        [TestCase(MacroStability.CSharpWrapper.ShearStrengthModelType.CPhi, ShearStrengthModel.CPhi)]
-        [TestCase(MacroStability.CSharpWrapper.ShearStrengthModelType.CPhiOrCuCalculated, ShearStrengthModel.CPhiOrSuCalculated)]
-        [TestCase(MacroStability.CSharpWrapper.ShearStrengthModelType.CuCalculated, ShearStrengthModel.SuCalculated)]
+        [TestCase(MacroStability.CSharpWrapper.ShearStrengthModelType.MohrCoulomb, ShearStrengthModel.CPhi)]
+        [TestCase(MacroStability.CSharpWrapper.ShearStrengthModelType.Shansep, ShearStrengthModel.SuCalculated)]
         public static void CanConvertToDamShearStrengthModel(
             MacroStability.CSharpWrapper.ShearStrengthModelType kernelShearStrengthModel, ShearStrengthModel damShearStrengthModel)
         {
             Assert.AreEqual(damShearStrengthModel, ConversionHelper.ConvertToDamShearStrengthModel(kernelShearStrengthModel));
         }
 
-        [TestCase(ShearStrengthModel.CPhi, MacroStability.CSharpWrapper.ShearStrengthModelType.CPhi)]
-        [TestCase(ShearStrengthModel.CPhiOrSuCalculated, MacroStability.CSharpWrapper.ShearStrengthModelType.CPhiOrCuCalculated)]
-        [TestCase(ShearStrengthModel.SuCalculated, MacroStability.CSharpWrapper.ShearStrengthModelType.CuCalculated)]
+        [TestCase(ShearStrengthModel.CPhi, MacroStability.CSharpWrapper.ShearStrengthModelType.Shansep)]
+        [TestCase(ShearStrengthModel.SuCalculated, MacroStability.CSharpWrapper.ShearStrengthModelType.Shansep)]
         public static void CanConvertToMacroStabilityShearStrengthModel(
             ShearStrengthModel damShearStrengthModel, MacroStability.CSharpWrapper.ShearStrengthModelType kernelShearStrengthModel)
         {
Index: DamEngine/trunk/lib/FailureMechanisms/MacrostabilityCSharpWrapper/Deltares.SoilStress.Calculation.dll
===================================================================
diff -u -r3063 -r3220
Binary files differ
Index: DamEngine/trunk/lib/FailureMechanisms/MacrostabilityCSharpWrapper/Deltares.MacroStability.Reliability.Interface.dll
===================================================================
diff -u -r3063 -r3220
Binary files differ
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/ConversionHelper.cs
===================================================================
diff -u -r3025 -r3220
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/ConversionHelper.cs	(.../ConversionHelper.cs)	(revision 3025)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/ConversionHelper.cs	(.../ConversionHelper.cs)	(revision 3220)
@@ -182,11 +182,6 @@
         /// <returns>The MacroStability Soil.</returns>
         public static Soil ConvertToMacroStabilitySoil(Data.Geotechnics.Soil soil)
         {
-            ShearStrengthModel shearStrengthModel = ShearStrengthModel.None;
-            if (soil.ShearStrengthModel != null && soil.ShearStrengthModel.HasValue)
-            {
-                shearStrengthModel = soil.ShearStrengthModel.Value;
-            }
             var macroStabilitySoil = new Soil()
             {
                 Name = soil.Name,
@@ -196,15 +191,14 @@
                 FrictionAngle = soil.FrictionAngle,
                 RRatio = soil.RRatio,
                 RatioCuPc = soil.RatioCuPc,
-                ShearStrengthModel = ConversionHelper.ConvertToMacroStabilityShearStrengthModel(shearStrengthModel),
-                //RheologicalCoefficient = 0.0, //  is purely needed for Nails which are NOT yet to be implemented
                 StrengthIncreaseExponent = soil.StrengthIncreaseExponent,
                 UseSoilClassification = false, // Soil type is not given so make sure it is not used.
                 BondStressCurve = null // these are not supported in DAM so set to null.
             };
             if (soil.ShearStrengthModel != null)
             {
-                macroStabilitySoil.ShearStrengthModel = ConvertToMacroStabilityShearStrengthModel(soil.ShearStrengthModel.Value);
+                macroStabilitySoil.ShearStrengthAbovePhreaticLevelModel = ConvertToMacroStabilityShearStrengthModel(soil.ShearStrengthModel.Value);
+                macroStabilitySoil.ShearStrengthBelowPhreaticLevelModel = ConvertToMacroStabilityShearStrengthModel(soil.ShearStrengthModel.Value);
             }
             
             switch (soil.DilatancyType)
@@ -239,7 +233,8 @@
                 RRatio = soil.RRatio,
                 RatioCuPc = soil.RatioCuPc,
                 // RheologicalCoefficient = 1.07, // is purely needed for Nails which are NOT yet to be implemented
-                ShearStrengthModel = ConvertToDamShearStrengthModel(soil.ShearStrengthModel),
+                //Todo #Bka We keep this as "truth" for now. But maybe Dam should become above/below too
+                ShearStrengthModel = ConvertToDamShearStrengthModel(soil.ShearStrengthAbovePhreaticLevelModel), 
                 StrengthIncreaseExponent = soil.StrengthIncreaseExponent,
                 // Following parameters are not available in MacroStability soil and will not be translated (they are for Piping).
                 //CuBottom = 0.00,
@@ -282,9 +277,8 @@
         {
             var translationTable = new Dictionary<ShearStrengthModelKernel, ShearStrengthModel>()
             {
-                {ShearStrengthModelKernel.CPhi, ShearStrengthModel.CPhi},
-                {ShearStrengthModelKernel.CPhiOrCuCalculated, ShearStrengthModel.CPhiOrSuCalculated},
-                {ShearStrengthModelKernel.CuCalculated, ShearStrengthModel.SuCalculated}
+                {ShearStrengthModelKernel.MohrCoulomb, ShearStrengthModel.CPhi},
+                {ShearStrengthModelKernel.Shansep, ShearStrengthModel.SuCalculated}
             };
             return translationTable[kernelShearStrengthModel];
         }
@@ -297,16 +291,16 @@
         {
             if (damShearStrengthModel == ShearStrengthModel.SuCalculatedWithYield || damShearStrengthModel == ShearStrengthModel.None ||
                 damShearStrengthModel == ShearStrengthModel.PseudoValues || damShearStrengthModel == ShearStrengthModel.StressTable ||
-                damShearStrengthModel == ShearStrengthModel.SuGradient || damShearStrengthModel == ShearStrengthModel.SuMeasured)
+                damShearStrengthModel == ShearStrengthModel.SuGradient || damShearStrengthModel == ShearStrengthModel.SuMeasured ||
+                damShearStrengthModel == ShearStrengthModel.CPhiOrSuCalculated)
             {
                 throw new ArgumentException(string.Format("Cannot convert dam ShearStrengthModel: {0}", damShearStrengthModel));
             }
 
             var translationTable = new Dictionary<ShearStrengthModel, ShearStrengthModelKernel>()
             {
-                {ShearStrengthModel.CPhi, ShearStrengthModelKernel.CPhi},
-                {ShearStrengthModel.CPhiOrSuCalculated, ShearStrengthModelKernel.CPhiOrCuCalculated},
-                {ShearStrengthModel.SuCalculated, ShearStrengthModelKernel.CuCalculated}
+                {ShearStrengthModel.CPhi, ShearStrengthModelKernel.MohrCoulomb},
+                {ShearStrengthModel.SuCalculated, ShearStrengthModelKernel.Shansep}
             };
             return translationTable[damShearStrengthModel];
         }
Index: DamEngine/trunk/lib/FailureMechanisms/MacrostabilityCSharpWrapper/Deltares.MacroStability.Reliability.Io.dll
===================================================================
diff -u -r3063 -r3220
Binary files differ
Index: DamEngine/trunk/lib/FailureMechanisms/MacrostabilityCSharpWrapper/Deltares.MacroStability.Calculation.dll
===================================================================
diff -u -r3063 -r3220
Binary files differ
Index: DamEngine/trunk/lib/FailureMechanisms/MacrostabilityCSharpWrapper/Deltares.MacroStability.Standard.dll
===================================================================
diff -u -r3063 -r3220
Binary files differ