Index: dam engine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamPipingBligh/DamPipingBlighKernelWrapperTests.cs =================================================================== diff -u -r764 -r768 --- dam engine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamPipingBligh/DamPipingBlighKernelWrapperTests.cs (.../DamPipingBlighKernelWrapperTests.cs) (revision 764) +++ dam engine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamPipingBligh/DamPipingBlighKernelWrapperTests.cs (.../DamPipingBlighKernelWrapperTests.cs) (revision 768) @@ -67,7 +67,7 @@ }; var subSoilScenario = new SoilGeometryProbability(); - subSoilScenario.SoilProfile1D = CreateClaySandProfileForPipingBligh(); + subSoilScenario.SoilProfile1D = FactoryForSoilProfiles.CreateClaySandProfileForPipingBligh(); subSoilScenario.SegmentFailureMechanismType = FailureMechanismSystemType.Piping; var damKernelInput = new DamKernelInput @@ -129,7 +129,7 @@ location.SurfaceLine = FactoryForSurfaceLines.CreateSurfaceLineTutorial1(); var subSoilScenario = new SoilGeometryProbability(); - subSoilScenario.SoilProfile1D = CreateClaySandProfileForPipingBligh(); + subSoilScenario.SoilProfile1D = FactoryForSoilProfiles.CreateClaySandProfileForPipingBligh(); subSoilScenario.SegmentFailureMechanismType = FailureMechanismSystemType.Piping; var damKernelInput = new DamKernelInput @@ -184,7 +184,7 @@ var kernelWrapper = new DamPipingBlighKernelWrapper(); var subSoilScenario = new SoilGeometryProbability(); - subSoilScenario.SoilProfile1D = CreateClaySandProfileForPipingBligh(); + subSoilScenario.SoilProfile1D = FactoryForSoilProfiles.CreateClaySandProfileForPipingBligh(); subSoilScenario.SegmentFailureMechanismType = FailureMechanismSystemType.Piping; var input = new DamKernelInput { @@ -264,35 +264,5 @@ kernelWrapper.PostProcess(null, new DamPipingBlighOutput(), "", out result); } - private static SoilProfile1D CreateClaySandProfileForPipingBligh() - { - SoilProfile1D soilProfile1D = new SoilProfile1D(); - SoilLayer1D soilLayer1D1 = new SoilLayer1D(); - soilLayer1D1.Name = "L0"; - soilLayer1D1.TopLevel = 10.0; - soilLayer1D1.Soil = new Soil("HW-OBO", 12.0, 10.0); - soilLayer1D1.Soil.DryUnitWeight = 0.01; - soilLayer1D1.IsAquifer = false; - soilLayer1D1.Soil.SoilType = SoilType.Clay; - soilProfile1D.Layers.Add(soilLayer1D1); - - SoilLayer1D soilLayer1D2 = new SoilLayer1D(); - soilLayer1D2.Name = "L1"; - soilLayer1D2.TopLevel = -5.0; - soilLayer1D2.Soil = new Soil("Alg-zand (0-30)", 22.0, 20.0); - soilLayer1D2.Soil.DryUnitWeight = 0.01; - soilLayer1D2.IsAquifer = true; - soilProfile1D.Layers.Add(soilLayer1D2); - soilProfile1D.BottomLevel = -10.0; - - foreach (SoilLayer1D layer in soilProfile1D.Layers) - { - layer.Soil.BelowPhreaticLevel = 1.0; - layer.Soil.AbovePhreaticLevel = 1.0; - layer.Soil.DiameterD70 = 0.00018; - } - return soilProfile1D; - } - } }