Index: DamClients/DamUI/trunk/lib/DSL-Geo/Deltares.Geometry.dll =================================================================== diff -u -r5791 -r5798 Binary files differ Index: DamClients/DamUI/trunk/lib/DSL-GeoIO/Deltares.Soilbase.dll =================================================================== diff -u -r5791 -r5798 Binary files differ Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/IO/CombineImportedData.cs =================================================================== diff -u -r5465 -r5798 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/IO/CombineImportedData.cs (.../CombineImportedData.cs) (revision 5465) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/IO/CombineImportedData.cs (.../CombineImportedData.cs) (revision 5798) @@ -99,6 +99,11 @@ public IEnumerable SigmaTauCurveRecords { get; set; } /// + /// The SigmaTauCurve records. + /// + public IEnumerable SuTableRecords { get; set; } + + /// /// The error messages. /// public IList ErrorMessages { get; } = new List(); Index: DamClients/DamUI/trunk/lib/DSL-FormsGeo/Deltares.Geometry.dll =================================================================== diff -u -r5791 -r5798 Binary files differ Index: DamClients/DamUI/trunk/lib/DSL-GeoIO/Deltares.Geometry.dll =================================================================== diff -u -r5791 -r5798 Binary files differ Index: DamClients/DamUI/trunk/lib/DSL-GeoIO/Deltares.Geotechnics.dll =================================================================== diff -u -r5791 -r5798 Binary files differ Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/TestData/CSVData/Full1DProject/csvfiles/soils.csv =================================================================== diff -u -r5794 -r5798 --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/TestData/CSVData/Full1DProject/csvfiles/soils.csv (.../soils.csv) (revision 5794) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/TestData/CSVData/Full1DProject/csvfiles/soils.csv (.../soils.csv) (revision 5798) @@ -8,9 +8,9 @@ FCC;#FFFFFF;Sand;20;20;0;30;350;0.35;MohrCoulomb;0;;CurveZand;100 FCF;#FFFFFF;Sand;19;19;0;27;170;0.17;MohrCoulomb;0;;;100 FCM;#FFFFFF;Sand;20;20;0;30;250;0.25;MohrCoulomb;0;;;100 -FCO;#FFFFFF;Clay;17;17;2;20;0.01;1e-05;SuTable;0;;CurveKlei;100 +FCO;#FFFFFF;Clay;17;17;2;20;0.01;1e-05;SuTable;0;;;100 FFG;#FFFFFF;Clay;19;19;8;27.5;0.01;1e-05;MohrCoulomb;0;;;100 -FFO;#FFFFFF;Clay;15;15;2;20;0.01;1e-05;MohrCoulomb;0;;;100 +FFO;#FFFFFF;Clay;15;15;2;20;0.01;1e-05;MohrCoulomb;0;;SuKlei;100 FFS;#FFFFFF;Clay;19;19;5;30;0.01;1e-05;MohrCoulomb;0;;;100 FPR;#FFFFFF;Peat;13;13;2;20;0.01;1e-05;MohrCoulomb;0;;;100 kade;#FFFFFF;Clay;17;17;3;22;0.01;1e-05;MohrCoulomb;0;;;100 Index: DamClients/DamUI/trunk/lib/DSL-FormsGeo/Deltares.Geotechnics.dll =================================================================== diff -u -r5791 -r5798 Binary files differ Index: DamClients/DamUI/trunk/lib/DSL-Geo/Deltares.Geotechnics.dll =================================================================== diff -u -r5791 -r5798 Binary files differ Index: DamClients/DamUI/trunk/lib/DSL-FormsGeo/Deltares.Geotechnics.Forms.dll =================================================================== diff -u -r5791 -r5798 Binary files differ Index: DamClients/DamUI/trunk/lib/DSL-GeoIO/Deltares.Geotechnics.IO.dll =================================================================== diff -u -r5791 -r5798 Binary files differ Index: DamClients/DamUI/trunk/lib/DSL-FormsGeo/Deltares.Geometry.Forms.dll =================================================================== diff -u -r5791 -r5798 Binary files differ Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/IO/CombineImportedDataTest.cs =================================================================== diff -u -r5465 -r5798 --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/IO/CombineImportedDataTest.cs (.../CombineImportedDataTest.cs) (revision 5465) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/IO/CombineImportedDataTest.cs (.../CombineImportedDataTest.cs) (revision 5798) @@ -205,7 +205,8 @@ AquiferRecords = csvImporter.AquifersRecords, ScenarioRecords = csvImporter.ScenariosRecords, SoilRecords = csvImporter.SoilsRecords, - SigmaTauCurveRecords = csvImporter.SigmaTauCurvesRecords + SigmaTauCurveRecords = csvImporter.SigmaTauCurvesRecords, + SuTableRecords = csvImporter.SuTablesRecords }; combineImportedData.AddCsvDataToDikes(); combineImportedData.AddScenarioDataToDikes(); @@ -246,6 +247,13 @@ Assert.That(soil.ShearStrengthModel, Is.EqualTo(ShearStrengthModel.StressTable)); Assert.That(soil.StressTable.Name, Is.EqualTo("CurveKlei")); }); + soil = damProjectData.WaterBoard.Dikes[0].SoilList.Soils.FirstOrDefault(s => s.Name == "FFO"); + Assert.That(soil, Is.Not.Null); + Assert.Multiple(() => + { + Assert.That(soil.ShearStrengthModel, Is.EqualTo(ShearStrengthModel.SuTable)); + Assert.That(soil.StressTable.Name, Is.EqualTo("CurveKlei")); + }); // Check degree of consolidation data Assert.That(damProjectData.WaterBoard.Dikes[0].TrafficLoadDegreeOfConsolidations, Has.Count.EqualTo(14));