Index: DamEngine/trunk/src/Deltares.DamEngine.Interface/FillXmlInputFromDam.cs =================================================================== diff -u -r2925 -r2949 --- DamEngine/trunk/src/Deltares.DamEngine.Interface/FillXmlInputFromDam.cs (.../FillXmlInputFromDam.cs) (revision 2925) +++ DamEngine/trunk/src/Deltares.DamEngine.Interface/FillXmlInputFromDam.cs (.../FillXmlInputFromDam.cs) (revision 2949) @@ -451,6 +451,10 @@ { 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; inputSoils[i] = inputSoil; } } @@ -505,41 +509,38 @@ // Design options var designOptions = new LocationDesignOptions(); - if (designOptions != null) - { - designOptions.RedesignDikeHeight = location.RedesignDikeHeight; - designOptions.RedesignDikeShoulder = location.RedesignDikeShoulder; - designOptions.ShoulderEmbankmentMaterial = location.ShoulderEmbankmentMaterial; - designOptions.StabilityShoulderGrowSlope = location.StabilityShoulderGrowSlope; - designOptions.StabilityShoulderGrowDeltaX = location.StabilityShoulderGrowDeltaX; - designOptions.StabilitySlopeAdaptionDeltaX = location.StabilitySlopeAdaptionDeltaX; - designOptions.SlopeAdaptionStartCotangent = location.SlopeAdaptionStartCotangent; - designOptions.SlopeAdaptionEndCotangent = location.SlopeAdaptionEndCotangent; - designOptions.SlopeAdaptionStepCotangent = location.SlopeAdaptionStepCotangent; - designOptions.NewDikeTopWidthSpecified = location.UseNewDikeTopWidth; - designOptions.NewDikeTopWidth = location.NewDikeTopWidth; - designOptions.NewDikeSlopeInsideSpecified = location.UseNewDikeSlopeInside; - designOptions.NewDikeSlopeInside = location.NewDikeSlopeInside; - designOptions.NewDikeSlopeOutsideSpecified = location.UseNewDikeSlopeOutside; - designOptions.NewDikeSlopeOutside = location.NewDikeSlopeOutside; - designOptions.NewShoulderTopSlopeSpecified = location.UseNewShoulderTopSlope; - designOptions.NewShoulderTopSlope = location.NewShoulderTopSlope; - designOptions.NewShoulderBaseSlopeSpecified = location.UseNewShoulderBaseSlope; - designOptions.NewShoulderBaseSlope = location.NewShoulderBaseSlope; - designOptions.NewMaxHeightShoulderAsFractionSpecified = location.UseNewMaxHeightShoulderAsFraction; - designOptions.NewMaxHeightShoulderAsFraction = location.NewMaxHeightShoulderAsFraction; - designOptions.NewMinDistanceDikeToeStartDitchSpecified = location.UseNewMinDistanceDikeToeStartDitch; - designOptions.NewMinDistanceDikeToeStartDitch = location.NewMinDistanceDikeToeStartDitch; - designOptions.UseNewDitchDefinition = location.UseNewDitchDefinition; - designOptions.NewWidthDitchBottomSpecified = location.UseNewDitchDefinition; - designOptions.NewWidthDitchBottom = location.NewWidthDitchBottom; - designOptions.NewSlopeAngleDitchSpecified = location.UseNewDitchDefinition; - designOptions.NewSlopeAngleDitch = location.NewSlopeAngleDitch; - designOptions.NewDepthDitchSpecified = location.UseNewDitchDefinition; - designOptions.NewDepthDitch = location.NewDepthDitch; - designOptions.StabilityDesignMethod = ConversionHelper.ConvertToInputStabilityDesignMethod(location.StabilityDesignMethod); - inputLocation.DesignOptions = designOptions; - } + designOptions.RedesignDikeHeight = location.RedesignDikeHeight; + designOptions.RedesignDikeShoulder = location.RedesignDikeShoulder; + designOptions.ShoulderEmbankmentMaterial = location.ShoulderEmbankmentMaterial; + designOptions.StabilityShoulderGrowSlope = location.StabilityShoulderGrowSlope; + designOptions.StabilityShoulderGrowDeltaX = location.StabilityShoulderGrowDeltaX; + designOptions.StabilitySlopeAdaptionDeltaX = location.StabilitySlopeAdaptionDeltaX; + designOptions.SlopeAdaptionStartCotangent = location.SlopeAdaptionStartCotangent; + designOptions.SlopeAdaptionEndCotangent = location.SlopeAdaptionEndCotangent; + designOptions.SlopeAdaptionStepCotangent = location.SlopeAdaptionStepCotangent; + designOptions.NewDikeTopWidthSpecified = location.UseNewDikeTopWidth; + designOptions.NewDikeTopWidth = location.NewDikeTopWidth; + designOptions.NewDikeSlopeInsideSpecified = location.UseNewDikeSlopeInside; + designOptions.NewDikeSlopeInside = location.NewDikeSlopeInside; + designOptions.NewDikeSlopeOutsideSpecified = location.UseNewDikeSlopeOutside; + designOptions.NewDikeSlopeOutside = location.NewDikeSlopeOutside; + designOptions.NewShoulderTopSlopeSpecified = location.UseNewShoulderTopSlope; + designOptions.NewShoulderTopSlope = location.NewShoulderTopSlope; + designOptions.NewShoulderBaseSlopeSpecified = location.UseNewShoulderBaseSlope; + designOptions.NewShoulderBaseSlope = location.NewShoulderBaseSlope; + designOptions.NewMaxHeightShoulderAsFractionSpecified = location.UseNewMaxHeightShoulderAsFraction; + designOptions.NewMaxHeightShoulderAsFraction = location.NewMaxHeightShoulderAsFraction; + designOptions.NewMinDistanceDikeToeStartDitchSpecified = location.UseNewMinDistanceDikeToeStartDitch; + designOptions.NewMinDistanceDikeToeStartDitch = location.NewMinDistanceDikeToeStartDitch; + designOptions.UseNewDitchDefinition = location.UseNewDitchDefinition; + designOptions.NewWidthDitchBottomSpecified = location.UseNewDitchDefinition; + designOptions.NewWidthDitchBottom = location.NewWidthDitchBottom; + designOptions.NewSlopeAngleDitchSpecified = location.UseNewDitchDefinition; + designOptions.NewSlopeAngleDitch = location.NewSlopeAngleDitch; + designOptions.NewDepthDitchSpecified = location.UseNewDitchDefinition; + designOptions.NewDepthDitch = location.NewDepthDitch; + designOptions.StabilityDesignMethod = ConversionHelper.ConvertToInputStabilityDesignMethod(location.StabilityDesignMethod); + inputLocation.DesignOptions = designOptions; inputLocation.DesignScenarios = new LocationDesignScenario[location.Scenarios.Count]; for (int j = 0; j < location.Scenarios.Count; j++)