Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/LoadCompatiblityTest.cs =================================================================== diff -u -r4070 -r4236 --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/LoadCompatiblityTest.cs (.../LoadCompatiblityTest.cs) (revision 4070) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/LoadCompatiblityTest.cs (.../LoadCompatiblityTest.cs) (revision 4236) @@ -48,27 +48,29 @@ [SetUp] public void Initialize() { - compare = new CompareLogic(); - compare.Config.MaxDifferences = 100; - compare.Config.CompareChildren = false; - compare.Config.DoublePrecision = 0.000001; - compare.Config.MembersToIgnore = new List + compare = new CompareLogic { - "SurfaceLineId", - "LevelReductionInside", // Never used - "LevelReductionOutside", // Never used - "SheetPilePoint", - "SheetPilePointX", - "SheetPilePointY", - "SheetPilePointZ", - "LocalXZSheetPilePoint", - "SoilbaseDB", - "SurfaceLine", - "LocalXZSurfaceLine", - "SoilLayer1D", - "SoildatabaseName", - "SoilList", - "MapForSoilGeometries2D" + Config = + { + MaxDifferences = 100, + CompareChildren = false, + DoublePrecision = 0.000001, + MembersToIgnore = new List + { + "SurfaceLineId", + "SheetPilePoint", + "SheetPilePointX", + "SheetPilePointY", + "SheetPilePointZ", + "LocalXZSheetPilePoint", + "SurfaceLine", + "LocalXZSurfaceLine", + "SoilLayer1D", + "SoildatabaseName", + "SoilList", + "MapForSoilGeometries2D" + } + } }; } Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamProject.cs =================================================================== diff -u -r4216 -r4236 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamProject.cs (.../DamProject.cs) (revision 4216) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamProject.cs (.../DamProject.cs) (revision 4236) @@ -340,7 +340,6 @@ // Project still needs a reference to soilmaterials database; to be resolved later. // This will become obsolete as soon as Delphi DGeoStability version is no longer used. ResolveBackwardCompatibility(); - UpdateSoilDatabaseReferences(damProjectFolder); }); // Add stability as standard mechanism when not yet available. @@ -585,31 +584,6 @@ } /// - /// Update soil database references: - /// Soildatabase should always be in the project path - /// Make sure the file reference is adjusted to this - /// - /// - private void UpdateSoilDatabaseReferences(string damProjectFolder) - { - if (!string.IsNullOrWhiteSpace(damProjectFolder)) - { - foreach (Dike dike in damProjectData.WaterBoard.Dikes) - { - if (!string.IsNullOrWhiteSpace(dike.SoilDatabaseName)) - { - dike.SoilDatabaseName = Path.Combine(damProjectFolder, Path.GetFileName(dike.SoilDatabaseName)); - } - - foreach (Location location in dike.Locations) - { - location.SoildatabaseName = dike.SoilDatabaseName; - } - } - } - } - - /// /// Updates the MStab parameters slip circle definition. /// For older projects, when slip circle definition was not yet defined we have to provide the default values /// Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.TestHelper/ProjectLoader.cs =================================================================== diff -u -r4206 -r4236 --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.TestHelper/ProjectLoader.cs (.../ProjectLoader.cs) (revision 4206) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.TestHelper/ProjectLoader.cs (.../ProjectLoader.cs) (revision 4236) @@ -45,7 +45,7 @@ } public static DamFailureMechanismeCalculationSpecification CreateDefaultFailureMechanismeCalculationSpecification( - DamProjectData damProjectData, string soilDatabaseName) + DamProjectData damProjectData) { MStabParameters mstabParameters = FactoryForStabilityTests.CreateMStabParameters(); mstabParameters.GridPosition = MStabGridPosition.Left; @@ -89,14 +89,12 @@ return damProject.DamProjectData; } - private static DamProjectData LoadProjectData(string projectDataFolder, Func failureMechanismCalculationSpecificationFactoryMethod) + private static DamProjectData LoadProjectData(string projectDataFolder, Func failureMechanismCalculationSpecificationFactoryMethod) { DamProjectData damProjectData = LoadDike(projectDataFolder); - Dike dike = damProjectData.WaterBoard.Dikes.First(); - string soilDatabaseName = dike.SoilDatabaseName; // Specify calculation - DamFailureMechanismeCalculationSpecification damCalculationSpecification = failureMechanismCalculationSpecificationFactoryMethod(damProjectData, soilDatabaseName); + DamFailureMechanismeCalculationSpecification damCalculationSpecification = failureMechanismCalculationSpecificationFactoryMethod(damProjectData); damProjectData.DamProjectCalculationSpecification.DamCalculationSpecifications.Add(damCalculationSpecification); return damProjectData; Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DamEngineIo/FillDamUiFromXmlOutputTests.cs =================================================================== diff -u -r4235 -r4236 --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DamEngineIo/FillDamUiFromXmlOutputTests.cs (.../FillDamUiFromXmlOutputTests.cs) (revision 4235) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DamEngineIo/FillDamUiFromXmlOutputTests.cs (.../FillDamUiFromXmlOutputTests.cs) (revision 4236) @@ -569,7 +569,6 @@ "SurfaceLine", "LocalXZSurfaceLine", "SoilLayer1D", - "SoildatabaseName", "MapForSoilGeometries2D" }; ComparisonResult result = compare.Compare(expected, actual); Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DamEngineIo/FillXmlInputFromDamUiTests.cs =================================================================== diff -u -r4235 -r4236 --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DamEngineIo/FillXmlInputFromDamUiTests.cs (.../FillXmlInputFromDamUiTests.cs) (revision 4235) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DamEngineIo/FillXmlInputFromDamUiTests.cs (.../FillXmlInputFromDamUiTests.cs) (revision 4236) @@ -717,7 +717,6 @@ "SheetPilePointY", "SheetPilePointZ", "LocalXZSheetPilePoint", - "SoildatabaseName", "WaterBoardJob", "LocationJobs", "SelectedLocationJobs", Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Dike.cs =================================================================== diff -u -r4235 -r4236 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Dike.cs (.../Dike.cs) (revision 4235) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Dike.cs (.../Dike.cs) (revision 4236) @@ -86,8 +86,6 @@ public virtual string Name { get; set; } - public virtual string SoilDatabaseName { get; set; } = ""; - /// /// Gets the locations. ///