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

[Stephane Popinet]

The following commit has been merged in the upstream branch:
commit 055196e63dd57b93ae707a84443f6091fd71824b
Author: Stephane Popinet <popinet at users.sf.net>
Date:   Wed Oct 18 14:02:13 2006 +1000

    Updated capillary wave test case
    
    darcs-hash:20061018040213-d4795-09cb9fc2ee1831a794b1f129df01f8c860b77725.gz

diff --git a/test/capwave/capwave.gfs b/test/capwave/capwave.gfs
index 9acc55e..af74acf 100644
--- a/test/capwave/capwave.gfs
+++ b/test/capwave/capwave.gfs
@@ -43,10 +43,7 @@
 # Generated files: convergence.tex amplitude.eps
 #
 1 1 GfsSimulation GfsBox GfsGEdge {} {
-  Time {
-    end = 2.2426211256
-    dtmax = 1.01430173026e-3
-  }
+  Time { end = 2.2426211256 }
   ApproxProjectionParams { tolerance = 1e-6 }
   ProjectionParams { tolerance = 1e-6 }
   Refine LEVEL
@@ -57,8 +54,8 @@
   SourceDiffusion {} U 0.0182571749236
   SourceDiffusion {} V 0.0182571749236
   InitFraction {} T wave.gts
-  OutputSimulation { istep = 3 } sim-%ld.gfs { binary = 1 }
-  EventScript { istep = 3 } {
+  OutputSimulation { step = 3.04290519077e-3 } sim-%ld.gfs { binary = 1 }
+  EventScript { step = 3.04290519077e-3 } {
     echo $GfsTime | awk -v level=LEVEL '{printf ("%g ", $1*11.1366559937) >> ("wave-" level) }'
     gfs2oogl2D -g -c T < sim-$GfsIter.gfs | sort -n +1 -2 | awk -v level=LEVEL 'BEGIN {
       n = exp (level*log (2.));
diff --git a/test/capwave/convergence.ref b/test/capwave/convergence.ref
index 0408d68..8524cfb 100644
--- a/test/capwave/convergence.ref
+++ b/test/capwave/convergence.ref
@@ -1,5 +1,5 @@
-3 0.427077
-4 0.255341
-5 0.0784345
-6 0.0184025
-7 0.00694846
+3 0.0974342
+4 0.0298041
+5 0.015305
+6 0.00807946
+7 0.00596749

-- 
Gerris Flow Solver