Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Dike.cs =================================================================== diff -u -r4204 -r4205 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Dike.cs (.../Dike.cs) (revision 4204) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Dike.cs (.../Dike.cs) (revision 4205) @@ -60,7 +60,6 @@ private IList pl1Lines; private SoilList soilList; private IList soilProfiles; - private string soilDatabaseName = ""; public Dike() { @@ -88,15 +87,7 @@ public virtual string Name { get; set; } - public virtual string SoilDatabaseName - { - get => soilDatabaseName; - set - { - soilDatabaseName = value; - UpdateLocationsDatabaseName(); - } - } + public virtual string SoilDatabaseName { get; set; } = ""; [XmlIgnore] public SoilbaseDB SoilBaseDB { get; set; } @@ -169,17 +160,6 @@ } /// - /// Updates the name soil database for all locations. - /// - public void UpdateLocationsDatabaseName() - { - foreach (Location location in Locations) - { - location.SoildatabaseName = SoilDatabaseName; - } - } - - /// /// Sorts the locations. /// public void SortLocations() @@ -310,7 +290,6 @@ public void UpdateLocation(Location location) { - location.SoildatabaseName = SoilDatabaseName; location.SoilList = SoilList; location.MapForSoilGeometries2D = MapForSoilGeometries2D; Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillXmlInputFromDamUi.cs =================================================================== diff -u -r4070 -r4205 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillXmlInputFromDamUi.cs (.../FillXmlInputFromDamUi.cs) (revision 4070) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillXmlInputFromDamUi.cs (.../FillXmlInputFromDamUi.cs) (revision 4205) @@ -97,7 +97,6 @@ // Process soils input.Soils = new DamEngine.Io.XmlInput.Soil[dike.SoilList.Soils.Count]; TransferSoils(dike.SoilList.Soils, input.Soils); - TransferAquiferSoils(dike.SoilList.AquiferDictionary, input); // Process soilprofiles IList localSegments = EnsureInputLocationsSegmentsAreInSegments(damProjectData.WaterBoard.Segments, filteredLocations); @@ -279,31 +278,6 @@ } } - private static void TransferAquiferSoils(Dictionary aquiferDictionary, Input input) - { - InputAquiferSoil[] aquiferSoils; - if (aquiferDictionary != null && aquiferDictionary.Count > 0) - { - aquiferSoils = new InputAquiferSoil[aquiferDictionary.Count]; - var soilIndex = 0; - foreach (KeyValuePair keyValuePair in aquiferDictionary) - { - aquiferSoils[soilIndex] = new InputAquiferSoil - { - Soilname = keyValuePair.Key.Name, - IsAquifer = keyValuePair.Value - }; - soilIndex++; - } - } - else - { - aquiferSoils = null; - } - - input.AquiferSoils = aquiferSoils; - } - private static void TransferAnalysisSpecification(DamProjectData damProjectData, Input input) { input.DamProjectType = ConversionHelper.ConvertToInputDamProjectType(damProjectData.DamProjectType); Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.TestHelper/ProjectLoader.cs =================================================================== diff -u -r4070 -r4205 --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.TestHelper/ProjectLoader.cs (.../ProjectLoader.cs) (revision 4070) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.TestHelper/ProjectLoader.cs (.../ProjectLoader.cs) (revision 4205) @@ -50,7 +50,6 @@ MStabParameters mstabParameters = FactoryForStabilityTests.CreateMStabParameters(); mstabParameters.GridPosition = MStabGridPosition.Left; mstabParameters.SearchMethod = MStabSearchMethod.Grid; - mstabParameters.SoilDatabaseName = soilDatabaseName; var damCalculationSpecification = new DamFailureMechanismeCalculationSpecification {