Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/TestData/CSVData/Full1DProject/csvfiles/soils.csv =================================================================== diff -u -r5798 -r5799 --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/TestData/CSVData/Full1DProject/csvfiles/soils.csv (.../soils.csv) (revision 5798) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/TestData/CSVData/Full1DProject/csvfiles/soils.csv (.../soils.csv) (revision 5799) @@ -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;;;100 +FCO;#FFFFFF;Clay;17;17;2;20;0.01;1e-05;MohrCoulomb;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;;SuKlei;100 +FFO;#FFFFFF;Clay;15;15;2;20;0.01;1e-05;SuTable;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/src/DamClientsLibrary/Deltares.Dam.Data/Dike.cs =================================================================== diff -u -r5794 -r5799 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Dike.cs (.../Dike.cs) (revision 5794) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Dike.cs (.../Dike.cs) (revision 5799) @@ -242,6 +242,13 @@ } soil.StressTable = stressCurve; // Note: if the stress curve was not found, the soil will be removed from the soil list in TryToMakeSoilDataConsistent() + SuTableCurve suTableCurve = ImportedCsvSuTableCurves.Find(sc => sc.Name == soilRecord.SuTableName); + if (suTableCurve == null) + { + suTableCurve = new SuTableCurve{ Name = soilRecord.SuTableName}; + } + soil.SuTable = suTableCurve; + // Note: if the su table was not found, the soil will be removed from the soil list in TryToMakeSoilDataConsistent() if (soilRecord.StrengthIncreaseExponent.HasValue) { @@ -449,6 +456,7 @@ internal List ImportedCsvSoils { get; } = new(); internal List ImportedCsvStressCurves { get; } = new(); + internal List ImportedCsvSuTableCurves { get; } = new(); /// /// Tries to make the soil data as read for 1D profiles consistent with the data in the soil database. @@ -491,7 +499,7 @@ soilErrorMessages.Add(string.Format(LocalizationManager.GetTranslatedText(GetType(), "SigmaTauCurveNotFoundInCsvFile"), soil.StressTable.Name, soil.Name)); } - +// todo support for su tables Soil existingSoil = soilList.GetSoilByName(soil.Name); if (existingSoil == null) { Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/IO/CombineImportedDataTest.cs =================================================================== diff -u -r5798 -r5799 --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/IO/CombineImportedDataTest.cs (.../CombineImportedDataTest.cs) (revision 5798) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/IO/CombineImportedDataTest.cs (.../CombineImportedDataTest.cs) (revision 5799) @@ -252,7 +252,7 @@ Assert.Multiple(() => { Assert.That(soil.ShearStrengthModel, Is.EqualTo(ShearStrengthModel.SuTable)); - Assert.That(soil.StressTable.Name, Is.EqualTo("CurveKlei")); + Assert.That(soil.SuTable.Name, Is.EqualTo("SuKlei")); }); // Check degree of consolidation data