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

[Stephane Popinet]

The following commit has been merged in the upstream branch:
commit a72aea35138416f74e93e2adca2b86f4df81dc52
Author: Stephane Popinet <s.popinet at niwa.co.nz>
Date:   Mon Jul 4 11:36:02 2005 +1000

    boussinesq example updated for new gfsview option
    
    darcs-hash:20050704013602-fbd8f-386721b8a7534af0c053036200ec3de72b4a1b5e.gz

diff --git a/doc/examples/boussinesq/boussinesq.gfs b/doc/examples/boussinesq/boussinesq.gfs
index d28599f..a9491c1 100644
--- a/doc/examples/boussinesq/boussinesq.gfs
+++ b/doc/examples/boussinesq/boussinesq.gfs
@@ -24,7 +24,7 @@
 # \end{figure}
 #
 # Author: St\'ephane Popinet
-# Command: gerris2D boussinesq.gfs | gfsview2D | ppmtoy4m -F 24:1 -v 0 | mpeg2enc -v 0 -o t.mpg
+# Command: gerris2D boussinesq.gfs | gfsview2D -S | ppmtoy4m -F 24:1 -v 0 | mpeg2enc -v 0 -o t.mpg
 # Version: 0.6.4
 # Required files: cylinder.gts boussinesq.gfv
 # Running time: 60 minutes
diff --git a/doc/examples/boussinesq/boussinesq.gfv b/doc/examples/boussinesq/boussinesq.gfv
index 2d4657f..a90b277 100644
--- a/doc/examples/boussinesq/boussinesq.gfv
+++ b/doc/examples/boussinesq/boussinesq.gfv
@@ -12,8 +12,7 @@ Linear {
   r = 0 g = 0 b = 0
   shading = Constant
   maxlevel = 8
-} {
-  v = T
+} T {
   amin = 0 min = 1.9696e-19
   amax = 0 max = 1
   cmap = Jet
diff --git a/test/advection/graphic/tests/rotate1/graphics.gfs b/test/advection/graphic/tests/rotate1/graphics.gfs
index 6ee922c..f78e1bc 100644
--- a/test/advection/graphic/tests/rotate1/graphics.gfs
+++ b/test/advection/graphic/tests/rotate1/graphics.gfs
@@ -46,8 +46,7 @@ Isoline {
   r = 0 g = 0 b = 0
   shading = Constant
   maxlevel = -1
-} {
-  v = T
+} T {
   amin = 1
   amax = 1
   cmap = Jet
diff --git a/test/advection/graphic/tests/rotate2/graphics.gfs b/test/advection/graphic/tests/rotate2/graphics.gfs
index 6ee922c..f78e1bc 100644
--- a/test/advection/graphic/tests/rotate2/graphics.gfs
+++ b/test/advection/graphic/tests/rotate2/graphics.gfs
@@ -46,8 +46,7 @@ Isoline {
   r = 0 g = 0 b = 0
   shading = Constant
   maxlevel = -1
-} {
-  v = T
+} T {
   amin = 1
   amax = 1
   cmap = Jet
diff --git a/test/advection/graphic/tests/rotate3/graphics.gfs b/test/advection/graphic/tests/rotate3/graphics.gfs
index 1b30709..5613a2e 100644
--- a/test/advection/graphic/tests/rotate3/graphics.gfs
+++ b/test/advection/graphic/tests/rotate3/graphics.gfs
@@ -46,8 +46,7 @@ Isoline {
   r = 0 g = 0 b = 0
   shading = Constant
   maxlevel = -1
-} {
-  v = T
+} T {
   amin = 1
   amax = 1
   cmap = Jet
diff --git a/test/advection/graphic/tests/rotate4/graphics.gfs b/test/advection/graphic/tests/rotate4/graphics.gfs
index 1b30709..5613a2e 100644
--- a/test/advection/graphic/tests/rotate4/graphics.gfs
+++ b/test/advection/graphic/tests/rotate4/graphics.gfs
@@ -46,8 +46,7 @@ Isoline {
   r = 0 g = 0 b = 0
   shading = Constant
   maxlevel = -1
-} {
-  v = T
+} T {
   amin = 1
   amax = 1
   cmap = Jet
diff --git a/test/advection/graphic/tests/rotate_refine1/graphics.gfs b/test/advection/graphic/tests/rotate_refine1/graphics.gfs
index 6624cfb..fb08b56 100644
--- a/test/advection/graphic/tests/rotate_refine1/graphics.gfs
+++ b/test/advection/graphic/tests/rotate_refine1/graphics.gfs
@@ -46,8 +46,7 @@ Isoline {
   r = 0 g = 0 b = 0
   shading = Constant
   maxlevel = -1
-} {
-  v = T
+} T {
   amin = 1
   amax = 1
   cmap = Jet
diff --git a/test/advection/graphic/tests/rotate_refine2/graphics.gfs b/test/advection/graphic/tests/rotate_refine2/graphics.gfs
index 6624cfb..fb08b56 100644
--- a/test/advection/graphic/tests/rotate_refine2/graphics.gfs
+++ b/test/advection/graphic/tests/rotate_refine2/graphics.gfs
@@ -46,8 +46,7 @@ Isoline {
   r = 0 g = 0 b = 0
   shading = Constant
   maxlevel = -1
-} {
-  v = T
+} T {
   amin = 1
   amax = 1
   cmap = Jet
diff --git a/test/advection/graphic/tests/translate1/graphics.gfs b/test/advection/graphic/tests/translate1/graphics.gfs
index 6ee922c..f78e1bc 100644
--- a/test/advection/graphic/tests/translate1/graphics.gfs
+++ b/test/advection/graphic/tests/translate1/graphics.gfs
@@ -46,8 +46,7 @@ Isoline {
   r = 0 g = 0 b = 0
   shading = Constant
   maxlevel = -1
-} {
-  v = T
+} T {
   amin = 1
   amax = 1
   cmap = Jet
diff --git a/test/advection/graphic/tests/translate2/graphics.gfs b/test/advection/graphic/tests/translate2/graphics.gfs
index 6ee922c..f78e1bc 100644
--- a/test/advection/graphic/tests/translate2/graphics.gfs
+++ b/test/advection/graphic/tests/translate2/graphics.gfs
@@ -46,8 +46,7 @@ Isoline {
   r = 0 g = 0 b = 0
   shading = Constant
   maxlevel = -1
-} {
-  v = T
+} T {
   amin = 1
   amax = 1
   cmap = Jet
diff --git a/test/advection/graphic/tests/translate3/graphics.gfs b/test/advection/graphic/tests/translate3/graphics.gfs
index 6ee922c..f78e1bc 100644
--- a/test/advection/graphic/tests/translate3/graphics.gfs
+++ b/test/advection/graphic/tests/translate3/graphics.gfs
@@ -46,8 +46,7 @@ Isoline {
   r = 0 g = 0 b = 0
   shading = Constant
   maxlevel = -1
-} {
-  v = T
+} T {
   amin = 1
   amax = 1
   cmap = Jet
diff --git a/test/advection/graphic/tests/translate6/graphics.gfs b/test/advection/graphic/tests/translate6/graphics.gfs
index 1b30709..5613a2e 100644
--- a/test/advection/graphic/tests/translate6/graphics.gfs
+++ b/test/advection/graphic/tests/translate6/graphics.gfs
@@ -46,8 +46,7 @@ Isoline {
   r = 0 g = 0 b = 0
   shading = Constant
   maxlevel = -1
-} {
-  v = T
+} T {
   amin = 1
   amax = 1
   cmap = Jet
diff --git a/test/advection/graphic/tests/translate7/graphics.gfs b/test/advection/graphic/tests/translate7/graphics.gfs
index 1b30709..5613a2e 100644
--- a/test/advection/graphic/tests/translate7/graphics.gfs
+++ b/test/advection/graphic/tests/translate7/graphics.gfs
@@ -46,8 +46,7 @@ Isoline {
   r = 0 g = 0 b = 0
   shading = Constant
   maxlevel = -1
-} {
-  v = T
+} T {
   amin = 1
   amax = 1
   cmap = Jet
diff --git a/test/advection/graphic/tests/translate8/graphics.gfs b/test/advection/graphic/tests/translate8/graphics.gfs
index 983ce27..6d57bac 100644
--- a/test/advection/graphic/tests/translate8/graphics.gfs
+++ b/test/advection/graphic/tests/translate8/graphics.gfs
@@ -56,8 +56,7 @@ Isoline {
   r = 0 g = 0 b = 0
   shading = Constant
   maxlevel = -1
-} {
-  v = T
+} T {
   amin = 1
   amax = 1
   cmap = Jet
diff --git a/test/advection/graphic/tests/translate_refine1/graphics.gfs b/test/advection/graphic/tests/translate_refine1/graphics.gfs
index af4758d..a6d6cff 100644
--- a/test/advection/graphic/tests/translate_refine1/graphics.gfs
+++ b/test/advection/graphic/tests/translate_refine1/graphics.gfs
@@ -56,8 +56,7 @@ Isoline {
   r = 0 g = 0 b = 0
   shading = Constant
   maxlevel = -1
-} {
-  v = T
+} T {
   amin = 1
   amax = 1
   cmap = Jet
diff --git a/test/euler/merging/vorticity.gfv b/test/euler/merging/vorticity.gfv
index 475e5ac..f438399 100644
--- a/test/euler/merging/vorticity.gfv
+++ b/test/euler/merging/vorticity.gfv
@@ -12,8 +12,7 @@ Isoline {
   r = 0 g = 0 b = 0
   shading = Constant
   maxlevel = 8
-} {
-  v = Vorticity
+} Vorticity {
   amin = 1
   amax = 1
   cmap = Jet
diff --git a/test/euler/spurious/vectors.gfv b/test/euler/spurious/vectors.gfv
index 8b226a4..f4c3cee 100644
--- a/test/euler/spurious/vectors.gfv
+++ b/test/euler/spurious/vectors.gfv
@@ -12,13 +12,11 @@ Vectors {
   r = 0 g = 0 b = 0
   shading = Constant
   maxlevel = 5
-} {
-  v = P
+} P {
   amin = 1
   amax = 1
   cmap = Jet
-} {
-  v = U
+} U V {
   scale = 0.2184
   use_scalar = 0
 }
@@ -26,8 +24,7 @@ Isoline {
   r = 0 g = 0 b = 0
   shading = Constant
   maxlevel = 5
-} {
-  v = T
+} T {
   amin = 1
   amax = 1
   cmap = Jet

-- 
Gerris Flow Solver