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

Stephane Popinet popinet at users.sf.net
Fri May 15 02:54:00 UTC 2009


The following commit has been merged in the upstream branch:
commit f182175286db1a22667a641b70a96eddfc73bd35
Author: Stephane Popinet <popinet at users.sf.net>
Date:   Fri Mar 2 07:10:36 2007 +1100

    Updated surface tension test cases
    
    darcs-hash:20070301201036-d4795-90a9f2cc5ca196bc596a49b9c70a0e20b749bd9a.gz

diff --git a/test/capwave/convergence.ref b/test/capwave/convergence.ref
index 6a58d89..de89be7 100644
--- a/test/capwave/convergence.ref
+++ b/test/capwave/convergence.ref
@@ -1,4 +1,4 @@
-3 0.142603
-4 0.0198773
-5 0.00919392
-6 0.0049466
+3 0.142727
+4 0.0198798
+5 0.00918059
+6 0.00494779
diff --git a/test/capwave/density/convergence.ref b/test/capwave/density/convergence.ref
index 17f08af..99bbd24 100644
--- a/test/capwave/density/convergence.ref
+++ b/test/capwave/density/convergence.ref
@@ -1,4 +1,4 @@
-3 0.136862
-4 0.0340423
-5 0.0057585
-6 0.00371331
+3 0.136917
+4 0.0340935
+5 0.00576382
+6 0.00371567
diff --git a/test/capwave/density/density.gfs b/test/capwave/density/density.gfs
index 8e01a75..f105723 100644
--- a/test/capwave/density/density.gfs
+++ b/test/capwave/density/density.gfs
@@ -13,6 +13,8 @@
 # and Gerris ($64^2$) is given on Figure \ref{amplitude}.
 #
 # \begin{table}[htbp]
+# \caption{\label{convergence}Convergence of the relative error between the analytical
+# solution and simulation results from various solvers.}
 # \begin{center}
 # \begin{tabular}{|l|ccccc|} \hline
 # Method & $8^2$ & $16^2$ & $32^2$ & $64^2$ & $128^2$ \\ \hline
@@ -21,18 +23,14 @@
 # Surfer & - & - & 0.1233 & 0.0300 & 0.0254 \\ \hline
 # \end{tabular}
 # \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]
+# \caption{\label{amplitude}Evolution of the amplitude of the capillary wave as a
+# function of non-dimensional time $\tau=\omega_0 t$.}
 # \begin{center}
 # \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$.}
-# \label{amplitude}
 # \end{figure}
 #
 # Author: St\'ephane Popinet
diff --git a/test/capwave/gravity/convergence.ref b/test/capwave/gravity/convergence.ref
index a11dab6..6c8c913 100644
--- a/test/capwave/gravity/convergence.ref
+++ b/test/capwave/gravity/convergence.ref
@@ -1,4 +1,4 @@
-3 0.126888
-4 0.0257742
-5 0.0046936
-6 0.00640302
+3 0.126979
+4 0.0257422
+5 0.00469298
+6 0.00641083
diff --git a/test/capwave/gravity/gravity.gfs b/test/capwave/gravity/gravity.gfs
index aa58b34..e6894e6 100644
--- a/test/capwave/gravity/gravity.gfs
+++ b/test/capwave/gravity/gravity.gfs
@@ -10,24 +10,22 @@
 # and Gerris ($64^2$) is given on Figure \ref{amplitude}.
 #
 # \begin{table}[htbp]
+# \caption{\label{convergence}Convergence of the relative error between the analytical
+# solution and simulation results.}
 # \begin{center}
 # \begin{tabular}{|l|ccccc|} \hline
 # Method & $8^2$ & $16^2$ & $32^2$ & $64^2$ & $128^2$ \\ \hline
 # \input{convergence.tex} & 0.00417707 \\
 # \end{tabular}
 # \end{center}
-# \caption{Convergence of the relative error between the analytical
-# solution and simulation results.}
-# \label{convergence}
 # \end{table}
 #
 # \begin{figure}[htbp]
+# \caption{\label{amplitude}Evolution of the amplitude of the gravity wave as a
+# function of non-dimensional time $\tau=\omega_0 t$.}
 # \begin{center}
 # \includegraphics[width=\hsize]{amplitude.eps}
 # \end{center}
-# \caption{Evolution of the amplitude of the gravity wave as a
-# function of non-dimensional time $\tau=\omega_0 t$.}
-# \label{amplitude}
 # \end{figure}
 #
 # Author: St\'ephane Popinet
diff --git a/test/spurious/convergence.ref b/test/spurious/convergence.ref
index 93aa9f6..2ec27af 100644
--- a/test/spurious/convergence.ref
+++ b/test/spurious/convergence.ref
@@ -1,4 +1,4 @@
-12.8 3.764e-04 4.281e-03
-25.6 6.508e-05 8.585e-04
-51.2 2.180e-05 3.917e-04
-102.4 5.954e-06 1.794e-04
+12.8 3.752e-04 4.243e-03
+25.6 6.877e-05 9.211e-04
+51.2 2.062e-05 3.736e-04
+102.4 5.996e-06 1.609e-04

-- 
Gerris Flow Solver



More information about the debian-science-commits mailing list