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

[Stephane Popinet]

The following commit has been merged in the upstream branch:
commit 6ba5ad0388d2161ad7799941f7a6aebfeaccd5d6
Author: Stephane Popinet <popinet at users.sf.net>
Date:   Wed Feb 27 09:20:27 2008 +1100

    Updated test cases for surface tension/advection bug fix
    
    darcs-hash:20080226222027-d4795-e5ddc83f0d29509337516dc35efbee72cd7cfdfd.gz

diff --git a/test/capwave/convergence.ref b/test/capwave/convergence.ref
index 8d31eba..343d160 100644
--- a/test/capwave/convergence.ref
+++ b/test/capwave/convergence.ref
@@ -1,4 +1,4 @@
-3 0.156762
-4 0.0279115
-5 0.00837514
-6 0.00175843
+3 0.15676
+4 0.0279078
+5 0.00837283
+6 0.00175816
diff --git a/test/capwave/density/convergence.ref b/test/capwave/density/convergence.ref
index 3ab1b9b..4d74c1b 100644
--- a/test/capwave/density/convergence.ref
+++ b/test/capwave/density/convergence.ref
@@ -1,4 +1,4 @@
-3 0.146111
-4 0.0426201
-5 0.00485583
-6 0.00137153
+3 0.146108
+4 0.0426125
+5 0.00485401
+6 0.00137201
diff --git a/test/capwave/gravity/convergence.ref b/test/capwave/gravity/convergence.ref
index b8e4706..824917c 100644
--- a/test/capwave/gravity/convergence.ref
+++ b/test/capwave/gravity/convergence.ref
@@ -1,4 +1,4 @@
-3 0.152323
-4 0.031806
-5 0.0058712
-6 0.00651419
+3 0.152469
+4 0.0317992
+5 0.00582506
+6 0.00637091
diff --git a/test/oscillation/fit.ref b/test/oscillation/fit.ref
index bf1979a..5f6eb98 100644
--- a/test/oscillation/fit.ref
+++ b/test/oscillation/fit.ref
@@ -1,4 +1,4 @@
-5 0.000253439586779813 4.05559929906155 150.384464227908
-6 0.000277017222741231 3.14566630347144 152.62444664375
-7 0.00028917813747911 2.36731121163466 154.305213083329
-8 0.000291368437147205 1.64531453172308 154.450051764667
+5 0.000276999431075634 1.8328639219391 149.983301199523
+6 0.000283186934138563 0.601390295277781 152.706548164641
+7 0.000286882677104538 0.169625240086736 154.257565107163
+8 0.000288099488932086 0.0248770726110566 154.588097987697
diff --git a/test/oscillation/oscillation.gfs b/test/oscillation/oscillation.gfs
index a0a1a25..1b59d0b 100644
--- a/test/oscillation/oscillation.gfs
+++ b/test/oscillation/oscillation.gfs
@@ -12,9 +12,7 @@
 #
 # This simulation is also a stringent test case of the accuracy of the
 # surface tension representation as no explicit viscosity can damp
-# eventual parasitic currents. Onset of parasitic-current-driven
-# instability can be seen on the coarsest mesh (in Figure \ref{kinetic}
-# for $t>0.5$ the kinetic energy behaves strangely for the 32x32 resolution).
+# eventual parasitic currents.
 #
 # \begin{figure}[htbp]
 # \caption{\label{kinetic}Evolution of the kinetic energy as a function
@@ -63,7 +61,7 @@
 #
 # Author: St\'ephane Popinet
 # Command: sh oscillation.sh
-# Version: 1.1.1
+# Version: 1.2.0
 # Required files: oscillation.sh fit.ref
 # Running time: 3 minutes
 # Generated files: frequency.eps k.eps laplace.eps
@@ -75,7 +73,6 @@ Define RHO(T)            VAR(T, 1., 1e-3)
 Define RADIUS(x,y)      (DIAMETER/2.*(1. + EPSILON*cos (2.*atan2 (y, x))))
 
 1 0 GfsSimulation GfsBox GfsGEdge {} {
-
     Time { end = 1 }
 
     Refine LEVEL
@@ -88,6 +85,11 @@ Define RADIUS(x,y)      (DIAMETER/2.*(1. + EPSILON*cos (2.*atan2 (y, x))))
     VariableCurvature K T
     SourceTension T 1. K
 
+    # fixme: A small amount of viscosity seems to be necessary to
+    # obtain a non-increasing kinetic energy at high-resolution (8
+    # levels).
+    SourceViscosityExplicit 7e-5*RHO(T1)
+
     AdaptFunction { istep = 1 } {
         cmax = 0.01
         maxlevel = LEVEL
diff --git a/test/oscillation/oscillation.sh b/test/oscillation/oscillation.sh
index c02858d..b2ab535 100644
--- a/test/oscillation/oscillation.sh
+++ b/test/oscillation/oscillation.sh
@@ -35,18 +35,22 @@ if cat <<EOF | gnuplot ; then :
     set xlabel 'Time'
     set ylabel 'Kinetic energy'
     set logscale y
-    plot [0:1][1e-5:]'k-8' u 3:5 t "256x256" w l, 'k-7' u 3:5 t "128x128" w l, 'k-6' u 3:5 t "64x64" w l, 'k-5' u 3:5 t "32x32" w l, 'fit-8' t "fit" w l lt 7, 'fit-7' t "" w l lt 7, 'fit-6' t "" w l lt 7, 'fit-5' t "" w l lt 7
+    plot [0:1][8e-5:]'k-8' u 3:5 t "256x256" w l, 'k-7' u 3:5 t "128x128" w l, 'k-6' u 3:5 t "64x64" w l, 'k-5' u 3:5 t "32x32" w l, 'fit-8' t "fit" w l lt 7, 'fit-7' t "" w l lt 7, 'fit-6' t "" w l lt 7, 'fit-5' t "" w l lt 7
 
     set output 'laplace.eps'
     set xlabel 'Diameter (grid points)'
     set ylabel 'Equivalent Laplace number'
-    unset logscale
+    set logscale y
+    set logscale x 2
+    set grid
     empirical_constant = 30.
     plot 'fit' u (D*2.**(\$1)):(1./(\$3**2.*D**3.))*empirical_constant**2. t "" w lp pt 5 ps 2
 
+    unset logscale
     set output 'frequency.eps'
     set xlabel 'Diameter (grid points)'
     set ylabel 'Frequency error (%)'
+    unset grid
     set xzeroaxis
     plot 'fit' u (D*2.**(\$1)):(\$4/2./omega0-1.)*100. t "" w lp pt 5 ps 2
 

-- 
Gerris Flow Solver