Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityCommon/MStabXmlDoc.cs =================================================================== diff -u -r1105 -r1117 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityCommon/MStabXmlDoc.cs (.../MStabXmlDoc.cs) (revision 1105) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityCommon/MStabXmlDoc.cs (.../MStabXmlDoc.cs) (revision 1117) @@ -108,7 +108,7 @@ failureMechanismParametersMStab.MStabParameters.GeometryCreationOptions.XOffsetSoilGeometry2DOrigin = -scenario.Location.XSoilGeometry2DOrigin; failureMechanismParametersMStab.MStabParameters.GeometryCreationOptions.PLLineAssignment = - CalculationHelper.PlLineCreationMethod2PlLineAssignment(scenario.Location.ModelParametersForPLLines.PLLineCreationMethod); + CalculationHelper.PlLineCreationMethod2PlLineAssignment(scenario.Location.ModelParametersForPLLines.PlLineCreationMethod); if (scenario.Location.IntrusionVerticalWaterPressure != null) failureMechanismParametersMStab.MStabParameters.GeometryCreationOptions.IntrusionVerticalWaterPressureType = scenario.Location.IntrusionVerticalWaterPressure.Value; Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityCommon/CalculationHelper.cs =================================================================== diff -u -r949 -r1117 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityCommon/CalculationHelper.cs (.../CalculationHelper.cs) (revision 949) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityCommon/CalculationHelper.cs (.../CalculationHelper.cs) (revision 1117) @@ -34,14 +34,14 @@ /// /// 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; switch (plLineCreationMethod) { - case PLLineCreationMethod.ExpertKnowledgeRRD: - case PLLineCreationMethod.ExpertKnowledgeLinearInDike: - case PLLineCreationMethod.GaugesWithFallbackToExpertKnowledgeRRD: + case PlLineCreationMethod.ExpertKnowledgeRRD: + case PlLineCreationMethod.ExpertKnowledgeLinearInDike: + case PlLineCreationMethod.GaugesWithFallbackToExpertKnowledgeRRD: plLineAssignment = PLLineAssignment.ExpertKnowledge; break; } @@ -57,7 +57,7 @@ /// The pl lines. /// The location. /// - public static UpliftLocationAndResult GetLocationWithLowestUpliftFactor(SurfaceLine2 surfaceLine, SoilProfile1D soilProfile, string soilGeometry2DName, PLLines plLines, Location location) + public static UpliftLocationAndResult GetLocationWithLowestUpliftFactor(SurfaceLine2 surfaceLine, SoilProfile1D soilProfile, string soilGeometry2DName, PlLines plLines, Location location) { UpliftLocationDeterminator upliftLocationDeterminator = new UpliftLocationDeterminator() { Index: DamEngine/trunk/src/Deltares.DamEngine.Data/General/Location.cs =================================================================== diff -u -r1116 -r1117 --- DamEngine/trunk/src/Deltares.DamEngine.Data/General/Location.cs (.../Location.cs) (revision 1116) +++ DamEngine/trunk/src/Deltares.DamEngine.Data/General/Location.cs (.../Location.cs) (revision 1117) @@ -60,7 +60,7 @@ 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; @@ -585,7 +585,7 @@ } } - public virtual IList GaugePLLines + public virtual IList GaugePLLines { get { @@ -1907,10 +1907,10 @@ private bool ArePlLineCreationExpertKnowledgeParametersNeeded() { - bool arePlLineCreationExpertKnowledgeParametersNeeded = modelParametersForPLLines.PLLineCreationMethod == - PLLineCreationMethod.ExpertKnowledgeRRD || - modelParametersForPLLines.PLLineCreationMethod == - PLLineCreationMethod.GaugesWithFallbackToExpertKnowledgeRRD; + bool arePlLineCreationExpertKnowledgeParametersNeeded = modelParametersForPLLines.PlLineCreationMethod == + PlLineCreationMethod.ExpertKnowledgeRRD || + modelParametersForPLLines.PlLineCreationMethod == + PlLineCreationMethod.GaugesWithFallbackToExpertKnowledgeRRD; return arePlLineCreationExpertKnowledgeParametersNeeded; } Index: DamEngine/trunk/src/Deltares.DamEngine.Interface/FillXmlInputFromDam.cs =================================================================== diff -u -r1113 -r1117 --- DamEngine/trunk/src/Deltares.DamEngine.Interface/FillXmlInputFromDam.cs (.../FillXmlInputFromDam.cs) (revision 1113) +++ DamEngine/trunk/src/Deltares.DamEngine.Interface/FillXmlInputFromDam.cs (.../FillXmlInputFromDam.cs) (revision 1117) @@ -293,7 +293,7 @@ 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; Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/Common/UpliftHelper.cs =================================================================== diff -u -r1082 -r1117 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/Common/UpliftHelper.cs (.../UpliftHelper.cs) (revision 1082) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/Common/UpliftHelper.cs (.../UpliftHelper.cs) (revision 1117) @@ -60,7 +60,7 @@ } public static double? GetLowestUpliftFactor(SurfaceLine2 surfaceLine, SoilProfile1D soilProfile, string soilGeometry2DName, - PLLines plLines, Location location) + PlLines plLines, Location location) { var upliftLocationDeterminator = new UpliftLocationDeterminator() { Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/RegionalAssessment/Evaluator/UpliftEvaluator.cs =================================================================== diff -u -r1116 -r1117 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators/RegionalAssessment/Evaluator/UpliftEvaluator.cs (.../UpliftEvaluator.cs) (revision 1116) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/RegionalAssessment/Evaluator/UpliftEvaluator.cs (.../UpliftEvaluator.cs) (revision 1117) @@ -78,23 +78,23 @@ /// Create PL-lines /// /// - private PLLines CreatePlLines() + private PlLines CreatePlLines() { var plLinesCreator = new PlLinesCreator.PlLinesCreator(); double waterLevel = GetBoezemLevel(); plLinesCreator.WaterLevelRiverHigh = waterLevel; - plLinesCreator.HeadInPLLine2 = location.HeadPl2; - plLinesCreator.HeadInPLLine3 = location.HeadPl3; - plLinesCreator.HeadInPLLine4 = location.HeadPl4; + plLinesCreator.HeadInPlLine2 = location.HeadPl2; + plLinesCreator.HeadInPlLine3 = location.HeadPl3; + plLinesCreator.HeadInPlLine4 = location.HeadPl4; 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; - plLinesCreator.GaugePLLines = null; + plLinesCreator.GaugePlLines = null; plLinesCreator.Gauges = null; plLinesCreator.GaugeMissVal = 0.0; plLinesCreator.IsAdjustPL3AndPL4SoNoUpliftWillOccurEnabled = true; // for stability this must set to true @@ -104,7 +104,7 @@ plLinesCreator.IsUseOvenDryUnitWeight = (dikeDrySensitivity == DikeDrySensitivity.Dry); plLinesCreator.IsHydraulicShortcut = (hydraulicShortcutType == HydraulicShortcutType.HydraulicShortcut); plLinesCreator.XSoilGeometry2DOrigin = location.XSoilGeometry2DOrigin; - var plLines = plLinesCreator.CreateAllPLLines(location); + var plLines = plLinesCreator.CreateAllPlLines(location); return plLines; } Index: DamEngine/trunk/src/Deltares.DamEngine.Data/General/Dike.cs =================================================================== diff -u -r992 -r1117 --- DamEngine/trunk/src/Deltares.DamEngine.Data/General/Dike.cs (.../Dike.cs) (revision 992) +++ DamEngine/trunk/src/Deltares.DamEngine.Data/General/Dike.cs (.../Dike.cs) (revision 1117) @@ -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,7 +176,7 @@ } [Browsable(false)] - public virtual IList GaugePLLines + public virtual IList GaugePLLines { get { return this.gaugePLLines; } set { this.gaugePLLines = value; } Index: DamEngine/trunk/src/Deltares.DamEngine.TestHelpers/Factories/FactoryForPLLines.cs =================================================================== diff -u -r1116 -r1117 --- DamEngine/trunk/src/Deltares.DamEngine.TestHelpers/Factories/FactoryForPLLines.cs (.../FactoryForPLLines.cs) (revision 1116) +++ DamEngine/trunk/src/Deltares.DamEngine.TestHelpers/Factories/FactoryForPLLines.cs (.../FactoryForPLLines.cs) (revision 1117) @@ -9,22 +9,22 @@ /// Create simple PLline /// /// PLLines - public static PLLines CreatePLLinesForUpliftLocationDeterminatorTests() + public static PlLines CreatePLLinesForUpliftLocationDeterminatorTests() { - var plLines = new PLLines(); + var plLines = new PlLines(); - plLines.Lines[PLLineType.PL1] = new PLLine(); - plLines.Lines[PLLineType.PL1].Points.Add(new PLLinePoint(0, 1.5)); - plLines.Lines[PLLineType.PL1].Points.Add(new PLLinePoint(13, 1.5)); - plLines.Lines[PLLineType.PL2] = new PLLine(); - plLines.Lines[PLLineType.PL2].Points.Add(new PLLinePoint(0, 4)); - plLines.Lines[PLLineType.PL2].Points.Add(new PLLinePoint(13, 4)); - plLines.Lines[PLLineType.PL3] = new PLLine(); - plLines.Lines[PLLineType.PL3].Points.Add(new PLLinePoint(0, 2)); - plLines.Lines[PLLineType.PL3].Points.Add(new PLLinePoint(13, 2)); - plLines.Lines[PLLineType.PL4] = new PLLine(); - plLines.Lines[PLLineType.PL4].Points.Add(new PLLinePoint(0, 3)); - plLines.Lines[PLLineType.PL4].Points.Add(new PLLinePoint(13, 3)); + plLines.Lines[PlLineType.PL1] = new PlLine(); + plLines.Lines[PlLineType.PL1].Points.Add(new PlLinePoint(0, 1.5)); + plLines.Lines[PlLineType.PL1].Points.Add(new PlLinePoint(13, 1.5)); + plLines.Lines[PlLineType.PL2] = new PlLine(); + plLines.Lines[PlLineType.PL2].Points.Add(new PlLinePoint(0, 4)); + plLines.Lines[PlLineType.PL2].Points.Add(new PlLinePoint(13, 4)); + plLines.Lines[PlLineType.PL3] = new PlLine(); + plLines.Lines[PlLineType.PL3].Points.Add(new PlLinePoint(0, 2)); + plLines.Lines[PlLineType.PL3].Points.Add(new PlLinePoint(13, 2)); + plLines.Lines[PlLineType.PL4] = new PlLine(); + plLines.Lines[PlLineType.PL4].Points.Add(new PlLinePoint(0, 3)); + plLines.Lines[PlLineType.PL4].Points.Add(new PlLinePoint(13, 3)); return plLines; } } Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/Common/PlLinesHelperTests.cs =================================================================== diff -u -r1081 -r1117 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/Common/PlLinesHelperTests.cs (.../PlLinesHelperTests.cs) (revision 1081) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/Common/PlLinesHelperTests.cs (.../PlLinesHelperTests.cs) (revision 1117) @@ -42,20 +42,20 @@ UpliftSituation upliftSituation; var plLines = PlLinesHelper.CreatePlLinesForPiping(location, soilProfile1D, riverLevel, out upliftSituation); Assert.AreEqual(4, plLines.PLLineCount); - Assert.AreEqual(8, plLines.Lines[PLLineType.PL1].Points.Count); - Assert.IsTrue(new PLLinePoint(0.000, 1.000).LocationEquals(plLines.Lines[PLLineType.PL1].Points[0])); - Assert.IsTrue(new PLLinePoint(14.900, 1.000).LocationEquals(plLines.Lines[PLLineType.PL1].Points[1])); - Assert.IsTrue(new PLLinePoint(34.500, 0.500).LocationEquals(plLines.Lines[PLLineType.PL1].Points[2])); - Assert.IsTrue(new PLLinePoint(40.500, 0.000).LocationEquals(plLines.Lines[PLLineType.PL1].Points[3])); - Assert.IsTrue(new PLLinePoint(50.500, 0.000).LocationEquals(plLines.Lines[PLLineType.PL1].Points[4])); - Assert.IsTrue(new PLLinePoint(58.500, 0.000).LocationEquals(plLines.Lines[PLLineType.PL1].Points[5])); - Assert.IsTrue(new PLLinePoint(61.500, 0.000).LocationEquals(plLines.Lines[PLLineType.PL1].Points[6])); - Assert.IsTrue(new PLLinePoint(75.000, 0.000).LocationEquals(plLines.Lines[PLLineType.PL1].Points[7])); - Assert.AreEqual(0, plLines.Lines[PLLineType.PL2].Points.Count); - Assert.AreEqual(2, plLines.Lines[PLLineType.PL3].Points.Count); - Assert.IsTrue(new PLLinePoint(0.000, 1.000).LocationEquals(plLines.Lines[PLLineType.PL3].Points[0])); - Assert.IsTrue(new PLLinePoint(75.000, 1.000).LocationEquals(plLines.Lines[PLLineType.PL3].Points[1])); - Assert.AreEqual(0, plLines.Lines[PLLineType.PL4].Points.Count); + Assert.AreEqual(8, plLines.Lines[PlLineType.PL1].Points.Count); + Assert.IsTrue(new PlLinePoint(0.000, 1.000).LocationEquals(plLines.Lines[PlLineType.PL1].Points[0])); + Assert.IsTrue(new PlLinePoint(14.900, 1.000).LocationEquals(plLines.Lines[PlLineType.PL1].Points[1])); + Assert.IsTrue(new PlLinePoint(34.500, 0.500).LocationEquals(plLines.Lines[PlLineType.PL1].Points[2])); + Assert.IsTrue(new PlLinePoint(40.500, 0.000).LocationEquals(plLines.Lines[PlLineType.PL1].Points[3])); + Assert.IsTrue(new PlLinePoint(50.500, 0.000).LocationEquals(plLines.Lines[PlLineType.PL1].Points[4])); + Assert.IsTrue(new PlLinePoint(58.500, 0.000).LocationEquals(plLines.Lines[PlLineType.PL1].Points[5])); + Assert.IsTrue(new PlLinePoint(61.500, 0.000).LocationEquals(plLines.Lines[PlLineType.PL1].Points[6])); + Assert.IsTrue(new PlLinePoint(75.000, 0.000).LocationEquals(plLines.Lines[PlLineType.PL1].Points[7])); + Assert.AreEqual(0, plLines.Lines[PlLineType.PL2].Points.Count); + Assert.AreEqual(2, plLines.Lines[PlLineType.PL3].Points.Count); + Assert.IsTrue(new PlLinePoint(0.000, 1.000).LocationEquals(plLines.Lines[PlLineType.PL3].Points[0])); + Assert.IsTrue(new PlLinePoint(75.000, 1.000).LocationEquals(plLines.Lines[PlLineType.PL3].Points[1])); + Assert.AreEqual(0, plLines.Lines[PlLineType.PL4].Points.Count); } } Index: DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/ConversionHelperTests.cs =================================================================== diff -u -r1062 -r1117 --- DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/ConversionHelperTests.cs (.../ConversionHelperTests.cs) (revision 1062) +++ DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/ConversionHelperTests.cs (.../ConversionHelperTests.cs) (revision 1117) @@ -53,23 +53,23 @@ } [Test] - [TestCase(PLLineCreationMethod.ExpertKnowledgeLinearInDike, LocationWaternetOptionsPhreaticLineCreationMethod.ExpertKnowledgeLinearInDike)] - [TestCase(PLLineCreationMethod.ExpertKnowledgeRRD, LocationWaternetOptionsPhreaticLineCreationMethod.ExpertKnowledgeRRD)] - [TestCase(PLLineCreationMethod.GaugesWithFallbackToExpertKnowledgeRRD, LocationWaternetOptionsPhreaticLineCreationMethod.GaugesWithFallbackToExpertKnowledgeRRD)] - [TestCase(PLLineCreationMethod.None, LocationWaternetOptionsPhreaticLineCreationMethod.None)] - [TestCase(PLLineCreationMethod.Sensors, LocationWaternetOptionsPhreaticLineCreationMethod.Sensors)] - public void CanConvertToPlLineCreationMethod(PLLineCreationMethod plLineCreationMethod, LocationWaternetOptionsPhreaticLineCreationMethod inputPhreaticLineCreationMethod) + [TestCase(PlLineCreationMethod.ExpertKnowledgeLinearInDike, LocationWaternetOptionsPhreaticLineCreationMethod.ExpertKnowledgeLinearInDike)] + [TestCase(PlLineCreationMethod.ExpertKnowledgeRRD, LocationWaternetOptionsPhreaticLineCreationMethod.ExpertKnowledgeRRD)] + [TestCase(PlLineCreationMethod.GaugesWithFallbackToExpertKnowledgeRRD, LocationWaternetOptionsPhreaticLineCreationMethod.GaugesWithFallbackToExpertKnowledgeRRD)] + [TestCase(PlLineCreationMethod.None, LocationWaternetOptionsPhreaticLineCreationMethod.None)] + [TestCase(PlLineCreationMethod.Sensors, LocationWaternetOptionsPhreaticLineCreationMethod.Sensors)] + public void CanConvertToPlLineCreationMethod(PlLineCreationMethod plLineCreationMethod, LocationWaternetOptionsPhreaticLineCreationMethod inputPhreaticLineCreationMethod) { Assert.AreEqual(inputPhreaticLineCreationMethod, ConversionHelper.ConvertToInputPhreaticLineCreationMethod(plLineCreationMethod)); } [Test] - [TestCase(LocationWaternetOptionsPhreaticLineCreationMethod.ExpertKnowledgeLinearInDike, PLLineCreationMethod.ExpertKnowledgeLinearInDike)] - [TestCase(LocationWaternetOptionsPhreaticLineCreationMethod.ExpertKnowledgeRRD, PLLineCreationMethod.ExpertKnowledgeRRD)] - [TestCase(LocationWaternetOptionsPhreaticLineCreationMethod.GaugesWithFallbackToExpertKnowledgeRRD, PLLineCreationMethod.GaugesWithFallbackToExpertKnowledgeRRD)] - [TestCase(LocationWaternetOptionsPhreaticLineCreationMethod.None, PLLineCreationMethod.None)] - [TestCase(LocationWaternetOptionsPhreaticLineCreationMethod.Sensors, PLLineCreationMethod.Sensors)] - public void CanConvertToInputPlLineCreationMethod(LocationWaternetOptionsPhreaticLineCreationMethod inputPhreaticLineCreationMethod, PLLineCreationMethod plLineCreationMethod) + [TestCase(LocationWaternetOptionsPhreaticLineCreationMethod.ExpertKnowledgeLinearInDike, PlLineCreationMethod.ExpertKnowledgeLinearInDike)] + [TestCase(LocationWaternetOptionsPhreaticLineCreationMethod.ExpertKnowledgeRRD, PlLineCreationMethod.ExpertKnowledgeRRD)] + [TestCase(LocationWaternetOptionsPhreaticLineCreationMethod.GaugesWithFallbackToExpertKnowledgeRRD, PlLineCreationMethod.GaugesWithFallbackToExpertKnowledgeRRD)] + [TestCase(LocationWaternetOptionsPhreaticLineCreationMethod.None, PlLineCreationMethod.None)] + [TestCase(LocationWaternetOptionsPhreaticLineCreationMethod.Sensors, PlLineCreationMethod.Sensors)] + public void CanConvertToInputPlLineCreationMethod(LocationWaternetOptionsPhreaticLineCreationMethod inputPhreaticLineCreationMethod, PlLineCreationMethod plLineCreationMethod) { Assert.AreEqual(plLineCreationMethod, ConversionHelper.ConvertToPhreaticLineCreationMethod(inputPhreaticLineCreationMethod)); } Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamPipingBligh/DamPipingBlighKernelWrapper.cs =================================================================== diff -u -r1082 -r1117 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamPipingBligh/DamPipingBlighKernelWrapper.cs (.../DamPipingBlighKernelWrapper.cs) (revision 1082) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamPipingBligh/DamPipingBlighKernelWrapper.cs (.../DamPipingBlighKernelWrapper.cs) (revision 1117) @@ -74,15 +74,15 @@ var location = damKernelInput.Location; double waterLevel = damKernelInput.RiverLevelHigh; UpliftSituation upliftSituation; - PLLines plLines = PlLinesHelper.CreatePlLinesForPiping(location, soilProfile1D, waterLevel, out upliftSituation); + PlLines plLines = PlLinesHelper.CreatePlLinesForPiping(location, soilProfile1D, waterLevel, out upliftSituation); EvaluateUpliftSituation(damKernelInput, out kernelDataInput, plLines, damPipingBlighInput, waterLevel, damPipingBlighOutput); return PrepareResult.Successful; } kernelDataInput = null; return PrepareResult.NotRelevant; } - private static void EvaluateUpliftSituation(DamKernelInput damKernelInput, out IKernelDataInput kernelDataInput, PLLines plLines, DamPipingBlighInput damPipingBlighInput, double waterLevel, DamPipingBlighOutput damPipingBlighOutput) + private static void EvaluateUpliftSituation(DamKernelInput damKernelInput, out IKernelDataInput kernelDataInput, PlLines plLines, DamPipingBlighInput damPipingBlighInput, double waterLevel, DamPipingBlighOutput damPipingBlighOutput) { const double upliftCriterionTolerance = 0.000000001; SoilProfile1D soilProfile1D = damKernelInput.SubSoilScenario.SoilProfile1D; @@ -300,7 +300,7 @@ SoilProfile1D soilProfile = damKernelInput.SubSoilScenario.SoilProfile1D; SurfaceLine2 surfaceLine = damKernelInput.Location.SurfaceLine; - PLLines plLines; + PlLines plLines; UpliftLocationAndResult upliftLocationAndResult; DamPipingHelper.DeterminePlLinesAndUpliftLocation(damKernelInput, point, out plLines, out upliftLocationAndResult); Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/PlLinesCreator/PlLinesCreatorTest.cs =================================================================== diff -u -r1116 -r1117 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/PlLinesCreator/PlLinesCreatorTest.cs (.../PlLinesCreatorTest.cs) (revision 1116) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/PlLinesCreator/PlLinesCreatorTest.cs (.../PlLinesCreatorTest.cs) (revision 1117) @@ -59,13 +59,13 @@ Assert.IsNotNull(plLineCreator); plLineCreator.SoilProfile = FactoryForSoilProfiles.CreateComplexProfile(); plLineCreator.WaterLevelRiverHigh = 4.0; - plLineCreator.ModelParametersForPLLines.DampingFactorPL3 = 0.3; - plLineCreator.ModelParametersForPLLines.DampingFactorPL4 = 0.4; - plLineCreator.ModelParametersForPLLines.PLLineCreationMethod = PLLineCreationMethod.ExpertKnowledgeLinearInDike; + plLineCreator.ModelParametersForPlLines.DampingFactorPL3 = 0.3; + plLineCreator.ModelParametersForPlLines.DampingFactorPL4 = 0.4; + plLineCreator.ModelParametersForPlLines.PlLineCreationMethod = PlLineCreationMethod.ExpertKnowledgeLinearInDike; plLineCreator.SoilProfile = FactoryForSoilProfiles.CreateClaySandClaySandProfile(); plLineCreator.SurfaceLine = surfacelineSimpleDike; plLineCreator.WaterLevelPolder = plLineCreator.SurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtPolder).Z + 1.0; - PLLine plLine = plLineCreator.CreatePLLineByExpertKnowledge(PLLineType.PL1, DamType.Regional, 0.02); + PlLine plLine = plLineCreator.CreatePlLineByExpertKnowledge(PlLineType.PL1, DamType.Regional, 0.02); Assert.AreEqual(4, plLine.Points.Count); Assert.AreEqual(0.0, plLine.Points[0].X, cTolerance); Assert.AreEqual(4.0, plLine.Points[0].Z, cTolerance); @@ -76,10 +76,10 @@ Assert.AreEqual(12, plLine.Points[3].X, cTolerance); Assert.AreEqual(plLineCreator.WaterLevelPolder, plLine.Points[3].Z, cTolerance); - plLineCreator.ModelParametersForPLLines.PLLineCreationMethod = PLLineCreationMethod.ExpertKnowledgeRRD; + plLineCreator.ModelParametersForPlLines.PlLineCreationMethod = PlLineCreationMethod.ExpertKnowledgeRRD; plLineCreator.PlLineOffsetBelowDikeTopAtRiver = 0.5; // Default value plLineCreator.PlLineOffsetBelowDikeTopAtPolder = 1.5; // Default value - plLine = plLineCreator.CreatePLLineByExpertKnowledge(PLLineType.PL1, DamType.Regional, 0.02); + plLine = plLineCreator.CreatePlLineByExpertKnowledge(PlLineType.PL1, DamType.Regional, 0.02); Assert.AreEqual(6, plLine.Points.Count); Assert.AreEqual(0.0, plLine.Points[0].X, cTolerance); Assert.AreEqual(4.0, plLine.Points[0].Z, cTolerance); @@ -109,15 +109,15 @@ Assert.IsNotNull(plLineCreator); plLineCreator.SoilProfile = FactoryForSoilProfiles.CreateComplexProfile(); plLineCreator.WaterLevelRiverHigh = 4.0; - plLineCreator.ModelParametersForPLLines.DampingFactorPL3 = 0.3; - plLineCreator.ModelParametersForPLLines.DampingFactorPL4 = 0.4; - plLineCreator.ModelParametersForPLLines.PLLineCreationMethod = PLLineCreationMethod.ExpertKnowledgeRRD; + 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; plLineCreator.SoilProfile = FactoryForSoilProfiles.CreateClaySandClaySandProfile(); plLineCreator.SurfaceLine = surfacelineDikeWithSlopingShoulder; plLineCreator.WaterLevelPolder = 2.75; // CharacteristicPointType.ShoulderTopInside.Z = 2.5; CharacteristicPointType.ShoulderBaseInside.Z = 3.0); - PLLine plLine = plLineCreator.CreatePLLineByExpertKnowledge(PLLineType.PL1, DamType.Regional, 0.02); + PlLine plLine = plLineCreator.CreatePlLineByExpertKnowledge(PlLineType.PL1, DamType.Regional, 0.02); Assert.AreEqual(7, plLine.Points.Count); Assert.AreEqual(0.0, plLine.Points[0].X, cTolerance); Assert.AreEqual(4.0, plLine.Points[0].Z, cTolerance); @@ -149,16 +149,16 @@ Assert.IsNotNull(plLineCreator); plLineCreator.SoilProfile = FactoryForSoilProfiles.CreateComplexProfile(); plLineCreator.WaterLevelRiverHigh = 4.5; - plLineCreator.ModelParametersForPLLines.DampingFactorPL3 = 0.3; - plLineCreator.ModelParametersForPLLines.DampingFactorPL4 = 0.4; - plLineCreator.ModelParametersForPLLines.PLLineCreationMethod = PLLineCreationMethod.ExpertKnowledgeRRD; + 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; plLineCreator.SoilProfile = FactoryForSoilProfiles.CreateClaySandClaySandProfile(); plLineCreator.SurfaceLine = surfacelineDikeWithSlopingShoulder; plLineCreator.WaterLevelPolder = 3.25; // CharacteristicPointType.ShoulderBaseInside.Z = 3.0); Lower than PlLineOffsetBelowDikeTopAtPolder - PLLine plLine = plLineCreator.CreatePLLineByExpertKnowledge(PLLineType.PL1, DamType.Regional, 0.02); + PlLine plLine = plLineCreator.CreatePlLineByExpertKnowledge(PlLineType.PL1, DamType.Regional, 0.02); Assert.AreEqual(6, plLine.Points.Count); Assert.AreEqual(0.0, plLine.Points[0].X, cTolerance); Assert.AreEqual(4.5, plLine.Points[0].Z, cTolerance); @@ -174,7 +174,7 @@ Assert.AreEqual(plLineCreator.WaterLevelPolder, plLine.Points[5].Z, cTolerance); plLineCreator.WaterLevelPolder = 3.75; // CharacteristicPointType.ShoulderBaseInside.Z = 3.0); Higher than PlLineOffsetBelowDikeTopAtPolder - plLine = plLineCreator.CreatePLLineByExpertKnowledge(PLLineType.PL1, DamType.Regional, 0.02); + plLine = plLineCreator.CreatePlLineByExpertKnowledge(PlLineType.PL1, DamType.Regional, 0.02); Assert.AreEqual(6, plLine.Points.Count); Assert.AreEqual(0.0, plLine.Points[0].X, cTolerance); Assert.AreEqual(4.5, plLine.Points[0].Z, cTolerance); @@ -190,7 +190,7 @@ Assert.AreEqual(plLineCreator.WaterLevelPolder, plLine.Points[5].Z, cTolerance); plLineCreator.WaterLevelPolder = 4.25; // CharacteristicPointType.ShoulderBaseInside.Z = 3.0); Higher than PlLineOffsetBelowDikeTopAtRiver - plLine = plLineCreator.CreatePLLineByExpertKnowledge(PLLineType.PL1, DamType.Regional, 0.02); + plLine = plLineCreator.CreatePlLineByExpertKnowledge(PlLineType.PL1, DamType.Regional, 0.02); Assert.AreEqual(6, plLine.Points.Count); Assert.AreEqual(0.0, plLine.Points[0].X, cTolerance); Assert.AreEqual(4.5, plLine.Points[0].Z, cTolerance); @@ -219,13 +219,13 @@ Assert.IsNotNull(plLineCreator); plLineCreator.SoilProfile = FactoryForSoilProfiles.CreateComplexProfile(); plLineCreator.WaterLevelRiverHigh = 4.0; - plLineCreator.ModelParametersForPLLines.DampingFactorPL3 = 0.3; - plLineCreator.ModelParametersForPLLines.DampingFactorPL4 = 0.4; - plLineCreator.ModelParametersForPLLines.PLLineCreationMethod = PLLineCreationMethod.ExpertKnowledgeLinearInDike; + plLineCreator.ModelParametersForPlLines.DampingFactorPL3 = 0.3; + plLineCreator.ModelParametersForPlLines.DampingFactorPL4 = 0.4; + plLineCreator.ModelParametersForPlLines.PlLineCreationMethod = PlLineCreationMethod.ExpertKnowledgeLinearInDike; plLineCreator.SoilProfile = FactoryForSoilProfiles.CreateClaySandClaySandProfile(); plLineCreator.SurfaceLine = surfacelineSimpleDike; plLineCreator.WaterLevelPolder = plLineCreator.SurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeTopAtPolder).Z + 0.1; - PLLine plLine = plLineCreator.CreatePLLineByExpertKnowledge(PLLineType.PL1, DamType.Regional, 0.02); + PlLine plLine = plLineCreator.CreatePlLineByExpertKnowledge(PlLineType.PL1, DamType.Regional, 0.02); } } @@ -242,13 +242,13 @@ Assert.IsNotNull(plLineCreator); plLineCreator.SoilProfile = FactoryForSoilProfiles.CreateComplexProfile(); plLineCreator.WaterLevelRiverHigh = 4.0; - plLineCreator.ModelParametersForPLLines.DampingFactorPL3 = 0.3; - plLineCreator.ModelParametersForPLLines.DampingFactorPL4 = 0.4; - plLineCreator.ModelParametersForPLLines.PLLineCreationMethod = PLLineCreationMethod.ExpertKnowledgeLinearInDike; + plLineCreator.ModelParametersForPlLines.DampingFactorPL3 = 0.3; + plLineCreator.ModelParametersForPlLines.DampingFactorPL4 = 0.4; + plLineCreator.ModelParametersForPlLines.PlLineCreationMethod = PlLineCreationMethod.ExpertKnowledgeLinearInDike; plLineCreator.SoilProfile = FactoryForSoilProfiles.CreateClaySandClaySandProfile(); plLineCreator.SurfaceLine = surfacelineSimpleDike; plLineCreator.WaterLevelPolder = plLineCreator.SurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtPolder).Z - 1.0; - PLLine plLine = plLineCreator.CreatePLLineByExpertKnowledge(PLLineType.PL1, DamType.Regional, 0.02); + PlLine plLine = plLineCreator.CreatePlLineByExpertKnowledge(PlLineType.PL1, DamType.Regional, 0.02); Assert.AreEqual(4, plLine.Points.Count); Assert.AreEqual(0.0, plLine.Points[0].X, cTolerance); Assert.AreEqual(4.0, plLine.Points[0].Z, cTolerance); @@ -274,9 +274,9 @@ Assert.IsNotNull(plLineCreator); plLineCreator.SoilProfile = FactoryForSoilProfiles.CreateComplexProfile(); plLineCreator.WaterLevelRiverHigh = 4.0; - plLineCreator.ModelParametersForPLLines.DampingFactorPL3 = 0.3; - plLineCreator.ModelParametersForPLLines.DampingFactorPL4 = 0.4; - plLineCreator.ModelParametersForPLLines.PLLineCreationMethod = PLLineCreationMethod.ExpertKnowledgeLinearInDike; + plLineCreator.ModelParametersForPlLines.DampingFactorPL3 = 0.3; + plLineCreator.ModelParametersForPlLines.DampingFactorPL4 = 0.4; + plLineCreator.ModelParametersForPlLines.PlLineCreationMethod = PlLineCreationMethod.ExpertKnowledgeLinearInDike; plLineCreator.SoilProfile = FactoryForSoilProfiles.CreateClaySandClaySandProfile(); plLineCreator.SurfaceLine = surfacelineSimpleDike; // Add shoulder; this should not affect the creation of the phreatic line @@ -285,7 +285,7 @@ plLineCreator.SurfaceLine.Geometry.SyncCalcPoints(); plLineCreator.SurfaceLine.SortPoints(); plLineCreator.WaterLevelPolder = plLineCreator.SurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtPolder).Z - 1.0; - PLLine plLine = plLineCreator.CreatePLLineByExpertKnowledge(PLLineType.PL1, DamType.Regional, 0.02); + PlLine plLine = plLineCreator.CreatePlLineByExpertKnowledge(PlLineType.PL1, DamType.Regional, 0.02); Assert.AreEqual(4, plLine.Points.Count); Assert.AreEqual(0.0, plLine.Points[0].X, cTolerance); Assert.AreEqual(4.0, plLine.Points[0].Z, cTolerance); @@ -313,13 +313,13 @@ 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.PLLineCreationMethod = PLLineCreationMethod.ExpertKnowledgeLinearInDike; + plLineCreator.ModelParametersForPlLines.DampingFactorPL3 = 0.3; + plLineCreator.ModelParametersForPlLines.DampingFactorPL4 = 0.4; + plLineCreator.ModelParametersForPlLines.PlLineCreationMethod = PlLineCreationMethod.ExpertKnowledgeLinearInDike; plLineCreator.SoilProfile = FactoryForSoilProfiles.CreateClaySandClaySandProfile(); plLineCreator.SurfaceLine = surfacelineSimpleDike; plLineCreator.WaterLevelPolder = plLineCreator.SurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtPolder).Z - 1.0; - PLLine plLine = plLineCreator.CreatePLLineByExpertKnowledge(PLLineType.PL1, DamType.Regional, 0.02); + PlLine plLine = plLineCreator.CreatePlLineByExpertKnowledge(PlLineType.PL1, DamType.Regional, 0.02); Assert.AreEqual(5, plLine.Points.Count); Assert.AreEqual(0.0, plLine.Points[0].X, cTolerance); Assert.AreEqual(3.0, plLine.Points[0].Z, cTolerance); @@ -349,13 +349,13 @@ 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.PLLineCreationMethod = PLLineCreationMethod.ExpertKnowledgeLinearInDike; + plLineCreator.ModelParametersForPlLines.DampingFactorPL3 = 0.3; + plLineCreator.ModelParametersForPlLines.DampingFactorPL4 = 0.4; + plLineCreator.ModelParametersForPlLines.PlLineCreationMethod = PlLineCreationMethod.ExpertKnowledgeLinearInDike; plLineCreator.SoilProfile = FactoryForSoilProfiles.CreateClaySandClaySandProfile(); plLineCreator.SurfaceLine = surfacelineSimpleDike; plLineCreator.WaterLevelPolder = plLineCreator.SurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtPolder).Z - 1.0; - PLLine plLine = plLineCreator.CreatePLLineByExpertKnowledge(PLLineType.PL1, DamType.Regional, 0.02); + PlLine plLine = plLineCreator.CreatePlLineByExpertKnowledge(PlLineType.PL1, DamType.Regional, 0.02); Assert.AreEqual(5, plLine.Points.Count); Assert.AreEqual(0.0, plLine.Points[0].X, cTolerance); Assert.AreEqual(2.0, plLine.Points[0].Z, cTolerance); @@ -392,9 +392,9 @@ 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.PLLineCreationMethod = PLLineCreationMethod.ExpertKnowledgeLinearInDike; + 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); plLineCreator.SurfaceLine.EnsurePointOfType(1.0, 2.0, CharacteristicPointType.DikeToeAtRiver); @@ -409,7 +409,7 @@ plLineCreator.WaterLevelPolder = plLineCreator.SurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtPolder).Z - 1.0; - PLLine plLine = plLineCreator.CreatePLLineByExpertKnowledge(PLLineType.PL1, DamType.Regional, 0.02); + PlLine plLine = plLineCreator.CreatePlLineByExpertKnowledge(PlLineType.PL1, DamType.Regional, 0.02); Assert.AreEqual(5, plLine.Points.Count); Assert.AreEqual(0.0, plLine.Points[0].X, cTolerance); Assert.AreEqual(3.0, plLine.Points[0].Z, cTolerance); @@ -443,9 +443,9 @@ 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.PLLineCreationMethod = PLLineCreationMethod.ExpertKnowledgeLinearInDike; + 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); plLineCreator.SurfaceLine.EnsurePointOfType(1.0, 2.0, CharacteristicPointType.DikeToeAtRiver); @@ -458,7 +458,7 @@ plLineCreator.SurfaceLine.EnsurePointOfType(12.0, 1.0, CharacteristicPointType.SurfaceLevelInside); plLineCreator.SurfaceLine.Geometry.SyncCalcPoints(); plLineCreator.WaterLevelPolder = plLineCreator.SurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtPolder).Z - 1.0; - PLLine plLine = plLineCreator.CreatePLLineByExpertKnowledge(PLLineType.PL1, DamType.Regional, 0.02); + PlLine plLine = plLineCreator.CreatePlLineByExpertKnowledge(PlLineType.PL1, DamType.Regional, 0.02); Assert.AreEqual(7, plLine.Points.Count); Assert.AreEqual(0.0, plLine.Points[0].X, cTolerance); Assert.AreEqual(2.0, plLine.Points[0].Z, cTolerance); @@ -490,13 +490,13 @@ Assert.IsNotNull(plLineCreator); plLineCreator.SoilProfile = FactoryForSoilProfiles.CreateComplexProfile(); plLineCreator.WaterLevelRiverHigh = 4.0; - plLineCreator.ModelParametersForPLLines.DampingFactorPL3 = 0.3; - plLineCreator.ModelParametersForPLLines.DampingFactorPL4 = 0.4; - plLineCreator.ModelParametersForPLLines.PLLineCreationMethod = PLLineCreationMethod.ExpertKnowledgeRRD; + plLineCreator.ModelParametersForPlLines.DampingFactorPL3 = 0.3; + plLineCreator.ModelParametersForPlLines.DampingFactorPL4 = 0.4; + plLineCreator.ModelParametersForPlLines.PlLineCreationMethod = PlLineCreationMethod.ExpertKnowledgeRRD; plLineCreator.SoilProfile = FactoryForSoilProfiles.CreateClaySandClaySandProfile(); plLineCreator.SurfaceLine = surfacelineSimpleDike; plLineCreator.WaterLevelPolder = plLineCreator.SurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtPolder).Z - 1.0; - PLLine plLine = plLineCreator.CreatePLLineByExpertKnowledge(PLLineType.PL1, DamType.Regional, 0.02); + PlLine plLine = plLineCreator.CreatePlLineByExpertKnowledge(PlLineType.PL1, DamType.Regional, 0.02); Assert.AreEqual(6, plLine.Points.Count); Assert.AreEqual(0.0, plLine.Points[0].X, cTolerance); Assert.AreEqual(plLineCreator.WaterLevelRiverHigh, plLine.Points[0].Z, cTolerance); @@ -515,25 +515,25 @@ /// /// Test if PL1 is created correctly with expert knowledge with complex profile when waterlevel of river equlas top of dike - /// This coudl cause a problem in PLLinesCreator.ValidatePhreaticBelowDike + /// This could cause a problem in PlLinesCreator.ValidatePhreaticBelowDike /// [Test] - public void CreatePL1For1DGeometryWithExpertKnowledgeRRDIfRiverlevelEqualsTopOfDike() + public void CreatePl1For1DGeometryWithExpertKnowledgeRrdIfRiverlevelEqualsTopOfDike() { const double cTolerance = 0.0001; var surfacelineSimpleDike = FactoryForSurfaceLines.CreateSurfacelineSimpleDike(); { 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.PLLineCreationMethod = PLLineCreationMethod.ExpertKnowledgeRRD; + plLineCreator.ModelParametersForPlLines.DampingFactorPL3 = 0.3; + plLineCreator.ModelParametersForPlLines.DampingFactorPL4 = 0.4; + plLineCreator.ModelParametersForPlLines.PlLineCreationMethod = PlLineCreationMethod.ExpertKnowledgeRRD; plLineCreator.SoilProfile = FactoryForSoilProfiles.CreateClaySandClaySandProfile(); plLineCreator.SurfaceLine = surfacelineSimpleDike; plLineCreator.WaterLevelRiverHigh = plLineCreator.SurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeTopAtRiver).Z; plLineCreator.WaterLevelPolder = plLineCreator.SurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtPolder).Z - 1.0; - PLLine plLine = plLineCreator.CreatePLLineByExpertKnowledge(PLLineType.PL1, DamType.Regional, 0.02); + PlLine plLine = plLineCreator.CreatePlLineByExpertKnowledge(PlLineType.PL1, DamType.Regional, 0.02); Assert.AreEqual(6, plLine.Points.Count); Assert.AreEqual(0.0, plLine.Points[0].X, cTolerance); Assert.AreEqual(plLineCreator.WaterLevelRiverHigh, plLine.Points[0].Z, cTolerance); @@ -563,13 +563,13 @@ { SoilProfile = FactoryForSoilProfiles.CreateClaySandProfile(), WaterLevelRiverHigh = 2.5, - ModelParametersForPLLines = { PLLineCreationMethod = PLLineCreationMethod.ExpertKnowledgeRRD } + ModelParametersForPlLines = { PlLineCreationMethod = PlLineCreationMethod.ExpertKnowledgeRRD } }; plLineCreator.SurfaceLine = surfacelineSimpleDike; plLineCreator.PlLineOffsetBelowDikeTopAtRiver = 0.5; plLineCreator.PlLineOffsetBelowDikeTopAtPolder = 3.0; plLineCreator.WaterLevelPolder = plLineCreator.SurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtPolder).Z - 1.0; - PLLine plLine = plLineCreator.CreatePLLineByExpertKnowledge(PLLineType.PL1, DamType.Regional, 0.02); + PlLine plLine = plLineCreator.CreatePlLineByExpertKnowledge(PlLineType.PL1, DamType.Regional, 0.02); Assert.AreEqual(6, plLine.Points.Count); Assert.AreEqual(0.0, plLine.Points[0].X, cTolerance); Assert.AreEqual(2.5, plLine.Points[0].Z, cTolerance); @@ -606,7 +606,7 @@ SurfaceLine = surfaceLine, SoilProfile = FactoryForSoilProfiles.CreateClaySandProfile(), WaterLevelRiverHigh = 3.0, - ModelParametersForPLLines = { PLLineCreationMethod = PLLineCreationMethod.ExpertKnowledgeRRD } + ModelParametersForPlLines = { PlLineCreationMethod = PlLineCreationMethod.ExpertKnowledgeRRD } }; plLineCreator.SurfaceLine.EnsurePointOfType(0.0, 2.0, CharacteristicPointType.SurfaceLevelOutside); plLineCreator.SurfaceLine.EnsurePointOfType(1.0, 2.0, CharacteristicPointType.DikeToeAtRiver); @@ -624,7 +624,7 @@ plLineCreator.WaterLevelPolder = plLineCreator.SurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtPolder).Z - 1.0; - PLLine plLine = plLineCreator.CreatePLLineByExpertKnowledge(PLLineType.PL1, DamType.Regional, 0.02); + PlLine plLine = plLineCreator.CreatePlLineByExpertKnowledge(PlLineType.PL1, DamType.Regional, 0.02); Assert.AreEqual(7, plLine.Points.Count); Assert.AreEqual(0.0, plLine.Points[0].X, cTolerance); Assert.AreEqual(3.0, plLine.Points[0].Z, cTolerance); @@ -659,7 +659,7 @@ SurfaceLine = surfaceLine, SoilProfile = FactoryForSoilProfiles.CreateClaySandProfile(), WaterLevelRiverHigh = 3.0, - ModelParametersForPLLines = { PLLineCreationMethod = PLLineCreationMethod.ExpertKnowledgeRRD } + ModelParametersForPlLines = { PlLineCreationMethod = PlLineCreationMethod.ExpertKnowledgeRRD } }; plLineCreator.SurfaceLine.EnsurePointOfType(0.0, 2.0, CharacteristicPointType.SurfaceLevelOutside); plLineCreator.SurfaceLine.EnsurePointOfType(1.0, 2.0, CharacteristicPointType.DikeToeAtRiver); @@ -679,7 +679,7 @@ plLineCreator.WaterLevelPolder = plLineCreator.SurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtPolder).Z - 1.0; - PLLine plLine = plLineCreator.CreatePLLineByExpertKnowledge(PLLineType.PL1, DamType.Regional, 0.02); + PlLine plLine = plLineCreator.CreatePlLineByExpertKnowledge(PlLineType.PL1, DamType.Regional, 0.02); Assert.AreEqual(9, plLine.Points.Count); Assert.AreEqual(0.0, plLine.Points[0].X, cTolerance); Assert.AreEqual(3.0, plLine.Points[0].Z, cTolerance); @@ -718,7 +718,7 @@ SurfaceLine = surfaceLine, SoilProfile = FactoryForSoilProfiles.CreateClaySandProfile(), WaterLevelRiverHigh = 3.0, - ModelParametersForPLLines = { PLLineCreationMethod = PLLineCreationMethod.ExpertKnowledgeRRD } + ModelParametersForPlLines = { PlLineCreationMethod = PlLineCreationMethod.ExpertKnowledgeRRD } }; plLineCreator.SurfaceLine.EnsurePointOfType(0.0, 2.0, CharacteristicPointType.SurfaceLevelOutside); plLineCreator.SurfaceLine.EnsurePointOfType(1.0, 2.0, CharacteristicPointType.DikeToeAtRiver); @@ -739,7 +739,7 @@ plLineCreator.WaterLevelPolder = plLineCreator.SurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtPolder).Z - 1.0; - PLLine plLine = plLineCreator.CreatePLLineByExpertKnowledge(PLLineType.PL1, DamType.Regional, 0.02); + PlLine plLine = plLineCreator.CreatePlLineByExpertKnowledge(PlLineType.PL1, DamType.Regional, 0.02); Assert.AreEqual(9, plLine.Points.Count); Assert.AreEqual(0.0, plLine.Points[0].X, cTolerance); Assert.AreEqual(3.0, plLine.Points[0].Z, cTolerance); @@ -778,7 +778,7 @@ SurfaceLine = surfaceLine, SoilProfile = FactoryForSoilProfiles.CreateClaySandProfile(), WaterLevelRiverHigh = 3.0, - ModelParametersForPLLines = { PLLineCreationMethod = PLLineCreationMethod.ExpertKnowledgeRRD } + ModelParametersForPlLines = { PlLineCreationMethod = PlLineCreationMethod.ExpertKnowledgeRRD } }; plLineCreator.SurfaceLine.EnsurePointOfType(0.0, 2.0, CharacteristicPointType.SurfaceLevelOutside); plLineCreator.SurfaceLine.EnsurePointOfType(1.0, 2.0, CharacteristicPointType.DikeToeAtRiver); @@ -797,7 +797,7 @@ plLineCreator.PlLineOffsetBelowDikeToeAtPolder = 0.3; plLineCreator.WaterLevelPolder = plLineCreator.SurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtPolder).Z; - PLLine plLine = plLineCreator.CreatePLLineByExpertKnowledge(PLLineType.PL1, DamType.Regional, 0.02); + PlLine plLine = plLineCreator.CreatePlLineByExpertKnowledge(PlLineType.PL1, DamType.Regional, 0.02); Assert.AreEqual(7, plLine.Points.Count); Assert.AreEqual(0.0, plLine.Points[0].X, cTolerance); Assert.AreEqual(3.0, plLine.Points[0].Z, cTolerance); @@ -829,12 +829,12 @@ 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; - PLLine plLine = plLineCreator.CreatePLLineByExpertKnowledge(PLLineType.PL1, DamType.Regional, 0.02); + PlLine plLine = plLineCreator.CreatePlLineByExpertKnowledge(PlLineType.PL1, DamType.Regional, 0.02); Assert.AreEqual(6, plLine.Points.Count); Assert.AreEqual(0.0, plLine.Points[0].X, cTolerance); Assert.AreEqual(3.0, plLine.Points[0].Z, cTolerance); @@ -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 @@ -877,7 +877,7 @@ plLineCreator.SurfaceLine.SortPoints(); // Create Pl1 plLineCreator.WaterLevelPolder = plLineCreator.SurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtPolder).Z - 1.0; - PLLine plLine = plLineCreator.CreatePLLineByExpertKnowledge(PLLineType.PL1, DamType.Regional, 0.02); + PlLine plLine = plLineCreator.CreatePlLineByExpertKnowledge(PlLineType.PL1, DamType.Regional, 0.02); Assert.AreEqual(8, plLine.Points.Count); Assert.AreEqual(-2.0, plLine.Points[0].X, cTolerance); Assert.AreEqual(1.0, plLine.Points[0].Z, cTolerance); @@ -916,9 +916,9 @@ { Calculators.PlLinesCreator.PlLinesCreator plLineCreator = new Calculators.PlLinesCreator.PlLinesCreator(); plLineCreator.SurfaceLine = surfaceLine; - plLineCreator.ModelParametersForPLLines.PenetrationLength = 6.0; - plLineCreator.HeadInPLLine2 = 4.0; - plLineCreator.CreatePLLineByExpertKnowledge(PLLineType.PL2, DamType.Regional, 0.02); + plLineCreator.ModelParametersForPlLines.PenetrationLength = 6.0; + plLineCreator.HeadInPlLine2 = 4.0; + plLineCreator.CreatePlLineByExpertKnowledge(PlLineType.PL2, DamType.Regional, 0.02); } } @@ -932,9 +932,9 @@ Calculators.PlLinesCreator.PlLinesCreator plLineCreator = new Calculators.PlLinesCreator.PlLinesCreator(); plLineCreator.SoilProfile = FactoryForSoilProfiles.CreateSimpleProfile(); plLineCreator.SurfaceLine = null; - plLineCreator.ModelParametersForPLLines.PenetrationLength = 6.0; - plLineCreator.HeadInPLLine2 = 4.0; - plLineCreator.CreatePLLineByExpertKnowledge(PLLineType.PL2, DamType.Regional, 0.02); + plLineCreator.ModelParametersForPlLines.PenetrationLength = 6.0; + plLineCreator.HeadInPlLine2 = 4.0; + plLineCreator.CreatePlLineByExpertKnowledge(PlLineType.PL2, DamType.Regional, 0.02); } /// @@ -956,9 +956,9 @@ Calculators.PlLinesCreator.PlLinesCreator plLineCreator = new Calculators.PlLinesCreator.PlLinesCreator(); plLineCreator.SoilProfile = FactoryForSoilProfiles.CreateSimpleProfile(); plLineCreator.SurfaceLine = surfaceLine; - plLineCreator.ModelParametersForPLLines.PenetrationLength = 6.0; - plLineCreator.HeadInPLLine2 = 4.0; - plLineCreator.CreatePLLineByExpertKnowledge(PLLineType.PL2, DamType.Regional, 0.02); + plLineCreator.ModelParametersForPlLines.PenetrationLength = 6.0; + plLineCreator.HeadInPlLine2 = 4.0; + plLineCreator.CreatePlLineByExpertKnowledge(PlLineType.PL2, DamType.Regional, 0.02); } } @@ -985,9 +985,9 @@ plLineCreator.SurfaceLine.AddCharacteristicPoint(new GeometryPoint(10.0, 2.0)); plLineCreator.SurfaceLine.AddCharacteristicPoint(new GeometryPoint(21.0, 2.5)); plLineCreator.SurfaceLine.Geometry.SyncCalcPoints(); - plLineCreator.ModelParametersForPLLines.PenetrationLength = cPenetrationLength; - plLineCreator.HeadInPLLine2 = cHeadPL2; - PLLine plLine = plLineCreator.CreatePLLineByExpertKnowledge(PLLineType.PL2, DamType.Regional, 0.02); + plLineCreator.ModelParametersForPlLines.PenetrationLength = cPenetrationLength; + plLineCreator.HeadInPlLine2 = cHeadPL2; + PlLine plLine = plLineCreator.CreatePlLineByExpertKnowledge(PlLineType.PL2, DamType.Regional, 0.02); Assert.IsTrue(plLine.Exists()); } } @@ -1000,9 +1000,9 @@ const double cPenetrationLength = -1.0; Calculators.PlLinesCreator.PlLinesCreator plLineCreator = new Calculators.PlLinesCreator.PlLinesCreator(); plLineCreator.SoilProfile = FactoryForSoilProfiles.CreateSimpleProfile(); - plLineCreator.ModelParametersForPLLines.PenetrationLength = cPenetrationLength; - plLineCreator.HeadInPLLine2 = cHeadPL2; - PLLine plLine = plLineCreator.CreatePLLineByExpertKnowledge(PLLineType.PL2, DamType.Regional, 0.02); + plLineCreator.ModelParametersForPlLines.PenetrationLength = cPenetrationLength; + plLineCreator.HeadInPlLine2 = cHeadPL2; + PlLine plLine = plLineCreator.CreatePlLineByExpertKnowledge(PlLineType.PL2, DamType.Regional, 0.02); } /// @@ -1027,9 +1027,9 @@ plLineCreator.SurfaceLine.AddCharacteristicPoint(new GeometryPoint(1.0, 2.0)); plLineCreator.SurfaceLine.AddCharacteristicPoint(new GeometryPoint(10.0, 2.0)); plLineCreator.SurfaceLine.AddCharacteristicPoint(new GeometryPoint(21.0, 2.5)); - plLineCreator.ModelParametersForPLLines.PenetrationLength = cPenetrationLength; - plLineCreator.HeadInPLLine2 = cHeadPL2; - PLLine plLine = plLineCreator.CreatePLLineByExpertKnowledge(PLLineType.PL2, DamType.Regional, 0.02); + plLineCreator.ModelParametersForPlLines.PenetrationLength = cPenetrationLength; + plLineCreator.HeadInPlLine2 = cHeadPL2; + PlLine plLine = plLineCreator.CreatePlLineByExpertKnowledge(PlLineType.PL2, DamType.Regional, 0.02); // No extra layer should have been added to profile Assert.AreEqual(4, plLineCreator.SoilProfile.Layers.Count); @@ -1061,9 +1061,9 @@ plLineCreator.SurfaceLine.AddCharacteristicPoint(new GeometryPoint(10.0, 2.0)); plLineCreator.SurfaceLine.AddCharacteristicPoint(new GeometryPoint(21.0, 2.5)); plLineCreator.SurfaceLine.Geometry.SyncCalcPoints(); - plLineCreator.ModelParametersForPLLines.PenetrationLength = cPenetrationLength; - plLineCreator.HeadInPLLine2 = cHeadPL2; - PLLine plLine = plLineCreator.CreatePLLineByExpertKnowledge(PLLineType.PL2, DamType.Regional, 0.02); + plLineCreator.ModelParametersForPlLines.PenetrationLength = cPenetrationLength; + plLineCreator.HeadInPlLine2 = cHeadPL2; + PlLine plLine = plLineCreator.CreatePlLineByExpertKnowledge(PlLineType.PL2, DamType.Regional, 0.02); Assert.IsFalse(plLine.Exists()); } } @@ -1079,15 +1079,15 @@ var surfaceLineTutorial1 = FactoryForSurfaceLines.CreateSurfaceLineTutorial1(); { Calculators.PlLinesCreator.PlLinesCreator plLineCreator = new Calculators.PlLinesCreator.PlLinesCreator(); - plLineCreator.HeadInPLLine2 = cHeadPL2; - plLineCreator.ModelParametersForPLLines.PenetrationLength = cPenetrationLength; + plLineCreator.HeadInPlLine2 = cHeadPL2; + 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); + PlLine plLine = plLineCreator.CreatePlLineByExpertKnowledge(PlLineType.PL2, DamType.Regional, 0.02); Assert.IsFalse(plLine.Exists()); } } @@ -1099,26 +1099,26 @@ public void CreatePL2andPL4For1DGeometryWithExpertKnowledgeRRDWithAllWithSandLayerInBetweenAndPenetrationLengthInThisAquiferLayer() { const double cPenetrationLength = 4.0; - const double cHeadInPLLine2 = 3.0; + const double cHeadInPlLine2 = 3.0; var surfaceLineTutorial1 = FactoryForSurfaceLines.CreateSurfaceLineTutorial1(); { Calculators.PlLinesCreator.PlLinesCreator plLineCreator = new Calculators.PlLinesCreator.PlLinesCreator(); - plLineCreator.HeadInPLLine2 = cHeadInPLLine2; - plLineCreator.ModelParametersForPLLines.PenetrationLength = cPenetrationLength; + plLineCreator.HeadInPlLine2 = cHeadInPlLine2; + 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; Location primaryLocation = new Location(); Location regionalLocation = new Location(); { primaryLocation.DamType = DamType.Primary; - PLLines plLines = plLineCreator.CreateAllPLLines(primaryLocation); - PLLine plLine2 = plLines.Lines[PLLineType.PL2]; - PLLine plLine4 = plLines.Lines[PLLineType.PL4]; + PlLines plLines = plLineCreator.CreateAllPlLines(primaryLocation); + PlLine plLine2 = plLines.Lines[PlLineType.PL2]; + PlLine plLine4 = plLines.Lines[PlLineType.PL4]; Assert.IsTrue(plLine2.Exists()); Assert.IsTrue(plLine4.Exists()); Assert.AreEqual(plLine4.Points.Count, plLine2.Points.Count); @@ -1131,9 +1131,9 @@ regionalLocation.DamType = DamType.Regional; - plLines = plLineCreator.CreateAllPLLines(regionalLocation); - plLine2 = plLines.Lines[PLLineType.PL2]; - plLine4 = plLines.Lines[PLLineType.PL4]; + plLines = plLineCreator.CreateAllPlLines(regionalLocation); + plLine2 = plLines.Lines[PlLineType.PL2]; + plLine4 = plLines.Lines[PlLineType.PL4]; Assert.IsTrue(plLine2.Exists()); Assert.IsTrue(plLine4.Exists()); Assert.AreEqual(plLine4.Points.Count, plLine2.Points.Count); @@ -1166,12 +1166,12 @@ surfaceLine.AddCharacteristicPoint(new GeometryPoint(21.0, 2.5)); surfaceLine.Geometry.SyncCalcPoints(); plLineCreator.SurfaceLine = surfaceLine; - plLineCreator.ModelParametersForPLLines.PenetrationLength = cPenetrationLength; - plLineCreator.HeadInPLLine2 = cHeadPL2; - PLLine plLine = plLineCreator.CreatePLLineByExpertKnowledge(PLLineType.PL2, DamType.Regional, 0.02); + plLineCreator.ModelParametersForPlLines.PenetrationLength = cPenetrationLength; + plLineCreator.HeadInPlLine2 = cHeadPL2; + PlLine plLine = plLineCreator.CreatePlLineByExpertKnowledge(PlLineType.PL2, DamType.Regional, 0.02); Assert.IsTrue(plLine.Exists()); - Assert.IsTrue(plLine.Points[0].LocationEquals(new PLLinePoint(1.0, cHeadPL2))); - Assert.IsTrue(plLine.Points[1].LocationEquals(new PLLinePoint(21.0, cHeadPL2))); + Assert.IsTrue(plLine.Points[0].LocationEquals(new PlLinePoint(1.0, cHeadPL2))); + Assert.IsTrue(plLine.Points[1].LocationEquals(new PlLinePoint(21.0, cHeadPL2))); // Check if extra layer is added to soilprofile Assert.AreEqual(orgLayerCount + 1, plLineCreator.SoilProfile.Layers.Count); Assert.AreEqual(-2.0, plLineCreator.SoilProfile.Layers[orgLayerCount - 1].TopLevel, 0.01); @@ -1200,7 +1200,7 @@ // surfaceLine.AddCharacteristicPoint(new GeometryPoint(10.0, 2.0)); // surfaceLine.AddCharacteristicPoint(new GeometryPoint(21.0, 2.5)); // plLineCreator.SurfaceLine = surfaceLine; - // plLineCreator.ModelParametersForPLLines.PenetrationLength = cPenetrationLength; + // plLineCreator.ModelParametersForPlLines.PenetrationLength = cPenetrationLength; // plLineCreator.HeadInPLLine2 = cHeadPL2; // PLLine plLine = plLineCreator.CreatePLLineByExpertKnowledge(PLLineType.PL2, DamType.Regional, 0.02); // Assert.IsTrue(plLine.Exists()); @@ -1240,7 +1240,7 @@ // surfaceLine.AddCharacteristicPoint(GeometryPoint.CreateNewXZPoint(10.0, 2.0)); // surfaceLine.AddCharacteristicPoint(GeometryPoint.CreateNewXZPoint(21.0, 2.5)); // plLineCreator.SurfaceLine = surfaceLine; - // plLineCreator.ModelParametersForPLLines.PenetrationLength = cPenetrationLength; + // plLineCreator.ModelParametersForPlLines.PenetrationLength = cPenetrationLength; // plLineCreator.HeadInPLLine2 = cHeadPL2; // PLLine plLine = plLineCreator.CreatePLLineByExpertKnowledge(PLLineType.PL2, DamType.Regional, 0.02); // Assert.IsTrue(plLine.Exists()); @@ -1280,7 +1280,7 @@ // surfaceLine.AddCharacteristicPoint(GeometryPoint.CreateNewXZPoint(10.0, 2.0)); // surfaceLine.AddCharacteristicPoint(GeometryPoint.CreateNewXZPoint(21.0, 2.5)); // plLineCreator.SurfaceLine = surfaceLine; - // plLineCreator.ModelParametersForPLLines.PenetrationLength = cPenetrationLength; + // plLineCreator.ModelParametersForPlLines.PenetrationLength = cPenetrationLength; // plLineCreator.HeadInPLLine2 = cHeadPL2; // PLLine plLine = plLineCreator.CreatePLLineByExpertKnowledge(PLLineType.PL2, DamType.Regional, 0.02); // Assert.IsTrue(plLine.Exists()); @@ -1300,7 +1300,7 @@ [Test] [ExpectedException(typeof(PlLinesCreatorException))] - public void CreatePL3For1DGeometryWithExpertKnowledgeRRDThrowsExceptionIfNoAquiferLayers() + public void CreatePl3For1DGeometryWithExpertKnowledgeRrdThrowsExceptionIfNoAquiferLayers() { const double cDampingFactor = 0.3; var surfaceLineTutorial1 = FactoryForSurfaceLines.CreateSurfaceLineTutorial1(); @@ -1311,13 +1311,13 @@ plLineCreator.WaterLevelRiverHigh = 4.0; plLineCreator.WaterLevelPolder = -0.5; - plLineCreator.ModelParametersForPLLines.DampingFactorPL3 = cDampingFactor; - PLLine plLine = plLineCreator.CreatePLLineByExpertKnowledge(PLLineType.PL3, DamType.Regional, 0.02); + plLineCreator.ModelParametersForPlLines.DampingFactorPL3 = cDampingFactor; + PlLine plLine = plLineCreator.CreatePlLineByExpertKnowledge(PlLineType.PL3, DamType.Regional, 0.02); } } [Test] - public void CreatePL4For1DGeometryWithExpertKnowledgeRRDIfNoInBetweenAquiferLayer() + public void CreatePl4For1DGeometryWithExpertKnowledgeRrdIfNoInBetweenAquiferLayer() { const double cDampingFactor = 0.3; var surfaceLineTutorial1 = FactoryForSurfaceLines.CreateSurfaceLineTutorial1(); @@ -1328,8 +1328,8 @@ plLineCreator.WaterLevelRiverHigh = 4.0; plLineCreator.WaterLevelPolder = -0.5; - plLineCreator.ModelParametersForPLLines.DampingFactorPL4 = cDampingFactor; - PLLine plLine = plLineCreator.CreatePLLineByExpertKnowledge(PLLineType.PL4, DamType.Regional, 0.02); + plLineCreator.ModelParametersForPlLines.DampingFactorPL4 = cDampingFactor; + PlLine plLine = plLineCreator.CreatePlLineByExpertKnowledge(PlLineType.PL4, DamType.Regional, 0.02); Assert.IsFalse(plLine.Exists()); } } @@ -1358,7 +1358,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 headAtDikeToe = plLineCreator.WaterLevelRiver - (plLineCreator.WaterLevelRiver - plLineCreator.WaterLevelPolder) * 0.01 * cDampingFactor; @@ -1385,7 +1385,7 @@ /// The difference is that here the geometry is entered as a 1d-geometry /// [Test] - public void CreatePL3For1DGeometryWithExpertKnowledgeRRD() + public void CreatePl3For1DGeometryWithExpertKnowledgeRrd() { const double cDampingFactor = 0.3; var surfaceLineTutorial1 = FactoryForSurfaceLines.CreateSurfaceLineTutorial1(); @@ -1395,35 +1395,35 @@ 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); - CheckPL3For1DGeometryWithExpertKnowledgeRRD(plLine); + // 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); + CheckPl3For1DGeometryWithExpertKnowledgeRrd(plLine); - // In this case HeadInPLLine3 is specified (with same value as WaterLevelRiverHigh above, so result should be the same) - // Change WaterLevelRiverHigh to be sure the value of HeadInPLLine3 is really used + // In this case HeadInPlLine3 is specified (with same value as WaterLevelRiverHigh above, so result should be the same) + // Change WaterLevelRiverHigh to be sure the value of HeadInPlLine3 is really used plLineCreator.WaterLevelRiverHigh = 3.0; - plLineCreator.HeadInPLLine3 = 4.0; - plLine = plLineCreator.CreatePLLineByExpertKnowledge(PLLineType.PL3, DamType.Regional, 0.02); - CheckPL3For1DGeometryWithExpertKnowledgeRRD(plLine); + plLineCreator.HeadInPlLine3 = 4.0; + plLine = plLineCreator.CreatePlLineByExpertKnowledge(PlLineType.PL3, DamType.Regional, 0.02); + CheckPl3For1DGeometryWithExpertKnowledgeRrd(plLine); // Specify Head PL2, so it is used for damping, but give it the same value as WaterLevelPolder. // This will give the same result as when Head PL2 is not specified, because in that case, WaterLevelPolder ius used for damping. - plLineCreator.HeadInPLLine2 = -0.5; - plLine = plLineCreator.CreatePLLineByExpertKnowledge(PLLineType.PL3, DamType.Regional, 0.02); - CheckPL3For1DGeometryWithExpertKnowledgeRRD(plLine); + plLineCreator.HeadInPlLine2 = -0.5; + plLine = plLineCreator.CreatePlLineByExpertKnowledge(PlLineType.PL3, DamType.Regional, 0.02); + CheckPl3For1DGeometryWithExpertKnowledgeRrd(plLine); // Specify Head PL2, so it is used for damping, but now use diffeent value as WaterLevelPolder to force different result. - plLineCreator.HeadInPLLine2 = -5.0; - plLine = plLineCreator.CreatePLLineByExpertKnowledge(PLLineType.PL3, DamType.Regional, 0.02); - CheckPL3For1DGeometryWithExpertKnowledgeRRDWithHeadPl2Specified(plLine); + plLineCreator.HeadInPlLine2 = -5.0; + plLine = plLineCreator.CreatePlLineByExpertKnowledge(PlLineType.PL3, DamType.Regional, 0.02); + CheckPl3For1DGeometryWithExpertKnowledgeRrdWithHeadPl2Specified(plLine); } } - private void CheckPL3For1DGeometryWithExpertKnowledgeRRD(PLLine plLine) + private void CheckPl3For1DGeometryWithExpertKnowledgeRrd(PlLine plLine) { - // PLLine is supposed to have adjusted points at both banks of the ditch + // PlLine is supposed to have adjusted points at both banks of the ditch Assert.AreEqual(4, plLine.Points.Count); Assert.AreEqual(0.0, plLine.Points[0].X, Tolerance); // start Assert.AreEqual(4.0, plLine.Points[0].Z, Tolerance); // water level at river @@ -1435,9 +1435,9 @@ Assert.AreEqual(1.3276, plLine.Points[3].Z, Tolerance); // headAtDikeEnd } - private void CheckPL3For1DGeometryWithExpertKnowledgeRRDWithHeadPl2Specified(PLLine plLine) + private void CheckPl3For1DGeometryWithExpertKnowledgeRrdWithHeadPl2Specified(PlLine plLine) { - // PLLine is supposed to have adjusted points at both banks of the ditch + // PlLine is supposed to have adjusted points at both banks of the ditch Assert.AreEqual(4, plLine.Points.Count); Assert.AreEqual(0.0, plLine.Points[0].X, Tolerance); // start Assert.AreEqual(4.0, plLine.Points[0].Z, Tolerance); // water level at river @@ -1450,7 +1450,7 @@ } [Test] - public void CreatePL3LowFor1DGeometryWithExpertKnowledgeRRD() + public void CreatePl3LowFor1DGeometryWithExpertKnowledgeRrd() { const double cDampingFactor = 0.3; var surfaceLineTutorial1 = FactoryForSurfaceLines.CreateSurfaceLineTutorial1(); @@ -1462,22 +1462,22 @@ plLineCreator.WaterLevelRiverLow = 1.0; plLineCreator.IsUseLowWaterLevel = true; plLineCreator.WaterLevelPolder = -0.5; - 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); + 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); - // In this case HeadInPLLine3 is specified (with same value as WaterLevelRiverLow above, so result should be the same) - // Change WaterLevelRiverLow to be sure the value of HeadInPLLine3 is really used + // In this case HeadInPlLine3 is specified (with same value as WaterLevelRiverLow above, so result should be the same) + // Change WaterLevelRiverLow to be sure the value of HeadInPlLine3 is really used plLineCreator.WaterLevelRiverHigh = 4.0; - plLineCreator.HeadInPLLine3 = 1.0; + plLineCreator.HeadInPlLine3 = 1.0; plLineCreator.WaterLevelRiverLow = 2.0; - plLine = plLineCreator.CreatePLLineByExpertKnowledge(PLLineType.PL3, DamType.Regional, 0.02); - CheckPL3LowFor1DGeometryWithExpertKnowledgeRRD(plLine); + plLine = plLineCreator.CreatePlLineByExpertKnowledge(PlLineType.PL3, DamType.Regional, 0.02); + CheckPl3LowFor1DGeometryWithExpertKnowledgeRrd(plLine); } } - private void CheckPL3LowFor1DGeometryWithExpertKnowledgeRRD(PLLine plLine) + private void CheckPl3LowFor1DGeometryWithExpertKnowledgeRrd(PlLine plLine) { Assert.AreEqual(4, plLine.Points.Count); Assert.AreEqual(0.0, plLine.Points[0].X, Tolerance); // start @@ -1491,7 +1491,7 @@ } [Test] - public void CreatePL3For1DGeometryInBlackHoleWithExpertKnowledgeRRD() + public void CreatePl3For1DGeometryInBlackHoleWithExpertKnowledgeRrd() { const double cDampingFactor = 0.3; var surfaceLineTutorial1 = FactoryForSurfaceLines.CreateSurfaceLineTutorial1(); @@ -1512,8 +1512,8 @@ plLineCreator.WaterLevelRiverHigh = 4.0; plLineCreator.WaterLevelPolder = -0.5; - plLineCreator.ModelParametersForPLLines.DampingFactorPL3 = cDampingFactor; - PLLine plLine = plLineCreator.CreatePLLineByExpertKnowledge(PLLineType.PL3, DamType.Regional, 0.02); + 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; //double lengthFromRiverToe = plLineCreator.SurfaceLine.Points.Last().X - plLineCreator.SurfaceLine.CharacteristicPoints[CharacteristicPointType.DikeToeAtRiver].X; @@ -1522,7 +1522,7 @@ //double headAtDikeToe = plLineCreator.WaterLevelRiver - deltaHead; //double headAtEnd = plLineCreator.WaterLevelRiver - slope * lengthFromRiverToe; - // PLLine in this situation is supposed to take the shape of the line with no corrections for uplift + // PlLine in this situation is supposed to take the shape of the line with no corrections for uplift Assert.AreEqual(4, plLine.Points.Count); @@ -1540,7 +1540,7 @@ } [Test] - public void CreatePL3For1DGeometryInOuterSpaceWithExpertKnowledgeRRD() + public void CreatePl3For1DGeometryInOuterSpaceWithExpertKnowledgeRrd() { const double cDampingFactor = 0.3; var surfaceLineTutorial1 = FactoryForSurfaceLines.CreateSurfaceLineTutorial1(); @@ -1561,8 +1561,8 @@ plLineCreator.WaterLevelRiverHigh = 4.0; plLineCreator.WaterLevelPolder = -0.5; - plLineCreator.ModelParametersForPLLines.DampingFactorPL3 = cDampingFactor; - PLLine plLine = plLineCreator.CreatePLLineByExpertKnowledge(PLLineType.PL3, DamType.Regional, 0.02); + 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; //double lengthFromRiverToe = plLineCreator.SurfaceLine.Points.Last().X - plLineCreator.SurfaceLine.CharacteristicPoints[CharacteristicPointType.DikeToeAtRiver].X; @@ -1571,7 +1571,7 @@ //double headAtDikeToe = plLineCreator.WaterLevelRiver - deltaHead; //double headAtEnd = plLineCreator.WaterLevelRiver - slope * lengthFromRiverToe; - // PLLine in this situation is supposed to burn down to the polder water level from the entry point + // PlLine in this situation is supposed to burn down to the polder water level from the entry point Assert.AreEqual(4, plLine.Points.Count); @@ -1587,7 +1587,7 @@ } [Test] - public void CreatePL4For1DGeometryWithExpertKnowledgeRRD() + public void CreatePl4For1DGeometryWithExpertKnowledgeRrd() { const double cDampingFactor = 0.4; var surfaceLineTutorial1 = FactoryForSurfaceLines.CreateSurfaceLineTutorial1(); @@ -1598,25 +1598,25 @@ plLineCreator.WaterLevelRiverHigh = 4.0; plLineCreator.WaterLevelPolder = -0.5; plLineCreator.IsAdjustPL3AndPL4SoNoUpliftWillOccurEnabled = false; - // In this case no HeadInPLLine3 is specified, then the head of PL3 will be equal to WaterLevelRiverHigh + // In this case no HeadInPlLine3 is specified, then the head of PL3 will be equal to WaterLevelRiverHigh plLineCreator.IsHydraulicShortcut = true; - plLineCreator.ModelParametersForPLLines.DampingFactorPL4 = cDampingFactor; - PLLine plLine = plLineCreator.CreatePLLineByExpertKnowledge(PLLineType.PL4, DamType.Regional, 0.02); - CheckPL4LowFor1DGeometryWithExpertKnowledgeRRD(plLine); + plLineCreator.ModelParametersForPlLines.DampingFactorPL4 = cDampingFactor; + PlLine plLine = plLineCreator.CreatePlLineByExpertKnowledge(PlLineType.PL4, DamType.Regional, 0.02); + CheckPl4LowFor1DGeometryWithExpertKnowledgeRrd(plLine); - // In this case HeadInPLLine3 is specified (with same value as WaterLevelRiverHigh above, so result should be the same) - // Change WaterLevelRiverHigh to be sure the value of HeadInPLLine3 is really used + // In this case HeadInPlLine3 is specified (with same value as WaterLevelRiverHigh above, so result should be the same) + // Change WaterLevelRiverHigh to be sure the value of HeadInPlLine3 is really used plLineCreator.IsHydraulicShortcut = false; - plLineCreator.HeadInPLLine4 = 4.0; + plLineCreator.HeadInPlLine4 = 4.0; plLineCreator.WaterLevelRiverHigh = 3.0; - plLine = plLineCreator.CreatePLLineByExpertKnowledge(PLLineType.PL4, DamType.Regional, 0.02); - CheckPL4LowFor1DGeometryWithExpertKnowledgeRRD(plLine); + plLine = plLineCreator.CreatePlLineByExpertKnowledge(PlLineType.PL4, DamType.Regional, 0.02); + CheckPl4LowFor1DGeometryWithExpertKnowledgeRrd(plLine); } } - private void CheckPL4LowFor1DGeometryWithExpertKnowledgeRRD(PLLine plLine) + private void CheckPl4LowFor1DGeometryWithExpertKnowledgeRrd(PlLine plLine) { - // PLLine is supposed to have adjusted points at dike toe and end + // PlLine is supposed to have adjusted points at dike toe and end Assert.AreEqual(4, plLine.Points.Count); Assert.AreEqual(0.0, plLine.Points[0].X, Tolerance); // start Assert.AreEqual(4.0, plLine.Points[0].Z, Tolerance); // water level at river @@ -1630,7 +1630,7 @@ [Test] [ExpectedException(typeof(PlLinesCreatorException))] - public void CreatePL4For1DGeometryWithExpertKnowledgeRRDThrowsExceptionIfNoAquifers() + public void CreatePl4For1DGeometryWithExpertKnowledgeRrdThrowsExceptionIfNoAquifers() { const double cDampingFactor = 0.4; var surfaceLineTutorial1 = FactoryForSurfaceLines.CreateSurfaceLineTutorial1(); @@ -1641,14 +1641,14 @@ plLineCreator.WaterLevelRiverHigh = 4.0; plLineCreator.WaterLevelPolder = -0.5; - plLineCreator.ModelParametersForPLLines.DampingFactorPL4 = cDampingFactor; - PLLine plLine = plLineCreator.CreatePLLineByExpertKnowledge(PLLineType.PL4, DamType.Regional, 0.02); + plLineCreator.ModelParametersForPlLines.DampingFactorPL4 = cDampingFactor; + PlLine plLine = plLineCreator.CreatePlLineByExpertKnowledge(PlLineType.PL4, DamType.Regional, 0.02); } } [Test] [ExpectedException(typeof(PlLinesCreatorException))] - public void CreatePLLinesFromGaugesWithNonExistentGauge() + public void CreatePlLinesFromGaugesWithNonExistentGauge() { var surfaceLineTutorial1 = FactoryForSurfaceLines.CreateSurfaceLineTutorial1(); var location = new Location @@ -1669,25 +1669,25 @@ new Gauge { Name = "G2", Location = locations[0], LocalX = 12.4 } // Gauge "G3" is missing }; - var gaugePLLines = new List(); + var gaugePlLines = new List(); - GaugePLLine gaugePLLine1 = new GaugePLLine(PLLineType.PL1); - gaugePLLine1.Points.Add(new GaugePLLinePoint { X = 1.2, Z = 4.5 }); - gaugePLLine1.Points.Add(new GaugePLLinePoint { X = 3.4, Z = 4.5 }); - gaugePLLine1.Points.Add(new GaugePLLinePoint { X = 4.7, GaugeIDZ = "G1" }); - gaugePLLine1.Points.Add(new GaugePLLinePoint { GaugeIDX = "G3", GaugeIDZ = "G2" }); - gaugePLLine1.Points.Add(new GaugePLLinePoint { X = 17.6, Z = -2.0 }); - gaugePLLines.Add(gaugePLLine1); + GaugePlLine gaugePlLine1 = new GaugePlLine(PlLineType.PL1); + gaugePlLine1.Points.Add(new GaugePlLinePoint { X = 1.2, Z = 4.5 }); + gaugePlLine1.Points.Add(new GaugePlLinePoint { X = 3.4, Z = 4.5 }); + gaugePlLine1.Points.Add(new GaugePlLinePoint { X = 4.7, GaugeIDZ = "G1" }); + gaugePlLine1.Points.Add(new GaugePlLinePoint { GaugeIDX = "G3", GaugeIDZ = "G2" }); + gaugePlLine1.Points.Add(new GaugePlLinePoint { X = 17.6, Z = -2.0 }); + gaugePlLines.Add(gaugePlLine1); - plLineCreator.GaugePLLines = gaugePLLines; + plLineCreator.GaugePlLines = gaugePlLines; plLineCreator.Gauges = gauges; - plLineCreator.ModelParametersForPLLines.PLLineCreationMethod = PLLineCreationMethod.GaugesWithFallbackToExpertKnowledgeRRD; - PLLines plLines = plLineCreator.CreateAllPLLines(locations[0]); + plLineCreator.ModelParametersForPlLines.PlLineCreationMethod = PlLineCreationMethod.GaugesWithFallbackToExpertKnowledgeRRD; + PlLines plLines = plLineCreator.CreateAllPlLines(locations[0]); } } [Test] - public void CreatePLLinesFromGauges() + public void CreatePlLinesFromGauges() { var surfaceLineTutorial1 = FactoryForSurfaceLines.CreateSurfaceLineTutorial1(); var location = new Location @@ -1697,7 +1697,7 @@ { Calculators.PlLinesCreator.PlLinesCreator plLineCreator = new Calculators.PlLinesCreator.PlLinesCreator(); plLineCreator.SurfaceLine = surfaceLineTutorial1; - plLineCreator.ModelParametersForPLLines.PLLineCreationMethod = PLLineCreationMethod.GaugesWithFallbackToExpertKnowledgeRRD; + plLineCreator.ModelParametersForPlLines.PlLineCreationMethod = PlLineCreationMethod.GaugesWithFallbackToExpertKnowledgeRRD; var locations = new List { @@ -1708,47 +1708,47 @@ new Gauge { Name = "G1", Location = locations[0], LocalX = 15, Value = 4 }, new Gauge { Name = "G2", Location = locations[0], LocalX = 45, Value = 1 } }; - var gaugePLLines = new List(); + var gaugePlLines = new List(); - GaugePLLine gaugePLLine1 = new GaugePLLine(PLLineType.PL1); - gaugePLLine1.Points.Add(new GaugePLLinePoint { X = 0, GaugeIDZ = "G1" }); - gaugePLLine1.Points.Add(new GaugePLLinePoint { GaugeIDX = "G1", GaugeIDZ = "G1" }); - gaugePLLine1.Points.Add(new GaugePLLinePoint { GaugeIDX = "G2", GaugeIDZ = "G2" }); - gaugePLLine1.Points.Add(new GaugePLLinePoint { X = 75, GaugeIDZ = "G2" }); - gaugePLLines.Add(gaugePLLine1); + GaugePlLine gaugePlLine1 = new GaugePlLine(PlLineType.PL1); + gaugePlLine1.Points.Add(new GaugePlLinePoint { X = 0, GaugeIDZ = "G1" }); + gaugePlLine1.Points.Add(new GaugePlLinePoint { GaugeIDX = "G1", GaugeIDZ = "G1" }); + gaugePlLine1.Points.Add(new GaugePlLinePoint { GaugeIDX = "G2", GaugeIDZ = "G2" }); + gaugePlLine1.Points.Add(new GaugePlLinePoint { X = 75, GaugeIDZ = "G2" }); + gaugePlLines.Add(gaugePlLine1); - GaugePLLine gaugePLLine2 = new GaugePLLine(PLLineType.PL2); - gaugePLLines.Add(gaugePLLine2); + GaugePlLine gaugePlLine2 = new GaugePlLine(PlLineType.PL2); + gaugePlLines.Add(gaugePlLine2); - GaugePLLine gaugePLLine3 = new GaugePLLine(PLLineType.PL3); - gaugePLLines.Add(gaugePLLine3); + GaugePlLine gaugePlLine3 = new GaugePlLine(PlLineType.PL3); + gaugePlLines.Add(gaugePlLine3); - GaugePLLine gaugePLLine4 = new GaugePLLine(PLLineType.PL4); - gaugePLLines.Add(gaugePLLine4); + GaugePlLine gaugePlLine4 = new GaugePlLine(PlLineType.PL4); + gaugePlLines.Add(gaugePlLine4); - plLineCreator.GaugePLLines = gaugePLLines; + plLineCreator.GaugePlLines = gaugePlLines; plLineCreator.Gauges = gauges; - PLLines plLines = plLineCreator.CreateAllPLLines(locations[0]); + PlLines plLines = plLineCreator.CreateAllPlLines(locations[0]); - Assert.AreEqual(4, plLines.Lines[PLLineType.PL1].Points.Count); - Assert.AreEqual(0, plLines.Lines[PLLineType.PL1].Points[0].X); - Assert.AreEqual(4, plLines.Lines[PLLineType.PL1].Points[0].Z); + Assert.AreEqual(4, plLines.Lines[PlLineType.PL1].Points.Count); + Assert.AreEqual(0, plLines.Lines[PlLineType.PL1].Points[0].X); + Assert.AreEqual(4, plLines.Lines[PlLineType.PL1].Points[0].Z); // The following point.x is the intersection point of PL1 with the dike - Assert.AreEqual(29.6, plLines.Lines[PLLineType.PL1].Points[1].X); - Assert.AreEqual(4, plLines.Lines[PLLineType.PL1].Points[1].Z); - Assert.AreEqual(45, plLines.Lines[PLLineType.PL1].Points[2].X); - Assert.AreEqual(1, plLines.Lines[PLLineType.PL1].Points[2].Z); - Assert.AreEqual(75, plLines.Lines[PLLineType.PL1].Points[3].X); - Assert.AreEqual(1, plLines.Lines[PLLineType.PL1].Points[3].Z); + Assert.AreEqual(29.6, plLines.Lines[PlLineType.PL1].Points[1].X); + Assert.AreEqual(4, plLines.Lines[PlLineType.PL1].Points[1].Z); + Assert.AreEqual(45, plLines.Lines[PlLineType.PL1].Points[2].X); + Assert.AreEqual(1, plLines.Lines[PlLineType.PL1].Points[2].Z); + Assert.AreEqual(75, plLines.Lines[PlLineType.PL1].Points[3].X); + Assert.AreEqual(1, plLines.Lines[PlLineType.PL1].Points[3].Z); - Assert.AreEqual(0, plLines.Lines[PLLineType.PL2].Points.Count); - Assert.AreEqual(0, plLines.Lines[PLLineType.PL3].Points.Count); - Assert.AreEqual(0, plLines.Lines[PLLineType.PL4].Points.Count); + Assert.AreEqual(0, plLines.Lines[PlLineType.PL2].Points.Count); + Assert.AreEqual(0, plLines.Lines[PlLineType.PL3].Points.Count); + Assert.AreEqual(0, plLines.Lines[PlLineType.PL4].Points.Count); } } [Test] - public void CreatePLLinesFromGaugesMoses() + public void CreatePlLinesFromGaugesMoses() { var surfaceLineTutorial1 = FactoryForSurfaceLines.CreateSurfaceLineTutorial1(); var location = new Location @@ -1757,7 +1757,7 @@ }; { Calculators.PlLinesCreator.PlLinesCreator plLineCreator = new Calculators.PlLinesCreator.PlLinesCreator(); - plLineCreator.ModelParametersForPLLines.PLLineCreationMethod = PLLineCreationMethod.GaugesWithFallbackToExpertKnowledgeRRD; + plLineCreator.ModelParametersForPlLines.PlLineCreationMethod = PlLineCreationMethod.GaugesWithFallbackToExpertKnowledgeRRD; plLineCreator.SurfaceLine = surfaceLineTutorial1; var locations = new List @@ -1770,47 +1770,47 @@ new Gauge { Name = "G2", Location = locations[0], LocalX = 20, Value = 2 }, new Gauge { Name = "G3", Location = locations[0], LocalX = 45, Value = 1 } }; - var gaugePLLines = new List(); + var gaugePlLines = new List(); - GaugePLLine gaugePLLine1 = new GaugePLLine(PLLineType.PL1); - gaugePLLine1.Points.Add(new GaugePLLinePoint { X = 0, GaugeIDZ = "G1" }); - gaugePLLine1.Points.Add(new GaugePLLinePoint { GaugeIDX = "G1", GaugeIDZ = "G1" }); - gaugePLLine1.Points.Add(new GaugePLLinePoint { GaugeIDX = "G2", GaugeIDZ = "G2" }); - gaugePLLine1.Points.Add(new GaugePLLinePoint { GaugeIDX = "G3", GaugeIDZ = "G3" }); - gaugePLLine1.Points.Add(new GaugePLLinePoint { X = 75, GaugeIDZ = "G3" }); - gaugePLLines.Add(gaugePLLine1); + GaugePlLine gaugePlLine1 = new GaugePlLine(PlLineType.PL1); + gaugePlLine1.Points.Add(new GaugePlLinePoint { X = 0, GaugeIDZ = "G1" }); + gaugePlLine1.Points.Add(new GaugePlLinePoint { GaugeIDX = "G1", GaugeIDZ = "G1" }); + gaugePlLine1.Points.Add(new GaugePlLinePoint { GaugeIDX = "G2", GaugeIDZ = "G2" }); + gaugePlLine1.Points.Add(new GaugePlLinePoint { GaugeIDX = "G3", GaugeIDZ = "G3" }); + gaugePlLine1.Points.Add(new GaugePlLinePoint { X = 75, GaugeIDZ = "G3" }); + gaugePlLines.Add(gaugePlLine1); - GaugePLLine gaugePLLine2 = new GaugePLLine(PLLineType.PL2); - gaugePLLines.Add(gaugePLLine2); + GaugePlLine gaugePlLine2 = new GaugePlLine(PlLineType.PL2); + gaugePlLines.Add(gaugePlLine2); - GaugePLLine gaugePLLine3 = new GaugePLLine(PLLineType.PL3); - gaugePLLines.Add(gaugePLLine3); + GaugePlLine gaugePlLine3 = new GaugePlLine(PlLineType.PL3); + gaugePlLines.Add(gaugePlLine3); - GaugePLLine gaugePLLine4 = new GaugePLLine(PLLineType.PL4); - gaugePLLines.Add(gaugePLLine4); + GaugePlLine gaugePlLine4 = new GaugePlLine(PlLineType.PL4); + gaugePlLines.Add(gaugePlLine4); - plLineCreator.GaugePLLines = gaugePLLines; + plLineCreator.GaugePlLines = gaugePlLines; plLineCreator.Gauges = gauges; - PLLines plLines = plLineCreator.CreateAllPLLines(locations[0]); + PlLines plLines = plLineCreator.CreateAllPlLines(locations[0]); - Assert.AreEqual(4, plLines.Lines[PLLineType.PL1].Points.Count); - Assert.AreEqual(0, plLines.Lines[PLLineType.PL1].Points[0].X); - Assert.AreEqual(4, plLines.Lines[PLLineType.PL1].Points[0].Z); - Assert.AreEqual(29.6, plLines.Lines[PLLineType.PL1].Points[1].X); - Assert.AreEqual(4, plLines.Lines[PLLineType.PL1].Points[1].Z); - Assert.AreEqual(45, plLines.Lines[PLLineType.PL1].Points[2].X); - Assert.AreEqual(1, plLines.Lines[PLLineType.PL1].Points[2].Z); - Assert.AreEqual(75, plLines.Lines[PLLineType.PL1].Points[3].X); - Assert.AreEqual(1, plLines.Lines[PLLineType.PL1].Points[3].Z); + Assert.AreEqual(4, plLines.Lines[PlLineType.PL1].Points.Count); + Assert.AreEqual(0, plLines.Lines[PlLineType.PL1].Points[0].X); + Assert.AreEqual(4, plLines.Lines[PlLineType.PL1].Points[0].Z); + Assert.AreEqual(29.6, plLines.Lines[PlLineType.PL1].Points[1].X); + Assert.AreEqual(4, plLines.Lines[PlLineType.PL1].Points[1].Z); + Assert.AreEqual(45, plLines.Lines[PlLineType.PL1].Points[2].X); + Assert.AreEqual(1, plLines.Lines[PlLineType.PL1].Points[2].Z); + Assert.AreEqual(75, plLines.Lines[PlLineType.PL1].Points[3].X); + Assert.AreEqual(1, plLines.Lines[PlLineType.PL1].Points[3].Z); - Assert.AreEqual(0, plLines.Lines[PLLineType.PL2].Points.Count); - Assert.AreEqual(0, plLines.Lines[PLLineType.PL3].Points.Count); - Assert.AreEqual(0, plLines.Lines[PLLineType.PL4].Points.Count); + Assert.AreEqual(0, plLines.Lines[PlLineType.PL2].Points.Count); + Assert.AreEqual(0, plLines.Lines[PlLineType.PL3].Points.Count); + Assert.AreEqual(0, plLines.Lines[PlLineType.PL4].Points.Count); } } [Test] - public void CreatePLLinesFromGaugesNoah() + public void CreatePlLinesFromGaugesNoah() { var surfaceLineTutorial1 = FactoryForSurfaceLines.CreateSurfaceLineTutorial1(); var location = new Location @@ -1819,7 +1819,7 @@ }; { Calculators.PlLinesCreator.PlLinesCreator plLineCreator = new Calculators.PlLinesCreator.PlLinesCreator(); - plLineCreator.ModelParametersForPLLines.PLLineCreationMethod = PLLineCreationMethod.GaugesWithFallbackToExpertKnowledgeRRD; + plLineCreator.ModelParametersForPlLines.PlLineCreationMethod = PlLineCreationMethod.GaugesWithFallbackToExpertKnowledgeRRD; plLineCreator.SurfaceLine = surfaceLineTutorial1; var locations = new List @@ -1832,38 +1832,38 @@ new Gauge { Name = "G2", Location = locations[0], LocalX = 20, Value = 2 }, new Gauge { Name = "G3", Location = locations[0], LocalX = 45, Value = 1 } }; - var gaugePLLines = new List(); + var gaugePlLines = new List(); - GaugePLLine gaugePLLine1 = new GaugePLLine(PLLineType.PL1); - gaugePLLine1.Points.Add(new GaugePLLinePoint { X = 0, GaugeIDZ = "G1" }); - gaugePLLine1.Points.Add(new GaugePLLinePoint { GaugeIDX = "G1", GaugeIDZ = "G1" }); - gaugePLLine1.Points.Add(new GaugePLLinePoint { GaugeIDX = "G2", GaugeIDZ = "G2" }); - gaugePLLine1.Points.Add(new GaugePLLinePoint { GaugeIDX = "G3", GaugeIDZ = "G3" }); - gaugePLLine1.Points.Add(new GaugePLLinePoint { X = 75, GaugeIDZ = "G3" }); - gaugePLLines.Add(gaugePLLine1); + GaugePlLine gaugePlLine1 = new GaugePlLine(PlLineType.PL1); + gaugePlLine1.Points.Add(new GaugePlLinePoint { X = 0, GaugeIDZ = "G1" }); + gaugePlLine1.Points.Add(new GaugePlLinePoint { GaugeIDX = "G1", GaugeIDZ = "G1" }); + gaugePlLine1.Points.Add(new GaugePlLinePoint { GaugeIDX = "G2", GaugeIDZ = "G2" }); + gaugePlLine1.Points.Add(new GaugePlLinePoint { GaugeIDX = "G3", GaugeIDZ = "G3" }); + gaugePlLine1.Points.Add(new GaugePlLinePoint { X = 75, GaugeIDZ = "G3" }); + gaugePlLines.Add(gaugePlLine1); - GaugePLLine gaugePLLine2 = new GaugePLLine(PLLineType.PL2); - gaugePLLines.Add(gaugePLLine2); + GaugePlLine gaugePlLine2 = new GaugePlLine(PlLineType.PL2); + gaugePlLines.Add(gaugePlLine2); - GaugePLLine gaugePLLine3 = new GaugePLLine(PLLineType.PL3); - gaugePLLines.Add(gaugePLLine3); + GaugePlLine gaugePlLine3 = new GaugePlLine(PlLineType.PL3); + gaugePlLines.Add(gaugePlLine3); - GaugePLLine gaugePLLine4 = new GaugePLLine(PLLineType.PL4); - gaugePLLines.Add(gaugePLLine4); + GaugePlLine gaugePlLine4 = new GaugePlLine(PlLineType.PL4); + gaugePlLines.Add(gaugePlLine4); - plLineCreator.GaugePLLines = gaugePLLines; + plLineCreator.GaugePlLines = gaugePlLines; plLineCreator.Gauges = gauges; - PLLines plLines = plLineCreator.CreateAllPLLines(locations[0]); + PlLines plLines = plLineCreator.CreateAllPlLines(locations[0]); - Assert.AreEqual(2, plLines.Lines[PLLineType.PL1].Points.Count); - Assert.AreEqual(0, plLines.Lines[PLLineType.PL1].Points[0].X); - Assert.AreEqual(6, plLines.Lines[PLLineType.PL1].Points[0].Z); - Assert.AreEqual(75, plLines.Lines[PLLineType.PL1].Points[1].X); - Assert.AreEqual(6, plLines.Lines[PLLineType.PL1].Points[1].Z); + Assert.AreEqual(2, plLines.Lines[PlLineType.PL1].Points.Count); + Assert.AreEqual(0, plLines.Lines[PlLineType.PL1].Points[0].X); + Assert.AreEqual(6, plLines.Lines[PlLineType.PL1].Points[0].Z); + Assert.AreEqual(75, plLines.Lines[PlLineType.PL1].Points[1].X); + Assert.AreEqual(6, plLines.Lines[PlLineType.PL1].Points[1].Z); - Assert.AreEqual(0, plLines.Lines[PLLineType.PL2].Points.Count); - Assert.AreEqual(0, plLines.Lines[PLLineType.PL3].Points.Count); - Assert.AreEqual(0, plLines.Lines[PLLineType.PL4].Points.Count); + Assert.AreEqual(0, plLines.Lines[PlLineType.PL2].Points.Count); + Assert.AreEqual(0, plLines.Lines[PlLineType.PL3].Points.Count); + Assert.AreEqual(0, plLines.Lines[PlLineType.PL4].Points.Count); } } @@ -1885,11 +1885,11 @@ // plLineCreator.SoilBaseDB = SoilbaseDB.Create(soilDatabaseName); // plLineCreator.DikeEmbankmentMaterial = plLineCreator.SoilBaseDB.GetSoil(cDikeMaterial); // plLineCreator.WaterLevelRiverHigh = 4.0; - // plLineCreator.ModelParametersForPLLines.PenetrationLength = 1.0; + // plLineCreator.ModelParametersForPlLines.PenetrationLength = 1.0; // plLineCreator.HeadInPLLine2 = 0.0; - // plLineCreator.ModelParametersForPLLines.DampingFactorPL3 = 0.3; - // plLineCreator.ModelParametersForPLLines.DampingFactorPL4 = 0.4; - // plLineCreator.ModelParametersForPLLines.PLLineCreationMethod = PLLineCreationMethod.ExpertKnowledgeRRD; + // plLineCreator.ModelParametersForPlLines.DampingFactorPL3 = 0.3; + // plLineCreator.ModelParametersForPlLines.DampingFactorPL4 = 0.4; + // plLineCreator.ModelParametersForPlLines.PLLineCreationMethod = PLLineCreationMethod.ExpertKnowledgeRRD; // plLineCreator.SurfaceLine = surfaceline; // plLineCreator.WaterLevelPolder = plLineCreator.SurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtPolder).Z - 1.0; // return plLineCreator; Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/RegionalAssessment/HydraulicShortcut/HydraulicShortcutEvaluator.cs =================================================================== diff -u -r1116 -r1117 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators/RegionalAssessment/HydraulicShortcut/HydraulicShortcutEvaluator.cs (.../HydraulicShortcutEvaluator.cs) (revision 1116) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/RegionalAssessment/HydraulicShortcut/HydraulicShortcutEvaluator.cs (.../HydraulicShortcutEvaluator.cs) (revision 1117) @@ -223,21 +223,21 @@ /// Create PL-lines /// /// - private PLLines CreatePlLines() + private PlLines CreatePlLines() { PlLinesCreator.PlLinesCreator plLinesCreator = new PlLinesCreator.PlLinesCreator { WaterLevelRiverHigh = GetBoezemLevel(), - HeadInPLLine2 = location.HeadPl2, - HeadInPLLine3 = location.HeadPl3, - HeadInPLLine4 = location.HeadPl4, + HeadInPlLine2 = location.HeadPl2, + HeadInPlLine3 = location.HeadPl3, + HeadInPlLine4 = location.HeadPl4, SurfaceLine = location.SurfaceLine, WaterLevelPolder = location.PolderLevel, - ModelParametersForPLLines = location.ModelParametersForPLLines, + ModelParametersForPlLines = location.ModelParametersForPLLines, SoilProfile = soilGeometry.SoilProfile, SoilGeometry2DName = null, SoilProfileType = SoilProfileType.ProfileType1D, - GaugePLLines = null, + GaugePlLines = null, Gauges = null, GaugeMissVal = 0.0, IsAdjustPL3AndPL4SoNoUpliftWillOccurEnabled = true, @@ -253,7 +253,7 @@ // soilbase.GetSoil(location.DikeEmbankmentMaterial); // in this evaluation obviously no hydraulic shortcut - PLLines plLines = plLinesCreator.CreateAllPLLines(location); + PlLines plLines = plLinesCreator.CreateAllPlLines(location); return plLines; } Index: DamEngine/trunk/src/Deltares.DamEngine.Data/General/PlLines/PLLines.cs =================================================================== diff -u -r877 -r1117 --- DamEngine/trunk/src/Deltares.DamEngine.Data/General/PlLines/PLLines.cs (.../PLLines.cs) (revision 877) +++ DamEngine/trunk/src/Deltares.DamEngine.Data/General/PlLines/PLLines.cs (.../PLLines.cs) (revision 1117) @@ -23,24 +23,24 @@ namespace Deltares.DamEngine.Data.General.PlLines { - public class PLLines + public class PlLines { - IDictionary lines; - public PLLines() + IDictionary lines; + public PlLines() { - lines = new Dictionary(); - foreach (PLLineType plLineType in PLLineType.GetValues(typeof(PLLineType))) + lines = new Dictionary(); + foreach (PlLineType plLineType in PlLineType.GetValues(typeof(PlLineType))) { - this.Lines[plLineType] = new PLLine(); + this.Lines[plLineType] = new PlLine(); } } - public IDictionary Lines + public IDictionary Lines { get { return this.lines; } private set { this.lines = value; } } - public int PLLineCount { get { return PLLineType.GetValues(typeof(PLLineType)).GetLength(0); } } + public int PLLineCount { get { return PlLineType.GetValues(typeof(PlLineType)).GetLength(0); } } } } Index: DamEngine/trunk/src/Deltares.DamEngine.Data/General/FailureMechanismParametersMStab.cs =================================================================== diff -u -r964 -r1117 --- DamEngine/trunk/src/Deltares.DamEngine.Data/General/FailureMechanismParametersMStab.cs (.../FailureMechanismParametersMStab.cs) (revision 964) +++ DamEngine/trunk/src/Deltares.DamEngine.Data/General/FailureMechanismParametersMStab.cs (.../FailureMechanismParametersMStab.cs) (revision 1117) @@ -63,7 +63,7 @@ public Location Location { get; set; } public SurfaceLine2 SurfaceLine { get; set; } - public PLLines PLLines { get; set; } + public PlLines.PlLines PLLines { get; set; } public SoilProfile1D SoilProfile { get; set; } public string SoilGeometry2DName { get; set; } Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityCommon/Assemblers/DamMStabAssembler.cs =================================================================== diff -u -r927 -r1117 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityCommon/Assemblers/DamMStabAssembler.cs (.../DamMStabAssembler.cs) (revision 927) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityCommon/Assemblers/DamMStabAssembler.cs (.../DamMStabAssembler.cs) (revision 1117) @@ -425,14 +425,14 @@ if (failureMechanismParametersMStab.PLLines != null) { externalPLLinesElement = new XElement(tnsb + XmlElementExternalPLLines); - foreach (PLLineType plLineType in Enum.GetValues(typeof(PLLineType))) + foreach (PlLineType plLineType in Enum.GetValues(typeof(PlLineType))) { - PLLine line = failureMechanismParametersMStab.PLLines.Lines[plLineType]; + PlLine line = failureMechanismParametersMStab.PLLines.Lines[plLineType]; var PLLineElement = new XElement(tnsb + XmlElementPLLine); externalPLLinesElement.Add(PLLineElement); PLLineElement.Add(new XAttribute(XmlAttributeIsPhreatic, line.IsPhreatic)); PLLineElement.Add(new XAttribute(XmlAttributeBoundaryLayer, line.BoundaryLayer)); - foreach (PLLinePoint point in line.Points) + foreach (PlLinePoint point in line.Points) { var PLPointElement = new XElement(tnsb + XmlElementPLPoint); PLPointElement.Add(new XAttribute(XmlAttributeXCoord, point.X)); Index: DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/FillDamFromXmlInputTests.cs =================================================================== diff -u -r1113 -r1117 --- DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/FillDamFromXmlInputTests.cs (.../FillDamFromXmlInputTests.cs) (revision 1113) +++ DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/FillDamFromXmlInputTests.cs (.../FillDamFromXmlInputTests.cs) (revision 1117) @@ -241,7 +241,7 @@ 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; Index: DamEngine/trunk/src/Deltares.DamEngine.Data/General/Sensors/Sensor.cs =================================================================== diff -u -r877 -r1117 --- DamEngine/trunk/src/Deltares.DamEngine.Data/General/Sensors/Sensor.cs (.../Sensor.cs) (revision 877) +++ DamEngine/trunk/src/Deltares.DamEngine.Data/General/Sensors/Sensor.cs (.../Sensor.cs) (revision 1117) @@ -50,15 +50,15 @@ //private readonly IGeometry geometry; private double relativeLocation; - private readonly HashSet plLineTypes; + private readonly HashSet plLineTypes; private int id; private double xRd; private double yRd; private double zRd; public Sensor() { - plLineTypes = new HashSet(); + plLineTypes = new HashSet(); ID = -1; //geometry = new Point(0,0,0); } @@ -198,7 +198,7 @@ /// // [Specification(typeof(NotNullSpecification))] // [Specification(typeof(ContiansAtLeastOneItem))] - public PLLineType[] PLLineMappings + public PlLineType[] PLLineMappings { get { return plLineTypes.ToArray(); } set @@ -220,10 +220,10 @@ { switch (plLineType) { - case PLLineType.PL1: res = res + "1; "; break; - case PLLineType.PL2: res = res + "2; "; break; - case PLLineType.PL3: res = res + "3; "; break; - case PLLineType.PL4: res = res + "4; "; break; + case PlLineType.PL1: res = res + "1; "; break; + case PlLineType.PL2: res = res + "2; "; break; + case PlLineType.PL3: res = res + "3; "; break; + case PlLineType.PL4: res = res + "4; "; break; } } return res; @@ -236,10 +236,10 @@ { switch (plLineType) { - case 1: plLineTypes.Add(PLLineType.PL1); break; - case 2: plLineTypes.Add(PLLineType.PL2); break; - case 3: plLineTypes.Add(PLLineType.PL3); break; - case 4: plLineTypes.Add(PLLineType.PL4); break; + case 1: plLineTypes.Add(PlLineType.PL1); break; + case 2: plLineTypes.Add(PlLineType.PL2); break; + case 3: plLineTypes.Add(PlLineType.PL3); break; + case 4: plLineTypes.Add(PlLineType.PL4); break; } } } @@ -269,7 +269,7 @@ /// Adds the specified PL line. /// /// The PL line. - public void Add(PLLineType plLine) + public void Add(PlLineType plLine) { plLineTypes.Add(plLine); } @@ -278,7 +278,7 @@ /// Removes the specified PL line. /// /// The PL line. - public void Remove(PLLineType plLine) + public void Remove(PlLineType plLine) { plLineTypes.Remove(plLine); } Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/Uplift/UpliftLocationDeterminator.cs =================================================================== diff -u -r1009 -r1117 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators/Uplift/UpliftLocationDeterminator.cs (.../UpliftLocationDeterminator.cs) (revision 1009) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/Uplift/UpliftLocationDeterminator.cs (.../UpliftLocationDeterminator.cs) (revision 1117) @@ -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; } @@ -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)); } } Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/DikesAssessmentRegional/RegionalScenariosCalculation.cs =================================================================== diff -u -r1069 -r1117 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators/DikesAssessmentRegional/RegionalScenariosCalculation.cs (.../RegionalScenariosCalculation.cs) (revision 1069) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/DikesAssessmentRegional/RegionalScenariosCalculation.cs (.../RegionalScenariosCalculation.cs) (revision 1117) @@ -313,7 +313,7 @@ { // if (job.Location.ModelFactors.UpliftCriterionPiping.HasValue) // { -// var modelParametersForPLLines = new ModelParametersForPLLines(); +// var modelParametersForPLLines = new ModelParametersForPlLines(); // var calculator = GetCalculatorForPipingModel(job, modelParametersForPLLines); // double waterLevel; // switch (job.LoadSituation) @@ -380,7 +380,7 @@ /// /// /// proper piping calculator -// private PipingCalculator GetCalculatorForPipingModel(RWScenarioProfileResult job, ModelParametersForPLLines modelParametersForPLLines) +// private PipingCalculator GetCalculatorForPipingModel(RWScenarioProfileResult job, ModelParametersForPlLines modelParametersForPLLines) // { // PipingCalculator calculator; // switch (job.PipingModelOption) Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/Common/DamPipingHelper.cs =================================================================== diff -u -r1081 -r1117 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/Common/DamPipingHelper.cs (.../DamPipingHelper.cs) (revision 1081) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/Common/DamPipingHelper.cs (.../DamPipingHelper.cs) (revision 1117) @@ -59,7 +59,7 @@ /// The point. /// The pl lines. /// The uplift location and result. - public static void DeterminePlLinesAndUpliftLocation(DamKernelInput damKernelInput, GeometryPoint point, out PLLines plLines, out UpliftLocationAndResult upliftLocationAndResult) + public static void DeterminePlLinesAndUpliftLocation(DamKernelInput damKernelInput, GeometryPoint point, out PlLines plLines, out UpliftLocationAndResult upliftLocationAndResult) { Location location = damKernelInput.Location; SoilProfile1D soilProfile = damKernelInput.SubSoilScenario.SoilProfile1D; Index: DamEngine/trunk/src/Deltares.DamEngine.Data/General/DAMEnumerations.cs =================================================================== diff -u -r1062 -r1117 --- DamEngine/trunk/src/Deltares.DamEngine.Data/General/DAMEnumerations.cs (.../DAMEnumerations.cs) (revision 1062) +++ DamEngine/trunk/src/Deltares.DamEngine.Data/General/DAMEnumerations.cs (.../DAMEnumerations.cs) (revision 1117) @@ -175,15 +175,15 @@ SlopeAdaptionBeforeShoulderAdaption } - public enum PLLineType + public enum PlLineType { PL1, PL2, PL3, PL4 } - public enum PLLinePointPositionXzType + public enum PlLinePointPositionXzType { OnPLLine, AbovePLLine, @@ -292,7 +292,7 @@ NoUplift } - public enum PLLineCreationMethod + public enum PlLineCreationMethod { ExpertKnowledgeRRD, ExpertKnowledgeLinearInDike, Index: DamEngine/trunk/src/Deltares.DamEngine.Data/General/PlLines/PLLine.cs =================================================================== diff -u -r877 -r1117 --- DamEngine/trunk/src/Deltares.DamEngine.Data/General/PlLines/PLLine.cs (.../PLLine.cs) (revision 877) +++ DamEngine/trunk/src/Deltares.DamEngine.Data/General/PlLines/PLLine.cs (.../PLLine.cs) (revision 1117) @@ -27,20 +27,20 @@ namespace Deltares.DamEngine.Data.General.PlLines { - public class PLLinePoint : GeometryPoint + public class PlLinePoint : GeometryPoint { - public PLLinePoint() : this (0, 0) { } + public PlLinePoint() : this (0, 0) { } - public PLLinePoint(double aX, double aZ) : base(aX, aZ) + public PlLinePoint(double aX, double aZ) : base(aX, aZ) { } } - public class PLLine : PolyLine, ICloneable + public class PlLine : PolyLine, ICloneable { - private PLLineType plLineType; + private PlLineType plLineType; - public PLLineType PLLineType + public PlLineType PLLineType { get { return plLineType; } set @@ -57,12 +57,12 @@ public int BoundaryLayer { get; set; } - public PLLine Clone() + public PlLine Clone() { - PLLine plLine = new PLLine() { IsPhreatic = this.IsPhreatic, BoundaryLayer = this.BoundaryLayer }; - foreach (PLLinePoint point in this.Points) + PlLine plLine = new PlLine() { IsPhreatic = this.IsPhreatic, BoundaryLayer = this.BoundaryLayer }; + foreach (PlLinePoint point in this.Points) { - PLLinePoint newPoint = new PLLinePoint() { X = point.X, Y = point.Y, Z = point.Z }; + PlLinePoint newPoint = new PlLinePoint() { X = point.X, Y = point.Y, Z = point.Z }; plLine.Points.Add(newPoint); } return plLine; @@ -76,7 +76,7 @@ /// /// /// - public IEnumerable GetPointSegmentBetween(double startX, double endX) + public IEnumerable GetPointSegmentBetween(double startX, double endX) { if (endX < startX) throw new ArgumentException("End value is smaller then the start value"); @@ -92,31 +92,31 @@ /// /// /// - public PLLinePointPositionXzType PositionXzOfPointRelatedToPLLine(GeometryPoint point) + public PlLinePointPositionXzType PositionXzOfPointRelatedToPLLine(GeometryPoint point) { // if point is out of scope of the surface line, return beyond if ((point.X < points[0].X) || (point.X > points[points.Count - 1].X)) - return PLLinePointPositionXzType.BeyondPLLine; + return PlLinePointPositionXzType.BeyondPLLine; double z = ZFromX(point.X); if (Math.Abs(point.Z - z) < GeometryPoint.Precision) { - return PLLinePointPositionXzType.OnPLLine; + return PlLinePointPositionXzType.OnPLLine; } else { if (point.Z > z) { - return PLLinePointPositionXzType.AbovePLLine; + return PlLinePointPositionXzType.AbovePLLine; } else { - return PLLinePointPositionXzType.BelowPLLine; + return PlLinePointPositionXzType.BelowPLLine; } } } - private IEnumerable PointsOrderdByX + private IEnumerable PointsOrderdByX { get { return this.Points.OrderBy(p => p.X); } } Index: DamEngine/trunk/src/Deltares.DamEngine.Data/General/ModelParameters.cs =================================================================== diff -u -r1116 -r1117 --- DamEngine/trunk/src/Deltares.DamEngine.Data/General/ModelParameters.cs (.../ModelParameters.cs) (revision 1116) +++ DamEngine/trunk/src/Deltares.DamEngine.Data/General/ModelParameters.cs (.../ModelParameters.cs) (revision 1117) @@ -70,6 +70,6 @@ public virtual double PenetrationLength { get; set; } public virtual double DampingFactorPL3 { get; set; } public virtual double DampingFactorPL4 { get; set; } - public virtual PLLineCreationMethod PLLineCreationMethod { get; set; } + public virtual PlLineCreationMethod PlLineCreationMethod { get; set; } } } \ No newline at end of file Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamMacroStabilityHorizontalBalance/DamMacroStabilityHorizontalBalanceKernelWrapperTests.cs =================================================================== diff -u -r1036 -r1117 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamMacroStabilityHorizontalBalance/DamMacroStabilityHorizontalBalanceKernelWrapperTests.cs (.../DamMacroStabilityHorizontalBalanceKernelWrapperTests.cs) (revision 1036) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamMacroStabilityHorizontalBalance/DamMacroStabilityHorizontalBalanceKernelWrapperTests.cs (.../DamMacroStabilityHorizontalBalanceKernelWrapperTests.cs) (revision 1117) @@ -102,7 +102,7 @@ var soilDbName = Path.Combine(testFolder, "soilmaterials.mdb"); scenario.Location.StabilityOptions.SoilDatabaseName = soilDbName; var soilProfile = CreateSoilProfile(); - //var modelParametersForPLLines = new ModelParametersForPLLines(); + //var modelParametersForPLLines = new ModelParametersForPlLines(); MStabParameters mstabParameters = new MStabParameters { ShearStrength = MStabShearStrength.CPhi, Index: DamEngine/trunk/src/Deltares.DamEngine.Data/General/Gauges/GaugePLLine.cs =================================================================== diff -u -r877 -r1117 --- DamEngine/trunk/src/Deltares.DamEngine.Data/General/Gauges/GaugePLLine.cs (.../GaugePLLine.cs) (revision 877) +++ DamEngine/trunk/src/Deltares.DamEngine.Data/General/Gauges/GaugePLLine.cs (.../GaugePLLine.cs) (revision 1117) @@ -24,11 +24,11 @@ namespace Deltares.DamEngine.Data.General.Gauges { - public class GaugePLLinePoint : GeometryPoint + public class GaugePlLinePoint : GeometryPoint { - public GaugePLLinePoint() : this(null, null, null, null) { } + public GaugePlLinePoint() : this(null, null, null, null) { } - public GaugePLLinePoint(double? localX, double? localZ, string gaugeX, string gaugeZ) + public GaugePlLinePoint(double? localX, double? localZ, string gaugeX, string gaugeZ) { this.X = localX; this.Z = localZ; @@ -47,25 +47,25 @@ } } - public class GaugePLLine : PolyLine + public class GaugePlLine : PolyLine { - private GaugePLLine() + private GaugePlLine() : base() { } - public GaugePLLine(PLLineType plLineType) + public GaugePlLine(PlLineType plLineType) : this() { this.PLLineType = plLineType; } - public PLLineType PLLineType { get; set; } + public PlLineType PLLineType { get; set; } public override string ToString() { string result = String.Format("{0} | ", this.PLLineType.ToString()); - foreach (GaugePLLinePoint point in this.Points) + foreach (GaugePlLinePoint point in this.Points) result += point.ToString() + ", "; return result; Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/Common/ShoulderDesignHelper.cs =================================================================== diff -u -r1082 -r1117 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/Common/ShoulderDesignHelper.cs (.../ShoulderDesignHelper.cs) (revision 1082) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/Common/ShoulderDesignHelper.cs (.../ShoulderDesignHelper.cs) (revision 1117) @@ -28,21 +28,21 @@ { public class ShoulderDesignHelper { - public static double CalculateExtraShoulderHeight(SoilProfile1D soilProfile, PLLines plLines, UpliftLocationAndResult upliftLocationAndResult, double upliftCriterion) + public static double CalculateExtraShoulderHeight(SoilProfile1D soilProfile, PlLines plLines, UpliftLocationAndResult upliftLocationAndResult, double upliftCriterion) { var calculator = new UpliftCalculator(); calculator.SoilProfile = soilProfile; calculator.SurfaceLevel = upliftLocationAndResult.Z; - calculator.PhreaticLevel = plLines.Lines[PLLineType.PL1].ZFromX(upliftLocationAndResult.X); + calculator.PhreaticLevel = plLines.Lines[PlLineType.PL1].ZFromX(upliftLocationAndResult.X); calculator.TopOfLayerToBeEvaluated = soilProfile.GetLayerWithName(upliftLocationAndResult.LayerWhereUpliftOccuresId).TopLevel; - PLLine plLine; + PlLine plLine; if (upliftLocationAndResult.LayerWhereUpliftOccuresId == soilProfile.BottomAquiferLayer.Name) { - plLine = plLines.Lines[PLLineType.PL3]; + plLine = plLines.Lines[PlLineType.PL3]; } else { - plLine = plLines.Lines[PLLineType.PL4]; + plLine = plLines.Lines[PlLineType.PL4]; } return calculator.CalculateExtraHeight(plLine.ZFromX(upliftLocationAndResult.X), upliftCriterion); } Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamMacroStabilityCommon/DamMStabAssemblerTest.cs =================================================================== diff -u -r1116 -r1117 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamMacroStabilityCommon/DamMStabAssemblerTest.cs (.../DamMStabAssemblerTest.cs) (revision 1116) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamMacroStabilityCommon/DamMStabAssemblerTest.cs (.../DamMStabAssemblerTest.cs) (revision 1117) @@ -148,24 +148,24 @@ surfaceLine2.EnsurePointOfType(85.4, -3.61, CharacteristicPointType.SurfaceLevelInside); // PL Lines - peelLines = new PLLines(); - peelLine1 = new PLLine(); + peelLines = new PlLines(); + peelLine1 = new PlLine(); peelLine1.Name = "PLLine1"; peelLine1.IsPhreatic = false; peelLine1.BoundaryLayer = 2; - peelLine1.Points.Add(new PLLinePoint(35.2, -7.56)); - peelLine1.Points.Add(new PLLinePoint(42.5, -6.12)); - peelLine1.Points.Add(new PLLinePoint(45.3, -8.73)); - peelLines.Lines[PLLineType.PL1] = peelLine1; - peelLine2 = new PLLine(); + peelLine1.Points.Add(new PlLinePoint(35.2, -7.56)); + peelLine1.Points.Add(new PlLinePoint(42.5, -6.12)); + peelLine1.Points.Add(new PlLinePoint(45.3, -8.73)); + peelLines.Lines[PlLineType.PL1] = peelLine1; + peelLine2 = new PlLine(); peelLine2.Name = "PLLine2"; peelLine2.IsPhreatic = true; peelLine2.BoundaryLayer = 5; - peelLine2.Points.Add(new PLLinePoint(16.2, 3.23)); - peelLine2.Points.Add(new PLLinePoint(18.4, 1.19)); - peelLine2.Points.Add(new PLLinePoint(21.8, -0.45)); - peelLine2.Points.Add(new PLLinePoint(22.5, -1.73)); - peelLines.Lines[PLLineType.PL1] = peelLine2; + peelLine2.Points.Add(new PlLinePoint(16.2, 3.23)); + peelLine2.Points.Add(new PlLinePoint(18.4, 1.19)); + peelLine2.Points.Add(new PlLinePoint(21.8, -0.45)); + peelLine2.Points.Add(new PlLinePoint(22.5, -1.73)); + peelLines.Lines[PlLineType.PL1] = peelLine2; // Calculation options calculationOptions = new MStabCalculationOptions(); @@ -282,9 +282,9 @@ private SurfaceLine2 surfaceLine2; private SoilProfile1D soilProfile1; - private PLLines peelLines; - private PLLine peelLine1; - private PLLine peelLine2; + private PlLines peelLines; + private PlLine peelLine1; + private PlLine peelLine2; private MStabZoneAreas zoneAreas; private MStabCalculationOptions calculationOptions; @@ -366,9 +366,9 @@ Assert.AreEqual(damFailureMechanismeCalculationSpecification.FailureMechanismParametersMStab.PLLines.PLLineCount, peelLineCollectionElements.Count(), "Number of PL lines"); IEnumerator peelLineElementEnumerator = peelLineCollectionElements.GetEnumerator(); - foreach (PLLineType plLineType in Enum.GetValues(typeof(PLLineType))) + foreach (PlLineType plLineType in Enum.GetValues(typeof(PlLineType))) { - PLLine line = damFailureMechanismeCalculationSpecification.FailureMechanismParametersMStab.PLLines.Lines[plLineType]; + PlLine line = damFailureMechanismeCalculationSpecification.FailureMechanismParametersMStab.PLLines.Lines[plLineType]; peelLineElementEnumerator.MoveNext(); XElement peelLineElement = peelLineElementEnumerator.Current; @@ -380,7 +380,7 @@ select element; Assert.AreEqual(line.Points.Count, peelPointCollectionElements.Count(), "Number of PL line Points"); IEnumerator peelPointElementEnumerator = peelPointCollectionElements.GetEnumerator(); - foreach (PLLinePoint point in line.Points) + foreach (PlLinePoint point in line.Points) { peelPointElementEnumerator.MoveNext(); XElement peelPointElement = peelPointElementEnumerator.Current; @@ -501,11 +501,11 @@ plLineCreator.SurfaceLine = surfaceLine1; plLineCreator.WaterLevelRiverHigh = 4.0; plLineCreator.WaterLevelPolder = -4.5; - plLineCreator.ModelParametersForPLLines.DampingFactorPL3 = 0.3; - plLineCreator.ModelParametersForPLLines.DampingFactorPL4 = 0.4; - plLineCreator.ModelParametersForPLLines.PenetrationLength = 1.5; - plLineCreator.HeadInPLLine2 = 0.0; - plLineCreator.CreateAllPLLines(location); + plLineCreator.ModelParametersForPlLines.DampingFactorPL3 = 0.3; + plLineCreator.ModelParametersForPlLines.DampingFactorPL4 = 0.4; + plLineCreator.ModelParametersForPlLines.PenetrationLength = 1.5; + plLineCreator.HeadInPlLine2 = 0.0; + plLineCreator.CreateAllPlLines(location); var doc = assembler.CreateDataTransferObject(damFailureMechanismeCalculationSpecification.FailureMechanismParametersMStab); Directory.CreateDirectory(TestDirectory); doc.Save(Path.Combine(TestDirectory, TestFileNameWithPlLines)); Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/Common/PlLinesHelper.cs =================================================================== diff -u -r1116 -r1117 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/Common/PlLinesHelper.cs (.../PlLinesHelper.cs) (revision 1116) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/Common/PlLinesHelper.cs (.../PlLinesHelper.cs) (revision 1117) @@ -39,7 +39,7 @@ /// The water level. /// The uplift situation. /// - public static PLLines CreatePlLinesForStability(Location location, SoilGeometryProbability subSoilScenario, + public static PlLines CreatePlLinesForStability(Location location, SoilGeometryProbability subSoilScenario, double waterLevel, string soilGeometry2DName, double? waterLevelRiverLow, out UpliftSituation upliftSituation) { var plLinesCreator = new PlLinesCreator.PlLinesCreator @@ -49,14 +49,14 @@ WaterLevelRiverHigh = waterLevel, SurfaceLine = location.SurfaceLine, WaterLevelPolder = location.PolderLevel, - HeadInPLLine2 = location.HeadPl2, - HeadInPLLine3 = location.HeadPl3, - HeadInPLLine4 = location.HeadPl4, - ModelParametersForPLLines = location.ModelParametersForPLLines, + HeadInPlLine2 = location.HeadPl2, + HeadInPlLine3 = location.HeadPl3, + HeadInPlLine4 = location.HeadPl4, + ModelParametersForPlLines = location.ModelParametersForPLLines, SoilProfile = subSoilScenario.SoilProfile1D, SoilProfileType = subSoilScenario.SoilProfileType, SoilGeometry2DName = soilGeometry2DName, - GaugePLLines = null, // TODO: Operational + GaugePlLines = null, // TODO: Operational Gauges = null, // TODO: Operational IsAdjustPL3AndPL4SoNoUpliftWillOccurEnabled = true, // for stability this must be set to true PlLineOffsetBelowDikeTopAtRiver = location.PlLineOffsetBelowDikeTopAtRiver, @@ -68,7 +68,7 @@ XSoilGeometry2DOrigin = location.XSoilGeometry2DOrigin, SoilList = location.SoilList }; - var plLines = plLinesCreator.CreateAllPLLines(location); + var plLines = plLinesCreator.CreateAllPlLines(location); upliftSituation.Pl3HeadAdjusted = plLinesCreator.Pl3HeadAdjusted; upliftSituation.Pl3LocationXMinUplift = plLinesCreator.Pl3LocationXMinUplift; upliftSituation.Pl3MinUplift = plLinesCreator.Pl3MinUplift; @@ -87,19 +87,19 @@ /// The water level. /// The uplift situation. /// - public static PLLines CreatePlLinesForPiping(Location location, SoilProfile1D soilProfile, double waterLevel, out UpliftSituation upliftSituation) + public static PlLines CreatePlLinesForPiping(Location location, SoilProfile1D soilProfile, double waterLevel, out UpliftSituation upliftSituation) { var plLinesCreator = new PlLinesCreator.PlLinesCreator { WaterLevelRiverHigh = waterLevel, SurfaceLine = location.SurfaceLine, WaterLevelPolder = location.PolderLevel, - HeadInPLLine2 = location.HeadPl2, - HeadInPLLine3 = location.HeadPl3, - HeadInPLLine4 = location.HeadPl4, - ModelParametersForPLLines = location.ModelParametersForPLLines, + HeadInPlLine2 = location.HeadPl2, + HeadInPlLine3 = location.HeadPl3, + HeadInPlLine4 = location.HeadPl4, + ModelParametersForPlLines = location.ModelParametersForPLLines, SoilProfile = soilProfile, - GaugePLLines = null, // TODO: Operational + GaugePlLines = null, // TODO: Operational Gauges = null, // TODO: Operational IsAdjustPL3AndPL4SoNoUpliftWillOccurEnabled = false, // for piping this must be set to false PlLineOffsetBelowDikeTopAtRiver = location.PlLineOffsetBelowDikeTopAtRiver, @@ -108,7 +108,7 @@ IsHydraulicShortcut = false, // TODO: Regional XSoilGeometry2DOrigin = location.XSoilGeometry2DOrigin }; - var plLines = plLinesCreator.CreateAllPLLines(location); + var plLines = plLinesCreator.CreateAllPlLines(location); upliftSituation.Pl3HeadAdjusted = plLinesCreator.Pl3HeadAdjusted; upliftSituation.Pl3LocationXMinUplift = plLinesCreator.Pl3LocationXMinUplift; upliftSituation.Pl3MinUplift = plLinesCreator.Pl3MinUplift; Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/PlLinesCreator/PlLinesCreator.cs =================================================================== diff -u -r1116 -r1117 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators/PlLinesCreator/PlLinesCreator.cs (.../PlLinesCreator.cs) (revision 1116) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/PlLinesCreator/PlLinesCreator.cs (.../PlLinesCreator.cs) (revision 1117) @@ -42,7 +42,7 @@ protected readonly Dictionary cachedSoilProfiles1D = new Dictionary(); private const double cUpliftFactorEquilibrium = 1.0; private const double cOffsetPhreaticLineBelowSurface = 0.01; - private ModelParametersForPlLines modelParametersForPLLines = new ModelParametersForPlLines(); + private ModelParametersForPlLines modelParametersForPlLines = new ModelParametersForPlLines(); public bool IsUseOvenDryUnitWeight { get; set; } public SoilProfileType SoilProfileType { get; set; } public SoilProfile1D SoilProfile { get; set; } @@ -53,32 +53,32 @@ public Soil DikeEmbankmentMaterial { get; set; } //public SoilbaseDB SoilBaseDB { get; set; } public SoilList SoilList { get; set; } - public double? HeadInPLLine2 { get; set; } - private double? headInPLLine3 { get; set; } - private double? headInPLLine4 { get; set; } + public double? HeadInPlLine2 { get; set; } + private double? headInPlLine3 { get; set; } + private double? headInPlLine4 { get; set; } public double XSoilGeometry2DOrigin { get; set; } - private bool isAdjustPL3AndPL4SoNoUpliftWillOccurEnabled = true; + private bool isAdjustPl3AndPl4SoNoUpliftWillOccurEnabled = true; private bool isHydraulicShortcut = false; private double waterLevelPolder; private double waterLevelRiverHigh; private double? waterLevelRiverLow; private bool isUseLowWaterLevel; private SurfaceLine2 surfaceLine; - public bool IsAdjustPL3AndPL4SoNoUpliftWillOccurEnabled { get { return isAdjustPL3AndPL4SoNoUpliftWillOccurEnabled; } set { isAdjustPL3AndPL4SoNoUpliftWillOccurEnabled = value; } } + public bool IsAdjustPL3AndPL4SoNoUpliftWillOccurEnabled { get { return isAdjustPl3AndPl4SoNoUpliftWillOccurEnabled; } set { isAdjustPl3AndPl4SoNoUpliftWillOccurEnabled = value; } } public double WaterLevelRiverHigh { get { return waterLevelRiverHigh; } set { waterLevelRiverHigh = value; } } public double? WaterLevelRiverLow { get { return waterLevelRiverLow; } set { waterLevelRiverLow = value; } } public bool IsUseLowWaterLevel { get { return isUseLowWaterLevel; } set { isUseLowWaterLevel = value; } } public double WaterLevelPolder { get { return waterLevelPolder; } set { waterLevelPolder = value; } } - public double? HeadInPLLine3 { get { return headInPLLine3; } set { headInPLLine3 = value; } } - public double? HeadInPLLine4 { get { return headInPLLine4; } set { headInPLLine4 = value; } } + public double? HeadInPlLine3 { get { return headInPlLine3; } set { headInPlLine3 = value; } } + public double? HeadInPlLine4 { get { return headInPlLine4; } set { headInPlLine4 = value; } } /// Aggregation relationship public SurfaceLine2 SurfaceLine { get { return surfaceLine; } set { surfaceLine = value; } } - public IList GaugePLLines { get; set; } + public IList GaugePlLines { get; set; } public IList Gauges { get; set; } public double GaugeMissVal { get; set; } public double PlLineOffsetBelowDikeTopAtRiver { get; set; } @@ -108,7 +108,7 @@ { double waterLevel = WaterLevelToUse(); // If no value known for headPl3 then use waterlevel for headPL3 - if (HeadInPLLine3 == null) + if (HeadInPlLine3 == null) { return waterLevel; } @@ -123,11 +123,11 @@ return waterLevel; } } - return HeadInPLLine3.Value; + return HeadInPlLine3.Value; } else { - return HeadInPLLine3.Value; + return HeadInPlLine3.Value; } } } @@ -143,7 +143,7 @@ } else { - if (HeadInPLLine4 == null) + if (HeadInPlLine4 == null) { // If no hydraulic shortcut and no value known for headPl4 then use polderlevel for headPL4 if (damType == DamType.Primary) @@ -158,12 +158,12 @@ else { // If no hydraulic shortcut and value is specified for headPl4 then use this value for headPL4 - return HeadInPLLine4.Value; + return HeadInPlLine4.Value; } } } - private PLLine currentPL1Line = null; // is needed when calculating uplift reduction for PL3 and Pl4 + private PlLine currentPL1Line = null; // is needed when calculating uplift reduction for PL3 and Pl4 // Output private double pl3MinUplift; @@ -226,10 +226,10 @@ } } - public ModelParametersForPlLines ModelParametersForPLLines + public ModelParametersForPlLines ModelParametersForPlLines { - get { return modelParametersForPLLines; } - set { modelParametersForPLLines = value; } + get { return modelParametersForPlLines; } + set { modelParametersForPlLines = value; } } public bool IsHydraulicShortcut @@ -256,9 +256,9 @@ /// Create PL2 (is pl line for penetration) /// /// - private PLLine CreatePLLine2ByExpertKnowledge(double penetrationLength, double? headInPLLine2) + private PlLine CreatePLLine2ByExpertKnowledge(double penetrationLength, double? headInPLLine2) { - PLLine plLine = null; + PlLine plLine = null; if (penetrationLength < 0.0) { @@ -267,7 +267,7 @@ if ((penetrationLength.AlmostEquals(0.0)) || (headInPLLine2 == null)) { // No penetration, or no Head Pl2 defined, so empty pl-line will be returned - plLine = new PLLine(); + plLine = new PlLine(); } else { @@ -297,15 +297,15 @@ /// The head in pl line2. /// /// Head PL2 not defined - private PLLine CreatePlLine2ByExpertKnowledgeFor2DGeometry(double penetrationLength, double? headInPLLine2) + private PlLine CreatePlLine2ByExpertKnowledgeFor2DGeometry(double penetrationLength, double? headInPLLine2) { if (headInPLLine2 == null) { throw new PlLinesCreatorException("Head PL2 not defined"); } - PLLine plLine = new PLLine(); - plLine.Points.Add(new PLLinePoint(this.surfaceLine.Geometry.Points.First().X, headInPLLine2.Value)); - plLine.Points.Add(new PLLinePoint(this.surfaceLine.Geometry.Points.Last().X, headInPLLine2.Value)); + PlLine plLine = new PlLine(); + plLine.Points.Add(new PlLinePoint(this.surfaceLine.Geometry.Points.First().X, headInPLLine2.Value)); + plLine.Points.Add(new PlLinePoint(this.surfaceLine.Geometry.Points.Last().X, headInPLLine2.Value)); return plLine; } @@ -315,13 +315,13 @@ /// /// /// - private PLLine CreatePlLine2ByExpertKnowledgeFor1DGeometry(double penetrationLength, double? headInPLLine2) + private PlLine CreatePlLine2ByExpertKnowledgeFor1DGeometry(double penetrationLength, double? headInPLLine2) { if (headInPLLine2 == null) { throw new PlLinesCreatorException("Head PL2 not defined"); } - PLLine plLine = new PLLine(); + PlLine plLine = new PlLine(); if (SoilProfile != null) { IList aquiferLayers = this.SoilProfile.GetAquiferLayers(); @@ -343,8 +343,8 @@ if (separationLevel <= infiltrationLayers.First().TopLevel) { - plLine.Points.Add(new PLLinePoint(this.surfaceLine.Geometry.Points.First().X, headInPLLine2.Value)); - plLine.Points.Add(new PLLinePoint(this.surfaceLine.Geometry.Points.Last().X, headInPLLine2.Value)); + plLine.Points.Add(new PlLinePoint(this.surfaceLine.Geometry.Points.First().X, headInPLLine2.Value)); + plLine.Points.Add(new PlLinePoint(this.surfaceLine.Geometry.Points.Last().X, headInPLLine2.Value)); SoilLayer1D separationLayer = (from SoilLayer1D layer in infiltrationLayers where layer.TopLevel >= separationLevel @@ -394,26 +394,26 @@ /// Create PL3 (is phreatic level) /// /// - private PLLine CreatePLLine3ByExpertKnowledge(double headValue, double dampingFactor, double slopeGradient) + private PlLine CreatePLLine3ByExpertKnowledge(double headValue, double dampingFactor, double slopeGradient) { - return CreatePLLine3Or4ByExpertKnowledge(headValue, dampingFactor, PLLineType.PL3, slopeGradient); + return CreatePLLine3Or4ByExpertKnowledge(headValue, dampingFactor, PlLineType.PL3, slopeGradient); } /// /// Create PL4 (is phreatic level) /// /// - private PLLine CreatePLLine4ByExpertKnowledge(double headValue, double dampingFactor, double slopeGradient) + private PlLine CreatePLLine4ByExpertKnowledge(double headValue, double dampingFactor, double slopeGradient) { - return CreatePLLine3Or4ByExpertKnowledge(headValue, dampingFactor, PLLineType.PL4, slopeGradient); + return CreatePLLine3Or4ByExpertKnowledge(headValue, dampingFactor, PlLineType.PL4, slopeGradient); } - private PLLine CreatePLLine3Or4ByExpertKnowledge(double headValue, double dampingFactor, PLLineType plLineType, double slopeGradient) + private PlLine CreatePLLine3Or4ByExpertKnowledge(double headValue, double dampingFactor, PlLineType plLineType, double slopeGradient) { // Offset to solve issue MWDAM-557 const double offset = 0.01; - PLLine plLine = new PLLine(); + PlLine plLine = new PlLine(); ThrowIfInsufficientSoilGeometryData(); ThrowIfNoSurfaceLine(); @@ -435,16 +435,16 @@ var relevantAquiferLayer = GetRelevantAquiferLayer(plLineType, actualSoilProfile); if (relevantAquiferLayer != null) { - double referenceLevel = (this.HeadInPLLine2 != null) ? this.HeadInPLLine2.Value : this.waterLevelPolder; + double referenceLevel = (this.HeadInPlLine2 != null) ? this.HeadInPlLine2.Value : this.waterLevelPolder; double headAtPolderDikeToe = headValue - Math.Max(0, dampingFactor * (headValue - referenceLevel)); - plLine.Points.Add(new PLLinePoint(this.surfaceLine.Geometry.Points.First().X, headValue)); - plLine.Points.Add(new PLLinePoint(this.surfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtRiver).X, headValue)); - plLine.Points.Add(new PLLinePoint(this.surfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtPolder).X, headAtPolderDikeToe)); + plLine.Points.Add(new PlLinePoint(this.surfaceLine.Geometry.Points.First().X, headValue)); + plLine.Points.Add(new PlLinePoint(this.surfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtRiver).X, headValue)); + plLine.Points.Add(new PlLinePoint(this.surfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtPolder).X, headAtPolderDikeToe)); // Now continue PLline to the end with a slope of slopegradient AddTailOfPl3OrPl4WithSlopeGradient(slopeGradient, plLine); - if (isAdjustPL3AndPL4SoNoUpliftWillOccurEnabled) + if (isAdjustPl3AndPl4SoNoUpliftWillOccurEnabled) { AdjustLineAccordingToTRWUplift(plLine, plLineType, slopeGradient); } @@ -465,12 +465,12 @@ /// /// The slope gradient. /// The pl line. - private void AddTailOfPl3OrPl4WithSlopeGradient(double slopeGradient, PLLine plLine) + private void AddTailOfPl3OrPl4WithSlopeGradient(double slopeGradient, PlLine plLine) { if (plLine.Points.Last().Z <= this.WaterLevelPolder) { // the PL line is already at WaterLevelPolder, so countinue it horizontally - plLine.Points.Add(new PLLinePoint(this.surfaceLine.Geometry.Points.Last().X, this.WaterLevelPolder)); + plLine.Points.Add(new PlLinePoint(this.surfaceLine.Geometry.Points.Last().X, this.WaterLevelPolder)); } else { @@ -489,18 +489,18 @@ if (waterLevelPolderLine.IntersectsZ(slopeLine, out intersectionPoint)) { - plLine.Points.Add(new PLLinePoint(intersectionPoint.X, this.WaterLevelPolder)); - plLine.Points.Add(new PLLinePoint(this.surfaceLine.Geometry.Points.Last().X, this.WaterLevelPolder)); + plLine.Points.Add(new PlLinePoint(intersectionPoint.X, this.WaterLevelPolder)); + plLine.Points.Add(new PlLinePoint(this.surfaceLine.Geometry.Points.Last().X, this.WaterLevelPolder)); } else { - plLine.Points.Add(new PLLinePoint(this.surfaceLine.Geometry.Points.Last().X, headAtEnd)); + plLine.Points.Add(new PlLinePoint(this.surfaceLine.Geometry.Points.Last().X, headAtEnd)); } } } - private static SoilLayer1D GetRelevantAquiferLayer(PLLineType type, SoilProfile1D actualSoilProfile) + private static SoilLayer1D GetRelevantAquiferLayer(PlLineType type, SoilProfile1D actualSoilProfile) { IList aquiferLayers = actualSoilProfile.GetAquiferLayers(); // Note : if no aquifers at all, always throw a message @@ -512,18 +512,18 @@ SoilLayer1D relevantAquiferLayer; switch (type) { - case PLLineType.PL3: + case PlLineType.PL3: relevantAquiferLayer = actualSoilProfile.BottomAquiferLayer; // Pleistocene break; - case PLLineType.PL4: + case PlLineType.PL4: relevantAquiferLayer = actualSoilProfile.InBetweenAquiferLayer; // Intermediate sand layer break; default: throw new PlLinesCreatorException(String.Format("Invalid PL line type:{0} for creation of PL Line 3 or 4", type)); } // Note : DAM already handles a missing (null) InBetweenAquiferLayer itself so do not throw for that. - if (relevantAquiferLayer == null && type == PLLineType.PL3) + if (relevantAquiferLayer == null && type == PlLineType.PL3) { string message = "Soil profile (" + actualSoilProfile.Name + ") contains no relevant aquifer layer."; throw new PlLinesCreatorException(message); @@ -536,14 +536,14 @@ /// /// /// - private static void RemoveRedundantPoints(PLLine plLine) + private static void RemoveRedundantPoints(PlLine plLine) { const double Tolerance = 0.001; for (int pointIndex = plLine.Points.Count - 2; pointIndex > 0; pointIndex--) { - PLLinePoint plPointPrev = plLine.Points[pointIndex - 1]; - PLLinePoint plPoint = plLine.Points[pointIndex]; - PLLinePoint plPointNext = plLine.Points[pointIndex + 1]; + PlLinePoint plPointPrev = plLine.Points[pointIndex - 1]; + PlLinePoint plPoint = plLine.Points[pointIndex]; + PlLinePoint plPointNext = plLine.Points[pointIndex + 1]; if (Math.Abs((plPoint.Z - plPointPrev.Z) / (plPoint.X - plPointPrev.X) - (plPointNext.Z - plPoint.Z) / (plPointNext.X - plPoint.X)) < Tolerance) { plLine.Points.Remove(plPoint); @@ -555,10 +555,10 @@ /// All points should have descending z from dike to polder /// /// - private static void EnsureDescendingLine(PLLine plLine) + private static void EnsureDescendingLine(PlLine plLine) { - PLLinePoint plPointPrevious = null; - foreach (PLLinePoint plPoint in plLine.Points) + PlLinePoint plPointPrevious = null; + foreach (PlLinePoint plPoint in plLine.Points) { if (plPointPrevious != null && plPoint.Z > plPointPrevious.Z) plPoint.Z = plPointPrevious.Z; @@ -570,16 +570,16 @@ /// Clear outputvalues for PL3 or PL4 /// /// - private void ClearOutputValuesForPl3_4(PLLineType plLineType) + private void ClearOutputValuesForPl3_4(PlLineType plLineType) { switch (plLineType) { - case PLLineType.PL3: + case PlLineType.PL3: pl3MinUplift = Double.MaxValue; pl3HeadAdjusted = Double.MaxValue; pl3LocationXMinUplift = Double.MaxValue; break; - case PLLineType.PL4: + case PlLineType.PL4: pl4MinUplift = Double.MaxValue; pl4HeadAdjusted = Double.MaxValue; pl4LocationXMinUplift = Double.MaxValue; @@ -594,19 +594,19 @@ /// The x coordinate. /// The uplift factor. /// The head value. - private void UpdateOutputValuesForPl3_4(PLLineType plLineType, double xCoordinate, double upliftFactor, double headValue) + private void UpdateOutputValuesForPl3_4(PlLineType plLineType, double xCoordinate, double upliftFactor, double headValue) { switch (plLineType) { - case PLLineType.PL3: + case PlLineType.PL3: if (upliftFactor < pl3MinUplift) { pl3MinUplift = upliftFactor; pl3HeadAdjusted = headValue; pl3LocationXMinUplift = xCoordinate; } break; - case PLLineType.PL4: + case PlLineType.PL4: if (upliftFactor < pl4MinUplift) { pl4MinUplift = upliftFactor; @@ -624,11 +624,11 @@ /// The pl line. /// The x coordinate. /// - private int FindIndexOfPointInPLLineWithXCoordinate(PLLine plLine, double x) + private int FindIndexOfPointInPLLineWithXCoordinate(PlLine plLine, double x) { for (int pointIndex = plLine.Points.Count - 1; pointIndex > 0; pointIndex--) { - PLLinePoint plPoint = plLine.Points[pointIndex]; + PlLinePoint plPoint = plLine.Points[pointIndex]; if (plPoint.X.AlmostEquals(x, GeometryPoint.Precision)) { return pointIndex; @@ -643,7 +643,7 @@ /// /// The pl line. /// The start index (this point will not be removed). - private void RemoveAllPointsOfPlLineAfterIndex(PLLine plLine, int startIndex) + private void RemoveAllPointsOfPlLineAfterIndex(PlLine plLine, int startIndex) { for (int pointIndex = plLine.Points.Count - 1; pointIndex > startIndex; pointIndex--) { @@ -716,7 +716,7 @@ /// /// /// - private void AdjustLineAccordingToTRWUplift(PLLine plLine, PLLineType plLineType, double slopeGradient) + private void AdjustLineAccordingToTRWUplift(PlLine plLine, PlLineType plLineType, double slopeGradient) { const double cTolerancePoint = 0.0001; ClearOutputValuesForPl3_4(plLineType); @@ -778,7 +778,7 @@ } if (headOfPlLine < lastAdjustedHeadOfPlLine) { - var plPoint = new PLLinePoint(surfacePoint.X, headOfPlLine); + var plPoint = new PlLinePoint(surfacePoint.X, headOfPlLine); // Remove all points of PLLine after fixed point RemoveAllPointsOfPlLineAfterIndex(plLine, indexOfFixedPlPoint); plLine.Points.Add(plPoint); @@ -823,7 +823,7 @@ double currentHead = plLine.ZFromX(surfacePoint.X); if (headOfPlLine < currentHead) { - PLLinePoint plPoint = plLine.EnsurePointAtX(surfacePoint.X, cTolerancePoint); + PlLinePoint plPoint = plLine.EnsurePointAtX(surfacePoint.X, cTolerancePoint); plPoint.Z = headOfPlLine; } } @@ -839,7 +839,7 @@ /// Type of the pl line. /// The uplift calculator. /// The surface point. - private void ConfigureUpliftCalculator(PLLineType plLineType, UpliftCalculator upliftCalculator, GeometryPoint surfacePoint) + private void ConfigureUpliftCalculator(PlLineType plLineType, UpliftCalculator upliftCalculator, GeometryPoint surfacePoint) { // Offset to solve issue MWDAM-764 const double offset = 0.01; @@ -921,12 +921,12 @@ /// /// /// - void CopyPointsInPLLine(ref PLLine plLine, GeometryPointString genericLine) + void CopyPointsInPLLine(ref PlLine plLine, GeometryPointString genericLine) { plLine.Points.Clear(); foreach (GeometryPoint point in genericLine.Points) { - plLine.Points.Add(new PLLinePoint(point.X, point.Z)); + plLine.Points.Add(new PlLinePoint(point.X, point.Z)); } } @@ -935,24 +935,24 @@ /// /// /// - private PLLines CreateAllPLLinesWithExpertKnowledge(Location location) + private PlLines CreateAllPLLinesWithExpertKnowledge(Location location) { - PLLines plLines = new PLLines(); - foreach (PLLineType plLineType in Enum.GetValues(typeof(PLLineType))) + PlLines plLines = new PlLines(); + foreach (PlLineType plLineType in Enum.GetValues(typeof(PlLineType))) { bool isPL1LineDefinedForLocation = (location != null) && (location.LocalXZPL1Line != null) && (location.LocalXZPL1Line.Points.Count > 1); - if ((plLineType == PLLineType.PL1) && isPL1LineDefinedForLocation) + if ((plLineType == PlLineType.PL1) && isPL1LineDefinedForLocation) { - PLLine plLine = plLines.Lines[plLineType]; + PlLine plLine = plLines.Lines[plLineType]; CopyPointsInPLLine(ref plLine, location.LocalXZPL1Line); } else { - plLines.Lines[plLineType] = CreatePLLineByExpertKnowledge(plLineType, location.DamType, location.SlopeDampingPiezometricHeightPolderSide); + plLines.Lines[plLineType] = CreatePlLineByExpertKnowledge(plLineType, location.DamType, location.SlopeDampingPiezometricHeightPolderSide); } // currentPL1Line is needed when calculating uplift reduction for PL3 and Pl4 - if (plLineType == PLLineType.PL1) + if (plLineType == PlLineType.PL1) { // var plLine = plLines.Lines[plLineType]; // AdaptPL1ForNonWaterRetainingObject(ref plLine); @@ -1320,23 +1320,23 @@ /// /// /// - private PLLines CreateAllPLLinesWithGaugesWithFallbackToExpertKnowledgeRRD(Location location) + private PlLines CreateAllPLLinesWithGaugesWithFallbackToExpertKnowledgeRRD(Location location) { - var plLines = new PLLines(); + var plLines = new PlLines(); - foreach (PLLineType plLineType in Enum.GetValues(typeof(PLLineType))) + foreach (PlLineType plLineType in Enum.GetValues(typeof(PlLineType))) { - GaugePLLine gaugePLLine = (this.GaugePLLines != null) ? (this.GaugePLLines.FirstOrDefault(x => x.PLLineType == plLineType)) : null; + GaugePlLine gaugePLLine = (this.GaugePlLines != null) ? (this.GaugePlLines.FirstOrDefault(x => x.PLLineType == plLineType)) : null; if (gaugePLLine != null && location != null) { - Boolean isUseWaterLevel = ((plLineType == PLLineType.PL1) || (plLineType == PLLineType.PL2)); + Boolean isUseWaterLevel = ((plLineType == PlLineType.PL1) || (plLineType == PlLineType.PL2)); plLines.Lines[plLineType] = CreatePLLineFromGauges(gaugePLLine, this.Gauges, location, isUseWaterLevel); } else - plLines.Lines[plLineType] = CreatePLLineByExpertKnowledge(plLineType, location.DamType, location.SlopeDampingPiezometricHeightPolderSide); + plLines.Lines[plLineType] = CreatePlLineByExpertKnowledge(plLineType, location.DamType, location.SlopeDampingPiezometricHeightPolderSide); // currentPL1Line is needed when calculating uplift reduction for PL3 and Pl4 - if (plLineType == PLLineType.PL1) + if (plLineType == PlLineType.PL1) { currentPL1Line = plLines.Lines[plLineType]; } @@ -1348,27 +1348,27 @@ /// Create all PLLines /// /// - public PLLines CreateAllPLLines(Location location) + public PlLines CreateAllPlLines(Location location) { - PLLines plLines = new PLLines(); - switch (modelParametersForPLLines.PLLineCreationMethod) + PlLines plLines = new PlLines(); + switch (modelParametersForPlLines.PlLineCreationMethod) { - case PLLineCreationMethod.ExpertKnowledgeLinearInDike: - case PLLineCreationMethod.ExpertKnowledgeRRD: plLines = CreateAllPLLinesWithExpertKnowledge(location); + case PlLineCreationMethod.ExpertKnowledgeLinearInDike: + case PlLineCreationMethod.ExpertKnowledgeRRD: plLines = CreateAllPLLinesWithExpertKnowledge(location); break; - case PLLineCreationMethod.GaugesWithFallbackToExpertKnowledgeRRD: plLines = CreateAllPLLinesWithGaugesWithFallbackToExpertKnowledgeRRD(location); + case PlLineCreationMethod.GaugesWithFallbackToExpertKnowledgeRRD: plLines = CreateAllPLLinesWithGaugesWithFallbackToExpertKnowledgeRRD(location); break; } // If PL Line2 does not exists, make it equal to PL line 4 - if (!plLines.Lines[PLLineType.PL2].Exists()) + if (!plLines.Lines[PlLineType.PL2].Exists()) { - plLines.Lines[PLLineType.PL2] = plLines.Lines[PLLineType.PL4].Clone(); + plLines.Lines[PlLineType.PL2] = plLines.Lines[PlLineType.PL4].Clone(); } - if (!plLines.Lines[PLLineType.PL1].IsXAscending()) + if (!plLines.Lines[PlLineType.PL1].IsXAscending()) { throw new PlLinesCreatorException("PLLine 1 not an X-ascending polyline"); } @@ -1381,23 +1381,23 @@ /// /// /// - public PLLine CreatePLLineByExpertKnowledge(PLLineType plLineType, DamType damType, double slopeGradient) + public PlLine CreatePlLineByExpertKnowledge(PlLineType plLineType, DamType damType, double slopeGradient) { - PLLine plLine = null; + PlLine plLine = null; switch (plLineType) { - case PLLineType.PL1: + case PlLineType.PL1: plLine = this.CreatePLLine1ByExpertKnowledge(); break; - case PLLineType.PL2: - plLine = this.CreatePLLine2ByExpertKnowledge(this.ModelParametersForPLLines.PenetrationLength, this.HeadInPLLine2); + case PlLineType.PL2: + plLine = this.CreatePLLine2ByExpertKnowledge(this.ModelParametersForPlLines.PenetrationLength, this.HeadInPlLine2); break; - case PLLineType.PL3: - plLine = this.CreatePLLine3ByExpertKnowledge(HeadPL3TakingInAccountHydraulicShortcut, this.ModelParametersForPLLines.DampingFactorPL3, slopeGradient); + case PlLineType.PL3: + plLine = this.CreatePLLine3ByExpertKnowledge(HeadPL3TakingInAccountHydraulicShortcut, this.ModelParametersForPlLines.DampingFactorPL3, slopeGradient); break; - case PLLineType.PL4: - plLine = this.CreatePLLine4ByExpertKnowledge(GetHeadPL4TakingInAccountHydraulicShortcut(damType), this.ModelParametersForPLLines.DampingFactorPL4, slopeGradient); + case PlLineType.PL4: + plLine = this.CreatePLLine4ByExpertKnowledge(GetHeadPL4TakingInAccountHydraulicShortcut(damType), this.ModelParametersForPlLines.DampingFactorPL4, slopeGradient); break; } @@ -1423,15 +1423,15 @@ /// /// /// - private PLLine CreatePLLineFromGauges(GaugePLLine gaugePLLine, IEnumerable gauges, Location location, Boolean useWaterLevel) + private PlLine CreatePLLineFromGauges(GaugePlLine gaugePLLine, IEnumerable gauges, Location location, Boolean useWaterLevel) { - PLLine plLine = new PLLine(); + PlLine plLine = new PlLine(); double? gaugeWaterLevelRiver = null; double? leftMostXAtRiverLevel = null; int pointIndex = 0; - foreach (GaugePLLinePoint gaugePLLinePoint in gaugePLLine.Points) + foreach (GaugePlLinePoint gaugePLLinePoint in gaugePLLine.Points) { double? localX = gaugePLLinePoint.X; @@ -1476,7 +1476,7 @@ { if (!leftMostXAtRiverLevel.HasValue || localX > leftMostXAtRiverLevel) { - plLine.Points.Add(new PLLinePoint(localX.Value, localZ.Value)); + plLine.Points.Add(new PlLinePoint(localX.Value, localZ.Value)); if (useWaterLevel) { // Have to account for waterlevel @@ -1489,13 +1489,13 @@ { // this is where the waterlevel intersects with the dike leftMostXAtRiverLevel = intersectionsAtX.First(); - plLine.Points.Add(new PLLinePoint(leftMostXAtRiverLevel.Value, gaugeWaterLevelRiver.Value)); + plLine.Points.Add(new PlLinePoint(leftMostXAtRiverLevel.Value, gaugeWaterLevelRiver.Value)); } else { // No intersection with dike; polder is flooded leftMostXAtRiverLevel = this.surfaceLine.Geometry.Points.Last().X; - plLine.Points.Add(new PLLinePoint(this.surfaceLine.Geometry.Points.Last().X, gaugeWaterLevelRiver.Value)); + plLine.Points.Add(new PlLinePoint(this.surfaceLine.Geometry.Points.Last().X, gaugeWaterLevelRiver.Value)); } } } @@ -1546,46 +1546,46 @@ /// /// /// - private void CreatePhreaticLineSegmentsInsideDikeForLowRiverLevel(PLLine phreaticLine, double lowWaterLevel, double highWaterLevel) + private void CreatePhreaticLineSegmentsInsideDikeForLowRiverLevel(PlLine phreaticLine, double lowWaterLevel, double highWaterLevel) { - PLLinePoint intersectionLowWaterLevelWithDike = DetermineIntersectionBetweenWaterLevelAndDike(lowWaterLevel); + PlLinePoint intersectionLowWaterLevelWithDike = DetermineIntersectionBetweenWaterLevelAndDike(lowWaterLevel); GeometryPoint pointDikeToeAtRiver = SurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtRiver); - switch (modelParametersForPLLines.PLLineCreationMethod) + switch (modelParametersForPlLines.PlLineCreationMethod) { - case PLLineCreationMethod.ExpertKnowledgeLinearInDike: + case PlLineCreationMethod.ExpertKnowledgeLinearInDike: const double cPLLineOffsetBelowSurface = 0.1; - PLLinePoint intersectionHighWaterLevelWithDike = DetermineIntersectionBetweenWaterLevelAndDike(highWaterLevel); + PlLinePoint intersectionHighWaterLevelWithDike = DetermineIntersectionBetweenWaterLevelAndDike(highWaterLevel); if (intersectionLowWaterLevelWithDike == null) { // Intersection is supposed to be at toe of dike when no intersection found (i.e. waterlevel below toe of dike) - intersectionLowWaterLevelWithDike = new PLLinePoint(pointDikeToeAtRiver.X, pointDikeToeAtRiver.Z); + intersectionLowWaterLevelWithDike = new PlLinePoint(pointDikeToeAtRiver.X, pointDikeToeAtRiver.Z); } // At this point both intersectionHighWaterLevelWithDike and intersectionLowWaterLevelWithDike are <> null // or else an exception would have been thrown - PLLinePoint pointBelowHighLevel = new PLLinePoint(intersectionHighWaterLevelWithDike.X, + PlLinePoint pointBelowHighLevel = new PlLinePoint(intersectionHighWaterLevelWithDike.X, intersectionHighWaterLevelWithDike.Z - cPLLineOffsetBelowSurface); //Add points below surface of dike talud riverside foreach (GeometryPoint point in SurfaceLine.Geometry.Points.Where( point => point.X > intersectionLowWaterLevelWithDike.X && point.X < intersectionHighWaterLevelWithDike.X)) { - phreaticLine.Points.Add(new PLLinePoint(point.X, point.Z - cPLLineOffsetBelowSurface)); + phreaticLine.Points.Add(new PlLinePoint(point.X, point.Z - cPLLineOffsetBelowSurface)); } // Add last point (below high riverlevel/dike section phreaticLine.Points.Add(pointBelowHighLevel); break; - case PLLineCreationMethod.ExpertKnowledgeRRD: + case PlLineCreationMethod.ExpertKnowledgeRRD: //Add points below surface of dike talud riverside until toe of dike riverside foreach (GeometryPoint point in SurfaceLine.Geometry.Points.Where( point => point.X > intersectionLowWaterLevelWithDike.X && point.X <= pointDikeToeAtRiver.X)) { //if (!surfaceLine.IsNonWaterRetainingObjectPoint(point)) //{ - phreaticLine.Points.Add(new PLLinePoint(point.X, point.Z - cPLLineOffsetBelowSurface)); + phreaticLine.Points.Add(new PlLinePoint(point.X, point.Z - cPLLineOffsetBelowSurface)); //} } @@ -1595,15 +1595,15 @@ GeometryPoint pointDikeTopAtRiver = surfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeTopAtRiver); GeometryPoint pointDikeTopAtPolder = surfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeTopAtPolder); if (pointDikeTopAtRiver != null) - phreaticLine.Points.Add(new PLLinePoint(pointDikeTopAtRiver.X, offsetDikeTopAtRiver)); + phreaticLine.Points.Add(new PlLinePoint(pointDikeTopAtRiver.X, offsetDikeTopAtRiver)); if (pointDikeTopAtRiver != null && pointDikeTopAtPolder != null) { CreateOptionalPointAtDikeCrestMiddle(phreaticLine, pointDikeTopAtRiver, pointDikeTopAtPolder); } if (pointDikeTopAtPolder != null) - phreaticLine.Points.Add(new PLLinePoint(pointDikeTopAtPolder.X, offsetDikeTopAtPolder)); + phreaticLine.Points.Add(new PlLinePoint(pointDikeTopAtPolder.X, offsetDikeTopAtPolder)); break; } } @@ -1614,7 +1614,7 @@ /// The phreatic line. /// The point dike top at river. /// The point dike top at polder. - private void CreateOptionalPointAtDikeCrestMiddle(PLLine phreaticLine, GeometryPoint pointDikeTopAtRiver, + private void CreateOptionalPointAtDikeCrestMiddle(PlLine phreaticLine, GeometryPoint pointDikeTopAtRiver, GeometryPoint pointDikeTopAtPolder) { if (UsePlLineOffsetBelowDikeCrestMiddle.HasValue && UsePlLineOffsetBelowDikeCrestMiddle.Value && PlLineOffsetBelowDikeCrestMiddle != null) @@ -1631,36 +1631,36 @@ middleDikeCrestZ = z; } } - phreaticLine.Points.Add(new PLLinePoint(middleDikeCrestX, middleDikeCrestZ)); + phreaticLine.Points.Add(new PlLinePoint(middleDikeCrestX, middleDikeCrestZ)); } } /// /// Create the phreatic line segments inside the dike /// /// - private void CreatePhreaticLineSegmentsInsideDikeForHighRiverLevel(PLLine phreaticLine) + private void CreatePhreaticLineSegmentsInsideDikeForHighRiverLevel(PlLine phreaticLine) { double offsetDikeTopAtRiver = waterLevelRiverHigh - PlLineOffsetBelowDikeTopAtRiver; double offsetDikeTopAtPolder = waterLevelRiverHigh - PlLineOffsetBelowDikeTopAtPolder; // points created here are in dike - switch (modelParametersForPLLines.PLLineCreationMethod) + switch (modelParametersForPlLines.PlLineCreationMethod) { - case PLLineCreationMethod.ExpertKnowledgeLinearInDike: + case PlLineCreationMethod.ExpertKnowledgeLinearInDike: // No extra points below top of dike at river and top of dike at polder break; - case PLLineCreationMethod.ExpertKnowledgeRRD: + case PlLineCreationMethod.ExpertKnowledgeRRD: var pointDikeTopAtRiver = surfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeTopAtRiver); if (pointDikeTopAtRiver != null) - phreaticLine.Points.Add(new PLLinePoint(pointDikeTopAtRiver.X, offsetDikeTopAtRiver)); + phreaticLine.Points.Add(new PlLinePoint(pointDikeTopAtRiver.X, offsetDikeTopAtRiver)); var pointDikeTopAtPolder = surfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeTopAtPolder); if (pointDikeTopAtRiver != null && pointDikeTopAtPolder != null) { CreateOptionalPointAtDikeCrestMiddle(phreaticLine, pointDikeTopAtRiver, pointDikeTopAtPolder); } if (pointDikeTopAtPolder != null) - phreaticLine.Points.Add(new PLLinePoint(pointDikeTopAtPolder.X, offsetDikeTopAtPolder)); + phreaticLine.Points.Add(new PlLinePoint(pointDikeTopAtPolder.X, offsetDikeTopAtPolder)); break; } @@ -1670,13 +1670,13 @@ /// /// /// - private void CreatePhreaticLineSegmentsInShoulderAndPolder(PLLine phreaticLine) + private void CreatePhreaticLineSegmentsInShoulderAndPolder(PlLine phreaticLine) { - PLLinePoint intersectionPolderLevelWithDike = DetermineIntersectionBetweenPolderLevelAndDike(this.WaterLevelPolder); + PlLinePoint intersectionPolderLevelWithDike = DetermineIntersectionBetweenPolderLevelAndDike(this.WaterLevelPolder); GeometryPoint dikeToeAtPolderPoint = surfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtPolder); double maxXCoordinateSurface = surfaceLine.Geometry.Points.Max(x => x.X); - if (modelParametersForPLLines.PLLineCreationMethod != PLLineCreationMethod.ExpertKnowledgeLinearInDike) + if (modelParametersForPlLines.PlLineCreationMethod != PlLineCreationMethod.ExpertKnowledgeLinearInDike) { // Points created below are points starting at shoulder point to the right GeometryPoint shoulderBaseInsidePoint = surfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.ShoulderBaseInside); @@ -1690,7 +1690,7 @@ if ((intersectionPolderLevelWithDike == null) || (intersectionPolderLevelWithDike.X > shoulderBaseInsidePoint.X)) { - phreaticLine.Points.Add(new PLLinePoint(shoulderBaseInsidePoint.X, zLevel)); + phreaticLine.Points.Add(new PlLinePoint(shoulderBaseInsidePoint.X, zLevel)); } if (UsePlLineOffsetFactorBelowShoulderCrest.HasValue && UsePlLineOffsetFactorBelowShoulderCrest.Value && @@ -1705,7 +1705,7 @@ zLevel = Math.Min(zLevel, shoulderTopInsidePoint.Z - cOffsetPhreaticLineBelowSurface); zLevel = Math.Min(zLevel, phreaticLine.Points.Last().Z); zLevel = Math.Max(zLevel, this.WaterLevelPolder); - phreaticLine.Points.Add(new PLLinePoint(shoulderTopInsidePoint.X, zLevel)); + phreaticLine.Points.Add(new PlLinePoint(shoulderTopInsidePoint.X, zLevel)); } } } @@ -1728,7 +1728,7 @@ // Add point if it lies left of intersection of polderlevel with dike if ((intersectionPolderLevelWithDike == null) || (intersectionPolderLevelWithDike.X > dikeToeAtPolderPoint.X)) { - phreaticLine.Points.Add(new PLLinePoint(dikeToeAtPolderPoint.X, zLevel)); + phreaticLine.Points.Add(new PlLinePoint(dikeToeAtPolderPoint.X, zLevel)); } } @@ -1762,12 +1762,12 @@ //Validate if endpoint surface has reached if (phreaticLine.Points.Last().X != maxXCoordinateSurface) { - PLLinePoint endPoint = new PLLinePoint(maxXCoordinateSurface, phreaticLine.Points.Last().Z); + PlLinePoint endPoint = new PlLinePoint(maxXCoordinateSurface, phreaticLine.Points.Last().Z); phreaticLine.Points.Add(endPoint); } } - private void AddPhreaticLineAlongSurfaceLevel(PLLine phreaticLine) + private void AddPhreaticLineAlongSurfaceLevel(PlLine phreaticLine) { // Add phreatic point at offset below every surface line point as long as depth > polder level. Else determine the // proper position of the point at polder level (intersection) and stop. @@ -1791,7 +1791,7 @@ } intersected = true; } - PLLinePoint point = new PLLinePoint(x, z); + PlLinePoint point = new PlLinePoint(x, z); phreaticLine.Points.Add(point); if (intersected) { @@ -1800,7 +1800,7 @@ } } - private void AdjustForDitchatPolderSide(PLLine phreaticLine, int surfacePointIndex) + private void AdjustForDitchatPolderSide(PlLine phreaticLine, int surfacePointIndex) { const double maxDouble = 99999.999; var phreaticPolderPartialLine = new Line(); @@ -1818,7 +1818,7 @@ /// /// /// - private void AddIntersectionDitchPolderSegmentPolderLevelToPhreatic(PLLine phreaticLine, Line phreaticPolderPartialLine) + private void AddIntersectionDitchPolderSegmentPolderLevelToPhreatic(PlLine phreaticLine, Line phreaticPolderPartialLine) { GeometryPoint pointDitchPolder = surfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DitchPolderSide); if (pointDitchPolder != null) @@ -1833,11 +1833,11 @@ GeometryPoint intersectDitchPolderPhreatic = new GeometryPoint(); if (LineHelper.GetStrictIntersectionPoint(lineDitchPolderSide, phreaticPolderPartialLine, ref intersectDitchPolderPhreatic)) { - phreaticLine.Points.Add(new PLLinePoint(intersectDitchPolderPhreatic.X, intersectDitchPolderPhreatic.Z)); + phreaticLine.Points.Add(new PlLinePoint(intersectDitchPolderPhreatic.X, intersectDitchPolderPhreatic.Z)); } else { - phreaticLine.Points.Add(new PLLinePoint(pointDitchPolder.X, phreaticPolderPartialLine.EndPoint.Z)); + phreaticLine.Points.Add(new PlLinePoint(pointDitchPolder.X, phreaticPolderPartialLine.EndPoint.Z)); } } else @@ -1854,7 +1854,7 @@ /// /// /// - private void AddIntersectionDitchDikeSegmentPolderLevelToPhreatic(PLLine phreaticLine, int surfacePointIndex, Line phreaticPolderPartialLine) + private void AddIntersectionDitchDikeSegmentPolderLevelToPhreatic(PlLine phreaticLine, int surfacePointIndex, Line phreaticPolderPartialLine) { if (surfacePointIndex + 1 < surfaceLine.Geometry.Points.Count) { @@ -1865,11 +1865,11 @@ GeometryPoint intersectDitchDikePhreatic = new GeometryPoint(); if (LineHelper.GetStrictIntersectionPoint(lineDitchDikeSide, phreaticPolderPartialLine, ref intersectDitchDikePhreatic)) { - phreaticLine.Points.Add(new PLLinePoint(intersectDitchDikePhreatic.X, intersectDitchDikePhreatic.Z)); + phreaticLine.Points.Add(new PlLinePoint(intersectDitchDikePhreatic.X, intersectDitchDikePhreatic.Z)); } else { - phreaticLine.Points.Add(new PLLinePoint(surfaceLine.Geometry.Points[surfacePointIndex].X, phreaticPolderPartialLine.EndPoint.Z)); + phreaticLine.Points.Add(new PlLinePoint(surfaceLine.Geometry.Points[surfacePointIndex].X, phreaticPolderPartialLine.EndPoint.Z)); } } @@ -1885,20 +1885,20 @@ /// /// /// - public PLLinePoint DetermineIntersectionBetweenWaterLevelAndDike(double waterLevelRiver) + public PlLinePoint DetermineIntersectionBetweenWaterLevelAndDike(double waterLevelRiver) { GeometryPoint PointAtLevel = this.surfaceLine.DetermineIntersectionWithLevel(waterLevelRiver); if (PointAtLevel != null) { - return new PLLinePoint(PointAtLevel.X, PointAtLevel.Z); + return new PlLinePoint(PointAtLevel.X, PointAtLevel.Z); } else { return null; } } - private PLLinePoint DetermineIntersectionBetweenPolderLevelAndDike(double polderLevel) + private PlLinePoint DetermineIntersectionBetweenPolderLevelAndDike(double polderLevel) { var polderlevelLine = new Line(); double startXCoordinate = this.surfaceLine.Geometry.Points.OrderBy(p => p.X).First().X; @@ -1920,7 +1920,7 @@ GeometryPoint intersectPoint = new GeometryPoint(); if (LineHelper.GetStrictIntersectionPoint(surfaceLineSegment, polderlevelLine, ref intersectPoint)) { - return new PLLinePoint(intersectPoint.X, intersectPoint.Z); + return new PlLinePoint(intersectPoint.X, intersectPoint.Z); } } return null; @@ -1932,7 +1932,7 @@ /// /// /// - private void ValidatePhreaticBelowDike(PLLine phreaticLine) + private void ValidatePhreaticBelowDike(PlLine phreaticLine) { int startIndex = SurfaceLine.Geometry.Points.IndexOf(SurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeTopAtRiver)); int stopIndex = SurfaceLine.Geometry.Points.IndexOf(SurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtPolder)); @@ -1971,7 +1971,7 @@ // by the fact that the waterlevel is higher than DikeToeAtPolder if (intersectPoint.Z > waterLevelPolder + cOffsetPhreaticLineBelowSurface) { - var newPLLinePoint = new PLLinePoint(intersectPoint.X, + var newPLLinePoint = new PlLinePoint(intersectPoint.X, intersectPoint.Z - cOffsetPhreaticLineBelowSurface); // Only add new point if it is more to the right than the first point of the phreatic line segment when if (newPLLinePoint.X > phreaticLineSegment.BeginPoint.X) @@ -1981,14 +1981,14 @@ { // phreatic point and surfaceline point are postioned above each other, so replace the phreatic point with the intersect point phreaticLine.Points[phreaticPointIndex + 2] = - new PLLinePoint(SurfaceLine.Geometry.Points[surfacePointIndex + 1].X, + new PlLinePoint(SurfaceLine.Geometry.Points[surfacePointIndex + 1].X, SurfaceLine.Geometry.Points[surfacePointIndex + 1].Z - cOffsetPhreaticLineBelowSurface); } else { var newNextPLLinePoint = - new PLLinePoint(SurfaceLine.Geometry.Points[surfacePointIndex + 1].X, + new PlLinePoint(SurfaceLine.Geometry.Points[surfacePointIndex + 1].X, SurfaceLine.Geometry.Points[surfacePointIndex + 1].Z - cOffsetPhreaticLineBelowSurface); if (newNextPLLinePoint.X <= phreaticLine.Points[phreaticPointIndex + 2].X) @@ -2025,7 +2025,7 @@ /// /// /// - private PLLine CreatePLLine1ByExpertKnowledge() + private PlLine CreatePLLine1ByExpertKnowledge() { ValidateSurfaceLine(); @@ -2036,14 +2036,14 @@ //Create Phreatic line and add polderwater level double startXCoordinate = this.surfaceLine.Geometry.Points.OrderBy(p => p.X).First().X; - PLLine phreaticLine = new PLLine(); + PlLine phreaticLine = new PlLine(); phreaticLine.IsPhreatic = true; double? waterLevel = WaterLevelToUse(); // Waterlevel is supposed to be at level of SurfaceLevelOutside when waterlevel is below SurfaceLevelOutside (is the bottom of the river) waterLevel = this.SurfaceLine.EnsureWaterLevelIsAboveRiverBottom(waterLevel); - phreaticLine.Points.Add(new PLLinePoint(startXCoordinate, waterLevel.Value)); + phreaticLine.Points.Add(new PlLinePoint(startXCoordinate, waterLevel.Value)); - PLLinePoint intersectionPhreaticDike = null; + PlLinePoint intersectionPhreaticDike = null; //Determine intersection Phreaticlevel - Berm (or dike) intersectionPhreaticDike = DetermineIntersectionBetweenWaterLevelAndDike(waterLevel.Value); @@ -2102,9 +2102,9 @@ /// If it is below, correct it /// /// - private void ValidatePhreaticAboveWaterLevelPolder(PLLine phreaticLine) + private void ValidatePhreaticAboveWaterLevelPolder(PlLine phreaticLine) { - foreach (PLLinePoint phreaticPoint in phreaticLine.Points) + foreach (PlLinePoint phreaticPoint in phreaticLine.Points) { if (phreaticPoint.Z < waterLevelPolder) { Index: DamEngine/trunk/src/Deltares.DamEngine.Data/General/MStabParameters.cs =================================================================== diff -u -r877 -r1117 --- DamEngine/trunk/src/Deltares.DamEngine.Data/General/MStabParameters.cs (.../MStabParameters.cs) (revision 877) +++ DamEngine/trunk/src/Deltares.DamEngine.Data/General/MStabParameters.cs (.../MStabParameters.cs) (revision 1117) @@ -467,7 +467,7 @@ { this.IsCalculateAllStabilityProjectsAtOnce = true; this.IsOverrulePLLineCreationMethod = false; - this.PLLineCreationMethod = PLLineCreationMethod.ExpertKnowledgeRRD; + this.PLLineCreationMethod = PlLineCreationMethod.ExpertKnowledgeRRD; this.Model = MStabModelType.Bishop; this.SearchMethod = MStabSearchMethod.Grid; this.ZoneAreas = null; @@ -490,7 +490,7 @@ // 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 PlLineCreationMethod PLLineCreationMethod { get; set; } public MStabModelType Model { get; set; } Index: DamEngine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlInput.cs =================================================================== diff -u -r1113 -r1117 --- DamEngine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlInput.cs (.../FillDamFromXmlInput.cs) (revision 1113) +++ DamEngine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlInput.cs (.../FillDamFromXmlInput.cs) (revision 1117) @@ -340,7 +340,7 @@ 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; Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/Uplift/UpliftLocationDeterminatorTest.cs =================================================================== diff -u -r1116 -r1117 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/Uplift/UpliftLocationDeterminatorTest.cs (.../UpliftLocationDeterminatorTest.cs) (revision 1116) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/Uplift/UpliftLocationDeterminatorTest.cs (.../UpliftLocationDeterminatorTest.cs) (revision 1117) @@ -12,20 +12,20 @@ [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.PenetrationLength = 1.5; + 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 }; - return plLineCreator.CreateAllPLLines(location); + return plLineCreator.CreateAllPlLines(location); } [TestFixtureSetUp] @@ -93,7 +93,7 @@ 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() { @@ -117,7 +117,7 @@ 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() { @@ -148,7 +148,7 @@ 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() { Index: DamEngine/trunk/src/Deltares.DamEngine.Interface/ConversionHelper.cs =================================================================== diff -u -r1062 -r1117 --- DamEngine/trunk/src/Deltares.DamEngine.Interface/ConversionHelper.cs (.../ConversionHelper.cs) (revision 1062) +++ DamEngine/trunk/src/Deltares.DamEngine.Interface/ConversionHelper.cs (.../ConversionHelper.cs) (revision 1117) @@ -75,15 +75,15 @@ /// /// Type of the input object. /// - public static LocationWaternetOptionsPhreaticLineCreationMethod ConvertToInputPhreaticLineCreationMethod(PLLineCreationMethod plLineCreationMethod) + public static LocationWaternetOptionsPhreaticLineCreationMethod ConvertToInputPhreaticLineCreationMethod(PlLineCreationMethod plLineCreationMethod) { - var translationTable = new Dictionary() + var translationTable = new Dictionary() { - {PLLineCreationMethod.ExpertKnowledgeLinearInDike, LocationWaternetOptionsPhreaticLineCreationMethod.ExpertKnowledgeLinearInDike}, - {PLLineCreationMethod.ExpertKnowledgeRRD, LocationWaternetOptionsPhreaticLineCreationMethod.ExpertKnowledgeRRD}, - {PLLineCreationMethod.GaugesWithFallbackToExpertKnowledgeRRD, LocationWaternetOptionsPhreaticLineCreationMethod.GaugesWithFallbackToExpertKnowledgeRRD}, - {PLLineCreationMethod.Sensors, LocationWaternetOptionsPhreaticLineCreationMethod.Sensors}, - {PLLineCreationMethod.None, LocationWaternetOptionsPhreaticLineCreationMethod.None} + {PlLineCreationMethod.ExpertKnowledgeLinearInDike, LocationWaternetOptionsPhreaticLineCreationMethod.ExpertKnowledgeLinearInDike}, + {PlLineCreationMethod.ExpertKnowledgeRRD, LocationWaternetOptionsPhreaticLineCreationMethod.ExpertKnowledgeRRD}, + {PlLineCreationMethod.GaugesWithFallbackToExpertKnowledgeRRD, LocationWaternetOptionsPhreaticLineCreationMethod.GaugesWithFallbackToExpertKnowledgeRRD}, + {PlLineCreationMethod.Sensors, LocationWaternetOptionsPhreaticLineCreationMethod.Sensors}, + {PlLineCreationMethod.None, LocationWaternetOptionsPhreaticLineCreationMethod.None} }; return translationTable[plLineCreationMethod]; } @@ -95,15 +95,15 @@ /// /// Type of the dam object. /// - public static PLLineCreationMethod ConvertToPhreaticLineCreationMethod(LocationWaternetOptionsPhreaticLineCreationMethod inputPhreaticLineCreationMethod) + public static PlLineCreationMethod ConvertToPhreaticLineCreationMethod(LocationWaternetOptionsPhreaticLineCreationMethod inputPhreaticLineCreationMethod) { - var translationTable = new Dictionary() + var translationTable = new Dictionary() { - {LocationWaternetOptionsPhreaticLineCreationMethod.ExpertKnowledgeLinearInDike, PLLineCreationMethod.ExpertKnowledgeLinearInDike}, - {LocationWaternetOptionsPhreaticLineCreationMethod.ExpertKnowledgeRRD, PLLineCreationMethod.ExpertKnowledgeRRD}, - {LocationWaternetOptionsPhreaticLineCreationMethod.GaugesWithFallbackToExpertKnowledgeRRD, PLLineCreationMethod.GaugesWithFallbackToExpertKnowledgeRRD}, - {LocationWaternetOptionsPhreaticLineCreationMethod.Sensors, PLLineCreationMethod.Sensors}, - {LocationWaternetOptionsPhreaticLineCreationMethod.None, PLLineCreationMethod.None} + {LocationWaternetOptionsPhreaticLineCreationMethod.ExpertKnowledgeLinearInDike, PlLineCreationMethod.ExpertKnowledgeLinearInDike}, + {LocationWaternetOptionsPhreaticLineCreationMethod.ExpertKnowledgeRRD, PlLineCreationMethod.ExpertKnowledgeRRD}, + {LocationWaternetOptionsPhreaticLineCreationMethod.GaugesWithFallbackToExpertKnowledgeRRD, PlLineCreationMethod.GaugesWithFallbackToExpertKnowledgeRRD}, + {LocationWaternetOptionsPhreaticLineCreationMethod.Sensors, PlLineCreationMethod.Sensors}, + {LocationWaternetOptionsPhreaticLineCreationMethod.None, PlLineCreationMethod.None} }; return translationTable[inputPhreaticLineCreationMethod]; }