[SCM] Gerris Flow Solver branch, upstream, updated. b3aa46814a06c9cb2912790b23916ffb44f1f203
Stephane Popinet
popinet at users.sf.net
Fri May 15 02:54:01 UTC 2009
The following commit has been merged in the upstream branch:
commit 6f47d158ebd8d7ad26e03c087a27e6a1d5cdd66d
Author: Stephane Popinet <popinet at users.sf.net>
Date: Fri Mar 2 12:33:12 2007 +1100
Cleanup of Couette flow test case
darcs-hash:20070302013312-d4795-35fdc50b5e782154997e25a47b461653e346da88.gz
diff --git a/test/couette/couette.gfs b/test/couette/couette.gfs
index 8686316..c91d589 100644
--- a/test/couette/couette.gfs
+++ b/test/couette/couette.gfs
@@ -32,7 +32,7 @@
#
# Author: St\'ephane Popinet
# Command: sh couette.sh couette.gfs
-# Version: 0.8.0
+# Version: 1.0.0
# Required files: couette.sh profile prof-0.ref prof-1.ref prof-2.ref prof-3.ref
# Running time: 32 minutes
# Generated files: prof.eps
@@ -75,6 +75,6 @@
EventStop { istep = 1 } U 1e-4 DU
OutputScalarNorm { istep = 1 } du-MODEL { v = DU }
- OutputLocation { start = end } prof-MODEL profile
+ OutputLocation { start = end } { awk '{if ($1 != "#") print $2,$8;}' > prof-MODEL } profile
}
GfsBox {}
diff --git a/test/couette/couette.sh b/test/couette/couette.sh
index e12e30e..c11f04b 100644
--- a/test/couette/couette.sh
+++ b/test/couette/couette.sh
@@ -17,10 +17,10 @@ set ylabel 'Tangential velocity'
powerlaw(r,N)=r*((0.5/r)**(2./N) - 1.)/((0.5/0.25)**(2./N) - 1.)
hb(r,Rl)=(r > Rl ? 0. : r*sqrt(2.)*0.12*0.12/(4.*0.0672*0.0672)*(3./4.+(Rl/r)**4/4.-(Rl/r)**2+log(Rl/r)))
bingham(r,Rl)=(r > Rl ? 0. : r*sqrt(2.)*10./4.*((Rl/r)**2-2.*log(Rl/r)-1.))
-plot [0.25:0.5][0:0.25]powerlaw(x,1.) t "Newtonian", 'prof-0' u 2:8 w p ps 2 pt 9 t "",\
- powerlaw(x,0.5) t "Power law", 'prof-1' u 2:8 w p ps 2 pt 9 t "",\
- hb(x,0.4637) t "Herschel-Bulkley", 'prof-2' u 2:8 w p ps 2 pt 9 t "",\
- bingham(x,0.34924) t "Bingham", 'prof-3' u 2:8 w p ps 2 pt 9 t ""
+plot [0.25:0.5][0:0.25]powerlaw(x,1.) t "Newtonian", 'prof-0' w p ps 2 pt 9 t "",\
+ powerlaw(x,0.5) t "Power law", 'prof-1' w p ps 2 pt 9 t "",\
+ hb(x,0.4637) t "Herschel-Bulkley", 'prof-2' w p ps 2 pt 9 t "",\
+ bingham(x,0.34924) t "Bingham", 'prof-3' w p ps 2 pt 9 t ""
EOF
else
exit 1
@@ -29,14 +29,14 @@ fi
if cat <<EOF | python ; then :
from check import *
from sys import *
-print (Curve('prof-0',2,8) - Curve('prof-0.ref',1,2)).norm2(),\
- (Curve('prof-1',2,8) - Curve('prof-1.ref',1,2)).norm2(),\
- (Curve('prof-2',2,8) - Curve('prof-2.ref',1,2)).norm2(),\
- (Curve('prof-3',2,8) - Curve('prof-3.ref',1,2)).norm2()
-if (Curve('prof-0',2,8) - Curve('prof-0.ref',1,2)).norm2() > 3.6e-4 or \
- (Curve('prof-1',2,8) - Curve('prof-1.ref',1,2)).norm2() > 6.3e-4 or \
- (Curve('prof-2',2,8) - Curve('prof-2.ref',1,2)).norm2() > 21e-4 or \
- (Curve('prof-3',2,8) - Curve('prof-3.ref',1,2)).norm2() > 22e-4:
+print (Curve('prof-0',1,2) - Curve('prof-0.ref',1,2)).norm2(),\
+ (Curve('prof-1',1,2) - Curve('prof-1.ref',1,2)).norm2(),\
+ (Curve('prof-2',1,2) - Curve('prof-2.ref',1,2)).norm2(),\
+ (Curve('prof-3',1,2) - Curve('prof-3.ref',1,2)).norm2()
+if (Curve('prof-0',1,2) - Curve('prof-0.ref',1,2)).norm2() > 3.6e-4 or \
+ (Curve('prof-1',1,2) - Curve('prof-1.ref',1,2)).norm2() > 6.3e-4 or \
+ (Curve('prof-2',1,2) - Curve('prof-2.ref',1,2)).norm2() > 21e-4 or \
+ (Curve('prof-3',1,2) - Curve('prof-3.ref',1,2)).norm2() > 22e-4:
exit(1)
EOF
else
diff --git a/test/couette/prof-0.ref b/test/couette/prof-0.ref
index b085f06..51cd6e9 100644
--- a/test/couette/prof-0.ref
+++ b/test/couette/prof-0.ref
@@ -1,19 +1,19 @@
-0.2625 0.22823
-0.275 0.211021
-0.2875 0.193689
-0.3 0.177416
-0.3125 0.162069
-0.325 0.147783
-0.3375 0.134186
-0.35 0.121217
-0.3625 0.108823
-0.375 0.0969527
-0.3875 0.0856977
-0.4 0.0748506
-0.4125 0.0643807
-0.425 0.0542594
-0.4375 0.0444602
-0.45 0.0350435
-0.4625 0.0258821
-0.475 0.0169639
-0.4875 0.00933052
+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
diff --git a/test/couette/prof-1.ref b/test/couette/prof-1.ref
index caeafe9..c5c32bc 100644
--- a/test/couette/prof-1.ref
+++ b/test/couette/prof-1.ref
@@ -1,19 +1,19 @@
-0.2625 0.210667
-0.275 0.183684
-0.2875 0.157916
-0.3 0.135337
-0.3125 0.115958
-0.325 0.0999865
-0.3375 0.086019
-0.35 0.0737765
-0.3625 0.063013
-0.375 0.0535157
-0.3875 0.0453787
-0.4 0.0380701
-0.4125 0.0314896
-0.425 0.0255476
-0.4375 0.0201653
-0.45 0.0154073
-0.4625 0.0110454
-0.475 0.00703069
-0.4875 0.00373463
+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
diff --git a/test/couette/prof-2.ref b/test/couette/prof-2.ref
index 45d7b92..9c6a000 100644
--- a/test/couette/prof-2.ref
+++ b/test/couette/prof-2.ref
@@ -1,19 +1,19 @@
-0.2625 0.184336
-0.275 0.144645
-0.2875 0.10869
-0.3 0.0793804
-0.3125 0.0566837
-0.325 0.0407633
-0.3375 0.0285674
-0.35 0.0194106
-0.3625 0.012696
-0.375 0.00791536
-0.3875 0.0049539
-0.4 0.00292521
-0.4125 0.00160965
-0.425 0.000815487
-0.4375 0.00037882
-0.45 0.000191865
-0.4625 8.92331e-05
-0.475 3.63176e-05
-0.4875 1.03399e-05
+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
diff --git a/test/couette/prof-3.ref b/test/couette/prof-3.ref
index c414834..85e5c59 100644
--- a/test/couette/prof-3.ref
+++ b/test/couette/prof-3.ref
@@ -1,19 +1,19 @@
-0.2625 0.177358
-0.275 0.128878
-0.2875 0.0846555
-0.3 0.0493349
-0.3125 0.02407
-0.325 0.0110712
-0.3375 0.00432969
-0.35 0.00148187
-0.3625 0.000659063
-0.375 0.00048735
-0.3875 0.000428575
-0.4 0.000378791
-0.4125 0.000331567
-0.425 0.000283919
-0.4375 0.000236301
-0.45 0.00018923
-0.4625 0.000142762
-0.475 9.69944e-05
-0.4875 5.75183e-05
+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
--
Gerris Flow Solver
More information about the debian-science-commits
mailing list