Index: src/Deltares.DSoilModel.Data.Tests/DSoilModelProjectTest.cs =================================================================== diff -u -r463 -r483 --- src/Deltares.DSoilModel.Data.Tests/DSoilModelProjectTest.cs (.../DSoilModelProjectTest.cs) (revision 463) +++ src/Deltares.DSoilModel.Data.Tests/DSoilModelProjectTest.cs (.../DSoilModelProjectTest.cs) (revision 483) @@ -43,68 +43,6 @@ } [Test] - public void TestSetSoilDefaults() - { - var project = new DSoilModelProject(); - var soil = new Soil(); - - project.SetSoilDefaults(soil); - - AssertSoilDefaults(soil); - - // set non-default values - soil = new Soil(); - soil.AbovePhreaticLevelStochast.DistributionType = DistributionType.Deterministic; - soil.BelowPhreaticLevelStochast.DistributionType = DistributionType.Deterministic; - soil.DiameterD70Stochast.DistributionType = DistributionType.Deterministic; - soil.PermeabKxStochast.DistributionType = DistributionType.Deterministic; - - project.SetSoilDefaults(soil); - - // nondefault values are NOT overwritten - Assert.AreEqual(DistributionType.Deterministic, soil.AbovePhreaticLevelStochast.DistributionType); - Assert.AreEqual(DistributionType.Deterministic, soil.BelowPhreaticLevelStochast.DistributionType); - Assert.AreEqual(DistributionType.Deterministic, soil.DiameterD70Stochast.DistributionType); - Assert.AreEqual(DistributionType.Deterministic, soil.PermeabKxStochast.DistributionType); - } - - [Test] - public void TestSetSoilDefaultsAfterImporting1DProfiles() - { - var project = new DSoilModelProject(); - project.ReadSoilProfiles1DFromFile(Path.Combine(GetTestFilesPath() ,"Delfland", "soilprofiles.csv")); - Assert.AreEqual(9, project.Soils.Soils.Count); - - foreach (var soil in project.Soils.Soils) - { - AssertSoilDefaults(soil); - } - } - - [Test] - public void TestSetSoilDefaultsAfterImportingMaterialsMdb() - { - var project = new DSoilModelProject(); - project.ReadOldProjectFromDatabase(Path.Combine(GetTestFilesPath(), "DefaultSoils.mdb")); - Assert.AreEqual(51, project.Soils.Soils.Count); - - // check that defaults are set, BelowPhreaticLevelStochast is the only one not the same as DSL defaults for Soil - Assert.AreEqual(51, project.Soils.Soils.Count(s => s.BelowPhreaticLevelStochast.DistributionType == DistributionType.LogNormal && s.BelowPhreaticLevelStochast.Shift == 10.0)); - } - - private static void AssertSoilDefaults(Soil soil) - { - Assert.AreEqual(DistributionType.LogNormal, soil.AbovePhreaticLevelStochast.DistributionType); - Assert.AreEqual(0, soil.AbovePhreaticLevelStochast.Shift); - Assert.AreEqual(DistributionType.LogNormal, soil.BelowPhreaticLevelStochast.DistributionType); - Assert.AreEqual(10.0, soil.BelowPhreaticLevelStochast.Shift); - Assert.AreEqual(DistributionType.LogNormal, soil.DiameterD70Stochast.DistributionType); - Assert.AreEqual(0, soil.DiameterD70Stochast.Shift); - Assert.AreEqual(DistributionType.LogNormal, soil.PermeabKxStochast.DistributionType); - Assert.AreEqual(0, soil.PermeabKxStochast.Shift); - } - - [Test] public void TestCaseSensitivityOfImportedSoilNames() { var project = new DSoilModelProject(); Index: src/Deltares.DSoilModel.Forms/DSoilModelPlugin.cs =================================================================== diff -u -r455 -r483 --- src/Deltares.DSoilModel.Forms/DSoilModelPlugin.cs (.../DSoilModelPlugin.cs) (revision 455) +++ src/Deltares.DSoilModel.Forms/DSoilModelPlugin.cs (.../DSoilModelPlugin.cs) (revision 483) @@ -472,27 +472,6 @@ private void DataEventPublisherOnDataListModified(object sender, PublishEventArgs publishEventArgs) { - - if (sender is List) - { - var args = publishEventArgs as DataListModifiedArgs; - if (args != null && (args.Action == ListModifyAction.Add || args.Action == ListModifyAction.Insert) && publishEventArgs.Objects.Length > 0) - { - // handle the case where a new soil is added to the materials table - foreach (var item in publishEventArgs.Objects) - { - var soil = item as Soil; - if (soil != null) - { - if (soil.GetOrdinaryParameters().Count == 0 && soil.GetStochasticParameters().Count == 0) - { - project.SetSoilDefaults(soil); - } - } - } - } - } - if (sender is List) { mainForm.DynamicTableControl.GetTable(typeof(SurfaceLine2)).Refresh(); Index: src/Deltares.DSoilModel.Data/DSoilModelProject.cs =================================================================== diff -u -r452 -r483 --- src/Deltares.DSoilModel.Data/DSoilModelProject.cs (.../DSoilModelProject.cs) (revision 452) +++ src/Deltares.DSoilModel.Data/DSoilModelProject.cs (.../DSoilModelProject.cs) (revision 483) @@ -415,14 +415,6 @@ } }); } - // missing soils may have been added as new soil() ? - if (Soils.Soils.Count > soilsCount) - { - for (int i = soilsCount; i < Soils.Soils.Count; i++) - { - SetSoilDefaults(Soils.Soils[i]); - } - } } /// @@ -690,7 +682,6 @@ { var isNewSoil = true; - SetSoilDefaults(newSoil); CheckStrengthModelSoil(newSoil); foreach (var soilAlreadyKnown in soils.Soils) @@ -968,38 +959,6 @@ } } - /// - /// Set the soil defaults. - /// See the functional design document for D-SoilModel, some stochasts have a specific distribution type - /// - /// The soil. - public void SetSoilDefaults(Soil soil) - { - // only set the defaults if a stochast has not been defined otherwise - var definedStochasts = soil.GetStochasticParameters(); - - if (!definedStochasts.ContainsValue(soil.AbovePhreaticLevelStochast)) - { - soil.AbovePhreaticLevelStochast.DistributionType = DistributionType.LogNormal; - soil.AbovePhreaticLevelStochast.Shift = 0; - } - if (!definedStochasts.ContainsValue(soil.BelowPhreaticLevelStochast)) - { - soil.BelowPhreaticLevelStochast.DistributionType = DistributionType.LogNormal; - soil.BelowPhreaticLevelStochast.Shift = 10.0; - } - if (!definedStochasts.ContainsValue(soil.DiameterD70Stochast)) - { - soil.DiameterD70Stochast.DistributionType = DistributionType.LogNormal; - soil.DiameterD70Stochast.Shift = 0; - } - if (!definedStochasts.ContainsValue(soil.PermeabKxStochast)) - { - soil.PermeabKxStochast.DistributionType = DistributionType.LogNormal; - soil.PermeabKxStochast.Shift = 0; - } - } - private void FilterSegments() { if (CurrentFailureMechanism != Mechanism.None)