Index: DamEngine/trunk/src/Deltares.DamEngine.Data/Design/DesignScenario.cs =================================================================== diff -u -r2113 -r2463 --- DamEngine/trunk/src/Deltares.DamEngine.Data/Design/DesignScenario.cs (.../DesignScenario.cs) (revision 2113) +++ DamEngine/trunk/src/Deltares.DamEngine.Data/Design/DesignScenario.cs (.../DesignScenario.cs) (revision 2463) @@ -57,9 +57,7 @@ private double? plLineOffsetFactorBelowShoulderCrest; private double? headPl3; private double? headPl4; - private double? waterHeightDecimeringsHoogte; - private double? maxWaterLevel; - + public CalculationResult CalculationResult { get { return calculationResult; } @@ -421,42 +419,6 @@ } /// - /// Gets or sets the water height decimerings hoogte. - /// - /// - /// The water height decimerings hoogte. - /// - public double? WaterHeightDecimeringsHoogte - { - get - { - return waterHeightDecimeringsHoogte; - } - set - { - waterHeightDecimeringsHoogte = value; - } - } - - /// - /// Gets or sets the maximum water level. - /// - /// - /// The maximum water level. - /// - public double? MaxWaterLevel - { - get - { - return maxWaterLevel; - } - set - { - maxWaterLevel = value; - } - } - - /// /// Gets or sets the model factors. /// /// @@ -638,29 +600,25 @@ "DikeTableHeight={4} " + "SafetyFactorStabilityInnerSlope={5} " + "RequiredSafetyFactorStabilityOuterSlope={6} " + - "WaterHeightDecimeringsHoogte= {7} " + - "MaxWaterheight={8} " + - "PlLineOffsetBelowDikeTopAtRiver={9} " + - "PlLineOffsetBelowDikeToeAtPolder={10} " + - "PlLineOffsetBelowDikeTopAtPolder={11} " + - "PlLineOffsetBelowShoulderBaseInside={12} " + - "UsePlLineOffsetBelowDikeCrestMiddle {13} " + - "PlLineOffsetBelowDikeCrestMiddle {14} " + - "UsePlLineOffsetFactorBelowShoulderCrest {15} " + - "PlLineOffsetFactorBelowShoulderCrest {16} " + - "HeadPl3={17} " + - "HeadPl4={18}", + "PlLineOffsetBelowDikeTopAtRiver={7} " + + "PlLineOffsetBelowDikeToeAtPolder={8} " + + "PlLineOffsetBelowDikeTopAtPolder={9} " + + "PlLineOffsetBelowShoulderBaseInside={10} " + + "UsePlLineOffsetBelowDikeCrestMiddle {11} " + + "PlLineOffsetBelowDikeCrestMiddle {12} " + + "UsePlLineOffsetFactorBelowShoulderCrest {13} " + + "PlLineOffsetFactorBelowShoulderCrest {14} " + + "HeadPl3={15} " + + "HeadPl4={16}", Location.Name, LocationScenarioID, RiverLevel, RiverLevelLow.HasValue ? RiverLevelLow.ToString() : "?", DikeTableHeight.HasValue ? DikeTableHeight.ToString() : "?", ModelFactors.RequiredSafetyFactorStabilityInnerSlope.HasValue ? ModelFactors.RequiredSafetyFactorStabilityInnerSlope.ToString() : "?", ModelFactors.RequiredSafetyFactorStabilityOuterSlope.HasValue ? ModelFactors.RequiredSafetyFactorStabilityOuterSlope.ToString() : "?", - WaterHeightDecimeringsHoogte.HasValue ? WaterHeightDecimeringsHoogte.ToString() : "?", - MaxWaterLevel.HasValue ? MaxWaterLevel.ToString() : "?", PlLineOffsetBelowDikeTopAtRiver.HasValue ? PlLineOffsetBelowDikeToeAtPolder.ToString() : "?", - PlLineOffsetBelowDikeToeAtPolder.HasValue ? MaxWaterLevel.ToString() : "?", + PlLineOffsetBelowDikeToeAtPolder.HasValue ? PlLineOffsetBelowDikeToeAtPolder.ToString() : "?", PlLineOffsetBelowDikeTopAtPolder.HasValue ? PlLineOffsetBelowDikeTopAtPolder.ToString() : "?", PlLineOffsetBelowShoulderBaseInside.HasValue ? PlLineOffsetBelowShoulderBaseInside.ToString() : "?", UsePlLineOffsetBelowDikeCrestMiddle.HasValue ? UsePlLineOffsetBelowDikeCrestMiddle.ToString() : "?",