Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityCommon/MacroStabilityIoTests.cs
===================================================================
diff -u -r3003 -r3004
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityCommon/MacroStabilityIoTests.cs	(.../MacroStabilityIoTests.cs)	(revision 3003)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityCommon/MacroStabilityIoTests.cs	(.../MacroStabilityIoTests.cs)	(revision 3004)
@@ -29,8 +29,7 @@
 using Deltares.DamEngine.Calculators.KernelWrappers.MacroStabilityCommon.MacroStabilityIo;
 using Deltares.DamEngine.Data.Geometry;
 using Deltares.DamEngine.Data.Geotechnics;
-using Deltares.DamEngine.Data.Standard.Calculation;
-using Deltares.DamEngine.TestHelpers;
+using Deltares.DamEngine.Data.Standard.Logging;
 using Deltares.DamEngine.TestHelpers.Factories;
 using Deltares.MacroStability.CSharpWrapper.Output;
 using KellermanSoftware.CompareNetObjects;
@@ -64,17 +63,11 @@
             //ToDo fill this
             var expectedKernelOutput = CreateKernelOutputForTest(testNumber);
 
-            var fillEngineFromMacroStabilityWrapperOutput = new FillEngineFromMacroStabilityWrapperOutput();
-            var dd = fillEngineFromMacroStabilityWrapperOutput.FillEngineDataWithResults(expectedKernelOutput);
-            var kernelOutput = FillMacroStabilityWrapperOutputFromEngine.FillMacroStabilityWrapperOutput(dd, fillEngineFromMacroStabilityWrapperOutput.LogMessages);
+            List<LogMessage> logMessages;
+            var dd = FillEngineFromMacroStabilityWrapperOutput.FillEngineDataWithResults(expectedKernelOutput, out logMessages);
+            var kernelOutput = FillMacroStabilityWrapperOutputFromEngine.FillMacroStabilityWrapperOutput(dd, logMessages);
 
             var compare = new CompareLogic { Config = { MaxDifferences = 100 } };
-            compare.Config.MembersToInclude = new List<string>()
-            {
-                //"XEnd",
-                //"XStart",
-                //"Pressure"
-            };
             ComparisonResult result;
             result = compare.Compare(expectedKernelOutput, kernelOutput);
             Assert.AreEqual(0, result.Differences.Count, "Differences found read/write kernel Output");
@@ -85,8 +78,8 @@
         {
             // Given DamEngine data (DamProjectData)
             DamProjectData expectedDamProjectData = CreateExampleDamProjectData();
-            Data.Geometry.Waternet expectedWaternet = CreateExampleWaternet();
-            UpliftVanCalculationGrid expectedUpliftVanCalculationGrid = CreateExampleUpliftVanCalculationGrid();
+            Waternet expectedWaternet = CreateExampleWaternet();
+            //UpliftVanCalculationGrid expectedUpliftVanCalculationGrid = CreateExampleUpliftVanCalculationGrid();
 
             Location expectedLocation = expectedDamProjectData.Dike.Locations[0];
             SoilList expectedSoilList = expectedDamProjectData.Dike.SoilList;
@@ -101,7 +94,7 @@
             };
             var fillMacroStabilityWrapperInputFromEngine = new FillMacroStabilityWrapperInputFromEngine
             {
-                UpliftVanCalculationGrid = expectedUpliftVanCalculationGrid,
+                //UpliftVanCalculationGrid = expectedUpliftVanCalculationGrid,
                 TrafficLoad = expectedTrafficLoad
             };
             var damKernelInput = new DamKernelInput
@@ -123,37 +116,14 @@
             CompareSoilProfile2D(expectedSoilProfile2D, fillEngineFromMacroStabilityWrapperInput.SoilProfile2D);
             CompareSurfaceLine(expectedSurfaceLine2D, fillEngineFromMacroStabilityWrapperInput.SurfaceLine2);
             CompareTrafficLoad(expectedTrafficLoad, fillEngineFromMacroStabilityWrapperInput.TrafficLoad);
-            CompareUpliftVanCalculationGrid(expectedUpliftVanCalculationGrid, fillEngineFromMacroStabilityWrapperInput.UpliftVanCalculationGrid);
+            var expectedUpliftVanCalculationGridSettings = expectedParametersMStab.MStabParameters.SlipCircleDefinition;
+            CompareUpliftVanCalculationGridSettings(expectedUpliftVanCalculationGridSettings,
+                fillEngineFromMacroStabilityWrapperInput.SlipCircleDefinition);
+            //CompareUpliftVanCalculationGrid(expectedUpliftVanCalculationGrid, fillEngineFromMacroStabilityWrapperInput.UpliftVanCalculationGrid);
             CompareWaternet(expectedWaternet, fillEngineFromMacroStabilityWrapperInput.Waternet);
             //Todo : add and or implement comparer per item as these are added to the code
         }
 
-        private static UpliftVanCalculationGrid CreateExampleUpliftVanCalculationGrid()
-        {
-            var random = new Random(21);
-            var upliftVanCalculationGrid = new UpliftVanCalculationGrid
-            {
-                LeftGridXLeft = random.NextDouble(),
-                LeftGridXRight = random.NextDouble(),
-                LeftGridZTop = random.NextDouble(),
-                LeftGridZBottom = random.NextDouble(),
-                LeftGridXCount = random.Next(),
-                LeftGridZCount = random.Next(),
-
-                RightGridXLeft = random.NextDouble(),
-                RightGridXRight = random.NextDouble(),
-                RightGridZTop = random.NextDouble(),
-                RightGridZBottom = random.NextDouble(),
-                RightGridXCount = random.Next(),
-                RightGridZCount = random.Next(),
-
-                TangentLineZBottom = 0,
-                TangentLineZTop = 10,
-                TangentLineCount = 10
-            };
-            return upliftVanCalculationGrid;
-        }
-
         private static Waternet CreateExampleWaternet()
         {
             var waterNet = new Waternet
@@ -221,26 +191,14 @@
             Assert.AreEqual(0, result.Differences.Count, "Differences found read/write kernel Traffic Load");
         }
 
-        private void CompareUpliftVanCalculationGrid(UpliftVanCalculationGrid expectedSlipPlaneUpliftVan,
-            UpliftVanCalculationGrid actualSlipPlaneUpliftVan)
+        private void CompareUpliftVanCalculationGridSettings(SlipCircleDefinition expectedSlipCircleDefinition,
+            SlipCircleDefinition actualSlipCircleDefinition)
         {
-            Assert.AreEqual(expectedSlipPlaneUpliftVan.LeftGridXLeft, actualSlipPlaneUpliftVan.LeftGridXLeft);
-            Assert.AreEqual(expectedSlipPlaneUpliftVan.LeftGridXRight, actualSlipPlaneUpliftVan.LeftGridXRight);
-            Assert.AreEqual(expectedSlipPlaneUpliftVan.LeftGridZTop, actualSlipPlaneUpliftVan.LeftGridZTop);
-            Assert.AreEqual(expectedSlipPlaneUpliftVan.LeftGridZBottom, actualSlipPlaneUpliftVan.LeftGridZBottom);
-            Assert.AreEqual(expectedSlipPlaneUpliftVan.LeftGridXCount, actualSlipPlaneUpliftVan.LeftGridXCount);
-            Assert.AreEqual(expectedSlipPlaneUpliftVan.LeftGridZCount, actualSlipPlaneUpliftVan.LeftGridZCount);
+            Assert.AreEqual(expectedSlipCircleDefinition.GridSizeDetermination, actualSlipCircleDefinition.GridSizeDetermination);
+            Assert.AreEqual(expectedSlipCircleDefinition.UpliftVanTangentLinesDefinition, actualSlipCircleDefinition.UpliftVanTangentLinesDefinition);
+            // Note: do not test UpliftVanTangentLinesDistance as there is no way to be sure of equal values as determination to and from involves rounding.
+            //Assert.AreEqual(expectedSlipCircleDefinition.UpliftVanTangentLinesDistance, actualSlipCircleDefinition.UpliftVanTangentLinesDistance);
 
-            Assert.AreEqual(expectedSlipPlaneUpliftVan.RightGridXLeft, actualSlipPlaneUpliftVan.RightGridXLeft);
-            Assert.AreEqual(expectedSlipPlaneUpliftVan.RightGridXRight, actualSlipPlaneUpliftVan.RightGridXRight);
-            Assert.AreEqual(expectedSlipPlaneUpliftVan.RightGridZTop, actualSlipPlaneUpliftVan.RightGridZTop);
-            Assert.AreEqual(expectedSlipPlaneUpliftVan.RightGridZBottom, actualSlipPlaneUpliftVan.RightGridZBottom);
-            Assert.AreEqual(expectedSlipPlaneUpliftVan.RightGridXCount, actualSlipPlaneUpliftVan.RightGridXCount);
-            Assert.AreEqual(expectedSlipPlaneUpliftVan.RightGridZCount, actualSlipPlaneUpliftVan.RightGridZCount);
-
-            Assert.AreEqual(expectedSlipPlaneUpliftVan.TangentLineZTop, actualSlipPlaneUpliftVan.TangentLineZTop);
-            Assert.AreEqual(expectedSlipPlaneUpliftVan.TangentLineZBottom, actualSlipPlaneUpliftVan.TangentLineZBottom);
-            Assert.AreEqual(expectedSlipPlaneUpliftVan.TangentLineCount, actualSlipPlaneUpliftVan.TangentLineCount);
         }
 
         private static void CompareWaternet(Waternet expectedWaternet, Waternet actualWaternet)
@@ -319,7 +277,6 @@
             Assert.AreEqual(0, result.Differences.Count, "Differences found read/write kernel SoilProfile2D");
         }
 
-
         private void CompareSoilModel(SoilList expectedSoils, SoilList actualSoils)
         {
             Assert.AreEqual(expectedSoils.Soils.Count, actualSoils.Soils.Count, "Soil Count does not match");
@@ -346,9 +303,9 @@
             return FactoryForDamProjectData.CreateExampleDamProjectData();
         }
 
-        private MacroStability.CSharpWrapper.Output.MacroStabilityOutput CreateKernelOutputForTest(int choice)
+        private MacroStabilityOutput CreateKernelOutputForTest(int choice)
         {
-            var output = new MacroStability.CSharpWrapper.Output.MacroStabilityOutput();
+            var output = new MacroStabilityOutput();
             var messagesOutput = new List<Message>();
             if (choice == 1)
             {