[SCM] Gerris Flow Solver branch, upstream, updated. b3aa46814a06c9cb2912790b23916ffb44f1f203
Stephane Popinet
s.popinet at niwa.co.nz
Fri May 15 02:52:32 UTC 2009
The following commit has been merged in the upstream branch:
commit d23c48e89461e0d197f199754ee873a237b1d01d
Author: Stephane Popinet <s.popinet at niwa.co.nz>
Date: Mon Sep 5 10:32:24 2005 +1000
Channel and boundaries test cases compare non-centered variables
darcs-hash:20050905003224-fbd8f-c09c23415bd834d94d32aeb77fbd7ec0bb5a3f3e.gz
diff --git a/test/euler/boundaries/boundaries.sh b/test/euler/boundaries/boundaries.sh
index c7a7307..aaec500 100644
--- a/test/euler/boundaries/boundaries.sh
+++ b/test/euler/boundaries/boundaries.sh
@@ -14,7 +14,7 @@ for v in U V; do
for level in 7 8; do
level1=`expr $level + 1`
echo -n "$level " >> order$v
- if gfscompare2D -c -v sim-$level sim-$level1 $v 2>&1 | \
+ if gfscompare2D -v sim-$level sim-$level1 $v 2>&1 | \
awk '{if ($1 == "total") print $4 " " $6 " " $8;}' >> order$v; then :
else
exit 1
diff --git a/test/euler/channel/channel.sh b/test/euler/channel/channel.sh
index ab14b31..6cb0bc6 100644
--- a/test/euler/channel/channel.sh
+++ b/test/euler/channel/channel.sh
@@ -14,7 +14,7 @@ for v in U V; do
for level in 5 6; do
level1=`expr $level + 1`
echo -n "$level " >> order$v
- if gfscompare2D -c -v sim-$level sim-$level1 $v 2>&1 | \
+ if gfscompare2D -v sim-$level sim-$level1 $v 2>&1 | \
awk '{if ($1 == "total") print $4 " " $6 " " $8;}' >> order$v; then :
else
exit 1
diff --git a/tools/gfs2oogl.c b/tools/gfs2oogl.c
index 72e5d67..41887d7 100644
--- a/tools/gfs2oogl.c
+++ b/tools/gfs2oogl.c
@@ -565,7 +565,7 @@ static void cell_center (FttCell * cell, gpointer * data)
GtsPoint * v;
ftt_cell_pos (cell, &pos);
- pos.z = /*-0.49;*/0.;
+ pos.z = 0.;
v = gts_point_new (gts_point_class (), pos.x, pos.y, pos.z);
if (gfs_domain_locate (domain, pos, -1) &&
closest_grid_is_insertable (grid, v, 0., 0.) == INSERTED)
--
Gerris Flow Solver
More information about the debian-science-commits
mailing list