Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/DikesDesign/DesignCalculator.cs
===================================================================
diff -u -r6851 -r6895
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/DikesDesign/DesignCalculator.cs	(.../DesignCalculator.cs)	(revision 6851)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/DikesDesign/DesignCalculator.cs	(.../DesignCalculator.cs)	(revision 6895)
@@ -233,7 +233,7 @@
         Debug.WriteLine("End calculation Location '{0}', soilprofile '{1}'", task.Location, task.SoiProfileProbability);
     }
 
-    private void CalculateOneScenario(Location originalLocation, SoilGeometryProbability soiProfileProbability,
+    private void CalculateOneScenario(Location originalLocation, SoilGeometryProbability soilProfileProbability,
                                       DesignScenario designScenario, string projectPath, string calculationMap,
                                       DamFailureMechanismeCalculationSpecification damFailureMechanismeCalculationSpecification,
                                       List<DesignResult> designResults, List<LogMessage> calculationMessages)
@@ -246,7 +246,7 @@
             damKernelInput.ProjectDir = projectPath;
             damKernelInput.CalculationDir = Path.Combine(projectPath, calculationMap);
             damKernelInput.Location = location;
-            damKernelInput.SubSoilScenario = soiProfileProbability.Copy();
+            damKernelInput.SubSoilScenario = soilProfileProbability.Copy();
             damKernelInput.DamFailureMechanismeCalculationSpecification = damFailureMechanismeCalculationSpecification;
             damKernelInput.RiverLevelHigh = designScenario.RiverLevel;
             damKernelInput.RiverLevelLow = designScenario.RiverLevelLow;
@@ -285,20 +285,20 @@
                     {
                         case PrepareResult.Successful:
                             PerformCalculation(designResults, calculationMessages, analysisType, kernelWrapper, kernelDataInput, kernelDataOutput, damKernelInput);
-                            kernelWrapper.AddMessageToCalculationMessages(kernelDataOutput, calculationMessages);
+                            KernelWrapperHelper.AddKernelOutputMessageToLogMessages(originalLocation.Name, soilProfileProbability, designScenario.LocationScenarioID, kernelDataOutput, calculationMessages);
                             break;
                         case PrepareResult.NotRelevant:
                             calculationMessages.Add(new LogMessage(LogMessageType.Info, null,
                                                                    string.Format(Resources.DesignCalculatorPrepareNotRelevant,
                                                                                  location.Name,
-                                                                                 soiProfileProbability,
+                                                                                 soilProfileProbability,
                                                                                  designScenario.LocationScenarioID)));
                             break;
                         case PrepareResult.NoUplift:
                             calculationMessages.Add(new LogMessage(LogMessageType.Info, null,
                                                                    string.Format(Resources.DesignCalculatorPrepareNoUplift,
                                                                                  location.Name,
-                                                                                 soiProfileProbability,
+                                                                                 soilProfileProbability,
                                                                                  designScenario.LocationScenarioID)));
                             kernelWrapper.PostProcess(damKernelInput, kernelDataOutput, designScenario, "", out List<DesignResult> results);
                             designResults.AddRange(results);
@@ -307,9 +307,9 @@
                             calculationMessages.Add(new LogMessage(LogMessageType.Error, null,
                                                                    string.Format(Resources.DesignCalculatorPrepareError,
                                                                                  location.Name,
-                                                                                 soiProfileProbability,
+                                                                                 soilProfileProbability,
                                                                                  designScenario.LocationScenarioID)));
-                            kernelWrapper.AddMessageToCalculationMessages(kernelDataOutput, calculationMessages);
+                            KernelWrapperHelper.AddKernelOutputMessageToLogMessages(originalLocation.Name, soilProfileProbability, designScenario.LocationScenarioID, kernelDataOutput, calculationMessages);
                             break;
                     }
                 }
@@ -327,7 +327,7 @@
             calculationMessages.Add(new LogMessage(LogMessageType.Error, null,
                                                    string.Format(Resources.DesignCalculatorGeneralException,
                                                                  originalLocation.Name,
-                                                                 soiProfileProbability,
+                                                                 soilProfileProbability,
                                                                  designScenario.LocationScenarioID,
                                                                  e.Message)));
         }