Index: src/Deltares.DSoilModel.Data.Tests/Deltares.DSoilModel.Data.Tests.csproj
===================================================================
diff -u -r378 -r403
--- src/Deltares.DSoilModel.Data.Tests/Deltares.DSoilModel.Data.Tests.csproj (.../Deltares.DSoilModel.Data.Tests.csproj) (revision 378)
+++ src/Deltares.DSoilModel.Data.Tests/Deltares.DSoilModel.Data.Tests.csproj (.../Deltares.DSoilModel.Data.Tests.csproj) (revision 403)
@@ -169,6 +169,7 @@
+
Always
Index: src/Deltares.DSoilModel.Data.Tests/DSoilModelProjectTest.cs
===================================================================
diff -u -r396 -r403
--- src/Deltares.DSoilModel.Data.Tests/DSoilModelProjectTest.cs (.../DSoilModelProjectTest.cs) (revision 396)
+++ src/Deltares.DSoilModel.Data.Tests/DSoilModelProjectTest.cs (.../DSoilModelProjectTest.cs) (revision 403)
@@ -83,11 +83,11 @@
public void TestSetSoilDefaultsAfterImportingMaterialsMdb()
{
var project = new DSoilModelProject();
- project.ReadOldProjectFromDatabase(Path.Combine(GetTestFilesPath(), "groot salland.mdb"));
- Assert.AreEqual(65, project.Soils.Soils.Count);
+ project.ReadOldProjectFromDatabase(Path.Combine(GetTestFilesPath(), "DefaultSoils.mdb"));
+ Assert.AreEqual(51, project.Soils.Soils.Count);
- // some but not all soils in this file have this default set, which did NOT come from the file
- Assert.AreEqual(56, project.Soils.Soils.Count(s => s.DiameterD70Stochast.DistributionType == DistributionType.LogNormal && s.DiameterD70Stochast.Shift == 10.0));
+ // 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)
@@ -97,12 +97,11 @@
Assert.AreEqual(DistributionType.LogNormal, soil.BelowPhreaticLevelStochast.DistributionType);
Assert.AreEqual(10.0, soil.BelowPhreaticLevelStochast.Shift);
Assert.AreEqual(DistributionType.LogNormal, soil.DiameterD70Stochast.DistributionType);
- Assert.AreEqual(10.0, soil.DiameterD70Stochast.Shift);
+ Assert.AreEqual(0, soil.DiameterD70Stochast.Shift);
Assert.AreEqual(DistributionType.LogNormal, soil.PermeabKxStochast.DistributionType);
Assert.AreEqual(0, soil.PermeabKxStochast.Shift);
}
-
[Test]
public void TestCaseSensitivityOfImportedSoilNames()
{
Index: src/Deltares.DSoilModel.Data/DSoilModelProject.cs
===================================================================
diff -u -r391 -r403
--- src/Deltares.DSoilModel.Data/DSoilModelProject.cs (.../DSoilModelProject.cs) (revision 391)
+++ src/Deltares.DSoilModel.Data/DSoilModelProject.cs (.../DSoilModelProject.cs) (revision 403)
@@ -984,7 +984,7 @@
if (!definedStochasts.ContainsValue(soil.DiameterD70Stochast))
{
soil.DiameterD70Stochast.DistributionType = DistributionType.LogNormal;
- soil.DiameterD70Stochast.Shift = 10;
+ soil.DiameterD70Stochast.Shift = 0;
}
if (!definedStochasts.ContainsValue(soil.PermeabKxStochast))
{
Index: src/Deltares.DSoilModel.Data.Tests/TestFiles/DefaultSoils.mdb
===================================================================
diff -u
Binary files differ