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

[Stephane Popinet]

The following commit has been merged in the upstream branch:
commit 7ef38e9ce6f49d84b433e1f5904378eec6fbd388
Author: Stephane Popinet <popinet at users.sourceforge.net>
Date:   Tue Nov 16 08:23:00 2004 +1100

    Removed mixed cell refinement constraint for face traversal (gerris--ocean--0.7--patch-10)
    
    gerris--ocean--0.7--patch-10
    Keywords:
    
    darcs-hash:20041115212300-aabb8-aeb6621a0986c6f4cbfbf0d158c65ec53ce32922.gz

diff --git a/src/ftt_internal.c b/src/ftt_internal.c
index 77165f5..6cfe140 100644
--- a/src/ftt_internal.c
+++ b/src/ftt_internal.c
@@ -23,13 +23,10 @@ static void traverse_face (FttCell * cell, gpointer * datum)
 	face.d = FTT_OPPOSITE_DIRECTION (face.d);
 	n = ftt_cell_children_direction (face.neighbor, face.d, &children);
 	face.neighbor = face.cell;
-	for (i = 0; i < n; i++) {
-	  face.cell = children.c[i];
-	  /* check for mixed cell refinement violation (topology.fig) */
-	  g_assert (face.cell != NULL);
-	  if (!check || (face.cell->flags & FTT_FLAG_TRAVERSED) == 0)
+	for (i = 0; i < n; i++)
+	  if ((face.cell = children.c[i]) && 
+	      (!check || (face.cell->flags & FTT_FLAG_TRAVERSED) == 0))
 	    (* func) (&face, data);
-	}
       }
       else
 	(* func) (&face, data);

-- 
Gerris Flow Solver