Merge branch 'bugfixes_current_release' into loh/master

Changelog

+Changelog for release ELPA 2016.05.001
+
+- fix problem with generated *.sh- check scripts
+- name library differently if build without MPI support
+
+
+
 Changelog for release ELPA 2016.05.001
 
 - support building without MPI for one node usage

INSTALL.md

@@ -2,7 +2,7 @@
 
 ## Preamle ##
 
-This file provides documentation on how to build the *ELPA* library in **version ELPA-2016.05.001**.
+This file provides documentation on how to build the *ELPA* library in **version ELPA-2016.05.002**.
 Although most of the documentation is generic to any *ELPA* release, some configure options
 described in this document might be specific to the above mentioned version of *ELPA*.
 
@@ -110,6 +110,9 @@ by applications, which do not have any MPI parallelisation. To set this version,
 "--with-mpi=0" configure flag. It is strongly recommmended to also set the "--enable-openmp"
 option, otherwise no parallelisation whatsoever will be present.
 
+It is possible to install the different flavours of ELPA (with/without MPI, with/without OpenMP) in the same
+directory, since the library is named differently for each build.
+
 ### Doxygen documentation ###
 A doxygen documentation can be created with the "--enable-doxygen-doc" configure option
 

LIBRARY_INTERFACE

@@ -37,6 +37,4 @@ https://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
   Compatible API change w.r.t. previous version: Interfaces have been added to unify
   the naming conventions. The old interface are still available
 
-  The state of release 2016.05.001 defines this interface
-
-
+  The states of release 2016.05.001 and 2016.05.002 define this interface

Makefile.am

@@ -352,8 +352,9 @@ endif
 
 
 # test scripts
+MPIEXEC ?= mpiexec -n 2
 if WITH_MPI
-  wrapper=mpiexec -n 2
+  wrapper=$(MPIEXEC)
 else
   wrapper=
 endif

README.md

@@ -2,7 +2,7 @@
 
 ## Current Release ##
 
-The current release is ELPA 2016.05.001
+The current release is ELPA 2016.05.002
 
 ## About *ELPA*
 
@@ -87,7 +87,7 @@ the possible configure options.
 ## Using *ELPA*
 
 Please have a look at the "**USERS_GUIDE**" file, to get a documentation or at the [online]
-(http://elpa.mpcdf.mpg.de/html/Documentation/ELPA-2016.05.001/html/index.html) doygen
+(http://elpa.mpcdf.mpg.de/html/Documentation/ELPA-2016.05.002/html/index.html) doygen
 documentation, where you find the definition of the interfaces.
 
 ## Contributing to *ELPA*

RELEASE_NOTES

-This file contains the release notes for the ELPA 2016.05.001 version
+This file contains the release notes for the ELPA 2016.05.002 version
 
 What is new?
 -------------
-For changes since release ELPA 2015.11.011 please have a loog at the Changelog file
+For changes since release ELPA 2016.05.001 please have a look at the Changelog file
 
 
 a) ABI change
 ---------------------
 
-Most importantly, the ABI of the ELPA library changed!
-New interfaces have been added, the old ones still exists, thus a rebuild
-of your code (build with ELPA 2015.11.001) should not be necessary. However,
-it is not guaranteed whether your Fortran compiler produces compatible
-Fortran modules if content is added to this modules. To be on the safe sight,
-re-compiling your application with the new ELPA version is not a bad idea.
+Since release 2016.05.001 the ABI has not changed
 
-For details of the ABI changes (including the history of changes) please have a
-look at the "LIBRARY_INTERFACE" file
 
 Any incompatibilities to previous version?
 ---------------------------------------
 
-As mentioned before, the ABI of ELPA was changed such, that there should be no
-incompatibility with the previous version ELPA 2015.11.001. There is an
-incompatibility with older versions than ELPA 2015.11.001 !
+As mentioned before, the ABI of ELPA was not changed; There is no
+incompatibility with the previous version ELPA 2016.05.001. and ELPA 2015.11.001 releases. There is, however, an incompatibility with older versions than ELPA 2015.11.001 !

USERS_GUIDE.md

@@ -9,7 +9,7 @@ Local documentation (via man pages) should be available (if *ELPA* has been inst
 For example "man get_elpa_communicators" should provide the documentation for the *ELPA* function which sets
 the necessary communicators.
 
-Also a [online doxygen documentation] (http://elpa.mpcdf.mpg.de/html/Documentation/ELPA-2016.05.001/html/index.html)
+Also a [online doxygen documentation] (http://elpa.mpcdf.mpg.de/html/Documentation/ELPA-2016.05.002/html/index.html)
 for each *ELPA* release is available.
 
 ### General concept of the  *ELPA* library ###
@@ -20,7 +20,7 @@ The *ELPA* library consists of two main parts:
 
 Both variants of the *ELPA* solvers are available for real or complex valued matrices.
 
-Thus *ELPA* provides the following user functions (see man pages or [online] (http://elpa.mpcdf.mpg.de/html/Documentation/ELPA-2016.05.001/html/index.html) for details):
+Thus *ELPA* provides the following user functions (see man pages or [online] (http://elpa.mpcdf.mpg.de/html/Documentation/ELPA-2016.05.002/html/index.html) for details):
 
 - get_elpa_communicators   : set the row / column communicators for *ELPA*
 - solve_evp_complex_1stage : solve a complex valued eigenvale proplem with the *ELPA 1stage* solver

configure.ac

 AC_PREREQ([2.69])
 
 # Remember to change the version also in elpa.spec
-AC_INIT([elpa],[2016.05.001], [elpa-library@mpcdf.mpg.de])
+AC_INIT([elpa],[2016.05.002], [elpa-library@mpcdf.mpg.de])
 
 AC_SUBST([PACKAGE_VERSION])
 
@@ -34,7 +34,7 @@ AM_SILENT_RULES([yes])
 #    by the current interface, as they are ABI compatible (e.g. only new symbols
 #    were added by the new interface)
 #
-AC_SUBST([ELPA_SO_VERSION], [5:0:1])
+AC_SUBST([ELPA_SO_VERSION], [5:1:1])
 #
 
 
@@ -887,11 +887,20 @@ mkdir modules private_modules
 # into "postdeps_FC" and causes linking errors later on.
 postdeps_FC=$(echo $postdeps_FC | sed 's/-l //g')
 
-if test x"${enable_openmp}" = x"yes"; then
+if test x"${with_mpi}" = x"yes"; then
+  if test x"${enable_openmp}" = x"yes"; then
 	SUFFIX="_openmp"
-else
+  else
 	SUFFIX=""
+  fi
+else
+  if test x"${enable_openmp}" = x"yes"; then
+	SUFFIX="_onnode_openmp"
+  else
+	SUFFIX="_onenode"
+  fi
 fi
+
 AC_SUBST([SUFFIX])
 AC_SUBST([PKG_CONFIG_FILE],[elpa${SUFFIX}-${PACKAGE_VERSION}.pc])
 

test/fortran_test_programs/test_real2_default_kernel_qr_decomposition.F90

@@ -144,7 +144,7 @@ program test_real2
    !endif
 
    ! override nblk
-   !   nblk = 2
+       nblk = 32
    !   na   = 4000
    !   nev  = 1500
 

test_project/configure.ac

 AC_PREREQ([2.69])
-AC_INIT([elpa_test_project],[2016.05.001], elpa-library@rzg.mpg.de)
-elpaversion="2016.05.001"
+AC_INIT([elpa_test_project],[2016.05.002], elpa-library@rzg.mpg.de)
+elpaversion="2016.05.002"
 AC_CONFIG_SRCDIR([src/test_real.F90])
 
 AM_INIT_AUTOMAKE([foreign -Wall subdir-objects])

test_project/src/test_real.F90

@@ -74,9 +74,9 @@ program test_real_example
 !-------------------------------------------------------------------------------
    use ELPA1
    use elpa_utilities, only : error_unit
-   ! use elpa_mpi
    use iso_c_binding
    implicit none
+   include "mpif.h"
 
    include "mpif.h"