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

[Stephane Popinet]

The following commit has been merged in the upstream branch:
commit 9b570af59b280c0b7e1335381366afb6a20ae13a
Author: Stephane Popinet <popinet at users.sf.net>
Date:   Fri Jul 17 12:55:08 2009 +1000

    Various small fixes
    
    darcs-hash:20090717025508-d4795-abb170d802a63fbb92656db82feec8eed9655a0c.gz

diff --git a/autogen.sh b/autogen.sh
index a9b4e78..7dd7435 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,6 +1,12 @@
 #!/bin/sh
 # Run this to generate all the initial makefiles, etc.
 
+# a fix for older automake/autoconf versions
+if test -e m4; then :
+else
+    mkdir m4
+fi
+
 srcdir=`dirname $0`
 test -z "$srcdir" && srcdir=.
 
diff --git a/doc/examples/classes.c b/doc/examples/classes.c
index 4e42203..d8ba6fb 100644
--- a/doc/examples/classes.c
+++ b/doc/examples/classes.c
@@ -14,7 +14,6 @@ int main (int argc, char * argv[])
 {
   GtsObjectClass ** klass;
 
-  gfs_init (&argc, &argv);
   klass = gfs_classes ();
 
   printf ("# Language file for source-highlight\n"
diff --git a/src/domain.c b/src/domain.c
index ce7096b..03a85bb 100644
--- a/src/domain.c
+++ b/src/domain.c
@@ -539,17 +539,15 @@ static void domain_class_init (GfsDomainClass * klass)
 
 static void domain_init (GfsDomain * domain)
 {
+  domain->pid = -1;
+
 #ifdef HAVE_MPI
   int size;
 
   MPI_Comm_size (MPI_COMM_WORLD, &size);
   if (size > 1)
     MPI_Comm_rank (MPI_COMM_WORLD, &domain->pid);
-  else
-    domain->pid = -1;
-#else /* not HAVE_MPI */
-  domain->pid = -1;
-#endif /* not HAVE_MPI */
+#endif /* HAVE_MPI */
 
   domain->timer = gfs_clock_new ();
   domain->timers = g_hash_table_new (g_str_hash, g_str_equal);
diff --git a/src/mpi_boundary.c b/src/mpi_boundary.c
index 8951196..ddd0379 100644
--- a/src/mpi_boundary.c
+++ b/src/mpi_boundary.c
@@ -245,6 +245,17 @@ static void gfs_boundary_mpi_init (GfsBoundaryMpi * boundary)
     g_free (fname);
   }
 #endif
+  static gboolean initialized = FALSE;
+  if (!initialized) {
+    int * tagub, flag, maxtag;
+    MPI_Attr_get (MPI_COMM_WORLD, MPI_TAG_UB, &tagub, &flag);
+    if (flag)
+      maxtag = *tagub;
+    else
+      maxtag = 32767; /* minimum value from MPI standard specification */
+    tag_shift = maxtag/FTT_NEIGHBORS;
+    initialized = TRUE;
+  }
 #endif /* HAVE_MPI */
 }
 
@@ -264,15 +275,6 @@ GfsBoundaryClass * gfs_boundary_mpi_class (void)
     };
     klass = gts_object_class_new (GTS_OBJECT_CLASS (gfs_boundary_periodic_class ()),
 				  &gfs_boundary_mpi_info);
-#ifdef HAVE_MPI
-    int * tagub, flag, maxtag;
-    MPI_Attr_get (MPI_COMM_WORLD, MPI_TAG_UB, &tagub, &flag);
-    if (flag)
-      maxtag = *tagub;
-    else
-      maxtag = 32767; /* minimum value from MPI standard specification */
-    tag_shift = maxtag/FTT_NEIGHBORS;
-#endif /* HAVE_MPI */
   }
 
   return klass;
diff --git a/test/capwave/capwave.sh b/test/capwave/capwave.sh
index 3acc2c6..d2dc43f 100755
--- a/test/capwave/capwave.sh
+++ b/test/capwave/capwave.sh
@@ -53,7 +53,8 @@ if test -f clsvof.tex ; then
       set output 'convergence.eps'
       set xlabel 'Number of grid points'
       set ylabel 'Relative RMS error'
-      set logscale
+      set logscale y
+      set logscale x 2
       set grid
       plot [5:200][1e-4:1]'gerris.tex' u (2**(\$0 + 2)):1 t "Gerris" w lp, 'prost.tex' u (2**(\$0 + 2)):1 t "PROST" w lp, 'markers.tex' u (2**(\$0 + 2)):1 t "Markers" w lp, 'clsvof.tex' u (2**(\$0 + 2)):1 t "CLSVOF" w lp, 'surfer.tex' u (2**(\$0 + 2)):1 t "Surfer" w lp, 2./x**2 t "Second order"
 EOF
diff --git a/tools/daily b/tools/daily
index 12faae0..575385c 100755
--- a/tools/daily
+++ b/tools/daily
@@ -69,8 +69,9 @@ darcs_upgrade()
 	   ( darcs changes --last=1 --xml-output | \
 	      awk 'BEGIN{RS=" ";FS="="} {
                 if ($1 == "date") 
-                  printf ("%s-%s-%s", substr($2,8,2), substr($2,6,2), substr($2,2,4));
+                  printf ("%s-%s-%s", substr($2,2,4), substr($2,6,2), substr($2,8,2));
                }' > $package"_current" ) && \
+	    darcs tag $(cat $package"_current") && \
 	    darcs push -a --no-set-default $1 ; then
 	    return 0;
 	else
diff --git a/tools/darcs2dist b/tools/darcs2dist
index 4515690..e23f097 100755
--- a/tools/darcs2dist
+++ b/tools/darcs2dist
@@ -28,7 +28,7 @@ url=$3
 
 wrkdir=`mktemp -d /tmp/darcs2dist.XXXXXX`
 cd $wrkdir
-if ( darcs get $repo $package && \
+if ( darcs get --partial $repo $package && \
      cd $package && \
      version=`darcsversion` && \
      login=`echo $url | awk 'BEGIN{FS=":"}{print $1}'` && \

-- 
Gerris Flow Solver