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

[Stephane Popinet]

The following commit has been merged in the upstream branch:
commit 33c51854a52b4ac1a359f4ebdb00a4346961886f
Author: Stephane Popinet <popinet at users.sf.net>
Date:   Thu Sep 29 20:35:00 2005 +1000

    SourceControl does not need a timescale
    
    darcs-hash:20050929103500-d4795-d8387a97bdd30beb95b039d095afe4196ad842e8.gz

diff --git a/src/source.c b/src/source.c
index 814e424..4631234 100644
--- a/src/source.c
+++ b/src/source.c
@@ -325,30 +325,6 @@ GfsSourceGenericClass * gfs_source_class (void)
 
 /* GfsSourceControl: Object */
 
-static void source_control_destroy (GtsObject * o)
-{
-  if (GFS_SOURCE_CONTROL (o)->delay)
-    gts_object_destroy (GTS_OBJECT (GFS_SOURCE_CONTROL (o)->delay));
-
-  (* GTS_OBJECT_CLASS (gfs_source_control_class ())->parent_class->destroy) (o);
-}
-
-static void source_control_read (GtsObject ** o, GtsFile * fp)
-{
-  (* GTS_OBJECT_CLASS (gfs_source_control_class ())->parent_class->read) (o, fp);
-  if (fp->type == GTS_ERROR)
-    return;
-
-  GFS_SOURCE_CONTROL (*o)->delay = gfs_function_new (gfs_function_class (), 1.);
-  gfs_function_read (GFS_SOURCE_CONTROL (*o)->delay, gfs_object_simulation (*o), fp);
-}
-
-static void source_control_write (GtsObject * o, FILE * fp)
-{
-  (* GTS_OBJECT_CLASS (gfs_source_control_class ())->parent_class->write) (o, fp);
-  gfs_function_write (GFS_SOURCE_CONTROL (o)->delay, fp);
-}
-
 static gboolean source_control_event (GfsEvent * event, GfsSimulation * sim)
 {
   if ((* gfs_event_class ()->event) (event, sim)) {
@@ -356,7 +332,7 @@ static gboolean source_control_event (GfsEvent * event, GfsSimulation * sim)
     GtsRange r = gfs_domain_stats_variable (GFS_DOMAIN (sim), GFS_SOURCE_SCALAR (event)->v,
 					    FTT_TRAVERSE_LEAFS, -1);
     s->s = (gfs_function_value (GFS_SOURCE (s)->intensity, NULL) - r.mean)/
-      gfs_function_value (s->delay, NULL);
+      sim->advection_params.dt;
     return TRUE;
   }
   return FALSE;
@@ -371,9 +347,6 @@ static gdouble source_control_value (GfsSourceGeneric * s,
 
 static void source_control_class_init (GfsSourceGenericClass * klass)
 {
-  GTS_OBJECT_CLASS (klass)->destroy = source_control_destroy;
-  GTS_OBJECT_CLASS (klass)->read = source_control_read;
-  GTS_OBJECT_CLASS (klass)->write = source_control_write;
   GFS_EVENT_CLASS (klass)->event = source_control_event;
   klass->mac_value = klass->centered_value = source_control_value;
 }
diff --git a/src/source.h b/src/source.h
index ea53ff5..3e03792 100644
--- a/src/source.h
+++ b/src/source.h
@@ -136,9 +136,6 @@ struct _GfsSourceControl {
   /*< private >*/
   GfsSource parent;
   gdouble s;
-
-  /*< public >*/
-  GfsFunction * delay;
 };
 
 #define GFS_SOURCE_CONTROL(obj)            GTS_OBJECT_CAST (obj,\

-- 
Gerris Flow Solver