Index: dam engine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamPipingSellmeijer4Forces/DamPipingSellmeijer4ForcesKernelWrapperTests.cs =================================================================== diff -u -r764 -r765 --- dam engine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamPipingSellmeijer4Forces/DamPipingSellmeijer4ForcesKernelWrapperTests.cs (.../DamPipingSellmeijer4ForcesKernelWrapperTests.cs) (revision 764) +++ dam engine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamPipingSellmeijer4Forces/DamPipingSellmeijer4ForcesKernelWrapperTests.cs (.../DamPipingSellmeijer4ForcesKernelWrapperTests.cs) (revision 765) @@ -68,7 +68,7 @@ }; var subSoilScenario = new SoilGeometryProbability(); - subSoilScenario.SoilProfile1D = CreatePipingSellmeijerProfileWithOneSandlayer(); + subSoilScenario.SoilProfile1D = FactoryForSoilProfiles.CreatePipingSellmeijerProfileWithOneSandlayer(); subSoilScenario.SegmentFailureMechanismType = FailureMechanismSystemType.Piping; var damKernelInput = new DamKernelInput @@ -130,7 +130,7 @@ location.SurfaceLine = FactoryForSurfaceLines.CreateSurfaceLineTutorial1(); var subSoilScenario = new SoilGeometryProbability(); - subSoilScenario.SoilProfile1D = CreatePipingSellmeijerProfileWithOneSandlayer(); + subSoilScenario.SoilProfile1D = FactoryForSoilProfiles.CreatePipingSellmeijerProfileWithOneSandlayer(); subSoilScenario.SegmentFailureMechanismType = FailureMechanismSystemType.Piping; var damKernelInput = new DamKernelInput @@ -195,7 +195,7 @@ var kernelWrapper = new DamPipingSellmeijer4ForcesKernelWrapper(); var subSoilScenario = new SoilGeometryProbability(); - subSoilScenario.SoilProfile1D = CreatePipingSellmeijerProfileWithOneSandlayer(); + subSoilScenario.SoilProfile1D = FactoryForSoilProfiles.CreatePipingSellmeijerProfileWithOneSandlayer(); subSoilScenario.SegmentFailureMechanismType = FailureMechanismSystemType.Piping; var input = new DamKernelInput { @@ -271,33 +271,5 @@ kernelWrapper.PostProcess(null, new DamPipingSellmeijer4ForcesOutput(), "", out result); } - private static SoilProfile1D CreatePipingSellmeijerProfileWithOneSandlayer() - { - SoilProfile1D soilProfile1D = new SoilProfile1D(); - SoilLayer1D soilLayer1D1 = new SoilLayer1D(); - soilLayer1D1.Name = "L0"; - soilLayer1D1.TopLevel = 10.0; - soilLayer1D1.Soil = new Soil("Topmaterial", 1.0, 1.0); - soilLayer1D1.Soil.PermeabKx = 0.0003; - soilLayer1D1.Soil.DiameterD70 = 0.0003; - soilLayer1D1.Soil.WhitesConstant = 0.5; - soilLayer1D1.Soil.BeddingAngle = 57.0; - soilLayer1D1.IsAquifer = false; - soilProfile1D.Layers.Add(soilLayer1D1); - - SoilLayer1D soilLayer1D2 = new SoilLayer1D(); - soilLayer1D2.Name = "L1"; - soilLayer1D2.TopLevel = -2.0; - soilLayer1D2.Soil = new Soil("Sand", 22.0, 20.0); - soilLayer1D2.Soil.PermeabKx = 0.0001; - soilLayer1D2.Soil.DiameterD70 = 0.0002; - soilLayer1D2.Soil.WhitesConstant = 0.25; - soilLayer1D2.Soil.BeddingAngle = 37.0; - soilLayer1D2.IsAquifer = true; - soilProfile1D.Layers.Add(soilLayer1D2); - soilProfile1D.BottomLevel = -10.0; - return soilProfile1D; - } - } } Index: dam engine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/Common/PlLinesHelperTests.cs =================================================================== diff -u -r764 -r765 --- dam engine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/Common/PlLinesHelperTests.cs (.../PlLinesHelperTests.cs) (revision 764) +++ dam engine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/Common/PlLinesHelperTests.cs (.../PlLinesHelperTests.cs) (revision 765) @@ -23,7 +23,7 @@ // test CanCalculateThePipingFactorUsingSellmeijer4Forces var location = new Location(); location.SurfaceLine = FactoryForSurfaceLines.CreateSurfaceLineTutorial1(); - var soilProfile1D = CreatePipingSellmeijerProfileWithOneSandlayer(); + var soilProfile1D = FactoryForSoilProfiles.CreatePipingSellmeijerProfileWithOneSandlayer(); var riverLevel = 1.0; UpliftSituation upliftSituation; var plLines = PlLinesHelper.CreatePlLines(location, soilProfile1D, riverLevel, out upliftSituation); @@ -44,33 +44,5 @@ Assert.AreEqual(0, plLines.Lines[PLLineType.PL4].Points.Count); } - private static SoilProfile1D CreatePipingSellmeijerProfileWithOneSandlayer() - { - SoilProfile1D soilProfile1D = new SoilProfile1D(); - SoilLayer1D soilLayer1D1 = new SoilLayer1D(); - soilLayer1D1.Name = "L0"; - soilLayer1D1.TopLevel = 10.0; - soilLayer1D1.Soil = new Soil("Topmaterial", 1.0, 1.0); - soilLayer1D1.Soil.PermeabKx = 0.0003; - soilLayer1D1.Soil.DiameterD70 = 0.0003; - soilLayer1D1.Soil.WhitesConstant = 0.5; - soilLayer1D1.Soil.BeddingAngle = 57.0; - soilLayer1D1.IsAquifer = false; - soilProfile1D.Layers.Add(soilLayer1D1); - - SoilLayer1D soilLayer1D2 = new SoilLayer1D(); - soilLayer1D2.Name = "L1"; - soilLayer1D2.TopLevel = -2.0; - soilLayer1D2.Soil = new Soil("Sand", 22.0, 20.0); - soilLayer1D2.Soil.PermeabKx = 0.0001; - soilLayer1D2.Soil.DiameterD70 = 0.0002; - soilLayer1D2.Soil.WhitesConstant = 0.25; - soilLayer1D2.Soil.BeddingAngle = 37.0; - soilLayer1D2.IsAquifer = true; - soilProfile1D.Layers.Add(soilLayer1D2); - soilProfile1D.BottomLevel = -10.0; - return soilProfile1D; - } - } }