Index: dam clients/DamUI/trunk/src/MacroStability/Data/InterpolationArea.cs
===================================================================
diff -u -r236 -r268
--- dam clients/DamUI/trunk/src/MacroStability/Data/InterpolationArea.cs	(.../InterpolationArea.cs)	(revision 236)
+++ dam clients/DamUI/trunk/src/MacroStability/Data/InterpolationArea.cs	(.../InterpolationArea.cs)	(revision 268)
@@ -532,7 +532,7 @@
             }
         }
 
-        //TODO: Han check
+        //TOTODO: Han check
         public ShearStrengthModel ShearStrenghModel { get; set; }
 
         public InterpolationArea TopLayerArea
Index: dam clients/DamUI/trunk/src/Dam/Forms/DamPlugin.cs
===================================================================
diff -u -r236 -r268
--- dam clients/DamUI/trunk/src/Dam/Forms/DamPlugin.cs	(.../DamPlugin.cs)	(revision 236)
+++ dam clients/DamUI/trunk/src/Dam/Forms/DamPlugin.cs	(.../DamPlugin.cs)	(revision 268)
@@ -51,7 +51,6 @@
         private readonly LocationJobSymbol locationJobSymbol = new LocationJobSymbol();
         private DamMapEditor mapEditor = null;
         private DamGeometryEditor geometryEditor = null;
-        private DamRunner damRunner = null;
         private readonly Panel panel = new Panel();
         private readonly Panel projectPanel = new Panel();
         private readonly Panel materialPanel = new Panel();
@@ -570,21 +569,23 @@
                 return;
             }
 
-            DataEventPublisher.InvokeWithoutPublishingEvents(() =>
-            {
-                mainForm.Invoke(new TaskDelegate(DataEventPublisher.SelectionChanged), damProject.DamProjectData.WaterBoard);
-                damProject.DamProjectData.EnsureProperZoneSafetyFactors();
-                damRunner = new DamRunner(this.damProject);
-                damRunner.MaxCalculationCores = this.MaxCalculationCores;
-                LogManager.Clear();
-                damProject.DamProjectData.ClearResults();
-                damRunner.PerformCalculation(this.progressDelegate);
-            });
+            //DataEventPublisher.InvokeWithoutPublishingEvents(() =>
+            //{
+            //    mainForm.Invoke(new TaskDelegate(DataEventPublisher.SelectionChanged), damProject.DamProjectData.WaterBoard);
+            //    damProject.DamProjectData.EnsureProperZoneSafetyFactors();
+            //    damRunner = new DamRunner(this.damProject);
+            //    damRunner.MaxCalculationCores = this.MaxCalculationCores;
+            //    LogManager.Clear();
+            //    damProject.DamProjectData.ClearResults();
+            //    damRunner.PerformCalculation(this.progressDelegate);
+            //});
 
 
-            mainForm.Invoke(new PublisherDelegate(DataEventPublisher.DataListModified), LogManager.Messages, null);
-            mainForm.Invoke(new PublisherDelegate(DataEventPublisher.DataListModified), this.damProject.DamProjectData.DesignCalculations, null);
-            this.damProject.SaveXMLProject(this.damProject.ProjectFileName, this.damProject);
+            //mainForm.Invoke(new PublisherDelegate(DataEventPublisher.DataListModified), LogManager.Messages, null);
+            //mainForm.Invoke(new PublisherDelegate(DataEventPublisher.DataListModified), this.damProject.DamProjectData.DesignCalculations, null);
+            //this.damProject.SaveXMLProject(this.damProject.ProjectFileName, this.damProject);
+
+            LocalizedMessageBox.ShowError(this, "NoCalculationPossible");
             SetProperControlsAfterCalculation();
         }
 
Index: dam clients/DamUI/trunk/src/Dam/Forms/Deltares.Dam.Forms.csproj
===================================================================
diff -u -r237 -r268
--- dam clients/DamUI/trunk/src/Dam/Forms/Deltares.Dam.Forms.csproj	(.../Deltares.Dam.Forms.csproj)	(revision 237)
+++ dam clients/DamUI/trunk/src/Dam/Forms/Deltares.Dam.Forms.csproj	(.../Deltares.Dam.Forms.csproj)	(revision 268)
@@ -205,7 +205,6 @@
       <DependentUpon>DamProjectCalculationSpecificationPropertyControl.cs</DependentUpon>
     </Compile>
     <Compile Include="DamPlugin.cs" />
-    <Compile Include="DamRunner.cs" />
     <Compile Include="DamNewProjectDialog.cs">
       <SubType>Form</SubType>
     </Compile>
Fisheye: Tag 268 refers to a dead (removed) revision in file `dam clients/DamUI/trunk/src/Dam/Tests/StabilityCalculationTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: dam clients/DamUI/trunk/src/Dam/Forms/ScenarioCalculationPropertyControl.cs
===================================================================
diff -u -r236 -r268
--- dam clients/DamUI/trunk/src/Dam/Forms/ScenarioCalculationPropertyControl.cs	(.../ScenarioCalculationPropertyControl.cs)	(revision 236)
+++ dam clients/DamUI/trunk/src/Dam/Forms/ScenarioCalculationPropertyControl.cs	(.../ScenarioCalculationPropertyControl.cs)	(revision 268)
@@ -127,7 +127,7 @@
                 }
                 Process process = new Process();
                 process.StartInfo.RedirectStandardOutput = false;
-                process.StartInfo.FileName = StabilityCalculator.MStabExePath;
+                process.StartInfo.FileName = DamHelperFunctions.MStabExePath;
                 process.StartInfo.Arguments = " \"" + copyFile + "\"";
                 process.StartInfo.UseShellExecute = false;
                 process.StartInfo.WindowStyle = ProcessWindowStyle.Normal;
Fisheye: Tag 268 refers to a dead (removed) revision in file `dam clients/DamUI/trunk/src/Dam/Data/TimeSerieStabilityCalculator.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 268 refers to a dead (removed) revision in file `dam clients/DamUI/trunk/src/Dam/Tests/GageDikeRealCorrectDataTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 268 refers to a dead (removed) revision in file `dam clients/DamUI/trunk/src/Dam/Data/PipingCalculator.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 268 refers to a dead (removed) revision in file `dam clients/DamUI/trunk/src/Dam/Tests/PipingCalculatorSellmeijer4ForcesTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 268 refers to a dead (removed) revision in file `dam clients/DamUI/trunk/src/Dam/Data/GageDikeProcessor.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 268 refers to a dead (removed) revision in file `dam clients/DamUI/trunk/src/Dam/Data/TimeSerieProbablisticCalculator.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: dam clients/DamUI/trunk/src/Dam/Data/WaterBoardJobImporter.cs
===================================================================
diff -u -r236 -r268
--- dam clients/DamUI/trunk/src/Dam/Data/WaterBoardJobImporter.cs	(.../WaterBoardJobImporter.cs)	(revision 236)
+++ dam clients/DamUI/trunk/src/Dam/Data/WaterBoardJobImporter.cs	(.../WaterBoardJobImporter.cs)	(revision 268)
@@ -22,8 +22,7 @@
                         if (locationJob.GetType() == typeof(LocationJob))
                         {
                             ((LocationJob)locationJob).WaterLevelTimeSerie = timeSerieCollection.FindSerie
-                                (GageDikeProcessor.WaterLevelInputParameterID, 
-                                ((LocationJob)locationJob).Location.Name);
+                                 ("WaterLevel", ((LocationJob)locationJob).Location.Name);
                         }
                     }
                 }
Fisheye: Tag 268 refers to a dead (removed) revision in file `dam clients/DamUI/trunk/src/Dam/Tests/DamProjectCalculatorTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: dam clients/DamUI/trunk/src/Dam/Data/DamHelperFunctions.cs
===================================================================
diff -u
--- dam clients/DamUI/trunk/src/Dam/Data/DamHelperFunctions.cs	(revision 0)
+++ dam clients/DamUI/trunk/src/Dam/Data/DamHelperFunctions.cs	(revision 268)
@@ -0,0 +1,54 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Reflection;
+using System.Text;
+using System.Text.RegularExpressions;
+
+namespace Deltares.Dam.Data
+{
+    public class DamHelperFunctions
+    {
+        /// <summary>
+        /// Determine a filename based on the different inout parameters
+        /// </summary>
+        /// <param name="locationName">Name of the location.</param>
+        /// <param name="scenarioName">Name of the scenario.</param>
+        /// <param name="soilGeometryName">Name of the soil geometry.</param>
+        /// <param name="iterationIndex">Index of the iteration.</param>
+        /// <returns></returns>
+        public static string DetermineCalculationFilename(string locationName, string scenarioName,
+            string soilGeometryName, int iterationIndex)
+        {
+            string calculationName;
+            if (iterationIndex < 0)
+            {
+                calculationName = String.Format("Loc({0})_Sce({1})_Pro({2})", locationName, scenarioName,
+                    soilGeometryName);
+            }
+            else
+            {
+                calculationName = String.Format("Loc({0})_Sce({1})_Pro({2})_Ite({3})", locationName, scenarioName,
+                    soilGeometryName, iterationIndex);
+            }
+            return Regex.Replace(calculationName, @"[\\\/:\*\?""'<>|.]", "_");
+        }
+
+        /// <summary>
+        /// Gets the D-GeoStability executable path.
+        /// </summary>
+        /// <value>
+        /// The m stab executable path.
+        /// </value>
+        public static string MStabExePath
+        {
+            get
+            {
+                return Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location),
+                    @"DGeoStability.exe");
+            }
+        }
+
+    }
+}
Fisheye: Tag 268 refers to a dead (removed) revision in file `dam clients/DamUI/trunk/src/Dam/Data/PipingCalculatorSellmeijer4Forces.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 268 refers to a dead (removed) revision in file `dam clients/DamUI/trunk/src/Dam/Data/PipingCalculatorSellmeijer2Forces.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 268 refers to a dead (removed) revision in file `dam clients/DamUI/trunk/src/Dam/Tests/DamCalculationWtiComparisonTests.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 268 refers to a dead (removed) revision in file `dam clients/DamUI/trunk/src/Dam/Data/DamCalculation.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: dam clients/DamUI/trunk/src/Dam/Tests/TestHelper/FactoryForWaterBoard.cs
===================================================================
diff -u -r236 -r268
--- dam clients/DamUI/trunk/src/Dam/Tests/TestHelper/FactoryForWaterBoard.cs	(.../FactoryForWaterBoard.cs)	(revision 236)
+++ dam clients/DamUI/trunk/src/Dam/Tests/TestHelper/FactoryForWaterBoard.cs	(.../FactoryForWaterBoard.cs)	(revision 268)
@@ -20,6 +20,7 @@
     {
         public const string cLocation01Id = "Lcoation01";
 
+
         /// <summary>
         /// Create waterlevel timeseries
         /// </summary>
@@ -30,7 +31,7 @@
 
             TimeSerie waterLevelTimeSerie = new TimeSerie();
             waterLevelTimeSerie.LocationId = cLocation01Id;
-            waterLevelTimeSerie.ParameterId = GageDikeProcessor.WaterLevelInputParameterID;
+            waterLevelTimeSerie.ParameterId = "Waterlevel";
             waterLevelTimeSerie.Entries.Add(new TimeSerieEntry(new DateTime(2010, 1, 1), 5));
             waterLevelTimeSerie.Entries.Add(new TimeSerieEntry(new DateTime(2010, 1, 2), 6));
             waterLevelTimeSerie.Entries.Add(new TimeSerieEntry(new DateTime(2010, 1, 3), 4));
Fisheye: Tag 268 refers to a dead (removed) revision in file `dam clients/DamUI/trunk/src/Dam/Tests/PipingCalculatorSellmeijerTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 268 refers to a dead (removed) revision in file `dam clients/DamUI/trunk/src/Dam/Tests/PipingCalculatorWti2017Test.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: dam clients/DamUI/trunk/src/Dam/Data/Deltares.Dam.Data.csproj
===================================================================
diff -u -r238 -r268
--- dam clients/DamUI/trunk/src/Dam/Data/Deltares.Dam.Data.csproj	(.../Deltares.Dam.Data.csproj)	(revision 238)
+++ dam clients/DamUI/trunk/src/Dam/Data/Deltares.Dam.Data.csproj	(.../Deltares.Dam.Data.csproj)	(revision 268)
@@ -205,12 +205,12 @@
     <Compile Include="CsvImporters\SurfaceLineCsvColumnNames.cs" />
     <Compile Include="DAMEnumerations.cs" />
     <Compile Include="DamGlobalConstants.cs" />
+    <Compile Include="DamHelperFunctions.cs" />
     <Compile Include="DamProjectCalculatorCsvExportDataBuilder.cs" />
     <Compile Include="DesignPointCalculation.cs" />
     <Compile Include="IAssignable.cs" />
     <Compile Include="IO\FailureMechanismeParamatersMStabXmlHandler.cs" />
     <Compile Include="License\DamLicense.cs" />
-    <Compile Include="PipingCalculatorWti2017.cs" />
     <Compile Include="Sensors\SensorData.cs" />
     <Compile Include="Sensors\SensorImportFromExcelSheet.cs" />
     <Compile Include="Sensors\SensorPLLineCreatorException.cs" />
@@ -270,7 +270,6 @@
     <Compile Include="RWScenarios\RWScenarioSelector.cs" />
     <Compile Include="RWScenarios\RWScenariosResult.cs" />
     <Compile Include="RWScenarios\RWResult.cs" />
-    <Compile Include="DamCalculation.cs" />
     <Compile Include="DamJob.cs" />
     <Compile Include="DamProjectCalculationSpecification.cs" />
     <Compile Include="DataPlugins\Configuration\DataAttribute.cs" />
@@ -288,11 +287,8 @@
     <Compile Include="LocationJob.cs" />
     <Compile Include="LocationResult.cs" />
     <Compile Include="PLLinesCreatorDupuit.cs" />
-    <Compile Include="RWScenarios\RWScenariosCalculation.cs" />
     <Compile Include="RWScenarios\UpliftRWEvaluator.cs" />
     <Compile Include="SchematizationFactor\RWSchematizationFactorsResult.cs" />
-    <Compile Include="DamProjectCalculator.cs" />
-    <Compile Include="DAMFailureMechanismeCalculator.cs" />
     <Compile Include="CsvExportCharacteristicPoints.cs" />
     <Compile Include="CsvExportSurfaceLine.cs" />
     <Compile Include="DamProject.cs" />
@@ -308,8 +304,6 @@
     <Compile Include="DikeCoordinateSystemConverter.cs" />
     <Compile Include="GenericLine.cs" />
     <Compile Include="ModelParameters.cs" />
-    <Compile Include="PipingCalculatorSellmeijer2Forces.cs" />
-    <Compile Include="PipingCalculatorSellmeijer4Forces.cs" />
     <Compile Include="PL1Line.cs" />
     <Compile Include="SchematizationFactor\SchematizationFactorCalculation.cs" />
     <Compile Include="SchematizationFactor\SchematizationFactorData.cs" />
@@ -333,7 +327,6 @@
     <Compile Include="Sensors\SensorPLLineCreator.cs" />
     <Compile Include="Sensors\SensorPLLineCreatorBase.cs" />
     <Compile Include="Sensors\SensorRepository.cs" />
-    <Compile Include="Sensors\SensorTimeSeriesProcessor.cs" />
     <Compile Include="Sensors\Specifications\UseLocationAsDataSource.cs" />
     <Compile Include="Sensors\Specifications\WaterLevelSensorSpecification.cs" />
     <Compile Include="Specifications\AndSpecification.cs" />
@@ -362,7 +355,6 @@
     <Compile Include="TimeSeriesProcessor.cs" />
     <Compile Include="SoilGeometry.cs" />
     <Compile Include="SoilGeometry2DName.cs" />
-    <Compile Include="Stability\StabilityCalculation.cs" />
     <Compile Include="Stochast.cs" />
     <Compile Include="SurfaceLineSlopeAdapter.cs" />
     <Compile Include="GaugePLLine.cs" />
@@ -372,20 +364,14 @@
     <Compile Include="Gauge.cs" />
     <Compile Include="StabilityTimeSerieEntry.cs" />
     <Compile Include="FileWriterUtil.cs" />
-    <Compile Include="GageDikeProcessor.cs" />
-    <Compile Include="GageDikeCalculator.cs" />
     <Compile Include="MStabParameters.cs" />
     <Compile Include="NonExistentLocationException.cs" />
     <Compile Include="CsvExporter.cs" />
     <Compile Include="PipingDesign.cs" />
     <Compile Include="Scenario.cs" />
     <Compile Include="Importers\ImportException.cs" />
-    <Compile Include="PipingCalculator.cs" />
-    <Compile Include="PipingCalculatorSellmeijer.cs" />
     <Compile Include="OvertoppingErosionCalculator.cs" />
     <Compile Include="ParameterMissingException.cs" />
-    <Compile Include="PipingCalculatorBligh.cs" />
-    <Compile Include="DAMFailureMechanismeCalculatorException.cs" />
     <Compile Include="PLLinesCreator.cs" />
     <Compile Include="DamFailureMechanismeCalculationSpecification.cs">
       <SubType>Code</SubType>
@@ -417,7 +403,6 @@
     <Compile Include="RdLatLngConverter.cs" />
     <Compile Include="RequiredEntityNotExistException.cs" />
     <Compile Include="RequiredImportFileNotExistException.cs" />
-    <Compile Include="StabilityCalculator.cs" />
     <Compile Include="StabilityFileParseException.cs" />
     <Compile Include="StabilityServiceAgent.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
@@ -430,13 +415,9 @@
     <Compile Include="SurfaceLineShoulderAdapter.cs" />
     <Compile Include="ThrowHelper.cs" />
     <Compile Include="TimeSerie.cs" />
-    <Compile Include="TimeSerieProbablisticCalculator.cs" />
     <Compile Include="TimeSerieCollection.cs" />
     <Compile Include="TimeSerieEntry.cs" />
-    <Compile Include="TimeSerieOvertoppingErosionCalculator.cs" />
-    <Compile Include="TimeSeriePipingCalculator.cs" />
     <Compile Include="TimeSerieSchemaValidationException.cs" />
-    <Compile Include="TimeSerieStabilityCalculator.cs" />
     <Compile Include="TimeStep.cs" />
     <Compile Include="UISupport\ConfigurationManager.cs" />
     <Compile Include="UISupport\DAMNewProjectData.cs" />
@@ -462,10 +443,6 @@
   <ItemGroup>
     <None Include="app.config" />
     <None Include="Properties\AssemblyInfo.cs.svn" />
-    <None Include="DGeoStability.ini">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="DomainModel.cd" />
     <EmbeddedResource Include="DtoAssembler\Xsd\FileIdentificationDefinition.xsd">
       <SubType>Designer</SubType>
     </EmbeddedResource>
@@ -504,72 +481,6 @@
       <Link>DupuitLib.pdb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\..\lib\SlopeW\cm2lapack.dll">
-      <Link>cm2lapack.dll</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="..\..\..\lib\SlopeW\cm2math1.dll">
-      <Link>cm2math1.dll</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="..\..\..\lib\SlopeW\cm2meshtools.dll">
-      <Link>cm2meshtools.dll</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="..\..\..\lib\SlopeW\cm2meshtools1d.dll">
-      <Link>cm2meshtools1d.dll</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="..\..\..\lib\SlopeW\cm2meshtools2d.dll">
-      <Link>cm2meshtools2d.dll</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="..\..\..\lib\SlopeW\cm2misc.dll">
-      <Link>cm2misc.dll</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="..\..\..\lib\SlopeW\cm2quadmesh.dll">
-      <Link>cm2quadmesh.dll</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="..\..\..\lib\SlopeW\cm2triamesh.dll">
-      <Link>cm2triamesh.dll</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="..\..\..\lib\SlopeW\GsDoc.dll">
-      <Link>GsDoc.dll</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="..\..\..\lib\SlopeW\GSI.dll">
-      <Link>GSI.dll</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="..\..\..\lib\SlopeW\GSIDB.dll">
-      <Link>GSIDB.dll</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="..\..\..\lib\SlopeW\GSILIB.dll">
-      <Link>GSILIB.dll</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="..\..\..\lib\SlopeW\MNGSRV.dll">
-      <Link>MNGSRV.dll</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="..\..\..\lib\SlopeW\OC.dll">
-      <Link>OC.dll</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="..\..\..\lib\SlopeW\Slope2.exe">
-      <Link>Slope2.exe</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="cc3280mt.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="DGeoStability.exe">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
     <Content Include="DGSDAMSlopeW.dll">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
@@ -652,6 +563,7 @@
   <ItemGroup>
     <Folder Include="DtoAssembler\Properties\" />
     <Folder Include="MetaInfo\" />
+    <Folder Include="Stability\" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
Fisheye: Tag 268 refers to a dead (removed) revision in file `dam clients/DamUI/trunk/src/Dam/Forms/DamRunner.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 268 refers to a dead (removed) revision in file `dam clients/DamUI/trunk/src/Dam/Tests/PLLinesCreatorTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 268 refers to a dead (removed) revision in file `dam clients/DamUI/trunk/src/Dam/Data/RWScenarios/RWScenariosCalculation.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: dam clients/DamUI/trunk/src/Dam/Data/RWScenarios/RWScenariosResult.cs
===================================================================
diff -u -r236 -r268
--- dam clients/DamUI/trunk/src/Dam/Data/RWScenarios/RWScenariosResult.cs	(.../RWScenariosResult.cs)	(revision 236)
+++ dam clients/DamUI/trunk/src/Dam/Data/RWScenarios/RWScenariosResult.cs	(.../RWScenariosResult.cs)	(revision 268)
@@ -298,7 +298,7 @@
         public string PipingResultFile
         {
             // Note Bka: Path of piping is not based on the working dir but on assembly (Assembly.GetExecutingAssembly().Location)
-            get { return baseFileName + PipingCalculator.PipingFilenameExtension; }
+            get { return baseFileName + ".txt"; }
         }
 
         [Label("Failure mechanism")]
Fisheye: Tag 268 refers to a dead (removed) revision in file `dam clients/DamUI/trunk/src/Dam/Data/StabilityCalculator.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: dam clients/DamUI/trunk/src/Dam/Tests/Deltares.Dam.Tests.csproj
===================================================================
diff -u -r236 -r268
--- dam clients/DamUI/trunk/src/Dam/Tests/Deltares.Dam.Tests.csproj	(.../Deltares.Dam.Tests.csproj)	(revision 236)
+++ dam clients/DamUI/trunk/src/Dam/Tests/Deltares.Dam.Tests.csproj	(.../Deltares.Dam.Tests.csproj)	(revision 268)
@@ -127,9 +127,7 @@
     <Compile Include="IO\FailureMechanismeParamatersMStabXmlHandlerTest.cs" />
     <Compile Include="License\LicenseTest.cs" />
     <Compile Include="Memoryleaks\DamMemoryLeakTests.cs" />
-    <Compile Include="PipingCalculatorWti2017Test.cs" />
     <Compile Include="Sensors\SensorImportFromExcelSheetTest.cs" />
-    <Compile Include="StabilityProjectObjectCreatorTests.cs" />
     <Compile Include="WaterBoardPostProcessRelativeProfilesTest.cs" />
     <Compile Include="Importers\LineAttributeImporterTest.cs" />
     <Compile Include="Importers\LocationImportHelperTest.cs" />
@@ -153,7 +151,6 @@
     <Compile Include="Sensors\SensorLocationTests.cs" />
     <Compile Include="Sensors\SensorTimeSeriesProcessorTest.cs" />
     <Compile Include="SoilGeometryTests.cs" />
-    <Compile Include="StabilityCalculationTest.cs" />
     <Compile Include="DikeMaterialRWEvaluatorTests.cs" />
     <Compile Include="HydraulicShortcutRWEvaluatorTests.cs" />
     <Compile Include="IO\ExportTextFileTest.cs" />
@@ -163,7 +160,6 @@
     <Compile Include="DataPluginDataSourceXmlSerializerTests.cs" />
     <Compile Include="DataPluginImporterBackgroundTests.cs" />
     <Compile Include="DataPluginImporterCsvTests.cs" />
-    <Compile Include="DamCalculationTest.cs" />
     <Compile Include="DataPluginImporterDataShapeFilesTests.cs" />
     <Compile Include="DataPluginImporterIrisTests.cs" />
     <Compile Include="DataPluginImporterMGeobaseTests.cs" />
@@ -173,31 +169,23 @@
     <Compile Include="Geometry.cs" />
     <Compile Include="Geometry2DDataTests.cs" />
     <Compile Include="GeometryFileTest.cs" />
-    <Compile Include="PLLinesCreatorDupuitTests.cs" />
     <Compile Include="RWSelectorTest.cs" />
     <Compile Include="TimeSeries\TimeSeriesProcessorTest.cs" />
     <Compile Include="UISupport\ConfigurationManagerTest.cs" />
     <Compile Include="UpliftRWEvaluatorTests.cs" />
     <Compile Include="WaterBoardImporterTests.cs" />
     <Compile Include="WaterBoardJobImporterTest.cs" />
     <Compile Include="DamJobTest.cs" />
-    <Compile Include="DamProjectCalculatorTest.cs" />
     <Compile Include="CsvExportCharacteristicPointsTest.cs" />
     <Compile Include="CsvExportSurfaceLineTest.cs" />
     <Compile Include="DAMMstabGeometry2DSectionAssemblerTest.cs" />
     <Compile Include="Geometry2DTo1DConverterTest.cs" />
     <Compile Include="DikeCoordinateSystemConverterTest.cs" />
     <Compile Include="CoordinateSystemConverterTest.cs" />
-    <Compile Include="PipingCalculatorSellmeijer2ForcesTest.cs" />
-    <Compile Include="PipingCalculatorSellmeijer4ForcesTest.cs" />
     <Compile Include="ScenariosCreatorTest.cs" />
-    <Compile Include="StabilityCalculatorTest.cs" />
     <Compile Include="SurfaceLineSlopeAdapterTest.cs" />
-    <Compile Include="GageDikeProcessorTest.cs" />
-    <Compile Include="GageDikeCalculatorTest.cs" />
     <Compile Include="GaugePLLineTest.cs" />
     <Compile Include="CsvExporterTest.cs" />
-    <Compile Include="PipingCalculatorSellmeijerTest.cs" />
     <Compile Include="OvertoppingErosionCalculatorTest.cs" />
     <Compile Include="DamMStabAssemblerTest.cs">
       <SubType>Code</SubType>
@@ -207,10 +195,8 @@
     <Compile Include="CsvParserTest.cs" />
     <Compile Include="EntityFactoryTest.cs" />
     <Compile Include="ObjectMaterializerTest.cs" />
-    <Compile Include="PipingCalculatorBlighTest.cs" />
     <Compile Include="PLLinesTest.cs" />
     <Compile Include="PLLineTest.cs" />
-    <Compile Include="PLLinesCreatorTest.cs" />
     <Compile Include="DikeTest.cs" />
     <Compile Include="PointTest.cs" />
     <Compile Include="PolyLineTest.cs" />
@@ -223,10 +209,8 @@
     <Compile Include="SurfaceLineShoulderAdapterTest.cs" />
     <Compile Include="DikeJobTest.cs" />
     <Compile Include="WaterBoardJobTest.cs" />
-    <Compile Include="TimeSerieCalculatorTest.cs" />
     <Compile Include="TimeSerieCollectionTest.cs" />
     <Compile Include="TimeSeriesAssemblerTest.cs" />
-    <Compile Include="TimeSerieStabilityCalculatorTest.cs" />
     <Compile Include="UpliftFactorToBetaCalculatorTest.cs" />
     <Compile Include="UpliftLocationDeterminatorTest.cs" />
   </ItemGroup>
Fisheye: Tag 268 refers to a dead (removed) revision in file `dam clients/DamUI/trunk/src/Dam/Data/DAMFailureMechanismeCalculator.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 268 refers to a dead (removed) revision in file `dam clients/DamUI/trunk/src/Dam/Data/PipingCalculatorSellmeijer.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 268 refers to a dead (removed) revision in file `dam clients/DamUI/trunk/src/Dam/Tests/DamCalculationTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 268 refers to a dead (removed) revision in file `dam clients/DamUI/trunk/src/Dam/Data/DGeoStability.ini'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 268 refers to a dead (removed) revision in file `dam clients/DamUI/trunk/src/Dam/Tests/StabilityCalculatorTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: dam clients/DamUI/trunk/src/Dam/Data/Geometry2DDataCreator.cs
===================================================================
diff -u -r236 -r268
--- dam clients/DamUI/trunk/src/Dam/Data/Geometry2DDataCreator.cs	(.../Geometry2DDataCreator.cs)	(revision 236)
+++ dam clients/DamUI/trunk/src/Dam/Data/Geometry2DDataCreator.cs	(.../Geometry2DDataCreator.cs)	(revision 268)
@@ -93,7 +93,7 @@
         {
             const int iterationIndex = -1;
 
-            geometryFilename = StabilityCalculator.DetermineCalculationFilename(location.Name, "PL", soilProfileProbability.SoilGeometryName, iterationIndex);
+            geometryFilename = DamHelperFunctions.DetermineCalculationFilename(location.Name, "PL", soilProfileProbability.SoilGeometryName, iterationIndex);
             geometryFilename = geometryFilename + ".sti";
             geometryFilename = Path.Combine(geometryDirectory, geometryFilename);
             string soilgeometry2DFilename = null;
@@ -135,7 +135,7 @@
             stabilityServiceAgent.CreateProjectFile(mstabXML.ToString());
             if (!File.Exists(geometryFilename))
             {
-                throw new DamFailureMechanismeCalculatorException("Geometry file (sti) is not created.");
+                throw new Exception("Geometry file (sti) is not created.");
             }
         }
     }
Index: dam clients/DamUI/trunk/src/Dam/Tests/Deltares.Dam.IntegrationTests.csproj
===================================================================
diff -u -r245 -r268
--- dam clients/DamUI/trunk/src/Dam/Tests/Deltares.Dam.IntegrationTests.csproj	(.../Deltares.Dam.IntegrationTests.csproj)	(revision 245)
+++ dam clients/DamUI/trunk/src/Dam/Tests/Deltares.Dam.IntegrationTests.csproj	(.../Deltares.Dam.IntegrationTests.csproj)	(revision 268)
@@ -103,15 +103,10 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="ComparisonTestRunner.cs" />
-    <Compile Include="DamCalculationWtiComparisonTests.cs" />
     <Compile Include="DamIntegrationTestHelper.cs" />
     <Compile Include="DamIntegrationTestTolerance.cs" />
     <Compile Include="DamCalculationBenchmarkTest.cs" />
     <Compile Include="FailureMechanismTests.cs" />
-    <Compile Include="GageDikeRealCorrectDataTest.cs" />
-    <Compile Include="GageDikeIntegrationTest.cs" />
-    <Compile Include="GageDikeRealWildDataTest.cs" />
     <Compile Include="IntersectionOnShapesTest.cs" />
     <Compile Include="DAMProjectCalculatorDijkring13Test.cs" />
     <Compile Include="DamStabilityNWOIntegrationTest.cs" />
Fisheye: Tag 268 refers to a dead (removed) revision in file `dam clients/DamUI/trunk/src/Dam/Data/DomainModel.cd'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 268 refers to a dead (removed) revision in file `dam clients/DamUI/trunk/src/Dam/Data/DamProjectCalculator.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: dam clients/DamUI/trunk/src/Dam/Tests/DamPipingBenchmarkTest.cs
===================================================================
diff -u -r236 -r268
--- dam clients/DamUI/trunk/src/Dam/Tests/DamPipingBenchmarkTest.cs	(.../DamPipingBenchmarkTest.cs)	(revision 236)
+++ dam clients/DamUI/trunk/src/Dam/Tests/DamPipingBenchmarkTest.cs	(.../DamPipingBenchmarkTest.cs)	(revision 268)
@@ -30,11 +30,14 @@
 
 
                 // Calculate dijkring
-                var damProjectCalculator = new DamProjectCalculator(damProjectData);
-                damProjectCalculator.CalculationBaseDirectory = Path.Combine(Path.GetDirectoryName(Path.GetFullPath(projectFilename)), "CalculationFiles");
-                damProjectCalculator.MStabProgramPath = CmstabProgramPath;
-                var allCalculationresults = damProjectCalculator.Calculate(damProjectData, dike.Scenarios);
-                return allCalculationresults;
+                //  TODO: DAMUI Start
+                //var damProjectCalculator = new DamProjectCalculator(damProjectData);
+                //damProjectCalculator.CalculationBaseDirectory = Path.Combine(Path.GetDirectoryName(Path.GetFullPath(projectFilename)), "CalculationFiles");
+                //damProjectCalculator.MStabProgramPath = CmstabProgramPath;
+                //var allCalculationresults = damProjectCalculator.Calculate(damProjectData, dike.Scenarios);
+                //return allCalculationresults;
+                return null;
+                //  TODO: DAMUI End
             }
         }
 
Index: dam clients/DamUI/trunk/src/Dam/Tests/DamCalculationBenchmarkTest.cs
===================================================================
diff -u -r236 -r268
--- dam clients/DamUI/trunk/src/Dam/Tests/DamCalculationBenchmarkTest.cs	(.../DamCalculationBenchmarkTest.cs)	(revision 236)
+++ dam clients/DamUI/trunk/src/Dam/Tests/DamCalculationBenchmarkTest.cs	(.../DamCalculationBenchmarkTest.cs)	(revision 268)
@@ -42,10 +42,13 @@
                 DamIntegrationTestHelper.AddCalculationSpecificationsToDamProjectData(damProjectData);
 
                 // Calculate dijkring
-                var damProjectCalculator = new DamProjectCalculator(damProjectData);
-                damProjectCalculator.CalculationBaseDirectory = Path.GetFullPath(Path.Combine(cFolderName, "CalculationFiles"));
-                damProjectCalculator.MStabProgramPath = cmstabProgramPath;
-                List<List<CsvExportData>> allCalculationresults = damProjectCalculator.Calculate(damProjectData, dike.Scenarios);
+                //  TODO: DAMUI Start
+                //var damProjectCalculator = new DamProjectCalculator(damProjectData);
+                //damProjectCalculator.CalculationBaseDirectory = Path.GetFullPath(Path.Combine(cFolderName, "CalculationFiles"));
+                //damProjectCalculator.MStabProgramPath = cmstabProgramPath;
+                // List<List<CsvExportData>> allCalculationresults = damProjectCalculator.Calculate(damProjectData, dike.Scenarios);
+                List<List<CsvExportData>> allCalculationresults = null;
+                //  TODO: DAMUI End
                 Assert.IsTrue(allCalculationresults[0][0].IsUplift.Value);
                 Assert.AreEqual(1.024077029, allCalculationresults[0][0].Pl3MinUplift.Value, cTolerance);
                 Assert.AreEqual(49.1, allCalculationresults[0][0].Pl3LocalLocationXMinUplift.Value, cTolerance); // Due to improvement of PLLineCreator this value was changed from 51.1
@@ -69,10 +72,13 @@
                 DamIntegrationTestHelper.AddCalculationSpecificationsToDamProjectData(damProjectData);
 
                 // Calculate dijkring
-                var damProjectCalculator = new DamProjectCalculator(damProjectData);
-                damProjectCalculator.CalculationBaseDirectory = Path.GetFullPath(Path.Combine(cFolderName, "CalculationFiles"));
-                damProjectCalculator.MStabProgramPath = cmstabProgramPath;
-                List<List<CsvExportData>> allCalculationresults = damProjectCalculator.Calculate(damProjectData, dike.Scenarios);
+                //  TODO: DAMUI Start
+                //var damProjectCalculator = new DamProjectCalculator(damProjectData);
+                //damProjectCalculator.CalculationBaseDirectory = Path.GetFullPath(Path.Combine(cFolderName, "CalculationFiles"));
+                //damProjectCalculator.MStabProgramPath = cmstabProgramPath;
+                //List<List<CsvExportData>> allCalculationresults = damProjectCalculator.Calculate(damProjectData, dike.Scenarios);
+                List<List<CsvExportData>> allCalculationresults = null;
+                //  TODO: DAMUI End
                 Assert.IsTrue(allCalculationresults[0][0].IsUplift.Value);
                 Assert.AreEqual(0.905914295, allCalculationresults[0][0].Pl3MinUplift.Value, cTolerance);
                 Assert.AreEqual(-1.289245668, allCalculationresults[0][0].Pl3HeadAdjusted.Value, cTolerance);
@@ -95,10 +101,13 @@
                 DamIntegrationTestHelper.AddCalculationSpecificationsToDamProjectData(damProjectData);
 
                 // Calculate dijkring
-                var damProjectCalculator = new DamProjectCalculator(damProjectData);
-                damProjectCalculator.CalculationBaseDirectory = Path.GetFullPath(Path.Combine(cFolderName, "CalculationFiles"));
-                damProjectCalculator.MStabProgramPath = cmstabProgramPath;
-                List<List<CsvExportData>> allCalculationresults = damProjectCalculator.Calculate(damProjectData, dike.Scenarios);
+                //  TODO: DAMUI Start
+                //var damProjectCalculator = new DamProjectCalculator(damProjectData);
+                //damProjectCalculator.CalculationBaseDirectory = Path.GetFullPath(Path.Combine(cFolderName, "CalculationFiles"));
+                //damProjectCalculator.MStabProgramPath = cmstabProgramPath;
+                //List<List<CsvExportData>> allCalculationresults = damProjectCalculator.Calculate(damProjectData, dike.Scenarios);
+                List<List<CsvExportData>> allCalculationresults = null;
+                //  TODO: DAMUI End
                 Assert.IsTrue(allCalculationresults[0][0].IsUplift.Value);
                 Assert.AreEqual(1.0, allCalculationresults[0][0].Pl3MinUplift.Value, cTolerance);
                 Assert.AreEqual(-1.289245668, allCalculationresults[0][0].Pl3HeadAdjusted.Value, cTolerance);
@@ -121,10 +130,13 @@
                 DamIntegrationTestHelper.AddCalculationSpecificationsToDamProjectData(damProjectData);
 
                 // Calculate dijkring
-                var damProjectCalculator = new DamProjectCalculator(damProjectData);
-                damProjectCalculator.CalculationBaseDirectory = Path.GetFullPath(Path.Combine(cFolderName, "CalculationFiles"));
-                damProjectCalculator.MStabProgramPath = cmstabProgramPath;
-                List<List<CsvExportData>> allCalculationresults = damProjectCalculator.Calculate(damProjectData, dike.Scenarios);
+                //  TODO: DAMUI Start
+                //var damProjectCalculator = new DamProjectCalculator(damProjectData);
+                //damProjectCalculator.CalculationBaseDirectory = Path.GetFullPath(Path.Combine(cFolderName, "CalculationFiles"));
+                //damProjectCalculator.MStabProgramPath = cmstabProgramPath;
+                //List<List<CsvExportData>> allCalculationresults = damProjectCalculator.Calculate(damProjectData, dike.Scenarios);
+                List<List<CsvExportData>> allCalculationresults = null;
+                //  TODO: DAMUI End
                 Assert.IsTrue(allCalculationresults[0][0].IsUplift.Value);
                 Assert.AreEqual(0.969283045, allCalculationresults[0][0].Pl3MinUplift.Value, cTolerance);
                 Assert.AreEqual(-1.6382263, allCalculationresults[0][0].Pl3HeadAdjusted.Value, cTolerance);
@@ -147,11 +159,14 @@
                 DamIntegrationTestHelper.AddCalculationSpecificationsToDamProjectData(damProjectData);
 
                 // Calculate dijkring
-                var damProjectCalculator = new DamProjectCalculator(damProjectData);
-                damProjectCalculator.CalculationBaseDirectory = Path.GetFullPath(Path.Combine(cFolderName, "CalculationFiles"));
-                damProjectCalculator.MStabProgramPath = cmstabProgramPath;
-                damProjectData.DamProjectCalculationSpecification.SelectedStabilityKernelType = StabilityKernelType.DamClassicWti; // = StabilityKernelType.WtiMacroStability;
-                List<List<CsvExportData>> allCalculationresults = damProjectCalculator.Calculate(damProjectData, dike.Scenarios);
+                //  TODO: DAMUI Start
+                //var damProjectCalculator = new DamProjectCalculator(damProjectData);
+                //damProjectCalculator.CalculationBaseDirectory = Path.GetFullPath(Path.Combine(cFolderName, "CalculationFiles"));
+                //damProjectCalculator.MStabProgramPath = cmstabProgramPath;
+                //damProjectData.DamProjectCalculationSpecification.SelectedStabilityKernelType = StabilityKernelType.DamClassicWti; // = StabilityKernelType.WtiMacroStability;
+                //List<List<CsvExportData>> allCalculationresults = damProjectCalculator.Calculate(damProjectData, dike.Scenarios);
+                List<List<CsvExportData>> allCalculationresults = null;
+                //  TODO: DAMUI End
                 Assert.IsTrue(allCalculationresults[0][0].IsUplift.Value);
                 Assert.AreEqual(0.969283045, allCalculationresults[0][0].Pl3MinUplift.Value, cTolerance);
                 Assert.AreEqual(-1.6382263, allCalculationresults[0][0].Pl3HeadAdjusted.Value, cTolerance);
@@ -174,10 +189,13 @@
                 DamIntegrationTestHelper.AddCalculationSpecificationsToDamProjectData(damProjectData);
 
                 // Calculate dijkring
-                var damProjectCalculator = new DamProjectCalculator(damProjectData);
-                damProjectCalculator.CalculationBaseDirectory = Path.GetFullPath(Path.Combine(cFolderName, "CalculationFiles"));
-                damProjectCalculator.MStabProgramPath = cmstabProgramPath;
-                List<List<CsvExportData>> allCalculationresults = damProjectCalculator.Calculate(damProjectData, dike.Scenarios);
+                //  TODO: DAMUI Start
+                //var damProjectCalculator = new DamProjectCalculator(damProjectData);
+                //damProjectCalculator.CalculationBaseDirectory = Path.GetFullPath(Path.Combine(cFolderName, "CalculationFiles"));
+                //damProjectCalculator.MStabProgramPath = cmstabProgramPath;
+                //List<List<CsvExportData>> allCalculationresults = damProjectCalculator.Calculate(damProjectData, dike.Scenarios);
+                List<List<CsvExportData>> allCalculationresults = null;
+                //  TODO: DAMUI End
                 Assert.IsFalse(allCalculationresults[0][0].IsUplift.Value);
                 Assert.AreEqual(1.512062521, allCalculationresults[0][0].Pl3MinUplift.Value, cTolerance);
                 Assert.AreEqual(43.0, allCalculationresults[0][0].Pl3LocalLocationXMinUplift.Value, cTolerance);
@@ -198,10 +216,13 @@
                 DamIntegrationTestHelper.AddCalculationSpecificationsToDamProjectData(damProjectData);
 
                 // Calculate dijkring
-                var damProjectCalculator = new DamProjectCalculator(damProjectData);
-                damProjectCalculator.CalculationBaseDirectory = Path.GetFullPath(Path.Combine(cFolderName, "CalculationFiles"));
-                damProjectCalculator.MStabProgramPath = cmstabProgramPath;
-                List<List<CsvExportData>> allCalculationresults = damProjectCalculator.Calculate(damProjectData, dike.Scenarios);
+                //  TODO: DAMUI Start
+                //var damProjectCalculator = new DamProjectCalculator(damProjectData);
+                //damProjectCalculator.CalculationBaseDirectory = Path.GetFullPath(Path.Combine(cFolderName, "CalculationFiles"));
+                //damProjectCalculator.MStabProgramPath = cmstabProgramPath;
+                //List<List<CsvExportData>> allCalculationresults = damProjectCalculator.Calculate(damProjectData, dike.Scenarios);
+                List<List<CsvExportData>> allCalculationresults = null;
+                //  TODO: DAMUI End
                 Assert.IsTrue(allCalculationresults[0][0].IsUplift.Value);
                 // Values at bottom ditch dikeside
                 Assert.AreEqual(0.820097604, allCalculationresults[0][0].Pl3MinUplift.Value, cTolerance); 
@@ -242,26 +263,29 @@
         /// <returns></returns>
         private EvaluationJob ComputeEvaluationJobWithScenariosSelected(DamProjectData damProjectData)
         {
-            var rwScenariosCalculation = new RWScenariosCalculation();
+            //  TODO: DAMUI Start
+            //var rwScenariosCalculation = new RWScenariosCalculation();
 
-            rwScenariosCalculation.MStabExePath = Path.GetFullPath(cmstabProgramPath);
+            //rwScenariosCalculation.MStabExePath = Path.GetFullPath(cmstabProgramPath);
 
-            foreach (LocationJob locationjob in damProjectData.LocationJobs)
-            {
-                locationjob.Run = true;
-            }
-            EvaluationJob evaluationJob = damProjectData.GetEvaluationJob();
+            //foreach (LocationJob locationjob in damProjectData.LocationJobs)
+            //{
+            //    locationjob.Run = true;
+            //}
+            //EvaluationJob evaluationJob = damProjectData.GetEvaluationJob();
 
-            rwScenariosCalculation.Load(evaluationJob.XML);
-            rwScenariosCalculation.IsSkipStabilityCalculation = true; // skip actual calculations, because only scenario selection is tested
-            rwScenariosCalculation.Run();
+            //rwScenariosCalculation.Load(evaluationJob.XML);
+            //rwScenariosCalculation.IsSkipStabilityCalculation = true; // skip actual calculations, because only scenario selection is tested
+            //rwScenariosCalculation.Run();
 
-            string results = "";
-            rwScenariosCalculation.GetResults(ref results);
+            //string results = "";
+            //rwScenariosCalculation.GetResults(ref results);
 
-            evaluationJob.XML = results;
-            evaluationJob.AttachResults(damProjectData.LocationJobs);
-            return evaluationJob;
+            //evaluationJob.XML = results;
+            //evaluationJob.AttachResults(damProjectData.LocationJobs);
+            //return evaluationJob;
+            return null;
+            //  TODO: DAMUI End
         }
 
         /// <summary>
Fisheye: Tag 268 refers to a dead (removed) revision in file `dam clients/DamUI/trunk/src/Dam/Data/PipingCalculatorBligh.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 268 refers to a dead (removed) revision in file `dam clients/DamUI/trunk/src/Dam/Data/Stability/StabilityCalculation.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 268 refers to a dead (removed) revision in file `dam clients/DamUI/trunk/src/Dam/Tests/TimeSerieCalculatorTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 268 refers to a dead (removed) revision in file `dam clients/DamUI/trunk/src/Dam/Tests/PipingCalculatorBlighTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: dam clients/DamUI/trunk/src/Dam/Data/CalculationHelper.cs
===================================================================
diff -u -r236 -r268
--- dam clients/DamUI/trunk/src/Dam/Data/CalculationHelper.cs	(.../CalculationHelper.cs)	(revision 236)
+++ dam clients/DamUI/trunk/src/Dam/Data/CalculationHelper.cs	(.../CalculationHelper.cs)	(revision 268)
@@ -453,7 +453,7 @@
             {
                 if (soilGeometry2DName == null)
                 {
-                    throw new TimeSerieStabilityCalculatorException(String.Format("Location {0} does not have a soilprofile assigned", location.Name));
+                    throw new Exception(String.Format("Location {0} does not have a soilprofile assigned", location.Name));
                 }
                 soilGeometryType = SoilGeometryType.SoilGeometry2D;
             }
Index: dam clients/DamUI/trunk/src/Dam/Data/Segment.cs
===================================================================
diff -u -r236 -r268
--- dam clients/DamUI/trunk/src/Dam/Data/Segment.cs	(.../Segment.cs)	(revision 236)
+++ dam clients/DamUI/trunk/src/Dam/Data/Segment.cs	(.../Segment.cs)	(revision 268)
@@ -54,7 +54,7 @@
                 {
                     if (SoilGeometry2DName == null)
                     {
-                        throw new TimeSerieStabilityCalculatorException("No soilprofile assigned");
+                        throw new Exception("No soilprofile assigned");
                     }
                     return SoilGeometryType.SoilGeometry2D;
                 }
Fisheye: Tag 268 refers to a dead (removed) revision in file `dam clients/DamUI/trunk/src/Dam/Data/Sensors/SensorTimeSeriesProcessor.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 268 refers to a dead (removed) revision in file `dam clients/DamUI/trunk/src/Dam/Tests/PLLinesCreatorDupuitTests.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 268 refers to a dead (removed) revision in file `dam clients/DamUI/trunk/src/Dam/Data/PipingCalculatorWti2017.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: dam clients/DamUI/trunk/src/Dam/Tests/DamStabilityNWOIntegrationTest.cs
===================================================================
diff -u -r236 -r268
--- dam clients/DamUI/trunk/src/Dam/Tests/DamStabilityNWOIntegrationTest.cs	(.../DamStabilityNWOIntegrationTest.cs)	(revision 236)
+++ dam clients/DamUI/trunk/src/Dam/Tests/DamStabilityNWOIntegrationTest.cs	(.../DamStabilityNWOIntegrationTest.cs)	(revision 268)
@@ -51,11 +51,14 @@
                 damProjectData.DamProjectCalculationSpecification.DamCalculationSpecifications.Add(damCalculationSpecification);
 
                 // Calculate dijkring
-                var damProjectCalculator = new DamProjectCalculator(damProjectData);
-                damProjectCalculator.CalculationBaseDirectory = Path.GetFullPath(Path.Combine(cDikeFolder, "CalculationFiles"));
-                damProjectCalculator.MStabProgramPath = cmstabProgramPath;
-                damProjectCalculator.ProjectDataDirectory = cDikeFolder;
-                List<List<CsvExportData>> allCalculationresults = damProjectCalculator.Calculate(damProjectData, dike.Scenarios);
+                //  TODO: DAMUI Start
+                //var damProjectCalculator = new DamProjectCalculator(damProjectData);
+                //damProjectCalculator.CalculationBaseDirectory = Path.GetFullPath(Path.Combine(cDikeFolder, "CalculationFiles"));
+                //damProjectCalculator.MStabProgramPath = cmstabProgramPath;
+                //damProjectCalculator.ProjectDataDirectory = cDikeFolder;
+                //List<List<CsvExportData>> allCalculationresults = damProjectCalculator.Calculate(damProjectData, dike.Scenarios);
+                List<List<CsvExportData>> allCalculationresults = null;
+                //  TODO: DAMUI End
                 //#Bka#Bka Bij multicore wordt niet altijd de juiste 2D ondergrond gebruikt, dit ondanks dar volgenns de naam van sti-file dat wel gebeurt. zie TEST NWO in losse zooi die weg kan, bishop versus 
                 // bishop multi core, dwp02-4 sommen 0 t/m 10 gebruiken 10Y_005_STBI ipv de (in de naam genoemde) 10Y_024_STBI. iter 11 gebruikt dan opeens wel de juiste 2d. Single core gaat wel goed!
                 Assert.AreEqual(1.673, allCalculationresults[0][0].StabilitySafetyFactor.Value, cTolerance);
Fisheye: Tag 268 refers to a dead (removed) revision in file `dam clients/DamUI/trunk/src/Dam/Tests/ComparisonTestRunner.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: dam clients/DamUI/trunk/src/Dam/Tests/DAMProjectCalculatorDijkring13Test.cs
===================================================================
diff -u -r236 -r268
--- dam clients/DamUI/trunk/src/Dam/Tests/DAMProjectCalculatorDijkring13Test.cs	(.../DAMProjectCalculatorDijkring13Test.cs)	(revision 236)
+++ dam clients/DamUI/trunk/src/Dam/Tests/DAMProjectCalculatorDijkring13Test.cs	(.../DAMProjectCalculatorDijkring13Test.cs)	(revision 268)
@@ -52,10 +52,13 @@
                 damProjectData.DamProjectCalculationSpecification.DamCalculationSpecifications.Add(damCalculationSpecification);
 
                 // Calculate dijkring
-                var damProjectCalculator = new DamProjectCalculator(damProjectData);
-                damProjectCalculator.CalculationBaseDirectory = Path.GetFullPath(Path.Combine(cDikeFolder, "CalculationFiles"));
-                damProjectCalculator.MStabProgramPath = cmstabProgramPath;
-                List<List<CsvExportData>> allCalculationresults = damProjectCalculator.Calculate(damProjectData, dike.Scenarios);
+                //  TODO: DAMUI Start
+                //var damProjectCalculator = new DamProjectCalculator(damProjectData);
+                //damProjectCalculator.CalculationBaseDirectory = Path.GetFullPath(Path.Combine(cDikeFolder, "CalculationFiles"));
+                //damProjectCalculator.MStabProgramPath = cmstabProgramPath;
+                //List<List<CsvExportData>> allCalculationresults = damProjectCalculator.Calculate(damProjectData, dike.Scenarios);
+                List<List<CsvExportData>> allCalculationresults = null;
+                //  TODO: DAMUI End
                 // Following values are just taken from the Geo Stability calculation and not manually calculated
                 Assert.AreEqual(0.82, allCalculationresults[0][0].StabilitySafetyFactor.Value, cTolerance);
                 Assert.AreEqual(1.046, allCalculationresults[0][1].StabilitySafetyFactor.Value, cTolerance);
Index: dam clients/DamUI/trunk/src/Dam/Forms/Translations.xml
===================================================================
diff -u -r236 -r268
--- dam clients/DamUI/trunk/src/Dam/Forms/Translations.xml	(.../Translations.xml)	(revision 236)
+++ dam clients/DamUI/trunk/src/Dam/Forms/Translations.xml	(.../Translations.xml)	(revision 268)
@@ -61,6 +61,7 @@
   <Translation ID="ProbabilityString" en-US="Probability of occurrence" nl-NL="Kans van voorkomen" />
   <Translation ID="ProbabilityStringDescription" en-US="The probability of the soil profile in the stochastic soil model of the current location" nl-NL="De kans van voorkomen van het grondprofiel in het stochastich ondergondmodel behorende bij de huidige locatie" />
   <Translation ID="NoLicenseGranted" en-US="Calculation is only possible with a valid DAM license" nl-NL="Rekenen kan alleen met een geldige DAM licentie" />
+  <Translation ID="NoCalculationPossible" en-US="Calculation is not possible yet" nl-NL="Rekenen kan op dit moment nog niet" />
   <Translation ID="StabilityOptionsGroupControl" en-US="Stability Options" nl-NL="Opties voor stabiliteit" />
   <Translation ID="AssessmentModelOptionsGroupControl" en-US="Model Options" nl-NL="Model opties" />
   <Translation ID="OpenFile" en-US="Open Calculation" nl-NL="Open Berekening" />
Fisheye: Tag 268 refers to a dead (removed) revision in file `dam clients/DamUI/trunk/src/Dam/Tests/GageDikeCalculatorTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 268 refers to a dead (removed) revision in file `dam clients/DamUI/trunk/src/Dam/Tests/StabilityProjectObjectCreatorTests.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: dam clients/DamUI/trunk/src/Dam/Data/cc3280mt.dll
===================================================================
diff -u -r236 -r268
Binary files differ
Fisheye: Tag 268 refers to a dead (removed) revision in file `dam clients/DamUI/trunk/src/Dam/Data/TimeSerieOvertoppingErosionCalculator.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 268 refers to a dead (removed) revision in file `dam clients/DamUI/trunk/src/Dam/Tests/GageDikeProcessorTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 268 refers to a dead (removed) revision in file `dam clients/DamUI/trunk/src/Dam/Tests/GageDikeRealWildDataTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: dam clients/DamUI/trunk/src/Dam/Data/CsvExportData.cs
===================================================================
diff -u -r236 -r268
--- dam clients/DamUI/trunk/src/Dam/Data/CsvExportData.cs	(.../CsvExportData.cs)	(revision 236)
+++ dam clients/DamUI/trunk/src/Dam/Data/CsvExportData.cs	(.../CsvExportData.cs)	(revision 268)
@@ -2399,12 +2399,13 @@
 
         private string GetCurrentExeForOpenCalculationFile()
         {
-            var exeName = StabilityCalculator.MStabExePath;
-            if (SelectedStabilityKernelType != StabilityKernelType.DamClassic)
-            {
-                exeName = Path.GetDirectoryName(exeName) + "\\MStab.exe";
-            }
-            return exeName;
+            //var exeName = StabilityCalculator.MStabExePath;
+            //if (SelectedStabilityKernelType != StabilityKernelType.DamClassic)
+            //{
+            //    exeName = Path.GetDirectoryName(exeName) + "\\MStab.exe";
+            //}
+            //return exeName;
+            throw new NotImplementedException("To be implemented");
         }
 
         /// <summary>
Index: dam clients/DamUI/trunk/src/Dam.sln
===================================================================
diff -u -r245 -r268
--- dam clients/DamUI/trunk/src/Dam.sln	(.../Dam.sln)	(revision 245)
+++ dam clients/DamUI/trunk/src/Dam.sln	(.../Dam.sln)	(revision 268)
@@ -85,8 +85,6 @@
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Deltares.Uplift.Tests", "Uplift\Tests\Deltares.Uplift.Tests.csproj", "{D258D962-3F8D-406D-A134-DEA27114EFAB}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PerformanceTestClientConsole", "Dam\Tests\PerfTestClient\PerformanceTestClientConsole.csproj", "{792CB645-B070-4B05-95EB-5E5CF7E59CDC}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CsvToDamxConverter", "Dam\Tools\CsvToDamxConverter\CsvToDamxConverter.csproj", "{D8457286-3BD4-49FB-9FCB-22D7CB662F57}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GeoXY2LatLong", "Dam\Tools\GeoXY2LatLong\GeoXY2LatLong.csproj", "{2C1BFE67-A106-4926-BA5A-0374EA6B99B6}"
@@ -203,10 +201,6 @@
 		{D258D962-3F8D-406D-A134-DEA27114EFAB}.Debug|x86.Build.0 = Debug|x86
 		{D258D962-3F8D-406D-A134-DEA27114EFAB}.Release|x86.ActiveCfg = Release|x86
 		{D258D962-3F8D-406D-A134-DEA27114EFAB}.Release|x86.Build.0 = Release|x86
-		{792CB645-B070-4B05-95EB-5E5CF7E59CDC}.Debug|x86.ActiveCfg = Debug|x86
-		{792CB645-B070-4B05-95EB-5E5CF7E59CDC}.Debug|x86.Build.0 = Debug|x86
-		{792CB645-B070-4B05-95EB-5E5CF7E59CDC}.Release|x86.ActiveCfg = Release|x86
-		{792CB645-B070-4B05-95EB-5E5CF7E59CDC}.Release|x86.Build.0 = Release|x86
 		{D8457286-3BD4-49FB-9FCB-22D7CB662F57}.Debug|x86.ActiveCfg = Debug|x86
 		{D8457286-3BD4-49FB-9FCB-22D7CB662F57}.Debug|x86.Build.0 = Debug|x86
 		{D8457286-3BD4-49FB-9FCB-22D7CB662F57}.Release|x86.ActiveCfg = Release|x86
@@ -258,7 +252,6 @@
 		{E0820F33-3929-493D-821D-95E755F87D0B} = {62CC2363-893F-4ECD-BCD6-AA7150AD6918}
 		{49673DFB-0A90-43D7-BF9E-C2EEAFDD2E81} = {62CC2363-893F-4ECD-BCD6-AA7150AD6918}
 		{D258D962-3F8D-406D-A134-DEA27114EFAB} = {62CC2363-893F-4ECD-BCD6-AA7150AD6918}
-		{792CB645-B070-4B05-95EB-5E5CF7E59CDC} = {62CC2363-893F-4ECD-BCD6-AA7150AD6918}
 		{731A8E36-4E16-4C13-B548-D47DA12B813F} = {62CC2363-893F-4ECD-BCD6-AA7150AD6918}
 		{9184EF77-E11F-41C9-8926-CFF0AABE43A0} = {62CC2363-893F-4ECD-BCD6-AA7150AD6918}
 		{D8457286-3BD4-49FB-9FCB-22D7CB662F57} = {21ABEBA9-040B-4522-BD23-837E4FB5CD08}
Index: dam clients/DamUI/trunk/src/Dam/Data/DGeoStability.exe
===================================================================
diff -u -r236 -r268
Binary files differ
Fisheye: Tag 268 refers to a dead (removed) revision in file `dam clients/DamUI/trunk/src/Dam/Tests/PipingCalculatorSellmeijer2ForcesTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 268 refers to a dead (removed) revision in file `dam clients/DamUI/trunk/src/Dam/Data/TimeSeriePipingCalculator.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 268 refers to a dead (removed) revision in file `dam clients/DamUI/trunk/src/Dam/Tests/GageDikeIntegrationTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 268 refers to a dead (removed) revision in file `dam clients/DamUI/trunk/src/Dam/Data/GageDikeCalculator.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 268 refers to a dead (removed) revision in file `dam clients/DamUI/trunk/src/Dam/Tests/TimeSerieStabilityCalculatorTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 268 refers to a dead (removed) revision in file `dam clients/DamUI/trunk/src/Dam/Data/DAMFailureMechanismeCalculatorException.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 268 refers to a dead (removed) revision in file `dam clients/DamUI/trunk/src/Dam/Tests/PerfTestClient/Properties/AssemblyInfo.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 268 refers to a dead (removed) revision in file `dam clients/DamUI/trunk/src/Dam/Tests/PerfTestClient/app.config'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 268 refers to a dead (removed) revision in file `dam clients/DamUI/trunk/src/Dam/Tests/PerfTestClient/PerformanceTestClientConsole.csproj'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 268 refers to a dead (removed) revision in file `dam clients/DamUI/trunk/src/Dam/Tests/PerfTestClient/TestData/IJkdata/ijkdijkpointdata_fews2dam.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 268 refers to a dead (removed) revision in file `dam clients/DamUI/trunk/src/Dam/Tests/PerfTestClient/Program.cs'.
Fisheye: No comparison available.  Pass `N' to diff?