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

[Stephane Popinet]

The following commit has been merged in the upstream branch:
commit 7dc80cfa9baadab061e1993311d2eec526fe3d23
Author: Stephane Popinet <popinet at users.sourceforge.net>
Date:   Mon Nov 1 10:07:30 2004 +1100

    Changed 2D bounding boxes for cut cells traversal (gerris--mainline--0.7--patch-16)
    
    gerris--mainline--0.7--patch-16
    Keywords:
    
    Only the faces crossing the z
    
    darcs-hash:20041031230730-aabb8-4bdc2bec051568b39a868b19acbbe050703e6c2e.gz

diff --git a/src/fluid.c b/src/fluid.c
index 346b0d4..38cd31a 100644
--- a/src/fluid.c
+++ b/src/fluid.c
@@ -1821,11 +1821,13 @@ static GtsSurface * cell_is_cut (FttCell * cell, GtsSurface * s)
   ftt_cell_pos (cell, &p);
   bb.x1 = p.x - h; bb.y1 = p.y - h;
   bb.x2 = p.x + h; bb.y2 = p.y + h; 
-#if FTT_2D3
+#if FTT_2D
+  bb.z1 = bb.z2 = 0.;
+#elif FTT_2D3
   bb.z1 = p.z - 1./1.99999; bb.z2 = p.z + 1./1.99999;
-#else  /* 2D or 3D */
+#else  /* 3D */
   bb.z1 = p.z - h; bb.z2 = p.z + h;
-#endif /* 2D or 3D */
+#endif /* 3D */
   data[0] = &bb;
   data[1] = &s1;
   gts_surface_foreach_face (s, (GtsFunc) face_overlaps_box, data);

-- 
Gerris Flow Solver