Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/StiImporter/SoilProfile2DImporter.cs =================================================================== diff -u -r4070 -r4201 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/StiImporter/SoilProfile2DImporter.cs (.../SoilProfile2DImporter.cs) (revision 4070) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/StiImporter/SoilProfile2DImporter.cs (.../SoilProfile2DImporter.cs) (revision 4201) @@ -78,7 +78,7 @@ throw new SoilProfileImporterException(string.Format(messageFormat, profileName)); } - TransferSoilLayerProperties(availableSoils, readSoilProfile.Surfaces); + TransferSoilLayerProperties(readSoilProfile.Surfaces); importedSoilProfiles.Add(readSoilProfile); } @@ -122,12 +122,10 @@ return profile.Surfaces.All(soilLayer => soilNames.Contains(soilLayer.Name)); } - private static void TransferSoilLayerProperties(SoilList availableSoils, IEnumerable soilLayers) + private static void TransferSoilLayerProperties(IEnumerable soilLayers) { foreach (SoilLayer2D layer in soilLayers) { - Soil soil = availableSoils.Soils.Single(s => string.Equals(s.Name, layer.Name)); - layer.IsAquifer = availableSoils.AquiferDictionary[soil]; layer.WaterpressureInterpolationModel = WaterpressureInterpolationModel.Hydrostatic; } } Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DamEngineIo/FillXmlInputFromDamUiTests.cs =================================================================== diff -u -r4070 -r4201 --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DamEngineIo/FillXmlInputFromDamUiTests.cs (.../FillXmlInputFromDamUiTests.cs) (revision 4070) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DamEngineIo/FillXmlInputFromDamUiTests.cs (.../FillXmlInputFromDamUiTests.cs) (revision 4201) @@ -810,7 +810,6 @@ Dike dike = damProjectData.WaterBoard.Dikes[0]; List surfaceLines = CreateSurfaceLines(); FillSoils(dike); - FillAquiferSoils(dike.SoilList); FillSoilProfiles1D(dike); FillSegments(damProjectData); AddLocations(dike, surfaceLines, damProjectData.WaterBoard.Segments); @@ -974,23 +973,16 @@ } } - private void FillAquiferSoils(SoilList soilList) - { - for (var i = 0; i < soilList.Soils.Count; i++) - { - // All even indeces are set to true, all odd indices are set to false - soilList.AquiferDictionary.Add(soilList.Soils[i], (i % 2) == 0); - } - } - private static void FillAnalysisSpecification(DamProjectData damProjectData) { damProjectData.DamProjectType = DamProjectType.Design; damProjectData.DamProjectCalculationSpecification = new DamProjectCalculationSpecification(); DamProjectCalculationSpecification.SelectedAnalysisType = ExpectedAnalysisType; - var calculationSpecification = new DamFailureMechanismeCalculationSpecification(); - calculationSpecification.FailureMechanismSystemType = FailureMechanismSystemType.Piping; - calculationSpecification.CalculationModel = PipingModelType.Bligh; + var calculationSpecification = new DamFailureMechanismeCalculationSpecification + { + FailureMechanismSystemType = FailureMechanismSystemType.Piping, + CalculationModel = PipingModelType.Bligh + }; damProjectData.DamProjectCalculationSpecification.DamCalculationSpecifications.Add(calculationSpecification); }