Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/CsvImporterTest.cs =================================================================== diff -u -r4638 -r4653 --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/CsvImporterTest.cs (.../CsvImporterTest.cs) (revision 4638) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/CsvImporterTest.cs (.../CsvImporterTest.cs) (revision 4653) @@ -308,12 +308,12 @@ { using StreamWriter writer = File.CreateText(importFolder + "\\soils.csv"); writer.WriteLine("soil_name;soil_color;soil_type;saturated_unit_weight;unsaturated_unit_weight;cohesion;friction_angle;diameter_d70;permeability_x;shear_strength_model;use_pop;pop"); - writer.WriteLine("Alg-zand (0-30);#FFFFFF;Sand;18.00;18.00;4.60;21.90;200.00;0.2;CPhi;True;10.00"); - writer.WriteLine("HW-CAO;#FFFFFF;Clay;17.00;17.00;3.50;16.50;200.00;0.2;CPhi;True;10.00"); - writer.WriteLine("HW-DUN;#FFFFFF;Clay;15.80;15.80;1.60;21.30;200.00;0.2;CPhi;True;10.00"); - writer.WriteLine("HW-DUOklei;#FFFFFF;Clay;20.00;17.00;0.00;30.00;200.00;0.2;CPhi;True;10.00"); - writer.WriteLine("HW-DUOzand;#FFFFFF;Sand;17.70;17.70;4.00;17.60;200.00;0.2;CPhi;True;10.00"); - writer.WriteLine("HW-HVN;#FFFFFF;Peat;10.40;10.40;4.50;17.50;200.00;0.2;CPhi;True;10.00"); - writer.WriteLine("HW-OBO;#FFFFFF;Clay;15.80;15.80;3.00;21.20;200.00;0.2;CPhi;True;10.00"); + writer.WriteLine("Alg-zand (0-30);#FFFFFF;Sand;18.00;18.00;4.60;21.90;200.00;0.2;MohrCoulomb;True;10.00"); + writer.WriteLine("HW-CAO;#FFFFFF;Clay;17.00;17.00;3.50;16.50;200.00;0.2;MohrCoulomb;True;10.00"); + writer.WriteLine("HW-DUN;#FFFFFF;Clay;15.80;15.80;1.60;21.30;200.00;0.2;MohrCoulomb;True;10.00"); + writer.WriteLine("HW-DUOklei;#FFFFFF;Clay;20.00;17.00;0.00;30.00;200.00;0.2;MohrCoulomb;True;10.00"); + writer.WriteLine("HW-DUOzand;#FFFFFF;Sand;17.70;17.70;4.00;17.60;200.00;0.2;MohrCoulomb;True;10.00"); + writer.WriteLine("HW-HVN;#FFFFFF;Peat;10.40;10.40;4.50;17.50;200.00;0.2;MohrCoulomb;True;10.00"); + writer.WriteLine("HW-OBO;#FFFFFF;Clay;15.80;15.80;3.00;21.20;200.00;0.2;MohrCoulomb;True;10.00"); } } \ No newline at end of file Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DamEngineIo/ConversionHelperTests.cs =================================================================== diff -u -r4644 -r4653 --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DamEngineIo/ConversionHelperTests.cs (.../ConversionHelperTests.cs) (revision 4644) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DamEngineIo/ConversionHelperTests.cs (.../ConversionHelperTests.cs) (revision 4653) @@ -561,8 +561,9 @@ Assert.That(ConversionHelper.ConvertToSoilType(inputSoilType), Is.EqualTo(expectedSoilType)); } - [TestCase("CPhi", ShearStrengthModel.CPhi)] - [TestCase("CuCalculated", ShearStrengthModel.CuCalculated)] + [TestCase("MohrCoulomb", ShearStrengthModel.CPhi)] + [TestCase("SHANSEP", ShearStrengthModel.CuCalculated)] + [TestCase("SigmaTauTable", ShearStrengthModel.StressTable)] public void CanConvertToShearStrengthModel(string inputSoilType, ShearStrengthModel expectedSoilType) { Assert.That(ConversionHelper.ConvertToShearStrengthModel(inputSoilType), Is.EqualTo(expectedSoilType)); Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/CsvImporterTestsNew.cs =================================================================== diff -u -r4638 -r4653 --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/CsvImporterTestsNew.cs (.../CsvImporterTestsNew.cs) (revision 4638) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/CsvImporterTestsNew.cs (.../CsvImporterTestsNew.cs) (revision 4653) @@ -964,9 +964,9 @@ { using StreamWriter writer = File.CreateText(filePath); writer.WriteLine("soil_name;soil_color;soil_type;saturated_unit_weight;unsaturated_unit_weight;cohesion;friction_angle;diameter_d70;permeability_x;shear_strength_model;strength_increase_exponent;ratio_su_pc;use_pop;pop;sigma_tau_curve_name"); - writer.WriteLine("Zand;#A6EBFC;Sand;20.000;18.000;0.000;30.000;210.00;0.001;CPhi;0.700;0.220;False;10.000;"); - writer.WriteLine("Klei;#FFFFFF;Clay;17.500;17.500;3.500;18.500;210.00;0.001;SigmaTauCurve;0.700;0.220;False;10.000;CurveKlei"); - writer.WriteLine("Veen;#A4FFA6;Peat;11.000;11.000;2.000;20.500;210.00;0.001;CuCalculated;0.700;0.220;False;10.000;"); + writer.WriteLine("Zand;#A6EBFC;Sand;20.000;18.000;0.000;30.000;210.00;0.001;MohrCoulomb;0.700;0.220;False;10.000;"); + writer.WriteLine("Klei;#FFFFFF;Clay;17.500;17.500;3.500;18.500;210.00;0.001;SigmaTauTable;0.700;0.220;False;10.000;CurveKlei"); + writer.WriteLine("Veen;#A4FFA6;Peat;11.000;11.000;2.000;20.500;210.00;0.001;SHANSEP;0.700;0.220;False;10.000;"); } private static void CreateMinimalSoilsFile(string filePath)