Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityInwards/MacroStabilityInwardsKernelWrapper.cs
===================================================================
diff -u -r3763 -r3765
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityInwards/MacroStabilityInwardsKernelWrapper.cs	(.../MacroStabilityInwardsKernelWrapper.cs)	(revision 3763)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityInwards/MacroStabilityInwardsKernelWrapper.cs	(.../MacroStabilityInwardsKernelWrapper.cs)	(revision 3765)
@@ -93,7 +93,7 @@
                     var model = FailureMechanismParametersMStab.MStabParameters.Model;
                     if (bishopUpliftVan)
                     {
-                        // if current model is BishopUpliftVan then set to Bishop for proper name/path for inputfile
+                        // if current model is BishopUpliftVan then set to Bishop for proper name/path for input file
                         model = MStabModelType.Bishop;
                     }
                 
@@ -187,7 +187,7 @@
                     Name = subSoilScenario.SoilProfile1D.Name,
                     DikeEmbankmentMaterial = dikeEmbankmentSoil
                 };
-                // Convert the soilsurfacesoilprofile to a SoilProfile2D to be able to edit it properly.
+                // Convert the soilSurfaceProfile to a SoilProfile2D to be able to edit it properly.
                 var soilProfile2DNew = soilSurfaceProfile.ConvertToSoilProfile2D();
                 subSoilScenario.SoilProfile2D = soilProfile2DNew;
                 subSoilScenario.SoilProfile2DName = soilProfile2DNew.Name;
@@ -196,12 +196,12 @@
             }
         }
 
-        private PrepareResult PrepareKernel(Calculator stabilityCalculator, string fileName)
+        private PrepareResult PrepareKernel(Calculator calculator, string fileName)
         {
             try
             {
                 // For now a simple check to see if any data has been past at all.
-                var inputAsXml = stabilityCalculator.KernelInputXml;
+                var inputAsXml = calculator.KernelInputXml;
 
                 File.WriteAllText(fileName, inputAsXml);
                 
@@ -302,8 +302,10 @@
 
                 foreach (var resultMessage in result.Messages)
                 {
-                    var message = new LogMessage();
-                    message.Message = resultMessage.Content;
+                    var message = new LogMessage
+                    {
+                        Message = resultMessage.Content
+                    };
                     switch (resultMessage.MessageType)
                     {
                         case MessageType.Error:
@@ -360,7 +362,8 @@
                 macroStabilityKernelDataInput.Input.StabilityModel.ModelOption = StabilityModelOptionType.Bishop;
             }
             
-            PerformStabilityCalculation(macroStabilityKernelDataInput, macroStabilityOutput, fileNameForCalculation, stabilityCalculator, out messages);
+            PerformStabilityCalculation(macroStabilityKernelDataInput.Input, macroStabilityOutput,
+                fileNameForCalculation, stabilityCalculator, out messages);
             var fileName = Path.GetFileNameWithoutExtension(fileNameForCalculation);
             foreach (var logMessage in messages)
             {
@@ -370,7 +373,8 @@
             if (bishopUpliftVan)
             {
                 macroStabilityKernelDataInput.Input.StabilityModel.ModelOption = StabilityModelOptionType.UpliftVan;
-                PerformStabilityCalculation(macroStabilityKernelDataInput, macroStabilityOutput, fileNameForSecondCalculation, stabilityCalculatorForSecondCalculation, out messages);
+                PerformStabilityCalculation(macroStabilityKernelDataInput.Input, macroStabilityOutput,
+                    fileNameForSecondCalculation, stabilityCalculatorForSecondCalculation, out messages);
                 fileName = Path.GetFileNameWithoutExtension(fileNameForSecondCalculation);
                 foreach (var logMessage in messages)
                 {
@@ -379,32 +383,31 @@
             }
         }
 
-        private void PerformStabilityCalculation(MacroStabilityKernelDataInput input, MacroStabilityOutput macroStabilityOutput,
-            string fileName, ICalculator stabilityCalculator, out List<LogMessage> messages)
+        private void PerformStabilityCalculation(MacroStabilityInput input, MacroStabilityOutput macroStabilityOutput,
+            string fileName, ICalculator calculator, out List<LogMessage> messages)
         {
             macroStabilityOutput.CalculationResult = CalculationResult.NoRun;
             macroStabilityOutput.StabilityOutputItems = new List<MacroStabilityOutputItem>();
             messages = new List<LogMessage>();
             try
             {
-                var macroStabilityOutputKernel = stabilityCalculator.Calculate();
+                var macroStabilityOutputKernel = calculator.Calculate();
                 FillEngineFromMacroStabilityWrapperOutput.FillEngineDataWithResults(macroStabilityOutputKernel, macroStabilityOutput,
                         out messages);
 #if DEBUG
-                var inputStixFile = input.Input;
                 foreach (var stabilityOutputItem in macroStabilityOutput.StabilityOutputItems)
                 {
                     switch (stabilityOutputItem.StabilityModelType)
                     {
                         case MStabModelType.Bishop:
-                            inputStixFile.StabilityModel.BishopCalculationCircle = stabilityOutputItem.BishopCalculationCircle;
+                            input.StabilityModel.BishopCalculationCircle = stabilityOutputItem.BishopCalculationCircle;
                             break;
                         case MStabModelType.UpliftVan:
-                            inputStixFile.StabilityModel.UpliftVanCalculationGrid = stabilityOutputItem.UpliftVanCalculationGrid;
+                            input.StabilityModel.UpliftVanCalculationGrid = stabilityOutputItem.UpliftVanCalculationGrid;
                             break;
                     }
 
-                    WriteStixFileBasedOnInputAndResultsSearchGrid(fileName, inputStixFile);    
+                    WriteStixFileBasedOnInputAndResultsSearchGrid(fileName, input);    
                 }
 #endif
                 WriteStixFileBasedOnInputAndResultsSlipPlane(fileName, input, macroStabilityOutput);
@@ -429,7 +432,7 @@
             }
         }
 
-        private void WriteStixFileBasedOnInputAndResultsSlipPlane(string filename, MacroStabilityKernelDataInput input,
+        private void WriteStixFileBasedOnInputAndResultsSlipPlane(string filename, MacroStabilityInput input,
             MacroStabilityOutput macroStabilityOutput)
         {
             if (macroStabilityOutput.CalculationResult == CalculationResult.Succeeded)
@@ -442,21 +445,23 @@
                     var resultStixWrite = new StixWriter();
                     resultStixWrite.FillInfo("DAM Engine", macroStabilityOutputItem.CalculationPath,
                         macroStabilityOutputItem.ProjectName, true);
-                    if (macroStabilityOutputItem.StabilityModelType == MStabModelType.Bishop)
+                    switch (macroStabilityOutputItem.StabilityModelType)
                     {
-                        resultStixWrite.FillCalculatedCircle(macroStabilityOutputItem.ActiveCenterPoint.X,
-                            macroStabilityOutputItem.ActiveCenterPoint.Z,
-                            macroStabilityOutputItem.ActiveCenterPointRadius);
+                        case MStabModelType.Bishop:
+                            resultStixWrite.FillCalculatedCircle(macroStabilityOutputItem.ActiveCenterPoint.X,
+                                macroStabilityOutputItem.ActiveCenterPoint.Z,
+                                macroStabilityOutputItem.ActiveCenterPointRadius);
+                            break;
+                        case MStabModelType.UpliftVan:
+                            resultStixWrite.FillCalculatedDualCircle(macroStabilityOutputItem.ActiveCenterPoint.X,
+                                macroStabilityOutputItem.ActiveCenterPoint.Z,
+                                macroStabilityOutputItem.ActiveCenterPointRadius,
+                                macroStabilityOutputItem.PassiveCenterPoint.X,
+                                macroStabilityOutputItem.PassiveCenterPoint.Z);
+                            break;
                     }
-                    if (macroStabilityOutputItem.StabilityModelType == MStabModelType.UpliftVan)
-                    {
-                        resultStixWrite.FillCalculatedDualCircle(macroStabilityOutputItem.ActiveCenterPoint.X,
-                            macroStabilityOutputItem.ActiveCenterPoint.Z,
-                            macroStabilityOutputItem.ActiveCenterPointRadius,
-                            macroStabilityOutputItem.PassiveCenterPoint.X,
-                            macroStabilityOutputItem.PassiveCenterPoint.Z);
-                    }
-                    StixFileWrite(resultStixWrite, fileNameForCalculationAsStix, input.Input);
+
+                    StixFileWrite(resultStixWrite, fileNameForCalculationAsStix, input);
                 }
             }
         }
@@ -473,7 +478,7 @@
         
         private string DetermineStixFilename(string fileNameForCalc, string suffix, string extension = ".stix")
         {
-            return Path.Combine(Path.GetDirectoryName(fileNameForCalc),
+            return Path.Combine(Path.GetDirectoryName(fileNameForCalc) ?? string.Empty,
                 $"{Path.GetFileNameWithoutExtension(fileNameForCalc)}_{suffix}{extension}");
         }
 
@@ -531,11 +536,13 @@
                 designScenario, damKernelInput.SubSoilScenario.SoilProfile1D, soilProfile2DName)
             {
                 // initialize as failed
-                CalculationResult = CalculationResult.RunFailed
+                CalculationResult = CalculationResult.RunFailed,
+                StabilityDesignResults = new StabilityDesignResults()
             };
-            designResult.StabilityDesignResults = new StabilityDesignResults();
-            var stabilityDesignResults = new StabilityDesignResults();
-            stabilityDesignResults.RedesignedSurfaceLine = damKernelInput.Location.SurfaceLine;
+            var stabilityDesignResults = new StabilityDesignResults
+            {
+                RedesignedSurfaceLine = damKernelInput.Location.SurfaceLine
+            };
             designResult.ProfileName = soilProfile2DName;
             designResult.StabilityDesignResults = stabilityDesignResults;
             designResult.CalculationSubDir = damKernelInput.CalculationDir;
@@ -559,7 +566,7 @@
         /// </summary>
         /// <param name="macroStabilityKernelDataInput">The dam macro stability input.</param>
         /// <exception cref="NoNullAllowedException"></exception>
-        public static void ThrowWhenMacroStabilityKernelInputNull(MacroStabilityKernelDataInput macroStabilityKernelDataInput)
+        private static void ThrowWhenMacroStabilityKernelInputNull(MacroStabilityKernelDataInput macroStabilityKernelDataInput)
         {
             if (macroStabilityKernelDataInput == null)
             {
@@ -741,11 +748,11 @@
             string calculationName;
             if (iterationIndex <= 0)
             {
-                calculationName = String.Format("{0}_Pro({1})", filenamePrefix, soilGeometryName);
+                calculationName = $"{filenamePrefix}_Pro({soilGeometryName})";
             }
             else
             {
-                calculationName = String.Format("{0}_Pro({1})_Ite({2})", filenamePrefix, soilGeometryName, iterationIndex);
+                calculationName = $"{filenamePrefix}_Pro({soilGeometryName})_Ite({iterationIndex})";
             }
             return Regex.Replace(calculationName, @"[\\\/:\*\?""'<>|.]", "_");
         }