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

[Stephane Popinet]

The following commit has been merged in the upstream branch:
commit cbd90409b8ff807a12e54933510d76ef173393de
Author: Stephane Popinet <stephane.popinet at paradise.net.nz>
Date:   Sun Jan 30 18:02:45 2005 +1100

    VOF advection tests
    
    darcs-hash:20050130070245-fa380-14c921328063d8a3a39c472e08a0ad9d21ae120b.gz

diff --git a/test/advection/graphic/tests/rotate_refine1/advection.gfs b/test/advection/graphic/tests/rotate_refine2/advection.gfs
similarity index 92%
copy from test/advection/graphic/tests/rotate_refine1/advection.gfs
copy to test/advection/graphic/tests/rotate_refine2/advection.gfs
index 957abe0..72847cf 100644
--- a/test/advection/graphic/tests/rotate_refine1/advection.gfs
+++ b/test/advection/graphic/tests/rotate_refine2/advection.gfs
@@ -1,8 +1,9 @@
 1 0 GfsAdvection GfsBox GfsGEdge {} {
   Time { end = 3.14159265359 }
   Refine { return x < 0.25 && x > -0.25 && y < 0.25 && y > -0.25 ? 7 : 5; }
-  VariableTracer {} T
-  AdvectionParams { cfl = 0.5 }
+  VariableTracer {} T {
+    scheme = vof
+  }
   InitFraction {} T ../../star.gts
   Init {} {
     U = { return -8.*y; }
diff --git a/test/advection/graphic/tests/rotate_refine2/description.txt b/test/advection/graphic/tests/rotate_refine2/description.txt
new file mode 100644
index 0000000..948ac36
--- /dev/null
+++ b/test/advection/graphic/tests/rotate_refine2/description.txt
@@ -0,0 +1 @@
+caption: Rotation of a sharp field (``star''), van Leer limiter, VOF scheme, CFL of 0.5, two levels of refinement in a square centered box.
diff --git a/test/advection/graphic/tests/rotate_refine1/graphics.gfs b/test/advection/graphic/tests/rotate_refine2/graphics.gfs
similarity index 100%
copy from test/advection/graphic/tests/rotate_refine1/graphics.gfs
copy to test/advection/graphic/tests/rotate_refine2/graphics.gfs
diff --git a/test/advection/graphic/tests/translate7/advection.gfs b/test/advection/graphic/tests/translate8/advection.gfs
similarity index 90%
copy from test/advection/graphic/tests/translate7/advection.gfs
copy to test/advection/graphic/tests/translate8/advection.gfs
index 4650047..56bacc0 100644
--- a/test/advection/graphic/tests/translate7/advection.gfs
+++ b/test/advection/graphic/tests/translate8/advection.gfs
@@ -1,6 +1,6 @@
 1 2 GfsAdvection GfsBox GfsGEdge {} {
   Time { end = 8.94427191 }
-  Refine 6
+  Refine 7
   VariableTracer {} T {
     scheme = vof
   }
@@ -9,6 +9,7 @@
     U = { double theta = atan (1./2.); return cos (theta); }
     V = { double theta = atan (1./2.); return sin (theta); }
   }
+  AdaptGradient { istep = 1 } { cmax = 1e-2 maxlevel = 7 } T
   OutputScalarStats { istep = 1 } log { v = T }
   OutputScalarSum { istep = 1 } log { v = T }
   OutputSimulation { step = 2.236067 } stdout { variables = T binary = 1 }
diff --git a/test/advection/graphic/tests/translate8/description.txt b/test/advection/graphic/tests/translate8/description.txt
new file mode 100644
index 0000000..999d33d
--- /dev/null
+++ b/test/advection/graphic/tests/translate8/description.txt
@@ -0,0 +1 @@
+caption: Translation of a sharp field (``star''), periodic boundary conditions, VOF scheme, CFL of 0.5, adaptive mesh refinement.
diff --git a/test/advection/graphic/tests/translate_refine1/graphics.gfs b/test/advection/graphic/tests/translate8/graphics.gfs
similarity index 96%
copy from test/advection/graphic/tests/translate_refine1/graphics.gfs
copy to test/advection/graphic/tests/translate8/graphics.gfs
index af4758d..983ce27 100644
--- a/test/advection/graphic/tests/translate_refine1/graphics.gfs
+++ b/test/advection/graphic/tests/translate8/graphics.gfs
@@ -46,7 +46,7 @@ GfsBox { id = 1 pid = -1 size = 4 } {
 View {
   tx = 0 ty = 0
   q0 = 0 q1 = 0 q2 = 0 q3 = 1
-  zoom = -8.01519
+  zoom = -11.5778
   r = 1 g = 1 b = 1
   res = 1
   lc = 0.001
@@ -65,7 +65,7 @@ Isoline {
   n = 10
 }
 Levels {
-  r = 0 g = 0.0852064 b = 1
+  r = 0.0203403 g = 0 b = 1
   shading = Constant
   maxlevel = -1
 }

-- 
Gerris Flow Solver