Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamMacroStabilityCommon/DamMStabAssemblerTest.cs =================================================================== diff -u -r1116 -r1117 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamMacroStabilityCommon/DamMStabAssemblerTest.cs (.../DamMStabAssemblerTest.cs) (revision 1116) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamMacroStabilityCommon/DamMStabAssemblerTest.cs (.../DamMStabAssemblerTest.cs) (revision 1117) @@ -148,24 +148,24 @@ surfaceLine2.EnsurePointOfType(85.4, -3.61, CharacteristicPointType.SurfaceLevelInside); // PL Lines - peelLines = new PLLines(); - peelLine1 = new PLLine(); + peelLines = new PlLines(); + peelLine1 = new PlLine(); peelLine1.Name = "PLLine1"; peelLine1.IsPhreatic = false; peelLine1.BoundaryLayer = 2; - peelLine1.Points.Add(new PLLinePoint(35.2, -7.56)); - peelLine1.Points.Add(new PLLinePoint(42.5, -6.12)); - peelLine1.Points.Add(new PLLinePoint(45.3, -8.73)); - peelLines.Lines[PLLineType.PL1] = peelLine1; - peelLine2 = new PLLine(); + peelLine1.Points.Add(new PlLinePoint(35.2, -7.56)); + peelLine1.Points.Add(new PlLinePoint(42.5, -6.12)); + peelLine1.Points.Add(new PlLinePoint(45.3, -8.73)); + peelLines.Lines[PlLineType.PL1] = peelLine1; + peelLine2 = new PlLine(); peelLine2.Name = "PLLine2"; peelLine2.IsPhreatic = true; peelLine2.BoundaryLayer = 5; - peelLine2.Points.Add(new PLLinePoint(16.2, 3.23)); - peelLine2.Points.Add(new PLLinePoint(18.4, 1.19)); - peelLine2.Points.Add(new PLLinePoint(21.8, -0.45)); - peelLine2.Points.Add(new PLLinePoint(22.5, -1.73)); - peelLines.Lines[PLLineType.PL1] = peelLine2; + peelLine2.Points.Add(new PlLinePoint(16.2, 3.23)); + peelLine2.Points.Add(new PlLinePoint(18.4, 1.19)); + peelLine2.Points.Add(new PlLinePoint(21.8, -0.45)); + peelLine2.Points.Add(new PlLinePoint(22.5, -1.73)); + peelLines.Lines[PlLineType.PL1] = peelLine2; // Calculation options calculationOptions = new MStabCalculationOptions(); @@ -282,9 +282,9 @@ private SurfaceLine2 surfaceLine2; private SoilProfile1D soilProfile1; - private PLLines peelLines; - private PLLine peelLine1; - private PLLine peelLine2; + private PlLines peelLines; + private PlLine peelLine1; + private PlLine peelLine2; private MStabZoneAreas zoneAreas; private MStabCalculationOptions calculationOptions; @@ -366,9 +366,9 @@ Assert.AreEqual(damFailureMechanismeCalculationSpecification.FailureMechanismParametersMStab.PLLines.PLLineCount, peelLineCollectionElements.Count(), "Number of PL lines"); IEnumerator peelLineElementEnumerator = peelLineCollectionElements.GetEnumerator(); - foreach (PLLineType plLineType in Enum.GetValues(typeof(PLLineType))) + foreach (PlLineType plLineType in Enum.GetValues(typeof(PlLineType))) { - PLLine line = damFailureMechanismeCalculationSpecification.FailureMechanismParametersMStab.PLLines.Lines[plLineType]; + PlLine line = damFailureMechanismeCalculationSpecification.FailureMechanismParametersMStab.PLLines.Lines[plLineType]; peelLineElementEnumerator.MoveNext(); XElement peelLineElement = peelLineElementEnumerator.Current; @@ -380,7 +380,7 @@ select element; Assert.AreEqual(line.Points.Count, peelPointCollectionElements.Count(), "Number of PL line Points"); IEnumerator peelPointElementEnumerator = peelPointCollectionElements.GetEnumerator(); - foreach (PLLinePoint point in line.Points) + foreach (PlLinePoint point in line.Points) { peelPointElementEnumerator.MoveNext(); XElement peelPointElement = peelPointElementEnumerator.Current; @@ -501,11 +501,11 @@ plLineCreator.SurfaceLine = surfaceLine1; plLineCreator.WaterLevelRiverHigh = 4.0; plLineCreator.WaterLevelPolder = -4.5; - plLineCreator.ModelParametersForPLLines.DampingFactorPL3 = 0.3; - plLineCreator.ModelParametersForPLLines.DampingFactorPL4 = 0.4; - plLineCreator.ModelParametersForPLLines.PenetrationLength = 1.5; - plLineCreator.HeadInPLLine2 = 0.0; - plLineCreator.CreateAllPLLines(location); + plLineCreator.ModelParametersForPlLines.DampingFactorPL3 = 0.3; + plLineCreator.ModelParametersForPlLines.DampingFactorPL4 = 0.4; + plLineCreator.ModelParametersForPlLines.PenetrationLength = 1.5; + plLineCreator.HeadInPlLine2 = 0.0; + plLineCreator.CreateAllPlLines(location); var doc = assembler.CreateDataTransferObject(damFailureMechanismeCalculationSpecification.FailureMechanismParametersMStab); Directory.CreateDirectory(TestDirectory); doc.Save(Path.Combine(TestDirectory, TestFileNameWithPlLines));