Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityOutwards/MacroStabilityOutwardsKernelWrapper.cs
===================================================================
diff -u -r3893 -r4000
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityOutwards/MacroStabilityOutwardsKernelWrapper.cs	(.../MacroStabilityOutwardsKernelWrapper.cs)	(revision 3893)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityOutwards/MacroStabilityOutwardsKernelWrapper.cs	(.../MacroStabilityOutwardsKernelWrapper.cs)	(revision 4000)
@@ -31,13 +31,13 @@
 using Deltares.DamEngine.Calculators.KernelWrappers.MacroStabilityInwards;
 using Deltares.DamEngine.Data.Design;
 using Deltares.DamEngine.Data.General;
+using Deltares.DamEngine.Data.General.PlLines;
 using Deltares.DamEngine.Data.General.Results;
 using Deltares.DamEngine.Data.Geometry;
+using Deltares.DamEngine.Data.Geotechnics;
 using Deltares.DamEngine.Data.Standard.Calculation;
 using Deltares.DamEngine.Data.Standard.Logging;
 using Deltares.MacroStability.CSharpWrapper;
-using CharacteristicPointType = Deltares.DamEngine.Data.Geotechnics.CharacteristicPointType;
-using MacroStabilityOutput = Deltares.DamEngine.Calculators.KernelWrappers.MacroStabilityInwards.MacroStabilityOutput;
 
 namespace Deltares.DamEngine.Calculators.KernelWrappers.MacroStabilityOutwards
 {
@@ -49,7 +49,7 @@
     {
         private Calculator stabilityCalculator;
         private string fileNameForCalculation;
-        
+
         /// <summary>
         /// Gets or sets the failure mechanism parameters for mstab.
         /// </summary>
@@ -87,45 +87,50 @@
                     {
                         throw new NotImplementedException();
                     }
-                    
-                    MacroStabilityCommonHelper.EnsureSoilProfile2DIsFilled(damKernelInput.SubSoilScenario, damKernelInput.Location.SurfaceLine, 
-                        damKernelInput.Location.GetDikeEmbankmentSoil());
 
+                    MacroStabilityCommonHelper.EnsureSoilProfile2DIsFilled(damKernelInput.SubSoilScenario, damKernelInput.Location.SurfaceLine,
+                                                                           damKernelInput.Location.GetDikeEmbankmentSoil());
+
                     const bool useRiverLevelLow = false;
                     //Determine pl Lines.
                     var upliftHelper = new UpliftHelper();
-                    var plLines = upliftHelper.DeterminePlLinesForStability(damKernelInput, useRiverLevelLow, out _);
-                    
+                    PlLines plLines = upliftHelper.DeterminePlLinesForStability(damKernelInput, useRiverLevelLow, out _);
+
                     var fillMacroStabilityWrapperFromEngine = new FillMacroStabilityWrapperInputFromEngine
                     {
                         TrafficLoad = MacroStabilityCommonHelper.FillTrafficLoad(damKernelInput)
                     };
                     FailureMechanismParametersMStab.MStabParameters.GridPosition = MStabGridPosition.Left;
                     damKernelInput.DamFailureMechanismeCalculationSpecification.FailureMechanismParametersMStab
-                        .MStabParameters.GridPosition = MStabGridPosition.Left;
+                                  .MStabParameters.GridPosition = MStabGridPosition.Left;
                     fillMacroStabilityWrapperFromEngine.BishopCalculationGrid = MacroStabilityCommonHelper.FillBishopCalculationGrid(damKernelInput);
-                    
-                    var left = damKernelInput.Location.SurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.SurfaceLevelOutside).X;
-                    var right = damKernelInput.Location.SurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.SurfaceLevelInside).X;
-                    var penetrationLength = damKernelInput.Location.ModelParametersForPlLines.PenetrationLength;
-                    var soilProfile1D = damKernelInput.SubSoilScenario.SoilProfile2D.GetSoilProfile1D(
+
+                    double left = damKernelInput.Location.SurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.SurfaceLevelOutside).X;
+                    double right = damKernelInput.Location.SurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.SurfaceLevelInside).X;
+                    double penetrationLength = damKernelInput.Location.ModelParametersForPlLines.PenetrationLength;
+                    SoilProfile1D soilProfile1D = damKernelInput.SubSoilScenario.SoilProfile2D.GetSoilProfile1D(
                         damKernelInput.Location.SurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeTopAtPolder).X);
-                    var waterNet = PlLinesToWaternetConverter.ConvertPlLineToWaternet(plLines, soilProfile1D, penetrationLength, left, right);
+                    Waternet waterNet = PlLinesToWaternetConverter.ConvertPlLineToWaternet(plLines, soilProfile1D, penetrationLength, left, right);
 
                     macroStabilityInput.Input = fillMacroStabilityWrapperFromEngine.CreateMacroStabilityInput(damKernelInput, FailureMechanismParametersMStab.MStabParameters, waterNet);
                     fileNameForCalculation = MacroStabilityCommonHelper.GetStabilityInputFileName(damKernelInput, iterationIndex, FailureMechanismParametersMStab.MStabParameters.Model);
                     stabilityCalculator = new Calculator(macroStabilityInput.Input);
-                    var firstPrepareResult = MacroStabilityCommonHelper.PrepareKernel(stabilityCalculator, fileNameForCalculation);
+                    PrepareResult firstPrepareResult = MacroStabilityCommonHelper.PrepareKernel(stabilityCalculator, fileNameForCalculation);
 
                     return firstPrepareResult;
                 }
                 catch (Exception e)
                 {
-                    macroStabilityOutput.Message = new LogMessage { MessageType = LogMessageType.FatalError, Message = e.Message };
+                    macroStabilityOutput.Message = new LogMessage
+                    {
+                        MessageType = LogMessageType.FatalError,
+                        Message = e.Message
+                    };
                     kernelDataOutput = macroStabilityOutput;
                     return PrepareResult.Failed;
                 }
             }
+
             kernelDataInput = null;
             return PrepareResult.NotRelevant;
         }
@@ -152,15 +157,15 @@
         /// <param name="messages">The return messages.</param>
         public void Execute(IKernelDataInput kernelDataInput, IKernelDataOutput kernelDataOutput, out List<LogMessage> messages)
         {
-            MacroStabilityKernelDataInput macroStabilityKernelDataInput = (MacroStabilityKernelDataInput)kernelDataInput;
-            MacroStabilityOutput macroStabilityOutput = (MacroStabilityOutput)kernelDataOutput;
+            var macroStabilityKernelDataInput = (MacroStabilityKernelDataInput) kernelDataInput;
+            var macroStabilityOutput = (MacroStabilityOutput) kernelDataOutput;
             MacroStabilityCommonHelper.ThrowWhenMacroStabilityKernelInputNull(macroStabilityKernelDataInput);
             MacroStabilityCommonHelper.ThrowWhenMacroStabilityKernelOutputNull(macroStabilityOutput);
 
             MacroStabilityCommonHelper.PerformStabilityCalculation(macroStabilityKernelDataInput.Input, macroStabilityOutput,
-                fileNameForCalculation, stabilityCalculator, out messages);
-            var fileName = Path.GetFileNameWithoutExtension(fileNameForCalculation);
-            foreach (var logMessage in messages)
+                                                                   fileNameForCalculation, stabilityCalculator, out messages);
+            string fileName = Path.GetFileNameWithoutExtension(fileNameForCalculation);
+            foreach (LogMessage logMessage in messages)
             {
                 logMessage.Message = fileName + ": " + logMessage.Message;
             }
@@ -176,18 +181,18 @@
         /// <param name="designResults">The design results.</param>
         /// <exception cref="NoNullAllowedException"></exception>
         public void PostProcess(DamKernelInput damKernelInput, IKernelDataOutput kernelDataOutput, DesignScenario designScenario,
-            string resultMessage, out List<DesignResult> designResults)
+                                string resultMessage, out List<DesignResult> designResults)
         {
             MacroStabilityCommonHelper.ThrowWhenMacroStabilityDamKernelInputNull(damKernelInput);
             var macroStabilityOutput = kernelDataOutput as MacroStabilityOutput;
             MacroStabilityCommonHelper.ThrowWhenMacroStabilityKernelOutputNull(macroStabilityOutput);
             designResults = new List<DesignResult>();
             if (macroStabilityOutput?.StabilityOutputItems != null && macroStabilityOutput.StabilityOutputItems.Count > 0)
             {
-                var macroStabilityOutputItem = macroStabilityOutput.StabilityOutputItems[0];
+                MacroStabilityOutputItem macroStabilityOutputItem = macroStabilityOutput.StabilityOutputItems[0];
                 if (macroStabilityOutputItem != null)
                 {
-                    var designResult = MacroStabilityCommonHelper.NewDesignResult(damKernelInput, designScenario);
+                    DesignResult designResult = MacroStabilityCommonHelper.NewDesignResult(damKernelInput, designScenario);
                     MacroStabilityCommonHelper.FillDesignResult(macroStabilityOutputItem, designResult);
                     designResult.StabilityDesignResults.NumberOfIterations = 0;
                     designResult.StabilityDesignResults.UpliftSituation = macroStabilityOutput.UpliftSituation;
@@ -224,13 +229,13 @@
         /// </returns>
         /// <exception cref="System.NotImplementedException"></exception>
         public bool EvaluateDesign(DamKernelInput damKernelInput, IKernelDataInput kernelDataInput, IKernelDataOutput kernelDataOutput,
-            out DesignAdvise designAdvise, out string evaluationMessage)
+                                   out DesignAdvise designAdvise, out string evaluationMessage)
         {
             throw new NotImplementedException();
         }
 
         public void PrepareDesign(IKernelDataInput kernelDataInput, IKernelDataOutput kernelDataOutput, DamKernelInput damKernelInput,
-            int iterationIndex, out EmbankmentDesignParameters embankmentDesignParameters)
+                                  int iterationIndex, out EmbankmentDesignParameters embankmentDesignParameters)
         {
             throw new NotImplementedException();
         }
@@ -245,4 +250,4 @@
             return DesignStrategy.NoDesignPossible;
         }
     }
-}
+}
\ No newline at end of file