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

[Stephane Popinet]

The following commit has been merged in the upstream branch:
commit cceffd2170507915a4c585a88a6a432173dad5c7
Author: Stephane Popinet <popinet at users.sf.net>
Date:   Sun Feb 5 12:20:02 2006 +1100

    OutputTiming also reports the maximum number of variables allocated
    
    darcs-hash:20060205012002-d4795-30256af2f67bcb23102d424fcb37041a9b790020.gz

diff --git a/src/domain.h b/src/domain.h
index 12695ca..8c7a36c 100644
--- a/src/domain.h
+++ b/src/domain.h
@@ -81,6 +81,7 @@ struct _GfsDomainClass {
 #define GFS_IS_DOMAIN(obj)         (gts_object_is_from_class (obj,\
 						   gfs_domain_class ()))
 
+#define gfs_domain_variables_number(d) ((d)->allocated->len - 1)
 #define gfs_domain_variables_size(d)   (sizeof (GfsStateVector) +\
                                         sizeof (gdouble)*((d)->allocated->len - 1))
      
diff --git a/src/output.c b/src/output.c
index d4d55aa..989003f 100644
--- a/src/output.c
+++ b/src/output.c
@@ -889,7 +889,8 @@ static gboolean timing_event (GfsEvent * event, GfsSimulation * sim)
 	       "  timestep:\n"
 	       "      min: %9.3f avg: %9.3f         | %7.3f max: %9.3f\n"
                "  domain size:\n"
-	       "      min: %9.0f avg: %9.0f         | %7.0f max: %9.0f\n",
+	       "      min: %9.0f avg: %9.0f         | %7.0f max: %9.0f\n"
+	       "  maximum number of variables: %d\n",
 	       domain->timestep.n,
 	       domain->size.mean/domain->timestep.mean,
 	       domain->timestep.min,
@@ -899,7 +900,8 @@ static gboolean timing_event (GfsEvent * event, GfsSimulation * sim)
 	       domain->size.min,
 	       domain->size.mean,
 	       domain->size.stddev, 
-	       domain->size.max);
+	       domain->size.max,
+	       gfs_domain_variables_number (domain));
       data[0] = fp;
       data[1] = domain;
       g_hash_table_foreach (domain->timers, (GHFunc) timer_print, data);

-- 
Gerris Flow Solver