Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/General/Geometry2DTo1DConverter.cs =================================================================== diff -u -r937 -r949 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators/General/Geometry2DTo1DConverter.cs (.../Geometry2DTo1DConverter.cs) (revision 937) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/General/Geometry2DTo1DConverter.cs (.../Geometry2DTo1DConverter.cs) (revision 949) @@ -58,7 +58,7 @@ SoilGeometry2DName = soilGeometry2DName; SurfaceLine = surfaceLine; DikeEmbankmentMaterial = dikeEmbankmentMaterial; - this.SoilList = soilList; + SoilList = soilList; XOffsetSoilGeometry2DOrigin = 0; } @@ -75,7 +75,7 @@ SoilGeometry2DName = soilGeometry2DName; SurfaceLine = surfaceLine; DikeEmbankmentMaterial = dikeEmbankmentMaterial; - this.SoilList = soilList; + SoilList = soilList; XOffsetSoilGeometry2DOrigin = xOffsetSoilGeometry2DOrigin; } public string SoilGeometry2DName { get; set; } @@ -95,9 +95,11 @@ //xCoordinate = Math.Min(xCoordinate, this.SurfaceLine[CharacteristicPointType.SurfaceLevelInside].X - 0.1); //xCoordinate = this.SurfaceLine[CharacteristicPointType.SurfaceLevelInside].X-0.25; DAMMStabGeometry2DSectionAssembler assembler = new DAMMStabGeometry2DSectionAssembler(); - var geometry2DSectionParameters = new Geometry2DSectionParameters(); - geometry2DSectionParameters.SoilGeometry2DName = System.IO.Path.GetFullPath(SoilGeometry2DName); - geometry2DSectionParameters.XCoordinateSection = xCoordinate + XOffsetSoilGeometry2DOrigin; + var geometry2DSectionParameters = new Geometry2DSectionParameters + { + SoilGeometry2DName = Path.GetFullPath(SoilGeometry2DName), + XCoordinateSection = xCoordinate + XOffsetSoilGeometry2DOrigin + }; XDocument doc = assembler.CreateDataTransferObject(geometry2DSectionParameters); String LXMLInput = doc.ToString(); @@ -139,15 +141,17 @@ /// The x coordinate. private void AddDikeMaterialIfSurfaceLineAboveGeometrySurface(ref SoilProfile1D soilProfile, double xCoordinate) { - double surfaceLevel = this.SurfaceLine.Geometry.GetZAtUnsortedX(xCoordinate); + double surfaceLevel = SurfaceLine.Geometry.GetZAtUnsortedX(xCoordinate); if (surfaceLevel > soilProfile.Layers[0].TopLevel) { // Add toplayer ThrowIfNoDikeMaterialAssigned(); - var topLayer = new SoilLayer1D(); - topLayer.Name = soilProfile.GetNewUniqueLayerName(); - topLayer.SoilName = DikeEmbankmentMaterial.Name; - topLayer.TopLevel = surfaceLevel; + var topLayer = new SoilLayer1D + { + Name = soilProfile.GetNewUniqueLayerName(), + SoilName = DikeEmbankmentMaterial.Name, + TopLevel = surfaceLevel + }; soilProfile.Layers.Insert(0, topLayer); } }