Index: src/Deltares.DSoilModel.Data.Tests/Deltares.DSoilModel.Data.Tests.csproj =================================================================== diff -u -r462 -r474 --- src/Deltares.DSoilModel.Data.Tests/Deltares.DSoilModel.Data.Tests.csproj (.../Deltares.DSoilModel.Data.Tests.csproj) (revision 462) +++ src/Deltares.DSoilModel.Data.Tests/Deltares.DSoilModel.Data.Tests.csproj (.../Deltares.DSoilModel.Data.Tests.csproj) (revision 474) @@ -178,6 +178,7 @@ Always + Index: src/Deltares.DSoilModel.Data.Tests/DSoilModelIOTest.cs =================================================================== diff -u -r451 -r474 --- src/Deltares.DSoilModel.Data.Tests/DSoilModelIOTest.cs (.../DSoilModelIOTest.cs) (revision 451) +++ src/Deltares.DSoilModel.Data.Tests/DSoilModelIOTest.cs (.../DSoilModelIOTest.cs) (revision 474) @@ -227,15 +227,15 @@ Assert.AreEqual(1, project.Soils.AquiferDictionary.Count(item => item.Value == true)); } - [Test] + // 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, "", 23, 24, true, 25, 26, 0.27, 222, 22, DistributionType.Normal, 22, 2, DistributionType.Deterministic)] - [TestCase(3, "3 Pseudo values", SoilType.Loam, 31, 32, "", 33, 34, true, 35, 36, 0.37, 333, 33, DistributionType.LogNormal, 33, 3, DistributionType.Normal)] - [TestCase(4, "4 Su measured", SoilType.Clay, 41, 42, "", 43, 44, true, 45, 46, 0.47, 444, 44, DistributionType.LogNormal, 44, 4, DistributionType.Normal)] + [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, "", 63, 64, true, 65, 66, 0.67, 666, 66, DistributionType.Deterministic, 66, 6, DistributionType.LogNormal)] - [TestCase(7, "7 No type", SoilType.Sand, 71, 72, "", 73, 74, true, 75, 76, 0.77, 777, 77, DistributionType.Normal, 77, 7, DistributionType.Deterministic)] - [Category(Categories.WorkInProgress)] // TODO solve issue DSB-573 + [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)] 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) { @@ -259,7 +259,7 @@ Assert.AreEqual(phi, project.Soils.Soils[nb - 1].FrictionAngleStochast.Mean); Assert.AreEqual(usePop, project.Soils.Soils[nb - 1].UsePop); Assert.AreEqual(pop, project.Soils.Soils[nb - 1].POP); - Assert.AreEqual(pop, project.Soils.Soils[nb - 1].POPStochast); + Assert.AreEqual(pop, project.Soils.Soils[nb - 1].POPStochast.Mean); Assert.AreEqual(ratioS, project.Soils.Soils[nb - 1].RatioCuPc); Assert.AreEqual(ratioS, project.Soils.Soils[nb - 1].RatioCuPcStochast.Mean); Assert.AreEqual(expM, project.Soils.Soils[nb - 1].StrengthIncreaseExponent);