[SCM] Gerris Flow Solver branch, upstream, updated. b3aa46814a06c9cb2912790b23916ffb44f1f203

[Stephane Popinet]

The following commit has been merged in the upstream branch:
commit e04e50f18179ae11a1fd4168ae637b50a78d5d41
Author: Stephane Popinet <popinet at users.sf.net>
Date:   Wed Aug 22 13:26:02 2007 +1000

    Updated 'shear' VOF advection test case
    
    Including test for mass conservation.
    
    darcs-hash:20070822032602-d4795-48eef891e90ea5998ff7a534bcbcd292a324f140.gz

diff --git a/test/shear/norms.ref b/test/shear/norms.ref
index 81aa016..7f9c6ea 100644
--- a/test/shear/norms.ref
+++ b/test/shear/norms.ref
@@ -1 +1 @@
-T time: 5 first:  2.553e-03 second:  4.056e-02 infty:  1.000e+00 bias: -1.594e-03
+T time: 5 first:  1.662e-04 second:  5.739e-03 infty:  3.802e-01 bias:  7.507e-06
diff --git a/test/shear/shear.gfs b/test/shear/shear.gfs
index 024b3cc..61e4a9e 100644
--- a/test/shear/shear.gfs
+++ b/test/shear/shear.gfs
@@ -60,14 +60,14 @@
 
     # Add tracer T, using a VOF advection scheme.
     # The default scheme is a Van-Leer limited, second-order upwind scheme.
-    VariableTracerVOF {} T
+    VariableTracerVOF T
 
-    InitFraction {} T (ellipse (0, -.236338, 0.2, 0.2))
+    InitFraction T (ellipse (0, -.236338, 0.2, 0.2))
 
     # Initialize U and V with the vortical shear flow field
     Init {} {
-	U = sin((x + 0.5)*M_PI)*cos((y + 0.5)*M_PI)
-	V = -cos((x + 0.5)*M_PI)*sin((y + 0.5)*M_PI)
+        U = sin((x + 0.5)*M_PI)*cos((y + 0.5)*M_PI)
+        V = -cos((x + 0.5)*M_PI)*sin((y + 0.5)*M_PI)
     }
 
     # At t = 2.5 re-initialize U and V with the reversed flow field
@@ -82,7 +82,7 @@
     OutputPPM { start = 5 } { convert ppm:- t-5.eps } { v = T }
 
     # Add a new variable 
-    Variable {} Tref
+    Variable Tref
 
     # Initialize Tref with the initial shape
     InitFraction { start = end } Tref (ellipse (0, -.236338, 0.2, 0.2))
@@ -90,7 +90,7 @@
     # Output the norms of the difference between T and Tref, stores that into
     # new variable DT
     OutputErrorNorm { start = end } norms { v = T } {
-	s = Tref v = DT
+        s = Tref v = DT
     }
 
     OutputPPM { start = end } { convert ppm:- dt-5.eps } { v = DT }
diff --git a/test/shear/shear.sh b/test/shear/shear.sh
index 5ced3fb..6fbac65 100644
--- a/test/shear/shear.sh
+++ b/test/shear/shear.sh
@@ -16,7 +16,8 @@ from check import *
 from sys import *
 if (Curve('norms',3,5) - Curve('norms.ref',3,5)).max() > 0. or\
    (Curve('norms',3,7) - Curve('norms.ref',3,7)).max() > 0. or\
-   (Curve('norms',3,9) - Curve('norms.ref',3,9)).max() > 0.:
+   (Curve('norms',3,9) - Curve('norms.ref',3,9)).max() > 0. or\
+   (Curve('norms',3,11) - Curve('norms.ref',3,11)).max() > 0.:
     exit(1)
 EOF
 else

-- 
Gerris Flow Solver