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

[Stephane Popinet]

The following commit has been merged in the upstream branch:
commit b385dade151e16d7080ad343ccc90e3e98591b38
Author: Stephane Popinet <s.popinet at niwa.co.nz>
Date:   Fri Sep 16 08:47:38 2005 +1000

    OutputEnergy has been removed (it can be done better using functions)
    
    darcs-hash:20050915224738-fbd8f-c9fe019da8843448084bd226343ed4f84a5ac952.gz

diff --git a/src/init.c b/src/init.c
index dbdc788..04c2c08 100644
--- a/src/init.c
+++ b/src/init.c
@@ -215,7 +215,6 @@ void gfs_init (int * argc, char *** argv)
       gfs_output_location_class ();
       gfs_output_simulation_class ();
       gfs_output_boundaries_class ();
-      gfs_output_energy_class ();
       gfs_output_particle_class ();
 
       gfs_output_scalar_class ();
diff --git a/src/output.c b/src/output.c
index c35859c..d5085c0 100644
--- a/src/output.c
+++ b/src/output.c
@@ -2068,74 +2068,6 @@ GfsOutputClass * gfs_output_scalar_histogram_class (void)
   return klass;
 }
 
-/* GfsOutputEnergy: Object */
-
-typedef struct {
-  GtsRange ps;
-  gdouble ke, pe;
-  GfsVariable ** u, * p;
-} EnergyParams;
-
-static void add_energy (FttCell * cell, EnergyParams * p)
-{
-  gdouble vol = gfs_cell_volume (cell);
-
-  p->ke += vol*gfs_vector_norm2 (cell, p->u);
-  p->pe += vol*(GFS_VARIABLE (cell, p->p->i) - p->ps.mean)*(GFS_VARIABLE (cell, p->p->i) - p->ps.mean);
-}
-
-static gboolean gfs_output_energy_event (GfsEvent * event,
-					 GfsSimulation * sim)
-{
-  if ((* GFS_EVENT_CLASS (GTS_OBJECT_CLASS (gfs_output_energy_class ())->parent_class)->event) 
-      (event, sim)) {
-    GfsOutput * output = GFS_OUTPUT (event);
-    EnergyParams p;
-
-    p.p = gfs_variable_from_name (GFS_DOMAIN (sim)->variables, "P");
-    p.u = gfs_domain_velocity (GFS_DOMAIN (sim));
-    p.ps = gfs_domain_stats_variable (GFS_DOMAIN (sim), p.p,
-				      FTT_TRAVERSE_LEAFS|FTT_TRAVERSE_LEVEL, -1);
-    p.pe = p.ke = 0.;
-
-    gfs_domain_cell_traverse (GFS_DOMAIN (sim),
-			      FTT_PRE_ORDER, 
-			      FTT_TRAVERSE_LEAFS|FTT_TRAVERSE_LEVEL, -1,
-			      (FttCellTraverseFunc) add_energy, &p);
-    fprintf (output->file->fp,
-	     "Energy time: %g kinetic: %10.3e potential: %10.3e\n",
-	     sim->time.t, p.ke, p.pe/sim->physical_params.g);
-    return TRUE;
-  }
-  return FALSE;
-}
-
-static void gfs_output_energy_class_init (GfsOutputClass * klass)
-{
-  GFS_EVENT_CLASS (klass)->event = gfs_output_energy_event;
-}
-
-GfsOutputClass * gfs_output_energy_class (void)
-{
-  static GfsOutputClass * klass = NULL;
-
-  if (klass == NULL) {
-    GtsObjectClassInfo gfs_output_energy_info = {
-      "GfsOutputEnergy",
-      sizeof (GfsOutput),
-      sizeof (GfsOutputClass),
-      (GtsObjectClassInitFunc) gfs_output_energy_class_init,
-      (GtsObjectInitFunc) NULL,
-      (GtsArgSetFunc) NULL,
-      (GtsArgGetFunc) NULL
-    };
-    klass = gts_object_class_new (GTS_OBJECT_CLASS (gfs_output_class ()),
-				  &gfs_output_energy_info);
-  }
-
-  return klass;
-}
-
 /* GfsOutputErrorNorm: Object */
 
 static void output_error_norm_destroy (GtsObject * o)
diff --git a/src/output.h b/src/output.h
index 1fdbd9b..6d4ee2c 100644
--- a/src/output.h
+++ b/src/output.h
@@ -227,10 +227,6 @@ struct _GfsOutputScalarHistogram {
 
 GfsOutputClass * gfs_output_scalar_histogram_class  (void);
 
-/* GfsOutputEnergy: Header */
-
-GfsOutputClass * gfs_output_energy_class  (void);
-
 /* GfsOutputErrorNorm: Header */
 
 typedef struct _GfsOutputErrorNorm        GfsOutputErrorNorm;

-- 
Gerris Flow Solver