[SCM] Gerris Flow Solver branch, upstream, updated. b3aa46814a06c9cb2912790b23916ffb44f1f203
Stephane Popinet
s.popinet at niwa.co.nz
Fri May 15 02:52:17 UTC 2009
The following commit has been merged in the upstream branch:
commit 5c57e3b48299d2fadc702200bf5ff52f2d7ab1aa
Author: Stephane Popinet <s.popinet at niwa.co.nz>
Date: Mon Jul 11 09:36:09 2005 +1000
Bug fix for VOF plane center calculation
Assertions were too limiting when cells were completely full or empty.
darcs-hash:20050710233609-fbd8f-6dfe87b41eed8ef8fefb585d313f00e087845a0d.gz
diff --git a/src/vof.c b/src/vof.c
index 77b66da..ac9680c 100644
--- a/src/vof.c
+++ b/src/vof.c
@@ -78,7 +78,6 @@ void gfs_line_center (FttVector * m, gdouble alpha, gdouble a, FttVector * p)
g_return_if_fail (m != NULL);
g_return_if_fail (p != NULL);
- g_return_if_fail (a > 0. && a < 1.);
g_return_if_fail (m->x >= 0. && m->y >= 0.);
if (alpha <= 0.) {
@@ -91,6 +90,8 @@ void gfs_line_center (FttVector * m, gdouble alpha, gdouble a, FttVector * p)
return;
}
+ g_return_if_fail (a > 0. && a < 1.);
+
n = *m; n.x += 1e-4; n.y += 1e-4;
p->x = p->y = alpha*alpha*alpha;
@@ -181,7 +182,6 @@ void gfs_plane_center (FttVector * m, gdouble alpha, gdouble a, FttVector * p)
gdouble b, amax;
g_return_if_fail (m != NULL);
- g_return_if_fail (a > 0. && a < 1.);
g_return_if_fail (p != NULL);
g_return_if_fail (m->x >= 0. && m->y >= 0. && m->z >= 0.);
@@ -195,6 +195,8 @@ void gfs_plane_center (FttVector * m, gdouble alpha, gdouble a, FttVector * p)
return;
}
+ g_return_if_fail (a > 0. && a < 1.);
+
n = *m; n.x += 1e-4; n.y += 1e-4; n.z += 1e-4;
amax = n.x + n.y + n.z;
--
Gerris Flow Solver
More information about the debian-science-commits
mailing list