Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityCommonHelper.cs
===================================================================
diff -u -r4052 -r4150
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityCommonHelper.cs	(.../MacroStabilityCommonHelper.cs)	(revision 4052)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityCommonHelper.cs	(.../MacroStabilityCommonHelper.cs)	(revision 4150)
@@ -48,15 +48,15 @@
 /// <summary>
 /// Class with helper methods for the Macro Stability Wrappers.
 /// </summary>
-public static class MacroStabilityCommonHelper
+public class MacroStabilityCommonHelper
 {
     /// <summary>
     /// Ensures the soil profile2d is filled.
     /// </summary>
     /// <param name="subSoilScenario">The sub soil scenario.</param>
     /// <param name="surfaceLine2">The surface line2.</param>
     /// <param name="dikeEmbankmentSoil">The dike embankment soil.</param>
-    public static void EnsureSoilProfile2DIsFilled(SoilGeometryProbability subSoilScenario, SurfaceLine2 surfaceLine2, Soil dikeEmbankmentSoil)
+    public void EnsureSoilProfile2DIsFilled(SoilGeometryProbability subSoilScenario, SurfaceLine2 surfaceLine2, Soil dikeEmbankmentSoil)
     {
         SoilProfile2D soilProfile2D = subSoilScenario.SoilProfile2D;
         if (soilProfile2D == null)
@@ -82,7 +82,7 @@
     /// </summary>
     /// <param name="damKernelInput">The dam kernel input.</param>
     /// <returns></returns>
-    public static TrafficLoad FillTrafficLoad(DamKernelInput damKernelInput)
+    public TrafficLoad FillTrafficLoad(DamKernelInput damKernelInput)
     {
         TrafficLoad trafficLoad = null;
         if (damKernelInput.Location.StabilityOptions != null && damKernelInput.Location.StabilityOptions.TrafficLoad.HasValue &&
@@ -106,7 +106,7 @@
     /// </summary>
     /// <param name="damKernelInput">The dam kernel input.</param>
     /// <returns></returns>
-    public static BishopCalculationGrid FillBishopCalculationGrid(DamKernelInput damKernelInput)
+    public BishopCalculationGrid FillBishopCalculationGrid(DamKernelInput damKernelInput)
     {
         SlipCircleDefinition slipCircleDefinition = damKernelInput.DamFailureMechanismeCalculationSpecification
                                                                   .FailureMechanismParametersMStab.MStabParameters.SlipCircleDefinition;
@@ -133,7 +133,7 @@
     /// <param name="iterationIndex">Index of the iteration.</param>
     /// <param name="model">The model.</param>
     /// <returns></returns>
-    public static string GetStabilityInputFileName(DamKernelInput damKernelInput, int iterationIndex, MStabModelType model)
+    public string GetStabilityInputFileName(DamKernelInput damKernelInput, int iterationIndex, MStabModelType model)
     {
         // Assume 2D sti-file, then check on type being 1D
         string soilGeometryName = damKernelInput.SubSoilScenario.SoilProfile2DName;
@@ -149,7 +149,7 @@
     /// </summary>
     /// <param name="macroStabilityKernelDataInput">The dam macro stability input.</param>
     /// <exception cref="NoNullAllowedException"></exception>
-    public static void ThrowWhenMacroStabilityKernelInputNull(MacroStabilityKernelDataInput macroStabilityKernelDataInput)
+    public void ThrowWhenMacroStabilityKernelInputNull(MacroStabilityKernelDataInput macroStabilityKernelDataInput)
     {
         if (macroStabilityKernelDataInput == null)
         {
@@ -162,7 +162,7 @@
     /// </summary>
     /// <param name="macroStabilityOutput">The dam macro stability output.</param>
     /// <exception cref="NoNullAllowedException"></exception>
-    public static void ThrowWhenMacroStabilityKernelOutputNull(MacroStabilityOutput macroStabilityOutput)
+    public void ThrowWhenMacroStabilityKernelOutputNull(MacroStabilityOutput macroStabilityOutput)
     {
         if (macroStabilityOutput == null)
         {
@@ -175,7 +175,7 @@
     /// </summary>
     /// <param name="damKernelInput">The dam kernel input.</param>
     /// <exception cref="NoNullAllowedException"></exception>
-    public static void ThrowWhenMacroStabilityDamKernelInputNull(DamKernelInput damKernelInput)
+    public void ThrowWhenMacroStabilityDamKernelInputNull(DamKernelInput damKernelInput)
     {
         if (damKernelInput == null)
         {
@@ -189,7 +189,7 @@
     /// <param name="damKernelInput">The dam kernel input.</param>
     /// <param name="designScenario">The design scenario.</param>
     /// <returns></returns>
-    public static DesignResult NewDesignResult(DamKernelInput damKernelInput, DesignScenario designScenario)
+    public DesignResult NewDesignResult(DamKernelInput damKernelInput, DesignScenario designScenario)
     {
         var soilProfile2DName = damKernelInput.SubSoilScenario.ToString();
         var designResult = new DesignResult(damKernelInput.DamFailureMechanismeCalculationSpecification,
@@ -214,7 +214,7 @@
     /// </summary>
     /// <param name="macroStabilityOutputItem">The macro stability output item.</param>
     /// <param name="designResult">The design result.</param>
-    public static void FillDesignResult(MacroStabilityOutputItem macroStabilityOutputItem, DesignResult designResult)
+    public void FillDesignResult(MacroStabilityOutputItem macroStabilityOutputItem, DesignResult designResult)
     {
         designResult.BaseFileName = Path.GetFileNameWithoutExtension(macroStabilityOutputItem.ProjectName);
         designResult.CalculationSubDir = macroStabilityOutputItem.CalculationPath;
@@ -246,7 +246,7 @@
     /// <param name="calculator">The calculator.</param>
     /// <param name="fileName">Name of the file.</param>
     /// <returns></returns>
-    public static PrepareResult PrepareKernel(Calculator calculator, string fileName)
+    public PrepareResult PrepareKernel(Calculator calculator, string fileName)
     {
         try
         {
@@ -277,7 +277,7 @@
     /// <returns>
     /// Zero when there are no errors, one when there are errors that prevent a calculation
     /// </returns>
-    public static int Validate(IKernelDataInput kernelDataInput, IKernelDataOutput kernelDataOutput, out List<LogMessage> messages)
+    public int Validate(IKernelDataInput kernelDataInput, IKernelDataOutput kernelDataOutput, out List<LogMessage> messages)
     {
         var macroStabilityKernelDataInput = (MacroStabilityKernelDataInput) kernelDataInput;
         messages = new List<LogMessage>();
@@ -349,7 +349,7 @@
     /// <param name="fileName">Name of the file.</param>
     /// <param name="calculator">The calculator.</param>
     /// <param name="messages">The messages.</param>
-    public static void PerformStabilityCalculation(MacroStabilityInput input, MacroStabilityOutput macroStabilityOutput,
+    public void PerformStabilityCalculation(MacroStabilityInput input, MacroStabilityOutput macroStabilityOutput,
                                                    string fileName, ICalculator calculator, out List<LogMessage> messages)
     {
         macroStabilityOutput.CalculationResult = CalculationResult.NoRun;
@@ -392,7 +392,7 @@
     /// <param name="soilGeometryName">Name of the soil geometry.</param>
     /// <param name="iterationIndex">Index of the iteration.</param>
     /// <returns></returns>
-    private static string DetermineCalculationFilename(string filenamePrefix, string soilGeometryName, int iterationIndex)
+    private string DetermineCalculationFilename(string filenamePrefix, string soilGeometryName, int iterationIndex)
     {
         string calculationName;
         if (iterationIndex <= 0)
@@ -413,7 +413,7 @@
     /// <param name="model">The model.</param>
     /// <param name="projectWorkingPath">The project working path.</param>
     /// <returns></returns>
-    private static string GetStabilityCalculationDirectory(MStabModelType model, string projectWorkingPath)
+    private string GetStabilityCalculationDirectory(MStabModelType model, string projectWorkingPath)
     {
         string calculationBaseDirectory = projectWorkingPath;
         string stabilitySubDir = GetCalculationSubDir(model);
@@ -431,7 +431,7 @@
     /// </summary>
     /// <param name="model">The model.</param>
     /// <returns></returns>
-    private static string GetCalculationSubDir(MStabModelType model)
+    private string GetCalculationSubDir(MStabModelType model)
     {
         const string stabilitySubDir = @"Stability\";
         var modelSubDirectory = model.ToString();
@@ -445,7 +445,7 @@
     /// </summary>
     /// <param name="fileName">Name of the file.</param>
     /// <param name="input">The input.</param>
-    private static void WriteStixFileBasedOnInputAndResultsSearchGrid(string fileName, MacroStabilityInput input)
+    private void WriteStixFileBasedOnInputAndResultsSearchGrid(string fileName, MacroStabilityInput input)
     {
         if (!(input.StabilityModel.ModelOption == StabilityModelOptionType.UpliftVan &&
               input.StabilityModel.SearchAlgorithm == SearchAlgorithm.Beeswarm))
@@ -465,7 +465,7 @@
     /// <param name="fileName">Name of the file.</param>
     /// <param name="input">The input.</param>
     /// <param name="macroStabilityOutput">The macro stability output.</param>
-    private static void WriteStixFileBasedOnInputAndResultsSlipPlane(string fileName, MacroStabilityInput input,
+    private void WriteStixFileBasedOnInputAndResultsSlipPlane(string fileName, MacroStabilityInput input,
                                                                      MacroStabilityOutput macroStabilityOutput)
     {
         if (macroStabilityOutput.CalculationResult == CalculationResult.Succeeded)
@@ -486,7 +486,7 @@
         }
     }
 
-    private static void StixFileWrite(StixWriter stixWriter, string fileName, MacroStabilityInput input)
+    private void StixFileWrite(StixWriter stixWriter, string fileName, MacroStabilityInput input)
     {
         if (File.Exists(fileName))
         {
@@ -496,7 +496,7 @@
         stixWriter.WriteStixFile(fileName, input);
     }
 
-    private static string DetermineStixFilename(string fileNameForCalc, string suffix, string extension = ".stix")
+    private string DetermineStixFilename(string fileNameForCalc, string suffix, string extension = ".stix")
     {
         return Path.Combine(Path.GetDirectoryName(fileNameForCalc) ?? string.Empty,
                             $"{Path.GetFileNameWithoutExtension(fileNameForCalc)}_{suffix}{extension}");