Index: DamClients/DamUI/trunk/src/Dam/Data/DamEngineIo/FillXmlInputFromDamUi.cs
===================================================================
diff -u -r994 -r1112
--- DamClients/DamUI/trunk/src/Dam/Data/DamEngineIo/FillXmlInputFromDamUi.cs	(.../FillXmlInputFromDamUi.cs)	(revision 994)
+++ DamClients/DamUI/trunk/src/Dam/Data/DamEngineIo/FillXmlInputFromDamUi.cs	(.../FillXmlInputFromDamUi.cs)	(revision 1112)
@@ -50,6 +50,8 @@
 
             input.ProjectPath = damProjectData.ProjectPath;
             input.CalculationMap = damProjectData.CalculationMap;
+            input.MaxCalculationCoresSpecified = true;
+            input.MaxCalculationCores = damProjectData.MaxCalculationCores;
 
             TransferAnalysisSpecification(damProjectData, input);
             TransferStabilityParameters(damProjectData, input);
Index: DamClients/DamUI/trunk/src/Dam/Data/DamProjectData.cs
===================================================================
diff -u -r994 -r1112
--- DamClients/DamUI/trunk/src/Dam/Data/DamProjectData.cs	(.../DamProjectData.cs)	(revision 994)
+++ DamClients/DamUI/trunk/src/Dam/Data/DamProjectData.cs	(.../DamProjectData.cs)	(revision 1112)
@@ -57,6 +57,7 @@
         private SensorData sensorData;
         private string projectPath;
         private string calculationMap;
+        private int maxCalculationCores = 1;
 
         /// <summary>
         /// Constructor
@@ -109,6 +110,23 @@
         }
 
         /// <summary>
+        /// Gets or sets the maximum calculation cores.
+        /// </summary>
+        /// <value>
+        /// The maximum calculation cores.
+        /// </value>
+        public int MaxCalculationCores
+        {
+            get
+            {
+                return maxCalculationCores;
+            }
+            set
+            {
+                maxCalculationCores = value;
+            }
+        }
+        /// <summary>
         /// Toplevel object to hold waterboard data
         /// </summary>
         public virtual WaterBoard WaterBoard
Index: DamClients/DamUI/trunk/src/Dam/Forms/DamPlugin.cs
===================================================================
diff -u -r936 -r1112
--- DamClients/DamUI/trunk/src/Dam/Forms/DamPlugin.cs	(.../DamPlugin.cs)	(revision 936)
+++ DamClients/DamUI/trunk/src/Dam/Forms/DamPlugin.cs	(.../DamPlugin.cs)	(revision 1112)
@@ -143,10 +143,18 @@
             {
                 if (mainForm == null)
                     return 1;
+                if (damProject != null && damProject.DamProjectData != null)
+                {
+                    damProject.DamProjectData.MaxCalculationCores = mainForm.MaxCalculationCores;
+                }
                 return mainForm.MaxCalculationCores;
             }
             set
             {
+                if (damProject != null && damProject.DamProjectData != null)
+                {
+                    damProject.DamProjectData.MaxCalculationCores = value;
+                }
                 if (mainForm != null)
                 {
                     mainForm.MaxCalculationCores = value;
Index: DamClients/DamUI/trunk/src/Dam/Tests/DamEngineIo/FillXmlInputFromDamUiTests.cs
===================================================================
diff -u -r994 -r1112
--- DamClients/DamUI/trunk/src/Dam/Tests/DamEngineIo/FillXmlInputFromDamUiTests.cs	(.../FillXmlInputFromDamUiTests.cs)	(revision 994)
+++ DamClients/DamUI/trunk/src/Dam/Tests/DamEngineIo/FillXmlInputFromDamUiTests.cs	(.../FillXmlInputFromDamUiTests.cs)	(revision 1112)
@@ -93,6 +93,7 @@
             damProjectData.WaterBoard = new WaterBoard();
             damProjectData.WaterBoard.Dikes = new List<Dike>();
             damProjectData.WaterBoard.Dikes.Add(new Dike());
+            damProjectData.MaxCalculationCores = 3;
             Dike dike = damProjectData.WaterBoard.Dikes[0];
             var surfaceLines = CreateSurfaceLines();
             FillSoils(dike);
Index: DamClients/DamUI/trunk/src/Dam/Data/DamEngineIo/FillDamUiFromXmlInput.cs
===================================================================
diff -u -r994 -r1112
--- DamClients/DamUI/trunk/src/Dam/Data/DamEngineIo/FillDamUiFromXmlInput.cs	(.../FillDamUiFromXmlInput.cs)	(revision 994)
+++ DamClients/DamUI/trunk/src/Dam/Data/DamEngineIo/FillDamUiFromXmlInput.cs	(.../FillDamUiFromXmlInput.cs)	(revision 1112)
@@ -50,6 +50,10 @@
 
             damProjectData.ProjectPath = input.ProjectPath;
             damProjectData.CalculationMap = input.CalculationMap;
+            if (input.MaxCalculationCoresSpecified)
+            {
+                damProjectData.MaxCalculationCores = input.MaxCalculationCores;
+            }
 
             damProjectData.WaterBoard = new WaterBoard();
             damProjectData.WaterBoard.Dikes = new List<Dike>();