Index: DamEngine/trunk/src/Deltares.DamEngine.Data/General/Location.cs =================================================================== diff -u -r2111 -r2113 --- DamEngine/trunk/src/Deltares.DamEngine.Data/General/Location.cs (.../Location.cs) (revision 2111) +++ DamEngine/trunk/src/Deltares.DamEngine.Data/General/Location.cs (.../Location.cs) (revision 2113) @@ -93,20 +93,13 @@ public class Location { // Added initial value as these properties must be tested for real values on import - private const double boezemLevelNotSetValue = -987654321.0; private static DamProjectType damProjectType = DamProjectType.Operational; private readonly List scenarios = new List(); - private double boezemLevelHbp = boezemLevelNotSetValue; - private double boezemLevelLbp = boezemLevelNotSetValue; - private double boezemLevelTp = boezemLevelNotSetValue; - + private ModelParametersForPlLines modelParametersForPlLines = new ModelParametersForPlLines(); private DamType damType = DamType.Primary; - private double detrimentFactor = 0.95; private string dikeEmbankmentMaterial = ""; - private SoilType dikeMaterialType = SoilType.Clay; private double dikeTableHeight; - private double dredgingDepth; private IList gaugePlLines = new List(); private IList gauges = new List(); @@ -116,8 +109,7 @@ // Start of parameters that are also defined in modelparameters private Pl1Line localXzpl1Line; - private GeometryPoint localXzSheetPilePoint; - + private StabilityOptions stabilityOptions; private ModelFactors modelFactors = new ModelFactors(); private string name = ""; @@ -139,11 +131,9 @@ private double polderLevelLow; private bool redesignDikeHeight = true; private bool redesignDikeShoulder = true; - private double rwBankProtectionBottomLevel; private double scenarioRiverLevel; private Segment segment; private SensorLocation sensorLocation; - private double sheetPileLength; private string shoulderEmbankmentMaterial = ""; private double slopeAdaptionEndCotangent = 6.0; private double slopeAdaptionStartCotangent = 3.0; @@ -276,24 +266,6 @@ } /// - /// Gets or sets the length of the sheet pile. - /// - /// - /// The length of the sheet pile. - /// - public virtual double SheetPileLength - { - get - { - return sheetPileLength; - } - set - { - sheetPileLength = value; - } - } - - /// /// Gets or sets the local XZPL1 line. /// /// @@ -319,24 +291,6 @@ public virtual SurfaceLine2 SurfaceLine { get; set; } /// - /// Gets or sets the local xz sheet pile point. - /// - /// - /// The local xz sheet pile point. - /// - public virtual GeometryPoint LocalXzSheetPilePoint - { - get - { - return localXzSheetPilePoint; - } - set - { - localXzSheetPilePoint = value; - } - } - - /// /// Gets or sets the Segment /// public virtual Segment Segment @@ -504,28 +458,6 @@ } /// - /// Gets a value indicating whether [uses gauges]. - /// - /// - /// true if [uses gauges]; otherwise, false. - /// - public bool UsesGauges - { - get - { - return GaugePlLines != null && GaugePlLines.Count > 0 && Gauges != null; - } - } - - /// - /// Gets or sets the gauge miss value. - /// - /// - /// The gauge miss value. - /// - public double GaugeMissVal { get; set; } - - /// /// Gets or sets a value indicating whether [redesign dike height]. /// /// @@ -1425,21 +1357,6 @@ { var factory = new SensorFactory(); SensorLocation = factory.CreateSensorLocation(this); - } - - /// - /// Creates an instance of model parameters for pl lines. - /// - /// - public ModelParametersForPlLines CreateModelParametersForPlLines() - { - return new ModelParametersForPlLines - { - PenetrationLength = ModelParametersForPlLines.PenetrationLength, - DampingFactorPl3 = ModelParametersForPlLines.DampingFactorPl3, - DampingFactorPl4 = ModelParametersForPlLines.DampingFactorPl4, - PlLineCreationMethod = ModelParametersForPlLines.PlLineCreationMethod - }; - } + } } } \ No newline at end of file