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

[Stephane Popinet]

The following commit has been merged in the upstream branch:
commit 6be3383ca9b12f368b571620683086897be5324d
Author: Stephane Popinet <stephane.popinet at paradise.net.nz>
Date:   Sun Apr 3 19:54:34 2005 +1000

    GfsInit and GfsOutputErrorNorm can use functions of variables
    
    darcs-hash:20050403095434-fa380-0d896d13fde3fbb1a458a43aed9c0d26e4a513c5.gz

diff --git a/src/event.c b/src/event.c
index 28da161..67b306e 100644
--- a/src/event.c
+++ b/src/event.c
@@ -537,7 +537,7 @@ static void init_vf (FttCell * cell, gpointer * data)
     ftt_cell_pos (cell, &p);
   else
     gfs_cell_cm (cell, &p);
-  GFS_VARIABLE (cell, v->i) = gfs_function_value (f, NULL, &p, sim->time.t);
+  GFS_VARIABLE (cell, v->i) = gfs_function_value (f, cell, &p, sim->time.t);
 }
 
 static void init_f (GfsVariable * v, GfsFunction * f, GfsDomain * domain)
diff --git a/src/output.c b/src/output.c
index 004c3aa..a126e45 100644
--- a/src/output.c
+++ b/src/output.c
@@ -1982,7 +1982,7 @@ static void compute_error (FttCell * cell, GfsOutputScalar * o)
   else
     gfs_cell_cm (cell, &p);
   GFS_VARIABLE (cell, GFS_OUTPUT_ERROR_NORM (o)->v->i) = GFS_VARIABLE (cell, o->v->i) -
-    gfs_function_value (GFS_OUTPUT_ERROR_NORM (o)->s, NULL, &p, sim->time.t); 
+    gfs_function_value (GFS_OUTPUT_ERROR_NORM (o)->s, cell, &p, sim->time.t); 
 }
 
 static void remove_bias (FttCell * cell, gpointer * data)

-- 
Gerris Flow Solver