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

[Stephane Popinet]

The following commit has been merged in the upstream branch:
commit b251949868b7935752031a2cf954940131897b06
Author: Stephane Popinet <popinet at users.sf.net>
Date:   Fri Apr 20 15:35:50 2007 +1000

    Updated wave tests to use implicit surfaces
    
    darcs-hash:20070420053550-d4795-ffe87efa1f4903a42c75f9ee6c78c43fcbb60f14.gz

diff --git a/test/capwave/capwave.gfs b/test/capwave/capwave.gfs
index fb2badb..a23d3f0 100644
--- a/test/capwave/capwave.gfs
+++ b/test/capwave/capwave.gfs
@@ -52,7 +52,7 @@
   VariablePosition {} Y T y
   SourceDiffusion {} U 0.0182571749236
   SourceDiffusion {} V 0.0182571749236
-  InitFraction {} T wave.gts
+  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.) }
diff --git a/test/capwave/capwave.sh b/test/capwave/capwave.sh
index da6628e..2574616 100755
--- a/test/capwave/capwave.sh
+++ b/test/capwave/capwave.sh
@@ -1,19 +1,6 @@
 levels="3 4 5 6"
 
 if ! $donotrun; then
-    if test -f wave.gts; then :
-    else
-	file=`mktemp /tmp/wave.XXXXXX`
-	awk 'BEGIN{
-          print "0.51 -0.51"
-          for (x = 0.51; x >= -0.51; x -= 0.01) 
-            print x " " 0.01*cos (2.*3.14159265359*x);
-          print "-0.51 -0.51"
-        }' > $file
-	shapes $file > wave.gts
-	rm -f $file
-    fi
-
     for level in $levels; do
 	if sed "s/LEVEL/$level/g" < $1 | gerris2D -; then
 	    :
diff --git a/test/capwave/convergence.ref b/test/capwave/convergence.ref
index de89be7..4e1f174 100644
--- a/test/capwave/convergence.ref
+++ b/test/capwave/convergence.ref
@@ -1,4 +1,4 @@
-3 0.142727
-4 0.0198798
-5 0.00918059
-6 0.00494779
+3 0.14274
+4 0.0198192
+5 0.00909905
+6 0.00491347
diff --git a/test/capwave/density/convergence.ref b/test/capwave/density/convergence.ref
index 99bbd24..14ceae0 100644
--- a/test/capwave/density/convergence.ref
+++ b/test/capwave/density/convergence.ref
@@ -1,4 +1,4 @@
-3 0.136917
-4 0.0340935
-5 0.00576382
-6 0.00371567
+3 0.136923
+4 0.0340786
+5 0.00570455
+6 0.00368735
diff --git a/test/capwave/density/density.gfs b/test/capwave/density/density.gfs
index f105723..f998828 100644
--- a/test/capwave/density/density.gfs
+++ b/test/capwave/density/density.gfs
@@ -51,7 +51,7 @@
   SourceDiffusion {} U 0.0182571749236
   SourceDiffusion {} V 0.0182571749236
   PhysicalParams { alpha = 1./(T + 0.1*(1. - T)) }
-  InitFraction {} T wave.gts
+  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.) }
diff --git a/test/capwave/gravity/convergence.ref b/test/capwave/gravity/convergence.ref
index 6c8c913..9d44609 100644
--- a/test/capwave/gravity/convergence.ref
+++ b/test/capwave/gravity/convergence.ref
@@ -1,4 +1,4 @@
-3 0.126979
-4 0.0257422
-5 0.00469298
-6 0.00641083
+3 0.126981
+4 0.0257372
+5 0.00469025
+6 0.00642058
diff --git a/test/capwave/gravity/gravity.gfs b/test/capwave/gravity/gravity.gfs
index e6894e6..107db7e 100644
--- a/test/capwave/gravity/gravity.gfs
+++ b/test/capwave/gravity/gravity.gfs
@@ -56,7 +56,7 @@
   SourceDiffusion {} U 0.0182571749236
   SourceDiffusion {} V 0.0182571749236
   PhysicalParams { alpha = 1./(T + 0.1*(1. - T)) }
-  InitFraction {} T wave.gts
+  InitFraction {} T (y - 0.01*cos (2.*M_PI*x))
   OutputScalarNorm { step = .00225584983639310905 } {
       awk '{printf ("%g %g\n", $3*16.032448313657, $9); fflush(stdout); }' > wave-LEVEL
   } { v = (T > 1e-6 && T < 1. - 1e-6 ? Y : 0.) }

-- 
Gerris Flow Solver