Index: DamEngine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlInput.cs =================================================================== diff -u -r6107 -r6157 --- DamEngine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlInput.cs (.../FillDamFromXmlInput.cs) (revision 6107) +++ DamEngine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlInput.cs (.../FillDamFromXmlInput.cs) (revision 6157) @@ -512,25 +512,12 @@ soil.Name = inputSoil.Name; soil.AbovePhreaticLevel = inputSoil.AbovePhreaticLevelSpecified ? inputSoil.AbovePhreaticLevel : double.NaN; soil.BelowPhreaticLevel = inputSoil.BelowPhreaticLevelSpecified ? inputSoil.BelowPhreaticLevel : double.NaN; - soil.DryUnitWeight = inputSoil.DryUnitWeightSpecified ? inputSoil.DryUnitWeight : double.NaN; - soil.BeddingAngle = inputSoil.BeddingAngleSpecified ? inputSoil.BeddingAngle : double.NaN; soil.DiameterD70 = inputSoil.DiameterD70Specified ? inputSoil.DiameterD70 : double.NaN; - soil.DiameterD90 = inputSoil.DiameterD90Specified ? inputSoil.DiameterD90 : double.NaN; soil.PermeabKx = inputSoil.PermeabKxSpecified ? inputSoil.PermeabKx : double.NaN; - soil.WhitesConstant = inputSoil.WhitesConstantSpecified ? inputSoil.WhitesConstant : double.NaN; soil.ShearStrengthModel = inputSoil.ShearStrengthModelSpecified ? ConversionHelper.ConvertToShearStrengthModel(inputSoil.ShearStrengthModel) : null; - soil.UseDefaultShearStrengthModel = inputSoil.UseDefaultShearStrengthModelSpecified ? inputSoil.UseDefaultShearStrengthModel : null; - if (soil.UseDefaultShearStrengthModel.HasValue && soil.UseDefaultShearStrengthModel.Value) - { - soil.ShearStrengthModel = ShearStrengthModel.CPhi; - } - soil.Cohesion = inputSoil.CohesionSpecified ? inputSoil.Cohesion : double.NaN; soil.FrictionAngle = inputSoil.FrictionAngleSpecified ? inputSoil.FrictionAngle : double.NaN; soil.Ocr = inputSoil.OcrSpecified ? inputSoil.Ocr : double.NaN; - soil.SlopeRestProfile = inputSoil.SlopeRestProfileSpecified ? inputSoil.SlopeRestProfile : double.NaN; - soil.DilatancyType = inputSoil.DilatancyTypeSpecified ? ConversionHelper.ConvertToDilatancyType(inputSoil.DilatancyType) : null; - soil.RRatio = inputSoil.RRatioSpecified ? inputSoil.RRatio : double.NaN; soil.StrengthIncreaseExponent = inputSoil.StrengthIncreaseExponentSpecified ? inputSoil.StrengthIncreaseExponent : double.NaN; soil.RatioCuPc = inputSoil.RatioCuPcSpecified ? inputSoil.RatioCuPc : double.NaN; soil.PoP = inputSoil.PopSpecified ? inputSoil.Pop : double.NaN;