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

[Stephane Popinet]

The following commit has been merged in the upstream branch:
commit acdd7bb29fd42719852a8afc5a5f704daa91511a
Author: Stephane Popinet <popinet at users.sf.net>
Date:   Fri Jun 19 10:40:54 2009 +1000

    Added man pages for gfsjoin2D, gfsjoin3D
    
    darcs-hash:20090619004054-d4795-adeeb9f9c6ab9d532548b6e4e68b39ff918686bd.gz

diff --git a/doc/manpages/Makefile.am b/doc/manpages/Makefile.am
index 4d45227..cf7623b 100644
--- a/doc/manpages/Makefile.am
+++ b/doc/manpages/Makefile.am
@@ -19,4 +19,6 @@ dist_man_MANS = \
 	rsurfacequery.1 \
 	shapes.1 \
 	streamanime.1 \
-	xyz2rsurface.1
+	xyz2rsurface.1 \
+	gfsjoin2D.1 \
+	gfsjoin3D.1
diff --git a/doc/manpages/gfsjoin.1 b/doc/manpages/gfsjoin.1
index 8504076..bef5de0 100644
--- a/doc/manpages/gfsjoin.1
+++ b/doc/manpages/gfsjoin.1
@@ -1,4 +1,4 @@
-.TH xyz2rsurface 1 "August 9, 2008" "" "User Commands"
+.TH gfsjoin 1 "August 9, 2008" "" "User Commands"
 
 .SH NAME
 gfsjoin \- joins Gerris files.
@@ -19,7 +19,7 @@ NP:             Number of processors
 Tailname:       File tail name
 
 .SH AUTHOR
-gfsjoin was written by Stephane Popinet <s.popinet at niwa.co.nz>.
+gfsjoin was written by Daniel Fuster.
 .PP
 This manual page was written by Ruben Molina <rmolina at udea.edu.co>,
 for the Debian project (but may be used by others).
diff --git a/doc/manpages/gfsjoin2D.1 b/doc/manpages/gfsjoin2D.1
new file mode 100644
index 0000000..3dfb56d
--- /dev/null
+++ b/doc/manpages/gfsjoin2D.1
@@ -0,0 +1,29 @@
+.TH gfsjoin 1 "June 19, 2009" "" "User Commands"
+
+.SH NAME
+gfsjoin2D, gfsjoin3D \- joins several parallel Gerris simulation files
+
+.SH SYNOPSIS
+.B gfsjoin
+[OPTIONS] FILE1 FILE2 ... > JOINED
+.SH DESCRIPTION
+This manual page documents briefly the
+.B gfsjoin
+command.
+
+.SH OPTIONS
+These programs follow the usual GNU command line syntax, with long
+options starting with two dashes (`-').
+A summary of options is included below.
+.TP
+.B \-k, \-\-keep
+Keep MPI boundaries.
+.TP
+.B \-v, \-\-verbose
+Display statistics and other info.
+.TP
+.B \-h, \-\-help
+Display the help and exit.
+
+.SH AUTHOR
+gfsjoin was written by Stephane Popinet <s.popinet at niwa.co.nz>.
diff --git a/doc/manpages/gfsjoin3D.1 b/doc/manpages/gfsjoin3D.1
new file mode 100644
index 0000000..3dfb56d
--- /dev/null
+++ b/doc/manpages/gfsjoin3D.1
@@ -0,0 +1,29 @@
+.TH gfsjoin 1 "June 19, 2009" "" "User Commands"
+
+.SH NAME
+gfsjoin2D, gfsjoin3D \- joins several parallel Gerris simulation files
+
+.SH SYNOPSIS
+.B gfsjoin
+[OPTIONS] FILE1 FILE2 ... > JOINED
+.SH DESCRIPTION
+This manual page documents briefly the
+.B gfsjoin
+command.
+
+.SH OPTIONS
+These programs follow the usual GNU command line syntax, with long
+options starting with two dashes (`-').
+A summary of options is included below.
+.TP
+.B \-k, \-\-keep
+Keep MPI boundaries.
+.TP
+.B \-v, \-\-verbose
+Display statistics and other info.
+.TP
+.B \-h, \-\-help
+Display the help and exit.
+
+.SH AUTHOR
+gfsjoin was written by Stephane Popinet <s.popinet at niwa.co.nz>.

-- 
Gerris Flow Solver