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

[Stephane Popinet]

The following commit has been merged in the upstream branch:
commit 8d87208c3e4c0fb182c84d331d543d4f6de88d94
Author: Stephane Popinet <s.popinet at niwa.co.nz>
Date:   Thu Sep 29 13:47:56 2005 +1000

    Updated capillary wave test
    
    darcs-hash:20050929034756-fbd8f-f3ff64ade63763933406190f22448df4c6c165e4.gz

diff --git a/test/euler/capwave/capwave.gfs b/test/euler/capwave/capwave.gfs
index 208abde..cde24ca 100644
--- a/test/euler/capwave/capwave.gfs
+++ b/test/euler/capwave/capwave.gfs
@@ -26,11 +26,12 @@
 # \end{center}
 # \caption{Convergence of the relative error between the analytical
 # solution and simulation results from various solvers.}
+# \label{convergence}
 # \end{table}
 #
 # \begin{figure}[htbp]
 # \begin{center}
-# \includegraphics[width=0.8\hsize]{amplitude.eps}
+# \includegraphics[width=\hsize]{amplitude.eps}
 # \end{center}
 # \caption{Evolution of the amplitude of the capillary wave as a
 # function of non-dimensional time $\tau=\omega_0 t$.}
diff --git a/test/euler/capwave/capwave.sh b/test/euler/capwave/capwave.sh
index 576f4bc..d1c9e10 100755
--- a/test/euler/capwave/capwave.sh
+++ b/test/euler/capwave/capwave.sh
@@ -56,7 +56,7 @@ if cat <<EOF | gnuplot ; then :
     set output 'amplitude.eps'
     set xlabel 'tau'
     set ylabel 'Relative amplitude'
-    plot 'prosperetti' w l t "Prosperetti", 'wave-5' every 10 w p t "Gerris"
+    plot 'prosperetti' w l t "Prosperetti", 'wave-7' every 10 w p t "Gerris"
 EOF
 else
     exit 1
diff --git a/test/euler/capwave/convergence.ref b/test/euler/capwave/convergence.ref
index 02fea89..0408d68 100644
--- a/test/euler/capwave/convergence.ref
+++ b/test/euler/capwave/convergence.ref
@@ -1,3 +1,5 @@
 3 0.427077
 4 0.255341
 5 0.0784345
+6 0.0184025
+7 0.00694846

-- 
Gerris Flow Solver