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

[Stephane Popinet]

The following commit has been merged in the upstream branch:
commit a33bc12231afe876f11743bf3246285e5396484c
Author: Stephane Popinet <s.popinet at niwa.co.nz>
Date:   Fri Jul 8 07:31:32 2005 +1000

    Minor layout changes for merging test
    
    darcs-hash:20050707213132-fbd8f-363febd58722ccd287e79977e1965c44da5d0e12.gz

diff --git a/test/euler/merging/levels.gfv b/test/euler/merging/levels.gfv
index 84f69dd..15c2416 100644
--- a/test/euler/merging/levels.gfv
+++ b/test/euler/merging/levels.gfv
@@ -8,13 +8,12 @@ View {
   lc = 0.001
   reactivity = 0.1
 }
-Boundaries {
-  r = 0 g = 0 b = 0
-  shading = Constant
-  maxlevel = 8
-}
-Levels {
+Squares {
   r = 0 g = 0 b = 0
   shading = Constant
   maxlevel = 8
+} Level {
+  amin = 1
+  amax = 1
+  cmap = Jet
 }
diff --git a/test/euler/merging/merging.gfs b/test/euler/merging/merging.gfs
index 98a3697..83681b2 100644
--- a/test/euler/merging/merging.gfs
+++ b/test/euler/merging/merging.gfs
@@ -88,9 +88,7 @@
 # \end{tabular}
 # \end{center}
 # \caption{Contour plots of vorticity (left) and adaptive grids used
-# (right) for the four-way vortex merging calculation. The lines on the
-# pictures in the right column represent the boundaries between levels
-# of refinement (with a maximum of $L=8$ levels).}
+# (right) for the four-way vortex merging calculation.}
 # \label{vorticity}
 # \end{figure}
 #

-- 
Gerris Flow Solver