Index: DamEngine/branches/DamEngine 19.3/src/Deltares.DamEngine.Interface/FillXmlInputFromDam.cs =================================================================== diff -u -r3736 -r3737 --- DamEngine/branches/DamEngine 19.3/src/Deltares.DamEngine.Interface/FillXmlInputFromDam.cs (.../DamEngine 19.3 wrong/src/Deltares.DamEngine.Interface/FillXmlInputFromDam.cs) (revision 3736) +++ DamEngine/branches/DamEngine 19.3/src/Deltares.DamEngine.Interface/FillXmlInputFromDam.cs (.../DamEngine 19.3/src/Deltares.DamEngine.Interface/FillXmlInputFromDam.cs) (revision 3737) @@ -496,9 +496,12 @@ var waternetOptions = new LocationWaternetOptions(); waternetOptions.PhreaticLineCreationMethod = ConversionHelper.ConvertToInputPhreaticLineCreationMethod(location.ModelParametersForPlLines.PlLineCreationMethod); waternetOptions.IntrusionVerticalWaterPressure = ConversionHelper.ConvertToInputIntrusionVerticalWaterPressure(location.IntrusionVerticalWaterPressure ?? IntrusionVerticalWaterPressureType.Standard); + waternetOptions.PolderLevel = location.PolderLevel; waternetOptions.DampingFactorPl3 = location.ModelParametersForPlLines.DampingFactorPl3; waternetOptions.DampingFactorPl4 = location.ModelParametersForPlLines.DampingFactorPl4; waternetOptions.PenetrationLength = location.ModelParametersForPlLines.PenetrationLength; + waternetOptions.HeadPl2Specified = location.HeadPl2.HasValue; + waternetOptions.HeadPl2 = location.HeadPl2 ?? 0.0; waternetOptions.DikeSoilScenario = ConversionHelper.ConvertToInputDikeSoilScenario(location.DikeSoilScenario); waternetOptions.SlopeDampingFactor = location.SlopeDampingPiezometricHeightPolderSide; inputLocation.WaternetOptions = waternetOptions; @@ -547,8 +550,8 @@ var designScenario = location.Scenarios[j]; var inputDesignScenario = new LocationDesignScenario(); inputDesignScenario.RiverLevel = designScenario.RiverLevel; + inputDesignScenario.Id = designScenario.LocationScenarioID; - inputDesignScenario.PolderLevel = designScenario.PolderLevel; inputDesignScenario.RiverLevelLowSpecified = designScenario.RiverLevelLow.HasValue; inputDesignScenario.RiverLevelLow = designScenario.RiverLevelLow ?? 0.0; inputDesignScenario.DikeTableHeightSpecified = designScenario.DikeTableHeight.HasValue; @@ -561,8 +564,6 @@ inputDesignScenario.PlLineOffsetBelowDikeCrestMiddle = designScenario.PlLineOffsetBelowDikeCrestMiddle.Value; inputDesignScenario.PlLineOffsetFactorBelowShoulderCrestSpecified = designScenario.UsePlLineOffsetFactorBelowShoulderCrest.Value; inputDesignScenario.PlLineOffsetFactorBelowShoulderCrest = designScenario.PlLineOffsetFactorBelowShoulderCrest.Value; - inputDesignScenario.HeadPl2Specified = designScenario.HeadPl2.HasValue; - inputDesignScenario.HeadPl2 = designScenario.HeadPl2 ?? 0.0; inputDesignScenario.HeadPl3Specified = designScenario.HeadPl3.HasValue; inputDesignScenario.HeadPl3 = designScenario.HeadPl3 ?? 0.0; inputDesignScenario.HeadPl4Specified = designScenario.HeadPl4.HasValue;