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

[Stephane Popinet]

The following commit has been merged in the upstream branch:
commit 6d8eac0ff64f4d9d14979c1ea5ee7b1fecbfb603
Author: Stephane Popinet <popinet at users.sf.net>
Date:   Thu Sep 4 14:15:05 2008 +1000

    gfs2oogl outputs dimensional values in mixed cells
    
    darcs-hash:20080904041505-d4795-62efed387ff2f7d95745998b3ac8407fad709ebd.gz

diff --git a/tools/gfs2oogl.c b/tools/gfs2oogl.c
index 99f39da..8382ec1 100644
--- a/tools/gfs2oogl.c
+++ b/tools/gfs2oogl.c
@@ -154,7 +154,7 @@ static void output_mixed_pressure (FttCell * cell, GfsVariable * p)
   GfsSolidVector * s = GFS_STATE (cell)->solid;
 
   printf ("%g %g %g %g\n", s->ca.x, s->ca.y, s->ca.z, 
-	  gfs_cell_dirichlet_value (cell, p, -1));
+	  gfs_dimensional_value (p, gfs_interpolate (cell, s->ca, p)));
 }
 
 static void output_mixed_variable (FttCell * cell, GfsVariable * v)
@@ -162,7 +162,7 @@ static void output_mixed_variable (FttCell * cell, GfsVariable * v)
   GfsSolidVector * s = GFS_STATE (cell)->solid;
 
   printf ("%g %g %g %g\n", s->ca.x, s->ca.y, s->ca.z,
-	  GFS_VARIABLE (cell, v->i));
+	  gfs_dimensional_value (v, GFS_VALUE (cell, v)));
 }
 
 /* SVertex: Header */

-- 
Gerris Flow Solver