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

[Stephane Popinet]

The following commit has been merged in the upstream branch:
commit ece15c4543f88d3aa9b1a4f08804e5d7b682f58e
Author: Stephane Popinet <s.popinet at niwa.co.nz>
Date:   Fri Jun 17 15:53:32 2005 +1000

    merging test uses batch-mode gfsview for figure generation
    
    darcs-hash:20050617055332-fbd8f-889aaf243e3de4d9bbcdc5c59b86ac3bde1c9002.gz

diff --git a/test/euler/merging/merging.gfs b/test/euler/merging/merging.gfs
index d091444..98a3697 100644
--- a/test/euler/merging/merging.gfs
+++ b/test/euler/merging/merging.gfs
@@ -102,7 +102,7 @@
 # Generated files: convergence.tex tv_0_05.eps tm_0_05.eps tv_0_15.eps tm_0_15.eps tv_0_25.eps tm_0_25.eps
 #
 1 0 GfsSimulation GfsBox GfsGEdge {} {
-  Time { end = 0.3 }
+  Time { end = 0.25 }
   AdvectionParams { cfl = 0.9 }
   ApproxProjectionParams { tolerance = 1e-5 }
   ProjectionParams { tolerance = 1e-5 }
diff --git a/test/euler/merging/merging.sh b/test/euler/merging/merging.sh
index e2ba918..a63fe14 100644
--- a/test/euler/merging/merging.sh
+++ b/test/euler/merging/merging.sh
@@ -1,7 +1,7 @@
 if ! $donotrun; then
     if sed "s/LEVEL/8/g" < $1 | \
        sed "s/SIM/sim-8/g" | \
-       gerris2D - | gfsview2D; then :
+       gerris2D - | gfsview-batch2D; then :
     else
 	exit 1
     fi

-- 
Gerris Flow Solver