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

[Stephane Popinet]

The following commit has been merged in the upstream branch:
commit 100b8bcede306261d4343995fc51754c8e970a23
Author: Stephane Popinet <popinet at users.sf.net>
Date:   Sat Sep 8 16:09:40 2007 +1000

    Fixed boundary conditions for boussinesq example
    
    As pointed out by Phil Rubini, the previous boundary conditions were
    misleading: they were equivalent to flow in a closed box rather than the
    expected vertical open channel.
    
    darcs-hash:20070908060940-d4795-55bfbbdfba5de8f7e020d0b90f9e265b287150c1.gz

diff --git a/THANKS b/THANKS
index 42adeb3..434f0e3 100644
--- a/THANKS
+++ b/THANKS
@@ -7,3 +7,4 @@ David Sterling
 Frank Griessbaum
 Ben Moat
 Vladimir Kolobov
+Philip Rubini
diff --git a/doc/examples/boussinesq/boussinesq.gfs b/doc/examples/boussinesq/boussinesq.gfs
index cbb7321..23b5022 100644
--- a/doc/examples/boussinesq/boussinesq.gfs
+++ b/doc/examples/boussinesq/boussinesq.gfs
@@ -24,7 +24,7 @@
 #
 # Author: St\'ephane Popinet
 # Command: gerris2D boussinesq.gfs | gfsview2D boussinesq.gfv | ppm2mpeg > t.mpg
-# Version: 0.6.4
+# Version: 1.1.0
 # Required files: cylinder.gts boussinesq.gfv
 # Running time: 60 minutes
 # Generated files: t.mpg t.eps
@@ -36,16 +36,17 @@
   RefineSolid 8
 
   # Insert the solid boundary defined by cylinder.gts
-  Solid cylinder.gts
+  # shift the cylinder vertically
+  Solid cylinder.gts { ty = 0.25 }
 
   # Add a passive tracer called T
-  VariableTracer {} T
+  VariableTracer T
 
   # Add diffusion to tracer T
-  SourceDiffusion {} T 0.0001
+  SourceDiffusion T 0.0001
  
   # Add a source term to the vertical velocity component equal to T
-  Source {} V T
+  Source V T
 
   # Dirichlet boundary condition for T on the cylinder
   SurfaceBc T Dirichlet 1
@@ -85,7 +86,8 @@
   # At the end of the simulation this file is converted to EPS.
   EventScript { start = end } { convert -colors 256 t.ppm t.eps ; rm -f t.ppm }
 }
-GfsBox {}
+# The bottom boundary will also allow inflow (despite its name)
+GfsBox { bottom = BoundaryOutflow }
 GfsBox {}
 # The top boundary is a simple outflow condition. This could cause problems
 # (eddies getting stuck on the boundary) if the adaptive "sponge" layer was not
diff --git a/doc/examples/boussinesq/boussinesq.gfv b/doc/examples/boussinesq/boussinesq.gfv
index 0e3c7ff..ba52f2f 100644
--- a/doc/examples/boussinesq/boussinesq.gfv
+++ b/doc/examples/boussinesq/boussinesq.gfv
@@ -1,8 +1,9 @@
 # GfsView 2D
 View {
-  tx = 0. ty = -1.
+  tx = 0 ty = -0.5
+  sx = 1 sy = 1 sz = 1
   q0 = 0 q1 = 0 q2 = 0 q3 = 1
-  fov = 40
+  fov = 25.9274
   r = 0.3 g = 0.4 b = 0.6
   res = 1
   lc = 0.001

-- 
Gerris Flow Solver