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

[Stephane Popinet]

The following commit has been merged in the upstream branch:
commit 0bd62f756af51e97cdf9522ff98444a644dbda3d
Author: Stephane Popinet <popinet at users.sf.net>
Date:   Thu Sep 13 07:53:12 2007 +1000

    Added clock start/stop to avoid harmless warnings
    
    darcs-hash:20070912215312-d4795-35845a674a75bef9d8505316e48686ff1536aba4.gz

diff --git a/src/gerris.c b/src/gerris.c
index e7b712a..e295fb8 100644
--- a/src/gerris.c
+++ b/src/gerris.c
@@ -217,7 +217,9 @@ int main (int argc, char * argv[])
 
   domain = GFS_DOMAIN (simulation);
   if (split) {
+    gfs_clock_start (domain->timer);
     gfs_simulation_refine (simulation);
+    gfs_clock_stop (domain->timer);
     while (split) {
       gfs_domain_split (domain, TRUE);
       split--;
diff --git a/tools/gfs2oogl.c b/tools/gfs2oogl.c
index 7a8b64c..99f39da 100644
--- a/tools/gfs2oogl.c
+++ b/tools/gfs2oogl.c
@@ -1012,8 +1012,10 @@ int main (int argc, char * argv[])
       fprintf (stderr, "gfs2oogl: processing t = %10e\n", simulation->time.t);
 
     if (reinit) {
+      gfs_clock_start (domain->timer);
       gfs_simulation_refine (simulation);
       gfs_simulation_init (simulation);
+      gfs_clock_stop (domain->timer);
     }
 
     if (var != NULL) {
diff --git a/tools/gfscompare.c b/tools/gfscompare.c
index 49bfc4d..b6f2d29 100644
--- a/tools/gfscompare.c
+++ b/tools/gfscompare.c
@@ -620,10 +620,14 @@ int main (int argc, char * argv[])
     GtsSurface * ss1, * ss2;
     gpointer data[3];
 
+    gfs_clock_start (GFS_DOMAIN (s1)->timer);
+    gfs_clock_start (GFS_DOMAIN (s2)->timer);
     gfs_simulation_refine (s1);
     gfs_simulation_refine (s2);
     gfs_set_merged (GFS_DOMAIN (s1));
     gfs_set_merged (GFS_DOMAIN (s2));
+    gfs_clock_stop (GFS_DOMAIN (s1)->timer);
+    gfs_clock_stop (GFS_DOMAIN (s2)->timer);
     ss1 = surface_from_domain (GFS_DOMAIN (s1));
     ss2 = surface_from_domain (GFS_DOMAIN (s2));
     data[0] = ss2;

-- 
Gerris Flow Solver