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

[Stephane Popinet]

The following commit has been merged in the upstream branch:
commit 738638657b26d50f8d71024329581e7d2e72c4b8
Author: Stephane Popinet <popinet at users.sf.net>
Date:   Tue Nov 28 10:28:36 2006 +1100

    Code cleanup for tension coefficients
    
    darcs-hash:20061127232836-d4795-af656896cad2eefaa8b96eb5466556f39d7a5446.gz

diff --git a/src/poisson.c b/src/poisson.c
index 69343ce..867122c 100644
--- a/src/poisson.c
+++ b/src/poisson.c
@@ -460,19 +460,20 @@ static void tension_coeff (FttCellFace * face, gpointer * data)
     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*GFS_VARIABLE (face->cell, kappa->i) +
-	    w2*GFS_VARIABLE (face->neighbor, kappa->i))/(w1 + w2);
+      v *= (w1*k1 + w2*k2)/(w1 + w2);
     else {
-      if (GFS_VARIABLE (face->cell, kappa->i) < G_MAXDOUBLE) {
-	if (GFS_VARIABLE (face->neighbor, kappa->i) < G_MAXDOUBLE)
-	  v *= (GFS_VARIABLE (face->cell, kappa->i) + GFS_VARIABLE (face->neighbor, kappa->i))/2.;
+      if (k1 < G_MAXDOUBLE) {
+	if (k2 < G_MAXDOUBLE)
+	  v *= (k1 + k2)/2.;
 	else
-	  v *= GFS_VARIABLE (face->cell, kappa->i);
+	  v *= k1;
       }
-      else if (GFS_VARIABLE (face->neighbor, kappa->i) < G_MAXDOUBLE)
-	v *= GFS_VARIABLE (face->neighbor, kappa->i);
+      else if (k2 < G_MAXDOUBLE)
+	v *= k2;
       else
 	v = 1e6;
     }

-- 
Gerris Flow Solver