[SCM] Gerris Flow Solver branch, upstream, updated. e8f73a07832050124d2b8bf6c6f35b33180e65a8
Sebastien Delaux
s.delaux at niwa.co.nz
Tue Nov 24 12:25:23 UTC 2009
The following commit has been merged in the upstream branch:
commit f44921058fd10f81f706f82d6b5ba75cf98e1741
Author: Sebastien Delaux <s.delaux at niwa.co.nz>
Date: Fri Aug 7 09:05:42 2009 +1000
Update of the strouhal testcase
darcs-hash:20090806230542-118cf-f709f1268e38dd1e3e2cc7176ecbb592342130f6.gz
diff --git a/test/strouhal/moving.ref b/test/strouhal/moving.ref
index 8eb866c..4e5fd62 100644
--- a/test/strouhal/moving.ref
+++ b/test/strouhal/moving.ref
@@ -1,7 +1,8 @@
-#Re period Fx
-200 0.604 0.0947364
-250 0.584 0.0952446
-300 0.569 0.0960957
-350 0.559 0.0974551
-450 0.545 0.0991125
-500 0.539 0.100031
\ No newline at end of file
+#Re St(high resolution) St(low resolution)
+200 0.207 0.197
+250 0.214 0.207
+300 0.219 0.214
+350 0.224 0.221
+400 0.226 x
+450 0.229 0.230
+500 0.232 0.234
\ No newline at end of file
diff --git a/test/strouhal/static.ref b/test/strouhal/static.ref
index f04ce0b..e1521f2 100644
--- a/test/strouhal/static.ref
+++ b/test/strouhal/static.ref
@@ -1,8 +1,8 @@
-#Re Period(s) Fx Pressure force along X(3-5), Y(6-9) Viscous force along X(10-12), Y(13-15) Average, Min, Max
-200 0.599 0.0939684
-250 0.580 0.0952884 0.0835 0.078 0.089 0. -0.060 0.060 0.01540 0.0151 0.0157 0 -0.0051 0.0051 -1
-300 0.566 0.0971142 0.079 0.093 0. -0.067 0.067 0.01405 0.0137 0.0144 0 -0.0051 0.0051 0.203
-350 0.558 0.0981471 0.079 0.097 0. -0.073 0.073 0.01300 0.0126 0.0134 0 -0.00495 0.00495 -1
-400 0.548 0.0993875 0.0895 0.080 0.099 0. -0.077 0.077 0.01210 0.0117 0.0125 0 -0.0048 0.0048 0.205
-450 0.541 0.10055 0.0915 0.081 0.102 0. -0.082 0.082 0.01140 0.0110 0.0118 0 -0.00457 0.00457 -1
-500 0.536 0.101417
\ No newline at end of file
+#Re St(high resolution) St(low resolution)
+200 0.209 0.195
+250 0.216 0.205
+300 0.221 0.212
+350 0.224 0.218
+400 0.228 0.223
+450 0.231 0.227
+500 0.233 0.231
\ No newline at end of file
diff --git a/test/strouhal/strouhal.sh b/test/strouhal/strouhal.sh
index 1d81511..a1b8a15 100644
--- a/test/strouhal/strouhal.sh
+++ b/test/strouhal/strouhal.sh
@@ -33,11 +33,14 @@ if cat <<EOF | gnuplot ;then :
set out 'strouhal.eps'
set xl "Reynolds number"
set yl "St"
- set yr [0.2:0.24]
+ set yr [0.19:0.24]
set xr [180:520]
- plot 'static.ref' u 1:(0.125/\$2) w l t "Gerris Static",\
- 'moving.ref' u 1:(0.125/\$2) pt 5 t "Gerris Moving",\
- 'strouhal.res' pt 5 lc 2 t " "
+ set key bottom
+ plot 'static.ref' u 1:3 w lp t "Gerris Static Low Resolution",\
+ 'moving.ref' u 1:3 pt 5 t "Gerris Moving Low Resolution",\
+ 'static.ref' u 1:2 w lp t "Gerris Static High Resolution",\
+ 'moving.ref' u 1:2 w lp t "Gerris Moving High Resolution",\
+ 'strouhal.res' pt 5 lc 2 t ""
EOF
else
exit 1
--
Gerris Flow Solver
More information about the debian-science-commits
mailing list