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

[Stephane Popinet]

The following commit has been merged in the upstream branch:
commit 57943c3f06a1085f6d4a091f30b2596bf0f659f3
Author: Stephane Popinet <popinet at users.sf.net>
Date:   Wed May 13 12:09:17 2009 +1000

    Debian packages are built with MPI support
    
    darcs-hash:20090513020917-d4795-a46dc61dcb914de0ffa6477f6f1d9de23d2489a1.gz

diff --git a/Makefile.am b/Makefile.am
index efbae0b..f16251c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -30,6 +30,7 @@ changelog:
 
 debian-snapshot: $(DARCS_CHANGELOG) config.h src/version.h
 	sh debian/changelog.sh
+	sh debian/control.sh
 	dpkg-buildpackage -rfakeroot -b
 	rm -f debian/repo/*
 	mv -f ../*.changes ../*.deb debian/repo
diff --git a/debian/control b/debian/control
index f38c393..20d5552 100644
--- a/debian/control
+++ b/debian/control
@@ -5,6 +5,7 @@ Maintainer: Stephane Popinet <popinet at users.sf.net>
 Build-Depends: cdbs, debhelper (>= 5), autotools-dev, libglib2.0-dev,
 	       libgts-snapshot-dev,
 	       libnetcdf-dev, libgsl0-dev, proj,
+               libopenmpi-dev [i386 amd64], openmpi-bin [i386 amd64],
 	       python, g77 | gfortran, chrpath
 Homepage: http://gfs.sourceforge.net/
 
diff --git a/debian/rules b/debian/rules
index 0239cf9..a8abfe2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,8 +3,6 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk
 
-DEB_CONFIGURE_EXTRA_FLAGS = --disable-mpi
-
 GFS_VERSION = $(shell grep -o "[0-9]*\.[0-9]*\.[0-9]*" $(CURDIR)/debian/changelog)
 DEB_DH_MAKESHLIBS_ARGS_ALL = -- -v$(GFS_VERSION) -c0
 
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/init.c b/src/init.c
index e878738..f07cbc9 100644
--- a/src/init.c
+++ b/src/init.c
@@ -128,9 +128,6 @@ GtsObjectClass ** gfs_classes (void)
     gfs_boundary_outflow_class (),
     gfs_boundary_gradient_class (),
     gfs_boundary_periodic_class (),
-#ifdef HAVE_MPI
-    gfs_boundary_mpi_class (),
-#endif /* HAVE_MPI */
 
   gfs_refine_class (),
     gfs_refine_solid_class (),
@@ -295,6 +292,9 @@ void gfs_init (int * argc, char *** argv)
 
   /* Instantiates classes before reading any domain or simulation file */
   gfs_classes ();
+#ifdef HAVE_MPI
+  gfs_boundary_mpi_class ();
+#endif /* HAVE_MPI */
 
   /* If modules are not supported, calls modules init functions */
 #include "modules.c"

-- 
Gerris Flow Solver