Index: DamEngine/trunk/src/Deltares.DamEngine.Data.Tests/Geotechnics/SoilProfile1DAquiferLayerCombinerTests.cs =================================================================== diff -u -r3893 -r4000 --- DamEngine/trunk/src/Deltares.DamEngine.Data.Tests/Geotechnics/SoilProfile1DAquiferLayerCombinerTests.cs (.../SoilProfile1DAquiferLayerCombinerTests.cs) (revision 3893) +++ DamEngine/trunk/src/Deltares.DamEngine.Data.Tests/Geotechnics/SoilProfile1DAquiferLayerCombinerTests.cs (.../SoilProfile1DAquiferLayerCombinerTests.cs) (revision 4000) @@ -27,16 +27,15 @@ [TestFixture] public class SoilProfile1DAquiferLayerCombinerTests { - [Test] public void TestResultsOfCombinedLayers() { const double diff = 0.0001; - var soilProfile1D = CreateProfile(); + SoilProfile1D soilProfile1D = CreateProfile(); var topLayerName = "L2"; - var aquiferLayer = SoilProfile1DAquiferLayerCombiner.CombineLayers(soilProfile1D, topLayerName); + SoilProfile1DAquiferLayerCombiner.AquiferLayerProperties aquiferLayer = SoilProfile1DAquiferLayerCombiner.CombineLayers(soilProfile1D, topLayerName); // D70 from layer L2 - Assert.AreEqual(0.0002, aquiferLayer.D70, diff); + Assert.AreEqual(0.0002, aquiferLayer.D70, diff); // Height from L2 + all layers below it that are aquifer unless an aquitard is in between // so sum of L2 and L3: 3 + 2 = 5 Assert.AreEqual(5.0, aquiferLayer.Height, diff); @@ -49,7 +48,7 @@ [SetUICulture("nl-NL")] public void TestThrowsExceptionWhenInterpolationModelIsNotTheSameForAllCombinedLayers() { - var soilProfile1D = CreateProfile(); + SoilProfile1D soilProfile1D = CreateProfile(); soilProfile1D.GetLayerWithName("L2").WaterpressureInterpolationModel = WaterpressureInterpolationModel.Automatic; soilProfile1D.GetLayerWithName("L3").WaterpressureInterpolationModel = WaterpressureInterpolationModel.Hydrostatic; soilProfile1D.Name = "Test Profile"; @@ -59,10 +58,10 @@ private static SoilProfile1D CreateProfile() { - SoilProfile1D soilProfile1D = new SoilProfile1D(); + var soilProfile1D = new SoilProfile1D(); soilProfile1D.BottomLevel = -12.0; - SoilLayer1D soilLayer1 = new SoilLayer1D(); + var soilLayer1 = new SoilLayer1D(); soilLayer1.Name = "L0"; soilLayer1.TopLevel = 13.0; soilLayer1.Soil = new Soil("Sandy stuff", 22.0, 20.0); @@ -71,7 +70,7 @@ soilLayer1.IsAquifer = true; soilProfile1D.Layers.Add(soilLayer1); - SoilLayer1D soilLayer2 = new SoilLayer1D(); + var soilLayer2 = new SoilLayer1D(); soilLayer2.Name = "L1"; soilLayer2.TopLevel = 10.0; soilLayer2.Soil = new Soil("Topmaterial", 1.0, 1.0); @@ -80,7 +79,7 @@ soilLayer2.IsAquifer = false; soilProfile1D.Layers.Add(soilLayer2); - SoilLayer1D soilLayer3 = new SoilLayer1D(); + var soilLayer3 = new SoilLayer1D(); soilLayer3.Name = "L2"; soilLayer3.TopLevel = -2.0; soilLayer3.Soil = new Soil("Sand", 22.0, 20.0); @@ -89,7 +88,7 @@ soilLayer3.IsAquifer = true; soilProfile1D.Layers.Add(soilLayer3); - SoilLayer1D soilLayer4 = new SoilLayer1D(); + var soilLayer4 = new SoilLayer1D(); soilLayer4.Name = "L3"; soilLayer4.TopLevel = -5.0; soilLayer4.Soil = new Soil("Also sand", 22.0, 20.0); @@ -98,7 +97,7 @@ soilLayer4.IsAquifer = true; soilProfile1D.Layers.Add(soilLayer4); - SoilLayer1D soilLayer5 = new SoilLayer1D(); + var soilLayer5 = new SoilLayer1D(); soilLayer5.Name = "L4"; soilLayer5.TopLevel = -7.0; soilLayer5.Soil = new Soil("clay or so", 1.0, 1.0); @@ -107,7 +106,7 @@ soilLayer5.IsAquifer = false; soilProfile1D.Layers.Add(soilLayer5); - SoilLayer1D soilLayer6 = new SoilLayer1D(); + var soilLayer6 = new SoilLayer1D(); soilLayer6.Name = "L4"; soilLayer6.TopLevel = -8.0; soilLayer6.Soil = new Soil("More sand", 22.0, 20.0); @@ -119,4 +118,4 @@ return soilProfile1D; } } -} +} \ No newline at end of file