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

[Stephane Popinet]

The following commit has been merged in the upstream branch:
commit 9904cf7c37552573f4e910e64ea95c489aa1f254
Author: Stephane Popinet <popinet at users.sf.net>
Date:   Thu Apr 30 18:42:14 2009 +1000

    gfs_cell_traverse_cut() can traverse "destroyed" cells
    
    Ignore-this: f4605397246a7bd4c6b6084d6dbeacd2
    
    darcs-hash:20090430084214-d4795-fecdf0e80465cfc1baf72515dca550bba020a0ca.gz

diff --git a/src/ftt.h b/src/ftt.h
index 5645ea6..4d2a359 100644
--- a/src/ftt.h
+++ b/src/ftt.h
@@ -62,6 +62,7 @@ typedef enum
   FTT_TRAVERSE_NON_LEAFS      = 1 << 1,
   FTT_TRAVERSE_LEVEL          = 1 << 2,
   FTT_TRAVERSE_BOUNDARY_FACES = 1 << 3,
+  FTT_TRAVERSE_DESTROYED      = 1 << 4,
   FTT_TRAVERSE_ALL            = FTT_TRAVERSE_LEAFS | FTT_TRAVERSE_NON_LEAFS
 } FttTraverseFlags;
 
diff --git a/src/surface.c b/src/surface.c
index 97d355a..3817cb7 100644
--- a/src/surface.c
+++ b/src/surface.c
@@ -89,7 +89,7 @@ static void cell_traverse_cut (FttCell * cell,
     for (n = 0; n < FTT_CELLS; n++) {
       FttCell * c = &(children->cell[n]);
 
-      if (!FTT_CELL_IS_DESTROYED (c))
+      if ((flags & FTT_TRAVERSE_DESTROYED) != 0 || !FTT_CELL_IS_DESTROYED (c))
 	cell_traverse_cut (c, s1, order, flags, func, data, flatten);
     }
   }

-- 
Gerris Flow Solver