Index: dam classic/trunk/src/Dam/Data/DupuitCalculatorFileIO.cs =================================================================== diff -u -r190 -r222 --- dam classic/trunk/src/Dam/Data/DupuitCalculatorFileIO.cs (.../DupuitCalculatorFileIO.cs) (revision 190) +++ dam classic/trunk/src/Dam/Data/DupuitCalculatorFileIO.cs (.../DupuitCalculatorFileIO.cs) (revision 222) @@ -24,8 +24,6 @@ using System.Text.RegularExpressions; using System.Threading; - using Geotechnics; - /// /// Exception class for DupuitCalculatorFileIO /// @@ -489,6 +487,19 @@ } + private Soil GetDefaultSoil() + { + var soil = new Soil() + { + BelowPhreaticLevel = 0.0, + AbovePhreaticLevel = 0.0, + FrictionAngle = 0.0, + Cohesion = 0.0, + PermeabKx = 0.0 + }; + return soil; + } + /// /// Write materials to file /// @@ -514,13 +525,13 @@ Soil soil; if (layerIndex == 0) { - soil = new Soil(); + soil = GetDefaultSoil(); } else { Geometry2DLayer layerForSoil = adaptedGeometry2DData.GetLayer(layerIndex - 1); int soilIndex = soilList.GetSoilIndexByName(layerForSoil.soilName); - soil = (soilIndex >= 0) ? soilList.Soils[soilIndex] : new Soil(); + soil = (soilIndex >= 0) ? soilList.Soils[soilIndex] : GetDefaultSoil(); } Geometry2DLayer layer = adaptedGeometry2DData.GetLayer(layerIndex); Index: dam classic/trunk/src/Dam/Tests/PLLinesCreatorDupuitTests.cs =================================================================== diff -u -r219 -r222 --- dam classic/trunk/src/Dam/Tests/PLLinesCreatorDupuitTests.cs (.../PLLinesCreatorDupuitTests.cs) (revision 219) +++ dam classic/trunk/src/Dam/Tests/PLLinesCreatorDupuitTests.cs (.../PLLinesCreatorDupuitTests.cs) (revision 222) @@ -9,19 +9,14 @@ //----------------------------------------------------------------------- using Deltares.Dam.TestHelper; -using Deltares.Standard.IO; -using Deltares.Standard.TestUtils; namespace Deltares.Dam.Tests { - using System; - using System.Collections.Generic; using System.IO; using Deltares.Dam.Data; using NUnit.Framework; [TestFixture] - [Category(Categories.WorkInProgress)] // To be checked; Fails since SVN rev. #25385.3930 Check!! public class PLLinesCreatorDupuitTests { [Test]