Index: dam engine/branches/Initial Source/Deltares.DamEngine.Calculators/General/DamRunner.cs
===================================================================
diff -u -r303 -r330
--- dam engine/branches/Initial Source/Deltares.DamEngine.Calculators/General/DamRunner.cs	(.../DamRunner.cs)	(revision 303)
+++ dam engine/branches/Initial Source/Deltares.DamEngine.Calculators/General/DamRunner.cs	(.../DamRunner.cs)	(revision 330)
@@ -26,10 +26,13 @@
 using System.Reflection;
 using System.Text;
 using Deltares.DamEngine.Calculators.Dikes_Assessment;
+using Deltares.DamEngine.Calculators.Stability;
 using Deltares.DamEngine.Data.Design;
 using Deltares.DamEngine.Data.General;
 using Deltares.DamEngine.Data.RWScenarios;
 using Deltares.DamEngine.Data.Standard.Calculation;
+using Deltares.DamEngine.Data.Standard.Language;
+using Deltares.DamEngine.Data.Standard.Logging;
 
 namespace Deltares.DamEngine.Calculators
 {
@@ -42,7 +45,7 @@
 
         public DamRunner(DamProjectData damProjectData, string projectFileName)
         {
-            damProjectData = damProjectData;
+            this.damProjectData = damProjectData;
             directory = Path.GetDirectoryName(projectFileName);
         }
 
@@ -58,29 +61,29 @@
             string paragraphSepatator = Environment.NewLine + Environment.NewLine;
             if (output.StartsWith("Thread was being aborted"))
             {
-                LocalizedMessageBox.Show(this, "CalculationAborted");
+               // LocalizedMessageBox.Show(this, "CalculationAborted"); ##Bka: most probably unwanted, replace with other mechanism
             }
             else if (result == CalculationResult.Succeeded)
             {
                 string openingMessage = LocalizationManager.GetTranslatedText(this, "CalculationFinished");
-                LocalizedMessageBox.ShowTranslatedText(openingMessage + paragraphSepatator + timeMessage + paragraphSepatator + output);
+                // LocalizedMessageBox.ShowTranslatedText(openingMessage + paragraphSepatator + timeMessage + paragraphSepatator + output); ##Bka: most probably unwanted, replace with other mechanism
             }
             else if ((result == CalculationResult.RunFailed) || (result == CalculationResult.UnexpectedError))
             {
                 string openingMessage = LocalizationManager.GetTranslatedText(this, "CalculationFailed");
-                LocalizedMessageBox.ShowTranslatedText(openingMessage + paragraphSepatator + output);
-            }            
+                //LocalizedMessageBox.ShowTranslatedText(openingMessage + paragraphSepatator + output); ##Bka: most probably unwanted, replace with other mechanism
+            }
         }
 
         private void ProcessResult(DamProjectData damProject, CalculationResult result, string output)
         {
-            if (BindSupport.InvokeControl.InvokeRequired)
+            //            if (BindSupport.InvokeControl.InvokeRequired)
+            //            {
+            //                var d = new ProcessResultDelegate(ProcessResultLocal);
+            //                BindSupport.InvokeControl.Invoke(d, new object[] { damProject, result, output });
+            //            }
+            //            else ##Bka: most probably unwanted, replace with other mechanism
             {
-                var d = new ProcessResultDelegate(ProcessResultLocal);
-                BindSupport.InvokeControl.Invoke(d, new object[] { damProject, result, output });
-            }
-            else
-            {
                 ProcessResultLocal(damProject, result, output);
             }
         }
@@ -102,7 +105,7 @@
                             damCalculation.ProjectDataDirectory = directory + Path.DirectorySeparatorChar;
                             damCalculation.MStabExePath = StabilityCalculator.MStabExePath;
                             damCalculation.MaxCalculationCores = MaxCalculationCores;
-                            damCalculation.CalculateDamProject(damProjectData);
+                            damCalculation.CalculateDamProject(damProjectData, DamProjectData.ProjectWorkingPath); //##Bka!? or damCalculation.ProjectDataDirectory
                             var output = FillOutputForMessage(damProjectData.LocationJobs);
                             ProcessResult(damProjectData, CalculationResult.Succeeded, output);
                             break;
@@ -128,9 +131,9 @@
                             CalculationResult calculationResult;
                             try
                             {
-                                rwScenariosCalculation.Load(evaluationJob.XML);
+                                //rwScenariosCalculation.Load(evaluationJob.XML); ##Bka
                                 calculationResult = rwScenariosCalculation.Run();
-                                DataEventPublisher.DataListModified(LogManager.Messages);
+                                //DataEventPublisher.DataListModified(LogManager.Messages);
                             }
                             catch (Exception)
                             {
@@ -140,7 +143,7 @@
                             string results = "";
                             rwScenariosCalculation.GetResults(ref results);
 
-                            evaluationJob.XML = results;
+                            //evaluationJob.XML = results; ##Bka
                             evaluationJob.AttachResults(damProjectData.LocationJobs);
                             var output = FillOutputForMessage(damProjectData.LocationJobs);
                             ProcessResult(damProjectData, calculationResult, output);
@@ -158,7 +161,7 @@
                                     SlopeWProgramPath = Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), "Slope2.exe"), 
                                     ProjectDataDirectory = directory + Path.DirectorySeparatorChar, 
                                     Progress = progressDelegate, 
-                                    CalculationBaseDirectory = DamProject.ProjectWorkingPath + @"\CalculationFiles\"
+                                    CalculationBaseDirectory = DamProjectData.ProjectWorkingPath + @"\CalculationFiles\"
                                 };
 
                                 damProjectCalculator.Calculate(damProjectData, scenarios);
@@ -229,27 +232,27 @@
 
         private void RemoveLogMessages(EvaluationJob evaluationJob)
         {
-            foreach (LogMessage logMessage in LogManager.Messages.ToArray())
-            {
-                foreach (var location in evaluationJob.Locations)
-                {
-                    if (logMessage.SubjectName.Equals(location.ToString()))
-                    {
-                        LogManager.Messages.Remove(logMessage);
-                    }
-                }
-            }
-
-            DataEventPublisher.DataListModified(LogManager.Messages);
+//            foreach (LogMessage logMessage in LogManager.Messages.ToArray())
+//            {
+//                foreach (var location in evaluationJob.Locations)
+//                {
+//                    if (logMessage.SubjectName.Equals(location.ToString()))
+//                    {
+//                        LogManager.Messages.Remove(logMessage);
+//                    }
+//                }
+//            }
+//
+//            DataEventPublisher.DataListModified(LogManager.Messages);
         }
 
         private void HandleCalculationSendMessage(LogMessage logMessage)
         {
-            lock (LogManager.Messages)
-            {
-                LogManager.Messages.Add(logMessage);
-                DataEventPublisher.DataListModified(LogManager.Messages);
-            }
+//            lock (LogManager.Messages)
+//            {
+//                LogManager.Messages.Add(logMessage);
+//                DataEventPublisher.DataListModified(LogManager.Messages);
+//            }
         }
 
         public int MaxCalculationCores