Index: src/Deltares.DSoilModel.Data.Tests/DSoilModelIOTest.cs =================================================================== diff -u -r849 -r850 --- src/Deltares.DSoilModel.Data.Tests/DSoilModelIOTest.cs (.../DSoilModelIOTest.cs) (revision 849) +++ src/Deltares.DSoilModel.Data.Tests/DSoilModelIOTest.cs (.../DSoilModelIOTest.cs) (revision 850) @@ -251,15 +251,17 @@ // please note that not all ShearstrengthModel options are supported by DSoilModel, so most values in the file are converted to ShearStrengthModel.None here // the same testfile and cases are tested in Deltares.SoilBase.Test (DslGeoIo) and there the result is a bit different - [TestCase(1, "1 C-Phi", SoilType.Gravel, 11, 12, ShearStrengthModel.CPhi, 13, 14, true, 15, 16, 0.17, 111, 11, DistributionType.Normal, 11, 1, DistributionType.Deterministic)] - [TestCase(2, "2 Stress table", SoilType.Sand, 21, 22, ShearStrengthModel.None, 23, 24, true, 25, 26, 0.27, 222, 22, DistributionType.Normal, 22, 2, DistributionType.Deterministic)] - [TestCase(3, "3 Pseudo values", SoilType.Loam, 31, 32, ShearStrengthModel.None, 33, 34, true, 35, 36, 0.37, 333, 33, DistributionType.LogNormal, 33, 3, DistributionType.Normal)] - [TestCase(4, "4 Su measured", SoilType.Clay, 41, 42, ShearStrengthModel.None, 43, 44, true, 45, 46, 0.47, 444, 44, DistributionType.LogNormal, 44, 4, DistributionType.Normal)] - [TestCase(5, "5 Su calculated", SoilType.Peat, 51, 52, ShearStrengthModel.CuCalculated, 53, 54, true, 55, 56, 0.57, 555, 55, DistributionType.Deterministic, 55, 5, DistributionType.LogNormal)] - [TestCase(6, "6 Su gradient", SoilType.Gravel, 61, 62, ShearStrengthModel.None, 63, 64, true, 65, 66, 0.67, 666, 66, DistributionType.Deterministic, 66, 6, DistributionType.LogNormal)] - [TestCase(7, "7 No type", SoilType.Sand, 71, 72, ShearStrengthModel.CPhi, 73, 74, true, 75, 76, 0.77, 777, 77, DistributionType.Normal, 77, 7, DistributionType.Deterministic)] + [TestCase(1, "1 C-Phi", SoilType.Gravel, 11, 12, ShearStrengthModel.CPhi, 13, 14, false, 15, 16, 0.17, 111, 11, DistributionType.Normal, 11, 1, DistributionType.Deterministic, 0.30, 0.00050, 0.0065, DistributionType.Deterministic, 1.0, DistributionType.Normal, 1.11)] + [TestCase(2, "2 Stress table", SoilType.Sand, 21, 22, ShearStrengthModel.None, 23, 24, false, 25, 26, 0.27, 222, 22, DistributionType.Normal, 22, 2, DistributionType.Deterministic, 0.31, 0.00060, 0.0070, DistributionType.Normal, 2.0, DistributionType.LogNormal, 2.22)] + [TestCase(3, "3 Pseudo values", SoilType.Loam, 31, 32, ShearStrengthModel.None, 33, 34, true, 35, 36, 0.37, 333, 33, DistributionType.LogNormal, 33, 3, DistributionType.Normal, 0.32, 0.00070, 0.0075, DistributionType.LogNormal, 3.0, DistributionType.Deterministic, 3.33)] + [TestCase(4, "4 Su measured", SoilType.Clay, 41, 42, ShearStrengthModel.None, 43, 44, true, 45, 46, 0.47, 444, 44, DistributionType.LogNormal, 44, 4, DistributionType.Normal, 0.33, 0.00080, 0.0080, DistributionType.Deterministic, 4.0, DistributionType.Normal, 4.44)] + [TestCase(5, "5 Su calculated", SoilType.Peat, 51, 52, ShearStrengthModel.CuCalculated, 53, 54, false, 55, 56, 0.57, 555, 55, DistributionType.Deterministic, 55, 5, DistributionType.LogNormal, 0.34, 0.00090, 0.0085, DistributionType.Normal, 5.0, DistributionType.LogNormal, 5.55)] + [TestCase(6, "6 Su gradient", SoilType.Gravel, 61, 62, ShearStrengthModel.None, 63, 64, false, 65, 66, 0.67, 666, 66, DistributionType.Deterministic, 66, 6, DistributionType.LogNormal, 0.35, 0.00010, 0.0090, DistributionType.LogNormal, 6.0, DistributionType.Deterministic, 6.66)] + [TestCase(7, "7 No type", SoilType.Sand, 71, 72, ShearStrengthModel.CPhi, 73, 74, true, 75, 76, 0.77, 777, 77, DistributionType.Normal, 77, 7, DistributionType.Deterministic, 0.36, 0.00110, 0.0095, DistributionType.Deterministic, 7.0, DistributionType.Normal, 7.77)] public void ImportMaterialsFromMdbFileMadeWithMSoilBase(int nb, string name, SoilType type, double gammaUnsat, double gammaSat, ShearStrengthModel model, double coh, double phi, - bool usePop, double pop, double ratioS, double expM, double d70MeanInMicroMeter, double d70StdDevInMicroMeter, DistributionType d70Dist, double permMean, double permStdDev, DistributionType permDist) + bool usePop, double pop, double ratioS, double expM, double d70MeanInMicroMeter, double d70StdDevInMicroMeter, DistributionType d70Dist, + double permMean, double permStdDev, DistributionType permDist, double porosity, double d15, double d50, DistributionType abovePhreaticLevelDistributionType, + double abovePhreaticLevelDeviation, DistributionType belowPhreaticLevelDistributionType, double belowPhreaticLevelDeviation) { var project = new DSoilModelProject(); project.ReadSoilsFromDatabase(Path.Combine(GetTestFilesPath(), "MSoilBase.mdb")); @@ -291,11 +293,11 @@ // Filter Piping - Ringtoets Assert.AreEqual(gammaUnsat, project.Soils.Soils[nb - 1].AbovePhreaticLevelStochast.Mean); - Assert.AreEqual(double.NaN, project.Soils.Soils[nb - 1].AbovePhreaticLevelStochast.Deviation); - Assert.AreEqual(DistributionType.LogNormal, project.Soils.Soils[nb - 1].AbovePhreaticLevelStochast.DistributionType); + Assert.AreEqual(abovePhreaticLevelDeviation, project.Soils.Soils[nb - 1].AbovePhreaticLevelStochast.Deviation); + Assert.AreEqual(abovePhreaticLevelDistributionType, project.Soils.Soils[nb - 1].AbovePhreaticLevelStochast.DistributionType); Assert.AreEqual(gammaSat, project.Soils.Soils[nb - 1].BelowPhreaticLevelStochast.Mean); - Assert.AreEqual(double.NaN, project.Soils.Soils[nb - 1].BelowPhreaticLevelStochast.Deviation); - Assert.AreEqual(DistributionType.LogNormal, project.Soils.Soils[nb - 1].BelowPhreaticLevelStochast.DistributionType); + Assert.AreEqual(belowPhreaticLevelDeviation, project.Soils.Soils[nb - 1].BelowPhreaticLevelStochast.Deviation); + Assert.AreEqual(belowPhreaticLevelDistributionType, project.Soils.Soils[nb - 1].BelowPhreaticLevelStochast.DistributionType); Assert.AreEqual(d70MeanInMicroMeter * 1e-6, project.Soils.Soils[nb - 1].DiameterD70); Assert.AreEqual(d70MeanInMicroMeter * 1e-6, project.Soils.Soils[nb - 1].DiameterD70Stochast.Mean); Assert.AreEqual(d70StdDevInMicroMeter * 1e-6, project.Soils.Soils[nb - 1].DiameterD70Stochast.Deviation); @@ -304,6 +306,9 @@ Assert.AreEqual(permMean, project.Soils.Soils[nb - 1].PermeabKxStochast.Mean); Assert.AreEqual(permStdDev, project.Soils.Soils[nb - 1].PermeabKxStochast.Deviation); Assert.AreEqual(permDist, project.Soils.Soils[nb - 1].PermeabKxStochast.DistributionType); + Assert.AreEqual(porosity, project.Soils.Soils[nb - 1].Porosity); + Assert.AreEqual(d15 * 1e-3, project.Soils.Soils[nb - 1].DiameterD15, 1e-8); + Assert.AreEqual(d50 * 1e-3, project.Soils.Soils[nb - 1].DiameterD50, 1e-8); } /// Index: src/Deltares.DSoilModel.Data.Tests/TestFiles/MSoilBase.mdb =================================================================== diff -u -r451 -r850 Binary files differ