Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityOutwards/MacroStabilityOutwardsKernelWrapper.cs
===================================================================
diff -u -r4052 -r4150
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityOutwards/MacroStabilityOutwardsKernelWrapper.cs	(.../MacroStabilityOutwardsKernelWrapper.cs)	(revision 4052)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityOutwards/MacroStabilityOutwardsKernelWrapper.cs	(.../MacroStabilityOutwardsKernelWrapper.cs)	(revision 4150)
@@ -49,8 +49,17 @@
 {
     private Calculator stabilityCalculator;
     private string fileNameForCalculation;
+    readonly MacroStabilityCommonHelper macroStabilityCommonHelper;
 
     /// <summary>
+    /// Initializes a new instance of the <see cref="MacroStabilityOutwardsKernelWrapper"/> class.
+    /// </summary>
+    public MacroStabilityOutwardsKernelWrapper()
+    {
+        macroStabilityCommonHelper = new MacroStabilityCommonHelper();
+    }
+
+    /// <summary>
     /// Gets or sets the failure mechanism parameters for mstab.
     /// </summary>
     /// <value>
@@ -88,7 +97,7 @@
                     throw new NotImplementedException();
                 }
 
-                MacroStabilityCommonHelper.EnsureSoilProfile2DIsFilled(damKernelInput.SubSoilScenario, damKernelInput.Location.SurfaceLine,
+                macroStabilityCommonHelper.EnsureSoilProfile2DIsFilled(damKernelInput.SubSoilScenario, damKernelInput.Location.SurfaceLine,
                                                                        damKernelInput.Location.GetDikeEmbankmentSoil());
 
                 const bool useRiverLevelLow = false;
@@ -98,12 +107,12 @@
 
                 var fillMacroStabilityWrapperFromEngine = new FillMacroStabilityWrapperInputFromEngine
                 {
-                    TrafficLoad = MacroStabilityCommonHelper.FillTrafficLoad(damKernelInput)
+                    TrafficLoad = macroStabilityCommonHelper.FillTrafficLoad(damKernelInput)
                 };
                 FailureMechanismParametersMStab.MStabParameters.GridPosition = MStabGridPosition.Left;
                 damKernelInput.DamFailureMechanismeCalculationSpecification.FailureMechanismParametersMStab
                               .MStabParameters.GridPosition = MStabGridPosition.Left;
-                fillMacroStabilityWrapperFromEngine.BishopCalculationGrid = MacroStabilityCommonHelper.FillBishopCalculationGrid(damKernelInput);
+                fillMacroStabilityWrapperFromEngine.BishopCalculationGrid = macroStabilityCommonHelper.FillBishopCalculationGrid(damKernelInput);
 
                 double left = damKernelInput.Location.SurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.SurfaceLevelOutside).X;
                 double right = damKernelInput.Location.SurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.SurfaceLevelInside).X;
@@ -113,9 +122,9 @@
                 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);
+                fileNameForCalculation = macroStabilityCommonHelper.GetStabilityInputFileName(damKernelInput, iterationIndex, FailureMechanismParametersMStab.MStabParameters.Model);
                 stabilityCalculator = new Calculator(macroStabilityInput.Input);
-                PrepareResult firstPrepareResult = MacroStabilityCommonHelper.PrepareKernel(stabilityCalculator, fileNameForCalculation);
+                PrepareResult firstPrepareResult = macroStabilityCommonHelper.PrepareKernel(stabilityCalculator, fileNameForCalculation);
 
                 return firstPrepareResult;
             }
@@ -146,7 +155,7 @@
     /// </returns>
     public int Validate(IKernelDataInput kernelDataInput, IKernelDataOutput kernelDataOutput, out List<LogMessage> messages)
     {
-        return MacroStabilityCommonHelper.Validate(kernelDataInput, kernelDataOutput, out messages);
+        return macroStabilityCommonHelper.Validate(kernelDataInput, kernelDataOutput, out messages);
     }
 
     /// <summary>
@@ -159,10 +168,10 @@
     {
         var macroStabilityKernelDataInput = (MacroStabilityKernelDataInput) kernelDataInput;
         var macroStabilityOutput = (MacroStabilityOutput) kernelDataOutput;
-        MacroStabilityCommonHelper.ThrowWhenMacroStabilityKernelInputNull(macroStabilityKernelDataInput);
-        MacroStabilityCommonHelper.ThrowWhenMacroStabilityKernelOutputNull(macroStabilityOutput);
+        macroStabilityCommonHelper.ThrowWhenMacroStabilityKernelInputNull(macroStabilityKernelDataInput);
+        macroStabilityCommonHelper.ThrowWhenMacroStabilityKernelOutputNull(macroStabilityOutput);
 
-        MacroStabilityCommonHelper.PerformStabilityCalculation(macroStabilityKernelDataInput.Input, macroStabilityOutput,
+        macroStabilityCommonHelper.PerformStabilityCalculation(macroStabilityKernelDataInput.Input, macroStabilityOutput,
                                                                fileNameForCalculation, stabilityCalculator, out messages);
         string fileName = Path.GetFileNameWithoutExtension(fileNameForCalculation);
         foreach (LogMessage logMessage in messages)
@@ -183,17 +192,17 @@
     public void PostProcess(DamKernelInput damKernelInput, IKernelDataOutput kernelDataOutput, DesignScenario designScenario,
                             string resultMessage, out List<DesignResult> designResults)
     {
-        MacroStabilityCommonHelper.ThrowWhenMacroStabilityDamKernelInputNull(damKernelInput);
+        macroStabilityCommonHelper.ThrowWhenMacroStabilityDamKernelInputNull(damKernelInput);
         var macroStabilityOutput = kernelDataOutput as MacroStabilityOutput;
-        MacroStabilityCommonHelper.ThrowWhenMacroStabilityKernelOutputNull(macroStabilityOutput);
+        macroStabilityCommonHelper.ThrowWhenMacroStabilityKernelOutputNull(macroStabilityOutput);
         designResults = new List<DesignResult>();
         if (macroStabilityOutput?.StabilityOutputItems != null && macroStabilityOutput.StabilityOutputItems.Count > 0)
         {
             MacroStabilityOutputItem macroStabilityOutputItem = macroStabilityOutput.StabilityOutputItems[0];
             if (macroStabilityOutputItem != null)
             {
-                DesignResult designResult = MacroStabilityCommonHelper.NewDesignResult(damKernelInput, designScenario);
-                MacroStabilityCommonHelper.FillDesignResult(macroStabilityOutputItem, designResult);
+                DesignResult designResult = macroStabilityCommonHelper.NewDesignResult(damKernelInput, designScenario);
+                macroStabilityCommonHelper.FillDesignResult(macroStabilityOutputItem, designResult);
                 designResult.StabilityDesignResults.NumberOfIterations = 0;
                 designResult.StabilityDesignResults.UpliftSituation = macroStabilityOutput.UpliftSituation;
                 designResults.Add(designResult);