Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/CsvImporterTest.cs
===================================================================
diff -u -r4157 -r4168
--- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/CsvImporterTest.cs (.../CsvImporterTest.cs) (revision 4157)
+++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/CsvImporterTest.cs (.../CsvImporterTest.cs) (revision 4168)
@@ -312,7 +312,7 @@
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;strength_increase_exponent;ratio_su_pc;use_pop;pop");
writer.WriteLine("Zand;#A6EBFC;Sand;20.000;18.000;0.000;30.000;210.00;0.001;None;0.700;0.220;False;10.000");
- writer.WriteLine("Klei;#FFFFFF;Clay;17.500;17.500;3.500;18.500;210.00;0.001;None;0.700;0.220;False;10.000");
- writer.WriteLine("Veen;#A4FFA6;Peat;11.000;11.000;2.000;20.500;210.00;0.001;None;0.700;0.220;False;10.000");
+ writer.WriteLine("Klei;#FFFFFF;Clay;17.500;17.500;3.500;18.500;210.00;0.001;C phi;0.700;0.220;False;10.000");
+ writer.WriteLine("Veen;#A4FFA6;Peat;11.000;11.000;2.000;20.500;210.00;0.001;Su calculated;0.700;0.220;False;10.000");
}
}
\ No newline at end of file
Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DamEngineIo/ConversionHelperTests.cs
===================================================================
diff -u -r4143 -r4168
--- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DamEngineIo/ConversionHelperTests.cs (.../ConversionHelperTests.cs) (revision 4143)
+++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DamEngineIo/ConversionHelperTests.cs (.../ConversionHelperTests.cs) (revision 4168)
@@ -592,15 +592,15 @@
Assert.That(ConversionHelper.ConvertToSoilType(inputSoilType), Is.EqualTo(expectedSoilType));
}
- [TestCase("None", ShearStrengthModel.None)]
+ [TestCase("None", ShearStrengthModel.CPhi)]
[TestCase("C phi", ShearStrengthModel.CPhi)]
- [TestCase("Stress table", ShearStrengthModel.StressTable)]
- [TestCase("Pseudo values", ShearStrengthModel.PseudoValues)]
- [TestCase("Su measured", ShearStrengthModel.CuMeasured)]
+ [TestCase("Stress table", ShearStrengthModel.CPhi)]
+ [TestCase("Pseudo values", ShearStrengthModel.CPhi)]
+ [TestCase("Su measured", ShearStrengthModel.CPhi)]
[TestCase("Su calculated", ShearStrengthModel.CuCalculated)]
- [TestCase("Su gradient", ShearStrengthModel.CuGradient)]
- [TestCase("Su calculated with yield", ShearStrengthModel.CuCalculatedYield)]
- [TestCase("C phi or Su calculated", ShearStrengthModel.CPhiOrCuCalculated)]
+ [TestCase("Su gradient", ShearStrengthModel.CPhi)]
+ [TestCase("Su calculated with yield", ShearStrengthModel.CPhi)]
+ [TestCase("C phi or Su calculated", ShearStrengthModel.CPhi)]
public void CanConvertToShearStrengthModel(string inputSoilType, ShearStrengthModel expectedSoilType)
{
Assert.That(ConversionHelper.ConvertToShearStrengthModel(inputSoilType), Is.EqualTo(expectedSoilType));
Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Translations.xml
===================================================================
diff -u -r4160 -r4168
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Translations.xml (.../Translations.xml) (revision 4160)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Translations.xml (.../Translations.xml) (revision 4168)
@@ -371,8 +371,8 @@
en-US="Next error occured whilst reading surface line {0} column {1} from csv: "
nl-NL="Tijdens het lezen van surface line {0} in kolom {1} uit de csv trad de volgende fout op: "/>
+ en-US="Next error occured whilst reading soil {0} column {1} from csv: "
+ nl-NL="Tijdens het lezen van materiaal in kolom {1} uit de csv trad de volgende fout op: "/>
{
{
- "None", ShearStrengthModel.None
- },
- {
"C phi", ShearStrengthModel.CPhi
},
{
- "Stress table", ShearStrengthModel.StressTable
- },
- {
- "Pseudo values", ShearStrengthModel.PseudoValues
- },
- {
- "Su measured", ShearStrengthModel.CuMeasured
- },
- {
"Su calculated", ShearStrengthModel.CuCalculated
- },
- {
- "Su gradient", ShearStrengthModel.CuGradient
- },
- {
- "Su calculated with yield", ShearStrengthModel.CuCalculatedYield
- },
- {
- "C phi or Su calculated", ShearStrengthModel.CPhiOrCuCalculated
}
};
+ if ((shearStrengthModel != "C phi") && (shearStrengthModel != "Su calculated"))
+ {
+ shearStrengthModel = "C phi";
+ }
return translationTable[shearStrengthModel];
}
Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/CsvImporterTestsNew.cs
===================================================================
diff -u -r4160 -r4168
--- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/CsvImporterTestsNew.cs (.../CsvImporterTestsNew.cs) (revision 4160)
+++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/CsvImporterTestsNew.cs (.../CsvImporterTestsNew.cs) (revision 4168)
@@ -761,7 +761,7 @@
Assert.That(soilRecord.FrictionAngle, Is.EqualTo(30.000));
Assert.That(soilRecord.DiameterD70, Is.EqualTo(210.00));
Assert.That(soilRecord.PermeabilityX, Is.EqualTo(0.001));
- Assert.That(soilRecord.ShearStrengthModel, Is.EqualTo(ShearStrengthModel.None));
+ Assert.That(soilRecord.ShearStrengthModel, Is.EqualTo(ShearStrengthModel.CPhi));
Assert.That(soilRecord.StrengthIncreaseExponent, Is.EqualTo(0.700));
Assert.That(soilRecord.RatioSuPc, Is.EqualTo(0.220));
Assert.That(soilRecord.UsePop, Is.False);
@@ -777,7 +777,7 @@
Assert.That(soilRecord.FrictionAngle, Is.EqualTo(18.500));
Assert.That(soilRecord.DiameterD70, Is.EqualTo(210.00));
Assert.That(soilRecord.PermeabilityX, Is.EqualTo(0.001));
- Assert.That(soilRecord.ShearStrengthModel, Is.EqualTo(ShearStrengthModel.None));
+ Assert.That(soilRecord.ShearStrengthModel, Is.EqualTo(ShearStrengthModel.CPhi));
Assert.That(soilRecord.StrengthIncreaseExponent, Is.EqualTo(0.700));
Assert.That(soilRecord.RatioSuPc, Is.EqualTo(0.220));
Assert.That(soilRecord.UsePop, Is.False);
@@ -793,7 +793,7 @@
Assert.That(soilRecord.FrictionAngle, Is.EqualTo(20.500));
Assert.That(soilRecord.DiameterD70, Is.EqualTo(210.00));
Assert.That(soilRecord.PermeabilityX, Is.EqualTo(0.001));
- Assert.That(soilRecord.ShearStrengthModel, Is.EqualTo(ShearStrengthModel.None));
+ Assert.That(soilRecord.ShearStrengthModel, Is.EqualTo(ShearStrengthModel.CuCalculated));
Assert.That(soilRecord.StrengthIncreaseExponent, Is.EqualTo(0.700));
Assert.That(soilRecord.RatioSuPc, Is.EqualTo(0.220));
Assert.That(soilRecord.UsePop, Is.False);
@@ -912,8 +912,8 @@
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");
writer.WriteLine("Zand;#A6EBFC;Sand;20.000;18.000;0.000;30.000;210.00;0.001;None;0.700;0.220;False;10.000");
- writer.WriteLine("Klei;#FFFFFF;Clay;17.500;17.500;3.500;18.500;210.00;0.001;None;0.700;0.220;False;10.000");
- writer.WriteLine("Veen;#A4FFA6;Peat;11.000;11.000;2.000;20.500;210.00;0.001;None;0.700;0.220;False;10.000");
+ writer.WriteLine("Klei;#FFFFFF;Clay;17.500;17.500;3.500;18.500;210.00;0.001;C phi;0.700;0.220;False;10.000");
+ writer.WriteLine("Veen;#A4FFA6;Peat;11.000;11.000;2.000;20.500;210.00;0.001;Su calculated;0.700;0.220;False;10.000");
}
private static void CreateMinimalSoilsFile(string filePath)