Merge remote-tracking branch 'origin/devel'

Makefile.in

@@ -3,11 +3,11 @@
 #          S p e c f e m 3 D  G l o b e  V e r s i o n  6 . 0
 #          --------------------------------------------------
 #
-#          Main authors: Dimitri Komatitsch and Jeroen Tromp
+#     Main historical authors: Dimitri Komatitsch and Jeroen Tromp
 #                        Princeton University, USA
-#             and University of Pau / CNRS / INRIA, France
-# (c) Princeton University / California Institute of Technology and University of Pau / CNRS / INRIA
-#                            August 2013
+#                and CNRS / University of Marseille, France
+#                 (there are currently many more authors!)
+# (c) Princeton University and CNRS / University of Marseille, April 2014
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

README.md

@@ -0,0 +1,24 @@
+# Specfem3D Globe
+
+Program specfem3D from `SPECFEM3D_GLOBE` is a 3-D spectral-element solver for the Earth.
+It uses a mesh generated by program meshfem3D.
+
+Main "historical" authors: Dimitri Komatitsch and Jeroen Tromp
+  (there are currently many more!)
+
+## Installation
+
+Instructions on how to install and use `SPECFEM3D_GLOBE` are available
+in the PDF manual located in directory [doc/USER_MANUAL](doc/USER_MANUAL).
+
+## Development
+
+Development is hosted on GitHub in the
+[geodynamics/specfem3d_globe repository](https://github.com/geodynamics/specfem3d_globe).
+
+Git submodules for data files and examples are hosted on the CIG servers
+at:
+
+  * [Data](http://vcs.geodynamics.org/gitweb/?p=specfem3d_globe_data.git)
+  * [Examples](http://vcs.geodynamics.org/gitweb/?p=specfem3d_globe_examples.git)
+

configure

@@ -2,8 +2,6 @@
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.69 for Specfem3D_Globe 6.0.0.
 #
-# Report bugs to <jtromp AT princeton.edu>.
-#
 #
 # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
 #
@@ -266,8 +264,8 @@ fi
     $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should"
     $as_echo "$0: be upgraded to zsh 4.3.4 or later."
   else
-    $as_echo "$0: Please tell [email protected] and jtromp AT
-$0: princeton.edu about your system, including any error
+    $as_echo "$0: Please tell [email protected]
+$0: about your system, including any error
 $0: possibly output before this message. Then install a
 $0: modern shell, or manually run the script under such a
 $0: shell if you do have one."
@@ -582,7 +580,7 @@ PACKAGE_NAME='Specfem3D_Globe'
 PACKAGE_TARNAME='Specfem3DGlobe'
 PACKAGE_VERSION='6.0.0'
 PACKAGE_STRING='Specfem3D_Globe 6.0.0'
-PACKAGE_BUGREPORT='jtromp AT princeton.edu'
+PACKAGE_BUGREPORT='see the wiki'
 PACKAGE_URL=''
 
 ac_unique_file="src/specfem3D/specfem3D.F90"
@@ -1427,7 +1425,7 @@ Some influential environment variables:
 Use these variables to override the choices made by `configure' or to help
 it to find libraries and programs with nonstandard names/locations.
 
-Report bugs to <jtromp AT princeton.edu>.
+.
 _ACEOF
 ac_status=$?
 fi
@@ -1734,7 +1732,6 @@ $as_echo "$as_me: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >
     { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
 $as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
 ( $as_echo "## -------------------------------------- ##
-## Report this to jtromp AT princeton.edu ##
 ## -------------------------------------- ##"
      ) | sed "s/^/$as_me: WARNING:     /" >&2
     ;;
@@ -2019,7 +2016,6 @@ $as_echo "$as_me: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >
     { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
 $as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
 ( $as_echo "## -------------------------------------- ##
-## Report this to jtromp AT princeton.edu ##
 ## -------------------------------------- ##"
      ) | sed "s/^/$as_me: WARNING:     /" >&2
     ;;
@@ -6125,10 +6121,10 @@ else
     { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot compile a trivial MPI program using $MPIFC
-See \`config.log' for more details" "$LINENO" 5; }
+#     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+# $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+# as_fn_error $? "cannot compile a trivial MPI program using $MPIFC
+# See \`config.log' for more details" "$LINENO" 5; }
 
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
@@ -8001,7 +7997,7 @@ $config_links
 Configuration commands:
 $config_commands
 
-Report bugs to <jtromp AT princeton.edu>."
+."
 
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1

configure.ac

@@ -9,7 +9,7 @@ dnl You must have recent versions of Autoconf and Automake installed.
 ############################################################
 
 AC_PREREQ(2.61)
-AC_INIT([Specfem3D_Globe], [6.0.0], [jtromp AT princeton.edu], [Specfem3DGlobe])
+AC_INIT([Specfem3D_Globe], [6.0.0], [see the wiki], [Specfem3DGlobe])
 AC_CONFIG_SRCDIR([src/specfem3D/specfem3D.F90])
 
 AC_CONFIG_HEADER([setup/config.h])
@@ -164,9 +164,9 @@ AC_CHECK_HEADER(emmintrin.h,AC_DEFINE([HAVE_EMMINTRIN],[1],[Define if emmintrin.
 AC_CHECK_HEADER(xmmintrin.h,AC_DEFINE([HAVE_XMMINTRIN],[1],[Define if xmmintrin.h]))
 AC_LANG_POP(C)
 
-CIT_FC_MPI_MODULE([mpif.h], [$MPIFC], [$FLAGS_CHECK], [:], [
-    AC_MSG_FAILURE([cannot compile a trivial MPI program using $MPIFC])
-])
+# CIT_FC_MPI_MODULE([mpif.h], [$MPIFC], [$FLAGS_CHECK], [:], [
+#     AC_MSG_FAILURE([cannot compile a trivial MPI program using $MPIFC])
+# ])
 
 # Checks for libraries.