Index: DamEngine/trunk/src/Deltares.DamEngine.Data/General/Location.cs =================================================================== diff -u -r2100 -r2111 --- DamEngine/trunk/src/Deltares.DamEngine.Data/General/Location.cs (.../Location.cs) (revision 2100) +++ DamEngine/trunk/src/Deltares.DamEngine.Data/General/Location.cs (.../Location.cs) (revision 2111) @@ -47,7 +47,6 @@ /// public enum DamProjectType { - AssessmentRegional, Operational, Design } @@ -136,10 +135,6 @@ private double pLLineOffsetBelowDikeTopAtPolder = 1.5; private double pLLineOffsetBelowDikeTopAtRiver = 0.5; private double pLLineOffsetBelowShoulderBaseInside = 0.1; - private double pLLineOffsetDryBelowDikeToeAtPolder = 0.1; - private double pLLineOffsetDryBelowDikeTopAtPolder = 1.5; - private double pLLineOffsetDryBelowDikeTopAtRiver = 0.5; - private double pLLineOffsetDryBelowShoulderBaseInside = 0.1; private double polderLevel; private double polderLevelLow; private bool redesignDikeHeight = true; @@ -172,9 +167,7 @@ private double? plLineOffsetFactorBelowShoulderCrest; private double? plLineOffsetBelowDikeCrestMiddle; - private double? plLineOffsetDryFactorBelowShoulderCrest; - private double? plLineOffsetDryBelowDikeCrestMiddle; - + private IntrusionVerticalWaterPressureType? intrusionVerticalWaterPressure = IntrusionVerticalWaterPressureType.Standard; @@ -283,42 +276,6 @@ } /// - /// Gets or sets the dredging depth. - /// - /// - /// The dredging depth. - /// - public virtual double DredgingDepth - { - get - { - return dredgingDepth; - } - set - { - dredgingDepth = value; - } - } - - /// - /// Gets or sets the type of the dike material. - /// - /// - /// The type of the dike material. - /// - public virtual SoilType DikeMaterialType - { - get - { - return dikeMaterialType; - } - set - { - dikeMaterialType = value; - } - } - - /// /// Gets or sets the length of the sheet pile. /// /// @@ -337,24 +294,6 @@ } /// - /// Gets or sets the rw bank protection bottom level. - /// - /// - /// The rw bank protection bottom level. - /// - public virtual double RwBankProtectionBottomLevel - { - get - { - return rwBankProtectionBottomLevel; - } - set - { - rwBankProtectionBottomLevel = value; - } - } - - /// /// Gets or sets the local XZPL1 line. /// /// @@ -467,24 +406,6 @@ } /// - /// Gets or sets the detriment factor. - /// - /// - /// The detriment factor. - /// - public virtual double DetrimentFactor - { - get - { - return detrimentFactor; - } - set - { - detrimentFactor = value; - } - } - - /// /// Gets or sets the slope damping piezometric height polder side. /// /// @@ -1319,78 +1240,6 @@ } /// - /// Gets or sets the pl line offset dry below dike top at river. - /// - /// - /// The pl line offset dry below dike top at river. - /// - public virtual double PlLineOffsetDryBelowDikeTopAtRiver - { - get - { - return pLLineOffsetDryBelowDikeTopAtRiver; - } - set - { - pLLineOffsetDryBelowDikeTopAtRiver = value; - } - } - - /// - /// Gets or sets the pl line offset dry below dike top at polder. - /// - /// - /// The pl line offset dry below dike top at polder. - /// - public virtual double PlLineOffsetDryBelowDikeTopAtPolder - { - get - { - return pLLineOffsetDryBelowDikeTopAtPolder; - } - set - { - pLLineOffsetDryBelowDikeTopAtPolder = value; - } - } - - /// - /// Gets or sets the pl line offset dry below shoulder base inside. - /// - /// - /// The pl line offset dry below shoulder base inside. - /// - public virtual double PlLineOffsetDryBelowShoulderBaseInside - { - get - { - return pLLineOffsetDryBelowShoulderBaseInside; - } - set - { - pLLineOffsetDryBelowShoulderBaseInside = value; - } - } - - /// - /// Gets or sets the pl line offset dry below dike toe at polder. - /// - /// - /// The pl line offset dry below dike toe at polder. - /// - public virtual double PlLineOffsetDryBelowDikeToeAtPolder - { - get - { - return pLLineOffsetDryBelowDikeToeAtPolder; - } - set - { - pLLineOffsetDryBelowDikeToeAtPolder = value; - } - } - - /// /// Gets or sets the use pl line offset below dike crest middle. /// /// @@ -1437,52 +1286,6 @@ } /// - /// Gets or sets the use pl line offset dry below dike crest middle. - /// - /// - /// The use pl line offset dry below dike crest middle. - /// - public bool? UsePlLineOffsetDryBelowDikeCrestMiddle { get; set; } - - /// - /// Gets or sets the pl line offset dry below dike crest middle. - /// - /// - /// The pl line offset dry below dike crest middle. - /// - public double? PlLineOffsetDryBelowDikeCrestMiddle - { - get { return plLineOffsetDryBelowDikeCrestMiddle; } - set - { - plLineOffsetDryBelowDikeCrestMiddle = value; - } - } - - /// - /// Gets or sets the use pl line offset dry factor below shoulder crest. - /// - /// - /// The use pl line offset dry factor below shoulder crest. - /// - public bool? UsePlLineOffsetDryFactorBelowShoulderCrest { get; set; } - - /// - /// Gets or sets the pl line offset dry factor below shoulder crest. - /// - /// - /// The pl line offset dry factor below shoulder crest. - /// - public double? PlLineOffsetDryFactorBelowShoulderCrest - { - get { return plLineOffsetDryFactorBelowShoulderCrest; } - set - { - plLineOffsetDryFactorBelowShoulderCrest = value; - } - } - - /// /// Gets or sets the intrusion vertical water pressure. /// /// @@ -1501,60 +1304,6 @@ #region Waterlevels /// - /// Gets or sets the boezem level tp. - /// - /// - /// The boezem level tp. - /// - public virtual double BoezemLevelTp - { - get - { - return boezemLevelTp; - } - set - { - boezemLevelTp = value; - } - } - - /// - /// Gets or sets the boezem level HBP. - /// - /// - /// The boezem level HBP. - /// - public virtual double BoezemLevelHbp - { - get - { - return boezemLevelHbp; - } - set - { - boezemLevelHbp = value; - } - } - - /// - /// Gets or sets the boezem level LBP. - /// - /// - /// The boezem level LBP. - /// - public virtual double BoezemLevelLbp - { - get - { - return boezemLevelLbp; - } - set - { - boezemLevelLbp = value; - } - } - - /// /// Gets or sets the polder level. /// ///