Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/WaterBoardImporterTests.cs =================================================================== diff -u -r4749 -r4750 --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/WaterBoardImporterTests.cs (.../WaterBoardImporterTests.cs) (revision 4749) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/WaterBoardImporterTests.cs (.../WaterBoardImporterTests.cs) (revision 4750) @@ -119,7 +119,6 @@ } [Test] - [Category("Slow")] public void ImportWaterBoardOnlyCsvFiles1D() { const double cTolerance = 0.0001; @@ -150,7 +149,7 @@ Assert.That(dike.SoilList.Soils.Count, Is.EqualTo(51)); Soil soil = dike.SoilList.Soils[dike.SoilList.GetSoilIndexByName("kade")]; Assert.That(soil.AbovePhreaticLevel, Is.EqualTo(17.0).Within(cTolerance)); - //Check Soil with sigma-tau table + //Check Soil of shear strength model SigmaTauTable with sigma-tau table soil = dike.SoilList.Soils[dike.SoilList.GetSoilIndexByName("CCC")]; Assert.That(soil.ShearStrengthModel, Is.EqualTo(ShearStrengthModel.StressTable)); Assert.That(soil.StressTable.Name, Is.EqualTo("CurveKlei")); @@ -159,6 +158,15 @@ Assert.That(soil.StressTable.SigmaTaus[0].Tau, Is.EqualTo(2.05).Within(cTolerance)); Assert.That(soil.StressTable.SigmaTaus[4].Sigma, Is.EqualTo(110.5).Within(cTolerance)); Assert.That(soil.StressTable.SigmaTaus[4].Tau, Is.EqualTo(44.6).Within(cTolerance)); + //Check Soil of shear strength model MohrCoulomb with sigma-tau table + soil = dike.SoilList.Soils[dike.SoilList.GetSoilIndexByName("BSS")]; + Assert.That(soil.ShearStrengthModel, Is.EqualTo(ShearStrengthModel.CPhi)); + Assert.That(soil.StressTable.Name, Is.EqualTo("CurveZand")); + Assert.That(soil.StressTable.SigmaTaus.Count, Is.EqualTo(2)); + Assert.That(soil.StressTable.SigmaTaus[0].Sigma, Is.EqualTo(0.0).Within(cTolerance)); + Assert.That(soil.StressTable.SigmaTaus[0].Tau, Is.EqualTo(0.0).Within(cTolerance)); + Assert.That(soil.StressTable.SigmaTaus[1].Sigma, Is.EqualTo(200.0).Within(cTolerance)); + Assert.That(soil.StressTable.SigmaTaus[1].Tau, Is.EqualTo(129.88).Within(cTolerance)); // Check Segments Assert.That(waterBoard.Segments.Count, Is.EqualTo(2)); Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/TestData/CSVData/Full1DProject/csvfiles/soils.csv =================================================================== diff -u -r4649 -r4750 --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/TestData/CSVData/Full1DProject/csvfiles/soils.csv (.../soils.csv) (revision 4649) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/TestData/CSVData/Full1DProject/csvfiles/soils.csv (.../soils.csv) (revision 4750) @@ -1,7 +1,7 @@ soil_name;soil_color;soil_type;saturated_unit_weight;unsaturated_unit_weight;cohesion;friction_angle;diameter_d70;permeability_x;shear_strength_model;pop;sigma_tau_curve_name BAS;#FFFFFF;Clay;20.00;20.00;20.00;25.00;0.01;1e-05;MohrCoulomb;0.00; BFG;#FFFFFF;Clay;19.00;19.00;5.00;22.00;0.01;1e-05;SigmaTauTable;0.00;Missing -BSS;#FFFFFF;Sand;20.00;20.00;0.00;30.00;170.00;0.17;MohrCoulomb;0.00; +BSS;#FFFFFF;Sand;20.00;20.00;0.00;30.00;170.00;0.17;MohrCoulomb;0.00;CurveZand CCC;#FFFFFF;Clay;17.00;17.00;5.00;22.00;0.01;1e-05;SigmaTauTable;0.00;CurveKlei EFG;#FFFFFF;Sand;21.00;21.00;0.00;35.00;400.00;0.4;MohrCoulomb;0.00; ETL;#FFFFFF;Clay;21.00;21.00;15.00;22.00;0.01;1e-05;MohrCoulomb;0.00;