From 41341fbb3e78a0c6222f1d89fc043a9cc2a8c9c7 Mon Sep 17 00:00:00 2001
From: Andreas Marek <amarek@rzg.mpg.de>
Date: Mon, 30 May 2016 09:37:25 +0200
Subject: [PATCH] Prepare ELPA 2016.05.002 release

---
 Changelog                 |  7 +++++++
 INSTALL.md                |  5 ++++-
 LIBRARY_INTERFACE         |  4 +---
 README.md                 |  4 ++--
 RELEASE_NOTES             | 18 +++++-------------
 USERS_GUIDE.md            |  4 ++--
 configure.ac              |  4 ++--
 test_project/configure.ac |  4 ++--
 8 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/Changelog b/Changelog
index 58f4c07e..7b173e05 100644
--- a/Changelog
+++ b/Changelog
@@ -1,3 +1,10 @@
+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
diff --git a/INSTALL.md b/INSTALL.md
index 5ce0f46b..0930dc6b 100644
--- a/INSTALL.md
+++ b/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
 
diff --git a/LIBRARY_INTERFACE b/LIBRARY_INTERFACE
index 50ea5196..1e149592 100644
--- a/LIBRARY_INTERFACE
+++ b/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
diff --git a/README.md b/README.md
index 9a465409..bedd9a4e 100644
--- a/README.md
+++ b/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*
diff --git a/RELEASE_NOTES b/RELEASE_NOTES
index 14e256e0..7a9c21b5 100644
--- a/RELEASE_NOTES
+++ b/RELEASE_NOTES
@@ -1,26 +1,18 @@
-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 !
diff --git a/USERS_GUIDE.md b/USERS_GUIDE.md
index f243a991..44fbc49d 100644
--- a/USERS_GUIDE.md
+++ b/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
diff --git a/configure.ac b/configure.ac
index 308b9c59..6488989a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 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])
 #
 
 
diff --git a/test_project/configure.ac b/test_project/configure.ac
index a1b27abd..b4dad9c7 100644
--- a/test_project/configure.ac
+++ b/test_project/configure.ac
@@ -1,6 +1,6 @@
 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])
-- 
GitLab