Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityCommonHelper.cs
===================================================================
diff -u -r3801 -r3819
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityCommonHelper.cs	(.../MacroStabilityCommonHelper.cs)	(revision 3801)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityCommonHelper.cs	(.../MacroStabilityCommonHelper.cs)	(revision 3819)
@@ -19,17 +19,22 @@
 // Stichting Deltares and remain full property of Stichting Deltares at all times.
 // All rights reserved.
 using System;
+using System.Collections.Generic;
 using System.Data;
 using System.IO;
 using System.Text.RegularExpressions;
 using Deltares.DamEngine.Calculators.KernelWrappers.Common;
+using Deltares.DamEngine.Calculators.KernelWrappers.Interfaces;
+using Deltares.DamEngine.Calculators.KernelWrappers.MacroStabilityCommon.MacroStabilityIo;
 using Deltares.DamEngine.Calculators.KernelWrappers.MacroStabilityInwards;
 using Deltares.DamEngine.Calculators.Properties;
 using Deltares.DamEngine.Data.Design;
 using Deltares.DamEngine.Data.General;
 using Deltares.DamEngine.Data.General.Results;
 using Deltares.DamEngine.Data.Geotechnics;
 using Deltares.DamEngine.Data.Standard.Calculation;
+using Deltares.DamEngine.Data.Standard.Logging;
+using Deltares.MacroStability.CSharpWrapper;
 using Deltares.MacroStability.CSharpWrapper.Input;
 using Deltares.MacroStability.CSharpWrapper.Output;
 using Deltares.StixFileWriter;
@@ -231,7 +236,7 @@
         /// </summary>
         /// <param name="fileName">Name of the file.</param>
         /// <param name="input">The input.</param>
-        public static void WriteStixFileBasedOnInputAndResultsSearchGrid(string fileName, MacroStabilityInput input)
+        private static void WriteStixFileBasedOnInputAndResultsSearchGrid(string fileName, MacroStabilityInput input)
         {
             if (!(input.StabilityModel.ModelOption == StabilityModelOptionType.UpliftVan &&
                   input.StabilityModel.SearchAlgorithm == SearchAlgorithm.Beeswarm))
@@ -250,7 +255,7 @@
         /// <param name="fileName">Name of the file.</param>
         /// <param name="input">The input.</param>
         /// <param name="macroStabilityOutput">The macro stability output.</param>
-        public static void WriteStixFileBasedOnInputAndResultsSlipPlane(string fileName, MacroStabilityInput input,
+        private static void WriteStixFileBasedOnInputAndResultsSlipPlane(string fileName, MacroStabilityInput input,
             MacroStabilityOutput macroStabilityOutput)
         {
             if (macroStabilityOutput.CalculationResult == CalculationResult.Succeeded)
@@ -342,5 +347,146 @@
                     macroStabilityOutputItem.PassiveCenterPointRadius;
             }
         }
+
+        /// <summary>
+        /// Prepares the kernel.
+        /// </summary>
+        /// <param name="calculator">The calculator.</param>
+        /// <param name="fileName">Name of the file.</param>
+        /// <returns></returns>
+        public static PrepareResult PrepareKernel(Calculator calculator, string fileName)
+        {
+            try
+            {
+                // For now a simple check to see if any data has been past at all.
+                var inputAsXml = calculator.KernelInputXml;
+
+                File.WriteAllText(fileName, inputAsXml);
+
+                if (inputAsXml.Length > 10)
+                {
+                    return PrepareResult.Successful;
+                }
+
+                return PrepareResult.Failed;
+            }
+            catch
+            {
+                return PrepareResult.Failed;
+            }
+        }
+
+        /// <summary>
+        /// Validates the specified kernel data input.
+        /// </summary>
+        /// <param name="kernelDataInput">The kernel data input.</param>
+        /// <param name="kernelDataOutput">The kernel data output.</param>
+        /// <param name="messages">The return messages.</param>
+        /// <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)
+        {
+            MacroStabilityKernelDataInput macroStabilityKernelDataInput = (MacroStabilityKernelDataInput)kernelDataInput;
+            messages = new List<LogMessage>();
+            try
+            {
+                var result = new Validator(macroStabilityKernelDataInput.Input).Validate();
+                if (result.IsValid)
+                {
+                    return 0;
+                }
+
+                if (kernelDataOutput != null)
+                {
+                    ((MacroStabilityOutput)kernelDataOutput).CalculationResult = CalculationResult.InvalidInputData;
+                }
+
+                foreach (var resultMessage in result.Messages)
+                {
+                    var message = new LogMessage
+                    {
+                        Message = resultMessage.Content
+                    };
+                    switch (resultMessage.MessageType)
+                    {
+                        case MessageType.Error:
+                            {
+                                message.MessageType = LogMessageType.Error;
+                                break;
+                            }
+                        case MessageType.Info:
+                            {
+                                message.MessageType = LogMessageType.Info;
+                                break;
+                            }
+                        case MessageType.Warning:
+                            {
+                                message.MessageType = LogMessageType.Warning;
+                                break;
+                            }
+                    }
+
+                    messages.Add(message);
+                }
+
+                return 1;
+            }
+            catch (Exception e)
+            {
+                var message = new LogMessage { MessageType = LogMessageType.FatalError, Message = e.Message };
+                messages.Add(message);
+                if (kernelDataOutput != null)
+                {
+                    ((MacroStabilityOutput)kernelDataOutput).CalculationResult = CalculationResult.InvalidInputData;
+                }
+
+                return 1;
+            }
+        }
+
+        /// <summary>
+        /// Performs the stability calculation.
+        /// </summary>
+        /// <param name="input">The input.</param>
+        /// <param name="macroStabilityOutput">The macro stability output.</param>
+        /// <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,
+            string fileName, ICalculator calculator, out List<LogMessage> messages)
+        {
+            macroStabilityOutput.CalculationResult = CalculationResult.NoRun;
+            macroStabilityOutput.StabilityOutputItems = new List<MacroStabilityOutputItem>();
+            messages = new List<LogMessage>();
+            try
+            {
+                var macroStabilityOutputKernel = calculator.Calculate();
+                FillEngineFromMacroStabilityWrapperOutput.FillEngineDataWithResults(macroStabilityOutputKernel, macroStabilityOutput,
+                    out messages);
+#if DEBUG
+                foreach (var stabilityOutputItem in macroStabilityOutput.StabilityOutputItems)
+                {
+                    switch (stabilityOutputItem.StabilityModelType)
+                    {
+                        case MStabModelType.Bishop:
+                            input.StabilityModel.BishopCalculationCircle = stabilityOutputItem.BishopCalculationCircle;
+                            break;
+                        case MStabModelType.UpliftVan:
+                            input.StabilityModel.UpliftVanCalculationGrid = stabilityOutputItem.UpliftVanCalculationGrid;
+                            break;
+                    }
+
+                    WriteStixFileBasedOnInputAndResultsSearchGrid(fileName, input);
+                }
+#endif
+                WriteStixFileBasedOnInputAndResultsSlipPlane(fileName, input, macroStabilityOutput);
+            }
+            catch (Exception e)
+            {
+                macroStabilityOutput.CalculationResult = CalculationResult.UnexpectedError;
+                messages.Add(new LogMessage(LogMessageType.Error, null, e.Message));
+            }
+        }
     }
 }