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

[Stephane Popinet]

The following commit has been merged in the upstream branch:
commit 0083d01ce31c90743cb404fa7cd46b88bec028d9
Author: Stephane Popinet <popinet at users.sf.net>
Date:   Thu Mar 15 09:51:11 2007 +1100

    Merged cells work for 2D3
    
    darcs-hash:20070314225111-d4795-398e1942cf9e137229793bac2afc68f3c069592d.gz

diff --git a/src/advection.c b/src/advection.c
index 1ded042..cfa136d 100644
--- a/src/advection.c
+++ b/src/advection.c
@@ -684,12 +684,10 @@ static void add_merged (GSList ** merged, FttCell * cell)
       if (neighbor.c[i]) {
 	if (!FTT_CELL_IS_LEAF (neighbor.c[i])) {
 	  FttCellChildren child;
-	  guint j;
-#if FTT_2D3
-	  g_assert_not_implemented ();
-#endif
-	  ftt_cell_children_direction (neighbor.c[i], FTT_OPPOSITE_DIRECTION (i), &child);
-	  for (j = 0; j < FTT_CELLS/2; j++)
+	  guint j, n;
+
+	  n = ftt_cell_children_direction (neighbor.c[i], FTT_OPPOSITE_DIRECTION (i), &child);;
+	  for (j = 0; j < n; j++)
 	    if (GFS_IS_MIXED (child.c[j]) &&
 		GFS_STATE (child.c[j])->solid->merged == cell)
 	      add_merged (merged, child.c[j]);

-- 
Gerris Flow Solver