Index: DamClients/DamUI/trunk/src/Dam/Data/DamEngineIo/FillXmlInputFromDamUi.cs =================================================================== diff -u -r1267 -r1270 --- DamClients/DamUI/trunk/src/Dam/Data/DamEngineIo/FillXmlInputFromDamUi.cs (.../FillXmlInputFromDamUi.cs) (revision 1267) +++ DamClients/DamUI/trunk/src/Dam/Data/DamEngineIo/FillXmlInputFromDamUi.cs (.../FillXmlInputFromDamUi.cs) (revision 1270) @@ -328,6 +328,8 @@ waternetOptions.PhreaticLineCreationMethod = ConversionHelper.ConvertToInputPhreaticLineCreationMethod(location.PLLineCreationMethod); waternetOptions.IntrusionVerticalWaterPressure = ConversionHelper.ConvertToInputIntrusionVerticalWaterPressure(location.IntrusionVerticalWaterPressure ?? IntrusionVerticalWaterPressureType.Standard); waternetOptions.PolderLevel = location.PolderLevel; + waternetOptions.PolderLevelLow = location.PolderLevelLow; + waternetOptions.PolderLevelLowSpecified = true; waternetOptions.DampingFactorPL3 = location.DampingFactorPL4; waternetOptions.DampingFactorPL4 = location.DampingFactorPL3; waternetOptions.PenetrationLength = location.PenetrationLength; Index: DamClients/DamUI/trunk/src/Dam/Data/DamEngineIo/FillDamUiFromXmlInput.cs =================================================================== diff -u -r1267 -r1270 --- DamClients/DamUI/trunk/src/Dam/Data/DamEngineIo/FillDamUiFromXmlInput.cs (.../FillDamUiFromXmlInput.cs) (revision 1267) +++ DamClients/DamUI/trunk/src/Dam/Data/DamEngineIo/FillDamUiFromXmlInput.cs (.../FillDamUiFromXmlInput.cs) (revision 1270) @@ -273,6 +273,8 @@ location.PLLineCreationMethod = ConversionHelper.ConvertToPhreaticLineCreationMethod(waternetOptions.PhreaticLineCreationMethod); location.IntrusionVerticalWaterPressure = ConversionHelper.ConvertToIntrusionVerticalWaterPressure(waternetOptions.IntrusionVerticalWaterPressure); location.PolderLevel = waternetOptions.PolderLevel; + location.PolderLevelLow = waternetOptions.PolderLevelLow; + // waternetOptions.PolderLevelLowSpecified is not used because the value is not a nullable location.DampingFactorPL4 = waternetOptions.DampingFactorPL3; location.DampingFactorPL3 = waternetOptions.DampingFactorPL4; location.PenetrationLength = waternetOptions.PenetrationLength; @@ -302,16 +304,18 @@ // Regional settings location.DikeTableHeight = inputLocation.DikeTableHeight; var assesmentRegionalOptions = inputLocation.AssesmentRegionalOptions; - location.BoezemLevelHbp = assesmentRegionalOptions.BoezemLevelHbp; - location.BoezemLevelLbp = assesmentRegionalOptions.BoezemLevelLbp; - location.BoezemLevelTp = assesmentRegionalOptions.BoezemLevelTp; - location.RwBankProtectionBottomLevel = assesmentRegionalOptions.RegionalBankProtectionBottomLevel; - location.DredgingDepth = assesmentRegionalOptions.DredgingDepth; - location.DetrimentFactor = assesmentRegionalOptions.DetrimentFactor; - location.DikeMaterialType = assesmentRegionalOptions.DikeSoilTypeSpecified ? - ConversionHelper.ConvertToSoilType(assesmentRegionalOptions.DikeSoilType) : - SoilType.Clay; - + if (assesmentRegionalOptions != null) + { + location.BoezemLevelHbp = assesmentRegionalOptions.BoezemLevelHbp; + location.BoezemLevelLbp = assesmentRegionalOptions.BoezemLevelLbp; + location.BoezemLevelTp = assesmentRegionalOptions.BoezemLevelTp; + location.RwBankProtectionBottomLevel = assesmentRegionalOptions.RegionalBankProtectionBottomLevel; + location.DredgingDepth = assesmentRegionalOptions.DredgingDepth; + location.DetrimentFactor = assesmentRegionalOptions.DetrimentFactor; + location.DikeMaterialType = assesmentRegionalOptions.DikeSoilTypeSpecified ? + ConversionHelper.ConvertToSoilType(assesmentRegionalOptions.DikeSoilType) : + SoilType.Clay; + } SurfaceLine2 surfaceLine = dikeSurfaceLines.First(n => n.Name.Equals(inputLocation.SurfaceLineName)); location.LocalXZSurfaceLine2 = surfaceLine; Index: DamClients/DamUI/trunk/src/Dam/Tests/DamEngineIo/FillXmlInputFromDamUiTests.cs =================================================================== diff -u -r1267 -r1270 --- DamClients/DamUI/trunk/src/Dam/Tests/DamEngineIo/FillXmlInputFromDamUiTests.cs (.../FillXmlInputFromDamUiTests.cs) (revision 1267) +++ DamClients/DamUI/trunk/src/Dam/Tests/DamEngineIo/FillXmlInputFromDamUiTests.cs (.../FillXmlInputFromDamUiTests.cs) (revision 1270) @@ -191,6 +191,7 @@ location.PLLineCreationMethod = (PLLineCreationMethod) i; location.IntrusionVerticalWaterPressure = (IntrusionVerticalWaterPressureType) i; location.PolderLevel = 1.0 * i + 0.11; + location.PolderLevelLow = 1.0 * i + 0.09; location.DampingFactorPL4 = 1.0 * i + 0.12; location.DampingFactorPL3 = 1.0 * i + 0.13; location.PenetrationLength = 1.0 * i + 0.14; Index: DamEngine/trunk/src/Deltares.DamEngine.Interface/ConversionHelper.cs =================================================================== diff -u -r1227 -r1270 --- DamEngine/trunk/src/Deltares.DamEngine.Interface/ConversionHelper.cs (.../ConversionHelper.cs) (revision 1227) +++ DamEngine/trunk/src/Deltares.DamEngine.Interface/ConversionHelper.cs (.../ConversionHelper.cs) (revision 1270) @@ -620,7 +620,6 @@ return translationTable[validationResultMessageType]; } - /// /// The input grid type automatic /// @@ -669,7 +668,6 @@ return translationTable[shearStrengthModel]; } - /// /// Converts to grid determination. ///