Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/PlLinesCreator/PlLinesCreator.cs =================================================================== diff -u -r2146 -r2147 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators/PlLinesCreator/PlLinesCreator.cs (.../PlLinesCreator.cs) (revision 2146) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/PlLinesCreator/PlLinesCreator.cs (.../PlLinesCreator.cs) (revision 2147) @@ -905,7 +905,7 @@ } else { - plLines.Lines[plLineType] = CreatePlLineByExpertKnowledge(plLineType, location.DamType, location.SlopeDampingPiezometricHeightPolderSide); + plLines.Lines[plLineType] = CreatePlLineByExpertKnowledge(plLineType, location.SlopeDampingPiezometricHeightPolderSide); } // currentPL1Line is needed when calculating uplift reduction for PL3 and Pl4 @@ -1290,7 +1290,7 @@ 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.SlopeDampingPiezometricHeightPolderSide); // currentPL1Line is needed when calculating uplift reduction for PL3 and Pl4 if (plLineType == PlLineType.Pl1) @@ -1337,10 +1337,9 @@ /// Creates the pl line by expert knowledge. /// /// Type of the pl line. - /// Type of the dam. /// The slope gradient. /// - public PlLine CreatePlLineByExpertKnowledge(PlLineType plLineType, DamType damType, double slopeGradient) + public PlLine CreatePlLineByExpertKnowledge(PlLineType plLineType, double slopeGradient) { PlLine plLine = null; Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/PlLinesCreator/PlLinesCreatorTest.cs =================================================================== diff -u -r2111 -r2147 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/PlLinesCreator/PlLinesCreatorTest.cs (.../PlLinesCreatorTest.cs) (revision 2111) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/PlLinesCreator/PlLinesCreatorTest.cs (.../PlLinesCreatorTest.cs) (revision 2147) @@ -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, 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, 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, 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, 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, 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, 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, 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, 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, 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, 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, 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, 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, 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, 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, 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, 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, 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, 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, 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, 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, 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, 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, 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, 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, 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, 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, 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, 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, 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, 0.02); Assert.IsFalse(plLine.Exists()); } } @@ -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, 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))); @@ -1202,7 +1202,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, 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))); @@ -1242,7 +1242,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, 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))); @@ -1282,7 +1282,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, 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, 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, 0.02); Assert.IsFalse(plLine.Exists()); } } @@ -1359,7 +1359,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, 0.02); // //double headAtDikeToe = plLineCreator.WaterLevelRiver - (plLineCreator.WaterLevelRiver - plLineCreator.WaterLevelPolder) * 0.01 * cDampingFactor; @@ -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, 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, 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, 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, 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, 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, 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, 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, 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; @@ -1603,7 +1603,7 @@ // Change WaterLevelRiverHigh to be sure the value of HeadInPlLine3 is really used plLineCreator.HeadInPlLine4 = 4.0; plLineCreator.WaterLevelRiverHigh = 3.0; - var plLine = plLineCreator.CreatePlLineByExpertKnowledge(PlLineType.Pl4, DamType.Regional, 0.02); + var plLine = plLineCreator.CreatePlLineByExpertKnowledge(PlLineType.Pl4, 0.02); CheckPl4LowFor1DGeometryWithExpertKnowledgeRrd(plLine); } } @@ -1636,7 +1636,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, 0.02); } } @@ -1896,7 +1896,7 @@ // var surfacelineSimpleDike = FactoryForSurfaceLines.CreateSurfacelineSimpleDike(); // { // PLLinesCreator plLineCreator = DefinePLLineCreatorFor2DGeometry(surfacelineSimpleDike); - // PLLine plLine = plLineCreator.CreatePLLineByExpertKnowledge(PLLineType.PL1, DamType.Regional, 0.02); + // PLLine plLine = plLineCreator.CreatePLLineByExpertKnowledge(PLLineType.PL1, 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);