Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/Common/PlLinesHelper.cs =================================================================== diff -u -r2791 -r2799 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/Common/PlLinesHelper.cs (.../PlLinesHelper.cs) (revision 2791) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/Common/PlLinesHelper.cs (.../PlLinesHelper.cs) (revision 2799) @@ -116,9 +116,9 @@ WaterLevelRiverHigh = waterLevel, SurfaceLine = location.SurfaceLine, WaterLevelPolder = location.Scenarios[0].PolderLevel, - HeadInPlLine2 = location.HeadPl2, - HeadInPlLine3 = location.HeadPl3, - HeadInPlLine4 = location.HeadPl4, + HeadInPlLine2 = location.Scenarios[0].HeadPl2, + HeadInPlLine3 = location.Scenarios[0].HeadPl3, + HeadInPlLine4 = location.Scenarios[0].HeadPl4, ModelParametersForPlLines = location.ModelParametersForPlLines, SoilProfile = subSoilScenario.SoilProfile1D, SoilProfileType = subSoilScenario.SoilProfileType, @@ -165,9 +165,9 @@ WaterLevelRiverHigh = waterLevel, SurfaceLine = location.SurfaceLine, WaterLevelPolder = location.Scenarios[0].PolderLevel, - HeadInPlLine2 = location.HeadPl2, - HeadInPlLine3 = location.HeadPl3, - HeadInPlLine4 = location.HeadPl4, + HeadInPlLine2 = location.Scenarios[0].HeadPl2, + HeadInPlLine3 = location.Scenarios[0].HeadPl3, + HeadInPlLine4 = location.Scenarios[0].HeadPl4, ModelParametersForPlLines = location.ModelParametersForPlLines, SoilProfile = soilProfile, GaugePlLines = null, // TODO: Operational Index: DamEngine/trunk/src/Deltares.DamEngine.Interface/FillXmlInputFromDam.cs =================================================================== diff -u -r2791 -r2799 --- DamEngine/trunk/src/Deltares.DamEngine.Interface/FillXmlInputFromDam.cs (.../FillXmlInputFromDam.cs) (revision 2791) +++ DamEngine/trunk/src/Deltares.DamEngine.Interface/FillXmlInputFromDam.cs (.../FillXmlInputFromDam.cs) (revision 2799) @@ -499,8 +499,6 @@ 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; @@ -563,6 +561,8 @@ 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; Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/Sensors/SensorPLLineCreatorTest.cs =================================================================== diff -u -r2797 -r2799 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/Sensors/SensorPLLineCreatorTest.cs (.../SensorPLLineCreatorTest.cs) (revision 2797) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/Sensors/SensorPLLineCreatorTest.cs (.../SensorPLLineCreatorTest.cs) (revision 2799) @@ -94,6 +94,7 @@ { // setup var location = new Location("test"); + location.Scenarios.Add(new DesignScenario()); SensorLocation sensorLocation = new SensorFactory().CreateSensorLocation(location); var creator = SensorPlLineCreator.CreateInstance(sensorLocation, new Dictionary()); @@ -107,6 +108,7 @@ { // setup var location = new Location("test"); + location.Scenarios.Add(new DesignScenario()); SensorLocation sensorLocation = new SensorFactory().CreateSensorLocation(location); var creator = SensorPlLineCreator.CreateInstance(sensorLocation, new Dictionary()); Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamPipingBligh/DamPipingBlighKernelWrapperTests.cs =================================================================== diff -u -r2173 -r2799 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamPipingBligh/DamPipingBlighKernelWrapperTests.cs (.../DamPipingBlighKernelWrapperTests.cs) (revision 2173) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamPipingBligh/DamPipingBlighKernelWrapperTests.cs (.../DamPipingBlighKernelWrapperTests.cs) (revision 2799) @@ -57,7 +57,7 @@ UpliftCriterionPiping = 1.0 } }; - + location.Scenarios.Add(new DesignScenario()); var damFailureMechanismeCalculationSpecification = new DamFailureMechanismeCalculationSpecification() { FailureMechanismSystemType = FailureMechanismSystemType.Piping, @@ -130,7 +130,7 @@ var location = new Location(); location.SurfaceLine = FactoryForSurfaceLines.CreateSurfaceLineTutorial1(); location.ModelFactors.UpliftCriterionPiping = 1.0; - + location.Scenarios.Add(new DesignScenario()); var subSoilScenario = new SoilGeometryProbability(); subSoilScenario.SoilProfile1D = FactoryForSoilProfiles.CreateClaySandProfileForPipingBligh(); subSoilScenario.SegmentFailureMechanismType = SegmentFailureMechanismType.Piping; Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/Rechter Diezedijk_BlighInputFile.xml =================================================================== diff -u -r2176 -r2799 --- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/Rechter Diezedijk_BlighInputFile.xml (.../Rechter Diezedijk_BlighInputFile.xml) (revision 2176) +++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/Rechter Diezedijk_BlighInputFile.xml (.../Rechter Diezedijk_BlighInputFile.xml) (revision 2799) @@ -1,612 +1,612 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + Index: DamEngine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlInput.cs =================================================================== diff -u -r2791 -r2799 --- DamEngine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlInput.cs (.../FillDamFromXmlInput.cs) (revision 2791) +++ DamEngine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlInput.cs (.../FillDamFromXmlInput.cs) (revision 2799) @@ -503,7 +503,6 @@ location.ModelParametersForPlLines.DampingFactorPl3 = waternetOptions.DampingFactorPl3; location.ModelParametersForPlLines.DampingFactorPl4 = waternetOptions.DampingFactorPl4; location.ModelParametersForPlLines.PenetrationLength = waternetOptions.PenetrationLength; - location.HeadPl2 = (waternetOptions.HeadPl2Specified ? (double?)waternetOptions.HeadPl2 : null); location.DikeSoilScenario = ConversionHelper.ConvertToDikeSoilScenario(waternetOptions.DikeSoilScenario); location.SlopeDampingPiezometricHeightPolderSide = waternetOptions.SlopeDampingFactor; @@ -569,6 +568,7 @@ designScenario.PlLineOffsetBelowDikeCrestMiddle = inputLocationDesignScenario.PlLineOffsetBelowDikeCrestMiddle; designScenario.UsePlLineOffsetFactorBelowShoulderCrest = inputLocationDesignScenario.PlLineOffsetFactorBelowShoulderCrestSpecified; designScenario.PlLineOffsetFactorBelowShoulderCrest = inputLocationDesignScenario.PlLineOffsetFactorBelowShoulderCrest; + designScenario.HeadPl2 = (inputLocationDesignScenario.HeadPl2Specified ? (double?)inputLocationDesignScenario.HeadPl2 : null); designScenario.HeadPl3 = (inputLocationDesignScenario.HeadPl3Specified ? (double?)inputLocationDesignScenario.HeadPl3 : null); designScenario.HeadPl4 = (inputLocationDesignScenario.HeadPl4Specified ? (double?)inputLocationDesignScenario.HeadPl4 : null); designScenario.UpliftCriterionStability = inputLocationDesignScenario.UpliftCriterionStability; Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/Common/PlLinesHelperTests.cs =================================================================== diff -u -r2111 -r2799 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/Common/PlLinesHelperTests.cs (.../PlLinesHelperTests.cs) (revision 2111) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/Common/PlLinesHelperTests.cs (.../PlLinesHelperTests.cs) (revision 2799) @@ -20,6 +20,7 @@ // All rights reserved. using Deltares.DamEngine.Calculators.KernelWrappers.Common; +using Deltares.DamEngine.Data.Design; using Deltares.DamEngine.Data.General; using Deltares.DamEngine.Data.General.PlLines; using Deltares.DamEngine.Data.Geotechnics; @@ -37,6 +38,7 @@ // expected values retrieved from debugging Dam Classic (rev.663) // test CanCalculateThePipingFactorUsingSellmeijer4Forces var location = new Location(); + location.Scenarios.Add(new DesignScenario()); location.SurfaceLine = FactoryForSurfaceLines.CreateSurfaceLineTutorial1(); var soilProfile1D = FactoryForSoilProfiles.CreatePipingSellmeijerProfileWithOneSandlayer(); var riverLevel = 1.0; @@ -67,6 +69,7 @@ // Same as TestCreatePlLinesNoHydraulicShortcut because HeadInPlLine3 is not given. var location = new Location(); + location.Scenarios.Add(new DesignScenario()); location.SurfaceLine = FactoryForSurfaceLines.CreateSurfaceLineTutorial1(); var soilProfile1D = FactoryForSoilProfiles.CreatePipingSellmeijerProfileWithOneSandlayer(); var riverLevel = 1.0; @@ -100,12 +103,14 @@ // in between aquifer so Head (1.0) is used instead of riverlevel. // PL2 and PL4 now generated at riverlevel. var location = new Location(); + var scenario = new DesignScenario {HeadPl3 = 1.0}; + location.Scenarios.Add(scenario); location.SurfaceLine = FactoryForSurfaceLines.CreateSurfaceLineTutorial1(); var soilProfile1D = FactoryForSoilProfiles.CreatePipingSellmeijerProfileWithOneSandlayer(); AddLayerToSoilProfile(soilProfile1D, -4, false); AddLayerToSoilProfile(soilProfile1D, -5, true); var riverLevel = 0.5; - location.HeadPl3 = 1.0; + UpliftSituation upliftSituation; var plLines = PlLinesHelper.CreatePlLinesForPiping(location, soilProfile1D, riverLevel, out upliftSituation); Assert.AreEqual(4, plLines.PlLineCount); Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/Rechter Diezedijk_BlighDesignInputFile.xml =================================================================== diff -u -r2174 -r2799 --- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/Rechter Diezedijk_BlighDesignInputFile.xml (.../Rechter Diezedijk_BlighDesignInputFile.xml) (revision 2174) +++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/Rechter Diezedijk_BlighDesignInputFile.xml (.../Rechter Diezedijk_BlighDesignInputFile.xml) (revision 2799) @@ -4,45 +4,45 @@ - + - + - + - + - + - + - + - + - + - + Index: DamEngine/trunk/src/Deltares.DamEngine.TestHelpers/Factories/FactoryForDamProjectData.cs =================================================================== diff -u -r2791 -r2799 --- DamEngine/trunk/src/Deltares.DamEngine.TestHelpers/Factories/FactoryForDamProjectData.cs (.../FactoryForDamProjectData.cs) (revision 2791) +++ DamEngine/trunk/src/Deltares.DamEngine.TestHelpers/Factories/FactoryForDamProjectData.cs (.../FactoryForDamProjectData.cs) (revision 2799) @@ -348,12 +348,10 @@ location.ModelParametersForPlLines.PlLineCreationMethod = (PlLineCreationMethod)i; location.IntrusionVerticalWaterPressure = (IntrusionVerticalWaterPressureType)i; location.DistanceToEntryPoint = 1.2 * i + 0.56; - location.Scenarios[0].PolderLevel = 1.0 * i + 0.11; location.ModelParametersForPlLines.DampingFactorPl4 = 1.0 * i + 0.12; location.ModelParametersForPlLines.DampingFactorPl3 = 1.0 * i + 0.13; location.ModelParametersForPlLines.PenetrationLength = 1.0 * i + 0.14; location.SlopeDampingPiezometricHeightPolderSide = 1.0 * i + 0.19; - location.HeadPl2 = 1.0 * i + 0.28; location.DikeSoilScenario = (DikeSoilScenario)i; location.SurfaceLine = dike.SurfaceLines2[i]; @@ -362,6 +360,7 @@ { var designScenario = FillDesignScenario(i, j); designScenario.Location = location; + designScenario.PolderLevel = 1.0 * i + 0.11; location.Scenarios.Add(designScenario); } location.DikeEmbankmentMaterial = "DikeMat"; @@ -460,6 +459,8 @@ designScenario.UsePlLineOffsetBelowDikeCrestMiddle = true; designScenario.PlLineOffsetFactorBelowShoulderCrest = 1.0 * factor + 0.59; designScenario.UsePlLineOffsetFactorBelowShoulderCrest = true; + designScenario.PolderLevel = 1.0 * factor + 1.24; + designScenario.HeadPl2 = 1.0 * factor + 0.28; designScenario.HeadPl3 = 1.0 * factor + 0.60; designScenario.HeadPl4 = 1.0 * factor + 0.61; designScenario.UpliftCriterionStability = 1.0 * factor + 0.62; Index: DamEngine/trunk/src/Deltares.DamEngine.Io/DamInput.cs =================================================================== diff -u -r2791 -r2799 --- DamEngine/trunk/src/Deltares.DamEngine.Io/DamInput.cs (.../DamInput.cs) (revision 2791) +++ DamEngine/trunk/src/Deltares.DamEngine.Io/DamInput.cs (.../DamInput.cs) (revision 2799) @@ -3198,10 +3198,6 @@ private LocationWaternetOptionsPhreaticLineCreationMethod phreaticLineCreationMethodField; - private double headPl2Field; - - private bool headPl2FieldSpecified; - private double dampingFactorPl3Field; private double dampingFactorPl4Field; @@ -3227,28 +3223,6 @@ /// [System.Xml.Serialization.XmlAttributeAttribute()] - public double HeadPl2 { - get { - return this.headPl2Field; - } - set { - this.headPl2Field = value; - } - } - - /// - [System.Xml.Serialization.XmlIgnoreAttribute()] - public bool HeadPl2Specified { - get { - return this.headPl2FieldSpecified; - } - set { - this.headPl2FieldSpecified = value; - } - } - - /// - [System.Xml.Serialization.XmlAttributeAttribute()] public double DampingFactorPl3 { get { return this.dampingFactorPl3Field; @@ -3533,6 +3507,10 @@ private double polderLevelField; + private double headPl2Field; + + private bool headPl2FieldSpecified; + /// [System.Xml.Serialization.XmlAttributeAttribute()] public string Id { @@ -3796,6 +3774,28 @@ this.polderLevelField = value; } } + + /// + [System.Xml.Serialization.XmlAttributeAttribute()] + public double HeadPl2 { + get { + return this.headPl2Field; + } + set { + this.headPl2Field = value; + } + } + + /// + [System.Xml.Serialization.XmlIgnoreAttribute()] + public bool HeadPl2Specified { + get { + return this.headPl2FieldSpecified; + } + set { + this.headPl2FieldSpecified = value; + } + } } /// Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/WtiPipingSellmeijerRevised/WtiPipingSellmeijerRevisedKernelWrapperTests.cs =================================================================== diff -u -r2406 -r2799 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/WtiPipingSellmeijerRevised/WtiPipingSellmeijerRevisedKernelWrapperTests.cs (.../WtiPipingSellmeijerRevisedKernelWrapperTests.cs) (revision 2406) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/WtiPipingSellmeijerRevised/WtiPipingSellmeijerRevisedKernelWrapperTests.cs (.../WtiPipingSellmeijerRevisedKernelWrapperTests.cs) (revision 2799) @@ -65,13 +65,13 @@ DampingFactorPl4 = 0.10 } }; - + var designScenario = new DesignScenario { LocationScenarioID = "1", Location = location, }; - + location.Scenarios.Add(designScenario); var subSoilScenario = new SoilGeometryProbability { SoilProfile1D = FactoryForSoilProfiles.CreatePipingSellmeijerProfileWithOneSandlayer(), @@ -176,7 +176,7 @@ DampingFactorPl4 = 0.10 } }; - + location.Scenarios.Add(new DesignScenario()); var subSoilScenario = new SoilGeometryProbability { SoilProfile1D = FactoryForSoilProfiles.CreatePipingSellmeijerProfileWithOneSandlayer(), Index: DamEngine/trunk/src/Deltares.DamEngine.Data/General/Sensors/SensorLocation.cs =================================================================== diff -u -r2791 -r2799 --- DamEngine/trunk/src/Deltares.DamEngine.Data/General/Sensors/SensorLocation.cs (.../SensorLocation.cs) (revision 2791) +++ DamEngine/trunk/src/Deltares.DamEngine.Data/General/Sensors/SensorLocation.cs (.../SensorLocation.cs) (revision 2799) @@ -250,7 +250,7 @@ /// public double PolderLevel { - get { return Location.Scenarios.First().PolderLevel; } + get { return Location.Scenarios[0].PolderLevel; } } /// @@ -261,12 +261,12 @@ /// public double? HeadPl3 { - get { return Location.HeadPl3; } + get { return Location.Scenarios[0].HeadPl3; } } public double? HeadPl4 { - get { return Location.HeadPl4; } + get { return Location.Scenarios[0].HeadPl4; } } /// @@ -440,7 +440,7 @@ if (memberName == MemberNames.Pl3) { if (SourceTypePl3 == DataSourceTypeSensors.LocationData) - return Location.HeadPl3; + return Location.Scenarios[0].HeadPl3; if (SourceTypePl3 == DataSourceTypeSensors.Sensor) return sensorValues[sensor]; @@ -449,7 +449,7 @@ if (memberName == MemberNames.Pl4) { if (SourceTypePl4 == DataSourceTypeSensors.LocationData) - return Location.HeadPl4; + return Location.Scenarios[0].HeadPl4; if (SourceTypePl4 == DataSourceTypeSensors.Sensor) return sensorValues[sensor]; Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamPipingSellmeijer4Forces/DamPipingSellmeijer4ForcesKernelWrapperTests.cs =================================================================== diff -u -r2173 -r2799 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamPipingSellmeijer4Forces/DamPipingSellmeijer4ForcesKernelWrapperTests.cs (.../DamPipingSellmeijer4ForcesKernelWrapperTests.cs) (revision 2173) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamPipingSellmeijer4Forces/DamPipingSellmeijer4ForcesKernelWrapperTests.cs (.../DamPipingSellmeijer4ForcesKernelWrapperTests.cs) (revision 2799) @@ -57,7 +57,7 @@ UpliftCriterionPiping = 1.0 } }; - + location.Scenarios.Add(new DesignScenario()); var designScenario = new DesignScenario { LocationScenarioID = "1", @@ -134,7 +134,7 @@ UpliftCriterionPiping = 1.0 } }; - + location.Scenarios.Add(new DesignScenario()); var subSoilScenario = new SoilGeometryProbability(); subSoilScenario.SoilProfile1D = FactoryForSoilProfiles.CreatePipingSellmeijerProfileWithOneSandlayer(); subSoilScenario.SegmentFailureMechanismType = SegmentFailureMechanismType.Piping; Index: DamEngine/trunk/src/Deltares.DamEngine.Data/Design/DesignScenario.cs =================================================================== diff -u -r2791 -r2799 --- DamEngine/trunk/src/Deltares.DamEngine.Data/Design/DesignScenario.cs (.../DesignScenario.cs) (revision 2791) +++ DamEngine/trunk/src/Deltares.DamEngine.Data/Design/DesignScenario.cs (.../DesignScenario.cs) (revision 2799) @@ -55,6 +55,7 @@ private double? plLineOffsetBelowDikeCrestMiddle; private bool? usePlLineOffsetFactorBelowShoulderCrest; private double? plLineOffsetFactorBelowShoulderCrest; + private double? headPl2; private double? headPl3; private double? headPl4; @@ -118,7 +119,6 @@ /// public double PolderLevel { get; set; } - [Browsable(false)] public StringCollection Errors { get; private set; } @@ -391,7 +391,26 @@ } } + /// + /// Gets or sets the head PL2. + /// + /// + /// The head PL2. + /// + public virtual double? HeadPl2 + { + get + { + return headPl2; + } + set + { + headPl2 = value; + } + } + + /// /// Gets or sets the head PL3. /// /// @@ -617,8 +636,11 @@ "PlLineOffsetBelowDikeCrestMiddle {12} " + "UsePlLineOffsetFactorBelowShoulderCrest {13} " + "PlLineOffsetFactorBelowShoulderCrest {14} " + - "HeadPl3={15} " + - "HeadPl4={16}", + "HeadPl2={15} " + + "HeadPl3={16} " + + "HeadPl4={17} " + + "PolderLevel={18} ", + Location.Name, LocationScenarioID, RiverLevel, @@ -634,8 +656,10 @@ PlLineOffsetBelowDikeCrestMiddle.HasValue ? PlLineOffsetBelowDikeCrestMiddle.ToString() : "?", UsePlLineOffsetFactorBelowShoulderCrest.HasValue ? UsePlLineOffsetFactorBelowShoulderCrest.ToString() : "?", PlLineOffsetFactorBelowShoulderCrest.HasValue ? PlLineOffsetFactorBelowShoulderCrest.ToString() : "?", + HeadPl2.HasValue ? HeadPl2.ToString() : "?", HeadPl3.HasValue ? HeadPl3.ToString() : "?", - HeadPl4.HasValue ? HeadPl4.ToString() : "?"); + HeadPl4.HasValue ? HeadPl4.ToString() : "?", + PolderLevel); } } } Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/Sensors/SensorLocationTests.cs =================================================================== diff -u -r2791 -r2799 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/Sensors/SensorLocationTests.cs (.../SensorLocationTests.cs) (revision 2791) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/Sensors/SensorLocationTests.cs (.../SensorLocationTests.cs) (revision 2799) @@ -37,6 +37,7 @@ [TestFixtureSetUp] public void FixtureSetup() { + location.Scenarios.Add(new DesignScenario()); } [TestFixtureTearDown] @@ -418,7 +419,7 @@ var sensorValues = new Dictionary { { sensor, testValue } }; var sensorLocation = CreateValidSensorLocation(); - location.HeadPl3 = testValue; + location.Scenarios[0].HeadPl3 = testValue; sensorLocation.SourceTypePl3 = DataSourceTypeSensors.LocationData; // call @@ -473,7 +474,7 @@ var sensorValues = new Dictionary { { sensor, testValue } }; var sensorLocation = CreateValidSensorLocation(); - location.HeadPl4 = testValue; + location.Scenarios[0].HeadPl4 = testValue; sensorLocation.SourceTypePl4 = DataSourceTypeSensors.LocationData; // call Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/DikesDesign/DesignCalculator.cs =================================================================== diff -u -r2791 -r2799 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators/DikesDesign/DesignCalculator.cs (.../DesignCalculator.cs) (revision 2791) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/DikesDesign/DesignCalculator.cs (.../DesignCalculator.cs) (revision 2799) @@ -341,15 +341,7 @@ { location.UsePlLineOffsetFactorBelowShoulderCrest = designScenario.UsePlLineOffsetFactorBelowShoulderCrest; } - if (designScenario.HeadPl3.HasValue) - { - location.HeadPl3 = designScenario.HeadPl3.Value; - } - if (designScenario.HeadPl4.HasValue) - { - location.HeadPl4 = designScenario.HeadPl4.Value; - } - + // Synchronize piping design parameters location.UpliftCriterionPiping = designScenario.UpliftCriterionPiping; location.ModelFactors.RequiredSafetyFactorPiping = designScenario.RequiredSafetyFactorPiping; Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/Rechter Diezedijk_BlighDesignInputFile_1Location.xml =================================================================== diff -u -r2176 -r2799 --- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/Rechter Diezedijk_BlighDesignInputFile_1Location.xml (.../Rechter Diezedijk_BlighDesignInputFile_1Location.xml) (revision 2176) +++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/Rechter Diezedijk_BlighDesignInputFile_1Location.xml (.../Rechter Diezedijk_BlighDesignInputFile_1Location.xml) (revision 2799) @@ -4,9 +4,9 @@ - + - + Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamPipingSellmeijerVnk/DamPipingSellmeijerVnkKernelWrapperTests.cs =================================================================== diff -u -r2173 -r2799 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamPipingSellmeijerVnk/DamPipingSellmeijerVnkKernelWrapperTests.cs (.../DamPipingSellmeijerVnkKernelWrapperTests.cs) (revision 2173) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamPipingSellmeijerVnk/DamPipingSellmeijerVnkKernelWrapperTests.cs (.../DamPipingSellmeijerVnkKernelWrapperTests.cs) (revision 2799) @@ -76,7 +76,7 @@ UpliftCriterionPiping = 1.0 } }; - + location.Scenarios.Add(new DesignScenario()); var designScenario = new DesignScenario { LocationScenarioID = "1", @@ -161,6 +161,7 @@ UpliftCriterionPiping = 1.0 } }; + location.Scenarios.Add(new DesignScenario()); var subSoilScenario = new SoilGeometryProbability(); subSoilScenario.SoilProfile1D = FactoryForSoilProfiles.CreatePipingSellmeijerProfileWithTwoSandlayers(); Index: DamEngine/trunk/src/Deltares.DamEngine.Data/General/Location.cs =================================================================== diff -u -r2791 -r2799 --- DamEngine/trunk/src/Deltares.DamEngine.Data/General/Location.cs (.../Location.cs) (revision 2791) +++ DamEngine/trunk/src/Deltares.DamEngine.Data/General/Location.cs (.../Location.cs) (revision 2799) @@ -981,60 +981,6 @@ public DikeSoilScenario DikeSoilScenario { get; set; } /// - /// Gets or sets the head pl 2. - /// - /// - /// The head pl 2. - /// - public virtual double? HeadPl2 - { - get - { - return headPl2; - } - set - { - headPl2 = value; - } - } - - /// - /// Gets or sets the head PL3. - /// - /// - /// The head PL3. - /// - public virtual double? HeadPl3 - { - get - { - return headPl3; - } - set - { - headPl3 = value; - } - } - - /// - /// Gets or sets the head PL4. - /// - /// - /// The head PL4. - /// - public virtual double? HeadPl4 - { - get - { - return headPl4; - } - set - { - headPl4 = value; - } - } - - /// /// Gets or sets the pl line offset below dike top at river. /// ///