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

[Stephane Popinet]

The following commit has been merged in the upstream branch:
commit 8328e9b131403fffe4395dec8f02a449fa3d5771
Author: Stephane Popinet <popinet at users.sf.net>
Date:   Tue Jul 24 07:50:32 2007 +1000

    New test case for kinetic energy conservation in multiphase flows
    
    darcs-hash:20070723215032-d4795-8488100aeaa3367bb49641c798c134a8311b52c8.gz

diff --git a/test/Makefile.am b/test/Makefile.am
index 508ff22..6b087b5 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -18,7 +18,8 @@ TESTDIRS = \
 	plate \
 	dumbell \
 	nz \
-	shear
+	shear \
+	kinetic
 
 EXTRA_DIST = \
 	template.tex \
diff --git a/test/kinetic/kinetic.gfs b/test/kinetic/kinetic.gfs
new file mode 100644
index 0000000..f509cda
--- /dev/null
+++ b/test/kinetic/kinetic.gfs
@@ -0,0 +1,65 @@
+# Title: Momentum conservation for large density ratios
+#
+# Description:
+#
+# A dense droplet moves through a lighter background fluid. The
+# kinetic energy decreases due to viscous dissipation (Figure
+# \ref{k}). A previous non-conservative discretisation of the viscous
+# tensor was causing a non-physical increase in kinetic energy.
+#
+# \begin{figure}[htbp]
+# \caption{\label{k}Evolution of the kinetic energy.}
+# \begin{center}
+# \includegraphics[width=0.8\hsize]{k.eps}
+# \end{center}
+# \end{figure}
+#
+# Author: St\'ephane Popinet
+# Command: gerris2D kinetic.gfs
+# Version: 1.1.0
+# Required files: kinetic.gfs
+# Generated files: k.eps
+1 0 GfsSimulation GfsBox GfsGEdge {} {
+    Time { end = 0.5 }
+
+    Global {
+	#define rho(T) (T + 0.01*(1. - T))
+	#define level 7
+	#define radius 0.05
+    }
+
+    Refine level
+
+    ProjectionParams { tolerance = 1e-6 }
+    ApproxProjectionParams { tolerance = 1e-6 }
+
+    VariableTracerVOF T
+    InitFraction T (- ellipse(-0.3,0,radius,radius))
+    Init {} { U = T }
+
+    PhysicalParams { alpha = 1./rho(T) }
+    SourceViscosity (1e-3*T + 1e-5*(1. - T))
+
+    AdaptVorticity { istep = 1 } { cmax = 0.3 maxlevel = level }
+    AdaptGradient { istep = 1 } { cmax = 1e-3 maxlevel = level } T
+
+    OutputScalarSum { istep = 1 } k { v = Velocity2*rho(T) }
+    OutputScalarSum { istep = 1 } t { v = T }
+
+    EventScript { start = end } {
+	gnuplot <<EOF
+            set term postscript eps color lw 3 solid 20
+            set output 'k.eps'
+            set xlabel 'Time'
+            set ylabel 'Kinetic energy'
+            set grid
+            plot 'k' u 3:5 w l t ''
+EOF
+	if awk '{if ($5 > 8e-3) exit (1);}' < k ; then
+	    return 0;
+	else
+	    return $GFS_STOP;
+	fi
+    } 
+}
+GfsBox {}
diff --git a/test/template.tex b/test/template.tex
index eac3227..24f0240 100644
--- a/test/template.tex
+++ b/test/template.tex
@@ -58,6 +58,7 @@ current stable branch of the version-controlled source code.
 
 \input{lid/lid.tex}
 \input{couette/couette.tex}
+\input{kinetic/kinetic.tex}
 
 \section{Solid boundaries}
 

-- 
Gerris Flow Solver