Index: DamEngine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlInput.cs =================================================================== diff -u -r1117 -r1122 --- DamEngine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlInput.cs (.../FillDamFromXmlInput.cs) (revision 1117) +++ DamEngine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlInput.cs (.../FillDamFromXmlInput.cs) (revision 1122) @@ -340,12 +340,12 @@ if (inputLocation.XSoilGeometry2DOriginSpecified) location.XSoilGeometry2DOrigin = inputLocation.XSoilGeometry2DOrigin; // Waternet options var waternetOptions = inputLocation.WaternetOptions; - location.ModelParametersForPLLines.PlLineCreationMethod = ConversionHelper.ConvertToPhreaticLineCreationMethod(waternetOptions.PhreaticLineCreationMethod); + location.ModelParametersForPlLines.PlLineCreationMethod = ConversionHelper.ConvertToPhreaticLineCreationMethod(waternetOptions.PhreaticLineCreationMethod); location.IntrusionVerticalWaterPressure = ConversionHelper.ConvertToIntrusionVerticalWaterPressure(waternetOptions.IntrusionVerticalWaterPressure); location.PolderLevel = waternetOptions.PolderLevel; - location.ModelParametersForPLLines.DampingFactorPL4 = waternetOptions.DampingFactorPL3; - location.ModelParametersForPLLines.DampingFactorPL3 = waternetOptions.DampingFactorPL4; - location.ModelParametersForPLLines.PenetrationLength = waternetOptions.PenetrationLength; + location.ModelParametersForPlLines.DampingFactorPl4 = waternetOptions.DampingFactorPL3; + location.ModelParametersForPlLines.DampingFactorPl3 = waternetOptions.DampingFactorPL4; + location.ModelParametersForPlLines.PenetrationLength = waternetOptions.PenetrationLength; location.PlLineOffsetBelowDikeCrestMiddle = (waternetOptions.Pl1BelowCrestMiddleSpecified ? (double?)waternetOptions.Pl1BelowCrestMiddle : null); location.UsePlLineOffsetFactorBelowShoulderCrest = waternetOptions.Pl1FactorBelowShoulderCrestSpecified; location.PlLineOffsetFactorBelowShoulderCrest = waternetOptions.Pl1FactorBelowShoulderCrest; Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityCommon/Assemblers/DamMStabAssembler.cs =================================================================== diff -u -r1121 -r1122 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityCommon/Assemblers/DamMStabAssembler.cs (.../DamMStabAssembler.cs) (revision 1121) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityCommon/Assemblers/DamMStabAssembler.cs (.../DamMStabAssembler.cs) (revision 1122) @@ -608,13 +608,13 @@ new XAttribute(XmlAttributeMaterialForDike, materialForDike), new XAttribute(XmlAttributeMaterialForShoulder, materialForShoulder), new XAttribute(XmlAttributeIsUseOriginalPLLineAssignments, failureMechanismParametersMStab. - MStabParameters.GeometryCreationOptions.IsUseOriginalPLLineAssignments), + MStabParameters.GeometryCreationOptions.IsUseOriginalPlLineAssignments), new XAttribute(XmlAttributeIsUseOriginalCalculationOptions, failureMechanismParametersMStab. MStabParameters.GeometryCreationOptions.IsUseOriginalCalculationOptions), new XAttribute(XmlAttributeIsDrySituation, failureMechanismParametersMStab. MStabParameters.GeometryCreationOptions.IsDrySituation), new XAttribute(XmlAttributePLLineAssignment, failureMechanismParametersMStab. - MStabParameters.GeometryCreationOptions.PLLineAssignment), + MStabParameters.GeometryCreationOptions.PlLineAssignment), new XAttribute(XmlAttributeIntrusionVerticalWaterPressure, failureMechanismParametersMStab. MStabParameters.GeometryCreationOptions.IntrusionVerticalWaterPressureType), new XAttribute(XmlAttributePenetrationLength, failureMechanismParametersMStab. Index: DamEngine/trunk/src/Deltares.DamEngine.Data/General/Location.cs =================================================================== diff -u -r1121 -r1122 --- DamEngine/trunk/src/Deltares.DamEngine.Data/General/Location.cs (.../Location.cs) (revision 1121) +++ DamEngine/trunk/src/Deltares.DamEngine.Data/General/Location.cs (.../Location.cs) (revision 1122) @@ -51,7 +51,7 @@ private double boezemLevelLbp = BoezemLevelNotSetValue; private double boezemLevelTp = BoezemLevelNotSetValue; - private ModelParametersForPlLines modelParametersForPLLines = new ModelParametersForPlLines(); + private ModelParametersForPlLines modelParametersForPlLines = new ModelParametersForPlLines(); private DamType damType = DamType.Primary; private string description = ""; private double detrimentFactor = 0.95; @@ -60,12 +60,12 @@ private double dikeTableHeight = 0.0; private double dredgingDepth = 0; - private IList gaugePLLines = new List(); + private IList gaugePlLines = new List(); private IList gauges = new List(); private double? headPL2 = null; private double? headPL3 = null; private double? headPL4 = null; - private bool isUseOriginalPLLineAssignments = false; + private bool isUseOriginalPlLineAssignments = false; private double layerHeightDeviation = 0; private DistributionType layerHeightDistribution = 0; // Start of parameters that are also defined in modelparameters @@ -354,15 +354,15 @@ } } - public virtual bool IsUseOriginalPLLineAssignments + public virtual bool IsUseOriginalPlLineAssignments { get { - return isUseOriginalPLLineAssignments; + return isUseOriginalPlLineAssignments; } set { - isUseOriginalPLLineAssignments = value; + isUseOriginalPlLineAssignments = value; } } @@ -585,23 +585,23 @@ } } - public virtual IList GaugePLLines + public virtual IList GaugePlLines { get { - return gaugePLLines; + return gaugePlLines; } set { - gaugePLLines = value; + gaugePlLines = value; } } public bool UsesGauges { get { - return GaugePLLines != null && GaugePLLines.Count > 0 && Gauges != null; + return GaugePlLines != null && GaugePlLines.Count > 0 && Gauges != null; } } @@ -1087,7 +1087,7 @@ [Validate] public ValidationResult[] ValidateLocationUseOfPenetrationLength() { - if (modelParametersForPLLines.PenetrationLength > 0) + if (modelParametersForPlLines.PenetrationLength > 0) { // It may be used on 1D geometries if (!String.IsNullOrEmpty(this.Segment.GetMostProbableGeometry2DName(FailureMechanismSystemType.StabilityInside))) @@ -1340,7 +1340,7 @@ #endregion - #region PLLine creation parameters + #region PlLine creation parameters /// /// Gets or sets the head pl 2. @@ -1474,7 +1474,7 @@ /// /// The pl line offset dry below dike top at river. /// - public virtual double PLLineOffsetDryBelowDikeTopAtRiver + public virtual double PlLineOffsetDryBelowDikeTopAtRiver { get { @@ -1492,7 +1492,7 @@ /// /// The pl line offset dry below dike top at polder. /// - public virtual double PLLineOffsetDryBelowDikeTopAtPolder + public virtual double PlLineOffsetDryBelowDikeTopAtPolder { get { @@ -1510,7 +1510,7 @@ /// /// The pl line offset dry below shoulder base inside. /// - public virtual double PLLineOffsetDryBelowShoulderBaseInside + public virtual double PlLineOffsetDryBelowShoulderBaseInside { get { @@ -1528,7 +1528,7 @@ /// /// The pl line offset dry below dike toe at polder. /// - public virtual double PLLineOffsetDryBelowDikeToeAtPolder + public virtual double PlLineOffsetDryBelowDikeToeAtPolder { get { @@ -1885,15 +1885,15 @@ } } - public ModelParametersForPlLines ModelParametersForPLLines + public ModelParametersForPlLines ModelParametersForPlLines { get { - return modelParametersForPLLines; + return modelParametersForPlLines; } set { - modelParametersForPLLines = value; + modelParametersForPlLines = value; } } @@ -1907,9 +1907,9 @@ private bool ArePlLineCreationExpertKnowledgeParametersNeeded() { - bool arePlLineCreationExpertKnowledgeParametersNeeded = modelParametersForPLLines.PlLineCreationMethod == + bool arePlLineCreationExpertKnowledgeParametersNeeded = modelParametersForPlLines.PlLineCreationMethod == PlLineCreationMethod.ExpertKnowledgeRRD || - modelParametersForPLLines.PlLineCreationMethod == + modelParametersForPlLines.PlLineCreationMethod == PlLineCreationMethod.GaugesWithFallbackToExpertKnowledgeRRD; return arePlLineCreationExpertKnowledgeParametersNeeded; } Index: DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/FillDamFromXmlInputTests.cs =================================================================== diff -u -r1117 -r1122 --- DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/FillDamFromXmlInputTests.cs (.../FillDamFromXmlInputTests.cs) (revision 1117) +++ DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/FillDamFromXmlInputTests.cs (.../FillDamFromXmlInputTests.cs) (revision 1122) @@ -241,12 +241,12 @@ var location = new Data.General.Location(); location.Name = "Location " + (i + 1).ToString(); location.XSoilGeometry2DOrigin = 1.23; - location.ModelParametersForPLLines.PlLineCreationMethod = (PlLineCreationMethod) i; + location.ModelParametersForPlLines.PlLineCreationMethod = (PlLineCreationMethod) i; location.IntrusionVerticalWaterPressure = (IntrusionVerticalWaterPressureType) i; location.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.ModelParametersForPlLines.DampingFactorPl4 = 1.0 * i + 0.12; + location.ModelParametersForPlLines.DampingFactorPl3 = 1.0 * i + 0.13; + location.ModelParametersForPlLines.PenetrationLength = 1.0 * i + 0.14; location.PlLineOffsetBelowDikeCrestMiddle = 1.0 * i + 0.15; location.UsePlLineOffsetFactorBelowShoulderCrest = true; location.PlLineOffsetFactorBelowShoulderCrest = 1.0 * i + 0.16; Index: DamEngine/trunk/src/Deltares.DamEngine.Data/General/Sensors/SensorLocation.cs =================================================================== diff -u -r877 -r1122 --- DamEngine/trunk/src/Deltares.DamEngine.Data/General/Sensors/SensorLocation.cs (.../SensorLocation.cs) (revision 877) +++ DamEngine/trunk/src/Deltares.DamEngine.Data/General/Sensors/SensorLocation.cs (.../SensorLocation.cs) (revision 1122) @@ -68,40 +68,40 @@ public SensorLocation() { - PL1WaterLevelAtRiver = DataSourceTypeSensors.LocationData; - PL1WaterLevelAtPolder = DataSourceTypeSensors.LocationData; + Pl1WaterLevelAtRiver = DataSourceTypeSensors.LocationData; + Pl1WaterLevelAtPolder = DataSourceTypeSensors.LocationData; } private Group sensorGroup; /// /// Gets the PL line offset below dike top at river. /// - public double PLLineOffsetBelowDikeTopAtRiver + public double PlLineOffsetBelowDikeTopAtRiver { get { return Location.PlLineOffsetBelowDikeTopAtRiver; } } /// /// Gets the PL line offset below dike top at polder. /// - public double PLLineOffsetBelowDikeTopAtPolder + public double PlLineOffsetBelowDikeTopAtPolder { - get { return Location.PLLineOffsetDryBelowDikeTopAtPolder; } + get { return Location.PlLineOffsetDryBelowDikeTopAtPolder; } } /// /// Gets the PL line offset below dike toe at polder. /// - public double PLLineOffsetBelowDikeToeAtPolder + public double PlLineOffsetBelowDikeToeAtPolder { get { return Location.PlLineOffsetBelowDikeToeAtPolder; } } /// /// Gets the PL line offset dry below shoulder base inside. /// - public double PLLineOffsetDryBelowShoulderBaseInside + public double PlLineOffsetDryBelowShoulderBaseInside { get { return Location.PlLineOffsetBelowShoulderBaseInside; } } @@ -206,7 +206,7 @@ /// The outer water level. /// // [Specification(typeof(SensorOrLocationData))] - public DataSourceTypeSensors PL1WaterLevelAtRiver { get; set; } + public DataSourceTypeSensors Pl1WaterLevelAtRiver { get; set; } /// /// Gets or sets the PL1 PL line offset below dike top at river data source type. @@ -215,7 +215,7 @@ /// Data source type for PL1 PLLine offset below dike top at river. /// // [Specification(typeof(IgnoreOrLocationData))] - public DataSourceTypeSensors PL1PLLineOffsetBelowDikeTopAtRiver { get; set; } + public DataSourceTypeSensors Pl1PlLineOffsetBelowDikeTopAtRiver { get; set; } /// /// Gets or sets the PL1 PL line offset below dike top at polder data source type @@ -224,7 +224,7 @@ /// The PL1 PL line offset below dike top at polder. /// // [Specification(typeof(IgnoreOrLocationData))] - public DataSourceTypeSensors PL1PLLineOffsetBelowDikeTopAtPolder { get; set; } + public DataSourceTypeSensors Pl1PlLineOffsetBelowDikeTopAtPolder { get; set; } /// /// Gets or sets the PL1 PL line offset below shoulder base inside data source type @@ -233,7 +233,7 @@ /// The PL1 PL line offset below shoulder base inside. /// // [Specification(typeof(IgnoreOrLocationData))] - public DataSourceTypeSensors PL1PLLineOffsetBelowShoulderBaseInside { get; set; } + public DataSourceTypeSensors Pl1PlLineOffsetBelowShoulderBaseInside { get; set; } /// /// Gets or sets the PL1 PL line offset below dike toe at polder data source type. @@ -242,7 +242,7 @@ /// The PL1 PL line offset below dike toe at polder. /// //[Specification(typeof(IgnoreOrLocationData))] - public DataSourceTypeSensors PL1PLLineOffsetBelowDikeToeAtPolder { get; set; } + public DataSourceTypeSensors Pl1PlLineOffsetBelowDikeToeAtPolder { get; set; } /// /// Gets or sets the PL1 polder level data source type. @@ -251,7 +251,7 @@ /// The PL1 polder level. /// //[Specification(typeof(SensorOrLocationData))] - public DataSourceTypeSensors PL1WaterLevelAtPolder { get; set; } + public DataSourceTypeSensors Pl1WaterLevelAtPolder { get; set; } /// /// Gets the sensor count. @@ -360,12 +360,12 @@ internal static class MemberNames { - internal static readonly string OffsetBelowDikeToeAtPolder = StaticReflection.GetMemberName(x => x.PL1PLLineOffsetBelowDikeToeAtPolder); - internal static readonly string OffsetBelowDikeTopAtPolder = StaticReflection.GetMemberName(x => x.PL1PLLineOffsetBelowDikeTopAtPolder); - internal static readonly string OffsetBelowDikeTopAtRiver = StaticReflection.GetMemberName(x => x.PL1PLLineOffsetBelowDikeTopAtRiver); - internal static readonly string OffsetBelowShoulderBaseInside = StaticReflection.GetMemberName(x => x.PL1PLLineOffsetBelowShoulderBaseInside); - internal static readonly string WaterLevelAtRiver = StaticReflection.GetMemberName(x => x.PL1WaterLevelAtRiver); - internal static readonly string PolderLevel = StaticReflection.GetMemberName(x => x.PL1WaterLevelAtPolder); + internal static readonly string OffsetBelowDikeToeAtPolder = StaticReflection.GetMemberName(x => x.Pl1PlLineOffsetBelowDikeToeAtPolder); + internal static readonly string OffsetBelowDikeTopAtPolder = StaticReflection.GetMemberName(x => x.Pl1PlLineOffsetBelowDikeTopAtPolder); + internal static readonly string OffsetBelowDikeTopAtRiver = StaticReflection.GetMemberName(x => x.Pl1PlLineOffsetBelowDikeTopAtRiver); + internal static readonly string OffsetBelowShoulderBaseInside = StaticReflection.GetMemberName(x => x.Pl1PlLineOffsetBelowShoulderBaseInside); + internal static readonly string WaterLevelAtRiver = StaticReflection.GetMemberName(x => x.Pl1WaterLevelAtRiver); + internal static readonly string PolderLevel = StaticReflection.GetMemberName(x => x.Pl1WaterLevelAtPolder); internal static readonly string PL3 = StaticReflection.GetMemberName(x => x.PL3); internal static readonly string PL4 = StaticReflection.GetMemberName(x => x.PL4); } @@ -382,43 +382,43 @@ if (memberName == MemberNames.OffsetBelowDikeToeAtPolder) { - if (PL1PLLineOffsetBelowDikeToeAtPolder == DataSourceTypeSensors.LocationData) + if (Pl1PlLineOffsetBelowDikeToeAtPolder == DataSourceTypeSensors.LocationData) return Location.PlLineOffsetBelowDikeToeAtPolder; } if (memberName == MemberNames.OffsetBelowDikeTopAtPolder) { - if (PL1PLLineOffsetBelowDikeTopAtPolder == DataSourceTypeSensors.LocationData) + if (Pl1PlLineOffsetBelowDikeTopAtPolder == DataSourceTypeSensors.LocationData) return Location.PlLineOffsetBelowDikeTopAtPolder; } if (memberName == MemberNames.OffsetBelowDikeTopAtRiver) { - if (PL1PLLineOffsetBelowDikeTopAtRiver == DataSourceTypeSensors.LocationData) + if (Pl1PlLineOffsetBelowDikeTopAtRiver == DataSourceTypeSensors.LocationData) return Location.PlLineOffsetBelowDikeTopAtRiver; } if (memberName == MemberNames.OffsetBelowShoulderBaseInside) { - if (PL1PLLineOffsetBelowShoulderBaseInside == DataSourceTypeSensors.LocationData) + if (Pl1PlLineOffsetBelowShoulderBaseInside == DataSourceTypeSensors.LocationData) return Location.PlLineOffsetBelowShoulderBaseInside; } if (memberName == MemberNames.WaterLevelAtRiver) { - if (PL1WaterLevelAtRiver == DataSourceTypeSensors.LocationData) + if (Pl1WaterLevelAtRiver == DataSourceTypeSensors.LocationData) return Location.RiverLevel; - if (PL1WaterLevelAtRiver == DataSourceTypeSensors.Sensor) + if (Pl1WaterLevelAtRiver == DataSourceTypeSensors.Sensor) return sensorValues[sensor]; } if (memberName == MemberNames.PolderLevel) { - if (PL1WaterLevelAtPolder == DataSourceTypeSensors.LocationData) + if (Pl1WaterLevelAtPolder == DataSourceTypeSensors.LocationData) return Location.PolderLevel; - if (PL1WaterLevelAtPolder == DataSourceTypeSensors.Sensor) + if (Pl1WaterLevelAtPolder == DataSourceTypeSensors.Sensor) return sensorValues[sensor]; } Index: DamEngine/trunk/src/Deltares.DamEngine.Data/General/Sensors/SensorFactory.cs =================================================================== diff -u -r877 -r1122 --- DamEngine/trunk/src/Deltares.DamEngine.Data/General/Sensors/SensorFactory.cs (.../SensorFactory.cs) (revision 877) +++ DamEngine/trunk/src/Deltares.DamEngine.Data/General/Sensors/SensorFactory.cs (.../SensorFactory.cs) (revision 1122) @@ -49,12 +49,12 @@ { Group = group, Location = location, - PL1WaterLevelAtRiver = DataSourceTypeSensors.LocationData, - PL1PLLineOffsetBelowDikeToeAtPolder = DataSourceTypeSensors.LocationData, - PL1PLLineOffsetBelowDikeTopAtPolder = DataSourceTypeSensors.LocationData, - PL1PLLineOffsetBelowDikeTopAtRiver = DataSourceTypeSensors.LocationData, - PL1PLLineOffsetBelowShoulderBaseInside = DataSourceTypeSensors.LocationData, - PL1WaterLevelAtPolder = DataSourceTypeSensors.LocationData, + Pl1WaterLevelAtRiver = DataSourceTypeSensors.LocationData, + Pl1PlLineOffsetBelowDikeToeAtPolder = DataSourceTypeSensors.LocationData, + Pl1PlLineOffsetBelowDikeTopAtPolder = DataSourceTypeSensors.LocationData, + Pl1PlLineOffsetBelowDikeTopAtRiver = DataSourceTypeSensors.LocationData, + Pl1PlLineOffsetBelowShoulderBaseInside = DataSourceTypeSensors.LocationData, + Pl1WaterLevelAtPolder = DataSourceTypeSensors.LocationData, PL3 = DataSourceTypeSensors.LocationData, PL4 = DataSourceTypeSensors.LocationData }; Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/Common/PlLinesHelper.cs =================================================================== diff -u -r1117 -r1122 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/Common/PlLinesHelper.cs (.../PlLinesHelper.cs) (revision 1117) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/Common/PlLinesHelper.cs (.../PlLinesHelper.cs) (revision 1122) @@ -52,7 +52,7 @@ HeadInPlLine2 = location.HeadPl2, HeadInPlLine3 = location.HeadPl3, HeadInPlLine4 = location.HeadPl4, - ModelParametersForPlLines = location.ModelParametersForPLLines, + ModelParametersForPlLines = location.ModelParametersForPlLines, SoilProfile = subSoilScenario.SoilProfile1D, SoilProfileType = subSoilScenario.SoilProfileType, SoilGeometry2DName = soilGeometry2DName, @@ -97,7 +97,7 @@ HeadInPlLine2 = location.HeadPl2, HeadInPlLine3 = location.HeadPl3, HeadInPlLine4 = location.HeadPl4, - ModelParametersForPlLines = location.ModelParametersForPLLines, + ModelParametersForPlLines = location.ModelParametersForPlLines, SoilProfile = soilProfile, GaugePlLines = null, // TODO: Operational Gauges = null, // TODO: Operational Index: DamEngine/trunk/src/Deltares.DamEngine.Data/General/MStabParameters.cs =================================================================== diff -u -r1117 -r1122 --- DamEngine/trunk/src/Deltares.DamEngine.Data/General/MStabParameters.cs (.../MStabParameters.cs) (revision 1117) +++ DamEngine/trunk/src/Deltares.DamEngine.Data/General/MStabParameters.cs (.../MStabParameters.cs) (revision 1122) @@ -394,10 +394,10 @@ XOffsetSoilGeometry2DOrigin = 0.0; MaterialForDike = ""; MaterialForShoulder = ""; - IsUseOriginalPLLineAssignments = false; + IsUseOriginalPlLineAssignments = false; IsUseOriginalCalculationOptions = false; IsDrySituation = false; - PLLineAssignment = PLLineAssignment.ExpertKnowledge; + PlLineAssignment = PlLineAssignment.ExpertKnowledge; IntrusionVerticalWaterPressureType = IntrusionVerticalWaterPressureType.Standard; PenetrationLength = 0.0; IsDesign = false; @@ -407,10 +407,10 @@ public double XOffsetSoilGeometry2DOrigin { get; set; } public string MaterialForDike { get; set; } public string MaterialForShoulder { get; set; } - public bool IsUseOriginalPLLineAssignments { get; set; } + public bool IsUseOriginalPlLineAssignments { get; set; } public bool IsUseOriginalCalculationOptions { get; set; } public bool IsDrySituation { get; set; } - public PLLineAssignment PLLineAssignment { get; set; } + public PlLineAssignment PlLineAssignment { get; set; } public IntrusionVerticalWaterPressureType IntrusionVerticalWaterPressureType { get; set; } public double PenetrationLength { get; set; } public bool IsDesign { get; set; } @@ -422,10 +422,10 @@ this.XOffsetSoilGeometry2DOrigin = mstabGeometryCreationOptions.XOffsetSoilGeometry2DOrigin; this.MaterialForDike = mstabGeometryCreationOptions.MaterialForDike; this.MaterialForShoulder = mstabGeometryCreationOptions.MaterialForShoulder; - this.IsUseOriginalPLLineAssignments = mstabGeometryCreationOptions.IsUseOriginalPLLineAssignments; + this.IsUseOriginalPlLineAssignments = mstabGeometryCreationOptions.IsUseOriginalPlLineAssignments; this.IsUseOriginalCalculationOptions = mstabGeometryCreationOptions.IsUseOriginalCalculationOptions; this.IsDrySituation = mstabGeometryCreationOptions.IsDrySituation; - this.PLLineAssignment = mstabGeometryCreationOptions.PLLineAssignment; + this.PlLineAssignment = mstabGeometryCreationOptions.PlLineAssignment; this.IntrusionVerticalWaterPressureType = mstabGeometryCreationOptions.IntrusionVerticalWaterPressureType; this.PenetrationLength = mstabGeometryCreationOptions.PenetrationLength; this.IsDesign = mstabGeometryCreationOptions.IsDesign; @@ -466,8 +466,8 @@ public MStabParameters() { this.IsCalculateAllStabilityProjectsAtOnce = true; - this.IsOverrulePLLineCreationMethod = false; - this.PLLineCreationMethod = PlLineCreationMethod.ExpertKnowledgeRRD; + this.IsOverrulePlLineCreationMethod = false; + this.PlLineCreationMethod = PlLineCreationMethod.ExpertKnowledgeRRD; this.Model = MStabModelType.Bishop; this.SearchMethod = MStabSearchMethod.Grid; this.ZoneAreas = null; @@ -489,8 +489,8 @@ // Normally PLLine creation is specified per location. // If IsOverrulePLLineCreationMethod is set to true the settings in the locations will be // overruled with the value in PLLineCreationMethod - public bool IsOverrulePLLineCreationMethod { get; set; } - public PlLineCreationMethod PLLineCreationMethod { get; set; } + public bool IsOverrulePlLineCreationMethod { get; set; } + public PlLineCreationMethod PlLineCreationMethod { get; set; } public MStabModelType Model { get; set; } Index: DamEngine/trunk/src/Deltares.DamEngine.Data/General/ModelParameters.cs =================================================================== diff -u -r1117 -r1122 --- DamEngine/trunk/src/Deltares.DamEngine.Data/General/ModelParameters.cs (.../ModelParameters.cs) (revision 1117) +++ DamEngine/trunk/src/Deltares.DamEngine.Data/General/ModelParameters.cs (.../ModelParameters.cs) (revision 1122) @@ -30,14 +30,14 @@ public double LevelReductionInside { get; set; } // not used yet; to be moved to location public double LevelReductionOutside { get; set; } // not used yet; to be moved to location public string MapForSoilGeometries2D { get; set; } // ??? - public ModelParametersForPlLines ModelParametersForPLLines { get; set; } // to be moved to location + public ModelParametersForPlLines ModelParametersForPlLines { get; set; } // to be moved to location public ModelFactors ModelFactors { get; set; } // to be moved to location public DistributionType LayerHeightDistribution { get; set; } // to be moved to location public double LayerHeightDeviation { get; set; } // to be moved to location public ModelParameters() { - ModelParametersForPLLines = new ModelParametersForPlLines(); + ModelParametersForPlLines = new ModelParametersForPlLines(); ModelFactors = new ModelFactors { // Default values for ModelFactors in ModelParameters @@ -68,8 +68,8 @@ public class ModelParametersForPlLines { public virtual double PenetrationLength { get; set; } - public virtual double DampingFactorPL3 { get; set; } - public virtual double DampingFactorPL4 { get; set; } + public virtual double DampingFactorPl3 { get; set; } + public virtual double DampingFactorPl4 { get; set; } public virtual PlLineCreationMethod PlLineCreationMethod { get; set; } } } \ No newline at end of file Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamMacroStabilityCommon/DamMStabAssemblerTest.cs =================================================================== diff -u -r1121 -r1122 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamMacroStabilityCommon/DamMStabAssemblerTest.cs (.../DamMStabAssemblerTest.cs) (revision 1121) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamMacroStabilityCommon/DamMStabAssemblerTest.cs (.../DamMStabAssemblerTest.cs) (revision 1122) @@ -188,7 +188,7 @@ geometryCreationOptions.XOffsetSoilGeometry2DOrigin = 12.0; geometryCreationOptions.MaterialForDike = "clay dike"; geometryCreationOptions.MaterialForShoulder = "sand shoulder"; - geometryCreationOptions.IsUseOriginalPLLineAssignments = true; + geometryCreationOptions.IsUseOriginalPlLineAssignments = true; geometryCreationOptions.IsUseOriginalCalculationOptions = true; geometryCreationOptions.IsDrySituation = true; geometryCreationOptions.IsDesign = true; @@ -424,11 +424,11 @@ geometryCreationOptionsElement.AttributeAs(DamMStabAssembler.XmlAttributeSoilGeometry2DFilename), DamMStabAssembler.XmlAttributeSoilGeometry2DFilename); Assert.AreEqual(geometryCreationOptions.MaterialForDike, geometryCreationOptionsElement.AttributeAs(DamMStabAssembler.XmlAttributeMaterialForDike), DamMStabAssembler.XmlAttributeMaterialForDike); Assert.AreEqual(geometryCreationOptions.MaterialForShoulder, geometryCreationOptionsElement.AttributeAs(DamMStabAssembler.XmlAttributeMaterialForShoulder), DamMStabAssembler.XmlAttributeMaterialForShoulder); - Assert.AreEqual(geometryCreationOptions.IsUseOriginalPLLineAssignments, geometryCreationOptionsElement.AttributeAs(DamMStabAssembler.XmlAttributeIsUseOriginalPLLineAssignments), DamMStabAssembler.XmlAttributeIsUseOriginalPLLineAssignments); + Assert.AreEqual(geometryCreationOptions.IsUseOriginalPlLineAssignments, geometryCreationOptionsElement.AttributeAs(DamMStabAssembler.XmlAttributeIsUseOriginalPLLineAssignments), DamMStabAssembler.XmlAttributeIsUseOriginalPLLineAssignments); Assert.AreEqual(geometryCreationOptions.IsUseOriginalCalculationOptions, geometryCreationOptionsElement.AttributeAs(DamMStabAssembler.XmlAttributeIsUseOriginalCalculationOptions), DamMStabAssembler.XmlAttributeIsUseOriginalCalculationOptions); Assert.AreEqual(geometryCreationOptions.IsDrySituation, geometryCreationOptionsElement.AttributeAs(DamMStabAssembler.XmlAttributeIsDrySituation), DamMStabAssembler.XmlAttributeIsDrySituation); Assert.AreEqual(geometryCreationOptions.IsDesign, geometryCreationOptionsElement.AttributeAs(DamMStabAssembler.XmlAttributeIsDesign), DamMStabAssembler.XmlAttributeIsDesign); - Assert.AreEqual(geometryCreationOptions.PLLineAssignment, geometryCreationOptionsElement.AttributeAs(DamMStabAssembler.XmlAttributePLLineAssignment), DamMStabAssembler.XmlAttributePLLineAssignment); + Assert.AreEqual(geometryCreationOptions.PlLineAssignment, geometryCreationOptionsElement.AttributeAs(DamMStabAssembler.XmlAttributePLLineAssignment), DamMStabAssembler.XmlAttributePLLineAssignment); Assert.AreEqual(geometryCreationOptions.IntrusionVerticalWaterPressureType, geometryCreationOptionsElement.AttributeAs(DamMStabAssembler.XmlAttributeIntrusionVerticalWaterPressure), DamMStabAssembler.XmlAttributeIntrusionVerticalWaterPressure); Assert.AreEqual(geometryCreationOptions.PenetrationLength, geometryCreationOptionsElement.AttributeAs(DamMStabAssembler.XmlAttributePenetrationLength), DamMStabAssembler.XmlAttributePenetrationLength); @@ -501,8 +501,8 @@ plLineCreator.SurfaceLine = surfaceLine1; plLineCreator.WaterLevelRiverHigh = 4.0; plLineCreator.WaterLevelPolder = -4.5; - plLineCreator.ModelParametersForPlLines.DampingFactorPL3 = 0.3; - plLineCreator.ModelParametersForPlLines.DampingFactorPL4 = 0.4; + plLineCreator.ModelParametersForPlLines.DampingFactorPl3 = 0.3; + plLineCreator.ModelParametersForPlLines.DampingFactorPl4 = 0.4; plLineCreator.ModelParametersForPlLines.PenetrationLength = 1.5; plLineCreator.HeadInPlLine2 = 0.0; plLineCreator.CreateAllPlLines(location); @@ -746,7 +746,7 @@ public void VerifyThatTheAssemblerCorrectlyWritesTheIsUseOriginalPLLineAssignmentsAttributeValueWhenSetToTrue() { assembler = new DamMStabAssembler(); - damFailureMechanismeCalculationSpecification.FailureMechanismParametersMStab.MStabParameters.GeometryCreationOptions.IsUseOriginalPLLineAssignments = true; + damFailureMechanismeCalculationSpecification.FailureMechanismParametersMStab.MStabParameters.GeometryCreationOptions.IsUseOriginalPlLineAssignments = true; var doc = assembler.CreateDataTransferObject(damFailureMechanismeCalculationSpecification.FailureMechanismParametersMStab); var modelElement = doc.GetFirstOrDefaultElementByLocalName(DamMStabAssembler.XmlElementGeometryCreationOptions); Assert.IsNotNull(modelElement); Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamPipingSellmeijerVnk/DamPipingSellmeijerVnkKernelWrapper.cs =================================================================== diff -u -r1081 -r1122 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamPipingSellmeijerVnk/DamPipingSellmeijerVnkKernelWrapper.cs (.../DamPipingSellmeijerVnkKernelWrapper.cs) (revision 1081) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamPipingSellmeijerVnk/DamPipingSellmeijerVnkKernelWrapper.cs (.../DamPipingSellmeijerVnkKernelWrapper.cs) (revision 1122) @@ -68,7 +68,7 @@ var plLines = PlLinesHelper.CreatePlLinesForPiping(location, soilProfile1D, riverLevel, out upliftSituation); var upliftLocationDeterminator = new UpliftLocationDeterminator { - PLLines = plLines, + PlLines = plLines, SoilProfile = soilProfile1D, SurfaceLine = surfaceLine, DikeEmbankmentMaterial = location.GetDikeEmbankmentSoil(), Index: DamEngine/trunk/src/Deltares.DamEngine.Interface/FillXmlInputFromDam.cs =================================================================== diff -u -r1117 -r1122 --- DamEngine/trunk/src/Deltares.DamEngine.Interface/FillXmlInputFromDam.cs (.../FillXmlInputFromDam.cs) (revision 1117) +++ DamEngine/trunk/src/Deltares.DamEngine.Interface/FillXmlInputFromDam.cs (.../FillXmlInputFromDam.cs) (revision 1122) @@ -293,12 +293,12 @@ inputLocation.SurfaceLineName = location.SurfaceLine.Name; inputLocation.SegmentName = location.Segment.Name; var waternetOptions = new LocationWaternetOptions(); - waternetOptions.PhreaticLineCreationMethod = ConversionHelper.ConvertToInputPhreaticLineCreationMethod(location.ModelParametersForPLLines.PlLineCreationMethod); + waternetOptions.PhreaticLineCreationMethod = ConversionHelper.ConvertToInputPhreaticLineCreationMethod(location.ModelParametersForPlLines.PlLineCreationMethod); waternetOptions.IntrusionVerticalWaterPressure = ConversionHelper.ConvertToInputIntrusionVerticalWaterPressure(location.IntrusionVerticalWaterPressure ?? IntrusionVerticalWaterPressureType.Standard); waternetOptions.PolderLevel = location.PolderLevel; - waternetOptions.DampingFactorPL3 = location.ModelParametersForPLLines.DampingFactorPL4; - waternetOptions.DampingFactorPL4 = location.ModelParametersForPLLines.DampingFactorPL3; - waternetOptions.PenetrationLength = location.ModelParametersForPLLines.PenetrationLength; + waternetOptions.DampingFactorPL3 = location.ModelParametersForPlLines.DampingFactorPl4; + waternetOptions.DampingFactorPL4 = location.ModelParametersForPlLines.DampingFactorPl3; + waternetOptions.PenetrationLength = location.ModelParametersForPlLines.PenetrationLength; waternetOptions.Pl1BelowCrestMiddleSpecified = location.PlLineOffsetBelowDikeCrestMiddle.HasValue; waternetOptions.Pl1BelowCrestMiddle = location.PlLineOffsetBelowDikeCrestMiddle ?? 0.0; waternetOptions.Pl1FactorBelowShoulderCrestSpecified = location.UsePlLineOffsetFactorBelowShoulderCrest ?? false; Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/Uplift/UpliftLocationDeterminatorTest.cs =================================================================== diff -u -r1117 -r1122 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/Uplift/UpliftLocationDeterminatorTest.cs (.../UpliftLocationDeterminatorTest.cs) (revision 1117) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/Uplift/UpliftLocationDeterminatorTest.cs (.../UpliftLocationDeterminatorTest.cs) (revision 1122) @@ -12,16 +12,16 @@ [TestFixture] public class UpliftLocationDeterminatorTest { - private static PlLines CreatePLLines(SurfaceLine2 surfaceLine, SoilProfile1D soilProfile, double riverLevel, bool isUseOvenDryUnitWeight) + private static PlLines CreatePlLines(SurfaceLine2 surfaceLine, SoilProfile1D soilProfile, double riverLevel, bool isUseOvenDryUnitWeight) { Calculators.PlLinesCreator.PlLinesCreator plLineCreator = new Calculators.PlLinesCreator.PlLinesCreator(); plLineCreator.IsUseOvenDryUnitWeight = isUseOvenDryUnitWeight; plLineCreator.SoilProfile = soilProfile; plLineCreator.SurfaceLine = surfaceLine; plLineCreator.WaterLevelRiverHigh = riverLevel; plLineCreator.WaterLevelPolder = -0.5; - plLineCreator.ModelParametersForPlLines.DampingFactorPL3 = 0.3; - plLineCreator.ModelParametersForPlLines.DampingFactorPL4 = 0.4; + plLineCreator.ModelParametersForPlLines.DampingFactorPl3 = 0.3; + plLineCreator.ModelParametersForPlLines.DampingFactorPl4 = 0.4; plLineCreator.ModelParametersForPlLines.PenetrationLength = 1.5; plLineCreator.IsAdjustPL3AndPL4SoNoUpliftWillOccurEnabled = false; // for piping this must be set to false var location = new Location { DamType = DamType.Regional }; @@ -44,13 +44,13 @@ var surfaceLineTutorial1 = FactoryForSurfaceLines.CreateSurfaceLineTutorial1(); var upliftLocationDeterminator = new UpliftLocationDeterminator(); upliftLocationDeterminator.SurfaceLine = surfaceLineTutorial1; - upliftLocationDeterminator.PLLines = FactoryForPlLines.CreatePLLinesForUpliftLocationDeterminatorTests(); + upliftLocationDeterminator.PlLines = FactoryForPlLines.CreatePlLinesForUpliftLocationDeterminatorTests(); UpliftLocationAndResult upliftLocationAndResult = upliftLocationDeterminator.GetLocationAndResult(1.0); } [Test] [ExpectedException(typeof(UpliftLocationDeterminatorException))] - public void ThrowsExceptionIfPLLinesNotAssignedInUpliftLocationDeterminator() + public void ThrowsExceptionIfPlLinesNotAssignedInUpliftLocationDeterminator() { var surfaceLineTutorial1 = FactoryForSurfaceLines.CreateSurfaceLineTutorial1(); var upliftLocationDeterminator = new UpliftLocationDeterminator(); @@ -65,7 +65,7 @@ { var upliftLocationDeterminator = new UpliftLocationDeterminator(); upliftLocationDeterminator.SoilProfile = FactoryForSoilProfiles.CreateClaySandClaySandProfile(); - upliftLocationDeterminator.PLLines = FactoryForPlLines.CreatePLLinesForUpliftLocationDeterminatorTests(); + upliftLocationDeterminator.PlLines = FactoryForPlLines.CreatePlLinesForUpliftLocationDeterminatorTests(); UpliftLocationAndResult upliftLocationAndResult = upliftLocationDeterminator.GetLocationAndResult(1.0); } @@ -75,7 +75,7 @@ var surfaceLineForPipingBligh = FactoryForSurfaceLines.CreateSurfaceLineForPipingBligh(); var upliftLocationDeterminator = new UpliftLocationDeterminator(); upliftLocationDeterminator.SoilProfile = FactoryForSoilProfiles.CreateClaySandClaySandProfileForPipingBligh(); - upliftLocationDeterminator.PLLines = FactoryForPlLines.CreatePLLinesForUpliftLocationDeterminatorTests(); + upliftLocationDeterminator.PlLines = FactoryForPlLines.CreatePlLinesForUpliftLocationDeterminatorTests(); upliftLocationDeterminator.SurfaceLine = surfaceLineForPipingBligh; UpliftLocationAndResult upliftLocationAndResult = upliftLocationDeterminator.GetLocationAndResult(1.0); Assert.IsTrue(upliftLocationAndResult.LocationEquals(upliftLocationDeterminator.SurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtPolder))); @@ -93,13 +93,13 @@ const double cRiverlevel = 4; SurfaceLine2 surfaceLine = FactoryForSurfaceLines.CreateSurfaceLineTutorial1(); SoilProfile1D soilProfile = FactoryForSoilProfiles.CreateClaySandProfile(); - PlLines plLines = CreatePLLines(surfaceLine, soilProfile, cRiverlevel, false); + PlLines plLines = CreatePlLines(surfaceLine, soilProfile, cRiverlevel, false); UpliftLocationDeterminator upliftLocationDeterminator = new UpliftLocationDeterminator() { SurfaceLine = surfaceLine, SoilProfile = soilProfile, - PLLines = plLines + PlLines = plLines }; UpliftLocationAndResult upliftLocationAndResult = upliftLocationDeterminator.GetLocationAtWithLowestUpliftFactor(); @@ -117,13 +117,13 @@ const double cRiverlevel = 4; SurfaceLine2 surfaceLine = FactoryForSurfaceLines.CreateSurfaceLineTutorial1(); SoilProfile1D soilProfile = FactoryForSoilProfiles.CreateClaySandProfileForPipingBligh(); - PlLines plLines = CreatePLLines(surfaceLine, soilProfile, cRiverlevel, false); + PlLines plLines = CreatePlLines(surfaceLine, soilProfile, cRiverlevel, false); UpliftLocationDeterminator upliftLocationDeterminator = new UpliftLocationDeterminator() { SurfaceLine = surfaceLine, SoilProfile = soilProfile, - PLLines = plLines + PlLines = plLines }; UpliftLocationAndResult upliftLocationAndResult = upliftLocationDeterminator.GetLocationInPolderNearestDikeWithUpliftFactorLowerThanRequired(1.0); @@ -148,13 +148,13 @@ layer.Soil.DryUnitWeight = layer.Soil.AbovePhreaticLevel; layer.Soil.AbovePhreaticLevel = layer.Soil.AbovePhreaticLevel + 1.0; } - PlLines plLines = CreatePLLines(surfaceLine, soilProfile, cRiverlevel, false); + PlLines plLines = CreatePlLines(surfaceLine, soilProfile, cRiverlevel, false); UpliftLocationDeterminator upliftLocationDeterminator = new UpliftLocationDeterminator() { SurfaceLine = surfaceLine, SoilProfile = soilProfile, - PLLines = plLines, + PlLines = plLines, IsUseOvenDryUnitWeight = true }; UpliftLocationAndResult upliftLocationAndResult = upliftLocationDeterminator.GetLocationInPolderNearestDikeWithUpliftFactorLowerThanRequired(1.0); Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamPipingSellmeijer4Forces/DamPipingSellmeijer4ForcesKernelWrapper.cs =================================================================== diff -u -r1081 -r1122 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamPipingSellmeijer4Forces/DamPipingSellmeijer4ForcesKernelWrapper.cs (.../DamPipingSellmeijer4ForcesKernelWrapper.cs) (revision 1081) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamPipingSellmeijer4Forces/DamPipingSellmeijer4ForcesKernelWrapper.cs (.../DamPipingSellmeijer4ForcesKernelWrapper.cs) (revision 1122) @@ -69,7 +69,7 @@ var plLines = PlLinesHelper.CreatePlLinesForPiping(location, soilProfile1D, riverLevel, out upliftSituation); var upliftLocationDeterminator = new UpliftLocationDeterminator { - PLLines = plLines, + PlLines = plLines, SoilProfile = soilProfile1D, SurfaceLine = surfaceLine, DikeEmbankmentMaterial = location.GetDikeEmbankmentSoil(), Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/RegionalAssessment/Evaluator/UpliftEvaluator.cs =================================================================== diff -u -r1117 -r1122 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators/RegionalAssessment/Evaluator/UpliftEvaluator.cs (.../UpliftEvaluator.cs) (revision 1117) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/RegionalAssessment/Evaluator/UpliftEvaluator.cs (.../UpliftEvaluator.cs) (revision 1122) @@ -90,7 +90,7 @@ plLinesCreator.SurfaceLine = location.SurfaceLine; plLinesCreator.WaterLevelPolder = location.PolderLevel; - plLinesCreator.ModelParametersForPlLines = location.ModelParametersForPLLines; + plLinesCreator.ModelParametersForPlLines = location.ModelParametersForPlLines; plLinesCreator.SoilProfile = soilGeometry.SoilProfile; plLinesCreator.SoilGeometry2DName = null; plLinesCreator.SoilProfileType = SoilProfileType.ProfileType1D; @@ -140,7 +140,7 @@ SoilProfile = soilGeometry.SoilProfile, SoilGeometry2DName = null, DikeEmbankmentMaterial = location.GetDikeEmbankmentSoil(), - PLLines = CreatePlLines(), + PlLines = CreatePlLines(), IsUseOvenDryUnitWeight = (dikeDrySensitivity == DikeDrySensitivity.Dry), XSoilGeometry2DOrigin = location.XSoilGeometry2DOrigin }; Index: DamEngine/trunk/src/Deltares.DamEngine.Data/General/Dike.cs =================================================================== diff -u -r1121 -r1122 --- DamEngine/trunk/src/Deltares.DamEngine.Data/General/Dike.cs (.../Dike.cs) (revision 1121) +++ DamEngine/trunk/src/Deltares.DamEngine.Data/General/Dike.cs (.../Dike.cs) (revision 1122) @@ -74,7 +74,7 @@ private MStabShearStrength shearmodel; private SoilList soilList; private IList gauges = new List(); - private IList gaugePLLines = new List(); + private IList gaugePlLines = new List(); private IList soilProfiles; private IList soilProfiles2D; private List databaseSoils = new List(); @@ -176,13 +176,13 @@ } [Browsable(false)] - public virtual IList GaugePLLines + public virtual IList GaugePlLines { - get { return this.gaugePLLines; } - set { this.gaugePLLines = value; } + get { return this.gaugePlLines; } + set { this.gaugePlLines = value; } } - public bool UsesGauges { get { return this.GaugePLLines != null && this.GaugePLLines.Count > 0 && this.Gauges != null; } } + public bool UsesGauges { get { return this.GaugePlLines != null && this.GaugePlLines.Count > 0 && this.Gauges != null; } } public virtual List Scenarios { @@ -406,8 +406,8 @@ location.Gauges.Clear(); location.Gauges.AddRange(Gauges); - location.GaugePLLines.Clear(); - location.GaugePLLines.AddRange(GaugePLLines); + location.GaugePlLines.Clear(); + location.GaugePlLines.AddRange(GaugePlLines); } } } \ No newline at end of file Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/PlLinesCreator/PlLinesCreator.cs =================================================================== diff -u -r1121 -r1122 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators/PlLinesCreator/PlLinesCreator.cs (.../PlLinesCreator.cs) (revision 1121) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/PlLinesCreator/PlLinesCreator.cs (.../PlLinesCreator.cs) (revision 1122) @@ -1394,10 +1394,10 @@ plLine = this.CreatePlLine2ByExpertKnowledge(this.ModelParametersForPlLines.PenetrationLength, this.HeadInPlLine2); break; case PlLineType.Pl3: - plLine = this.CreatePlLine3ByExpertKnowledge(HeadPL3TakingInAccountHydraulicShortcut, this.ModelParametersForPlLines.DampingFactorPL3, slopeGradient); + plLine = this.CreatePlLine3ByExpertKnowledge(HeadPL3TakingInAccountHydraulicShortcut, this.ModelParametersForPlLines.DampingFactorPl3, slopeGradient); break; case PlLineType.Pl4: - plLine = this.CreatePlLine4ByExpertKnowledge(GetHeadPL4TakingInAccountHydraulicShortcut(damType), this.ModelParametersForPlLines.DampingFactorPL4, slopeGradient); + plLine = this.CreatePlLine4ByExpertKnowledge(GetHeadPL4TakingInAccountHydraulicShortcut(damType), this.ModelParametersForPlLines.DampingFactorPl4, slopeGradient); break; } Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/Common/UpliftHelper.cs =================================================================== diff -u -r1117 -r1122 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/Common/UpliftHelper.cs (.../UpliftHelper.cs) (revision 1117) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/Common/UpliftHelper.cs (.../UpliftHelper.cs) (revision 1122) @@ -69,7 +69,7 @@ SoilGeometry2DName = soilGeometry2DName, SoilList = location.SoilList, DikeEmbankmentMaterial = location.GetDikeEmbankmentSoil(), - PLLines = plLines, + PlLines = plLines, XSoilGeometry2DOrigin = location.XSoilGeometry2DOrigin }; UpliftLocationAndResult upliftLocationAndResult = upliftLocationDeterminator.GetLocationAtWithLowestUpliftFactor(); Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/PlLinesCreator/PlLinesCreatorTest.cs =================================================================== diff -u -r1121 -r1122 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/PlLinesCreator/PlLinesCreatorTest.cs (.../PlLinesCreatorTest.cs) (revision 1121) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/PlLinesCreator/PlLinesCreatorTest.cs (.../PlLinesCreatorTest.cs) (revision 1122) @@ -59,8 +59,8 @@ Assert.IsNotNull(plLineCreator); plLineCreator.SoilProfile = FactoryForSoilProfiles.CreateComplexProfile(); plLineCreator.WaterLevelRiverHigh = 4.0; - plLineCreator.ModelParametersForPlLines.DampingFactorPL3 = 0.3; - plLineCreator.ModelParametersForPlLines.DampingFactorPL4 = 0.4; + plLineCreator.ModelParametersForPlLines.DampingFactorPl3 = 0.3; + plLineCreator.ModelParametersForPlLines.DampingFactorPl4 = 0.4; plLineCreator.ModelParametersForPlLines.PlLineCreationMethod = PlLineCreationMethod.ExpertKnowledgeLinearInDike; plLineCreator.SoilProfile = FactoryForSoilProfiles.CreateClaySandClaySandProfile(); plLineCreator.SurfaceLine = surfacelineSimpleDike; @@ -109,8 +109,8 @@ Assert.IsNotNull(plLineCreator); plLineCreator.SoilProfile = FactoryForSoilProfiles.CreateComplexProfile(); plLineCreator.WaterLevelRiverHigh = 4.0; - plLineCreator.ModelParametersForPlLines.DampingFactorPL3 = 0.3; - plLineCreator.ModelParametersForPlLines.DampingFactorPL4 = 0.4; + plLineCreator.ModelParametersForPlLines.DampingFactorPl3 = 0.3; + plLineCreator.ModelParametersForPlLines.DampingFactorPl4 = 0.4; plLineCreator.ModelParametersForPlLines.PlLineCreationMethod = PlLineCreationMethod.ExpertKnowledgeRRD; plLineCreator.PlLineOffsetBelowDikeTopAtRiver = 0.5; // Default value plLineCreator.PlLineOffsetBelowDikeTopAtPolder = 1.0; @@ -149,8 +149,8 @@ Assert.IsNotNull(plLineCreator); plLineCreator.SoilProfile = FactoryForSoilProfiles.CreateComplexProfile(); plLineCreator.WaterLevelRiverHigh = 4.5; - plLineCreator.ModelParametersForPlLines.DampingFactorPL3 = 0.3; - plLineCreator.ModelParametersForPlLines.DampingFactorPL4 = 0.4; + plLineCreator.ModelParametersForPlLines.DampingFactorPl3 = 0.3; + plLineCreator.ModelParametersForPlLines.DampingFactorPl4 = 0.4; plLineCreator.ModelParametersForPlLines.PlLineCreationMethod = PlLineCreationMethod.ExpertKnowledgeRRD; plLineCreator.PlLineOffsetBelowDikeTopAtRiver = 0.5; // Default value plLineCreator.PlLineOffsetBelowDikeTopAtPolder = 1.0; @@ -219,8 +219,8 @@ Assert.IsNotNull(plLineCreator); plLineCreator.SoilProfile = FactoryForSoilProfiles.CreateComplexProfile(); plLineCreator.WaterLevelRiverHigh = 4.0; - plLineCreator.ModelParametersForPlLines.DampingFactorPL3 = 0.3; - plLineCreator.ModelParametersForPlLines.DampingFactorPL4 = 0.4; + plLineCreator.ModelParametersForPlLines.DampingFactorPl3 = 0.3; + plLineCreator.ModelParametersForPlLines.DampingFactorPl4 = 0.4; plLineCreator.ModelParametersForPlLines.PlLineCreationMethod = PlLineCreationMethod.ExpertKnowledgeLinearInDike; plLineCreator.SoilProfile = FactoryForSoilProfiles.CreateClaySandClaySandProfile(); plLineCreator.SurfaceLine = surfacelineSimpleDike; @@ -242,8 +242,8 @@ Assert.IsNotNull(plLineCreator); plLineCreator.SoilProfile = FactoryForSoilProfiles.CreateComplexProfile(); plLineCreator.WaterLevelRiverHigh = 4.0; - plLineCreator.ModelParametersForPlLines.DampingFactorPL3 = 0.3; - plLineCreator.ModelParametersForPlLines.DampingFactorPL4 = 0.4; + plLineCreator.ModelParametersForPlLines.DampingFactorPl3 = 0.3; + plLineCreator.ModelParametersForPlLines.DampingFactorPl4 = 0.4; plLineCreator.ModelParametersForPlLines.PlLineCreationMethod = PlLineCreationMethod.ExpertKnowledgeLinearInDike; plLineCreator.SoilProfile = FactoryForSoilProfiles.CreateClaySandClaySandProfile(); plLineCreator.SurfaceLine = surfacelineSimpleDike; @@ -274,8 +274,8 @@ Assert.IsNotNull(plLineCreator); plLineCreator.SoilProfile = FactoryForSoilProfiles.CreateComplexProfile(); plLineCreator.WaterLevelRiverHigh = 4.0; - plLineCreator.ModelParametersForPlLines.DampingFactorPL3 = 0.3; - plLineCreator.ModelParametersForPlLines.DampingFactorPL4 = 0.4; + plLineCreator.ModelParametersForPlLines.DampingFactorPl3 = 0.3; + plLineCreator.ModelParametersForPlLines.DampingFactorPl4 = 0.4; plLineCreator.ModelParametersForPlLines.PlLineCreationMethod = PlLineCreationMethod.ExpertKnowledgeLinearInDike; plLineCreator.SoilProfile = FactoryForSoilProfiles.CreateClaySandClaySandProfile(); plLineCreator.SurfaceLine = surfacelineSimpleDike; @@ -313,8 +313,8 @@ plLineCreator.WaterLevelRiverHigh = 4.0; plLineCreator.WaterLevelRiverLow = 3.0; // <===================== low waterlevel crossing dike plLineCreator.IsUseLowWaterLevel = true; - plLineCreator.ModelParametersForPlLines.DampingFactorPL3 = 0.3; - plLineCreator.ModelParametersForPlLines.DampingFactorPL4 = 0.4; + plLineCreator.ModelParametersForPlLines.DampingFactorPl3 = 0.3; + plLineCreator.ModelParametersForPlLines.DampingFactorPl4 = 0.4; plLineCreator.ModelParametersForPlLines.PlLineCreationMethod = PlLineCreationMethod.ExpertKnowledgeLinearInDike; plLineCreator.SoilProfile = FactoryForSoilProfiles.CreateClaySandClaySandProfile(); plLineCreator.SurfaceLine = surfacelineSimpleDike; @@ -349,8 +349,8 @@ plLineCreator.WaterLevelRiverHigh = 4.0; plLineCreator.WaterLevelRiverLow = 1.0; // <===================== low waterlevel below surfacelevel plLineCreator.IsUseLowWaterLevel = true; - plLineCreator.ModelParametersForPlLines.DampingFactorPL3 = 0.3; - plLineCreator.ModelParametersForPlLines.DampingFactorPL4 = 0.4; + plLineCreator.ModelParametersForPlLines.DampingFactorPl3 = 0.3; + plLineCreator.ModelParametersForPlLines.DampingFactorPl4 = 0.4; plLineCreator.ModelParametersForPlLines.PlLineCreationMethod = PlLineCreationMethod.ExpertKnowledgeLinearInDike; plLineCreator.SoilProfile = FactoryForSoilProfiles.CreateClaySandClaySandProfile(); plLineCreator.SurfaceLine = surfacelineSimpleDike; @@ -392,8 +392,8 @@ plLineCreator.WaterLevelRiverHigh = 4.0; plLineCreator.WaterLevelRiverLow = 3.0; // <===================== low waterlevel crossing dike plLineCreator.IsUseLowWaterLevel = true; - plLineCreator.ModelParametersForPlLines.DampingFactorPL3 = 0.3; - plLineCreator.ModelParametersForPlLines.DampingFactorPL4 = 0.4; + plLineCreator.ModelParametersForPlLines.DampingFactorPl3 = 0.3; + plLineCreator.ModelParametersForPlLines.DampingFactorPl4 = 0.4; plLineCreator.ModelParametersForPlLines.PlLineCreationMethod = PlLineCreationMethod.ExpertKnowledgeLinearInDike; plLineCreator.SoilProfile = FactoryForSoilProfiles.CreateClaySandClaySandProfile(); plLineCreator.SurfaceLine.EnsurePointOfType(0.0, 2.0, CharacteristicPointType.SurfaceLevelOutside); @@ -443,8 +443,8 @@ plLineCreator.WaterLevelRiverHigh = 4.0; plLineCreator.WaterLevelRiverLow = 1.0; // <===================== low waterlevel below surfacelevel plLineCreator.IsUseLowWaterLevel = true; - plLineCreator.ModelParametersForPlLines.DampingFactorPL3 = 0.3; - plLineCreator.ModelParametersForPlLines.DampingFactorPL4 = 0.4; + plLineCreator.ModelParametersForPlLines.DampingFactorPl3 = 0.3; + plLineCreator.ModelParametersForPlLines.DampingFactorPl4 = 0.4; plLineCreator.ModelParametersForPlLines.PlLineCreationMethod = PlLineCreationMethod.ExpertKnowledgeLinearInDike; plLineCreator.SoilProfile = FactoryForSoilProfiles.CreateClaySandClaySandProfile(); plLineCreator.SurfaceLine.EnsurePointOfType(0.0, 2.0, CharacteristicPointType.SurfaceLevelOutside); @@ -490,8 +490,8 @@ Assert.IsNotNull(plLineCreator); plLineCreator.SoilProfile = FactoryForSoilProfiles.CreateComplexProfile(); plLineCreator.WaterLevelRiverHigh = 4.0; - plLineCreator.ModelParametersForPlLines.DampingFactorPL3 = 0.3; - plLineCreator.ModelParametersForPlLines.DampingFactorPL4 = 0.4; + plLineCreator.ModelParametersForPlLines.DampingFactorPl3 = 0.3; + plLineCreator.ModelParametersForPlLines.DampingFactorPl4 = 0.4; plLineCreator.ModelParametersForPlLines.PlLineCreationMethod = PlLineCreationMethod.ExpertKnowledgeRRD; plLineCreator.SoilProfile = FactoryForSoilProfiles.CreateClaySandClaySandProfile(); plLineCreator.SurfaceLine = surfacelineSimpleDike; @@ -526,8 +526,8 @@ Calculators.PlLinesCreator.PlLinesCreator plLineCreator = new Calculators.PlLinesCreator.PlLinesCreator(); Assert.IsNotNull(plLineCreator); plLineCreator.SoilProfile = FactoryForSoilProfiles.CreateComplexProfile(); - plLineCreator.ModelParametersForPlLines.DampingFactorPL3 = 0.3; - plLineCreator.ModelParametersForPlLines.DampingFactorPL4 = 0.4; + plLineCreator.ModelParametersForPlLines.DampingFactorPl3 = 0.3; + plLineCreator.ModelParametersForPlLines.DampingFactorPl4 = 0.4; plLineCreator.ModelParametersForPlLines.PlLineCreationMethod = PlLineCreationMethod.ExpertKnowledgeRRD; plLineCreator.SoilProfile = FactoryForSoilProfiles.CreateClaySandClaySandProfile(); plLineCreator.SurfaceLine = surfacelineSimpleDike; @@ -829,8 +829,8 @@ plLineCreator.WaterLevelRiverHigh = 4.0; plLineCreator.WaterLevelRiverLow = 3.0; plLineCreator.IsUseLowWaterLevel = true; - plLineCreator.ModelParametersForPlLines.DampingFactorPL3 = 0.3; - plLineCreator.ModelParametersForPlLines.DampingFactorPL4 = 0.4; + plLineCreator.ModelParametersForPlLines.DampingFactorPl3 = 0.3; + plLineCreator.ModelParametersForPlLines.DampingFactorPl4 = 0.4; plLineCreator.SoilProfile = FactoryForSoilProfiles.CreateClaySandClaySandProfile(); plLineCreator.SurfaceLine = surfacelineSimpleDike; plLineCreator.WaterLevelPolder = plLineCreator.SurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtPolder).Z - 1.0; @@ -866,8 +866,8 @@ plLineCreator.WaterLevelRiverHigh = 4.0; plLineCreator.WaterLevelRiverLow = 1.0; plLineCreator.IsUseLowWaterLevel = true; - plLineCreator.ModelParametersForPlLines.DampingFactorPL3 = 0.3; - plLineCreator.ModelParametersForPlLines.DampingFactorPL4 = 0.4; + plLineCreator.ModelParametersForPlLines.DampingFactorPl3 = 0.3; + plLineCreator.ModelParametersForPlLines.DampingFactorPl4 = 0.4; plLineCreator.SoilProfile = FactoryForSoilProfiles.CreateClaySandClaySandProfile(); plLineCreator.SurfaceLine = surfacelineSimpleDike; // Add voorland to dike @@ -1083,8 +1083,8 @@ plLineCreator.ModelParametersForPlLines.PenetrationLength = cPenetrationLength; plLineCreator.WaterLevelRiverHigh = 4.0; plLineCreator.WaterLevelPolder = -0.5; - plLineCreator.ModelParametersForPlLines.DampingFactorPL3 = 0.3; - plLineCreator.ModelParametersForPlLines.DampingFactorPL4 = 0.4; + plLineCreator.ModelParametersForPlLines.DampingFactorPl3 = 0.3; + plLineCreator.ModelParametersForPlLines.DampingFactorPl4 = 0.4; plLineCreator.SoilProfile = FactoryForSoilProfiles.CreateClaySandClaySandProfile(); plLineCreator.SurfaceLine = surfaceLineTutorial1; PlLine plLine = plLineCreator.CreatePlLineByExpertKnowledge(PlLineType.Pl2, DamType.Regional, 0.02); @@ -1107,8 +1107,8 @@ plLineCreator.ModelParametersForPlLines.PenetrationLength = cPenetrationLength; plLineCreator.WaterLevelRiverHigh = 4.0; plLineCreator.WaterLevelPolder = -0.5; - plLineCreator.ModelParametersForPlLines.DampingFactorPL3 = 0.3; - plLineCreator.ModelParametersForPlLines.DampingFactorPL4 = 0.4; + plLineCreator.ModelParametersForPlLines.DampingFactorPl3 = 0.3; + plLineCreator.ModelParametersForPlLines.DampingFactorPl4 = 0.4; plLineCreator.SoilProfile = FactoryForSoilProfiles.CreateClaySandClaySandProfile(); plLineCreator.SurfaceLine = surfaceLineTutorial1; @@ -1311,7 +1311,7 @@ plLineCreator.WaterLevelRiverHigh = 4.0; plLineCreator.WaterLevelPolder = -0.5; - plLineCreator.ModelParametersForPlLines.DampingFactorPL3 = cDampingFactor; + plLineCreator.ModelParametersForPlLines.DampingFactorPl3 = cDampingFactor; PlLine plLine = plLineCreator.CreatePlLineByExpertKnowledge(PlLineType.Pl3, DamType.Regional, 0.02); } } @@ -1328,7 +1328,7 @@ plLineCreator.WaterLevelRiverHigh = 4.0; plLineCreator.WaterLevelPolder = -0.5; - plLineCreator.ModelParametersForPlLines.DampingFactorPL4 = cDampingFactor; + plLineCreator.ModelParametersForPlLines.DampingFactorPl4 = cDampingFactor; PlLine plLine = plLineCreator.CreatePlLineByExpertKnowledge(PlLineType.Pl4, DamType.Regional, 0.02); Assert.IsFalse(plLine.Exists()); } @@ -1395,7 +1395,7 @@ plLineCreator.SurfaceLine = surfaceLineTutorial1; plLineCreator.WaterLevelRiverHigh = 4.0; plLineCreator.WaterLevelPolder = -0.5; - plLineCreator.ModelParametersForPlLines.DampingFactorPL3 = cDampingFactor; + plLineCreator.ModelParametersForPlLines.DampingFactorPl3 = cDampingFactor; // In this case no HeadInPlLine3 is specified, then the head of PL3 will be equal to WaterLevelRiverHigh PlLine plLine = plLineCreator.CreatePlLineByExpertKnowledge(PlLineType.Pl3, DamType.Regional, 0.02); @@ -1462,7 +1462,7 @@ plLineCreator.WaterLevelRiverLow = 1.0; plLineCreator.IsUseLowWaterLevel = true; plLineCreator.WaterLevelPolder = -0.5; - plLineCreator.ModelParametersForPlLines.DampingFactorPL3 = cDampingFactor; + plLineCreator.ModelParametersForPlLines.DampingFactorPl3 = cDampingFactor; // In this case no HeadInPlLine3 is specified, then the head of Pl3 will be equal to WaterLevelRiverLow PlLine plLine = plLineCreator.CreatePlLineByExpertKnowledge(PlLineType.Pl3, DamType.Regional, 0.02); CheckPl3LowFor1DGeometryWithExpertKnowledgeRrd(plLine); @@ -1512,7 +1512,7 @@ plLineCreator.WaterLevelRiverHigh = 4.0; plLineCreator.WaterLevelPolder = -0.5; - plLineCreator.ModelParametersForPlLines.DampingFactorPL3 = cDampingFactor; + plLineCreator.ModelParametersForPlLines.DampingFactorPl3 = cDampingFactor; PlLine plLine = plLineCreator.CreatePlLineByExpertKnowledge(PlLineType.Pl3, DamType.Regional, 0.02); //double dikeBaseLength = plLineCreator.SurfaceLine.GetDikeToeInward().X - plLineCreator.SurfaceLine.CharacteristicPoints[CharacteristicPointType.DikeToeAtRiver].X; @@ -1561,7 +1561,7 @@ plLineCreator.WaterLevelRiverHigh = 4.0; plLineCreator.WaterLevelPolder = -0.5; - plLineCreator.ModelParametersForPlLines.DampingFactorPL3 = cDampingFactor; + plLineCreator.ModelParametersForPlLines.DampingFactorPl3 = cDampingFactor; PlLine plLine = plLineCreator.CreatePlLineByExpertKnowledge(PlLineType.Pl3, DamType.Regional, 0.02); //double dikeBaseLength = plLineCreator.SurfaceLine.GetDikeToeInward().X - plLineCreator.SurfaceLine.CharacteristicPoints[CharacteristicPointType.DikeToeAtRiver].X; @@ -1600,7 +1600,7 @@ plLineCreator.IsAdjustPL3AndPL4SoNoUpliftWillOccurEnabled = false; // In this case no HeadInPlLine3 is specified, then the head of PL3 will be equal to WaterLevelRiverHigh plLineCreator.IsHydraulicShortcut = true; - plLineCreator.ModelParametersForPlLines.DampingFactorPL4 = cDampingFactor; + plLineCreator.ModelParametersForPlLines.DampingFactorPl4 = cDampingFactor; PlLine plLine = plLineCreator.CreatePlLineByExpertKnowledge(PlLineType.Pl4, DamType.Regional, 0.02); CheckPl4LowFor1DGeometryWithExpertKnowledgeRrd(plLine); @@ -1641,7 +1641,7 @@ plLineCreator.WaterLevelRiverHigh = 4.0; plLineCreator.WaterLevelPolder = -0.5; - plLineCreator.ModelParametersForPlLines.DampingFactorPL4 = cDampingFactor; + plLineCreator.ModelParametersForPlLines.DampingFactorPl4 = cDampingFactor; PlLine plLine = plLineCreator.CreatePlLineByExpertKnowledge(PlLineType.Pl4, DamType.Regional, 0.02); } } Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/Uplift/UpliftCalculator.cs =================================================================== diff -u -r1118 -r1122 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators/Uplift/UpliftCalculator.cs (.../UpliftCalculator.cs) (revision 1118) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/Uplift/UpliftCalculator.cs (.../UpliftCalculator.cs) (revision 1122) @@ -66,17 +66,17 @@ /// /// /// - /// + /// /// - public double CalculateUpliftFactor(double headOfPLLine) + public double CalculateUpliftFactor(double headOfPlLine) { ThrowWhenSoilProfileIsNull(); var massCalculator = CreateSoilVolumeMassCalculator(); massCalculator.IsUseOvenDryUnitWeight = IsUseOvenDryUnitWeight; var mass = massCalculator.CalculateTotalMass(); - var height = headOfPLLine - TopOfLayerToBeEvaluated; + var height = headOfPlLine - TopOfLayerToBeEvaluated; var phreaticPressure = VolumicWeightOfWater*height; if (phreaticPressure > 0) @@ -92,19 +92,19 @@ /// /// Calculate soil extra height to be added to obtain the specified upliftFactor with a given head of PLline /// - /// + /// /// /// /// Required extra height - public double CalculateExtraHeight(double headOfPLLine, double upliftFactor) + public double CalculateExtraHeight(double headOfPlLine, double upliftFactor) { ThrowWhenSoilProfileIsNull(); var massCalculator = CreateSoilVolumeMassCalculator(); var mass = massCalculator.CalculateTotalMass(); var toplevel = Math.Min(SurfaceLevel, TopOfLayerToBeEvaluated); - var height = headOfPLLine - toplevel; + var height = headOfPlLine - toplevel; var phreaticPressure = VolumicWeightOfWater*height; double requiredExtraMass = upliftFactor*phreaticPressure - mass; Index: DamEngine/trunk/src/Deltares.DamEngine.TestHelpers/Factories/FactoryForPLLines.cs =================================================================== diff -u -r1121 -r1122 --- DamEngine/trunk/src/Deltares.DamEngine.TestHelpers/Factories/FactoryForPLLines.cs (.../FactoryForPLLines.cs) (revision 1121) +++ DamEngine/trunk/src/Deltares.DamEngine.TestHelpers/Factories/FactoryForPLLines.cs (.../FactoryForPLLines.cs) (revision 1122) @@ -8,8 +8,8 @@ /// /// Create simple PLline /// - /// PLLines - public static PlLines CreatePLLinesForUpliftLocationDeterminatorTests() + /// PlLines + public static PlLines CreatePlLinesForUpliftLocationDeterminatorTests() { var plLines = new PlLines(); Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/Uplift/UpliftLocationDeterminator.cs =================================================================== diff -u -r1121 -r1122 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators/Uplift/UpliftLocationDeterminator.cs (.../UpliftLocationDeterminator.cs) (revision 1121) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/Uplift/UpliftLocationDeterminator.cs (.../UpliftLocationDeterminator.cs) (revision 1122) @@ -36,7 +36,7 @@ public class UpliftLocationDeterminator { public bool IsUseOvenDryUnitWeight { get; set; } - public PlLines PLLines { get; set; } + public PlLines PlLines { get; set; } public SurfaceLine2 SurfaceLine { get; set; } public SoilProfile1D SoilProfile { get; set; } public SoilProfile2D SoilProfile2D { get; set; } @@ -60,7 +60,7 @@ /// location and upliftfactor public UpliftLocationAndResult GetLocationAndResult(double upliftCriterion) { - ThrowIfNoPLLinesDefined(); + ThrowIfNoPlLinesDefined(); ThrowIfNoSurfaceLinDefined(); ThrowIfNoSoilProfileDefined(); @@ -73,7 +73,7 @@ /// location and upliftfactor public UpliftLocationAndResult GetLocationInPolderNearestDikeWithUpliftFactorLowerThanRequired(double upliftCriterion) { - ThrowIfNoPLLinesDefined(); + ThrowIfNoPlLinesDefined(); ThrowIfNoSurfaceLinDefined(); ThrowIfNoSoilProfileDefined(); @@ -108,7 +108,7 @@ /// location and upliftfactor private UpliftCalculator CreateUpliftCalculator(GeometryPoint point, double topOfLayer, SoilProfile1D soilProfile) { - PlLine phreaticLine = PLLines.Lines[PlLineType.Pl1]; + PlLine phreaticLine = PlLines.Lines[PlLineType.Pl1]; return new UpliftCalculator { @@ -138,17 +138,17 @@ { // There is an aquitard above the aquifer, for which we can determine the uplift factor UpliftCalculator upliftCalculatorForInBetweenSandLayer = CreateUpliftCalculator(point, topInBetweenSandLayer, soilProfileInCurrentPoint); - if ( (PLLines.Lines[PlLineType.Pl4] != null) && (PLLines.Lines[PlLineType.Pl4].Points.Count > 0 )) - upliftFactorForInBetweenSandLayer = upliftCalculatorForInBetweenSandLayer.CalculateUpliftFactor(PLLines.Lines[PlLineType.Pl4].ZFromX(point.X)); + if ( (PlLines.Lines[PlLineType.Pl4] != null) && (PlLines.Lines[PlLineType.Pl4].Points.Count > 0 )) + upliftFactorForInBetweenSandLayer = upliftCalculatorForInBetweenSandLayer.CalculateUpliftFactor(PlLines.Lines[PlLineType.Pl4].ZFromX(point.X)); } else { if (soilProfileInCurrentPoint.GetBottomLevel(soilProfileInCurrentPoint.InBetweenAquiferLayer) < point.Z) { // The surface cuts into the aquifer so the level to be evaluated is at surfacelevel UpliftCalculator upliftCalculatorForInBetweenSandLayer = CreateUpliftCalculator(point, point.Z, soilProfileInCurrentPoint); - if ((PLLines.Lines[PlLineType.Pl4] != null) && (PLLines.Lines[PlLineType.Pl4].Points.Count > 0)) - upliftFactorForInBetweenSandLayer = upliftCalculatorForInBetweenSandLayer.CalculateUpliftFactor(PLLines.Lines[PlLineType.Pl4].ZFromX(point.X)); + if ((PlLines.Lines[PlLineType.Pl4] != null) && (PlLines.Lines[PlLineType.Pl4].Points.Count > 0)) + upliftFactorForInBetweenSandLayer = upliftCalculatorForInBetweenSandLayer.CalculateUpliftFactor(PlLines.Lines[PlLineType.Pl4].ZFromX(point.X)); } } @@ -162,17 +162,17 @@ if (topBottomSandLayer < point.Z) { UpliftCalculator upliftCalculatorForBottomSandLayer = CreateUpliftCalculator(point, soilProfileInCurrentPoint.BottomAquiferLayer.TopLevel, soilProfileInCurrentPoint); - if ((PLLines.Lines[PlLineType.Pl3] != null) && (PLLines.Lines[PlLineType.Pl3].Points.Count > 0)) - upliftFactorForBottomSandLayer = upliftCalculatorForBottomSandLayer.CalculateUpliftFactor(PLLines.Lines[PlLineType.Pl3].ZFromX(point.X)); + if ((PlLines.Lines[PlLineType.Pl3] != null) && (PlLines.Lines[PlLineType.Pl3].Points.Count > 0)) + upliftFactorForBottomSandLayer = upliftCalculatorForBottomSandLayer.CalculateUpliftFactor(PlLines.Lines[PlLineType.Pl3].ZFromX(point.X)); } else { if (soilProfileInCurrentPoint.GetBottomLevel(soilProfileInCurrentPoint.BottomAquiferLayer) < point.Z) { // The surface cuts into the aquifer so the level to be evaluated is at surfacelevel UpliftCalculator upliftCalculatorForInBetweenSandLayer = CreateUpliftCalculator(point, point.Z, soilProfileInCurrentPoint); - if ((PLLines.Lines[PlLineType.Pl3] != null) && (PLLines.Lines[PlLineType.Pl3].Points.Count > 0)) - upliftFactorForBottomSandLayer = upliftCalculatorForInBetweenSandLayer.CalculateUpliftFactor(PLLines.Lines[PlLineType.Pl3].ZFromX(point.X)); + if ((PlLines.Lines[PlLineType.Pl3] != null) && (PlLines.Lines[PlLineType.Pl3].Points.Count > 0)) + upliftFactorForBottomSandLayer = upliftCalculatorForInBetweenSandLayer.CalculateUpliftFactor(PlLines.Lines[PlLineType.Pl3].ZFromX(point.X)); } } @@ -200,7 +200,7 @@ { double? lowestUpliftFactor = null; - ThrowIfNoPLLinesDefined(); + ThrowIfNoPlLinesDefined(); ThrowIfNoSurfaceLinDefined(); ThrowIfNoSoilProfileDefined(); @@ -248,9 +248,9 @@ /// /// Check on precondition /// - private void ThrowIfNoPLLinesDefined() + private void ThrowIfNoPlLinesDefined() { - if (PLLines == null) + if (PlLines == null) throw new UpliftLocationDeterminatorException("Required pllines not found"); } Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/RegionalAssessment/HydraulicShortcut/HydraulicShortcutEvaluator.cs =================================================================== diff -u -r1117 -r1122 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators/RegionalAssessment/HydraulicShortcut/HydraulicShortcutEvaluator.cs (.../HydraulicShortcutEvaluator.cs) (revision 1117) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/RegionalAssessment/HydraulicShortcut/HydraulicShortcutEvaluator.cs (.../HydraulicShortcutEvaluator.cs) (revision 1122) @@ -233,7 +233,7 @@ HeadInPlLine4 = location.HeadPl4, SurfaceLine = location.SurfaceLine, WaterLevelPolder = location.PolderLevel, - ModelParametersForPlLines = location.ModelParametersForPLLines, + ModelParametersForPlLines = location.ModelParametersForPlLines, SoilProfile = soilGeometry.SoilProfile, SoilGeometry2DName = null, SoilProfileType = SoilProfileType.ProfileType1D, @@ -270,7 +270,7 @@ SoilProfile = soilGeometry.SoilProfile, SoilGeometry2DName = null, DikeEmbankmentMaterial = location.GetDikeEmbankmentSoil(), - PLLines = CreatePlLines(), + PlLines = CreatePlLines(), IsUseOvenDryUnitWeight = (dikeDrySensitivity == DikeDrySensitivity.Dry), XSoilGeometry2DOrigin = location.XSoilGeometry2DOrigin }; Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamPipingBligh/DamPipingBlighKernelWrapper.cs =================================================================== diff -u -r1117 -r1122 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamPipingBligh/DamPipingBlighKernelWrapper.cs (.../DamPipingBlighKernelWrapper.cs) (revision 1117) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamPipingBligh/DamPipingBlighKernelWrapper.cs (.../DamPipingBlighKernelWrapper.cs) (revision 1122) @@ -91,7 +91,7 @@ UpliftSituation upliftSituation = new UpliftSituation(); UpliftLocationDeterminator upliftLocationDeterminator = new UpliftLocationDeterminator { - PLLines = plLines, + PlLines = plLines, SoilProfile = soilProfile1D, SurfaceLine = surfaceLine, DikeEmbankmentMaterial = location.GetDikeEmbankmentSoil(), Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityCommon/MStabXmlDoc.cs =================================================================== diff -u -r1121 -r1122 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityCommon/MStabXmlDoc.cs (.../MStabXmlDoc.cs) (revision 1121) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityCommon/MStabXmlDoc.cs (.../MStabXmlDoc.cs) (revision 1122) @@ -101,19 +101,19 @@ scenario.Location.DikeEmbankmentMaterial; failureMechanismParametersMStab.MStabParameters.GeometryCreationOptions.MaterialForShoulder = scenario.Location.ShoulderEmbankmentMaterial; - failureMechanismParametersMStab.MStabParameters.GeometryCreationOptions.IsUseOriginalPLLineAssignments = - scenario.Location.IsUseOriginalPLLineAssignments; + failureMechanismParametersMStab.MStabParameters.GeometryCreationOptions.IsUseOriginalPlLineAssignments = + scenario.Location.IsUseOriginalPlLineAssignments; failureMechanismParametersMStab.MStabParameters.GeometryCreationOptions.IsDesign = (mstabDesignEmbankment != null); failureMechanismParametersMStab.MStabParameters.GeometryCreationOptions.XOffsetSoilGeometry2DOrigin = -scenario.Location.XSoilGeometry2DOrigin; - failureMechanismParametersMStab.MStabParameters.GeometryCreationOptions.PLLineAssignment = - CalculationHelper.PlLineCreationMethod2PlLineAssignment(scenario.Location.ModelParametersForPLLines.PlLineCreationMethod); + failureMechanismParametersMStab.MStabParameters.GeometryCreationOptions.PlLineAssignment = + CalculationHelper.PlLineCreationMethod2PlLineAssignment(scenario.Location.ModelParametersForPlLines.PlLineCreationMethod); if (scenario.Location.IntrusionVerticalWaterPressure != null) failureMechanismParametersMStab.MStabParameters.GeometryCreationOptions.IntrusionVerticalWaterPressureType = scenario.Location.IntrusionVerticalWaterPressure.Value; failureMechanismParametersMStab.MStabParameters.GeometryCreationOptions.PenetrationLength = - scenario.Location.ModelParametersForPLLines.PenetrationLength; + scenario.Location.ModelParametersForPlLines.PenetrationLength; // End of Geometry Creation Options Index: DamEngine/trunk/src/Deltares.DamEngine.Data/General/DAMEnumerations.cs =================================================================== diff -u -r1121 -r1122 --- DamEngine/trunk/src/Deltares.DamEngine.Data/General/DAMEnumerations.cs (.../DAMEnumerations.cs) (revision 1121) +++ DamEngine/trunk/src/Deltares.DamEngine.Data/General/DAMEnumerations.cs (.../DAMEnumerations.cs) (revision 1122) @@ -119,12 +119,12 @@ Wti2017 }; - public enum PLLineAssignment + public enum PlLineAssignment { - NoPLLines, + NoPlLines, ExpertKnowledge, DikeFlow, - OrginalPLLines + OrginalPlLines } public enum SoilProfileType Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityCommon/CalculationHelper.cs =================================================================== diff -u -r1117 -r1122 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityCommon/CalculationHelper.cs (.../CalculationHelper.cs) (revision 1117) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityCommon/CalculationHelper.cs (.../CalculationHelper.cs) (revision 1122) @@ -34,15 +34,15 @@ /// /// The pl line creation method. /// the pl line assignment method - public static PLLineAssignment PlLineCreationMethod2PlLineAssignment(PlLineCreationMethod plLineCreationMethod) + public static PlLineAssignment PlLineCreationMethod2PlLineAssignment(PlLineCreationMethod plLineCreationMethod) { - PLLineAssignment plLineAssignment = PLLineAssignment.ExpertKnowledge; + PlLineAssignment plLineAssignment = PlLineAssignment.ExpertKnowledge; switch (plLineCreationMethod) { case PlLineCreationMethod.ExpertKnowledgeRRD: case PlLineCreationMethod.ExpertKnowledgeLinearInDike: case PlLineCreationMethod.GaugesWithFallbackToExpertKnowledgeRRD: - plLineAssignment = PLLineAssignment.ExpertKnowledge; + plLineAssignment = PlLineAssignment.ExpertKnowledge; break; } return plLineAssignment; @@ -66,7 +66,7 @@ SoilGeometry2DName = soilGeometry2DName, SoilList = location.SoilList, DikeEmbankmentMaterial = location.GetDikeEmbankmentSoil(), - PLLines = plLines, + PlLines = plLines, XSoilGeometry2DOrigin = location.XSoilGeometry2DOrigin }; return upliftLocationDeterminator.GetLocationAtWithLowestUpliftFactor(); Index: DamEngine/trunk/src/Deltares.DamEngine.Data/General/Sensors/Sensor.cs =================================================================== diff -u -r1121 -r1122 --- DamEngine/trunk/src/Deltares.DamEngine.Data/General/Sensors/Sensor.cs (.../Sensor.cs) (revision 1121) +++ DamEngine/trunk/src/Deltares.DamEngine.Data/General/Sensors/Sensor.cs (.../Sensor.cs) (revision 1122) @@ -198,20 +198,20 @@ /// // [Specification(typeof(NotNullSpecification))] // [Specification(typeof(ContiansAtLeastOneItem))] - public PlLineType[] PLLineMappings + public PlLineType[] PlLineMappings { get { return plLineTypes.ToArray(); } set { - ClearPLLines(); + ClearPlLines(); foreach (var lineType in value) { Add(lineType); } } } - public string PLLineMappingsAsString + public string PlLineMappingsAsString { get { @@ -230,7 +230,7 @@ } set { - ClearPLLines(); + ClearPlLines(); var locPlLineTypes = ParseStringToPlLineTypes(value); foreach (var plLineType in locPlLineTypes) { @@ -286,7 +286,7 @@ /// /// Clears the PL lines list. /// - public void ClearPLLines() + public void ClearPlLines() { plLineTypes.Clear(); } Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/Common/DamPipingHelper.cs =================================================================== diff -u -r1117 -r1122 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/Common/DamPipingHelper.cs (.../DamPipingHelper.cs) (revision 1117) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/Common/DamPipingHelper.cs (.../DamPipingHelper.cs) (revision 1122) @@ -80,7 +80,7 @@ UpliftLocationDeterminator upliftLocationDeterminator = new UpliftLocationDeterminator { - PLLines = plLines, + PlLines = plLines, SoilProfile = soilProfile, SurfaceLine = surfaceLine, DikeEmbankmentMaterial = location.GetDikeEmbankmentSoil(),