[SCM] Gerris Flow Solver branch, upstream, updated. b3aa46814a06c9cb2912790b23916ffb44f1f203

[Stephane Popinet]

The following commit has been merged in the upstream branch:
commit 65398b797020be31f5a7463888a2bc5b1741cd05
Author: Stephane Popinet <popinet at users.sf.net>
Date:   Fri Feb 29 09:27:04 2008 +1100

    Bug fix for OutputDropletSums when using functions as volume fraction
    
    darcs-hash:20080228222704-d4795-443954c52bf86f01cd656c059967d40a978f3a60.gz

diff --git a/src/domain.c b/src/domain.c
index a5e8093..c9d8ae7 100644
--- a/src/domain.c
+++ b/src/domain.c
@@ -2918,6 +2918,8 @@ static void tag_new_fraction_region (FttCell * cell, TagPar * p)
  * positive) index of the droplet they belong to. The cells belonging
  * to the background phase have an index of zero.
  *
+ * Note that the volume fraction @c must be defined on all levels.
+ *
  * Returns: the number of droplets.
  */
 guint gfs_domain_tag_droplets (GfsDomain * domain,
diff --git a/src/output.c b/src/output.c
index 4f08f2a..d952d95 100644
--- a/src/output.c
+++ b/src/output.c
@@ -2314,7 +2314,7 @@ static gboolean gfs_output_droplet_sums_event (GfsEvent * event, GfsSimulation *
     if (!p.c) {
       p.c = gfs_temporary_variable (domain);
       p.fc = d->c;
-      gfs_domain_cell_traverse (domain, FTT_PRE_ORDER, FTT_TRAVERSE_LEAFS, -1,
+      gfs_domain_cell_traverse (domain, FTT_PRE_ORDER, FTT_TRAVERSE_ALL, -1,
 				(FttCellTraverseFunc) compute_c, &p);
     }
     p.tag = d->tag ? d->tag : gfs_temporary_variable (domain);

-- 
Gerris Flow Solver