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

[Stephane Popinet]

The following commit has been merged in the upstream branch:
commit e22444f148db91a7cd529e5fb74c4eab0bff4293
Author: Stephane Popinet <popinet at users.sf.net>
Date:   Wed May 23 14:36:26 2007 +1000

    Face curvature does not use vof-weighted averaging anymore
    
    darcs-hash:20070523043626-d4795-9c5b69907f8a3bcb90381995de0f511e202f3c33.gz

diff --git a/src/poisson.c b/src/poisson.c
index 33bf290..7c6a6c0 100644
--- a/src/poisson.c
+++ b/src/poisson.c
@@ -471,16 +471,19 @@ static void tension_coeff (FttCellFace * face, gpointer * data)
   gdouble v = lambda2[face->d/2]*t->sigma;
   GfsFunction * alpha = data[2];
   GfsVariable * kappa = GFS_SOURCE_TENSION (data[1])->k;
+  gdouble k1 = GFS_VARIABLE (face->cell, kappa->i);
+  gdouble k2 = GFS_VARIABLE (face->neighbor, kappa->i);
+#if 0
   gdouble c1 = GFS_VARIABLE (face->cell, t->c->i);
   gdouble c2 = GFS_VARIABLE (face->neighbor, t->c->i);
   gdouble w1 = c1*(1. - c1);
   gdouble w2 = c2*(1. - c2);
-  gdouble k1 = GFS_VARIABLE (face->cell, kappa->i);
-  gdouble k2 = GFS_VARIABLE (face->neighbor, kappa->i);
 
   if (w1 + w2 > 0.)
     v *= (w1*k1 + w2*k2)/(w1 + w2);
-  else {
+  else
+#endif
+  {
     if (k1 < G_MAXDOUBLE) {
       if (k2 < G_MAXDOUBLE)
 	v *= (k1 + k2)/2.;

-- 
Gerris Flow Solver