Index: DamClients/DamUI/trunk/src/Dam/Tests/DamCalculationBenchmarkTest.cs
===================================================================
diff -u -r3317 -r3336
--- DamClients/DamUI/trunk/src/Dam/Tests/DamCalculationBenchmarkTest.cs	(.../DamCalculationBenchmarkTest.cs)	(revision 3317)
+++ DamClients/DamUI/trunk/src/Dam/Tests/DamCalculationBenchmarkTest.cs	(.../DamCalculationBenchmarkTest.cs)	(revision 3336)
@@ -48,7 +48,7 @@
         /// <param name="modelType"></param>
         /// <param name="expectedLocations"></param>
         /// <returns></returns>
-        private static List<CsvExportData> ComputeStabilityInsideProjectUsingClassic(string projectFilename,
+        private static List<CsvExportData> ComputeStabilityInsideProject(string projectFilename,
             MStabModelType modelType, int expectedLocations)
         {
             using (DamProjectData damProjectData =
@@ -99,7 +99,7 @@
         {
             string cFolderName =
                 @"..\..\..\data\Dam\\Benchmarks\4 Validatie opdrijfberekeningen\01 Situatie zonder opdrijven (1D)\Databronbestand.damx";
-            List<CsvExportData> allCalculationResults = ComputeStabilityInsideProjectUsingClassic(cFolderName, MStabModelType.Bishop, 1);
+            List<CsvExportData> allCalculationResults = ComputeStabilityInsideProject(cFolderName, MStabModelType.Bishop, 1);
 
             Assert.IsTrue(allCalculationResults[0].IsUplift.Value);
             Assert.AreEqual(1.024077029, allCalculationResults[0].Pl3MinUplift.Value, cTolerance);
@@ -118,7 +118,7 @@
         {
             string cFolderName =
                 @"..\..\..\data\Dam\\Benchmarks\4 Validatie opdrijfberekeningen\02 Situatie met opdrijven (1D)\Databronbestand.damx";
-            List<CsvExportData> allCalculationResults = ComputeStabilityInsideProjectUsingClassic(cFolderName, MStabModelType.Bishop, 1);
+            List<CsvExportData> allCalculationResults = ComputeStabilityInsideProject(cFolderName, MStabModelType.Bishop, 1);
 
             Assert.IsTrue(allCalculationResults[0].IsUplift.Value);
             Assert.AreEqual(0.905914295, allCalculationResults[0].Pl3MinUplift.Value, cTolerance);
@@ -137,7 +137,7 @@
         {
             string cFolderName =
                 @"..\..\..\data\Dam\\Benchmarks\4 Validatie opdrijfberekeningen\03 Situatie met een labiel evenwicht (1D)\Databronbestand.damx";
-            List<CsvExportData> allCalculationResults = ComputeStabilityInsideProjectUsingClassic(cFolderName, MStabModelType.Bishop, 1);
+            List<CsvExportData> allCalculationResults = ComputeStabilityInsideProject(cFolderName, MStabModelType.Bishop, 1);
 
             Assert.IsTrue(allCalculationResults[0].IsUplift.Value);
             Assert.AreEqual(1.0, allCalculationResults[0].Pl3MinUplift.Value, cTolerance);
@@ -156,7 +156,7 @@
         {
             string cFolderName =
                 @"..\..\..\data\Dam\Benchmarks\4 Validatie opdrijfberekeningen\04 Situatie met een schuine slootbodem en opdrijven op 1 locatie (1D)\Databronbestand.damx";
-            List<CsvExportData> allCalculationResults = ComputeStabilityInsideProjectUsingClassic(cFolderName, MStabModelType.Bishop, 1);
+            List<CsvExportData> allCalculationResults = ComputeStabilityInsideProject(cFolderName, MStabModelType.Bishop, 1);
 
             Assert.IsTrue(allCalculationResults[0].IsUplift.Value);
             Assert.AreEqual(0.969283045, allCalculationResults[0].Pl3MinUplift.Value, cTolerance);
@@ -175,7 +175,7 @@
         {
             string cFolderName =
                 @"..\..\..\data\Dam\\Benchmarks\4 Validatie opdrijfberekeningen\05 Situatie met grondlagen boven en onder het freatisch vlak (1D)\Databronbestand.damx";
-            List<CsvExportData> allCalculationResults = ComputeStabilityInsideProjectUsingClassic(cFolderName, MStabModelType.Bishop, 1);
+            List<CsvExportData> allCalculationResults = ComputeStabilityInsideProject(cFolderName, MStabModelType.Bishop, 1);
 
             Assert.IsFalse(allCalculationResults[0].IsUplift.Value);
             Assert.AreEqual(1.512062521, allCalculationResults[0].Pl3MinUplift.Value, cTolerance);
@@ -192,7 +192,7 @@
         {
             string cFolderName =
              @"..\..\..\data\Dam\Benchmarks\4 Validatie opdrijfberekeningen\06 Situatie met verschillende opdrijflocaties (1D)\Databronbestand.damx";
-            List<CsvExportData> allCalculationResults = ComputeStabilityInsideProjectUsingClassic(cFolderName, MStabModelType.Bishop, 1);
+            List<CsvExportData> allCalculationResults = ComputeStabilityInsideProject(cFolderName, MStabModelType.Bishop, 1);
 
             Assert.IsTrue(allCalculationResults[0].IsUplift.Value);
             // Values at bottom ditch dikeside
@@ -209,7 +209,7 @@
         public void Dijkring13NormalStabilityCalculation()
         {
             const string cDikeFolder = @"..\..\..\data\Dam\Benchmarks\4 Validatie opdrijfberekeningen\Dijkring13-Sec1\Databronbestand.damx";
-            List<CsvExportData> allCalculationResults = ComputeStabilityInsideProjectUsingClassic(cDikeFolder, MStabModelType.Bishop, 1);
+            List<CsvExportData> allCalculationResults = ComputeStabilityInsideProject(cDikeFolder, MStabModelType.Bishop, 1);
 
             // Following values are just taken from the Geo Stability calculation and not manually calculated
             Assert.AreEqual(0.822, allCalculationResults[0].StabilitySafetyFactor.Value, cTolerance);
@@ -226,7 +226,7 @@
         {
             string cFolderName =
                 @"..\..\..\data\Dam\\Benchmarks\Validatie UpliftVan\StabilityInwards-NoAdaptation\Databronbestand.damx";
-            List<CsvExportData> allCalculationResults = ComputeStabilityInsideProjectUsingClassic(cFolderName, MStabModelType.UpliftVan, 1);
+            List<CsvExportData> allCalculationResults = ComputeStabilityInsideProject(cFolderName, MStabModelType.UpliftVan, 1);
 
             Assert.IsTrue(allCalculationResults[0].IsUplift.Value);
             Assert.AreEqual(0.902, allCalculationResults[0].StabilitySafetyFactor.Value, cTolerance);