Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamProject.cs
===================================================================
diff -u -r4198 -r4212
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamProject.cs	(.../DamProject.cs)	(revision 4198)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamProject.cs	(.../DamProject.cs)	(revision 4212)
@@ -394,18 +394,6 @@
     }
 
     /// <summary>
-    /// Create a destination filename for new location of soilmaterials database
-    /// </summary>
-    /// <param name="projectFilename"></param>
-    /// <param name="soilmaterialsFilename"></param>
-    /// <returns></returns>
-    public static string CreateNewSoilMaterialsFilename(string projectFilename, string soilmaterialsFilename, int dikeIndex)
-    {
-        string destsoilmaterialsFilename = Path.GetFileNameWithoutExtension(projectFilename) + dikeIndex.ToString(CultureInfo.InvariantCulture) + ".soilmaterials.mdb";
-        return destsoilmaterialsFilename;
-    }
-
-    /// <summary>
     /// Save the project in XML format
     /// </summary>
     /// <param name="fileName"></param>
Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DamProjectTest.cs
===================================================================
diff -u -r4070 -r4212
--- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DamProjectTest.cs	(.../DamProjectTest.cs)	(revision 4070)
+++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DamProjectTest.cs	(.../DamProjectTest.cs)	(revision 4212)
@@ -21,127 +21,76 @@
 
 using System.IO;
 using Deltares.Dam.Data;
-using Deltares.Geotechnics.Soils;
-using Deltares.Soilbase;
 using NUnit.Framework;
 
-namespace Deltares.Dam.Tests
+namespace Deltares.Dam.Tests;
+
+[TestFixture]
+public class DamProjectTest
 {
-    [TestFixture]
-    public class DamProjectTest
+    [Test]
+    public void CanDetermineProjectWorkingPathApplication()
     {
-        [Test]
-        public void CanDetermineProjectWorkingPathApplication()
-        {
-            DamProject.ProjectWorkingPathLocation = ProjectPathLocation.InApplicationMap;
-            string projectWorkingPath = DamProject.ProjectWorkingPath;
-            Assert.AreEqual(Path.GetDirectoryName(typeof(DamProject).Assembly.Location) + @"\DamCalculation", projectWorkingPath);
-        }
+        DamProject.ProjectWorkingPathLocation = ProjectPathLocation.InApplicationMap;
+        string projectWorkingPath = DamProject.ProjectWorkingPath;
+        Assert.AreEqual(Path.GetDirectoryName(typeof(DamProject).Assembly.Location) + @"\DamCalculation", projectWorkingPath);
+    }
 
-        [Test]
-        public void CanDetermineProjectWorkingPathUserDefined()
-        {
-            const string userProjectPath = "c:\\";
-            DamProject.ProjectWorkingPathLocation = ProjectPathLocation.InUserMap;
-            DamProject.UserWorkingPath = userProjectPath;
-            string projectWorkingPath = DamProject.ProjectWorkingPath;
-            Assert.AreEqual(userProjectPath, projectWorkingPath);
-        }
+    [Test]
+    public void CanDetermineProjectWorkingPathUserDefined()
+    {
+        const string userProjectPath = "c:\\";
+        DamProject.ProjectWorkingPathLocation = ProjectPathLocation.InUserMap;
+        DamProject.UserWorkingPath = userProjectPath;
+        string projectWorkingPath = DamProject.ProjectWorkingPath;
+        Assert.AreEqual(userProjectPath, projectWorkingPath);
+    }
 
-        [Test]
-        public void CanDetermineProjectWorkingPathProjectMap()
-        {
-            const string cProjectFilename = @"d:\Projects\MyProject.damx";
-            const string cProjectWorkingPath = @"d:\Projects\MyProject.Calc";
-            using (var damProject = new DamProject())
-            {
-                damProject.ProjectFileName = cProjectFilename;
-                DamProject.ProjectWorkingPathLocation = ProjectPathLocation.InProjectMap;
-                string projectWorkingPath = DamProject.ProjectWorkingPath;
-                Assert.AreEqual(cProjectWorkingPath, projectWorkingPath);
-            }
-        }
+    [Test]
+    public void CanDetermineProjectWorkingPathProjectMap()
+    {
+        const string cProjectFilename = @"d:\Projects\MyProject.damx";
+        const string cProjectWorkingPath = @"d:\Projects\MyProject.Calc";
+        using var damProject = new DamProject();
+        damProject.ProjectFileName = cProjectFilename;
+        DamProject.ProjectWorkingPathLocation = ProjectPathLocation.InProjectMap;
+        string projectWorkingPath = DamProject.ProjectWorkingPath;
+        Assert.AreEqual(cProjectWorkingPath, projectWorkingPath);
+    }
 
-        [Test]
-        public void NewSoilmaterialsFilenameCorrectIfNewLocation()
-        {
-            var projectFilename = "Delfland.damx";
-            var soilmaterialsFilename = @"..\..\soilmaterials.mdb";
-            string newSoilmaterialsFilename = DamProject.CreateNewSoilMaterialsFilename(projectFilename, soilmaterialsFilename, 2);
-            Assert.AreEqual("Delfland2.soilmaterials.mdb", newSoilmaterialsFilename);
-        }
+    [Test]
+    public void NewGeometry2DMapnameCorrectIfNewLocation()
+    {
+        var projectFilename = "Delfland.damx";
+        var mapName = @"..\..\geometries\";
+        string newMapname = DamProject.CreateNewGeometry2DMapname(projectFilename, mapName, 2);
+        Assert.AreEqual(@"Delfland.geometries2D.2\", newMapname);
+    }
 
-        [Test]
-        public void NewSoilmaterialsFilenameCorrectIfSourceIsTarget()
-        {
-            var projectFilename = "Delfland.damx";
-            var soilmaterialsFilename = @"Delfland.soilmaterials.mdb";
-            string newSoilmaterialsFilename = DamProject.CreateNewSoilMaterialsFilename(projectFilename, soilmaterialsFilename, 10);
-            Assert.AreEqual("Delfland10.soilmaterials.mdb", newSoilmaterialsFilename);
-        }
+    [Test]
+    public void NewGeometry2DMapnameCorrectIfSourceIsTarget()
+    {
+        var projectFilename = "Delfland.damx";
+        var mapName = @"Delfland.geometries2D.10\";
+        string newMapname = DamProject.CreateNewGeometry2DMapname(projectFilename, mapName, 10);
+        Assert.AreEqual(@"Delfland.geometries2D.10\", newMapname);
+    }
 
-        [Test]
-        public void NewGeometry2DMapnameCorrectIfNewLocation()
+    [Test]
+    public void CanAssignGeometry2DMapnameIfNotAssigned()
+    {
+        const string mapName1 = @"Test1\";
+        const string mapName2 = @"Test2\";
+        using var damProject = new DamProject();
+        damProject.DamProjectData.WaterBoard.Dikes.Add(new Dike());
+        damProject.DamProjectData.WaterBoard.Dikes.Add(new Dike
         {
-            var projectFilename = "Delfland.damx";
-            var mapName = @"..\..\geometries\";
-            string newMapname = DamProject.CreateNewGeometry2DMapname(projectFilename, mapName, 2);
-            Assert.AreEqual(@"Delfland.geometries2D.2\", newMapname);
-        }
-
-        [Test]
-        public void NewGeometry2DMapnameCorrectIfSourceIsTarget()
-        {
-            var projectFilename = "Delfland.damx";
-            var mapName = @"Delfland.geometries2D.10\";
-            string newMapname = DamProject.CreateNewGeometry2DMapname(projectFilename, mapName, 10);
-            Assert.AreEqual(@"Delfland.geometries2D.10\", newMapname);
-        }
-
-        [Test]
-        public void CanAssignGeometry2DMapnameIfNotAssigned()
-        {
-            const string mapName1 = @"Test1\";
-            const string mapName2 = @"Test2\";
-            using (var damProject = new DamProject())
-            {
-                damProject.DamProjectData.WaterBoard.Dikes.Add(new Dike());
-                damProject.DamProjectData.WaterBoard.Dikes.Add(new Dike
-                {
-                    MapForSoilGeometries2D = mapName1
-                });
-                damProject.DamProjectData.WaterBoard.Dikes.Add(new Dike());
-                damProject.AssignGeometry2DMapnameIfNotAssigned(mapName2);
-                Assert.AreEqual(mapName2, damProject.DamProjectData.WaterBoard.Dikes[0].MapForSoilGeometries2D);
-                Assert.AreEqual(mapName1, damProject.DamProjectData.WaterBoard.Dikes[1].MapForSoilGeometries2D);
-                Assert.AreEqual(mapName2, damProject.DamProjectData.WaterBoard.Dikes[2].MapForSoilGeometries2D);
-            }
-        }
-
-        [TestCase("Alg-zand (0-30)", 20.0, 22.0, 1.0, 0.7, 0.22)]
-        [TestCase("HW-DUN", 15.8, 16.8, 0.0, 0.8, 0.23)]
-        [TestCase("HW-OBO", 10.0, 12.0, 1.0, 0.9, 0.24)]
-        public void GivenMSoilbaseDatabaseWhenReadingSoilsThenCorrectParametersAreRead(string soilName, double abovePhreaticLevel, double belowPhreaticLevel, double rRatio, double strengthIncreaseExponent, double ratioCuPc)
-        {
-            const double tolerance = 0.005;
-            // Given MSoilbase Database
-            const string databaseFilename = @"TestData\DamProjectTest\DamProjectTestMSoilbaseRead.mdb";
-            using (var geoDatabase = new GeoDatabase(databaseFilename))
-            {
-                // When Reading Soils
-                geoDatabase.ReUseSoils = true;
-                var soilList = new SoilList();
-                soilList = geoDatabase.ReadSoils(soilList.Soils);
-
-                // Then Correct Parameters Are Read
-                Assert.AreEqual(4, soilList.Soils.Count); // 3 real soils and 1 undetermined soil
-                Soil soil = soilList.GetSoilByName(soilName);
-                Assert.AreEqual(abovePhreaticLevel, soil.AbovePhreaticLevel, tolerance);
-                Assert.AreEqual(belowPhreaticLevel, soil.BelowPhreaticLevel, tolerance);
-                Assert.AreEqual(rRatio, soil.RRatio, tolerance);
-                Assert.AreEqual(strengthIncreaseExponent, soil.StrengthIncreaseExponent, tolerance);
-                Assert.AreEqual(ratioCuPc, soil.RatioCuPc, tolerance);
-            }
-        }
+            MapForSoilGeometries2D = mapName1
+        });
+        damProject.DamProjectData.WaterBoard.Dikes.Add(new Dike());
+        damProject.AssignGeometry2DMapnameIfNotAssigned(mapName2);
+        Assert.AreEqual(mapName2, damProject.DamProjectData.WaterBoard.Dikes[0].MapForSoilGeometries2D);
+        Assert.AreEqual(mapName1, damProject.DamProjectData.WaterBoard.Dikes[1].MapForSoilGeometries2D);
+        Assert.AreEqual(mapName2, damProject.DamProjectData.WaterBoard.Dikes[2].MapForSoilGeometries2D);
     }
 }
\ No newline at end of file