Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityCommon/ConversionHelperTests.cs
===================================================================
diff -u -r2017 -r2018
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityCommon/ConversionHelperTests.cs	(.../ConversionHelperTests.cs)	(revision 2017)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityCommon/ConversionHelperTests.cs	(.../ConversionHelperTests.cs)	(revision 2018)
@@ -27,6 +27,8 @@
 using Deltares.MacroStability.Geometry;
 using KellermanSoftware.CompareNetObjects;
 using NUnit.Framework;
+using CharacteristicPointType = Deltares.DamEngine.Data.Geotechnics.CharacteristicPointType;
+using ShearStrengthModel = Deltares.DamEngine.Data.Geotechnics.ShearStrengthModel;
 using Soil = Deltares.DamEngine.Data.Geotechnics.Soil;
 
 namespace Deltares.DamEngine.Calculators.Tests.KernelWrappers.MacroStabilityCommon
@@ -147,6 +149,36 @@
         }
         #endregion
 
+        #region ShearStrengthModel
+        [TestCase(MacroStability.Geometry.ShearStrengthModel.CPhi, ShearStrengthModel.CPhi)]
+        [TestCase(MacroStability.Geometry.ShearStrengthModel.CPhiOrCuCalculated, ShearStrengthModel.CPhiOrSuCalculated)]
+        [TestCase(MacroStability.Geometry.ShearStrengthModel.CuCalculated, ShearStrengthModel.SuCalculated)]
+        [TestCase(MacroStability.Geometry.ShearStrengthModel.CuGradient, ShearStrengthModel.SuGradient)]
+        [TestCase(MacroStability.Geometry.ShearStrengthModel.CuMeasured, ShearStrengthModel.SuMeasured)]
+        [TestCase(MacroStability.Geometry.ShearStrengthModel.None, ShearStrengthModel.None)]
+        [TestCase(MacroStability.Geometry.ShearStrengthModel.PseudoValues, ShearStrengthModel.PseudoValues)]
+        [TestCase(MacroStability.Geometry.ShearStrengthModel.StressTable, ShearStrengthModel.StressTable)]
+        public static void CanConvertToConvertToDamShearStrengthModel(
+            MacroStability.Geometry.ShearStrengthModel kernelShearStrengthModel, ShearStrengthModel damShearStrengthModel)
+        {
+            Assert.AreEqual(damShearStrengthModel, ConversionHelper.ConvertToDamShearStrengthModel(kernelShearStrengthModel));
+        }
+
+        [TestCase(ShearStrengthModel.CPhi, MacroStability.Geometry.ShearStrengthModel.CPhi)]
+        [TestCase(ShearStrengthModel.CPhiOrSuCalculated, MacroStability.Geometry.ShearStrengthModel.CPhiOrCuCalculated)]
+        [TestCase(ShearStrengthModel.None, MacroStability.Geometry.ShearStrengthModel.None)]
+        [TestCase(ShearStrengthModel.PseudoValues, MacroStability.Geometry.ShearStrengthModel.PseudoValues)]
+        [TestCase(ShearStrengthModel.StressTable, MacroStability.Geometry.ShearStrengthModel.StressTable)]
+        [TestCase(ShearStrengthModel.SuCalculated, MacroStability.Geometry.ShearStrengthModel.CuCalculated)]
+        [TestCase(ShearStrengthModel.SuGradient, MacroStability.Geometry.ShearStrengthModel.CuGradient)]
+        [TestCase(ShearStrengthModel.SuMeasured, MacroStability.Geometry.ShearStrengthModel.CuMeasured)]
+        public static void CanConvertToConvertToMacroStabilityShearStrengthModel(
+            ShearStrengthModel damShearStrengthModel, MacroStability.Geometry.ShearStrengthModel kernelShearStrengthModel)
+        {
+            Assert.AreEqual(kernelShearStrengthModel, ConversionHelper.ConvertToMacroStabilityShearStrengthModel(damShearStrengthModel));
+        }
+        #endregion
+
         #region WaterpressureInterpolationModel
         [TestCase(Data.Geotechnics.WaterpressureInterpolationModel.Automatic, WaterpressureInterpolationModel.Automatic)]
         [TestCase(Data.Geotechnics.WaterpressureInterpolationModel.Hydrostatic, WaterpressureInterpolationModel.Hydrostatic)]
@@ -165,5 +197,55 @@
         }
         #endregion
 
+        #region CharacteristicPointType
+        [TestCase(CharacteristicPointType.BottomDitchPolderSide, MacroStability.Geometry.CharacteristicPointType.BottomDitchPolderSide)]
+        [TestCase(CharacteristicPointType.BottomDitchDikeSide, MacroStability.Geometry.CharacteristicPointType.BottomDitchDikeSide)]
+        [TestCase(CharacteristicPointType.DikeLine, MacroStability.Geometry.CharacteristicPointType.DikeLine)]
+        [TestCase(CharacteristicPointType.DikeToeAtPolder, MacroStability.Geometry.CharacteristicPointType.DikeToeAtPolder)]
+        [TestCase(CharacteristicPointType.DikeToeAtRiver, MacroStability.Geometry.CharacteristicPointType.DikeToeAtRiver)]
+        [TestCase(CharacteristicPointType.DikeTopAtPolder, MacroStability.Geometry.CharacteristicPointType.DikeTopAtPolder)]
+        [TestCase(CharacteristicPointType.DikeTopAtRiver, MacroStability.Geometry.CharacteristicPointType.DikeTopAtRiver)]
+        [TestCase(CharacteristicPointType.DitchDikeSide, MacroStability.Geometry.CharacteristicPointType.DitchDikeSide)]
+        [TestCase(CharacteristicPointType.DitchPolderSide, MacroStability.Geometry.CharacteristicPointType.DitchPolderSide)]
+        [TestCase(CharacteristicPointType.None, MacroStability.Geometry.CharacteristicPointType.None)]
+        [TestCase(CharacteristicPointType.ShoulderBaseInside, MacroStability.Geometry.CharacteristicPointType.ShoulderBaseInside)]
+        [TestCase(CharacteristicPointType.ShoulderBaseOutside, MacroStability.Geometry.CharacteristicPointType.ShoulderBaseOutside)]
+        [TestCase(CharacteristicPointType.ShoulderTopInside, MacroStability.Geometry.CharacteristicPointType.ShoulderTopInside)]
+        [TestCase(CharacteristicPointType.ShoulderTopOutside, MacroStability.Geometry.CharacteristicPointType.ShoulderTopOutside)]
+        [TestCase(CharacteristicPointType.SurfaceLevelInside, MacroStability.Geometry.CharacteristicPointType.SurfaceLevelInside)]
+        [TestCase(CharacteristicPointType.SurfaceLevelOutside, MacroStability.Geometry.CharacteristicPointType.SurfaceLevelOutside)]
+        [TestCase(CharacteristicPointType.TrafficLoadInside, MacroStability.Geometry.CharacteristicPointType.TrafficLoadInside)]
+        [TestCase(CharacteristicPointType.TrafficLoadOutside, MacroStability.Geometry.CharacteristicPointType.TrafficLoadOutside)]
+        public static void CanConvertToMacroStabilityWaterpressureInterpolationModel(
+            CharacteristicPointType damCharacteristicPointType, MacroStability.Geometry.CharacteristicPointType kernelCharacteristicPointType)
+        {
+            Assert.AreEqual(kernelCharacteristicPointType, ConversionHelper.ConvertToMacroStabilityCharacteristicPointType(damCharacteristicPointType));
+        }
+
+        [TestCase(MacroStability.Geometry.CharacteristicPointType.BottomDitchDikeSide, CharacteristicPointType.BottomDitchDikeSide)]
+        [TestCase(MacroStability.Geometry.CharacteristicPointType.BottomDitchPolderSide, CharacteristicPointType.BottomDitchPolderSide)]
+        [TestCase(MacroStability.Geometry.CharacteristicPointType.DikeLine, CharacteristicPointType.DikeLine)]
+        [TestCase(MacroStability.Geometry.CharacteristicPointType.DikeToeAtPolder, CharacteristicPointType.DikeToeAtPolder)]
+        [TestCase(MacroStability.Geometry.CharacteristicPointType.DikeToeAtRiver, CharacteristicPointType.DikeToeAtRiver)]
+        [TestCase(MacroStability.Geometry.CharacteristicPointType.DikeTopAtPolder, CharacteristicPointType.DikeTopAtPolder)]
+        [TestCase(MacroStability.Geometry.CharacteristicPointType.DikeTopAtRiver, CharacteristicPointType.DikeTopAtRiver)]
+        [TestCase(MacroStability.Geometry.CharacteristicPointType.DitchDikeSide, CharacteristicPointType.DitchDikeSide)]
+        [TestCase(MacroStability.Geometry.CharacteristicPointType.DitchPolderSide, CharacteristicPointType.DitchPolderSide)]
+        [TestCase(MacroStability.Geometry.CharacteristicPointType.None, CharacteristicPointType.None)]
+        [TestCase(MacroStability.Geometry.CharacteristicPointType.ShoulderBaseInside, CharacteristicPointType.ShoulderBaseInside)]
+        [TestCase(MacroStability.Geometry.CharacteristicPointType.ShoulderBaseOutside, CharacteristicPointType.ShoulderBaseOutside)]
+        [TestCase(MacroStability.Geometry.CharacteristicPointType.ShoulderTopInside, CharacteristicPointType.ShoulderTopInside)]
+        [TestCase(MacroStability.Geometry.CharacteristicPointType.ShoulderTopOutside, CharacteristicPointType.ShoulderTopOutside)]
+        [TestCase(MacroStability.Geometry.CharacteristicPointType.SurfaceLevelInside, CharacteristicPointType.SurfaceLevelInside)]
+        [TestCase(MacroStability.Geometry.CharacteristicPointType.SurfaceLevelOutside, CharacteristicPointType.SurfaceLevelOutside)]
+        [TestCase(MacroStability.Geometry.CharacteristicPointType.TrafficLoadInside, CharacteristicPointType.TrafficLoadInside)]
+        [TestCase(MacroStability.Geometry.CharacteristicPointType.TrafficLoadOutside, CharacteristicPointType.TrafficLoadOutside)]
+        public static void CanConvertToDamWaterpressureInterpolationModel(
+            MacroStability.Geometry.CharacteristicPointType kernelCharacteristicPointType, CharacteristicPointType damCharacteristicPointType)
+        {
+            Assert.AreEqual(damCharacteristicPointType, ConversionHelper.ConvertToDamCharacteristicPointType(kernelCharacteristicPointType));
+        }
+        #endregion
+
     }
 }
Index: DamEngine/trunk/doc/Dam Engine - Technical Design/DAM Engine - Technical Design.pdf
===================================================================
diff -u -r2006 -r2018
Binary files differ
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityCommon/MacroStabilityIoTests.cs
===================================================================
diff -u -r2017 -r2018
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityCommon/MacroStabilityIoTests.cs	(.../MacroStabilityIoTests.cs)	(revision 2017)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityCommon/MacroStabilityIoTests.cs	(.../MacroStabilityIoTests.cs)	(revision 2018)
@@ -33,6 +33,7 @@
 using Deltares.MacroStability.Geometry;
 using Deltares.MacroStability.Standard;
 using KellermanSoftware.CompareNetObjects;
+using CharacteristicPointSet = Deltares.MacroStability.Geometry.CharacteristicPointSet;
 using Soil = Deltares.MacroStability.Geometry.Soil;
 using SoilProfile2D = Deltares.DamEngine.Data.Geotechnics.SoilProfile2D;
 using SurfaceLine2 = Deltares.DamEngine.Data.Geotechnics.SurfaceLine2;
@@ -44,8 +45,18 @@
     {
         private const string WtiFilesMap = @"KernelWrappers\MacroStabilityCommon\TestFiles";
 
+        private static readonly List<string> SoilParametersToIgnore = new List<string>()
+        {
+            "StrengthIncreaseExponent",
+            "RRatio",
+            "RheologicalCoefficient",
+            "BondStressCurve",
+            "UseSoilType"
+        };
+
         [TestCase("Benchmark 1-01b.wti")]
         [TestCase("Benchmark 2-04a.wti")]
+        [TestCase("bm3-10c.wti")]
         public void GivenWtiFileWhenDeserializingAndSerializingThenTheStringsAreEqual(string fileNameIn)
         {
             // Given WTI file
@@ -112,6 +123,7 @@
 
         [TestCase("Benchmark 1-01b.wti")]
         [TestCase("Benchmark 2-04a.wti")]
+        [TestCase("bm3-10c.wti")]
         public void GivenWtiFileWhenFillingToDamEngineDataAndWritingBackToKernelDataThenTheKernelModelsAreEqual(string fileNameIn)
         {
             // Given Wti file
@@ -142,19 +154,24 @@
             CompareStabilityModel(expectedKernelModel.StabilityModel, actualKernelModel.StabilityModel);
             CompareSoilModel(expectedKernelModel.StabilityModel.SoilModel, actualKernelModel.StabilityModel.SoilModel);
             CompareSoilProfile2D(expectedKernelModel.StabilityModel.SoilProfile, actualKernelModel.StabilityModel.SoilProfile);
+            CompareSoilSurfaceLine(expectedKernelModel.PreprocessingModel.LastStage.SurfaceLine.CharacteristicPoints, 
+                actualKernelModel.PreprocessingModel.LastStage.SurfaceLine.CharacteristicPoints);
         }
 
-        private void CompareSoilProfile2D(MacroStability.Geometry.SoilProfile2D expectedSoilProfile, MacroStability.Geometry.SoilProfile2D actualSoilProfile)
+        private void CompareSoilSurfaceLine(CharacteristicPointSet expectedCharacteristicPoints, CharacteristicPointSet actualCharacteristicPoints)
         {
             var compare = new CompareLogic { Config = { MaxDifferences = 100 } };
-            compare.Config.MembersToIgnore = new List<string>
+            compare.Config.MembersToIgnore = new List<string>()
             {
-                "StrengthIncreaseExponent",
-                "RRatio",
-                "RheologicalCoefficient",
-                "BondStressCurve",
-                "UseSoilType"
-            };
+                "Owner"
+            }; var result = compare.Compare(expectedCharacteristicPoints, actualCharacteristicPoints);
+            Assert.AreEqual(0, result.Differences.Count, "Differences found read/write kernel SurfaceLine");
+        }
+
+        private void CompareSoilProfile2D(MacroStability.Geometry.SoilProfile2D expectedSoilProfile, MacroStability.Geometry.SoilProfile2D actualSoilProfile)
+        {
+            var compare = new CompareLogic { Config = { MaxDifferences = 100 } };
+            compare.Config.MembersToIgnore = SoilParametersToIgnore;
             var result = compare.Compare(expectedSoilProfile, actualSoilProfile);
             Assert.AreEqual(0, result.Differences.Count, "Differences found read/write kernel SoilProfile2D");
         }
@@ -168,16 +185,9 @@
                 var actualSoil = actualSoilModel.Soils.First(soil => soil.Name.Equals(expectedSoil.Name));
                 Assert.IsNotNull(actualSoil, string.Format("Soil {0} not found", expectedSoil.Name));
                 var compare = new CompareLogic { Config = { MaxDifferences = 100 } };
-                compare.Config.MembersToIgnore = new List<string>
-                {
-                    "StrengthIncreaseExponent",
-                    "RRatio",
-                    "RheologicalCoefficient",
-                    "BondStressCurve",
-                    "UseSoilType"
-                };
+                compare.Config.MembersToIgnore = SoilParametersToIgnore;
                 var result = compare.Compare(expectedSoil, actualSoil);
-                Assert.AreEqual(0, result.Differences.Count, "Differences found read/write kernel SoilProfile");
+                Assert.AreEqual(0, result.Differences.Count, "Differences found read/write kernel SoilModel");
             }
         }
 
Index: DamEngine/trunk/doc/Dam Engine - Technical Design/DAM Engine - Technical Design.tex
===================================================================
diff -u -r2006 -r2018
--- DamEngine/trunk/doc/Dam Engine - Technical Design/DAM Engine - Technical Design.tex	(.../DAM Engine - Technical Design.tex)	(revision 2006)
+++ DamEngine/trunk/doc/Dam Engine - Technical Design/DAM Engine - Technical Design.tex	(.../DAM Engine - Technical Design.tex)	(revision 2018)
@@ -894,11 +894,10 @@
 		DilatancyType & DilatancyType \\ \hline
 		Cohesion & Cohesion \\ \hline
 		FrictionAngle & FrictionAngle \\ \hline
-		UsePop & UsePop \\ \hline
-		POP & POP \\ \hline
 		RatioCuPc & RatioCuPc \\ \hline
 		StrengthIncreaseExponent & StrengthIncreaseExponent  \\ \hline
 		OCR & OCR \\ \hline
+		ShearStrengthModel & ShearStrengthModel \\ \hline
 	\end{tabular}
 	\caption{\small Mapping of the \WbiKernel Soils to the \ProgramName Soils.}
 	\label{table-MappingDamEngineSoilsWbiMacrostability}
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityCommon/TestFiles/bm3-10c.wti
===================================================================
diff -u
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityCommon/TestFiles/bm3-10c.wti	(revision 0)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityCommon/TestFiles/bm3-10c.wti	(revision 2018)
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="utf-8"?><WTIStabilityModel MoveGrid="false" MaximumSliceWidth="0.4" SearchAlgorithm="Grid" ModelOption="UpliftVan" Orientation="Inwards"><VersionInfo FileVersion="1" ProgramVersion="v4.0.30319" /><SoilModel><Soils><Soil Key="1" Name="Clay" AbovePhreaticLevel="18" BelowPhreaticLevel="20" DilatancyType="Zero" Cohesion="2" FrictionAngle="25" RatioCuPc="0.2" StrengthIncreaseExponent="0.6" ShearStrengthModel="CuCalculated" UsePop="false" POP="0" OCR="1" /><Soil Key="2" Name="Clay (1)" AbovePhreaticLevel="18" BelowPhreaticLevel="20" DilatancyType="Zero" Cohesion="2" FrictionAngle="25" RatioCuPc="0.2" StrengthIncreaseExponent="0.6" ShearStrengthModel="CuCalculated" UsePop="false" POP="0" OCR="1" /><Soil Key="3" Name="Sand" AbovePhreaticLevel="17" BelowPhreaticLevel="17" DilatancyType="Zero" Cohesion="20" FrictionAngle="30" RatioCuPc="0.3" StrengthIncreaseExponent="0.7" ShearStrengthModel="CuCalculated" UsePop="false" POP="0" OCR="1" /><Soil Key="4" Name="Sand (1)" AbovePhreaticLevel="17" BelowPhreaticLevel="17" DilatancyType="Zero" Cohesion="20" FrictionAngle="30" RatioCuPc="0.3" StrengthIncreaseExponent="0.7" ShearStrengthModel="CuCalculated" UsePop="false" POP="0" OCR="1" /><Soil Key="5" Name="Peat" AbovePhreaticLevel="14" BelowPhreaticLevel="14" DilatancyType="Zero" Cohesion="0" FrictionAngle="15" RatioCuPc="0.4" StrengthIncreaseExponent="0.8" ShearStrengthModel="CuCalculated" UsePop="false" POP="0" OCR="1" /><Soil Key="6" Name="Peat (1)" AbovePhreaticLevel="14" BelowPhreaticLevel="14" DilatancyType="Zero" Cohesion="0" FrictionAngle="15" RatioCuPc="0.4" StrengthIncreaseExponent="0.8" ShearStrengthModel="CuCalculated" UsePop="false" POP="0" OCR="1" /><Soil Key="7" Name="Pleistocene" AbovePhreaticLevel="18" BelowPhreaticLevel="20" DilatancyType="Zero" Cohesion="30" FrictionAngle="35" RatioCuPc="0.5" StrengthIncreaseExponent="0.9" ShearStrengthModel="CuCalculated" UsePop="false" POP="0" OCR="1" /><Soil Key="8" Name="Pleistocene (1)" AbovePhreaticLevel="18" BelowPhreaticLevel="20" DilatancyType="Zero" Cohesion="30" FrictionAngle="35" RatioCuPc="0.5" StrengthIncreaseExponent="0.9" ShearStrengthModel="CuCalculated" UsePop="false" POP="0" OCR="1" /></Soils></SoilModel><SoilProfile><Geometry Left="0" Right="100" Bottom="-5"><Points><Point Key="9" X="0" Z="0" /><Point Key="10" X="40" Z="0" /><Point Key="11" X="43" Z="1.8" /><Point Key="12" X="44" Z="1.8" /><Point Key="13" X="47.5" Z="4.6" /><Point Key="14" X="53.5" Z="4.5" /><Point Key="15" X="57" Z="2.3" /><Point Key="16" X="58.5" Z="2" /><Point Key="17" X="61.5" Z="0" /><Point Key="18" X="71.5" Z="-0.2" /><Point Key="19" X="71.7" Z="-0.3" /><Point Key="20" X="73.5" Z="-1.2" /><Point Key="21" X="73.5" Z="-1.4" /><Point Key="22" X="0" Z="-1.4" /><Point Key="23" X="74.5" Z="-1.15" /><Point Key="24" X="76" Z="0" /><Point Key="25" X="100" Z="0" /><Point Key="26" X="100" Z="-1.4" /><Point Key="27" X="73.5" Z="-1.7" /><Point Key="28" X="0" Z="-1.7" /><Point Key="29" X="100" Z="-1.7" /><Point Key="30" X="73.5" Z="-2.2" /><Point Key="31" X="0" Z="-2.2" /><Point Key="32" X="100" Z="-2.2" /><Point Key="33" X="73.5" Z="-2.4" /><Point Key="34" X="0" Z="-2.4" /><Point Key="35" X="100" Z="-2.4" /><Point Key="36" X="73.5" Z="-2.9" /><Point Key="37" X="0" Z="-2.9" /><Point Key="38" X="100" Z="-2.9" /><Point Key="39" X="73.5" Z="-3.2" /><Point Key="40" X="0" Z="-3.2" /><Point Key="41" X="100" Z="-3.2" /><Point Key="42" X="73.5" Z="-5" /><Point Key="43" X="0" Z="-5" /><Point Key="44" X="100" Z="-5" /></Points><Curves><Curve Key="45" HeadPoint="9" EndPoint="10" /><Curve Key="46" HeadPoint="10" EndPoint="11" /><Curve Key="47" HeadPoint="11" EndPoint="12" /><Curve Key="48" HeadPoint="12" EndPoint="13" /><Curve Key="49" HeadPoint="13" EndPoint="14" /><Curve Key="50" HeadPoint="14" EndPoint="15" /><Curve Key="51" HeadPoint="15" EndPoint="16" /><Curve Key="52" HeadPoint="16" EndPoint="17" /><Curve Key="53" HeadPoint="17" EndPoint="18" /><Curve Key="54" HeadPoint="18" EndPoint="19" /><Curve Key="55" HeadPoint="19" EndPoint="20" /><Curve Key="56" HeadPoint="21" EndPoint="20" /><Curve Key="57" HeadPoint="22" EndPoint="21" /><Curve Key="58" HeadPoint="22" EndPoint="9" /><Curve Key="59" HeadPoint="20" EndPoint="23" /><Curve Key="60" HeadPoint="23" EndPoint="24" /><Curve Key="61" HeadPoint="24" EndPoint="25" /><Curve Key="62" HeadPoint="26" EndPoint="25" /><Curve Key="63" HeadPoint="21" EndPoint="26" /><Curve Key="64" HeadPoint="27" EndPoint="21" /><Curve Key="65" HeadPoint="28" EndPoint="27" /><Curve Key="66" HeadPoint="28" EndPoint="22" /><Curve Key="67" HeadPoint="29" EndPoint="26" /><Curve Key="68" HeadPoint="27" EndPoint="29" /><Curve Key="69" HeadPoint="30" EndPoint="27" /><Curve Key="70" HeadPoint="31" EndPoint="30" /><Curve Key="71" HeadPoint="31" EndPoint="28" /><Curve Key="72" HeadPoint="32" EndPoint="29" /><Curve Key="73" HeadPoint="30" EndPoint="32" /><Curve Key="74" HeadPoint="33" EndPoint="30" /><Curve Key="75" HeadPoint="34" EndPoint="33" /><Curve Key="76" HeadPoint="34" EndPoint="31" /><Curve Key="77" HeadPoint="35" EndPoint="32" /><Curve Key="78" HeadPoint="33" EndPoint="35" /><Curve Key="79" HeadPoint="36" EndPoint="33" /><Curve Key="80" HeadPoint="37" EndPoint="36" /><Curve Key="81" HeadPoint="37" EndPoint="34" /><Curve Key="82" HeadPoint="38" EndPoint="35" /><Curve Key="83" HeadPoint="36" EndPoint="38" /><Curve Key="84" HeadPoint="39" EndPoint="36" /><Curve Key="85" HeadPoint="40" EndPoint="39" /><Curve Key="86" HeadPoint="40" EndPoint="37" /><Curve Key="87" HeadPoint="41" EndPoint="38" /><Curve Key="88" HeadPoint="39" EndPoint="41" /><Curve Key="89" HeadPoint="42" EndPoint="39" /><Curve Key="90" HeadPoint="43" EndPoint="42" /><Curve Key="91" HeadPoint="43" EndPoint="40" /><Curve Key="92" HeadPoint="44" EndPoint="41" /><Curve Key="93" HeadPoint="42" EndPoint="44" /></Curves><Loops><Loop Key="94"><Curves><Curve Curve="45" /><Curve Curve="46" /><Curve Curve="47" /><Curve Curve="48" /><Curve Curve="49" /><Curve Curve="50" /><Curve Curve="51" /><Curve Curve="52" /><Curve Curve="53" /><Curve Curve="54" /><Curve Curve="55" /><Curve Curve="56" /><Curve Curve="57" /><Curve Curve="58" /></Curves></Loop><Loop Key="95"><Curves><Curve Curve="56" /><Curve Curve="59" /><Curve Curve="60" /><Curve Curve="61" /><Curve Curve="62" /><Curve Curve="63" /></Curves></Loop><Loop Key="96"><Curves><Curve Curve="57" /><Curve Curve="64" /><Curve Curve="65" /><Curve Curve="66" /></Curves></Loop><Loop Key="97"><Curves><Curve Curve="63" /><Curve Curve="67" /><Curve Curve="68" /><Curve Curve="64" /></Curves></Loop><Loop Key="98"><Curves><Curve Curve="65" /><Curve Curve="69" /><Curve Curve="70" /><Curve Curve="71" /></Curves></Loop><Loop Key="99"><Curves><Curve Curve="68" /><Curve Curve="72" /><Curve Curve="73" /><Curve Curve="69" /></Curves></Loop><Loop Key="100"><Curves><Curve Curve="70" /><Curve Curve="74" /><Curve Curve="75" /><Curve Curve="76" /></Curves></Loop><Loop Key="101"><Curves><Curve Curve="73" /><Curve Curve="77" /><Curve Curve="78" /><Curve Curve="74" /></Curves></Loop><Loop Key="102"><Curves><Curve Curve="75" /><Curve Curve="79" /><Curve Curve="80" /><Curve Curve="81" /></Curves></Loop><Loop Key="103"><Curves><Curve Curve="78" /><Curve Curve="82" /><Curve Curve="83" /><Curve Curve="79" /></Curves></Loop><Loop Key="104"><Curves><Curve Curve="80" /><Curve Curve="84" /><Curve Curve="85" /><Curve Curve="86" /></Curves></Loop><Loop Key="105"><Curves><Curve Curve="83" /><Curve Curve="87" /><Curve Curve="88" /><Curve Curve="84" /></Curves></Loop><Loop Key="106"><Curves><Curve Curve="85" /><Curve Curve="89" /><Curve Curve="90" /><Curve Curve="91" /></Curves></Loop><Loop Key="107"><Curves><Curve Curve="88" /><Curve Curve="92" /><Curve Curve="93" /><Curve Curve="89" /></Curves></Loop></Loops><Surfaces><Surface Key="108" OuterLoop="94"><InnerLoops /></Surface><Surface Key="109" OuterLoop="95"><InnerLoops /></Surface><Surface Key="110" OuterLoop="96"><InnerLoops /></Surface><Surface Key="111" OuterLoop="97"><InnerLoops /></Surface><Surface Key="112" OuterLoop="98"><InnerLoops /></Surface><Surface Key="113" OuterLoop="99"><InnerLoops /></Surface><Surface Key="114" OuterLoop="100"><InnerLoops /></Surface><Surface Key="115" OuterLoop="101"><InnerLoops /></Surface><Surface Key="116" OuterLoop="102"><InnerLoops /></Surface><Surface Key="117" OuterLoop="103"><InnerLoops /></Surface><Surface Key="118" OuterLoop="104"><InnerLoops /></Surface><Surface Key="119" OuterLoop="105"><InnerLoops /></Surface><Surface Key="120" OuterLoop="106"><InnerLoops /></Surface><Surface Key="121" OuterLoop="107"><InnerLoops /></Surface></Surfaces></Geometry><Surfaces><Surface Soil="1" Surface="108" IsAquifer="false" WaterpressureInterpolationModel="Automatic" Key="122" /><Surface Soil="2" Surface="109" IsAquifer="false" WaterpressureInterpolationModel="Automatic" Key="123" /><Surface Soil="1" Surface="110" IsAquifer="false" WaterpressureInterpolationModel="Automatic" Key="124" /><Surface Soil="2" Surface="111" IsAquifer="false" WaterpressureInterpolationModel="Automatic" Key="125" /><Surface Soil="3" Surface="112" IsAquifer="false" WaterpressureInterpolationModel="Automatic" Key="126" /><Surface Soil="4" Surface="113" IsAquifer="false" WaterpressureInterpolationModel="Automatic" Key="127" /><Surface Soil="5" Surface="114" IsAquifer="false" WaterpressureInterpolationModel="Automatic" Key="128" /><Surface Soil="6" Surface="115" IsAquifer="false" WaterpressureInterpolationModel="Automatic" Key="129" /><Surface Soil="5" Surface="116" IsAquifer="false" WaterpressureInterpolationModel="Automatic" Key="130" /><Surface Soil="6" Surface="117" IsAquifer="false" WaterpressureInterpolationModel="Automatic" Key="131" /><Surface Soil="5" Surface="118" IsAquifer="false" WaterpressureInterpolationModel="Automatic" Key="132" /><Surface Soil="6" Surface="119" IsAquifer="false" WaterpressureInterpolationModel="Automatic" Key="133" /><Surface Soil="7" Surface="120" IsAquifer="false" WaterpressureInterpolationModel="Automatic" Key="134" /><Surface Soil="8" Surface="121" IsAquifer="false" WaterpressureInterpolationModel="Automatic" Key="135" /></Surfaces></SoilProfile><SurfaceLine><CharacteristicPoints><CharacteristicPoint CharacteristicPointType="SurfaceLevelOutside"><GeometryPoint Key="136" X="0" Z="0" /></CharacteristicPoint><CharacteristicPoint CharacteristicPointType="DikeToeAtRiver"><GeometryPoint Key="137" X="40" Z="0" /></CharacteristicPoint><CharacteristicPoint CharacteristicPointType="ShoulderTopOutside"><GeometryPoint Key="138" X="43" Z="1.8" /></CharacteristicPoint><CharacteristicPoint CharacteristicPointType="ShoulderBaseOutside"><GeometryPoint Key="139" X="44" Z="1.8" /></CharacteristicPoint><CharacteristicPoint CharacteristicPointType="DikeTopAtRiver"><GeometryPoint Key="140" X="47.5" Z="4.6" /></CharacteristicPoint><CharacteristicPoint CharacteristicPointType="DikeTopAtPolder"><GeometryPoint Key="141" X="53.5" Z="4.5" /></CharacteristicPoint><CharacteristicPoint CharacteristicPointType="TrafficLoadOutside"><GeometryPoint Key="142" X="57" Z="2.3" /></CharacteristicPoint><CharacteristicPoint CharacteristicPointType="ShoulderBaseInside"><GeometryPoint Key="143" X="57" Z="2.3" /></CharacteristicPoint><CharacteristicPoint CharacteristicPointType="ShoulderTopInside"><GeometryPoint Key="144" X="58.5" Z="2" /></CharacteristicPoint><CharacteristicPoint CharacteristicPointType="TrafficLoadInside"><GeometryPoint Key="145" X="58.5" Z="2" /></CharacteristicPoint><CharacteristicPoint CharacteristicPointType="DikeToeAtPolder"><GeometryPoint Key="146" X="61.5" Z="0" /></CharacteristicPoint><CharacteristicPoint CharacteristicPointType="DitchDikeSide"><GeometryPoint Key="147" X="71.5" Z="-0.2" /></CharacteristicPoint><CharacteristicPoint CharacteristicPointType="BottomDitchDikeSide"><GeometryPoint Key="148" X="73.5" Z="-1.2" /></CharacteristicPoint><CharacteristicPoint CharacteristicPointType="BottomDitchPolderSide"><GeometryPoint Key="149" X="74.5" Z="-1.15" /></CharacteristicPoint><CharacteristicPoint CharacteristicPointType="DitchPolderSide"><GeometryPoint Key="150" X="76" Z="0" /></CharacteristicPoint><CharacteristicPoint CharacteristicPointType="SurfaceLevelInside"><GeometryPoint Key="151" X="100" Z="0" /></CharacteristicPoint></CharacteristicPoints></SurfaceLine><Location DikeSoilScenario="ClayDikeOnClay" WaterLevelRiver="NaN" WaterLevelRiverAverage="NaN" WaterLevelRiverLow="NaN" WaterLevelPolder="NaN" DrainageConstructionPresent="false" XCoordMiddleDrainageConstruction="NaN" ZCoordMiddleDrainageConstruction="NaN" MinimumLevelPhreaticLineAtDikeTopRiver="NaN" MinimumLevelPhreaticLineAtDikeTopPolder="NaN" UseDefaultOffsets="true" PlLineOffsetBelowPointBRingtoetsWti2017="0.5" PlLineOffsetBelowDikeTopAtPolder="1.5" PlLineOffsetBelowShoulderBaseInside="0.1" PlLineOffsetBelowDikeToeAtPolder="0.1" HeadInPLLine2Outwards="NaN" HeadInPLLine2Inwards="0" HeadInPLLine3="NaN" HeadInPLLine4="NaN" AdjustPl3And4ForUplift="true" PenetrationLength="NaN" LeakageLengthOutwardsPl3="300" LeakageLengthInwardsPl3="300" LeakageLengthOutwardsPl4="300" LeakageLengthInwardsPl4="300" /><PreconsolidationStresses><PreconsolidationStress StressValue="43"><Point Key="152" X="49" Z="2.5" /></PreconsolidationStress><PreconsolidationStress StressValue="79"><Point Key="153" X="52.5" Z="0.7" /></PreconsolidationStress><PreconsolidationStress StressValue="84"><Point Key="154" X="53" Z="-1.2" /></PreconsolidationStress><PreconsolidationStress StressValue="75"><Point Key="155" X="57.6" Z="-3.6" /></PreconsolidationStress><PreconsolidationStress StressValue="40"><Point Key="156" X="65" Z="-2.7" /></PreconsolidationStress><PreconsolidationStress StressValue="104"><Point Key="157" X="47.5" Z="-2" /></PreconsolidationStress><PreconsolidationStress StressValue="108"><Point Key="158" X="55.5" Z="-4.8" /></PreconsolidationStress><PreconsolidationStress StressValue="72"><Point Key="159" X="54" Z="-0.8" /></PreconsolidationStress><PreconsolidationStress StressValue="18"><Point Key="160" X="72" Z="-1.3" /></PreconsolidationStress><PreconsolidationStress StressValue="94"><Point Key="161" X="48.5" Z="-3.4" /></PreconsolidationStress></PreconsolidationStresses><UniformLoads /><ConsolidationValues><ConsolidationLoad Key="162" /></ConsolidationValues><MultiplicationFactorsCPhiForUplift /><Waternets><Waternet UnitWeightWater="9.81" IsGenerated="false" IsDaily="false"><PhreaticLine Key="163" Name="Phreatic line"><Points><Point Key="164" X="0" Z="4.3" /><Point Key="165" X="47" Z="4.3" /><Point Key="166" X="61.5" Z="-0.2" /><Point Key="167" X="71.7" Z="-0.3" /><Point Key="168" X="100" Z="-0.3" /></Points></PhreaticLine><HeadLines><HeadLine Key="169" Name="Head line 1"><Points><Point Key="170" X="0" Z="0.9" /><Point Key="171" X="100" Z="0.9" /></Points></HeadLine><HeadLine Key="172" Name="Head line 2"><Points><Point Key="173" X="0" Z="3.8" /><Point Key="174" X="40" Z="3.8" /><Point Key="175" X="61.5" Z="1.4" /><Point Key="176" X="100" Z="1" /></Points></HeadLine><HeadLine Key="177" Name="Head line 3"><Points><Point Key="178" X="0" Z="4" /><Point Key="179" X="40" Z="4" /><Point Key="180" X="61.5" Z="1.5" /><Point Key="181" X="100" Z="1.1" /></Points></HeadLine></HeadLines><WaternetLines /></Waternet></Waternets><SpencerSlipPlanes Auto="false" SlipPlanePosition="High"><UpperSlipPlane /><LowerSlipPlane /></SpencerSlipPlanes><UpliftVanCalculationGrid Auto="false"><LeftGrid GridXLeft="66" GridXRight="66" GridZTop="7" GridZBottom="7" GridXNumber="1" GridZNumber="1" /><RightGrid GridXLeft="73" GridXRight="73" GridZTop="1.5" GridZBottom="1.5" GridXNumber="1" GridZNumber="1" /><TangentLines TangentLineZTop="-3.4" TangentLineZBottom="-3.4" TangentLineNumber="1" AutomaticAtBoundaries="false" /></UpliftVanCalculationGrid><SlipPlaneConstraints SlipPlaneMinDepth="0" SlipPlaneMinLength="0" CreateZones="false" AutomaticForbiddenZones="false" XEntryMin="NaN" XEntryMax="NaN" MaxAllowedAngleBetweenSlices="60" RequiredForcePointsInSlices="0.8" /><GeneticAlgorithmOptions EliteCount="2" PopulationCount="40" GenerationCount="40" MutationRate="0.25" CrossOverScatterFraction="1" CrossOverSinglePointFraction="0" CrossOverDoublePointFraction="0" MutationJumpFraction="1" MutationCreepFraction="0" MutationInverseFraction="0" MutationCreepReduction="0.05" Seed="1" /><LevenbergMarquardtOptions IterationCount="100" Shift="0.0001" DriftGrant="0.0001" ParameterCount="0" VariableCount="0" /></WTIStabilityModel>
\ No newline at end of file
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/ConversionHelper.cs
===================================================================
diff -u -r2002 -r2018
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/ConversionHelper.cs	(.../ConversionHelper.cs)	(revision 2002)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/ConversionHelper.cs	(.../ConversionHelper.cs)	(revision 2018)
@@ -26,6 +26,8 @@
 using Deltares.DamEngine.Data.Standard;
 using Deltares.MacroStability.Data;
 using Deltares.MacroStability.Geometry;
+using CharacteristicPointType = Deltares.DamEngine.Data.Geotechnics.CharacteristicPointType;
+using ShearStrengthModel = Deltares.DamEngine.Data.Geotechnics.ShearStrengthModel;
 using Soil = Deltares.MacroStability.Geometry.Soil;
 using WaterpressureInterpolationModel = Deltares.MacroStability.Geometry.WaterpressureInterpolationModel;
 
@@ -67,6 +69,7 @@
         }
 
         #endregion
+
         #region ModelType
         /// <summary>Converts ModelOption to the MStabModelType.</summary>
         /// <param name="modelOption">The model option.</param>
@@ -158,6 +161,14 @@
                 UseSoilType = true, // TODO find the correct parameter
                 BondStressCurve = null // TODO find the correct parameter
             };
+            if (soil.ShearStrengthModel != null)
+            {
+                macroStabilitySoil.ShearStrengthModel = ConvertToMacroStabilityShearStrengthModel(soil.ShearStrengthModel.Value);
+            }
+            else
+            {
+                macroStabilitySoil.ShearStrengthModel = MacroStability.Geometry.ShearStrengthModel.None;
+            }
             switch (soil.DilatancyType)
             {
                 case DilatancyType.MinusPhi:
@@ -190,6 +201,7 @@
                 // RRatio = 1.01
                 RatioCuPc = soil.RatioCuPc,
                 // RheologicalCoefficient = 1.07,
+                ShearStrengthModel = ConvertToDamShearStrengthModel(soil.ShearStrengthModel),
                 // StrengthIncreaseExponent = 1.08,
                 // UseSoilType = true,
 
@@ -202,7 +214,6 @@
                 //Ocr = 0.00,
                 //PermeabKx = 0.00,
                 //PoP = 0.00,
-                //ShearStrengthModel = ShearStrengthModel.CPhi,
                 //SlopeRestProfile = 0.00,
                 //SoilType = SoilType.Clay,
                 //UseDefaultShearStrengthModel = false,
@@ -227,7 +238,54 @@
             }
             return damSoil;
         }
+
+        /// <summary>Converts to dam ShearStrengthModel.</summary>
+        /// <param name="kernelShearStrengthModel">The kernel ShearStrengthModel.</param>
+        /// <returns></returns>
+        public static ShearStrengthModel ConvertToDamShearStrengthModel(MacroStability.Geometry.ShearStrengthModel kernelShearStrengthModel)
+        {
+            var translationTable = new Dictionary<MacroStability.Geometry.ShearStrengthModel, ShearStrengthModel>()
+            {
+                {MacroStability.Geometry.ShearStrengthModel.CPhi, ShearStrengthModel.CPhi},
+                {MacroStability.Geometry.ShearStrengthModel.CPhiOrCuCalculated, ShearStrengthModel.CPhiOrSuCalculated},
+                {MacroStability.Geometry.ShearStrengthModel.CuCalculated, ShearStrengthModel.SuCalculated},
+                {MacroStability.Geometry.ShearStrengthModel.CuGradient, ShearStrengthModel.SuGradient},
+                {MacroStability.Geometry.ShearStrengthModel.CuMeasured, ShearStrengthModel.SuMeasured},
+                {MacroStability.Geometry.ShearStrengthModel.None, ShearStrengthModel.None},
+                {MacroStability.Geometry.ShearStrengthModel.PseudoValues, ShearStrengthModel.PseudoValues},
+                {MacroStability.Geometry.ShearStrengthModel.StressTable, ShearStrengthModel.StressTable},
+            };
+            return translationTable[kernelShearStrengthModel];
+        }
+
+        /// <summary>Converts to macro stability ShearStrengthModel.</summary>
+        /// <param name="damShearStrengthModel">The dam ShearStrengthModel.</param>
+        /// <returns></returns>
+        /// <exception cref="System.ArgumentException"></exception>
+        public static MacroStability.Geometry.ShearStrengthModel ConvertToMacroStabilityShearStrengthModel(ShearStrengthModel damShearStrengthModel)
+        {
+            if (damShearStrengthModel == ShearStrengthModel.SuCalculatedWithYield)
+            {
+                throw new ArgumentException(string.Format("Cannot convert dam ShearStrengthModel: {0}", damShearStrengthModel));
+            }
+
+            var translationTable = new Dictionary<ShearStrengthModel, MacroStability.Geometry.ShearStrengthModel>()
+            {
+                {ShearStrengthModel.CPhi, MacroStability.Geometry.ShearStrengthModel.CPhi},
+                {ShearStrengthModel.CPhiOrSuCalculated, MacroStability.Geometry.ShearStrengthModel.CPhiOrCuCalculated},
+                {ShearStrengthModel.None, MacroStability.Geometry.ShearStrengthModel.None},
+                {ShearStrengthModel.PseudoValues, MacroStability.Geometry.ShearStrengthModel.PseudoValues},
+                {ShearStrengthModel.StressTable, MacroStability.Geometry.ShearStrengthModel.StressTable},
+                {ShearStrengthModel.SuCalculated, MacroStability.Geometry.ShearStrengthModel.CuCalculated},
+                {ShearStrengthModel.SuGradient, MacroStability.Geometry.ShearStrengthModel.CuGradient},
+                {ShearStrengthModel.SuMeasured, MacroStability.Geometry.ShearStrengthModel.CuMeasured},
+            };
+            return translationTable[damShearStrengthModel];
+        }
+
         #endregion
+
+        #region WaterpressureInterpolationModel
         /// <summary>Converts to macro stability waterpressure interpolation model.</summary>
         /// <param name="waterpressureInterpolationModel">The waterpressure interpolation model.</param>
         /// <returns></returns>
@@ -253,5 +311,66 @@
             };
             return translationTable[waterpressureInterpolationModel];
         }
+        #endregion
+
+        #region CharacteristicPointType
+        /// <summary>Converts the type of to dam characteristic point.</summary>
+        /// <param name="kernelCharacteristicPointType">Type of the kernel characteristic point.</param>
+        /// <returns></returns>
+        public static CharacteristicPointType ConvertToDamCharacteristicPointType(MacroStability.Geometry.CharacteristicPointType kernelCharacteristicPointType)
+        {
+            var translationTable = new Dictionary<MacroStability.Geometry.CharacteristicPointType, CharacteristicPointType>()
+            {
+                {MacroStability.Geometry.CharacteristicPointType.BottomDitchDikeSide, CharacteristicPointType.BottomDitchDikeSide},
+                {MacroStability.Geometry.CharacteristicPointType.BottomDitchPolderSide, CharacteristicPointType.BottomDitchPolderSide},
+                {MacroStability.Geometry.CharacteristicPointType.DikeLine, CharacteristicPointType.DikeLine},
+                {MacroStability.Geometry.CharacteristicPointType.DikeToeAtPolder, CharacteristicPointType.DikeToeAtPolder},
+                {MacroStability.Geometry.CharacteristicPointType.DikeToeAtRiver, CharacteristicPointType.DikeToeAtRiver},
+                {MacroStability.Geometry.CharacteristicPointType.DikeTopAtPolder, CharacteristicPointType.DikeTopAtPolder},
+                {MacroStability.Geometry.CharacteristicPointType.DikeTopAtRiver, CharacteristicPointType.DikeTopAtRiver},
+                {MacroStability.Geometry.CharacteristicPointType.DitchDikeSide, CharacteristicPointType.DitchDikeSide},
+                {MacroStability.Geometry.CharacteristicPointType.DitchPolderSide, CharacteristicPointType.DitchPolderSide},
+                {MacroStability.Geometry.CharacteristicPointType.None, CharacteristicPointType.None},
+                {MacroStability.Geometry.CharacteristicPointType.ShoulderBaseInside, CharacteristicPointType.ShoulderBaseInside},
+                {MacroStability.Geometry.CharacteristicPointType.ShoulderBaseOutside, CharacteristicPointType.ShoulderBaseOutside},
+                {MacroStability.Geometry.CharacteristicPointType.ShoulderTopInside, CharacteristicPointType.ShoulderTopInside},
+                {MacroStability.Geometry.CharacteristicPointType.ShoulderTopOutside, CharacteristicPointType.ShoulderTopOutside},
+                {MacroStability.Geometry.CharacteristicPointType.SurfaceLevelInside, CharacteristicPointType.SurfaceLevelInside},
+                {MacroStability.Geometry.CharacteristicPointType.SurfaceLevelOutside, CharacteristicPointType.SurfaceLevelOutside},
+                {MacroStability.Geometry.CharacteristicPointType.TrafficLoadInside, CharacteristicPointType.TrafficLoadInside},
+                {MacroStability.Geometry.CharacteristicPointType.TrafficLoadOutside, CharacteristicPointType.TrafficLoadOutside}
+            };
+            return translationTable[kernelCharacteristicPointType];
+        }
+
+        /// <summary>Converts the type of to macro stability characteristic point.</summary>
+        /// <param name="damCharacteristicPointType">Type of the dam characteristic point.</param>
+        /// <returns></returns>
+        public static MacroStability.Geometry.CharacteristicPointType ConvertToMacroStabilityCharacteristicPointType(CharacteristicPointType damCharacteristicPointType)
+        {
+            var translationTable = new Dictionary<CharacteristicPointType, MacroStability.Geometry.CharacteristicPointType>()
+            {
+                {CharacteristicPointType.BottomDitchPolderSide, MacroStability.Geometry.CharacteristicPointType.BottomDitchPolderSide},
+                {CharacteristicPointType.BottomDitchDikeSide, MacroStability.Geometry.CharacteristicPointType.BottomDitchDikeSide},
+                {CharacteristicPointType.DikeLine, MacroStability.Geometry.CharacteristicPointType.DikeLine},
+                {CharacteristicPointType.DikeToeAtPolder, MacroStability.Geometry.CharacteristicPointType.DikeToeAtPolder},
+                {CharacteristicPointType.DikeToeAtRiver, MacroStability.Geometry.CharacteristicPointType.DikeToeAtRiver},
+                {CharacteristicPointType.DikeTopAtPolder, MacroStability.Geometry.CharacteristicPointType.DikeTopAtPolder},
+                {CharacteristicPointType.DikeTopAtRiver, MacroStability.Geometry.CharacteristicPointType.DikeTopAtRiver},
+                {CharacteristicPointType.DitchDikeSide, MacroStability.Geometry.CharacteristicPointType.DitchDikeSide},
+                {CharacteristicPointType.DitchPolderSide, MacroStability.Geometry.CharacteristicPointType.DitchPolderSide},
+                {CharacteristicPointType.None, MacroStability.Geometry.CharacteristicPointType.None},
+                {CharacteristicPointType.ShoulderBaseInside, MacroStability.Geometry.CharacteristicPointType.ShoulderBaseInside},
+                {CharacteristicPointType.ShoulderBaseOutside, MacroStability.Geometry.CharacteristicPointType.ShoulderBaseOutside},
+                {CharacteristicPointType.ShoulderTopInside, MacroStability.Geometry.CharacteristicPointType.ShoulderTopInside},
+                {CharacteristicPointType.ShoulderTopOutside, MacroStability.Geometry.CharacteristicPointType.ShoulderTopOutside},
+                {CharacteristicPointType.SurfaceLevelInside, MacroStability.Geometry.CharacteristicPointType.SurfaceLevelInside},
+                {CharacteristicPointType.SurfaceLevelOutside, MacroStability.Geometry.CharacteristicPointType.SurfaceLevelOutside},
+                {CharacteristicPointType.TrafficLoadInside, MacroStability.Geometry.CharacteristicPointType.TrafficLoadInside},
+                {CharacteristicPointType.TrafficLoadOutside, MacroStability.Geometry.CharacteristicPointType.TrafficLoadOutside}
+            };
+            return translationTable[damCharacteristicPointType];
+        }
+        #endregion
     }
 }
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/Deltares.DamEngine.Calculators.Tests.csproj
===================================================================
diff -u -r2005 -r2018
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/Deltares.DamEngine.Calculators.Tests.csproj	(.../Deltares.DamEngine.Calculators.Tests.csproj)	(revision 2005)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/Deltares.DamEngine.Calculators.Tests.csproj	(.../Deltares.DamEngine.Calculators.Tests.csproj)	(revision 2018)
@@ -151,6 +151,9 @@
     <None Include="KernelWrappers\MacroStabilityCommon\TestFiles\Benchmark 2-04a.wti">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
+    <None Include="KernelWrappers\MacroStabilityCommon\TestFiles\bm3-10c.wti">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
   </ItemGroup>
   <ItemGroup>
     <None Include="KernelWrappers\DamMacroStabilityCommon\TestData\DWP_1.sti">
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/FillDamEngineFromWti.cs
===================================================================
diff -u -r2017 -r2018
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/FillDamEngineFromWti.cs	(.../FillDamEngineFromWti.cs)	(revision 2017)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/FillDamEngineFromWti.cs	(.../FillDamEngineFromWti.cs)	(revision 2018)
@@ -21,11 +21,17 @@
 
 using System.Collections.Generic;
 using Deltares.DamEngine.Data.General;
+using Deltares.DamEngine.Data.Geometry;
 using Deltares.DamEngine.Data.Geotechnics;
 using Deltares.MacroStability.Data;
 using Deltares.MacroStability.Kernel;
 using Soil = Deltares.MacroStability.Geometry.Soil;
-using Deltares.MacroStability.Geometry;
+using CharacteristicPoint = Deltares.DamEngine.Data.Geotechnics.CharacteristicPoint;
+using GeometryCurve = Deltares.MacroStability.Geometry.GeometryCurve;
+using GeometryLoop = Deltares.MacroStability.Geometry.GeometryLoop;
+using GeometrySurface = Deltares.MacroStability.Geometry.GeometrySurface;
+using Point2D = Deltares.MacroStability.Geometry.Point2D;
+using SurfaceLine2 = Deltares.DamEngine.Data.Geotechnics.SurfaceLine2;
 
 namespace Deltares.DamEngine.Calculators.KernelWrappers.MacroStabilityCommon.MacroStabilityIo
 {
@@ -62,12 +68,30 @@
             TransferWtiStabilityModel(kernelModel.StabilityModel, FailureMechanismParametersMStab);
             TransferSoils(kernelModel.StabilityModel.Soils);
             TransferSoilProfile2D(kernelModel.StabilityModel.SoilProfile);
-
+            TransferSurfaceLine(kernelModel.PreprocessingModel.LastStage.SurfaceLine, SurfaceLine2);
             //            TransferLocation(kernelModel, Location);
             //            TransferSurfaceLine2(kernelModel, SurfaceLine2);
             //            TransferParametersMStab(kernelModel, FailureMechanismParametersMStab);
         }
 
+        private void TransferSurfaceLine(MacroStability.Geometry.SurfaceLine2 kernelSurfaceLine2, SurfaceLine2 damSurfaceLine)
+        {
+            foreach (var kernelCharPoint in kernelSurfaceLine2.CharacteristicPoints)
+            {
+                CharacteristicPoint damCharPoint;
+                damCharPoint = new CharacteristicPoint()
+                {
+                    CharacteristicPointType = ConversionHelper.ConvertToDamCharacteristicPointType(kernelCharPoint.CharacteristicPointType),
+                    GeometryPoint = new GeometryPoint()
+                    {
+                        X = kernelCharPoint.X,
+                        Z = kernelCharPoint.Z
+                    }
+                };
+                damSurfaceLine.CharacteristicPoints.Add(damCharPoint);
+            }
+        }
+
         private void TransferSoils(IList<Soil> stabilityModelSoils)
         {
             foreach (Soil kernelSoil in stabilityModelSoils)
@@ -189,7 +213,7 @@
             // Add soil surfaces
             foreach (var kernelSoilLayer2D in kernelsoilProfile2D.Surfaces)
             {
-                Data.Geotechnics.SoilLayer2D damSoilLayer2D = new Data.Geotechnics.SoilLayer2D();
+                SoilLayer2D damSoilLayer2D = new SoilLayer2D();
                 damSoilLayer2D.GeometrySurface = dictSurfaces[kernelSoilLayer2D.GeometrySurface];
                 damSoilLayer2D.Soil = dictSoils[kernelSoilLayer2D.Soil.Name];
                 damSoilLayer2D.IsAquifer = kernelSoilLayer2D.IsAquifer;
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/FillWtiKernelData.cs
===================================================================
diff -u -r2017 -r2018
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/FillWtiKernelData.cs	(.../FillWtiKernelData.cs)	(revision 2017)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/FillWtiKernelData.cs	(.../FillWtiKernelData.cs)	(revision 2018)
@@ -26,6 +26,7 @@
 using Deltares.MacroStability.Geometry;
 using Deltares.MacroStability.Kernel;
 using Deltares.MacroStability.Preprocessing;
+using CharacteristicPoint = Deltares.MacroStability.Geometry.CharacteristicPoint;
 using Location = Deltares.MacroStability.WaternetCreator.Location;
 using Soil = Deltares.MacroStability.Geometry.Soil;
 using SoilLayer2D = Deltares.DamEngine.Data.Geotechnics.SoilLayer2D;
@@ -71,7 +72,7 @@
             kernelModel.StabilityModel.SoilProfile = new SoilProfile2D();
             TransferSoilProfile(SoilProfile2D, kernelModel.StabilityModel.SoilProfile);
             kernelModel.PreprocessingModel.LastStage.SurfaceLine = new SurfaceLine2();
-            TransferSurfaceLine(SurfaceLine2, kernelModel.PreprocessingModel.LastStage.SurfaceLine); // TODO
+            TransferSurfaceLine(SurfaceLine2, kernelModel.PreprocessingModel.LastStage.SurfaceLine);
             kernelModel.PreprocessingModel.ConstructionStages.Add(new PreprocessingConstructionStage());
             kernelModel.PreprocessingModel.LastStage.Locations.Add(new Location());
             TransferLocation(Location, kernelModel.PreprocessingModel.LastStage.Locations); // TODO
@@ -87,9 +88,22 @@
             return kernelModel;
         }
 
-        private void TransferSurfaceLine(Data.Geotechnics.SurfaceLine2 surfaceLine2, SurfaceLine2 surfaceLine)
+        private void TransferSurfaceLine(Data.Geotechnics.SurfaceLine2 damSurfaceLine, SurfaceLine2 kernelSurfaceLine)
         {
-            // TODO: to be implemented
+            foreach (var damCharPoint in damSurfaceLine.CharacteristicPoints)
+            {
+                CharacteristicPoint kernelCharPoint;
+                kernelCharPoint = new CharacteristicPoint()
+                {
+                    CharacteristicPointType = ConversionHelper.ConvertToMacroStabilityCharacteristicPointType(damCharPoint.CharacteristicPointType),
+                    GeometryPoint = new GeometryPoint()
+                    {
+                        X = damCharPoint.X,
+                        Z = damCharPoint.Z
+                    }
+                };
+                kernelSurfaceLine.CharacteristicPoints.Add(kernelCharPoint);
+            }
         }
 
         private void TransferSoilProfile(Data.Geotechnics.SoilProfile2D damSoilProfile2D, SoilProfile2D soilProfile2D)