[SCM] Gerris Flow Solver branch, upstream, updated. b3aa46814a06c9cb2912790b23916ffb44f1f203
Stephane Popinet
popinet at users.sf.net
Fri May 15 02:54:18 UTC 2009
The following commit has been merged in the upstream branch:
commit 2af9271b7d898d3646c30c73098588456f0b116c
Author: Stephane Popinet <popinet at users.sf.net>
Date: Fri Apr 20 13:44:55 2007 +1000
Updated tests with new implicit surfaces
darcs-hash:20070420034455-d4795-7e8df84f5d061d1d5d0f9afda5852eee4a805712.gz
diff --git a/test/boundaries/boundaries.gfs b/test/boundaries/boundaries.gfs
index d5a1bd0..abb3bc8 100644
--- a/test/boundaries/boundaries.gfs
+++ b/test/boundaries/boundaries.gfs
@@ -34,9 +34,9 @@
AdvectionParams { scheme = none }
ApproxProjectionParams { tolerance = 1e-6 }
Refine LEVEL
- Solid (ellipse(0.25, 0.25, 0.1, 0.1))
- Solid (ellipse(-0.25, 0.125, 0.15, 0.1))
- Solid (ellipse(0., -0.25, 0.2, 0.1))
+ Solid (ellipse (0.25, 0.25, 0.1, 0.1))
+ Solid (ellipse (-0.25, 0.125, 0.15, 0.1))
+ Solid (ellipse (0., -0.25, 0.2, 0.1))
Init {} { U = 1 }
OutputSimulation { start = end } sim-LEVEL {
variables = U,V,P
diff --git a/test/boundaries/orderU.ref b/test/boundaries/orderU.ref
index 34320a7..d82e74d 100644
--- a/test/boundaries/orderU.ref
+++ b/test/boundaries/orderU.ref
@@ -1,2 +1,2 @@
-7 5.168e-04 2.198e-03 6.725e-02
-8 1.412e-04 9.084e-04 4.422e-02
+7 3.722e-04 2.134e-03 6.678e-02
+8 1.016e-04 8.851e-04 4.408e-02
diff --git a/test/boundaries/orderV.ref b/test/boundaries/orderV.ref
index 3f06870..ea22f34 100644
--- a/test/boundaries/orderV.ref
+++ b/test/boundaries/orderV.ref
@@ -1,2 +1,2 @@
-7 4.849e-04 1.947e-03 5.346e-02
-8 1.277e-04 7.183e-04 3.567e-02
+7 3.999e-04 1.746e-03 5.347e-02
+8 1.067e-04 6.590e-04 3.287e-02
diff --git a/test/boundaries/orderfU.ref b/test/boundaries/orderfU.ref
index 909adb3..7b7222c 100644
--- a/test/boundaries/orderfU.ref
+++ b/test/boundaries/orderfU.ref
@@ -1,2 +1,2 @@
-7 3.623e-04 6.652e-04 8.708e-03
-8 9.237e-05 1.765e-04 3.870e-03
+7 2.252e-04 4.771e-04 6.737e-03
+8 5.627e-05 1.230e-04 2.794e-03
diff --git a/test/boundaries/orderfV.ref b/test/boundaries/orderfV.ref
index 150019d..06d6d33 100644
--- a/test/boundaries/orderfV.ref
+++ b/test/boundaries/orderfV.ref
@@ -1,2 +1,2 @@
-7 3.487e-04 8.671e-04 9.910e-03
-8 8.572e-05 2.579e-04 4.012e-03
+7 2.818e-04 7.563e-04 9.280e-03
+8 7.034e-05 2.330e-04 3.691e-03
diff --git a/test/channel/channel.gfs b/test/channel/channel.gfs
index 8c37288..b0a2968 100644
--- a/test/channel/channel.gfs
+++ b/test/channel/channel.gfs
@@ -44,8 +44,8 @@
y2;
}
}
- Solid (0.125 - channel(x) - y) { scale = 4 tx = 1.5 }
- Solid (y + 0.125 - channel(x)) { scale = 4 tx = 1.5 }
+ Solid (0.125 - channel (x) - y) { scale = 4 tx = 1.5 }
+ Solid (y + 0.125 - channel (x)) { scale = 4 tx = 1.5 }
Init {} { U = 1 }
OutputSimulation { start = end } sim-LEVEL {
variables = U,V,P
diff --git a/test/channel/orderU.ref b/test/channel/orderU.ref
index 23b3afa..82e07d1 100644
--- a/test/channel/orderU.ref
+++ b/test/channel/orderU.ref
@@ -1,2 +1,2 @@
-5 1.139e-04 2.825e-04 2.434e-03
-6 5.144e-05 1.674e-04 3.214e-03
+5 1.176e-04 2.894e-04 2.336e-03
+6 5.082e-05 1.545e-04 1.617e-03
diff --git a/test/channel/orderV.ref b/test/channel/orderV.ref
index b6ab666..e3887c3 100644
--- a/test/channel/orderV.ref
+++ b/test/channel/orderV.ref
@@ -1,2 +1,2 @@
-5 1.735e-04 5.314e-04 4.766e-03
-6 4.939e-05 1.933e-04 2.577e-03
+5 1.724e-04 5.272e-04 4.552e-03
+6 4.908e-05 1.913e-04 2.426e-03
diff --git a/test/channel/orderfU.ref b/test/channel/orderfU.ref
index cb77a3e..948c9cb 100644
--- a/test/channel/orderfU.ref
+++ b/test/channel/orderfU.ref
@@ -1,2 +1,2 @@
-5 9.627e-05 2.464e-04 2.031e-03
-6 3.492e-05 1.089e-04 1.432e-03
+5 1.002e-04 2.567e-04 2.178e-03
+6 3.457e-05 1.070e-04 1.363e-03
diff --git a/test/channel/orderfV.ref b/test/channel/orderfV.ref
index 873d71e..58ebe41 100644
--- a/test/channel/orderfV.ref
+++ b/test/channel/orderfV.ref
@@ -1,2 +1,2 @@
-5 1.551e-04 5.050e-04 4.766e-03
-6 3.439e-05 1.451e-04 2.333e-03
+5 1.543e-04 5.008e-04 4.552e-03
+6 3.416e-05 1.440e-04 2.281e-03
diff --git a/test/circle/circle.gfs b/test/circle/circle.gfs
index c90ba0f..2481914 100644
--- a/test/circle/circle.gfs
+++ b/test/circle/circle.gfs
@@ -54,7 +54,7 @@
1 0 GfsPoisson GfsBox GfsGEdge {} {
Time { iend = 10 }
Refine LEVEL
- Solid (ellipse(0,0,0.25,0.25))
+ Solid (ellipse (0, 0, 0.25, 0.25))
ApproxProjectionParams { nrelax = 4 tolerance = 1e-30 erelax = 2 }
Init {} {
Div = {
diff --git a/test/circle/error.ref b/test/circle/error.ref
index 10a497c..dfc1e3b 100644
--- a/test/circle/error.ref
+++ b/test/circle/error.ref
@@ -1,6 +1,6 @@
-3 7.982e-02 1.068e-01 2.972e-01
+3 7.983e-02 1.068e-01 2.972e-01
4 1.773e-02 2.227e-02 4.846e-02
-5 4.494e-03 5.567e-03 1.339e-02
-6 1.089e-03 1.356e-03 3.959e-03
-7 2.812e-04 3.509e-04 1.808e-03
-8 6.911e-05 8.576e-05 3.560e-04
+5 4.495e-03 5.567e-03 1.339e-02
+6 1.088e-03 1.356e-03 3.952e-03
+7 2.809e-04 3.504e-04 1.802e-03
+8 6.908e-05 8.573e-05 3.554e-04
diff --git a/test/circle/order.ref b/test/circle/order.ref
index 5dda677..3d65837 100644
--- a/test/circle/order.ref
+++ b/test/circle/order.ref
@@ -1,5 +1,5 @@
-4 2.17056 2.26174 2.61657
-5 1.98012 2.00013 1.85564
-6 2.045 2.03754 1.75795
-7 1.95334 1.95023 1.13074
-8 2.02463 2.03268 2.34445
+4 2.17074 2.26174 2.61657
+5 1.9798 2.00013 1.85564
+6 2.04664 2.03754 1.7605
+7 1.95355 1.95228 1.13298
+8 2.02372 2.03113 2.34208
diff --git a/test/circle/res-7.ref b/test/circle/res-7.ref
index 52b2fbf..67ef393 100644
--- a/test/circle/res-7.ref
+++ b/test/circle/res-7.ref
@@ -1,11 +1,11 @@
-0 0 1.775e+02 0
-1 0.08 4.906e+00 36
-2 0.15 1.515e-01 34
-3 0.21 5.785e-03 31
-4 0.28 2.185e-04 30
-5 0.35 7.225e-06 30
-6 0.41 2.313e-07 30
-7 0.48 7.186e-09 31
-8 0.54 2.910e-10 30
-9 0.61 1.998e-11 27
-10 0.67 1.921e-11 20
+0 0.00000000 1.775e+02 0
+1 0.07000000 4.867e+00 36
+2 0.13000000 1.526e-01 34
+3 0.19000000 5.844e-03 31
+4 0.24000000 2.190e-04 30
+5 0.30000000 7.283e-06 30
+6 0.36000000 2.330e-07 30
+7 0.42000000 6.724e-09 31
+8 0.48000000 2.837e-10 30
+9 0.54000000 1.958e-11 28
+10 0.60000000 1.640e-11 20
diff --git a/test/couette/couette.gfs b/test/couette/couette.gfs
index 7f46101..dbacb26 100644
--- a/test/couette/couette.gfs
+++ b/test/couette/couette.gfs
@@ -40,8 +40,8 @@
1 0 GfsSimulation GfsBox GfsGEdge {} {
Time { iend = 100 dtmax = 1e-2 }
Refine 6
- Solid inner.gts { flip = 1 scale = 1.9999 }
- Solid inner.gts
+ Solid (ellipse (0,0,0.25,0.25)) { flip = 1 scale = 1.9999 }
+ Solid (ellipse (0,0,0.25,0.25))
ApproxProjectionParams { tolerance = 1e-6 }
AdvectionParams { scheme = none }
SourceViscosity {} {
diff --git a/test/couette/couette.sh b/test/couette/couette.sh
index 5fe9230..8e7c7b0 100644
--- a/test/couette/couette.sh
+++ b/test/couette/couette.sh
@@ -1,5 +1,4 @@
if ! $donotrun; then
- shapes ellipse | transform > inner.gts
for model in 0 1 2 3; do
if sed "s/MODEL/$model/g" < $1 | gerris2D -; then :
else
diff --git a/test/couette/prof-0.ref b/test/couette/prof-0.ref
index 51cd6e9..66e129b 100644
--- a/test/couette/prof-0.ref
+++ b/test/couette/prof-0.ref
@@ -1,19 +1,19 @@
-0.2625 0.22839
-0.275 0.211073
-0.2875 0.19375
-0.3 0.177467
-0.3125 0.162114
-0.325 0.147824
-0.3375 0.134222
-0.35 0.121249
-0.3625 0.10885
-0.375 0.0969764
-0.3875 0.0857179
-0.4 0.0748674
-0.4125 0.0643943
-0.425 0.05427
-0.4375 0.0444679
-0.45 0.0350485
-0.4625 0.0258845
-0.475 0.0169638
-0.4875 0.00932832
+0.2625 0.228374
+0.275 0.211074
+0.2875 0.193769
+0.3 0.177503
+0.3125 0.162164
+0.325 0.147884
+0.3375 0.13429
+0.35 0.121324
+0.3625 0.108931
+0.375 0.097061
+0.3875 0.0858052
+0.4 0.0749568
+0.4125 0.0644852
+0.425 0.0543619
+0.4375 0.0445603
+0.45 0.035141
+0.4625 0.0259768
+0.475 0.017052
+0.4875 0.00940313
diff --git a/test/couette/prof-1.ref b/test/couette/prof-1.ref
index c5c32bc..9cfd98a 100644
--- a/test/couette/prof-1.ref
+++ b/test/couette/prof-1.ref
@@ -1,19 +1,19 @@
-0.2625 0.21083
-0.275 0.183735
-0.2875 0.15799
-0.3 0.135425
-0.3125 0.116044
-0.325 0.100063
-0.3375 0.0860865
-0.35 0.073835
-0.3625 0.0630633
-0.375 0.0535586
-0.3875 0.0454152
-0.4 0.0381011
-0.4125 0.0315156
-0.425 0.0255692
-0.4375 0.020183
-0.45 0.0154217
-0.4625 0.0110569
-0.475 0.00703945
-0.4875 0.003741
+0.2625 0.210866
+0.275 0.183792
+0.2875 0.158062
+0.3 0.135508
+0.3125 0.116131
+0.325 0.100148
+0.3375 0.0861675
+0.35 0.0739109
+0.3625 0.0631336
+0.375 0.0536236
+0.3875 0.0454754
+0.4 0.0381569
+0.4125 0.0315675
+0.425 0.0256176
+0.4375 0.0202283
+0.45 0.0154642
+0.4625 0.0110954
+0.475 0.00707182
+0.4875 0.0037639
diff --git a/test/couette/prof-2.ref b/test/couette/prof-2.ref
index 9c6a000..5bb43f0 100644
--- a/test/couette/prof-2.ref
+++ b/test/couette/prof-2.ref
@@ -1,19 +1,19 @@
-0.2625 0.184547
-0.275 0.144774
-0.2875 0.108854
-0.3 0.0795564
-0.3125 0.0568421
-0.325 0.0408942
-0.3375 0.0286723
-0.35 0.0194922
-0.3625 0.0127579
-0.375 0.00796096
-0.3875 0.00498714
-0.4 0.0029485
-0.4125 0.00162515
-0.425 0.000825101
-0.4375 0.000384232
-0.45 0.000194867
-0.4625 9.07588e-05
-0.475 3.70195e-05
-0.4875 1.06442e-05
+0.2625 0.184616
+0.275 0.144868
+0.2875 0.108955
+0.3 0.0796569
+0.3125 0.0569322
+0.325 0.0409685
+0.3375 0.0287308
+0.35 0.0195365
+0.3625 0.01279
+0.375 0.00798333
+0.3875 0.00500264
+0.4 0.00295887
+0.4125 0.00163182
+0.425 0.000829206
+0.4375 0.000386639
+0.45 0.000196303
+0.4625 9.1544e-05
+0.475 3.73828e-05
+0.4875 1.07438e-05
diff --git a/test/couette/prof-3.ref b/test/couette/prof-3.ref
index 85e5c59..327b350 100644
--- a/test/couette/prof-3.ref
+++ b/test/couette/prof-3.ref
@@ -1,19 +1,19 @@
-0.2625 0.177666
-0.275 0.129278
-0.2875 0.0851104
-0.3 0.0496888
-0.3125 0.0243003
-0.325 0.0111968
-0.3375 0.00438545
-0.35 0.00149935
-0.3625 0.000662012
-0.375 0.000487269
-0.3875 0.000428187
-0.4 0.000378324
-0.4125 0.000331092
-0.425 0.000283425
-0.4375 0.000235776
-0.45 0.000188657
-0.4625 0.000142132
-0.475 9.63035e-05
-0.4875 5.67726e-05
+0.2625 0.177734
+0.275 0.129386
+0.2875 0.0852325
+0.3 0.0498059
+0.3125 0.0243925
+0.325 0.0112533
+0.3375 0.00441371
+0.35 0.00150978
+0.3625 0.000664511
+0.375 0.000487827
+0.3875 0.000428553
+0.4 0.000378624
+0.4125 0.000331367
+0.425 0.000283671
+0.4375 0.000235993
+0.45 0.000188843
+0.4625 0.000142289
+0.475 9.64123e-05
+0.4875 5.6789e-05
diff --git a/test/nz/nz.gfs b/test/nz/nz.gfs
index ce10668..70dbb5b 100644
--- a/test/nz/nz.gfs
+++ b/test/nz/nz.gfs
@@ -15,9 +15,9 @@
# velocity values are computed from cell-centred values.
#
# \begin{figure}[htbp]
-# \caption{\label{p}MPEG movie of the surface height.}
+# \caption{Surface height at $t = 2$.}
# \begin{center}
-# \htmladdnormallinkfoot{\includegraphics[width=0.6\hsize]{p.eps}}{p.mpg}
+# \includegraphics[width=0.6\hsize]{p.eps}
# \end{center}
# \end{figure}
#
@@ -32,7 +32,7 @@
# Command: gerris2D3 nz.gfs
# Version: 1.0.0
# Required files: nz.gfs bath.gts
-# Generated files: p.mpg p.eps k.eps
+# Generated files: p.eps k.eps
#
# Use the "GfsOcean" model
1 0 GfsOcean GfsBox GfsGEdge {} {
@@ -51,7 +51,6 @@
# Non-dimensional gravity
PhysicalParams { g = 19.62 }
- OutputPPM { istep = 10 } { ppm2mpeg > p.mpg } { v = P min = -5e-3 max = 5e-3 }
OutputPPM { start = 2 } { convert ppm:- p.eps } { v = P min = -5e-3 max = 5e-3 }
OutputScalarSum { istep = 10 } k { v = Velocity2 }
EventScript { start = end } {
diff --git a/test/waves/adaptive/adaptive.gfs b/test/waves/adaptive/adaptive.gfs
index d3b29e1..f09873d 100644
--- a/test/waves/adaptive/adaptive.gfs
+++ b/test/waves/adaptive/adaptive.gfs
@@ -81,7 +81,7 @@
}
Refine LEVEL
AdaptVorticity { istep = 1 } { cmax = 5e-2 maxlevel = LEVEL }
- Solid basin.gts
+ Solid (- ellipse (0, 0, 0.25, 0.25)) { scale = 1.999 }
AdvectionParams { scheme = none }
ApproxProjectionParams { tolerance = 1e-9 weighted = 0 }
SourceCoriolis {} 1.
diff --git a/test/waves/adaptive/correlation.ref b/test/waves/adaptive/correlation.ref
index 77b33a9..d07a19f 100644
--- a/test/waves/adaptive/correlation.ref
+++ b/test/waves/adaptive/correlation.ref
@@ -1,3 +1,3 @@
-5 2.7 0.8664
-6 0.3 0.9745
-7 0 0.9958
+5 2.5 0.8666
+6 0.3 0.975
+7 0 0.9955
diff --git a/test/waves/correlation.ref b/test/waves/correlation.ref
index aa737b4..1d64f60 100644
--- a/test/waves/correlation.ref
+++ b/test/waves/correlation.ref
@@ -1,3 +1,3 @@
-5 2.6 0.8644
-6 0.5 0.9712
-7 0.2 0.9922
+5 2.6 0.8645
+6 0.4 0.9718
+7 0.4 0.9924
diff --git a/test/waves/waves.gfs b/test/waves/waves.gfs
index 24c6128..5ff29dc 100644
--- a/test/waves/waves.gfs
+++ b/test/waves/waves.gfs
@@ -92,7 +92,7 @@
H = 1
}
Refine LEVEL
- Solid basin.gts
+ Solid (- ellipse (0, 0, 0.25, 0.25)) { scale = 1.999 }
AdvectionParams { scheme = none }
ApproxProjectionParams { tolerance = 1e-9 weighted = 0 }
SourceCoriolis {} 1.
diff --git a/test/waves/waves.sh b/test/waves/waves.sh
index 4d566dd..46cd91b 100644
--- a/test/waves/waves.sh
+++ b/test/waves/waves.sh
@@ -1,6 +1,5 @@
if ! $donotrun; then
rm -f correlation res-* sim-*
- shapes -n 500 ellipse | transform -s 1.999 -i > basin.gts
for level in 5 6 7; do
if sed "s/LEVEL/$level/g" < $1 | gerris2D3 - | \
awk '{ print $1 " " $5 }' > res-$level && \
--
Gerris Flow Solver
More information about the debian-science-commits
mailing list