Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/ConversionHelper.cs =================================================================== diff -u -r5794 -r5814 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/ConversionHelper.cs (.../ConversionHelper.cs) (revision 5794) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/ConversionHelper.cs (.../ConversionHelper.cs) (revision 5814) @@ -1278,6 +1278,9 @@ }, { ShearStrengthModel.StressTable, SoilShearStrengthModel.SigmaTauCurve + }, + { + ShearStrengthModel.SuTable, SoilShearStrengthModel.SuTable } }; return translationTable[shearStrengthModel]; @@ -1300,6 +1303,9 @@ }, { SoilShearStrengthModel.SigmaTauCurve, ShearStrengthModel.StressTable + }, + { + SoilShearStrengthModel.SuTable, ShearStrengthModel.SuTable } }; return translationTable[soilShearStrengthModel]; Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DamEngineIo/FillXmlInputFromDamUiTests.cs =================================================================== diff -u -r5705 -r5814 --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DamEngineIo/FillXmlInputFromDamUiTests.cs (.../FillXmlInputFromDamUiTests.cs) (revision 5705) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DamEngineIo/FillXmlInputFromDamUiTests.cs (.../FillXmlInputFromDamUiTests.cs) (revision 5814) @@ -1076,6 +1076,21 @@ Sigma = 1.0, Tau = 2.0 }); + + // Change 1 soil to ShearStrengthModel.SuTable + Soil soilSuTable = dike.SoilList.Soils[2]; + soilSuTable.ShearStrengthModel = ShearStrengthModel.SuTable; + soilSuTable.SuTable = new SuTableCurve(); + soilSuTable.SuTable.SigmaSus.Add(new SigmaSu() + { + Sigma = 0.0, + Su = 1.1 + }); + soilSuTable.SuTable.SigmaSus.Add(new SigmaSu() + { + Sigma = 1.1, + Su = 2.1 + }); } private static void AddLocations(Dike dike, List surfaceLines, IList segments) Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillDamUiFromXmlInput.cs =================================================================== diff -u -r5705 -r5814 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillDamUiFromXmlInput.cs (.../FillDamUiFromXmlInput.cs) (revision 5705) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillDamUiFromXmlInput.cs (.../FillDamUiFromXmlInput.cs) (revision 5814) @@ -406,6 +406,19 @@ }); } } + if (soil.ShearStrengthModel == ShearStrengthModel.SuTable) + { + soil.SuTable = new SuTableCurve(); + for (var j = 0; j < inputSoil.SuTable.Length; j++) + { + SuTableSigmaSuPoint point = inputSoil.SuTable[j]; + soil.SuTable.SigmaSus.Add(new SigmaSu() + { + Sigma = point.Sigma, + Su = point.Su + }); + } + } soil.Cohesion = inputSoil.CohesionSpecified ? inputSoil.Cohesion : Double.NaN; soil.FrictionAngle = inputSoil.FrictionAngleSpecified ? inputSoil.FrictionAngle : Double.NaN; Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillXmlInputFromDamUi.cs =================================================================== diff -u -r5705 -r5814 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillXmlInputFromDamUi.cs (.../FillXmlInputFromDamUi.cs) (revision 5705) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillXmlInputFromDamUi.cs (.../FillXmlInputFromDamUi.cs) (revision 5814) @@ -484,7 +484,18 @@ }; } } - + if (soil.ShearStrengthModel == ShearStrengthModel.SuTable) + { + inputSoil.SuTable = new SuTableSigmaSuPoint[soil.SuTable.SigmaSus.Count]; + for (var j = 0; j < soil.SuTable.SigmaSus.Count; j++) + { + inputSoil.SuTable[j] = new SuTableSigmaSuPoint + { + Sigma = soil.SuTable.SigmaSus[j].Sigma, + Su = soil.SuTable.SigmaSus[j].Su + }; + } + } inputSoil.UseDefaultShearStrengthModelSpecified = true; inputSoil.UseDefaultShearStrengthModel = soil.UseDefaultShearStrengthModel; inputSoil.CohesionSpecified = !Double.IsNaN(soil.Cohesion);