Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamMacroStabilityCommon/DamMStabAssemblerTest.cs =================================================================== diff -u -r1464 -r1487 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamMacroStabilityCommon/DamMStabAssemblerTest.cs (.../DamMStabAssemblerTest.cs) (revision 1464) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamMacroStabilityCommon/DamMStabAssemblerTest.cs (.../DamMStabAssemblerTest.cs) (revision 1487) @@ -147,24 +147,24 @@ surfaceLine2.EnsurePointOfType(85.4, -3.61, CharacteristicPointType.SurfaceLevelInside); // PL Lines - 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(); - 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; + plLines = new PlLines(); + plLine1 = new PlLine(); + plLine1.Name = "PLLine1"; + plLine1.IsPhreatic = false; + plLine1.BoundaryLayer = 2; + plLine1.Points.Add(new PlLinePoint(35.2, -7.56)); + plLine1.Points.Add(new PlLinePoint(42.5, -6.12)); + plLine1.Points.Add(new PlLinePoint(45.3, -8.73)); + plLines.Lines[PlLineType.Pl1] = plLine1; + plLine2 = new PlLine(); + plLine2.Name = "PLLine2"; + plLine2.IsPhreatic = true; + plLine2.BoundaryLayer = 5; + plLine2.Points.Add(new PlLinePoint(16.2, 3.23)); + plLine2.Points.Add(new PlLinePoint(18.4, 1.19)); + plLine2.Points.Add(new PlLinePoint(21.8, -0.45)); + plLine2.Points.Add(new PlLinePoint(22.5, -1.73)); + plLines.Lines[PlLineType.Pl1] = plLine2; // Calculation options calculationOptions = new MStabCalculationOptions(); @@ -237,7 +237,7 @@ { Location = location1, SurfaceLine = location1.SurfaceLine, - PlLines = peelLines, + PlLines = plLines, SoilProfile = soilProfile1, EmbankmentDesignParameters = design, MStabParameters = new MStabParameters() @@ -281,9 +281,9 @@ private SurfaceLine2 surfaceLine2; private SoilProfile1D soilProfile1; - private PlLines peelLines; - private PlLine peelLine1; - private PlLine peelLine2; + private PlLines plLines; + private PlLine plLine1; + private PlLine plLine2; private MStabZoneAreas zoneAreas; private MStabCalculationOptions calculationOptions; @@ -359,22 +359,22 @@ XElement externalPlLineCollectionElement = externalPlLineCollectionElements.Single(); - IEnumerable peelLineCollectionElements = from element in externalPlLineCollectionElement.Descendants() + IEnumerable plLineCollectionElements = 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"); - IEnumerator peelLineElementEnumerator = peelLineCollectionElements.GetEnumerator(); + Assert.AreEqual(damFailureMechanismeCalculationSpecification.FailureMechanismParametersMStab.PlLines.PlLineCount, plLineCollectionElements.Count(), "Number of PL lines"); + IEnumerator plLineElementEnumerator = plLineCollectionElements.GetEnumerator(); foreach (PlLineType plLineType in Enum.GetValues(typeof(PlLineType))) { PlLine line = damFailureMechanismeCalculationSpecification.FailureMechanismParametersMStab.PlLines.Lines[plLineType]; - peelLineElementEnumerator.MoveNext(); - XElement peelLineElement = peelLineElementEnumerator.Current; + plLineElementEnumerator.MoveNext(); + XElement plLineElement = plLineElementEnumerator.Current; - Assert.AreEqual(line.IsPhreatic, peelLineElement.AttributeAs(DamMStabAssembler.XmlAttributeIsPhreatic), String.Format("{0}", DamMStabAssembler.XmlAttributeIsPhreatic)); - Assert.AreEqual(line.BoundaryLayer, peelLineElement.AttributeAs(DamMStabAssembler.XmlAttributeBoundaryLayer), String.Format("{0}", DamMStabAssembler.XmlAttributeBoundaryLayer)); + Assert.AreEqual(line.IsPhreatic, plLineElement.AttributeAs(DamMStabAssembler.XmlAttributeIsPhreatic), String.Format("{0}", DamMStabAssembler.XmlAttributeIsPhreatic)); + Assert.AreEqual(line.BoundaryLayer, plLineElement.AttributeAs(DamMStabAssembler.XmlAttributeBoundaryLayer), String.Format("{0}", DamMStabAssembler.XmlAttributeBoundaryLayer)); - IEnumerable peelPointCollectionElements = from element in peelLineElement.Descendants() + IEnumerable peelPointCollectionElements = from element in plLineElement.Descendants() where element.Name.LocalName == DamMStabAssembler.XmlElementPLPoint select element; Assert.AreEqual(line.Points.Count, peelPointCollectionElements.Count(), "Number of PL line Points");