Index: DamEngine/trunk/src/Deltares.DamEngine.Interface/FillXmlInputFromDam.cs =================================================================== diff -u -r6097 -r6157 --- DamEngine/trunk/src/Deltares.DamEngine.Interface/FillXmlInputFromDam.cs (.../FillXmlInputFromDam.cs) (revision 6097) +++ DamEngine/trunk/src/Deltares.DamEngine.Interface/FillXmlInputFromDam.cs (.../FillXmlInputFromDam.cs) (revision 6157) @@ -474,46 +474,22 @@ inputSoil.AbovePhreaticLevel = soil.AbovePhreaticLevel; inputSoil.BelowPhreaticLevelSpecified = !double.IsNaN(soil.BelowPhreaticLevel); inputSoil.BelowPhreaticLevel = soil.BelowPhreaticLevel; - inputSoil.DryUnitWeightSpecified = !double.IsNaN(soil.DryUnitWeight); - inputSoil.DryUnitWeight = soil.DryUnitWeight; - inputSoil.BeddingAngleSpecified = !double.IsNaN(soil.BeddingAngle); - inputSoil.BeddingAngle = soil.BeddingAngle; inputSoil.DiameterD70Specified = !double.IsNaN(soil.DiameterD70); inputSoil.DiameterD70 = soil.DiameterD70; - inputSoil.DiameterD90Specified = !double.IsNaN(soil.DiameterD90); - inputSoil.DiameterD90 = soil.DiameterD90; inputSoil.PermeabKxSpecified = !double.IsNaN(soil.PermeabKx); inputSoil.PermeabKx = soil.PermeabKx; - inputSoil.WhitesConstantSpecified = !double.IsNaN(soil.WhitesConstant); - inputSoil.WhitesConstant = soil.WhitesConstant; inputSoil.ShearStrengthModelSpecified = (soil.ShearStrengthModel != null); if (inputSoil.ShearStrengthModelSpecified) { inputSoil.ShearStrengthModel = ConversionHelper.ConvertToSoilShearStrengthModel(soil.ShearStrengthModel.Value); } - inputSoil.UseDefaultShearStrengthModelSpecified = (soil.UseDefaultShearStrengthModel != null); - if (inputSoil.UseDefaultShearStrengthModelSpecified) - { - inputSoil.UseDefaultShearStrengthModel = soil.UseDefaultShearStrengthModel.Value; - } - inputSoil.CohesionSpecified = !double.IsNaN(soil.Cohesion); inputSoil.Cohesion = soil.Cohesion; inputSoil.FrictionAngleSpecified = !double.IsNaN(soil.FrictionAngle); inputSoil.FrictionAngle = soil.FrictionAngle; inputSoil.OcrSpecified = !double.IsNaN(soil.Ocr); inputSoil.Ocr = soil.Ocr; - inputSoil.SlopeRestProfileSpecified = !double.IsNaN(soil.SlopeRestProfile); - inputSoil.SlopeRestProfile = soil.SlopeRestProfile; - inputSoil.DilatancyTypeSpecified = (soil.DilatancyType != null); - if (inputSoil.DilatancyTypeSpecified) - { - inputSoil.DilatancyType = ConversionHelper.ConvertToSoilDilatancyType(soil.DilatancyType.Value); - } - - inputSoil.RRatioSpecified = !double.IsNaN(soil.RRatio); - inputSoil.RRatio = soil.RRatio; inputSoil.StrengthIncreaseExponentSpecified = !double.IsNaN(soil.StrengthIncreaseExponent); inputSoil.StrengthIncreaseExponent = soil.StrengthIncreaseExponent; inputSoil.RatioCuPcSpecified = !double.IsNaN(soil.RatioCuPc);