Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/RegionalAssessment/RegionalScenarioSelectorTests.cs =================================================================== diff -u -r1127 -r1289 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/RegionalAssessment/RegionalScenarioSelectorTests.cs (.../RegionalScenarioSelectorTests.cs) (revision 1127) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/RegionalAssessment/RegionalScenarioSelectorTests.cs (.../RegionalScenarioSelectorTests.cs) (revision 1289) @@ -58,7 +58,7 @@ location.HeadPl3 = location.BoezemLevelHbp - 0.1; location.HeadPl4 = location.BoezemLevelHbp - 0.1; location.SurfaceLine = surfaceline; - location.LocalXZSheetPilePoint = location.SurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtRiver); + location.LocalXzSheetPilePoint = location.SurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtRiver); location.ModelFactors.UpliftCriterionStability = 1.0; location.SheetPileLength = 0.0; Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/RegionalAssessment/Evaluator/UpliftEvaluatorTests.cs =================================================================== diff -u -r1050 -r1289 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/RegionalAssessment/Evaluator/UpliftEvaluatorTests.cs (.../UpliftEvaluatorTests.cs) (revision 1050) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/RegionalAssessment/Evaluator/UpliftEvaluatorTests.cs (.../UpliftEvaluatorTests.cs) (revision 1289) @@ -74,7 +74,7 @@ location.HeadPl3 = location.BoezemLevelHbp - 0.1; location.HeadPl4 = location.BoezemLevelHbp - 0.1; location.SurfaceLine = surfaceline; - location.LocalXZSheetPilePoint = location.SurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtRiver); + location.LocalXzSheetPilePoint = location.SurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtRiver); location.ModelFactors.UpliftCriterionStability = 1.0; location.SheetPileLength = 0.0; Index: DamEngine/trunk/src/Deltares.DamEngine.Data/General/Location.cs =================================================================== diff -u -r1271 -r1289 --- DamEngine/trunk/src/Deltares.DamEngine.Data/General/Location.cs (.../Location.cs) (revision 1271) +++ DamEngine/trunk/src/Deltares.DamEngine.Data/General/Location.cs (.../Location.cs) (revision 1289) @@ -21,58 +21,44 @@ using System; using System.Collections.Generic; -using System.ComponentModel; -using System.Globalization; using System.Linq; using Deltares.DamEngine.Data.Design; using Deltares.DamEngine.Data.General.Gauges; using Deltares.DamEngine.Data.General.PlLines; using Deltares.DamEngine.Data.General.Sensors; using Deltares.DamEngine.Data.Geometry; using Deltares.DamEngine.Data.Geotechnics; -using Deltares.DamEngine.Data.Probabilistic; -using Deltares.DamEngine.Data.Standard.Language; using Deltares.DamEngine.Data.Standard.Validation; namespace Deltares.DamEngine.Data.General { public class Location { // Added initial value as these properties must be tested for real values on import - private const double BoezemLevelNotSetValue = -987654321.0; - private const double newDikeTopWidthMinValue = 0.1; - private const double newDikeSlopeInsideMinValue = 0.01; - private const double newDikeSlopeOutsideMinValue = 0.01; - private const double penetrationLenghtMinValue = 0.00; + private const double boezemLevelNotSetValue = -987654321.0; private static DamProjectType damProjectType = DamProjectType.Operational; private readonly List scenarios = new List(); - private bool areLocalXZObjectsCreated = false; - private double boezemLevelHbp = BoezemLevelNotSetValue; - private double boezemLevelLbp = BoezemLevelNotSetValue; - private double boezemLevelTp = BoezemLevelNotSetValue; + private double boezemLevelHbp = boezemLevelNotSetValue; + private double boezemLevelLbp = boezemLevelNotSetValue; + private double boezemLevelTp = boezemLevelNotSetValue; private ModelParametersForPlLines modelParametersForPlLines = new ModelParametersForPlLines(); private DamType damType = DamType.Primary; - private string description = ""; private double detrimentFactor = 0.95; private string dikeEmbankmentMaterial = ""; private SoilType dikeMaterialType = SoilType.Clay; - private double dikeTableHeight = 0.0; - private double dredgingDepth = 0; + private double dikeTableHeight; + private double dredgingDepth; 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 double layerHeightDeviation = 0; - private DistributionType layerHeightDistribution = 0; + private double? headPl2; + private double? headPl3; + private double? headPl4; + // Start of parameters that are also defined in modelparameters - private double levelReductionInside = 0; - private double levelReductionOutside = 0; - private Pl1Line localXZPL1Line; - private GeometryPoint localXZSheetPilePoint; + private Pl1Line localXzpl1Line; + private GeometryPoint localXzSheetPilePoint; private StabilityOptions stabilityOptions; private ModelFactors modelFactors = new ModelFactors(); @@ -87,7 +73,6 @@ private double newShoulderTopSlope = 1.0/20.0; // as tangent private double newSlopeAngleDitch = 1.0/0.5; // as tangent private double newWidthDitchBottom = 1.0; - private Pl1Line pL1Line; private double pLLineOffsetBelowDikeToeAtPolder = 0.1; private double pLLineOffsetBelowDikeTopAtPolder = 1.5; private double pLLineOffsetBelowDikeTopAtRiver = 0.5; @@ -96,28 +81,25 @@ private double pLLineOffsetDryBelowDikeTopAtPolder = 1.5; private double pLLineOffsetDryBelowDikeTopAtRiver = 0.5; private double pLLineOffsetDryBelowShoulderBaseInside = 0.1; - private double polderLevel = 0; - private double polderLevelLow = 0; + private double polderLevel; + private double polderLevelLow; private bool redesignDikeHeight = true; private bool redesignDikeShoulder = true; - private double rwBankProtectionBottomLevel = 0; - private double scenarioRiverLevel = 0; + private double rwBankProtectionBottomLevel; + private double scenarioRiverLevel; private Segment segment; private SensorLocation sensorData; - private double sheetPileLength = 0; - private GeometryPoint sheetPilePoint = new GeometryPoint(); + private double sheetPileLength; private string shoulderEmbankmentMaterial = ""; private double slopeAdaptionEndCotangent = 6.0; private double slopeAdaptionStartCotangent = 3.0; private double slopeAdaptionStepCotangent = 0.5; - private double slopeDampingPiezometricHeightPolderSide = 0.0; - private SoilSurfaceProfile soilSurfaceProfile = null; + private double slopeDampingPiezometricHeightPolderSide; private StabilityDesignMethod stabilityDesignMethod = StabilityDesignMethod.OptimizedSlopeAndShoulderAdaption; private double stabilityShoulderGrowDeltaX = 2.0; private double stabilityShoulderGrowSlope = 1.0/3; private double stabilitySlopeAdaptionDeltaX = 2.0; - private string surfaceLineId = ""; private bool useNewDikeSlopeInside; private bool useNewDikeSlopeOutside; private bool useNewDikeTopWidth; @@ -127,18 +109,19 @@ private bool useNewShoulderBaseSlope; private bool useNewShoulderTopSlope; private double xRdDikeLine; - private double xSoilGeometry2DOrigin = 0; - private double xrd = 0; - private double yrd = 0; + private double xSoilGeometry2DOrigin; private double? plLineOffsetFactorBelowShoulderCrest; private double? plLineOffsetBelowDikeCrestMiddle; private double? plLineOffsetDryFactorBelowShoulderCrest; private double? plLineOffsetDryBelowDikeCrestMiddle; private IntrusionVerticalWaterPressureType? intrusionVerticalWaterPressure = IntrusionVerticalWaterPressureType.Standard; - + + /// + /// Initializes a new instance of the class. + /// public Location() { SoilList = null; @@ -153,6 +136,12 @@ this.name = name; } + /// + /// Gets a value indicating whether this instance has sensor data. + /// + /// + /// true if this instance has sensor data; otherwise, false. + /// public bool HasSensorData { get @@ -161,6 +150,12 @@ } } + /// + /// Gets or sets the sensor data. + /// + /// + /// The sensor data. + /// public virtual SensorLocation SensorData { get @@ -174,18 +169,12 @@ } } - public virtual bool AreLocalXZObjectsCreated - { - get - { - return areLocalXZObjectsCreated; - } - set - { - areLocalXZObjectsCreated = value; - } - } - + /// + /// Gets or sets the name. + /// + /// + /// The name. + /// public virtual string Name { get @@ -198,42 +187,12 @@ } } - public virtual string Description - { - get - { - return description; - } - set - { - description = value; - } - } - - public virtual double XRd - { - get - { - return xrd; - } - set - { - xrd = value; - } - } - - public virtual double YRd - { - get - { - return yrd; - } - set - { - yrd = value; - } - } - + /// + /// Gets or sets the x rd dike line (for senesors). + /// + /// + /// The x rd dike line. + /// public virtual double XRdDikeLine { get @@ -246,6 +205,12 @@ } } + /// + /// Gets or sets the x soil geometry2 d origin. + /// + /// + /// The x soil geometry2 d origin. + /// public virtual double XSoilGeometry2DOrigin { get @@ -258,6 +223,12 @@ } } + /// + /// Gets or sets the dredging depth. + /// + /// + /// The dredging depth. + /// public virtual double DredgingDepth { get @@ -270,6 +241,12 @@ } } + /// + /// Gets or sets the type of the dike material. + /// + /// + /// The type of the dike material. + /// public virtual SoilType DikeMaterialType { get @@ -282,54 +259,12 @@ } } - public virtual GeometryPoint SheetPilePoint - { - get - { - return sheetPilePoint; - } - set - { - sheetPilePoint = value; - } - } - - public virtual double SheetPilePointX - { - get - { - return SheetPilePoint.X; - } - set - { - SheetPilePoint.X = value; - } - } - - public virtual double SheetPilePointY - { - get - { - return SheetPilePoint.Y; - } - set - { - SheetPilePoint.Y = value; - } - } - - [Browsable(false)]public virtual double SheetPilePointZ - { - get - { - return SheetPilePoint.Z; - } - set - { - SheetPilePoint.Z = value; - } - } - + /// + /// Gets or sets the length of the sheet pile. + /// + /// + /// The length of the sheet pile. + /// public virtual double SheetPileLength { get @@ -342,6 +277,12 @@ } } + /// + /// Gets or sets the rw bank protection bottom level. + /// + /// + /// The rw bank protection bottom level. + /// public virtual double RwBankProtectionBottomLevel { get @@ -354,58 +295,46 @@ } } - public virtual bool IsUseOriginalPlLineAssignments + /// + /// Gets or sets the local XZPL1 line. + /// + /// + /// The local XZPL1 line. + /// + public virtual Pl1Line LocalXzpl1Line { get { - return isUseOriginalPlLineAssignments; + return localXzpl1Line; } set { - isUseOriginalPlLineAssignments = value; + localXzpl1Line = value; } } - public virtual Pl1Line PL1Line - { - get - { - return pL1Line; - } - set - { - pL1Line = value; - } - } - - public virtual Pl1Line LocalXZPL1Line - { - get - { - return localXZPL1Line; - } - set - { - localXZPL1Line = value; - } - } - /// /// The surfaceline in local coordinates /// /// Composite relationship. [Validate] public virtual SurfaceLine2 SurfaceLine { get; set; } - public virtual GeometryPoint LocalXZSheetPilePoint + /// + /// Gets or sets the local xz sheet pile point. + /// + /// + /// The local xz sheet pile point. + /// + public virtual GeometryPoint LocalXzSheetPilePoint { get { - return localXZSheetPilePoint; + return localXzSheetPilePoint; } set { - localXZSheetPilePoint = value; + localXzSheetPilePoint = value; } } @@ -424,30 +353,12 @@ } } - public virtual double LevelReductionInside - { - get - { - return levelReductionInside; - } - set - { - levelReductionInside = value; - } - } - - public virtual double LevelReductionOutside - { - get - { - return levelReductionOutside; - } - set - { - levelReductionOutside = value; - } - } - + /// + /// Gets or sets the model factors. + /// + /// + /// The model factors. + /// public virtual ModelFactors ModelFactors { get @@ -460,6 +371,12 @@ } } + /// + /// Gets or sets the uplift criterion stability. + /// + /// + /// The uplift criterion stability. + /// public virtual double? UpliftCriterionStability { get @@ -472,6 +389,12 @@ } } + /// + /// Gets or sets the uplift criterion piping. + /// + /// + /// The uplift criterion piping. + /// public virtual double? UpliftCriterionPiping { get @@ -484,30 +407,12 @@ } } - public virtual DistributionType LayerHeightDistribution - { - get - { - return layerHeightDistribution; - } - set - { - layerHeightDistribution = value; - } - } - - public virtual double LayerHeightDeviation - { - get - { - return layerHeightDeviation; - } - set - { - layerHeightDeviation = value; - } - } - + /// + /// Gets or sets the detriment factor. + /// + /// + /// The detriment factor. + /// public virtual double DetrimentFactor { get @@ -520,6 +425,12 @@ } } + /// + /// Gets or sets the slope damping piezometric height polder side. + /// + /// + /// The slope damping piezometric height polder side. + /// public virtual double SlopeDampingPiezometricHeightPolderSide { get @@ -532,6 +443,12 @@ } } + /// + /// Gets or sets the height of the dike table. + /// + /// + /// The height of the dike table. + /// public virtual double DikeTableHeight { get @@ -544,6 +461,12 @@ } } + /// + /// Gets or sets the type of the dam. + /// + /// + /// The type of the dam. + /// public DamType DamType { get @@ -556,23 +479,20 @@ } } - public string SurfaceLineId - { - get - { - return surfaceLineId; - } - set - { - surfaceLineId = value; - } - } - + /// + /// Gets or sets the soil list. + /// + /// + /// The soil list. + /// public SoilList SoilList { get; set; } - - - + /// + /// Gets or sets the gauges. + /// + /// + /// The gauges. + /// public virtual IList Gauges { get @@ -585,6 +505,12 @@ } } + /// + /// Gets or sets the gauge pl lines. + /// + /// + /// The gauge pl lines. + /// public virtual IList GaugePlLines { get @@ -597,6 +523,12 @@ } } + /// + /// Gets a value indicating whether [uses gauges]. + /// + /// + /// true if [uses gauges]; otherwise, false. + /// public bool UsesGauges { get @@ -605,8 +537,20 @@ } } + /// + /// 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]. + /// + /// + /// true if [redesign dike height]; otherwise, false. + /// public bool RedesignDikeHeight { get @@ -619,6 +563,12 @@ } } + /// + /// Gets or sets a value indicating whether [redesign dike shoulder]. + /// + /// + /// true if [redesign dike shoulder]; otherwise, false. + /// public bool RedesignDikeShoulder { get @@ -631,6 +581,12 @@ } } + /// + /// Gets or sets the stability design method. + /// + /// + /// The stability design method. + /// public StabilityDesignMethod StabilityDesignMethod { get @@ -643,6 +599,12 @@ } } + /// + /// Gets or sets the slope adaption start cotangent. + /// + /// + /// The slope adaption start cotangent. + /// public double SlopeAdaptionStartCotangent { get @@ -655,6 +617,12 @@ } } + /// + /// Gets or sets the slope adaption end cotangent. + /// + /// + /// The slope adaption end cotangent. + /// public double SlopeAdaptionEndCotangent { get @@ -667,6 +635,12 @@ } } + /// + /// Gets or sets the slope adaption step cotangent. + /// + /// + /// The slope adaption step cotangent. + /// public double SlopeAdaptionStepCotangent { get @@ -679,6 +653,12 @@ } } + /// + /// Gets or sets a value indicating whether [use new dike top width]. + /// + /// + /// true if [use new dike top width]; otherwise, false. + /// public bool UseNewDikeTopWidth { get @@ -691,6 +671,12 @@ } } + /// + /// Gets or sets the new width of the dike top. + /// + /// + /// The new width of the dike top. + /// public double NewDikeTopWidth { get @@ -703,6 +689,12 @@ } } + /// + /// Gets or sets a value indicating whether [use new dike slope inside]. + /// + /// + /// true if [use new dike slope inside]; otherwise, false. + /// public bool UseNewDikeSlopeInside { get @@ -715,6 +707,12 @@ } } + /// + /// Gets or sets the new dike slope inside. + /// + /// + /// The new dike slope inside. + /// public double NewDikeSlopeInside { get @@ -727,6 +725,12 @@ } } + /// + /// Gets or sets a value indicating whether [use new dike slope outside]. + /// + /// + /// true if [use new dike slope outside]; otherwise, false. + /// public bool UseNewDikeSlopeOutside { get @@ -739,6 +743,12 @@ } } + /// + /// Gets or sets the new dike slope outside. + /// + /// + /// The new dike slope outside. + /// public double NewDikeSlopeOutside { get @@ -751,6 +761,12 @@ } } + /// + /// Gets or sets a value indicating whether [use new shoulder top slope]. + /// + /// + /// true if [use new shoulder top slope]; otherwise, false. + /// public bool UseNewShoulderTopSlope { get @@ -763,6 +779,12 @@ } } + /// + /// Gets or sets the new shoulder top slope. + /// + /// + /// The new shoulder top slope. + /// public double NewShoulderTopSlope { get @@ -775,6 +797,12 @@ } } + /// + /// Gets or sets a value indicating whether [use new shoulder base slope]. + /// + /// + /// true if [use new shoulder base slope]; otherwise, false. + /// public bool UseNewShoulderBaseSlope { get @@ -787,6 +815,12 @@ } } + /// + /// Gets or sets the new shoulder base slope. + /// + /// + /// The new shoulder base slope. + /// public double NewShoulderBaseSlope { get @@ -799,6 +833,12 @@ } } + /// + /// Gets or sets a value indicating whether [use new maximum height shoulder as fraction]. + /// + /// + /// true if [use new maximum height shoulder as fraction]; otherwise, false. + /// public bool UseNewMaxHeightShoulderAsFraction { get @@ -811,6 +851,12 @@ } } + /// + /// Gets or sets the new maximum height shoulder as fraction. + /// + /// + /// The new maximum height shoulder as fraction. + /// public double NewMaxHeightShoulderAsFraction { get @@ -823,6 +869,12 @@ } } + /// + /// Gets or sets a value indicating whether [use new minimum distance dike toe start ditch]. + /// + /// + /// true if [use new minimum distance dike toe start ditch]; otherwise, false. + /// public bool UseNewMinDistanceDikeToeStartDitch { get @@ -835,6 +887,12 @@ } } + /// + /// Gets or sets the new minimum distance dike toe start ditch. + /// + /// + /// The new minimum distance dike toe start ditch. + /// public double NewMinDistanceDikeToeStartDitch { get @@ -847,6 +905,12 @@ } } + /// + /// Gets or sets a value indicating whether [use new ditch definition]. + /// + /// + /// true if [use new ditch definition]; otherwise, false. + /// public bool UseNewDitchDefinition { get @@ -859,6 +923,12 @@ } } + /// + /// Gets or sets the new width ditch bottom. + /// + /// + /// The new width ditch bottom. + /// public double NewWidthDitchBottom { get @@ -871,6 +941,12 @@ } } + /// + /// Gets or sets the new slope angle ditch. + /// + /// + /// The new slope angle ditch. + /// public double NewSlopeAngleDitch { get @@ -884,6 +960,12 @@ } } + /// + /// Gets or sets the new depth ditch. + /// + /// + /// The new depth ditch. + /// public double NewDepthDitch { get @@ -896,6 +978,12 @@ } } + /// + /// Gets the scenarios. + /// + /// + /// The scenarios. + /// [Validate] public List Scenarios { @@ -905,6 +993,12 @@ } } + /// + /// Gets or sets the type of the dam project. + /// + /// + /// The type of the dam project. + /// public static DamProjectType DamProjectType { get @@ -917,8 +1011,12 @@ } } - #region IGeographic Members - + /// + /// Gets or sets the stability options. + /// + /// + /// The stability options. + /// public StabilityOptions StabilityOptions { get @@ -930,354 +1028,15 @@ stabilityOptions = value; } } - public double X - { - get - { - return XRd; - } - set - { - XRd = value; - } - } - public double Y - { - get - { - return YRd; - } - set - { - YRd = value; - } - } + #region Design parameters /// - /// Ensure proper Safety Factors for zone type areas by always using the detriment factor. + /// Gets or sets the dike embankment material. /// - public void EnsureProperZoneSafetyFactors() - { - if (modelFactors != null) - { - // For regional assessment, automatically fill with the detriment factor instead of error message and repairer (MWDAM-748) - if (DamProjectType == DamProjectType.AssessmentRegional) - { - modelFactors.RequiredSafetyFactorStabilityInnerSlope = detrimentFactor; - } - } - } - - /// - /// Checks whether the required safety (stability inner slope) is given as that is needed to work with zone areas. - /// - /// - [Validate] - public ValidationResult[] IsRequiredSafetySetForZoneTypeArea() - { - if (stabilityOptions != null && stabilityOptions.StabilityZoneType == MStabZonesType.ZoneAreas) - { - // For design projects, the safetey must be defined per scenario, not per location - if (DamProjectType == DamProjectType.Design && scenarios != null && scenarios.Count > 0) - { - foreach (var scenario in scenarios) - { - if (scenario.ModelFactors.RequiredSafetyFactorStabilityInnerSlope == null) - { - return new[] - { - new ValidationResult(ValidationResultType.Error, LocalizationManager.GetTranslatedText( - this, "NoRequiredSafetyForZonesScenario"), scenario) - }; - } - } - } - else - { - if (modelFactors.RequiredSafetyFactorStabilityInnerSlope == null) - { - return new[] - { - new ValidationResult(ValidationResultType.Error, LocalizationManager.GetTranslatedText( - this, "NoRequiredSafetyForZones"), this) - }; - } - } - } - return new ValidationResult[0]; - } - - [Validate] - public ValidationResult[] ValidateDikeEmbankmentMaterial() - { - if (DamProjectType == DamProjectType.Design && !HasValidDikeEmbankmentMaterial()) - { - return new[] - { - new ValidationResult(ValidationResultType.Error, LocalizationManager.GetTranslatedText( - this, "NoDikeEmbankmentMaterial"), this) - }; - } - else - { - return new ValidationResult[0]; - } - } - - [Validate] - public ValidationResult[] ValidateLocationNewDikeTopWidth() - { - if (DamProjectType == DamProjectType.Design) - { - if ((UseNewDikeTopWidth) && (NewDikeTopWidth < newDikeTopWidthMinValue)) - { - return new[] - { - new ValidationResult(ValidationResultType.Error, String.Format( - LocalizationManager.GetTranslatedText(this, "NewDikeTopWidthRangeError"), - newDikeTopWidthMinValue), this) - }; - } - } - return new ValidationResult[0]; - } - - [Validate] - public ValidationResult[] ValidateLocationNewDikeSlopeInside() - { - if (DamProjectType == DamProjectType.Design) - { - if ((UseNewDikeSlopeInside) && (NewDikeSlopeInside < newDikeSlopeInsideMinValue)) - { - return new[] - { - new ValidationResult(ValidationResultType.Error, String.Format( - LocalizationManager.GetTranslatedText(this, "NewDikeSlopeInsideRangeError"), - newDikeSlopeInsideMinValue), this) - }; - } - } - return new ValidationResult[0]; - } - - - [Validate] - public ValidationResult[] ValidateLocationNewDikeSlopeOutside() - { - if (DamProjectType == DamProjectType.Design) - { - if ((UseNewDikeSlopeOutside) && (NewDikeSlopeOutside < newDikeSlopeOutsideMinValue)) - { - return new[] - { - new ValidationResult(ValidationResultType.Error, String.Format(LocalizationManager. - GetTranslatedText(this, "NewDikeSlopeOutsideRangeError"), - newDikeSlopeOutsideMinValue), this) - }; - } - } - return new ValidationResult[0]; - } - - /// - /// Validates the use of the penetration length. - /// - /// Validation result - [Validate] - public ValidationResult[] ValidateLocationUseOfPenetrationLength() - { - if (modelParametersForPlLines.PenetrationLength > 0) - { - // It may be used on 1D geometries - if (!String.IsNullOrEmpty(this.Segment.GetMostProbableGeometry2DName(FailureMechanismSystemType.StabilityInside))) - { - // It may be used on 2D geometries only if condition below is true - if (this.IntrusionVerticalWaterPressure != IntrusionVerticalWaterPressureType.SemiTimeDependent) - { - return new[] - { - new ValidationResult(ValidationResultType.Error, String.Format( - LocalizationManager.GetTranslatedText(this, "UseOfPenetrationLengthError"), - penetrationLenghtMinValue), this) - }; - } - } - } - return new ValidationResult[0]; - } - - [Validate] - public ValidationResult[] ValidateShoulderEmbankmentMaterial() - { - if (DamProjectType == DamProjectType.Design && !HasValidShoulderEmbankmentMaterial()) - { - return new[] - { - new ValidationResult(ValidationResultType.Error, LocalizationManager.GetTranslatedText( - this, "NewDikeTopWidth"), this) - }; - } - else - { - return new ValidationResult[0]; - } - } - - /// - /// Validates the location has segment. - /// - /// - [Validate] - public ValidationResult[] ValidateLocationHasSegment() - { - if (Segment == null) - { - return new[] - { - new ValidationResult(ValidationResultType.Error, - LocalizationManager.GetTranslatedText(this, "LocationHasNoSegment"), - this) - }; - } - else - { - return new ValidationResult[0]; - } - } - - /// - /// Validates the location has valid essential assessment values. - /// - /// - [Validate] - public ValidationResult[] ValidateLocationHasValidEssentialAssessmentValues() - { - if (DamProjectType == DamProjectType.AssessmentRegional) - { - if (Math.Abs(BoezemLevelTp - BoezemLevelNotSetValue) < Double.Epsilon) - { - return new[] - { - new ValidationResult(ValidationResultType.Error, - LocalizationManager.GetTranslatedText(this, "LocationInvalidBoezemLevelTp"), - this) - }; - } - if (Math.Abs(boezemLevelHbp - BoezemLevelNotSetValue) < Double.Epsilon) - { - return new[] - { - new ValidationResult(ValidationResultType.Error, - LocalizationManager.GetTranslatedText(this, "LocationInvalidBoezemLevelHbp"), - this) - }; - } - if (Math.Abs(boezemLevelLbp - BoezemLevelNotSetValue) < Double.Epsilon) - { - return new[] - { - new ValidationResult(ValidationResultType.Error, - LocalizationManager.GetTranslatedText(this, "LocationInvalidBoezemLevelLbp"), - this) - }; - } - } - return new ValidationResult[0]; - } - - [Validate] - public ValidationResult[] ValidateDikeEmbankmentMaterialDefinedIfSurfacelineAboveSoilProfile() - { - if (IsSurfaceLineAboveSoilProfile() && !HasValidDikeEmbankmentMaterial()) - { - return new[] - { - new ValidationResult(ValidationResultType.Error, - LocalizationManager.GetTranslatedText(this, "NoDikeEmbankmentMaterialAndNeeded"), - this) - }; - } - else - { - return new ValidationResult[0]; - } - } - - /// - /// Determines whether [is pl line offset factor below shoulder crest valid]. - /// - /// - [Validate] - public ValidationResult[] IsPlLineOffsetFactorBelowShoulderCrestValid() - { - if (!IsDesign() && ArePlLineCreationExpertKnowledgeParametersNeeded() && UsePlLineOffsetFactorBelowShoulderCrest.HasValue && UsePlLineOffsetFactorBelowShoulderCrest.Value && - PlLineOffsetFactorBelowShoulderCrest.HasValue) - { - if (PlLineOffsetFactorBelowShoulderCrest.Value < DamGlobalConstants.PlLineOffsetFactorBelowShoulderCrestMinValue) - { - return new[] - { - new ValidationResult(ValidationResultType.Error, - LocalizationManager.GetTranslatedText(this, "PlLineOffsetFactorBelowShoulderCrestTooSmall"), - this) - }; - } - if (PlLineOffsetFactorBelowShoulderCrest.Value > DamGlobalConstants.PlLineOffsetFactorBelowShoulderCrestMaxValue) - { - return new[] - { - new ValidationResult(ValidationResultType.Error, - LocalizationManager.GetTranslatedText(this, "PlLineOffsetFactorBelowShoulderCrestTooLarge"), - this) - }; - } - } - return new ValidationResult[0]; - } - /// - /// Check if DikeEmbankmentMaterial is defined and is available as soil - /// - /// - private bool HasValidDikeEmbankmentMaterial() - { - return !String.IsNullOrEmpty(DikeEmbankmentMaterial) && GetDikeEmbankmentSoil() != null; - } - - /// - /// Check if ShoulderEmbankmentMaterial is defined and is available as soil - /// - /// - private bool HasValidShoulderEmbankmentMaterial() - { - return !String.IsNullOrEmpty(ShoulderEmbankmentMaterial) && GetShoulderEmbankmentSoil() != null; - } - - /// - /// Determine if surfaceline is higher than any of the 1D soilprofiles - /// - /// - private bool IsSurfaceLineAboveSoilProfile() - { - bool isSurfaceLineAboveSoilProfile = false; - if (Segment != null) - { - foreach (var soilGeometryProbability in Segment.SoilProfileProbabilities) - { - SoilProfile1D soilProfile = soilGeometryProbability.SoilProfile1D; - if (soilProfile != null) - { - isSurfaceLineAboveSoilProfile = isSurfaceLineAboveSoilProfile || (SurfaceLine.Geometry.GetMaxZ() > soilGeometryProbability.SoilProfile1D.TopLevel); - } - } - } - return isSurfaceLineAboveSoilProfile; - } - - #endregion - - #region Design parameters - + /// + /// The dike embankment material. + /// public virtual string DikeEmbankmentMaterial { get @@ -1290,6 +1049,12 @@ } } + /// + /// Gets or sets the shoulder embankment material. + /// + /// + /// The shoulder embankment material. + /// public virtual string ShoulderEmbankmentMaterial { get @@ -1302,6 +1067,12 @@ } } + /// + /// Gets or sets the stability shoulder grow slope. + /// + /// + /// The stability shoulder grow slope. + /// public virtual double StabilityShoulderGrowSlope { get @@ -1314,6 +1085,12 @@ } } + /// + /// Gets or sets the stability shoulder grow delta x. + /// + /// + /// The stability shoulder grow delta x. + /// public virtual double StabilityShoulderGrowDeltaX { get @@ -1326,6 +1103,12 @@ } } + /// + /// Gets or sets the stability slope adaption delta x. + /// + /// + /// The stability slope adaption delta x. + /// public virtual double StabilitySlopeAdaptionDeltaX { get @@ -1352,11 +1135,11 @@ { get { - return headPL2; + return headPl2; } set { - headPL2 = value; + headPl2 = value; } } @@ -1370,11 +1153,11 @@ { get { - return headPL3; + return headPl3; } set { - headPL3 = value; + headPl3 = value; } } @@ -1388,11 +1171,11 @@ { get { - return headPL4; + return headPl4; } set { - headPL4 = value; + headPl4 = value; } } @@ -1650,6 +1433,12 @@ #region Waterlevels + /// + /// Gets or sets the boezem level tp. + /// + /// + /// The boezem level tp. + /// public virtual double BoezemLevelTp { get @@ -1662,6 +1451,12 @@ } } + /// + /// Gets or sets the boezem level HBP. + /// + /// + /// The boezem level HBP. + /// public virtual double BoezemLevelHbp { get @@ -1674,6 +1469,12 @@ } } + /// + /// Gets or sets the boezem level LBP. + /// + /// + /// The boezem level LBP. + /// public virtual double BoezemLevelLbp { get @@ -1686,6 +1487,12 @@ } } + /// + /// Gets or sets the polder level. + /// + /// + /// The polder level. + /// public virtual double PolderLevel { get @@ -1698,6 +1505,12 @@ } } + /// + /// Gets or sets the polder level low. + /// + /// + /// The polder level low. + /// public virtual double PolderLevelLow { get @@ -1710,6 +1523,12 @@ } } + /// + /// Gets or sets the river level. + /// + /// + /// The river level. + /// public virtual double RiverLevel { get @@ -1724,19 +1543,6 @@ #endregion - [Validate] - public ValidationResult[] AscendingLocalXZSurfaceLine() - { - if (SurfaceLine != null) - { - return new SurfaceLine2Validator().ValidateCharacteristicPointsAreOrdered(SurfaceLine).ToArray(); - } - else - { - return new ValidationResult[0]; - } - } - /// /// Gets the dike embankment soil. /// @@ -1747,144 +1553,32 @@ { return null; } - else - { - return SoilList.GetSoilByName(DikeEmbankmentMaterial); - } + return SoilList.GetSoilByName(DikeEmbankmentMaterial); } /// - /// Gets the shoulder embankment soil. + /// Aligns the boundary points of PL1 line with adapted surface line. /// - /// - public Soil GetShoulderEmbankmentSoil() + /// The adapted surface line. + public void AlignBoundaryPointsOfPl1LineWithAdaptedSurfaceLine(SurfaceLine2 adaptedSurfaceLine) { - if ((stabilityOptions != null && String.IsNullOrEmpty(stabilityOptions.SoilDatabaseName)) || String.IsNullOrEmpty(ShoulderEmbankmentMaterial)) + if ((LocalXzpl1Line != null) && (LocalXzpl1Line.Points.Count > 1)) { - return null; - } - else - { - return SoilList.GetSoilByName(ShoulderEmbankmentMaterial); - } - } - - /// - /// Gets the most probable profile. If there are no elements in the it returns null - /// and leave the handling over to the caller - /// - /// The soil profile - public SoilProfile1D GetMostProbableProfile(FailureMechanismSystemType? segmentFailureMechanismType) - { -// if (Segment == null) -// { -// throw new ArgumentNullException(String.Format(ThrowHelper.GetResourceString(StringResourceNames.LocationHasNoSegment), Name)); -// } - - return Segment.GetMostProbableProfile(segmentFailureMechanismType); - } - - /// - /// Gets the most probable profile. If there are no elements in the it returns null - /// and leave the handling over to the caller - /// - /// The soil profile - public string GetMostProbableGeometry2DName(FailureMechanismSystemType? segmentFailureMechanismType) - { -// if (Segment == null) -// { -// throw new ArgumentNullException(String.Format(ThrowHelper.GetResourceString(StringResourceNames.LocationHasNoSegment), Name)); -// } - - return Segment.GetMostProbableGeometry2DName(segmentFailureMechanismType); - } - - /// - /// Gets a sorted list of soil geometry probabilities for a certain failure mechanism type - /// - /// The failure mechanism type - /// List of geometry probabilities - public List GetGeometryProbabilities(FailureMechanismSystemType failureMechanismType) - { - var geometryProbabilities = new List(); - if (Segment != null) - { - foreach (var existingGeometryProbability in Segment.SoilProfileProbabilities) - { - if (existingGeometryProbability.SegmentFailureMechanismType.HasValue && existingGeometryProbability.SegmentFailureMechanismType.Value == failureMechanismType) - { - geometryProbabilities.Add(existingGeometryProbability); - } - } - - geometryProbabilities.Sort(); - } - return geometryProbabilities; - } - - /// - /// Gets the combination of the surface line and soil profile for a given failure mechanism and index - /// - /// Failure mechanism type - /// The index indicates the ranking in probability - /// The probability of the soil surface profile - /// The soil surface profile - public SoilSurfaceProfile GetSoilSurfaceProfile(FailureMechanismSystemType failureMechanismType, int index, out double probability) - { - List soilGeometryProbabilities = GetGeometryProbabilities(failureMechanismType); - SoilGeometryProbability soilGeometryProbability = index < soilGeometryProbabilities.Count ? soilGeometryProbabilities[index] : null; - - SoilProfile1D originalProfile = soilGeometryProbability != null ? soilGeometryProbability.SoilProfile1D : null; - probability = soilGeometryProbability != null ? soilGeometryProbability.Probability : 0; - - if (soilSurfaceProfile == null || soilSurfaceProfile.SoilProfile != originalProfile || soilSurfaceProfile.SurfaceLine2 != SurfaceLine) - { - Soil dikeSoil = SoilList.GetSoilByName(DikeEmbankmentMaterial); - - if (soilSurfaceProfile == null) - { - soilSurfaceProfile = new SoilSurfaceProfile(); - } - // Do not assign the orginal soilprofile, because it will be changed in the class SoilSurfaceProfile - SoilProfile1D soilProfile1D; - if (originalProfile == null) - { - soilProfile1D = new SoilProfile1D(SurfaceLine.Geometry.GetMaxZ(), -10, dikeSoil); - } - else - { - soilProfile1D = new SoilProfile1D(); - soilProfile1D.Assign(originalProfile); - } - soilSurfaceProfile.SoilProfile = soilProfile1D; - soilSurfaceProfile.SurfaceLine2 = SurfaceLine; - soilSurfaceProfile.DikeEmbankmentMaterial = GetDikeEmbankmentSoil(); - - foreach (SoilLayer2D layer in soilSurfaceProfile.Surfaces) - { - if (layer.Soil == null) - { - layer.Soil = dikeSoil; - } - } - } - - return soilSurfaceProfile; - } - - public void AlignBoundaryPointsOfPL1LineWithAdaptedSurfaceLine(SurfaceLine2 adaptedSurfaceLine) - { - if ((LocalXZPL1Line != null) && (LocalXZPL1Line.Points.Count > 1)) - { - GeometryPoint lastPointPL1Line = LocalXZPL1Line.Points.Last(); + GeometryPoint lastPointPl1Line = LocalXzpl1Line.Points.Last(); GeometryPoint lastPointSurfaceLine = adaptedSurfaceLine.Geometry.Points.Last(); - lastPointPL1Line.X = lastPointSurfaceLine.X; - GeometryPoint firstPointPL1Line = LocalXZPL1Line.Points.First(); + lastPointPl1Line.X = lastPointSurfaceLine.X; + GeometryPoint firstPointPl1Line = LocalXzpl1Line.Points.First(); GeometryPoint firstPointSurfaceLine = adaptedSurfaceLine.Geometry.Points.First(); - firstPointPL1Line.X = firstPointSurfaceLine.X; + firstPointPl1Line.X = firstPointSurfaceLine.X; } } + /// + /// Gets or sets the model parameters for pl lines. + /// + /// + /// The model parameters for pl lines. + /// public ModelParametersForPlLines ModelParametersForPlLines { get @@ -1897,36 +1591,9 @@ } } - - - private bool IsDesign() - { - bool isDesign = (DamProjectType == DamProjectType.Design); - return isDesign; - } - - private bool ArePlLineCreationExpertKnowledgeParametersNeeded() - { - bool arePlLineCreationExpertKnowledgeParametersNeeded = modelParametersForPlLines.PlLineCreationMethod == - PlLineCreationMethod.ExpertKnowledgeRRD || - modelParametersForPlLines.PlLineCreationMethod == - PlLineCreationMethod.GaugesWithFallbackToExpertKnowledgeRRD; - return arePlLineCreationExpertKnowledgeParametersNeeded; - } - - public override string ToString() { - return Name; - - /* StringBuilder sb = new StringBuilder(); - sb.Append(this.Name); - if (this.Segment != null) - sb.Append(String.Format(" @ Segment {0}", this.Segment.Name)); - if (this.SurfaceLine != null) - sb.Append(String.Format(" with {0})", this.SurfaceLine.Name)); - sb.Append(String.Format(" | X={0}, Y={1}, PolderLevel={2:F2}, HeadPL2={3:F2}, HeadPl3={4:F2}", this.XRd, this.YRd, this.PolderLevel, this.HeadPL2, this.HeadPl3)); - return sb.ToString();*/ + return Name; } } } \ No newline at end of file Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/RegionalAssessment/HydraulicShortcut/HydraulicShortcutEvaluatorTests.cs =================================================================== diff -u -r1046 -r1289 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/RegionalAssessment/HydraulicShortcut/HydraulicShortcutEvaluatorTests.cs (.../HydraulicShortcutEvaluatorTests.cs) (revision 1046) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/RegionalAssessment/HydraulicShortcut/HydraulicShortcutEvaluatorTests.cs (.../HydraulicShortcutEvaluatorTests.cs) (revision 1289) @@ -67,7 +67,7 @@ // Dikematerial = clay so next check Assert.AreEqual(HydraulicShortcutType.NoHydraulicShortcut, hydraulicShortcut); - location.SheetPileLength = location.LocalXZSheetPilePoint.Z + 4.0; + location.SheetPileLength = location.LocalXzSheetPilePoint.Z + 4.0; location.RwBankProtectionBottomLevel = -4; // Top of aquifer is -5.0 @@ -169,7 +169,7 @@ location.HeadPl3 = location.BoezemLevelHbp - 0.1; location.HeadPl4 = location.BoezemLevelHbp - 0.1; location.SurfaceLine = surfaceline; - location.LocalXZSheetPilePoint = location.SurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtRiver); + location.LocalXzSheetPilePoint = location.SurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtRiver); location.SheetPileLength = 0.0; return location; Index: DamEngine/trunk/src/Deltares.DamEngine.Data/General/StabilityOptions.cs =================================================================== diff -u -r1271 -r1289 --- DamEngine/trunk/src/Deltares.DamEngine.Data/General/StabilityOptions.cs (.../StabilityOptions.cs) (revision 1271) +++ DamEngine/trunk/src/Deltares.DamEngine.Data/General/StabilityOptions.cs (.../StabilityOptions.cs) (revision 1289) @@ -19,12 +19,6 @@ // Stichting Deltares and remain full property of Stichting Deltares at all times. // All rights reserved. -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - namespace Deltares.DamEngine.Data.General { public class StabilityOptions @@ -129,26 +123,7 @@ { minimalCircleDepth = value; } - } - - /// - /// Sets the default values; taking into account which DamProjectType and DamType is set - /// - /// Type of the dam. - /// Type of the dam project. - // TODO fix hiding parameter (e.g. use field instead of parameter) - // TODO possibly set this when setting a damType and damProjectType for this location - public void SetDefaultValues(DamType damType, DamProjectType damProjectType) - { - if (damProjectType == DamProjectType.AssessmentRegional) - { - zoneAreaRestSlopeCrestWidth = 1.5; - } - else - { - zoneAreaRestSlopeCrestWidth = 3.0; - } - } + } } Index: DamEngine/trunk/src/Deltares.DamEngine.Data/General/LocationJob.cs =================================================================== diff -u -r1192 -r1289 --- DamEngine/trunk/src/Deltares.DamEngine.Data/General/LocationJob.cs (.../LocationJob.cs) (revision 1192) +++ DamEngine/trunk/src/Deltares.DamEngine.Data/General/LocationJob.cs (.../LocationJob.cs) (revision 1289) @@ -54,12 +54,6 @@ { } - /// - /// TODO: what todo when location is null? - /// - public double XRd { get { return this.Location == null ? 0 : this.Location.XRd; } } - public double YRd { get { return this.Location == null ? 0 : this.Location.YRd; } } - [Validate] public Location Location { Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/DikesDesign/DesignCalculatorCombinedSlopeAndShoulderAdaption.cs =================================================================== diff -u -r1259 -r1289 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators/DikesDesign/DesignCalculatorCombinedSlopeAndShoulderAdaption.cs (.../DesignCalculatorCombinedSlopeAndShoulderAdaption.cs) (revision 1259) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/DikesDesign/DesignCalculatorCombinedSlopeAndShoulderAdaption.cs (.../DesignCalculatorCombinedSlopeAndShoulderAdaption.cs) (revision 1289) @@ -76,7 +76,7 @@ { iterationIndex = 1; bool isRedesignRequired; - location.AlignBoundaryPointsOfPL1LineWithAdaptedSurfaceLine(surfaceLine); + location.AlignBoundaryPointsOfPl1LineWithAdaptedSurfaceLine(surfaceLine); List locationCalculationMessages; DesignCalculatorUtils.KernelCalculate(out kernelDataInput, kernelWrapper, out kernelDataOutput, damKernelInput, iterationIndex, out locationCalculationMessages); calculationMessages.AddRange(locationCalculationMessages); @@ -142,7 +142,7 @@ } // Calculate again - designScenario.Location.AlignBoundaryPointsOfPL1LineWithAdaptedSurfaceLine(surfaceLine); + designScenario.Location.AlignBoundaryPointsOfPl1LineWithAdaptedSurfaceLine(surfaceLine); damKernelInput.Location.SurfaceLine = surfaceLine; kernelWrapper.PrepareDesign(kernelDataInput, kernelDataOutput, damKernelInput, iterationIndex, out embankmentDesignParameters); DesignCalculatorUtils.KernelCalculate(out kernelDataInput, kernelWrapper, out kernelDataOutput, damKernelInput, iterationIndex, out locationCalculationMessages); Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/PlLinesCreator/PlLinesCreator.cs =================================================================== diff -u -r1258 -r1289 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators/PlLinesCreator/PlLinesCreator.cs (.../PlLinesCreator.cs) (revision 1258) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/PlLinesCreator/PlLinesCreator.cs (.../PlLinesCreator.cs) (revision 1289) @@ -940,11 +940,11 @@ PlLines plLines = new PlLines(); foreach (PlLineType plLineType in Enum.GetValues(typeof(PlLineType))) { - bool isPL1LineDefinedForLocation = (location != null) && (location.LocalXZPL1Line != null) && (location.LocalXZPL1Line.Points.Count > 1); + bool isPL1LineDefinedForLocation = (location != null) && (location.LocalXzpl1Line != null) && (location.LocalXzpl1Line.Points.Count > 1); if ((plLineType == PlLineType.Pl1) && isPL1LineDefinedForLocation) { PlLine plLine = plLines.Lines[plLineType]; - CopyPointsInPlLine(ref plLine, location.LocalXZPL1Line); + CopyPointsInPlLine(ref plLine, location.LocalXzpl1Line); } else { Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityCommon/MStabXmlDoc.cs =================================================================== diff -u -r1285 -r1289 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityCommon/MStabXmlDoc.cs (.../MStabXmlDoc.cs) (revision 1285) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityCommon/MStabXmlDoc.cs (.../MStabXmlDoc.cs) (revision 1289) @@ -109,8 +109,7 @@ location.DikeEmbankmentMaterial; failureMechanismParametersMStab.MStabParameters.GeometryCreationOptions.MaterialForShoulder = location.ShoulderEmbankmentMaterial; - failureMechanismParametersMStab.MStabParameters.GeometryCreationOptions.IsUseOriginalPlLineAssignments = - location.IsUseOriginalPlLineAssignments; + failureMechanismParametersMStab.MStabParameters.GeometryCreationOptions.IsUseOriginalPlLineAssignments = false; failureMechanismParametersMStab.MStabParameters.GeometryCreationOptions.IsDrySituation = (regionalAssessmentScenarioJobSettings.DikeDrySensitivity == DikeDrySensitivity.Dry) && (regionalAssessmentScenarioJobSettings.LoadSituation == LoadSituation.Dry); Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/DikesDesign/DesignCalculatorFirstSlopeAdaptionThenShoulderAdaption.cs =================================================================== diff -u -r1259 -r1289 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators/DikesDesign/DesignCalculatorFirstSlopeAdaptionThenShoulderAdaption.cs (.../DesignCalculatorFirstSlopeAdaptionThenShoulderAdaption.cs) (revision 1259) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/DikesDesign/DesignCalculatorFirstSlopeAdaptionThenShoulderAdaption.cs (.../DesignCalculatorFirstSlopeAdaptionThenShoulderAdaption.cs) (revision 1289) @@ -62,7 +62,7 @@ { iterationIndex = 1; bool isRedesignRequired; - location.AlignBoundaryPointsOfPL1LineWithAdaptedSurfaceLine(surfaceLine); + location.AlignBoundaryPointsOfPl1LineWithAdaptedSurfaceLine(surfaceLine); List locationCalculationMessages; DesignCalculatorUtils.KernelCalculate(out kernelDataInput, kernelWrapper, out kernelDataOutput, damKernelInput, iterationIndex, out locationCalculationMessages); calculationMessages.AddRange(locationCalculationMessages); @@ -114,7 +114,7 @@ subSoilScenario.StiFileName, surfaceLine); // Recalculate new surfaceline - location.AlignBoundaryPointsOfPL1LineWithAdaptedSurfaceLine(surfaceLine); + location.AlignBoundaryPointsOfPl1LineWithAdaptedSurfaceLine(surfaceLine); damKernelInput.Location.SurfaceLine = surfaceLine; kernelWrapper.PrepareDesign(kernelDataInput, kernelDataOutput, damKernelInput, iterationIndex, out embankmentDesignParameters); DesignCalculatorUtils.KernelCalculate(out kernelDataInput, kernelWrapper, out kernelDataOutput, damKernelInput, iterationIndex, out locationCalculationMessages); @@ -152,7 +152,7 @@ designScenario.SetRedesignedSurfaceLine(subSoilScenario.SoilProfile1D, subSoilScenario.StiFileName, surfaceLine); // Recalculate new surfaceline - designScenario.Location.AlignBoundaryPointsOfPL1LineWithAdaptedSurfaceLine(surfaceLine); + designScenario.Location.AlignBoundaryPointsOfPl1LineWithAdaptedSurfaceLine(surfaceLine); damKernelInput.Location.SurfaceLine = surfaceLine; kernelWrapper.PrepareDesign(kernelDataInput, kernelDataOutput, damKernelInput, iterationIndex, out embankmentDesignParameters); DesignCalculatorUtils.KernelCalculate(out kernelDataInput, kernelWrapper, out kernelDataOutput, damKernelInput, iterationIndex, out locationCalculationMessages);