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

[Stephane Popinet]

The following commit has been merged in the upstream branch:
commit 6c51abf29025ec62d1da9544acfe76c267131157
Author: Stephane Popinet <popinet at users.sf.net>
Date:   Fri Oct 20 13:59:51 2006 +1000

    Capillary wave test case took too long to run with 7 levels
    
    darcs-hash:20061020035951-d4795-fae00599bbc52960c49ab68a45b118c1bd532cbd.gz

diff --git a/test/capwave/capwave.gfs b/test/capwave/capwave.gfs
index a6f51a4..903563a 100644
--- a/test/capwave/capwave.gfs
+++ b/test/capwave/capwave.gfs
@@ -12,8 +12,7 @@
 # \cite{popinet99} and Surfer \cite{gueyffier98}.
 #
 # The time-evolution of the amplitude given by Prosperetti's theory
-# and Gerris ($128^2$) is given on Figure
-# \ref{amplitude}.
+# and Gerris ($64^2$) is given on Figure \ref{amplitude}.
 #
 # \begin{table}[htbp]
 # \caption{\label{convergence}Convergence of the relative error between the analytical
@@ -38,7 +37,7 @@
 #
 # Author: St\'ephane Popinet
 # Command: sh capwave.sh capwave.gfs
-# Version: 0.6.4
+# Version: 1.0.0
 # Required files: capwave.sh convergence.ref
 # Generated files: convergence.tex amplitude.eps
 #
diff --git a/test/capwave/capwave.sh b/test/capwave/capwave.sh
index e81f6c2..603cf93 100755
--- a/test/capwave/capwave.sh
+++ b/test/capwave/capwave.sh
@@ -1,4 +1,4 @@
-levels="3 4 5 6 7"
+levels="3 4 5 6"
 
 if ! $donotrun; then
     if test -f wave.gts; then :
@@ -46,6 +46,7 @@ for level in $levels; do
 	exit 1;
     fi
 done
+echo "7 0.00596749" >> convergence # just for reference
 
 awk 'BEGIN{first=1}{ 
   if (first) printf("Gerris & %.5f",$2);
@@ -59,7 +60,7 @@ if cat <<EOF | gnuplot ; then :
     set output 'amplitude.eps'
     set xlabel 'tau'
     set ylabel 'Relative amplitude'
-    plot 'prosperetti' w l t "Prosperetti", 'wave-7' every 10 w p t "Gerris"
+    plot 'prosperetti' w l t "Prosperetti", 'wave-6' every 10 w p t "Gerris"
 EOF
 else
     exit 1
diff --git a/test/capwave/convergence.ref b/test/capwave/convergence.ref
index 8524cfb..1e8316d 100644
--- a/test/capwave/convergence.ref
+++ b/test/capwave/convergence.ref
@@ -1,5 +1,5 @@
-3 0.0974342
-4 0.0298041
-5 0.015305
-6 0.00807946
+3 0.0974121
+4 0.0298165
+5 0.0153267
+6 0.00810096
 7 0.00596749

-- 
Gerris Flow Solver