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

[Stephane Popinet]

The following commit has been merged in the upstream branch:
commit 903ab0e5a9551bded294a6a63710f9eb292dbe0f
Author: Stephane Popinet <s.popinet at niwa.co.nz>
Date:   Thu Jul 14 08:09:12 2005 +1000

    Face function evaluation knows about mixed cells
    
    This means that boundary conditions dependent on spatial coordinates
    will correctly account for cell faces on the boundaries of the domain
    being cut by an embdedded surface.
    
    darcs-hash:20050713220912-fbd8f-f9752073a11ba1c9e3e331440c525aa116ac0ebf.gz

diff --git a/src/simulation.c b/src/simulation.c
index 70732c9..8a16556 100644
--- a/src/simulation.c
+++ b/src/simulation.c
@@ -611,7 +611,7 @@ static gdouble cell_x (FttCell * cell, FttCellFace * face)
 {
   FttVector p;
 
-  if (face)
+  if (face && face->d/2 == 0)
     ftt_face_pos (face, &p);
   else
     gfs_cell_cm (cell, &p);
@@ -622,7 +622,7 @@ static gdouble cell_y (FttCell * cell, FttCellFace * face)
 {
   FttVector p;
 
-  if (face)
+  if (face && face->d/2 == 1)
     ftt_face_pos (face, &p);
   else
     gfs_cell_cm (cell, &p);
@@ -633,7 +633,7 @@ static gdouble cell_z (FttCell * cell, FttCellFace * face)
 {
   FttVector p;
 
-  if (face)
+  if (face && face->d/2 == 2)
     ftt_face_pos (face, &p);
   else
     gfs_cell_cm (cell, &p);

-- 
Gerris Flow Solver