Index: DamEngine/trunk/src/Deltares.DamEngine.Data/General/PlLines/PLLine.cs =================================================================== diff -u -r1117 -r1121 --- DamEngine/trunk/src/Deltares.DamEngine.Data/General/PlLines/PLLine.cs (.../PLLine.cs) (revision 1117) +++ DamEngine/trunk/src/Deltares.DamEngine.Data/General/PlLines/PLLine.cs (.../PlLine.cs) (revision 1121) @@ -40,17 +40,17 @@ { private PlLineType plLineType; - public PlLineType PLLineType + public PlLineType PlLineType { get { return plLineType; } set { plLineType = value; - PLLineTypeSpecified = true; + PlLineTypeSpecified = true; } } - public bool PLLineTypeSpecified { get; private set; } + public bool PlLineTypeSpecified { get; private set; } public bool IsPhreatic { get; set; } @@ -92,26 +92,26 @@ /// /// /// - 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; } } } Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/Uplift/UpliftLocationDeterminator.cs =================================================================== diff -u -r1117 -r1121 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators/Uplift/UpliftLocationDeterminator.cs (.../UpliftLocationDeterminator.cs) (revision 1117) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/Uplift/UpliftLocationDeterminator.cs (.../UpliftLocationDeterminator.cs) (revision 1121) @@ -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.Data/General/PlLines/PLLines.cs =================================================================== diff -u -r1117 -r1121 --- DamEngine/trunk/src/Deltares.DamEngine.Data/General/PlLines/PLLines.cs (.../PLLines.cs) (revision 1117) +++ DamEngine/trunk/src/Deltares.DamEngine.Data/General/PlLines/PLLines.cs (.../PlLines.cs) (revision 1121) @@ -40,7 +40,7 @@ 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.Calculators.Tests/PlLinesCreator/PlLinesCreatorTest.cs =================================================================== diff -u -r1117 -r1121 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/PlLinesCreator/PlLinesCreatorTest.cs (.../PlLinesCreatorTest.cs) (revision 1117) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/PlLinesCreator/PlLinesCreatorTest.cs (.../PlLinesCreatorTest.cs) (revision 1121) @@ -65,7 +65,7 @@ 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); @@ -79,7 +79,7 @@ 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); @@ -117,7 +117,7 @@ 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); @@ -158,7 +158,7 @@ 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); @@ -225,7 +225,7 @@ 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); } } @@ -248,7 +248,7 @@ 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); @@ -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); @@ -319,7 +319,7 @@ 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); @@ -355,7 +355,7 @@ 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); @@ -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); @@ -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); @@ -496,7 +496,7 @@ 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); @@ -533,7 +533,7 @@ 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); @@ -569,7 +569,7 @@ 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); @@ -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); @@ -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); @@ -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); @@ -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); @@ -834,7 +834,7 @@ 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); @@ -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); @@ -918,7 +918,7 @@ plLineCreator.SurfaceLine = surfaceLine; plLineCreator.ModelParametersForPlLines.PenetrationLength = 6.0; plLineCreator.HeadInPlLine2 = 4.0; - plLineCreator.CreatePlLineByExpertKnowledge(PlLineType.PL2, DamType.Regional, 0.02); + plLineCreator.CreatePlLineByExpertKnowledge(PlLineType.Pl2, DamType.Regional, 0.02); } } @@ -934,7 +934,7 @@ plLineCreator.SurfaceLine = null; plLineCreator.ModelParametersForPlLines.PenetrationLength = 6.0; plLineCreator.HeadInPlLine2 = 4.0; - plLineCreator.CreatePlLineByExpertKnowledge(PlLineType.PL2, DamType.Regional, 0.02); + plLineCreator.CreatePlLineByExpertKnowledge(PlLineType.Pl2, DamType.Regional, 0.02); } /// @@ -958,7 +958,7 @@ plLineCreator.SurfaceLine = surfaceLine; plLineCreator.ModelParametersForPlLines.PenetrationLength = 6.0; plLineCreator.HeadInPlLine2 = 4.0; - plLineCreator.CreatePlLineByExpertKnowledge(PlLineType.PL2, DamType.Regional, 0.02); + plLineCreator.CreatePlLineByExpertKnowledge(PlLineType.Pl2, DamType.Regional, 0.02); } } @@ -987,7 +987,7 @@ plLineCreator.SurfaceLine.Geometry.SyncCalcPoints(); plLineCreator.ModelParametersForPlLines.PenetrationLength = cPenetrationLength; plLineCreator.HeadInPlLine2 = cHeadPL2; - PlLine plLine = plLineCreator.CreatePlLineByExpertKnowledge(PlLineType.PL2, DamType.Regional, 0.02); + PlLine plLine = plLineCreator.CreatePlLineByExpertKnowledge(PlLineType.Pl2, DamType.Regional, 0.02); Assert.IsTrue(plLine.Exists()); } } @@ -1002,7 +1002,7 @@ plLineCreator.SoilProfile = FactoryForSoilProfiles.CreateSimpleProfile(); plLineCreator.ModelParametersForPlLines.PenetrationLength = cPenetrationLength; plLineCreator.HeadInPlLine2 = cHeadPL2; - PlLine plLine = plLineCreator.CreatePlLineByExpertKnowledge(PlLineType.PL2, DamType.Regional, 0.02); + PlLine plLine = plLineCreator.CreatePlLineByExpertKnowledge(PlLineType.Pl2, DamType.Regional, 0.02); } /// @@ -1029,7 +1029,7 @@ 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); + 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); @@ -1063,7 +1063,7 @@ plLineCreator.SurfaceLine.Geometry.SyncCalcPoints(); plLineCreator.ModelParametersForPlLines.PenetrationLength = cPenetrationLength; plLineCreator.HeadInPlLine2 = cHeadPL2; - PlLine plLine = plLineCreator.CreatePlLineByExpertKnowledge(PlLineType.PL2, DamType.Regional, 0.02); + PlLine plLine = plLineCreator.CreatePlLineByExpertKnowledge(PlLineType.Pl2, DamType.Regional, 0.02); Assert.IsFalse(plLine.Exists()); } } @@ -1087,7 +1087,7 @@ 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()); } } @@ -1117,8 +1117,8 @@ { primaryLocation.DamType = DamType.Primary; PlLines plLines = plLineCreator.CreateAllPlLines(primaryLocation); - PlLine plLine2 = plLines.Lines[PlLineType.PL2]; - PlLine plLine4 = plLines.Lines[PlLineType.PL4]; + 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); @@ -1132,8 +1132,8 @@ regionalLocation.DamType = DamType.Regional; plLines = plLineCreator.CreateAllPlLines(regionalLocation); - plLine2 = plLines.Lines[PlLineType.PL2]; - plLine4 = plLines.Lines[PlLineType.PL4]; + 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); @@ -1168,7 +1168,7 @@ plLineCreator.SurfaceLine = surfaceLine; plLineCreator.ModelParametersForPlLines.PenetrationLength = cPenetrationLength; plLineCreator.HeadInPlLine2 = cHeadPL2; - PlLine plLine = plLineCreator.CreatePlLineByExpertKnowledge(PlLineType.PL2, DamType.Regional, 0.02); + 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))); @@ -1312,7 +1312,7 @@ plLineCreator.WaterLevelPolder = -0.5; plLineCreator.ModelParametersForPlLines.DampingFactorPL3 = cDampingFactor; - PlLine plLine = plLineCreator.CreatePlLineByExpertKnowledge(PlLineType.PL3, DamType.Regional, 0.02); + PlLine plLine = plLineCreator.CreatePlLineByExpertKnowledge(PlLineType.Pl3, DamType.Regional, 0.02); } } @@ -1329,7 +1329,7 @@ plLineCreator.WaterLevelPolder = -0.5; plLineCreator.ModelParametersForPlLines.DampingFactorPL4 = cDampingFactor; - PlLine plLine = plLineCreator.CreatePlLineByExpertKnowledge(PlLineType.PL4, DamType.Regional, 0.02); + PlLine plLine = plLineCreator.CreatePlLineByExpertKnowledge(PlLineType.Pl4, DamType.Regional, 0.02); Assert.IsFalse(plLine.Exists()); } } @@ -1398,25 +1398,25 @@ 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); + 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 plLineCreator.WaterLevelRiverHigh = 3.0; plLineCreator.HeadInPlLine3 = 4.0; - plLine = plLineCreator.CreatePlLineByExpertKnowledge(PlLineType.PL3, DamType.Regional, 0.02); + 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); + 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); + plLine = plLineCreator.CreatePlLineByExpertKnowledge(PlLineType.Pl3, DamType.Regional, 0.02); CheckPl3For1DGeometryWithExpertKnowledgeRrdWithHeadPl2Specified(plLine); } } @@ -1464,15 +1464,15 @@ 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); + 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 plLineCreator.WaterLevelRiverHigh = 4.0; plLineCreator.HeadInPlLine3 = 1.0; plLineCreator.WaterLevelRiverLow = 2.0; - plLine = plLineCreator.CreatePlLineByExpertKnowledge(PlLineType.PL3, DamType.Regional, 0.02); + plLine = plLineCreator.CreatePlLineByExpertKnowledge(PlLineType.Pl3, DamType.Regional, 0.02); CheckPl3LowFor1DGeometryWithExpertKnowledgeRrd(plLine); } } @@ -1513,7 +1513,7 @@ plLineCreator.WaterLevelPolder = -0.5; plLineCreator.ModelParametersForPlLines.DampingFactorPL3 = cDampingFactor; - PlLine plLine = plLineCreator.CreatePlLineByExpertKnowledge(PlLineType.PL3, DamType.Regional, 0.02); + 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; @@ -1562,7 +1562,7 @@ plLineCreator.WaterLevelPolder = -0.5; plLineCreator.ModelParametersForPlLines.DampingFactorPL3 = cDampingFactor; - PlLine plLine = plLineCreator.CreatePlLineByExpertKnowledge(PlLineType.PL3, DamType.Regional, 0.02); + 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; @@ -1601,15 +1601,15 @@ // 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); + 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 plLineCreator.IsHydraulicShortcut = false; plLineCreator.HeadInPlLine4 = 4.0; plLineCreator.WaterLevelRiverHigh = 3.0; - plLine = plLineCreator.CreatePlLineByExpertKnowledge(PlLineType.PL4, DamType.Regional, 0.02); + plLine = plLineCreator.CreatePlLineByExpertKnowledge(PlLineType.Pl4, DamType.Regional, 0.02); CheckPl4LowFor1DGeometryWithExpertKnowledgeRrd(plLine); } } @@ -1642,7 +1642,7 @@ plLineCreator.WaterLevelPolder = -0.5; plLineCreator.ModelParametersForPlLines.DampingFactorPL4 = cDampingFactor; - PlLine plLine = plLineCreator.CreatePlLineByExpertKnowledge(PlLineType.PL4, DamType.Regional, 0.02); + PlLine plLine = plLineCreator.CreatePlLineByExpertKnowledge(PlLineType.Pl4, DamType.Regional, 0.02); } } @@ -1671,7 +1671,7 @@ }; var gaugePlLines = new List(); - GaugePlLine gaugePlLine1 = new GaugePlLine(PlLineType.PL1); + 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" }); @@ -1710,40 +1710,40 @@ }; var gaugePlLines = new List(); - GaugePlLine gaugePlLine1 = new GaugePlLine(PlLineType.PL1); + 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); + GaugePlLine gaugePlLine2 = new GaugePlLine(PlLineType.Pl2); gaugePlLines.Add(gaugePlLine2); - GaugePlLine gaugePlLine3 = new GaugePlLine(PlLineType.PL3); + GaugePlLine gaugePlLine3 = new GaugePlLine(PlLineType.Pl3); gaugePlLines.Add(gaugePlLine3); - GaugePlLine gaugePlLine4 = new GaugePlLine(PlLineType.PL4); + GaugePlLine gaugePlLine4 = new GaugePlLine(PlLineType.Pl4); gaugePlLines.Add(gaugePlLine4); plLineCreator.GaugePlLines = gaugePlLines; plLineCreator.Gauges = gauges; 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); } } @@ -1772,40 +1772,40 @@ }; var gaugePlLines = new List(); - GaugePlLine gaugePlLine1 = new GaugePlLine(PlLineType.PL1); + 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); + GaugePlLine gaugePlLine2 = new GaugePlLine(PlLineType.Pl2); gaugePlLines.Add(gaugePlLine2); - GaugePlLine gaugePlLine3 = new GaugePlLine(PlLineType.PL3); + GaugePlLine gaugePlLine3 = new GaugePlLine(PlLineType.Pl3); gaugePlLines.Add(gaugePlLine3); - GaugePlLine gaugePlLine4 = new GaugePlLine(PlLineType.PL4); + GaugePlLine gaugePlLine4 = new GaugePlLine(PlLineType.Pl4); gaugePlLines.Add(gaugePlLine4); plLineCreator.GaugePlLines = gaugePlLines; plLineCreator.Gauges = gauges; 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); } } @@ -1834,36 +1834,36 @@ }; var gaugePlLines = new List(); - GaugePlLine gaugePlLine1 = new GaugePlLine(PlLineType.PL1); + 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); + GaugePlLine gaugePlLine2 = new GaugePlLine(PlLineType.Pl2); gaugePlLines.Add(gaugePlLine2); - GaugePlLine gaugePlLine3 = new GaugePlLine(PlLineType.PL3); + GaugePlLine gaugePlLine3 = new GaugePlLine(PlLineType.Pl3); gaugePlLines.Add(gaugePlLine3); - GaugePlLine gaugePlLine4 = new GaugePlLine(PlLineType.PL4); + GaugePlLine gaugePlLine4 = new GaugePlLine(PlLineType.Pl4); gaugePlLines.Add(gaugePlLine4); plLineCreator.GaugePlLines = gaugePlLines; plLineCreator.Gauges = gauges; 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); } } Index: DamEngine/trunk/src/Deltares.DamEngine.Data/General/DAMEnumerations.cs =================================================================== diff -u -r1117 -r1121 --- DamEngine/trunk/src/Deltares.DamEngine.Data/General/DAMEnumerations.cs (.../DAMEnumerations.cs) (revision 1117) +++ DamEngine/trunk/src/Deltares.DamEngine.Data/General/DAMEnumerations.cs (.../DAMEnumerations.cs) (revision 1121) @@ -177,18 +177,18 @@ public enum PlLineType { - PL1, - PL2, - PL3, - PL4 + Pl1, + Pl2, + Pl3, + Pl4 } public enum PlLinePointPositionXzType { - OnPLLine, - AbovePLLine, - BelowPLLine, - BeyondPLLine // indicates that point is outside the scope of the pl line. + OnPlLine, + AbovePlLine, + BelowPlLine, + BeyondPlLine // indicates that point is outside the scope of the pl line. }; // TODO: RW this is regional specific code and should be moved to its own class Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/PlLinesCreator/PlLinesCreator.cs =================================================================== diff -u -r1118 -r1121 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators/PlLinesCreator/PlLinesCreator.cs (.../PlLinesCreator.cs) (revision 1118) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/PlLinesCreator/PlLinesCreator.cs (.../PlLinesCreator.cs) (revision 1121) @@ -396,7 +396,7 @@ /// private PlLine CreatePlLine3ByExpertKnowledge(double headValue, double dampingFactor, double slopeGradient) { - return CreatePlLine3Or4ByExpertKnowledge(headValue, dampingFactor, PlLineType.PL3, slopeGradient); + return CreatePlLine3Or4ByExpertKnowledge(headValue, dampingFactor, PlLineType.Pl3, slopeGradient); } /// @@ -405,7 +405,7 @@ /// 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) @@ -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); @@ -574,12 +574,12 @@ { 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; @@ -598,15 +598,15 @@ { 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; @@ -941,7 +941,7 @@ 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]; CopyPointsInPlLine(ref plLine, location.LocalXZPL1Line); @@ -952,7 +952,7 @@ } // 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); @@ -1329,14 +1329,14 @@ 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); // currentPL1Line is needed when calculating uplift reduction for PL3 and Pl4 - if (plLineType == PlLineType.PL1) + if (plLineType == PlLineType.Pl1) { currentPL1Line = plLines.Lines[plLineType]; } @@ -1363,12 +1363,12 @@ // 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"); } @@ -1387,16 +1387,16 @@ switch (plLineType) { - case PlLineType.PL1: + case PlLineType.Pl1: plLine = this.CreatePlLine1ByExpertKnowledge(); break; - case PlLineType.PL2: + case PlLineType.Pl2: plLine = this.CreatePlLine2ByExpertKnowledge(this.ModelParametersForPlLines.PenetrationLength, this.HeadInPlLine2); break; - case PlLineType.PL3: + case PlLineType.Pl3: plLine = this.CreatePlLine3ByExpertKnowledge(HeadPL3TakingInAccountHydraulicShortcut, this.ModelParametersForPlLines.DampingFactorPL3, slopeGradient); break; - case PlLineType.PL4: + case PlLineType.Pl4: plLine = this.CreatePlLine4ByExpertKnowledge(GetHeadPL4TakingInAccountHydraulicShortcut(damType), this.ModelParametersForPlLines.DampingFactorPL4, slopeGradient); break; } Index: DamEngine/trunk/src/Deltares.DamEngine.Data/General/FailureMechanismParametersMStab.cs =================================================================== diff -u -r1117 -r1121 --- DamEngine/trunk/src/Deltares.DamEngine.Data/General/FailureMechanismParametersMStab.cs (.../FailureMechanismParametersMStab.cs) (revision 1117) +++ DamEngine/trunk/src/Deltares.DamEngine.Data/General/FailureMechanismParametersMStab.cs (.../FailureMechanismParametersMStab.cs) (revision 1121) @@ -63,7 +63,7 @@ public Location Location { get; set; } public SurfaceLine2 SurfaceLine { get; set; } - public PlLines.PlLines PLLines { get; set; } + public PlLines.PlLines PlLines { get; set; } public SoilProfile1D SoilProfile { get; set; } public string SoilGeometry2DName { get; set; } @@ -91,7 +91,7 @@ { return !string.IsNullOrEmpty(this.MStabParameters.SoilDatabaseName) && - this.PLLines != null && + this.PlLines != null && (this.SoilProfile != null || this.MStabParameters.GeometryCreationOptions.SoilGeometry2DFilename != "") && this.Location != null && this.SurfaceLine != null && @@ -111,7 +111,7 @@ this.SurfaceLine = failureMechanismParametersMStab.SurfaceLine; this.SoilProfile = failureMechanismParametersMStab.SoilProfile; this.SoilGeometry2DName = failureMechanismParametersMStab.SoilGeometry2DName; - this.PLLines = failureMechanismParametersMStab.PLLines; + this.PlLines = failureMechanismParametersMStab.PlLines; this.RiverLevel = failureMechanismParametersMStab.RiverLevel; this.DikeTableHeight = failureMechanismParametersMStab.DikeTableHeight; Fisheye: Tag 1121 refers to a dead (removed) revision in file `DamEngine/trunk/src/Deltares.DamEngine.Data/General/PlLines/PLLine.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityCommon/MStabXmlDoc.cs =================================================================== diff -u -r1117 -r1121 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityCommon/MStabXmlDoc.cs (.../MStabXmlDoc.cs) (revision 1117) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityCommon/MStabXmlDoc.cs (.../MStabXmlDoc.cs) (revision 1121) @@ -206,7 +206,7 @@ var waterLevel = riverLevelHigh.Value; UpliftSituation upliftSituation; - failureMechanismParametersMStab.PLLines = PlLinesHelper.CreatePlLinesForStability( + failureMechanismParametersMStab.PlLines = PlLinesHelper.CreatePlLinesForStability( scenario.Location, subSoilScenario, waterLevel, soilGeometry2DName, riverLevelLow, out upliftSituation); // Slip circle definition for Uplift Van; TODO: Combine with code in StabilityCalculation @@ -215,7 +215,7 @@ // Determine right side of slip plane grid (right grid) // This is the location with the lowest uplift factor var upliftLocationAndResult = CalculationHelper.GetLocationWithLowestUpliftFactor(currentSurfaceLine, - subSoilScenario.SoilProfile1D, soilGeometry2DName, failureMechanismParametersMStab.PLLines, + subSoilScenario.SoilProfile1D, soilGeometry2DName, failureMechanismParametersMStab.PlLines, scenario.Location); double upliftCriterion = scenario.GetUpliftCriterionStability(scenario.Location.ModelFactors.UpliftCriterionStability); Index: DamEngine/trunk/src/Deltares.DamEngine.Data/General/Location.cs =================================================================== diff -u -r1117 -r1121 --- DamEngine/trunk/src/Deltares.DamEngine.Data/General/Location.cs (.../Location.cs) (revision 1117) +++ DamEngine/trunk/src/Deltares.DamEngine.Data/General/Location.cs (.../Location.cs) (revision 1121) @@ -71,7 +71,7 @@ // Start of parameters that are also defined in modelparameters private double levelReductionInside = 0; private double levelReductionOutside = 0; - private PL1Line localXZPL1Line; + private Pl1Line localXZPL1Line; private GeometryPoint localXZSheetPilePoint; private StabilityOptions stabilityOptions; @@ -87,7 +87,7 @@ private double newShoulderTopSlope = 1.0/20.0; // as tangent private double newSlopeAngleDitch = 1.0/0.5; // as tangent private double newWidthDitchBottom = 1.0; - private PL1Line pL1Line; + private Pl1Line pL1Line; private double pLLineOffsetBelowDikeToeAtPolder = 0.1; private double pLLineOffsetBelowDikeTopAtPolder = 1.5; private double pLLineOffsetBelowDikeTopAtRiver = 0.5; @@ -366,7 +366,7 @@ } } - public virtual PL1Line PL1Line + public virtual Pl1Line PL1Line { get { @@ -378,7 +378,7 @@ } } - public virtual PL1Line LocalXZPL1Line + public virtual Pl1Line LocalXZPL1Line { get { Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/Common/ShoulderDesignHelper.cs =================================================================== diff -u -r1117 -r1121 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/Common/ShoulderDesignHelper.cs (.../ShoulderDesignHelper.cs) (revision 1117) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/Common/ShoulderDesignHelper.cs (.../ShoulderDesignHelper.cs) (revision 1121) @@ -33,16 +33,16 @@ 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; 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.Data/General/Sensors/Sensor.cs =================================================================== diff -u -r1117 -r1121 --- DamEngine/trunk/src/Deltares.DamEngine.Data/General/Sensors/Sensor.cs (.../Sensor.cs) (revision 1117) +++ DamEngine/trunk/src/Deltares.DamEngine.Data/General/Sensors/Sensor.cs (.../Sensor.cs) (revision 1121) @@ -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; } } } Index: DamEngine/trunk/src/Deltares.DamEngine.Data/General/PlLines/PL1Line.cs =================================================================== diff -u -r877 -r1121 --- DamEngine/trunk/src/Deltares.DamEngine.Data/General/PlLines/PL1Line.cs (.../PL1Line.cs) (revision 877) +++ DamEngine/trunk/src/Deltares.DamEngine.Data/General/PlLines/PL1Line.cs (.../Pl1Line.cs) (revision 1121) @@ -31,9 +31,9 @@ } } - public class PL1Line : GeometryPointString + public class Pl1Line : GeometryPointString { - public void Assign(PL1Line pl1Line) + public void Assign(Pl1Line pl1Line) { this.Points.Clear(); @@ -44,9 +44,9 @@ } } - public new PL1Line Clone() + public new Pl1Line Clone() { - var newPL1Line = new PL1Line(); + var newPL1Line = new Pl1Line(); newPL1Line.Assign(this); Fisheye: Tag 1121 refers to a dead (removed) revision in file `DamEngine/trunk/src/Deltares.DamEngine.Data/General/PlLines/PLLines.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: DamEngine/trunk/src/Deltares.DamEngine.Data/Deltares.DamEngine.Data.csproj =================================================================== diff -u -r1120 -r1121 --- DamEngine/trunk/src/Deltares.DamEngine.Data/Deltares.DamEngine.Data.csproj (.../Deltares.DamEngine.Data.csproj) (revision 1120) +++ DamEngine/trunk/src/Deltares.DamEngine.Data/Deltares.DamEngine.Data.csproj (.../Deltares.DamEngine.Data.csproj) (revision 1121) @@ -59,9 +59,9 @@ - - - + + + Fisheye: Tag 1121 refers to a dead (removed) revision in file `DamEngine/trunk/src/Deltares.DamEngine.Data/General/PlLines/PL1Line.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/Common/PlLinesHelperTests.cs =================================================================== diff -u -r1117 -r1121 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/Common/PlLinesHelperTests.cs (.../PlLinesHelperTests.cs) (revision 1117) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/Common/PlLinesHelperTests.cs (.../PlLinesHelperTests.cs) (revision 1121) @@ -41,21 +41,21 @@ var riverLevel = 1.0; 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(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); } } Index: DamEngine/trunk/src/Deltares.DamEngine.Data/General/Dike.cs =================================================================== diff -u -r1117 -r1121 --- DamEngine/trunk/src/Deltares.DamEngine.Data/General/Dike.cs (.../Dike.cs) (revision 1117) +++ DamEngine/trunk/src/Deltares.DamEngine.Data/General/Dike.cs (.../Dike.cs) (revision 1121) @@ -69,7 +69,7 @@ public virtual string MapForSoilGeometries2D { get; set; } private IList locations; - private IList pl1Lines; + private IList pl1Lines; private bool removeStiFiles; private MStabShearStrength shearmodel; private SoilList soilList; @@ -92,7 +92,7 @@ soilProfiles2D = new List(); // this.surfaceLines = new DelegatedList { AddMethod = ConvertAddedOldSurfaceLineToNewFormat }; SurfaceLines2 = new List(); - pl1Lines = new List(); + pl1Lines = new List(); soilList = new SoilList(); removeStiFiles = true; } @@ -138,7 +138,7 @@ public IList SurfaceLines2 { get; set; } - public virtual IList PL1Lines + public virtual IList PL1Lines { get { return this.pl1Lines; } set { this.pl1Lines = value; } Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamMacroStabilityCommon/DamMStabAssemblerTest.cs =================================================================== diff -u -r1117 -r1121 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamMacroStabilityCommon/DamMStabAssemblerTest.cs (.../DamMStabAssemblerTest.cs) (revision 1117) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamMacroStabilityCommon/DamMStabAssemblerTest.cs (.../DamMStabAssemblerTest.cs) (revision 1121) @@ -156,7 +156,7 @@ 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; + peelLines.Lines[PlLineType.Pl1] = peelLine1; peelLine2 = new PlLine(); peelLine2.Name = "PLLine2"; peelLine2.IsPhreatic = true; @@ -165,7 +165,7 @@ 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; + peelLines.Lines[PlLineType.Pl1] = peelLine2; // Calculation options calculationOptions = new MStabCalculationOptions(); @@ -238,7 +238,7 @@ { Location = location1, SurfaceLine = location1.SurfaceLine, - PLLines = peelLines, + PlLines = peelLines, SoilProfile = soilProfile1, Design = design, MStabParameters = new MStabParameters() @@ -352,23 +352,23 @@ } // External PL lines - IEnumerable externalPLLineCollectionElements = from element in inputElement.Descendants() + IEnumerable externalPlLineCollectionElements = from element in inputElement.Descendants() where element.Name.LocalName == DamMStabAssembler.XmlElementExternalPLLines select element; - Assert.AreEqual(1, externalPLLineCollectionElements.Count(), String.Format("There should be exactly one {0} tag", DamMStabAssembler.XmlElementExternalPLLines)); + Assert.AreEqual(1, externalPlLineCollectionElements.Count(), String.Format("There should be exactly one {0} tag", DamMStabAssembler.XmlElementExternalPLLines)); - XElement externalPLLineCollectionElement = externalPLLineCollectionElements.Single(); + XElement externalPlLineCollectionElement = externalPlLineCollectionElements.Single(); - IEnumerable peelLineCollectionElements = from element in externalPLLineCollectionElement.Descendants() + IEnumerable peelLineCollectionElements = from element in externalPlLineCollectionElement.Descendants() where element.Name.LocalName == DamMStabAssembler.XmlElementPLLine select element; - Assert.AreEqual(damFailureMechanismeCalculationSpecification.FailureMechanismParametersMStab.PLLines.PLLineCount, peelLineCollectionElements.Count(), "Number of PL lines"); + Assert.AreEqual(damFailureMechanismeCalculationSpecification.FailureMechanismParametersMStab.PlLines.PlLineCount, peelLineCollectionElements.Count(), "Number of PL lines"); IEnumerator peelLineElementEnumerator = peelLineCollectionElements.GetEnumerator(); 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; Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityCommon/Assemblers/DamMStabAssembler.cs =================================================================== diff -u -r1117 -r1121 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityCommon/Assemblers/DamMStabAssembler.cs (.../DamMStabAssembler.cs) (revision 1117) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityCommon/Assemblers/DamMStabAssembler.cs (.../DamMStabAssembler.cs) (revision 1121) @@ -422,12 +422,12 @@ FailureMechanismParametersMStab failureMechanismParametersMStab, XNamespace tnsb) { XElement externalPLLinesElement = null; - if (failureMechanismParametersMStab.PLLines != null) + if (failureMechanismParametersMStab.PlLines != null) { externalPLLinesElement = new XElement(tnsb + XmlElementExternalPLLines); 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)); Index: DamEngine/trunk/src/Deltares.DamEngine.TestHelpers/Factories/FactoryForPLLines.cs =================================================================== diff -u -r1117 -r1121 --- DamEngine/trunk/src/Deltares.DamEngine.TestHelpers/Factories/FactoryForPLLines.cs (.../FactoryForPLLines.cs) (revision 1117) +++ DamEngine/trunk/src/Deltares.DamEngine.TestHelpers/Factories/FactoryForPLLines.cs (.../FactoryForPLLines.cs) (revision 1121) @@ -13,18 +13,18 @@ { 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; } }