Index: DamEngine/trunk/src/Deltares.DamEngine.Interface/FillXmlInputFromDam.cs =================================================================== diff -u -r5813 -r5880 --- DamEngine/trunk/src/Deltares.DamEngine.Interface/FillXmlInputFromDam.cs (.../FillXmlInputFromDam.cs) (revision 5813) +++ DamEngine/trunk/src/Deltares.DamEngine.Interface/FillXmlInputFromDam.cs (.../FillXmlInputFromDam.cs) (revision 5880) @@ -520,33 +520,46 @@ inputSoil.RatioCuPc = soil.RatioCuPc; inputSoil.PopSpecified = !double.IsNaN(soil.PoP); inputSoil.Pop = soil.PoP; - if (soil.SigmaTauCurve != null) + TransferSigmaTauCurves(soil, inputSoil); + TransferSuTables(soil, inputSoil); + inputSoils[i] = inputSoil; + } + } + + private static void TransferSuTables(Soil soil, Io.XmlInput.Soil inputSoil) + { + if (soil.SuTableCurve == null) + { + return; + } + + inputSoil.SuTable = new SuTableSigmaSuPoint[soil.SuTableCurve.Points.Count]; + for (var j = 0; j < soil.SuTableCurve.Points.Count; j++) + { + inputSoil.SuTable[j] = new SuTableSigmaSuPoint { - inputSoil.SigmaTauCurve = new SigmaTauCurveSigmaTauPoint[soil.SigmaTauCurve.Points.Count]; - for (var j = 0; j < soil.SigmaTauCurve.Points.Count; j++) - { - inputSoil.SigmaTauCurve[j] = new SigmaTauCurveSigmaTauPoint - { - Sigma = soil.SigmaTauCurve.Points[j].Sigma, - Tau = soil.SigmaTauCurve.Points[j].Tau - }; - } - } - if (soil.SuTableCurve != null) - { - inputSoil.SuTable = new SuTableSigmaSuPoint[soil.SuTableCurve.Points.Count]; - for (var j = 0; j < soil.SuTableCurve.Points.Count; j++) - { - inputSoil.SuTable[j] = new SuTableSigmaSuPoint - { - Sigma = soil.SuTableCurve.Points[j].Sigma, - Su = soil.SuTableCurve.Points[j].Su - }; - } - } + Sigma = soil.SuTableCurve.Points[j].Sigma, + Su = soil.SuTableCurve.Points[j].Su + }; + } + } - inputSoils[i] = inputSoil; + private static void TransferSigmaTauCurves(Soil soil, Io.XmlInput.Soil inputSoil) + { + if (soil.SigmaTauCurve == null) + { + return; } + + inputSoil.SigmaTauCurve = new SigmaTauCurveSigmaTauPoint[soil.SigmaTauCurve.Points.Count]; + for (var j = 0; j < soil.SigmaTauCurve.Points.Count; j++) + { + inputSoil.SigmaTauCurve[j] = new SigmaTauCurveSigmaTauPoint + { + Sigma = soil.SigmaTauCurve.Points[j].Sigma, + Tau = soil.SigmaTauCurve.Points[j].Tau + }; + } } private static void TransferSurfaceLines(IList dikeSurfaceLines, SurfaceLine[] inputSurfaceLines)