Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/CsvImporterTests.cs =================================================================== diff -u -r4951 -r5455 --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/CsvImporterTests.cs (.../CsvImporterTests.cs) (revision 4951) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/CsvImporterTests.cs (.../CsvImporterTests.cs) (revision 5455) @@ -813,6 +813,8 @@ Assert.That(soilRecord.StrengthIncreaseExponent, Is.Null); Assert.That(soilRecord.RatioSuPc, Is.Null); Assert.That(soilRecord.Pop, Is.Null); + Assert.That(soilRecord.SigmaTauCurveName, Is.EqualTo("")); + Assert.That(soilRecord.TrafficLoadDegreeOfConsolidation, Is.Null); soilRecord = soilRecords[1]; Assert.That(soilRecord.SoilName, Is.EqualTo("Veen")); @@ -828,6 +830,8 @@ Assert.That(soilRecord.StrengthIncreaseExponent, Is.Null); Assert.That(soilRecord.RatioSuPc, Is.Null); Assert.That(soilRecord.Pop, Is.Null); + Assert.That(soilRecord.SigmaTauCurveName, Is.EqualTo("")); + Assert.That(soilRecord.TrafficLoadDegreeOfConsolidation, Is.Null); } [Test] @@ -860,6 +864,7 @@ Assert.That(soilRecord.RatioSuPc, Is.EqualTo(0.220)); Assert.That(soilRecord.Pop, Is.EqualTo(10.000)); Assert.That(soilRecord.SigmaTauCurveName, Is.EqualTo("")); + Assert.That(soilRecord.TrafficLoadDegreeOfConsolidation, Is.EqualTo(100.00)); soilRecord = soilRecords[1]; Assert.That(soilRecord.SoilName, Is.EqualTo("Klei")); @@ -876,6 +881,7 @@ Assert.That(soilRecord.RatioSuPc, Is.EqualTo(0.220)); Assert.That(soilRecord.Pop, Is.EqualTo(10.000)); Assert.That(soilRecord.SigmaTauCurveName, Is.EqualTo("CurveKlei")); + Assert.That(soilRecord.TrafficLoadDegreeOfConsolidation, Is.EqualTo(30.00)); soilRecord = soilRecords[2]; Assert.That(soilRecord.SoilName, Is.EqualTo("Veen")); @@ -892,6 +898,7 @@ Assert.That(soilRecord.RatioSuPc, Is.EqualTo(0.220)); Assert.That(soilRecord.Pop, Is.EqualTo(10.000)); Assert.That(soilRecord.SigmaTauCurveName, Is.EqualTo("")); + Assert.That(soilRecord.TrafficLoadDegreeOfConsolidation, Is.EqualTo(100.00)); } [Test] @@ -904,7 +911,7 @@ File.Delete(testFilePath); } - CreateSoilProfilesFileWithIllegalHeader(testFilePath); + CreateSoilsFileWithIllegalHeader(testFilePath); Assert.That(() => new CsvImporterSoils(testFilePath), Throws.InstanceOf().With.Message.Contains("The header misses the field: soil_color")); } @@ -1098,10 +1105,10 @@ private static void CreateFullSoilsFile(string filePath) { 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;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;"); + 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;traffic_load_degree_of_consolidation"); + 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;;100.00"); + 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;30.00"); + 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;;100.00"); } private static void CreateMinimalSoilsFile(string filePath) @@ -1112,6 +1119,13 @@ writer.WriteLine("Veen;#A4FFA6;Peat"); } + private static void CreateSoilsFileWithIllegalHeader(string filePath) + { + using StreamWriter writer = File.CreateText(filePath); + writer.WriteLine("soil_name;color;soil_type"); + writer.WriteLine("Klei;#FFFFFF;Clay"); + } + private static void CreateSoilsFileWithIllegalValues(string filePath) { using StreamWriter writer = File.CreateText(filePath); Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Importers/CsvColumnNames.cs =================================================================== diff -u -r4618 -r5455 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Importers/CsvColumnNames.cs (.../CsvColumnNames.cs) (revision 4618) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Importers/CsvColumnNames.cs (.../CsvColumnNames.cs) (revision 5455) @@ -459,4 +459,9 @@ /// is_aquifer /// public const string IsAquiferColumnName = "is_aquifer"; + + /// + /// traffic_load_degree_of_consolidation + /// + public const string TrafficLoadDegreeOfConsolidationColumnName = "traffic_load_degree_of_consolidation"; } \ No newline at end of file Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/CsvImporters/CsvImporterSoils.cs =================================================================== diff -u -r4931 -r5455 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/CsvImporters/CsvImporterSoils.cs (.../CsvImporterSoils.cs) (revision 4931) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/CsvImporters/CsvImporterSoils.cs (.../CsvImporterSoils.cs) (revision 5455) @@ -83,6 +83,7 @@ int colIndexRatioSuPc = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.RatioSuPcColumnName); int colIndexPop = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.PopColumnName); int colIndexSigmaTauCurveName = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.SigmaTauCurveNameColumnName); + int colIndexTrafficLoadDegreeOfConsolidation = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.TrafficLoadDegreeOfConsolidationColumnName); while (csv.ReadNextRecord()) { @@ -123,6 +124,7 @@ } soil.Pop = FetchOptionalColumn(colIndexPop, csv); + soil.TrafficLoadDegreeOfConsolidation = FetchOptionalColumn(colIndexTrafficLoadDegreeOfConsolidation, csv); ImportedItems.Add(soil); } @@ -180,5 +182,6 @@ public double? StrengthIncreaseExponent { get; set; } public double? RatioSuPc { get; set; } public double? Pop { get; set; } + public double? TrafficLoadDegreeOfConsolidation { get; set; } } } \ No newline at end of file