Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/DikesDesign/DesignCalculator.cs
===================================================================
diff -u -r6697 -r6698
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/DikesDesign/DesignCalculator.cs	(.../DesignCalculator.cs)	(revision 6697)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/DikesDesign/DesignCalculator.cs	(.../DesignCalculator.cs)	(revision 6698)
@@ -282,44 +282,28 @@
 
                     // Sometimes the kernelDataInput is not created (e.g. when SoilProfileProbability is meant for 
                     // stability where Piping calc is wanted). In that case, do nothing but just skip.
-                    if (prepareResult == PrepareResult.Successful)
+                    switch (prepareResult)
                     {
-                        switch (analysisType)
-                        {
-                            case AnalysisType.AdaptGeometry:
-                                PerformDesignCalculation(kernelWrapper, kernelDataInput, kernelDataOutput,
-                                                         damKernelInput, calculationMessages, designResults);
-                                break;
-                            case AnalysisType.NoAdaption:
-                                DesignCalculatorSingle.PerformSingleCalculation(kernelWrapper, kernelDataInput, kernelDataOutput,
-                                                                                damKernelInput, calculationMessages, designResults);
-                                break;
-                        }
-                    }
-                    else
-                    {
-                        if (prepareResult == PrepareResult.NotRelevant)
-                        {
+                        case PrepareResult.Successful:
+                            PerformCalculation(designResults, calculationMessages, analysisType, kernelWrapper, kernelDataInput, kernelDataOutput, damKernelInput);
+                            break;
+                        case PrepareResult.NotRelevant:
                             calculationMessages.Add(new LogMessage(LogMessageType.Info, null,
                                                                    string.Format(Resources.DesignCalculatorPrepareNotRelevant,
                                                                                  location.Name,
                                                                                  soiProfileProbability,
                                                                                  designScenario.LocationScenarioID)));
-                        }
-
-                        if (prepareResult == PrepareResult.NoUplift)
-                        {
+                            break;
+                        case PrepareResult.NoUplift:
                             calculationMessages.Add(new LogMessage(LogMessageType.Info, null,
                                                                    string.Format(Resources.DesignCalculatorPrepareNoUplift,
                                                                                  location.Name,
                                                                                  soiProfileProbability,
                                                                                  designScenario.LocationScenarioID)));
                             kernelWrapper.PostProcess(damKernelInput, kernelDataOutput, designScenario, "", out List<DesignResult> results);
                             designResults.AddRange(results);
-                        }
-
-                        if (prepareResult == PrepareResult.Failed)
-                        {
+                            break;
+                        case PrepareResult.Failed:
                             calculationMessages.Add(new LogMessage(LogMessageType.Error, null,
                                                                    string.Format(Resources.DesignCalculatorPrepareError,
                                                                                  location.Name,
@@ -331,7 +315,7 @@
                             {
                                 calculationMessages.Add(mo.Message);
                             }
-                        }
+                            break;
                     }
                 }
             }
@@ -354,6 +338,21 @@
         }
     }
 
+    private static void PerformCalculation(List<DesignResult> designResults, List<LogMessage> calculationMessages, AnalysisType analysisType, IKernelWrapper kernelWrapper, IKernelDataInput kernelDataInput, IKernelDataOutput kernelDataOutput, DamKernelInput damKernelInput)
+    {
+        switch (analysisType)
+        {
+            case AnalysisType.AdaptGeometry:
+                PerformDesignCalculation(kernelWrapper, kernelDataInput, kernelDataOutput,
+                                         damKernelInput, calculationMessages, designResults);
+                break;
+            case AnalysisType.NoAdaption:
+                DesignCalculatorSingle.PerformSingleCalculation(kernelWrapper, kernelDataInput, kernelDataOutput,
+                                                                damKernelInput, calculationMessages, designResults);
+                break;
+        }
+    }
+
     private SurfaceLine2 AdaptSurfaceLineWhenNeededForDesign(Location location, AnalysisType analysisType,
                                                              DamKernelInput damKernelInput)
     {