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

[Stephane Popinet]

The following commit has been merged in the upstream branch:
commit 00286ac02aa3a60dc67a590be6c7cb97fdd7436e
Author: Stephane Popinet <s.popinet at niwa.co.nz>
Date:   Fri Apr 8 10:29:07 2005 +1000

    Added Boussinesq example to doc
    
    darcs-hash:20050408002907-fbd8f-e2ee7de26eaff420dc7d6372942049329e44b63c.gz

diff --git a/doc/examples/Makefile.am b/doc/examples/Makefile.am
index f5b23a9..27fa5ec 100644
--- a/doc/examples/Makefile.am
+++ b/doc/examples/Makefile.am
@@ -3,7 +3,8 @@
 EXAMPLES = \
 	cylinder \
 	lid \
-	shear
+	shear \
+	boussinesq
 
 EXTRA_DIST = \
 	template.tex \
diff --git a/doc/examples/boussinesq/boussinesq.gfs b/doc/examples/boussinesq/boussinesq.gfs
index b4d2c0e..d60cd76 100644
--- a/doc/examples/boussinesq/boussinesq.gfs
+++ b/doc/examples/boussinesq/boussinesq.gfs
@@ -1,4 +1,4 @@
-# Title: Boussinesq approximation applied to a heated cylinder
+# Title: Boussinesq flow generated by a heated cylinder
 #
 # Description:
 #
@@ -9,7 +9,7 @@
 # vertical component of the velocity field.
 #
 # Adaptivity is used to generate a "sponge" outflow condition on the
-# top boundary
+# top boundary.
 #
 # The turbulent plume obtained is illustrated on Figure \ref{tracer}.
 #
@@ -25,14 +25,14 @@
 # Command: gerris2D boussinesq.gfs
 # Version: 0.6.4
 # Required files: cylinder.gts
-# Running time: 22 minutes
+# Running time: 60 minutes
 # Generated files: t.mpg t.eps
 #
 2 1 GfsSimulation GfsBox GfsGEdge {} {
   Time { end = 20 }
 
-  # Use an initial refinement of 7 levels around the solid boundary
-  RefineSolid 7
+  # Use an initial refinement of 8 levels around the solid boundary
+  RefineSolid 8
 
   # Insert the solid boundary defined by cylinder.gts
   GtsSurfaceFile cylinder.gts
@@ -50,14 +50,14 @@
   SurfaceBc T Dirichlet 1
 
   # Adapt the mesh using the vorticity criterion at every timestep
-  # down to a maximum level of 7 if y is smaller than 1.25, 3 otherwise.
+  # down to a maximum level of 8 if y is smaller than 1.25, 3 otherwise.
   # The topmost part of the domain will never have more than
   # 3 levels of refinement and will act as a very efficient "sponge"
   # layer to damp any eddies before they exit the domain.
-  AdaptVorticity { istep = 1 } { maxlevel = (y > 1.25 ? 3 : 7) cmax = 1e-2 }
+  AdaptVorticity { istep = 1 } { maxlevel = (y > 1.25 ? 3 : 8) cmax = 1e-2 }
 
   # Also adapt according to the tracer gradient
-  AdaptGradient { istep = 1 } { maxlevel = 7 cmax = 5e-2 } T
+  AdaptGradient { istep = 1 } { maxlevel = 8 cmax = 5e-2 } T
 
   # Writes the time and timestep every 10 timesteps on standard error
   OutputTime { istep = 10 } stderr
diff --git a/doc/examples/template.tex b/doc/examples/template.tex
index 3a0780d..194fc88 100644
--- a/doc/examples/template.tex
+++ b/doc/examples/template.tex
@@ -35,7 +35,7 @@ Gerris parameter files are commented and cross-linked with the \htmladdnormallin
 
 The indicative running times given are representative of the running time on an Intel 2.4 GHz processor.
 
-The usefulness and quality of this document very much depend on the contributions of users. If you think you have used Gerris in an interesting way which is not already covered by the existing examples, you are very welcome to contribute. Have a look at section \ref{howto} for instructions on how to do that.
+The usefulness and quality of this document very much depend on the contributions of users. If you think you have used Gerris in an interesting way which is not already covered by the existing examples, you are very welcome to contribute. Have a look at section \ref{howto} for instructions on how to do so.
 
 \section{2D}
 
@@ -43,6 +43,7 @@ The usefulness and quality of this document very much depend on the contribution
 \input{cylinder/heated/heated.tex}
 \input{lid/lid.tex}
 \input{shear/shear.tex}
+\input{boussinesq/boussinesq.tex}
 
 \section{How to write examples}
 \label{howto}

-- 
Gerris Flow Solver