Index: dam failuremechanisms/damPiping/trunk/src/Deltares.DamPiping/PipingCalculatorBligh.cs =================================================================== diff -u -r251 -r252 --- dam failuremechanisms/damPiping/trunk/src/Deltares.DamPiping/PipingCalculatorBligh.cs (.../PipingCalculatorBligh.cs) (revision 251) +++ dam failuremechanisms/damPiping/trunk/src/Deltares.DamPiping/PipingCalculatorBligh.cs (.../PipingCalculatorBligh.cs) (revision 252) @@ -12,7 +12,7 @@ { } - public double? CalculatePipingFactor() + public double CalculatePipingFactor(double upliftCriterion) { //base.CalculatePipingFactor(location, surfaceLine, soilProfile, waterLevel); try Index: dam failuremechanisms/damPiping/trunk/src/Deltares.DamPiping.Tests/PipingCalculatorBlighTests.cs =================================================================== diff -u -r251 -r252 --- dam failuremechanisms/damPiping/trunk/src/Deltares.DamPiping.Tests/PipingCalculatorBlighTests.cs (.../PipingCalculatorBlighTests.cs) (revision 251) +++ dam failuremechanisms/damPiping/trunk/src/Deltares.DamPiping.Tests/PipingCalculatorBlighTests.cs (.../PipingCalculatorBlighTests.cs) (revision 252) @@ -14,7 +14,8 @@ public void CanCalculateThePipingFactorUsingBlighNoUplift() { var calculator = new PipingCalculatorBligh(); - var actual = calculator.CalculatePipingFactor(); + const double upliftCriterion = 1.0; + var actual = calculator.CalculatePipingFactor(upliftCriterion); // Phreatic level in profile // Mass of soil volume above @@ -29,7 +30,38 @@ Assert.AreEqual(expected, actual); } - + +// [Test] +// public void CanCalculateThePipingFactorUsingBlighNoUplift() +// { +// using (var surfaceLine = FactoryForSurfaceLineTests.CreateSurfaceLineTutorial1()) +// using (var dike = new Dike()) +// { +// var soilProfile = FactoryForSoilProfileTests.CreateClaySandClaySandProfile(); +// +// var calculator = new PipingCalculatorBligh(new ModelParametersForPLLines(), +// 1.0, dike.GaugePLLines, dike.Gauges, 1.0); +// using (var location = new Location()) +// { +// var actual = calculator.CalculatePipingFactor(location, surfaceLine, soilProfile, 0.0); +// +// +// // Phreatic level in profile +// // Mass of soil volume above +// // dry 6 m x 12 kN/m3 = 72 +// // wet 9 m x 16 kN/m3 = 144 +// // Total: 72 + 144 = 216 +// // Phreatic pressure +// // 20 m x 10 kN/m3 = 200 +// // UpliftFactor = 216/200 = 1.08 +// // UpliftFactor > 1.0, so no piping, so returns cDefaultMaxReturnValue +// var expected = PipingCalculatorBligh.cDefaultMaxReturnValue; +// +// Assert.AreEqual(expected, actual); +// } +// } +// } + // [Test] // public void CanCalculateThePipingFactorUsingBligh() // {