Automatic determination of ELPA version

cmake/tests/test_ELPA.cmake

 #First check if we can compile with ELPA
 try_compile(FLEUR_USE_ELPA ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR}/cmake/tests/test_ELPA.f90
-LINK_LIBRARIES ${FLEUR_LIBRARIES}
-            )
+LINK_LIBRARIES ${FLEUR_LIBRARIES})
 
 message("ELPA Library found:${FLEUR_USE_ELPA}")
 
+#Now check for version of elpa
 if (FLEUR_USE_ELPA)
-   set(FLEUR_MPI_DEFINITIONS ${FLEUR_MPI_DEFINITIONS} "CPP_ELPA" "CPP_ELPA_201605003")
+    try_compile(FLEUR_USE_ELPA_OLD ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR}/cmake/tests/test_ELPA_OLD.f90
+LINK_LIBRARIES ${FLEUR_LIBRARIES})
+try_compile(FLEUR_USE_ELPA_NEW ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR}/cmake/tests/test_ELPA_NEW.f90
+LINK_LIBRARIES ${FLEUR_LIBRARIES})
+try_compile(FLEUR_USE_ELPA_201605003 ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR}/cmake/tests/test_ELPA_201605003.f90
+LINK_LIBRARIES ${FLEUR_LIBRARIES})
+    message("Version check for ELPA:")
+    message("OLD ELPA      : ${FLEUR_USE_ELPA_OLD}")
+    message("NEW ELPA      : ${FLEUR_USE_ELPA_NEW}")
+    message("201605003 ELPA: ${FLEUR_USE_ELPA_201605003}")
+#Set preprocessor switches
+   if (FLEUR_USE_ELPA_OLD)
+       set(FLEUR_MPI_DEFINITIONS ${FLEUR_MPI_DEFINITIONS} "CPP_ELPA" "CPP_ELPA2")
+   endif()
+   if (FLEUR_USE_ELPA_NEW)
+       set(FLEUR_MPI_DEFINITIONS ${FLEUR_MPI_DEFINITIONS} "CPP_ELPA" "CPP_ELPA2" "CPP_ELPA_NEW")
+   endif()
+   if (FLEUR_USE_ELPA_201605003)
+       set(FLEUR_MPI_DEFINITIONS ${FLEUR_MPI_DEFINITIONS} "CPP_ELPA" "CPP_ELPA2" "CPP_ELPA_201605003")
+   endif()
 endif() 

cmake/tests/test_ELPA.f90

@@ -2,6 +2,4 @@
       use elpa1
       integer:: ierr,mpi_subcom, myrowblacs, mycolblacs
       integer:: mpi_comm_rows,mpi_comm_cols
-      ierr=get_elpa_row_col_comms(mpi_subcom, myrowblacs, mycolblacs,        &
-     &     mpi_comm_rows, mpi_comm_cols)
       end

cmake/tests/test_ELPA_201605003.f90

+      program test
+      use elpa1
+      integer:: ierr,mpi_subcom, myrowblacs, mycolblacs
+      integer:: mpi_comm_rows,mpi_comm_cols,m,nb,mycolssca,ok
+      real :: bsca(10,10)
+      ok=CHOLESKY_real (m,bsca,SIZE(bsca,1),nb,mycolssca,mpi_comm_rows,mpi_comm_cols,.false.)      
+      end

cmake/tests/test_ELPA_NEW.f90

+      program test
+      use elpa1
+      integer:: ierr,mpi_subcom, myrowblacs, mycolblacs
+      integer:: mpi_comm_rows,mpi_comm_cols,m,nb,mycolssca,ok
+      real :: bsca(10,10)
+      CALL CHOLESKY_real (m,bsca,SIZE(bsca,1),nb,mycolssca,mpi_comm_rows,mpi_comm_cols,.false.,ok)      
+      end

cmake/tests/test_ELPA_OLD.f90

+      program test
+      use elpa1
+      integer:: ierr,mpi_subcom, myrowblacs, mycolblacs
+      integer:: mpi_comm_rows,mpi_comm_cols
+      call get_elpa_row_col_comms(mpi_subcom, myrowblacs, mycolblacs,        &
+     &     mpi_comm_rows, mpi_comm_cols)
+      end