Mark solve_evp_1stage routines as legacy

Makefile.am

@@ -12,7 +12,7 @@ noinst_LTLIBRARIES = libelpa@SUFFIX@_public.la
 libelpa@SUFFIX@_public_la_FCFLAGS = $(AM_FCFLAGS) @FC_MODOUT@modules @FC_MODINC@private_modules
 libelpa@SUFFIX@_public_la_SOURCES = \
 	src/elpa.F90 \
-        src/elpa1/elpa1.F90 \
+        src/elpa1/legacy_interface/elpa1_legacy.F90 \
         src/elpa1/elpa1_new_interface.F90 \
         src/elpa2/elpa2.F90 \
         src/elpa2/elpa2_new_interface.F90 \
@@ -56,7 +56,7 @@ EXTRA_libelpa@SUFFIX@_private_la_DEPENDENCIES = \
         src/elpa1/elpa1_compute_template.X90 \
         src/elpa2/elpa2_compute_real_template.X90 \
         src/elpa2/elpa2_compute_complex_template.X90 \
-	src/elpa1/elpa1_template.X90 \
+	src/elpa1/legacy_interface/elpa1_template_legacy.X90 \
 	src/elpa1/elpa1_template_new_interface.X90 \
 	src/elpa2/elpa2_template.X90 \
 	src/elpa2/elpa2_template_new_interface.X90 \
@@ -1109,7 +1109,7 @@ EXTRA_DIST = \
   src/elpa2/elpa2_bandred_template.X90 \
   src/elpa2/elpa2_herm_matrix_allreduce_complex_template.X90 \
   src/elpa2/elpa2_symm_matrix_allreduce_real_template.X90 \
-  src/elpa1/elpa1_template.X90 \
+  src/elpa1/legacy_interface/elpa1_template_legacy.X90 \
   src/elpa1/elpa1_template_new_interface.X90 \
   src/elpa2/elpa2_template.X90 \
   src/elpa2/elpa2_template_new_interface.X90 \

src/elpa.F90

@@ -55,7 +55,7 @@
 !> \brief Fortran module which provides the routines to the ELPA solver (1 and 2 stage)
 module ELPA
   use, intrinsic :: iso_c_binding, only : c_double, c_int, c_float, c_float_complex, c_double_complex
-  use elpa1
+  use elpa1_legacy
   use elpa2
 
   implicit none

src/elpa1/elpa1.F90 → src/elpa1/legacy_interface/elpa1_legacy.F90

@@ -81,7 +81,7 @@
 #include "config-f90.h"
 
 !> \brief Fortran module which provides the routines to use the one-stage ELPA solver
-module ELPA1
+module ELPA1_legacy
   use, intrinsic :: iso_c_binding
   use elpa_utilities
   use elpa1_auxiliary_legacy
@@ -559,8 +559,8 @@ end function elpa_get_communicators
 
 #define REALCASE 1
 #define DOUBLE_PRECISION 1
-#include "../precision_macros.h"
-#include "elpa1_template.X90"
+#include "../../precision_macros.h"
+#include "./elpa1_template_legacy.X90"
 #undef REALCASE
 #undef DOUBLE_PRECISION
 
@@ -603,8 +603,8 @@ end function elpa_get_communicators
 
 #define REALCASE 1
 #define SINGLE_PRECISION 1
-#include "../precision_macros.h"
-#include "elpa1_template.X90"
+#include "../../precision_macros.h"
+#include "./elpa1_template_legacy.X90"
 #undef REALCASE
 #undef SINGLE_PRECISION
 #endif /* WANT_SINGLE_PRECISION_REAL */
@@ -646,8 +646,8 @@ end function elpa_get_communicators
 !>  \result                     success
 #define COMPLEXCASE 1
 #define DOUBLE_PRECISION 1
-#include "../precision_macros.h"
-#include "elpa1_template.X90"
+#include "../../precision_macros.h"
+#include "./elpa1_template_legacy.X90"
 #undef DOUBLE_PRECISION
 #undef COMPLEXCASE
 
@@ -692,10 +692,10 @@ end function elpa_get_communicators
 
 #define COMPLEXCASE 1
 #define SINGLE_PRECISION
-#include "../precision_macros.h"
-#include "elpa1_template.X90"
+#include "../../precision_macros.h"
+#include "./elpa1_template_legacy.X90"
 #undef COMPLEXCASE
 #undef SINGLE_PRECISION
 #endif /* WANT_SINGLE_PRECISION_COMPLEX */
 
-end module ELPA1
+end module ELPA1_legacy

src/elpa1/elpa1_template.X90 → src/elpa1/legacy_interface/elpa1_template_legacy.X90

@@ -52,7 +52,7 @@
 ! distributed along with the original code in the file "COPYING".
 #endif
 
-#include "../sanity.X90"
+#include "../../sanity.X90"
 
 function elpa_solve_evp_&
          &MATH_DATATYPE&
@@ -108,7 +108,7 @@ function elpa_solve_evp_&
    &MATH_DATATYPE&
    &_1stage_&
    &PRECISION&
-   &")
+   &_legacy")
 
    call mpi_comm_rank(mpi_comm_rows,my_prow,mpierr)
    call mpi_comm_rank(mpi_comm_cols,my_pcol,mpierr)
@@ -174,7 +174,7 @@ function elpa_solve_evp_&
    &MATH_DATATYPE&
    &_1stage_&
    &PRECISION&
-   &")
+   &_legacy")
 
 end function
 

src/elpa1_c_interface_template.X90

@@ -58,7 +58,7 @@
      &_precision")
 
     use, intrinsic :: iso_c_binding
-    use elpa1
+    use elpa1_legacy
 
     implicit none
     integer(kind=c_int)                    :: success

src/elpa2/elpa2.F90

@@ -59,7 +59,7 @@ module ELPA2
 ! Version 1.1.2, 2011-02-21
 
   use elpa_utilities
-  use elpa1, only : elpa_print_times, time_evp_back, time_evp_fwd, time_evp_solve
+  use elpa1_legacy, only : elpa_print_times, time_evp_back, time_evp_fwd, time_evp_solve
   use elpa2_utilities
 
   implicit none

src/elpa2/elpa2_print_kernels.F90

@@ -68,7 +68,7 @@
 program print_available_elpa2_kernels
 
    use precision
-   use ELPA1
+   use elpa1_legacy
    use ELPA2
 
    use elpa2_utilities

src/elpa_c_interface.F90

@@ -56,7 +56,7 @@
                                           mpi_comm_rows, mpi_comm_cols)     &
                                           result(mpierr) bind(C,name="get_elpa_row_col_comms")
     use, intrinsic :: iso_c_binding
-    use elpa1, only : elpa_get_communicators
+    use elpa1_legacy, only : elpa_get_communicators
 
     implicit none
     integer(kind=c_int)         :: mpierr
@@ -82,7 +82,7 @@
                                           mpi_comm_rows, mpi_comm_cols)     &
                                           result(mpierr) bind(C,name="get_elpa_communicators")
     use, intrinsic :: iso_c_binding
-    use elpa1, only : elpa_get_communicators
+    use elpa1_legacy, only : elpa_get_communicators
 
     implicit none
     integer(kind=c_int)         :: mpierr
@@ -109,7 +109,7 @@
                                           mpi_comm_rows, mpi_comm_cols)     &
                                           result(mpierr) bind(C,name="elpa_get_communicators")
     use, intrinsic :: iso_c_binding
-    use elpa1, only : elpa_get_communicators
+    use elpa1_legacy, only : elpa_get_communicators
 
     implicit none
     integer(kind=c_int)         :: mpierr

test/Fortran/elpa_tests.F90

@@ -57,7 +57,7 @@ program test_all_real
 !
 !-------------------------------------------------------------------------------
    use precision
-   use elpa1
+   use elpa1_legacy
    use elpa2
    use elpa_utilities, only : error_unit, map_global_array_index_to_local_index
    use elpa2_utilities

test/Fortran/read_real.F90

@@ -62,7 +62,7 @@ program read_real
 !-------------------------------------------------------------------------------
 
    use precision
-   use ELPA1
+   use elpa1_legacy
    use elpa_utilities, only : error_unit
 #ifdef WITH_OPENMP
    use test_util

test/Fortran/test_cholesky_complex.F90

@@ -46,7 +46,7 @@
 program test_cholesky
 
    use precision
-   use ELPA1
+   use elpa1_legacy
    use elpa_utilities
 #ifdef WITH_OPENMP
    use test_util

test/Fortran/test_cholesky_complex_single.F90

@@ -46,7 +46,7 @@
 program test_cholesky
 
    use precision
-   use ELPA1
+   use elpa1_legacy
    use elpa_utilities
 #ifdef WITH_OPENMP
    use test_util

test/Fortran/test_cholesky_real.F90

@@ -46,7 +46,7 @@
 program test_cholesky
 
    use precision
-   use ELPA1
+   use elpa1_legacy
    use elpa_utilities
 #ifdef WITH_OPENMP
    use test_util

test/Fortran/test_cholesky_real_single.F90

@@ -46,7 +46,7 @@
 program test_cholesky
 
    use precision
-   use ELPA1
+   use elpa1_legacy
    use elpa_utilities
 #ifdef WITH_OPENMP
    use test_util

test/Fortran/test_complex.F90

@@ -73,7 +73,7 @@ program test_complex_double_precision
 ! distributed along with the original code in the file "COPYING".
 !-------------------------------------------------------------------------------
    use precision
-   use ELPA1
+   use elpa1_legacy
    use elpa_utilities, only : error_unit
 #ifdef WITH_OPENMP
    use test_util

test/Fortran/test_complex2.F90

@@ -78,7 +78,7 @@ program test_complex2_double_precision
 ! distributed along with the original code in the file "COPYING".
 !-------------------------------------------------------------------------------
    use precision
-   use ELPA1
+   use elpa1_legacy
    use ELPA2
    use mod_check_for_gpu, only : check_for_gpu
    use elpa_utilities, only : error_unit

test/Fortran/test_complex2_api.F90

@@ -79,7 +79,7 @@ program test_complex2_choose_kernel_with_api_double_precision
 !-------------------------------------------------------------------------------
 
    use precision
-   use ELPA1
+   use elpa1_legacy
    use ELPA2
 
    use mod_check_for_gpu, only : check_for_gpu

test/Fortran/test_complex2_api_single.F90

@@ -79,7 +79,7 @@ program test_complex2_choose_kernel_with_api_single_precision
 !-------------------------------------------------------------------------------
 
    use precision
-   use ELPA1
+   use elpa1_legacy
    use ELPA2
 
    use mod_check_for_gpu, only : check_for_gpu

test/Fortran/test_complex2_banded.F90

@@ -78,7 +78,7 @@ program test_complex2_double_precision
 ! distributed along with the original code in the file "COPYING".
 !-------------------------------------------------------------------------------
    use precision
-   use ELPA1
+   use elpa1_legacy
    use ELPA2
    use mod_check_for_gpu, only : check_for_gpu
    use elpa_utilities, only : error_unit

test/Fortran/test_complex2_default.F90

@@ -78,7 +78,7 @@ program test_complex2_default_kernel_double_precision
 ! distributed along with the original code in the file "COPYING".
 !-------------------------------------------------------------------------------
    use precision
-   use ELPA1
+   use elpa1_legacy
    use ELPA2
 
    use mod_check_for_gpu, only : check_for_gpu