Fisheye: Tag 320 refers to a dead (removed) revision in file `dam failuremechanisms/damPiping/trunk/src/Deltares.DamPiping/Class1.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: dam failuremechanisms/damPiping/trunk/src/Tests/Deltares.DamPiping.BlighCalculatorTests/PipingCalculatorBlighTests.cs
===================================================================
diff -u -r271 -r320
--- dam failuremechanisms/damPiping/trunk/src/Tests/Deltares.DamPiping.BlighCalculatorTests/PipingCalculatorBlighTests.cs	(.../PipingCalculatorBlighTests.cs)	(revision 271)
+++ dam failuremechanisms/damPiping/trunk/src/Tests/Deltares.DamPiping.BlighCalculatorTests/PipingCalculatorBlighTests.cs	(.../PipingCalculatorBlighTests.cs)	(revision 320)
@@ -24,118 +24,27 @@
             Assert.AreEqual(0, bc.Hcp);
             Assert.AreEqual(0, bc.Hc);
         }
-        [Test, Ignore("result in test is still for WTI, not for Dam")]
+
+        [Test]
         public void TestCalculation()
         {
             const double diff = 0.0001;
             var bc = new PipingCalculatorBligh();
-            bc.HRiver = 7;
-            bc.ModelFactorPiping = 0.5;
-            bc.HExit = 2;
-            bc.Rc = 0.8;
-            bc.DTotal = 3;
-            bc.SeepageLength = 18;
-            bc.D50 = 2.5e-3; // WTI Test succeeds with CreepFactorWTI
-            bc.D70 = 3086; // Dam: set D70 instead of D50
+            bc.HRiver = 2.0;
+            bc.ModelFactorPiping = 1.0;
+            bc.HExit = 0.0;
+            bc.Rc = 0.3;
+            bc.DTotal = 5.0;
+            bc.SeepageLength = 40.5;
+            //bc.D50 = 2.5e-3; // WTI Test succeeds with CreepFactorWTI todo: remove D50 and CreepFactorWTI?
+            bc.D70 = 180.0; // Dam: set D70 instead of D50
             bc.Calculate();
-            Assert.AreEqual(-1.6, bc.Zp, diff);
-            Assert.AreEqual(1 / 2.6, bc.FoSp, diff);
-            Assert.AreEqual(5.4, bc.Hcp, diff);
-            Assert.AreEqual(2, bc.Hc, diff);
+            Assert.AreEqual(4.5, bc.FoSp, diff);
+            Assert.AreEqual(2.25, bc.Hc, diff);
+
+            Assert.AreEqual(1.75, bc.Zp, diff); // not relevant for Dam todo: remove Zp?
+            Assert.AreEqual(3.75, bc.Hcp, diff); // not relevant for Dam todo: remove Hcp?
         }
 
-
-        //        [Test]
-        //        public void CanCalculateThePipingFactorUsingBlighNoUplift()
-        //        {
-        //            var calculator = new PipingCalculatorBligh();
-        //            const double upliftCriterion = 1.0;
-        //            var actual = calculator.CalculatePipingFactor(upliftCriterion);
-        //        
-        //            // 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 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()
-        //        {
-        //            using (var surfaceLine = FactoryForSurfaceLineTests.CreateSurfaceLineTutorial1())
-        //            using (var dike = new Dike())
-        //            {
-        //                var soilProfile = FactoryForSoilProfileTests.CreateClaySandProfileForPipingBligh();
-        //                var modelParametersForPLLines = new ModelParametersForPLLines();
-        //                modelParametersForPLLines.DampingFactorPL4 = 0.0;
-        //
-        //                var calculator = new PipingCalculatorBligh(modelParametersForPLLines,
-        //                    1.0, dike.GaugePLLines, dike.Gauges, 1.0);
-        //
-        //                using (var location = new Location())
-        //                {
-        //                    var actual = calculator.CalculatePipingFactor(location, surfaceLine, soilProfile, 2.0);
-        //
-        //                    // Phreatic level in profile
-        //                    // Mass of soil volume above 
-        //                    //   material above bottom sandlayer: 0 to -5 m
-        //                    //   dry/wet 5 m x 1 kN/m3 = 5
-        //                    // Phreatic pressure (Head PLLine 4 is ca. 1.0
-        //                    //   6.0 m x 10 kN/m3 = 60,0
-        //                    // UpliftFactor = 5/60.0 = 0.0833
-        //                    // UpliftFactor < 1.0, so piping will occur in toe of dike
-        //                    //
-        //                    // L = ToeOfDike.x - entrypoint.x = 50.5 - 10.0 = 40.5
-        //                    // d = height coverlayer = 5.0
-        //                    // Fluidisationgradient = 0.3
-        //                    // Hc = L / 18  = 40.5 / 18 = 2.25
-        //                    // Ha = 2.0 - 0.0 - (Fluidisationgradient * d) = 2.0 - 0.3 * 5.0 = 0.5
-        //                    // Piping factor = Hc / Ha = 2.25 / 0.5
-        //                    const double expected = 4.5;
-        //
-        //                    Assert.AreEqual(expected, actual);
-        //                }
-        //            }
-        //        }
-
-
     }
 }
Fisheye: Tag 320 refers to a dead (removed) revision in file `dam failuremechanisms/damPiping/trunk/src/Tests/Deltares.DamPipingTests/Class1Tests.cs'.
Fisheye: No comparison available.  Pass `N' to diff?