[SCM] Gerris Flow Solver branch, upstream, updated. b3aa46814a06c9cb2912790b23916ffb44f1f203
Stephane Popinet
popinet at users.sf.net
Fri May 15 02:54:28 UTC 2009
The following commit has been merged in the upstream branch:
commit 1f5291a48cc1f2652dc9369a299b97693d4fe696
Author: Stephane Popinet <popinet at users.sf.net>
Date: Wed May 30 12:53:30 2007 +1000
Capillary wave test case uses a larger domain aspect ratio
This improves the convergence significantly and the results
compare well with those of Gerlach et al (added in the biblio).
darcs-hash:20070530025330-d4795-06d42d7b45d192216dba7af4e656068c3df04768.gz
diff --git a/test/capwave/capwave.gfs b/test/capwave/capwave.gfs
index a23d3f0..1c3e2c6 100644
--- a/test/capwave/capwave.gfs
+++ b/test/capwave/capwave.gfs
@@ -7,9 +7,13 @@
# initial value problem in the limit of a vanishingly small initial
# amplitude.
#
-# Table \ref{convergence} shows the convergence of various
-# solvers as a function of resolution: Gerris, the marker technique of
-# \cite{popinet99} and Surfer \cite{gueyffier98}.
+# The domain size is 1x3 units, large enough to minimise the effect of
+# boundaries (Prosperetti's theory is valid for infinite domains).
+#
+# Table \ref{convergence} shows the convergence of various solvers as
+# a function of resolution: Gerris, the marker technique of
+# \cite{popinet99}, Surfer \cite{gueyffier98}, PROST and CLSVOF
+# \cite{gerlach2006}.
#
# The time-evolution of the amplitude given by Prosperetti's theory
# and Gerris ($64^2$) is given on Figure \ref{amplitude}.
@@ -20,9 +24,11 @@
# \begin{center}
# \begin{tabular}{|l|ccccc|} \hline
# Method & $8^2$ & $16^2$ & $32^2$ & $64^2$ & $128^2$ \\ \hline
-# \input{convergence.tex} & 0.00598128 \\
+# \input{convergence.tex} & 0.000545 \\
# Markers & 0.3018 & 0.0778 & 0.0131 & 0.0082 & 0.00645 \\
-# Surfer & - & - & 0.1168 & 0.0132 & 0.007 \\ \hline
+# Surfer & - & - & 0.1168 & 0.0132 & 0.007 \\
+# PROST & 0.2960 & 0.0818 & 0.0069 & 0.0018 \\
+# CLSVOF & 0.3169 & 0.0991 & 0.0131 & 0.0033 \\ \hline
# \end{tabular}
# \end{center}
# \end{table}
@@ -37,25 +43,33 @@
#
# Author: St\'ephane Popinet
# Command: sh capwave.sh capwave.gfs
-# Version: 1.0.0
+# Version: 1.1.0
# Required files: capwave.sh convergence.ref prosperetti
# Generated files: convergence.tex amplitude.eps
#
-1 1 GfsSimulation GfsBox GfsGEdge {} {
+3 5 GfsSimulation GfsBox GfsGEdge {} {
Time { end = 2.2426211256 }
ApproxProjectionParams { tolerance = 1e-6 }
ProjectionParams { tolerance = 1e-6 }
- Refine LEVEL
- VariableTracerVOF {} T
- VariableCurvature {} K T
- SourceTension {} T 1 K
- VariablePosition {} Y T y
- SourceDiffusion {} U 0.0182571749236
- SourceDiffusion {} V 0.0182571749236
- InitFraction {} T (y - 0.01*cos (2.*M_PI*x))
+ # Decrease the resolution linearly down to 3 levels close to the
+ # bottom and top boundaries
+ Refine floor(LEVEL + 1 - (LEVEL - 2)*fabs(y)/1.5)
+ VariableTracerVOF T
+ VariableCurvature K T
+ SourceTension T 1 K
+ VariablePosition Y T y
+ SourceDiffusion U 0.0182571749236
+ SourceDiffusion V 0.0182571749236
+ InitFraction T (y - 0.01*cos (2.*M_PI*x))
OutputScalarNorm { step = 3.04290519077e-3 } {
awk '{printf ("%g %g\n", $3*11.1366559937, $9); fflush(stdout); }' > wave-LEVEL
} { v = (T > 0. && T < 1. ? Y : 0.) }
}
GfsBox {}
+GfsBox {}
+GfsBox {}
1 1 right
+2 2 right
+3 3 right
+1 2 top
+1 3 bottom
diff --git a/test/capwave/convergence.ref b/test/capwave/convergence.ref
index 4e1f174..9add6a5 100644
--- a/test/capwave/convergence.ref
+++ b/test/capwave/convergence.ref
@@ -1,4 +1,4 @@
-3 0.14274
-4 0.0198192
-5 0.00909905
-6 0.00491347
+3 0.139537
+4 0.0159549
+5 0.00857513
+6 0.00150965
diff --git a/test/capwave/density/convergence.ref b/test/capwave/density/convergence.ref
index 6914822..e034127 100644
--- a/test/capwave/density/convergence.ref
+++ b/test/capwave/density/convergence.ref
@@ -1,4 +1,4 @@
-3 0.136915
-4 0.034064
-5 0.00570098
-6 0.00368321
+3 0.135146
+4 0.030382
+5 0.00394061
+6 0.00132384
diff --git a/test/capwave/density/density.gfs b/test/capwave/density/density.gfs
index f998828..342a631 100644
--- a/test/capwave/density/density.gfs
+++ b/test/capwave/density/density.gfs
@@ -18,7 +18,7 @@
# \begin{center}
# \begin{tabular}{|l|ccccc|} \hline
# Method & $8^2$ & $16^2$ & $32^2$ & $64^2$ & $128^2$ \\ \hline
-# \input{convergence.tex} & 0.00447631 \\
+# \input{convergence.tex} & 0.001155 \\
# Markers & 0.3593 & 0.1397 & 0.0566 & 0.0264 & 0.0148 \\
# Surfer & - & - & 0.1233 & 0.0300 & 0.0254 \\ \hline
# \end{tabular}
@@ -35,26 +35,32 @@
#
# Author: St\'ephane Popinet
# Command: sh ../capwave.sh density.gfs
-# Version: 1.0.0
+# Version: 1.1.0
# Required files: convergence.ref prosperetti
# Generated files: convergence.tex amplitude.eps
#
-1 1 GfsSimulation GfsBox GfsGEdge {} {
+3 5 GfsSimulation GfsBox GfsGEdge {} {
Time { end = 1.66481717925811447992 }
ApproxProjectionParams { tolerance = 1e-6 }
ProjectionParams { tolerance = 1e-6 }
- Refine LEVEL
- VariableTracerVOF {} T
- VariableCurvature {} K T
- SourceTension {} T 1 K
- VariablePosition {} Y T y
- SourceDiffusion {} U 0.0182571749236
- SourceDiffusion {} V 0.0182571749236
+ Refine floor(LEVEL + 1 - (LEVEL - 2)*fabs(y)/1.5)
+ VariableTracerVOF T
+ VariableCurvature K T
+ SourceTension T 1 K
+ VariablePosition Y T y
+ SourceDiffusion U 0.0182571749236
+ SourceDiffusion V 0.0182571749236
PhysicalParams { alpha = 1./(T + 0.1*(1. - T)) }
- InitFraction {} T (y - 0.01*cos (2.*M_PI*x))
+ InitFraction T (y - 0.01*cos (2.*M_PI*x))
OutputScalarNorm { step = .00225584983639310905 } {
awk '{printf ("%g %g\n", $3*15.016663878457, $9); fflush(stdout); }' > wave-LEVEL
} { v = (T > 0. && T < 1. ? Y : 0.) }
}
GfsBox {}
+GfsBox {}
+GfsBox {}
1 1 right
+2 2 right
+3 3 right
+1 2 top
+1 3 bottom
diff --git a/test/tests.bib b/test/tests.bib
index 8709b36..9f43322 100644
--- a/test/tests.bib
+++ b/test/tests.bib
@@ -37,6 +37,15 @@
address = {Montreal}
}
+ at article{gerlach2006,
+ author = {D. Gerlach and G. Tomar and G. Biswas and F. Durst},
+ title = {Comparison of surface tension methods for surface tension dominant two-phase flows},
+ journal = {Int. J. Heat Mass Transfer},
+ year = 2006,
+ pages= {740-754},
+ volume= 49
+}
+
@Article{ghia82,
author = {U. Ghia, K.N. Ghia, C.T. Shin},
title = {High-{R}e solution for incompressible flow using the {N}avier-{S}tokes equations and the multigrid method},
--
Gerris Flow Solver
More information about the debian-science-commits
mailing list