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

[Stephane Popinet]

The following commit has been merged in the upstream branch:
commit 28e039425209a363eeb5ec640aa3e50cee748af2
Author: Stephane Popinet <popinet at users.sf.net>
Date:   Tue Aug 15 18:58:51 2006 +1000

    Density is taken into account for surface tension term
    
    darcs-hash:20060815085851-d4795-98a41c7fee774514e9e7704773ef4cb4b1a65845.gz

diff --git a/src/poisson.c b/src/poisson.c
index f9d71fd..7fc8672 100644
--- a/src/poisson.c
+++ b/src/poisson.c
@@ -453,6 +453,7 @@ static void tension_coeff (FttCellFace * face, gpointer * data)
   GfsStateVector * s = GFS_STATE (face->cell);
   gdouble v = lambda2[face->d/2];
   GfsSourceTension * t = data[1];
+  GfsVariable * alpha = data[2];
   gdouble c1 = GFS_VARIABLE (face->cell, t->c->i);
   gdouble c2 = GFS_VARIABLE (face->neighbor, t->c->i);
   gdouble w1 = GFS_IS_FULL (c1) ? 0. : c1*(1. - c1);
@@ -469,6 +470,8 @@ static void tension_coeff (FttCellFace * face, gpointer * data)
   else
     v = 0.;
 
+  if (alpha)
+      v *= gfs_face_interpolated_value (face, alpha->i);
   if (GFS_IS_MIXED (face->cell))
     v *= s->solid->s[face->d];
   s->f[face->d].v = v;

-- 
Gerris Flow Solver