Cleanup of src directory: mv ELPA 2 files in subdir

generated_headers.am

@@ -19,7 +19,7 @@ elpa/elpa_generated.h: $(top_srcdir)/src/elpa_c_interface.F90 | elpa
 test/shared/generated.h: $(wildcard $(top_srcdir)/test/shared/*.F90) | test/shared
 	$(call extract_interface,!c>)
 
-elpa/elpa_generated_fortran_interfaces.h: $(wildcard $(top_srcdir)/src/elpa2_kernels/*.c) $(wildcard $(top_srcdir)/src/elpa2_kernels/*.s) | elpa
+elpa/elpa_generated_fortran_interfaces.h: $(wildcard $(top_srcdir)/src/elpa2/kernels/*.c) $(wildcard $(top_srcdir)/src/elpa2/kernels/*.s) | elpa
 	$(call extract_interface,!f>)
 	$(call extract_interface,#!f>)
 

src/elpa2.F90 → src/elpa2/elpa2.F90

@@ -354,7 +354,7 @@ module ELPA2
 
 #define REALCASE 1
 #define DOUBLE_PRECISION 1
-#include "precision_macros.h"
+#include "../precision_macros.h"
 !-------------------------------------------------------------------------------
 !>  \brief solve_evp_real_2stage_double: Fortran function to solve the double-precision real eigenvalue problem with a 2 stage approach
 !>
@@ -402,7 +402,7 @@ module ELPA2
 #ifdef WANT_SINGLE_PRECISION_REAL
 #define REALCASE 1
 #define SINGLE_PRECISION 1
-#include "precision_macros.h"
+#include "../precision_macros.h"
 !-------------------------------------------------------------------------------
 !>  \brief solve_evp_real_2stage_single: Fortran function to solve the single-precision real eigenvalue problem with a 2 stage approach
 !>
@@ -451,7 +451,7 @@ module ELPA2
 
 #define COMPLEXCASE 1
 #define DOUBLE_PRECISION 1
-#include "precision_macros.h"
+#include "../precision_macros.h"
 !>  \brief solve_evp_complex_2stage_double: Fortran function to solve the double-precision complex eigenvalue problem with a 2 stage approach
 !>
 !>  Parameters
@@ -497,7 +497,7 @@ module ELPA2
 
 #define COMPLEXCASE 1
 #define SINGLE_PRECISION 1
-#include "precision_macros.h"
+#include "../precision_macros.h"
 
 !>  \brief solve_evp_complex_2stage_single: Fortran function to solve the single-precision complex eigenvalue problem with a 2 stage approach
 !>

src/elpa2_compute.F90 → src/elpa2/elpa2_compute.F90

@@ -105,7 +105,7 @@ module ELPA2_compute
 ! real double precision
 #define REALCASE 1
 #define DOUBLE_PRECISION 1
-#include "precision_macros.h"
+#include "../precision_macros.h"
 #include "elpa2_compute_real_template.X90"
 #undef REALCASE
 #undef DOUBLE_PRECISION
@@ -115,7 +115,7 @@ module ELPA2_compute
 
 #define REALCASE 1
 #define SINGLE_PRECISION 1
-#include "precision_macros.h"
+#include "../precision_macros.h"
 #include "elpa2_compute_real_template.X90"
 #undef REALCASE
 #undef SINGLE_PRECISION
@@ -125,7 +125,7 @@ module ELPA2_compute
 ! complex double precision
 #define COMPLEXCASE 1
 #define DOUBLE_PRECISION 1
-#include "precision_macros.h"
+#include "../precision_macros.h"
 #include "elpa2_compute_complex_template.X90"
 #undef COMPLEXCASE
 #undef DOUBLE_PRECISION
@@ -135,7 +135,7 @@ module ELPA2_compute
 
 #define COMPLEXCASE 1
 #define SINGLE_PRECISION 1
-#include "precision_macros.h"
+#include "../precision_macros.h"
 #include "elpa2_compute_complex_template.X90"
 #undef COMPLEXCASE
 #undef SINGLE_PRECISION

src/elpa2_compute_complex_template.X90 → src/elpa2/elpa2_compute_complex_template.X90

@@ -54,11 +54,15 @@
 ! Author: Andreas Marek, MPCDF
 #endif
 
+#include "../sanity.X90"
+
 #define COMPLEXCASE 1
 #undef REALCASE
 #include "elpa2_bandred_template.X90"
 #undef COMPLEXCASE
+#define COMPLEXCASE 1
 #include "elpa2_herm_matrix_allreduce_complex_template.X90"
+#undef COMPLEXCASE
 #define COMPLEXCASE 1
 #include "elpa2_trans_ev_band_to_full_template.X90"
 #include "elpa2_tridiag_band_template.X90"

src/elpa2_compute_real_template.X90 → src/elpa2/elpa2_compute_real_template.X90

@@ -53,11 +53,14 @@
 ! Author: Andreas Marek, MPCDF
 #endif
 
+#include "../sanity.X90"
+
 #define REALCASE 1
 #undef COMPLEXCASE
 #include "elpa2_bandred_template.X90"
-#undef REALCASE
+#define REALCASE 1
 #include "elpa2_symm_matrix_allreduce_real_template.X90"
+#undef REALCASE
 #define REALCASE 1
 #include "elpa2_trans_ev_band_to_full_template.X90"
 #include "elpa2_tridiag_band_template.X90"

src/elpa2_herm_matrix_allreduce_complex_template.X90 → src/elpa2/elpa2_herm_matrix_allreduce_complex_template.X90

@@ -50,6 +50,7 @@
 ! with their original authors, but shall adhere to the licensing terms
 ! distributed along with the original code in the file "COPYING".
 
+#include "../sanity.X90"
 
      subroutine herm_matrix_allreduce_&
      &PRECISION &

src/elpa2_symm_matrix_allreduce_real_template.X90 → src/elpa2/elpa2_symm_matrix_allreduce_real_template.X90

@@ -50,6 +50,7 @@
 ! with their original authors, but shall adhere to the licensing terms
 ! distributed along with the original code in the file "COPYING".
 
+#include "../sanity.X90"
 
     subroutine symm_matrix_allreduce_&
 &PRECISION &

src/elpa2_trans_ev_band_to_full_template.X90 → src/elpa2/elpa2_trans_ev_band_to_full_template.X90

@@ -49,6 +49,7 @@
 ! distributed along with the original code in the file "COPYING".
 #endif
 
+#include "../sanity.X90"
 
     subroutine trans_ev_band_to_full_&
     &MATH_DATATYPE&

src/elpa2_trans_ev_tridi_to_band_template.X90 → src/elpa2/elpa2_trans_ev_tridi_to_band_template.X90

@@ -50,6 +50,7 @@
 ! with their original authors, but shall adhere to the licensing terms
 ! distributed along with the original code in the file "COPYING".
 
+#include "../sanity.X90"
 
   subroutine trans_ev_tridi_to_band_&
     &MATH_DATATYPE&

src/elpa2_tridiag_band_template.X90 → src/elpa2/elpa2_tridiag_band_template.X90

@@ -49,6 +49,8 @@
 ! distributed along with the original code in the file "COPYING".
 #endif
 
+#include "../sanity.X90"
+
 #if REALCASE == 1
     subroutine tridiag_band_real_&
 #endif

src/elpa2_kernels/elpa2_kernels_complex_simple.F90 → src/elpa2/kernels/elpa2_kernels_complex_simple.F90

@@ -72,7 +72,7 @@ module complex_generic_simple_kernel
 
 #define COMPLEXCASE 1
 #define DOUBLE_PRECISION 1
-#include "../precision_macros.h"
+#include "../../precision_macros.h"
 #include "elpa2_kernels_simple_template.X90"
 #undef COMPLEXCASE
 #undef DOUBLE_PRECISION
@@ -80,7 +80,7 @@ module complex_generic_simple_kernel
 #ifdef WANT_SINGLE_PRECISION_COMPLEX
 #define COMPLEXCASE 1
 #define SINGLE_PRECISION 1
-#include "../precision_macros.h"
+#include "../../precision_macros.h"
 #include "elpa2_kernels_simple_template.X90"
 #undef COMPLEXCASE
 #undef SINGLE_PRECISION

src/elpa2_kernels/elpa2_kernels_real.F90 → src/elpa2/kernels/elpa2_kernels_real.F90

@@ -75,7 +75,7 @@ module real_generic_kernel
 
 #define REALCASE 1
 #define DOUBLE_PRECISION 1
-#include "../precision_macros.h"
+#include "../../precision_macros.h"
 #include "elpa2_kernels_real_template.X90"
 #undef REALCASE
 #undef DOUBLE_PRECISION
@@ -83,7 +83,7 @@ module real_generic_kernel
 #ifdef WANT_SINGLE_PRECISION_REAL
 #define REALCASE 1
 #define SINGLE_PRECISION 1
-#include "../precision_macros.h"
+#include "../../precision_macros.h"
 #include "elpa2_kernels_real_template.X90"
 #undef REALCASE
 #undef SINGLE_PRECISION

src/elpa2_kernels/elpa2_kernels_real_simple.F90 → src/elpa2/kernels/elpa2_kernels_real_simple.F90

@@ -73,7 +73,7 @@ module real_generic_simple_kernel
 
 #define REALCASE 1
 #define DOUBLE_PRECISION 1
-#include "../precision_macros.h"
+#include "../../precision_macros.h"
 #include "elpa2_kernels_simple_template.X90"
 #undef REALCASE
 #undef DOUBLE_PRECISION
@@ -81,7 +81,7 @@ module real_generic_simple_kernel
 #ifdef WANT_SINGLE_PRECISION_REAL
 #define REALCASE 1
 #define SINGLE_PRECISION 1
-#include "../precision_macros.h"
+#include "../../precision_macros.h"
 #include "elpa2_kernels_simple_template.X90"
 #undef REALCASE
 #undef SINGLE_PRECISION

src/mod_compute_hh_trafo.F90 → src/elpa2/mod_compute_hh_trafo.F90

@@ -79,7 +79,7 @@ module compute_hh_trafo
   !real double precision
 #define REALCASE 1
 #define DOUBLE_PRECISION 1
-#include "precision_macros.h"
+#include "../precision_macros.h"
 #include "compute_hh_trafo.X90"
 #undef REALCASE
 #undef DOUBLE_PRECISION
@@ -88,7 +88,7 @@ module compute_hh_trafo
 #if defined(WANT_SINGLE_PRECISION_REAL)
 #define REALCASE 1
 #define SINGLE_PRECISION 1
-#include "precision_macros.h"
+#include "../precision_macros.h"
 #include "compute_hh_trafo.X90"
 #undef REALCASE
 #undef SINGLE_PRECISION
@@ -97,7 +97,7 @@ module compute_hh_trafo
   !complex double precision
 #define COMPLEXCASE 1
 #define DOUBLE_PRECISION 1
-#include "precision_macros.h"
+#include "../precision_macros.h"
 #include "compute_hh_trafo.X90"
 #undef COMPLEXCASE
 #undef DOUBLE_PRECISION
@@ -106,7 +106,7 @@ module compute_hh_trafo
 #if defined(WANT_SINGLE_PRECISION_COMPLEX)
 #define COMPLEXCASE 1
 #define SINGLE_PRECISION 1
-#include "precision_macros.h"
+#include "../precision_macros.h"
 #include "compute_hh_trafo.X90"
 #undef COMPLEXCASE
 #undef SINGLE_PRECISION
@@ -116,7 +116,7 @@ module compute_hh_trafo
 !  !complex double precision
 !#define COMPLEXCASE 1
 !#define DOUBLE_PRECISION 1
-!#include "precision_macros.h"
+!#include "../precision_macros.h"
 !#include "compute_hh_trafo_complex_gpu.X90"
 !#undef COMPLEXCASE
 !#undef DOUBLE_PRECISION
@@ -125,7 +125,7 @@ module compute_hh_trafo
 !#if defined(WANT_SINGLE_PRECISION_COMPLEX)
 !#define COMPLEXCASE 1
 !#define SINGLE_PRECISION 1
-!#include "precision_macros.h"
+!#include "../precision_macros.h"
 !#include "compute_hh_trafo_complex_gpu.X90"
 !#undef COMPLEXCASE
 !#undef SINGLE_PRECISION