Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/DikesDesign/DesignCalculator.cs
===================================================================
diff -u -r971 -r979
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/DikesDesign/DesignCalculator.cs	(.../DesignCalculator.cs)	(revision 971)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/DikesDesign/DesignCalculator.cs	(.../DesignCalculator.cs)	(revision 979)
@@ -77,39 +77,8 @@
                         // stability where Piping calc is wanted). In that case, do nothing but just skip.
                         if (prepareResult == PrepareResult.Successful)
                         {
-                            // Perform validation
-                            List<LogMessage> locationCalculationMessages = new List<LogMessage>();
-                            List<LogMessage> validationMessages;
-                            int errorCount = kernelWrapper.Validate(kernelDataInput, kernelDataOutput, out validationMessages);
-                            if (errorCount > 0)
-                            {
-                                locationCalculationMessages.Add(new LogMessage(LogMessageType.Error, null,
-                                    string.Format(Resources.DesignCalculatorValidationFailed, 
-                                    location.Name, 
-                                    soiProfileProbability.ToString(), 
-                                    damKernelInput.DesignScenario.LocationScenarioID)));
-                                locationCalculationMessages.AddRange(validationMessages);
-                            }
-                            else
-                            {
-                                // Perform calculation
-                                kernelWrapper.Execute(kernelDataInput, kernelDataOutput, out locationCalculationMessages);
-                            }
-                            // Process output
-                            calculationMessages.AddRange(locationCalculationMessages);
-                            List<DesignResult> designResults;
-                            StringBuilder sb = new StringBuilder();
-                            foreach (var message in locationCalculationMessages)
-                            {
-                                sb.Append(message.Message + Environment.NewLine);
-                            }
-                            string resultMessage = sb.ToString();
-
-                            kernelWrapper.PostProcess(damKernelInput, kernelDataOutput, resultMessage, out designResults);
-                            foreach (var designResult in designResults)
-                            {
-                                damProjectData.DesignCalculations.Add(designResult);
-                            }                            
+                            PerformSingleCalculation(kernelWrapper, kernelDataInput, kernelDataOutput, 
+                                damKernelInput, calculationMessages, damProjectData.DesignCalculations);
                         }
                         else
                         {
@@ -136,5 +105,44 @@
             }
             return calculationMessages;
         }
+
+        private static void PerformSingleCalculation(IKernelWrapper kernelWrapper, IKernelDataInput kernelDataInput, IKernelDataOutput kernelDataOutput, DamKernelInput damKernelInput, 
+            List<LogMessage> calculationMessages, List<DesignResult> designCalculations)
+        {
+            // Perform validation
+            List<LogMessage> locationCalculationMessages = new List<LogMessage>();
+            List<LogMessage> validationMessages;
+            int errorCount = kernelWrapper.Validate(kernelDataInput, kernelDataOutput, out validationMessages);
+            if (errorCount > 0)
+            {
+                locationCalculationMessages.Add(new LogMessage(LogMessageType.Error, null,
+                                                               string.Format(Resources.DesignCalculatorValidationFailed,
+                                                                             damKernelInput.Location.Name,
+                                                                             damKernelInput.SubSoilScenario.ToString(),
+                                                                             damKernelInput.DesignScenario.LocationScenarioID)));
+                locationCalculationMessages.AddRange(validationMessages);
+            }
+            else
+            {
+                // Perform calculation
+                kernelWrapper.Execute(kernelDataInput, kernelDataOutput, out locationCalculationMessages);
+            }
+            // Process output
+            calculationMessages.AddRange(locationCalculationMessages);
+            List<DesignResult> designResults;
+            StringBuilder sb = new StringBuilder();
+            foreach (var message in locationCalculationMessages)
+            {
+                sb.Append(message.Message + Environment.NewLine);
+            }
+            string resultMessage = sb.ToString();
+
+            kernelWrapper.PostProcess(damKernelInput, kernelDataOutput, resultMessage, out designResults);
+            foreach (var designResult in designResults)
+            {
+                designCalculations.Add(designResult);
+            }
+        }
     }
 }
+ 
\ No newline at end of file