Move some files in general subdir

Makefile.am

@@ -83,7 +83,7 @@ EXTRA_libelpa@SUFFIX@_private_la_DEPENDENCIES = \
 	src/elpa2/pack_unpack_gpu.X90 \
 	src/elpa2/compute_hh_trafo.X90 \
         src/elpa2/redist_band.X90 \
-	src/sanity.X90 \
+	src/general/sanity.X90 \
 	src/elpa1/legacy_interface/elpa_cholesky_template_legacy.X90 \
 	src/elpa1/elpa_cholesky_template_new_interface.X90 \
 	src/elpa1/legacy_interface/elpa_invert_trm_legacy.X90 \
@@ -92,7 +92,7 @@ EXTRA_libelpa@SUFFIX@_private_la_DEPENDENCIES = \
 	src/elpa1/elpa_multiply_a_b_new_interface.X90 \
 	src/elpa1/legacy_interface/elpa_solve_tridi_legacy.X90 \
 	src/elpa1/elpa_solve_tridi_new_interface.X90 \
-        src/precision_macros.h
+        src/general/precision_macros.h
 
 lib_LTLIBRARIES = libelpa@SUFFIX@.la
 libelpa@SUFFIX@_la_LINK = $(FCLINK) $(AM_LDFLAGS) -version-info $(ELPA_SO_VERSION)
@@ -1134,7 +1134,7 @@ EXTRA_DIST = \
   src/elpa2/pack_unpack_cpu.X90 \
   src/elpa2/pack_unpack_gpu.X90 \
   src/elpa2/compute_hh_trafo.X90 \
-  src/sanity.X90 \
+  src/general/sanity.X90 \
   src/elpa1/legacy_interface/elpa_cholesky_template_legacy.X90 \
   src/elpa1/elpa_cholesky_template_new_interface.X90 \
   src/elpa1/legacy_interface/elpa_invert_trm_legacy.X90 \

src/elpa1/elpa1_auxiliary_new_interface.F90

@@ -90,7 +90,7 @@ module ELPA1_AUXILIARY_new
 
 #define REALCASE 1
 #define DOUBLE_PRECISION
-#include "../precision_macros.h"
+#include "../general/precision_macros.h"
 
    function elpa_cholesky_real_double_new (na, a, lda, nblk, matrixCols, mpi_comm_rows, mpi_comm_cols, &
                                             wantDebug) result(success)
@@ -101,7 +101,7 @@ module ELPA1_AUXILIARY_new
 #ifdef WANT_SINGLE_PRECISION_REAL
 #define REALCASE 1
 #define SINGLE_PRECISION
-#include "../precision_macros.h"
+#include "../general/precision_macros.h"
 
    function elpa_cholesky_real_single_new(na, a, lda, nblk, matrixCols, mpi_comm_rows, mpi_comm_cols, &
                                             wantDebug) result(success)
@@ -113,7 +113,7 @@ module ELPA1_AUXILIARY_new
 
 #define REALCASE 1
 #define DOUBLE_PRECISION
-#include "../precision_macros.h"
+#include "../general/precision_macros.h"
 !> \brief  elpa_invert_trm_real_double: Inverts a double-precision real upper triangular matrix
 !> \details
 !> \param  na                   Order of matrix
@@ -136,7 +136,7 @@ module ELPA1_AUXILIARY_new
 #if WANT_SINGLE_PRECISION_REAL
 #define REALCASE 1
 #define SINGLE_PRECISION
-#include "../precision_macros.h"
+#include "../general/precision_macros.h"
 
 !> \brief  elpa_invert_trm_real_single_new: Inverts a single-precision real upper triangular matrix
 !> \details
@@ -162,7 +162,7 @@ module ELPA1_AUXILIARY_new
 
 #define COMPLEXCASE 1
 #define DOUBLE_PRECISION
-#include "../precision_macros.h"
+#include "../general/precision_macros.h"
 
 !> \brief  elpa_cholesky_complex_double_new: Cholesky factorization of a double-precision complex hermitian matrix
 !> \details
@@ -189,7 +189,7 @@ module ELPA1_AUXILIARY_new
 #ifdef WANT_SINGLE_PRECISION_COMPLEX
 #define COMPLEXCASE 1
 #define SINGLE_PRECISION
-#include "../precision_macros.h"
+#include "../general/precision_macros.h"
 
 !> \brief  elpa_cholesky_complex_single_new: Cholesky factorization of a single-precision complex hermitian matrix
 !> \details
@@ -216,7 +216,7 @@ module ELPA1_AUXILIARY_new
 
 #define COMPLEXCASE 1
 #define DOUBLE_PRECISION
-#include "../precision_macros.h"
+#include "../general/precision_macros.h"
 
 !> \brief  elpa_invert_trm_complex_double_new: Inverts a double-precision complex upper triangular matrix
 !> \details
@@ -241,7 +241,7 @@ module ELPA1_AUXILIARY_new
 #ifdef WANT_SINGLE_PRECISION_COMPLEX
 #define COMPLEXCASE 1
 #define SINGLE_PRECISION
-#include "../precision_macros.h"
+#include "../general/precision_macros.h"
 
 !> \brief  elpa_invert_trm_complex_single_new: Inverts a single-precision complex upper triangular matrix
 !> \details
@@ -267,7 +267,7 @@ module ELPA1_AUXILIARY_new
 
 #define REALCASE 1
 #define DOUBLE_PRECISION
-#include "../precision_macros.h"
+#include "../general/precision_macros.h"
     function elpa_mult_at_b_real_double_new(uplo_a, uplo_c, na, ncb, a, lda, ldaCols, b, ldb, ldbCols, nblk, &
                               mpi_comm_rows, mpi_comm_cols, c, ldc, ldcCols) result(success)
 #include "elpa_multiply_a_b_new_interface.X90"
@@ -276,7 +276,7 @@ module ELPA1_AUXILIARY_new
 #if WANT_SINGLE_PRECISION_REAL
 #define REALCASE 1
 #define SINGLE_PRECISION
-#include "../precision_macros.h"
+#include "../general/precision_macros.h"
 
 !> \brief  elpa_mult_at_b_real_single_new: Performs C : = A**T * B
 !>         where   A is a square matrix (na,na) which is optionally upper or lower triangular
@@ -322,7 +322,7 @@ module ELPA1_AUXILIARY_new
 
 #define COMPLEXCASE 1
 #define DOUBLE_PRECISION
-#include "../precision_macros.h"
+#include "../general/precision_macros.h"
 
 !> \brief  elpa_mult_ah_b_complex_double_new: Performs C : = A**H * B
 !>         where   A is a square matrix (na,na) which is optionally upper or lower triangular
@@ -367,7 +367,7 @@ module ELPA1_AUXILIARY_new
 #ifdef WANT_SINGLE_PRECISION_COMPLEX
 #define COMPLEXCASE 1
 #define SINGLE_PRECISION
-#include "../precision_macros.h"
+#include "../general/precision_macros.h"
 
 !> \brief  elpa_mult_ah_b_complex_single_new: Performs C : = A**H * B
 !>         where   A is a square matrix (na,na) which is optionally upper or lower triangular
@@ -414,7 +414,7 @@ module ELPA1_AUXILIARY_new
 
 #define REALCASE 1
 #define DOUBLE_PRECISION
-#include "../precision_macros.h"
+#include "../general/precision_macros.h"
 
 !> \brief  elpa_solve_tridi_double_new: Solve tridiagonal eigensystem for a double-precision matrix with divide and conquer method
 !> \details
@@ -444,7 +444,7 @@ module ELPA1_AUXILIARY_new
 #ifdef WANT_SINGLE_PRECISION_REAL
 #define REALCASE 1
 #define SINGLE_PRECISION
-#include "../precision_macros.h"
+#include "../general/precision_macros.h"
 
 !> \brief  elpa_solve_tridi_single_new: Solve tridiagonal eigensystem for a single-precision matrix with divide and conquer method
 !> \details

src/elpa1/elpa1_compute_private.F90

@@ -159,7 +159,7 @@ module ELPA1_COMPUTE
 #define DOUBLE_PRECISION_REAL 1
 #define REALCASE 1
 #define DOUBLE_PRECISION 1
-#include "../precision_macros.h"
+#include "../general/precision_macros.h"
 
 #include "elpa_transpose_vectors.X90"
 #include "elpa_reduce_add_vectors.X90"
@@ -170,7 +170,7 @@ module ELPA1_COMPUTE
 
 #define REALCASE 1
 #define SINGLE_PRECISION 1
-#include "../precision_macros.h"
+#include "../general/precision_macros.h"
 
 #include "elpa_transpose_vectors.X90"
 #include "elpa_reduce_add_vectors.X90"
@@ -182,7 +182,7 @@ module ELPA1_COMPUTE
 
 #define COMPLEXCASE 1
 #define DOUBLE_PRECISION 1
-#include "../precision_macros.h"
+#include "../general/precision_macros.h"
 #include "elpa_transpose_vectors.X90"
 #include "elpa_reduce_add_vectors.X90"
 #undef COMPLEXCASE
@@ -192,7 +192,7 @@ module ELPA1_COMPUTE
 
 #define COMPLEXCASE 1
 #define SINGLE_PRECISION 1
-#include "../precision_macros.h"
+#include "../general/precision_macros.h"
 #include "elpa_transpose_vectors.X90"
 #include "elpa_reduce_add_vectors.X90"
 #undef COMPLEXCASE
@@ -203,7 +203,7 @@ module ELPA1_COMPUTE
 ! real double precision
 #define REALCASE 1
 #define DOUBLE_PRECISION 1
-#include "../precision_macros.h"
+#include "../general/precision_macros.h"
 #include "elpa1_compute_template.X90"
 
 #undef REALCASE
@@ -215,7 +215,7 @@ module ELPA1_COMPUTE
 #define REALCASE 1
 #define SINGLE_PRECISION 1
 
-#include "../precision_macros.h"
+#include "../general/precision_macros.h"
 #include "elpa1_compute_template.X90"
 
 #undef REALCASE
@@ -226,7 +226,7 @@ module ELPA1_COMPUTE
 
 #define COMPLEXCASE 1
 #define DOUBLE_PRECISION 1
-#include "../precision_macros.h"
+#include "../general/precision_macros.h"
 #include "elpa1_compute_template.X90"
 
 #undef COMPLEXCASE
@@ -237,7 +237,7 @@ module ELPA1_COMPUTE
 
 #define COMPLEXCASE 1
 #define SINGLE_PRECISION 1
-#include "../precision_macros.h"
+#include "../general/precision_macros.h"
 #include "elpa1_compute_template.X90"
 
 #undef COMPLEXCASE

src/elpa1/elpa1_compute_template.X90

@@ -54,7 +54,7 @@
 ! Author: Andreas Marek, MPCDF
 #endif
 
-#include "../sanity.X90"
+#include "../general/sanity.X90"
 
 #if REALCASE == 1
 

src/elpa1/elpa1_merge_systems_real_template.X90

@@ -52,7 +52,7 @@
 ! distributed along with the original code in the file "COPYING".
 #endif
 
-#include "../sanity.X90"
+#include "../general/sanity.X90"
 
     subroutine merge_systems_&
     &PRECISION &

src/elpa1/elpa1_new_interface.F90

@@ -260,7 +260,7 @@ end function elpa_get_communicators_new
 
 #define REALCASE 1
 #define DOUBLE_PRECISION 1
-#include "../precision_macros.h"
+#include "../general/precision_macros.h"
 #include "elpa1_template_new_interface.X90"
 #undef REALCASE
 #undef DOUBLE_PRECISION
@@ -304,7 +304,7 @@ end function elpa_get_communicators_new
 
 #define REALCASE 1
 #define SINGLE_PRECISION 1
-#include "../precision_macros.h"
+#include "../general/precision_macros.h"
 #include "elpa1_template_new_interface.X90"
 #undef REALCASE
 #undef SINGLE_PRECISION
@@ -347,7 +347,7 @@ end function elpa_get_communicators_new
 !>  \result                     success
 #define COMPLEXCASE 1
 #define DOUBLE_PRECISION 1
-#include "../precision_macros.h"
+#include "../general/precision_macros.h"
 #include "elpa1_template_new_interface.X90"
 #undef DOUBLE_PRECISION
 #undef COMPLEXCASE
@@ -393,7 +393,7 @@ end function elpa_get_communicators_new
 
 #define COMPLEXCASE 1
 #define SINGLE_PRECISION
-#include "../precision_macros.h"
+#include "../general/precision_macros.h"
 #include "elpa1_template_new_interface.X90"
 #undef COMPLEXCASE
 #undef SINGLE_PRECISION

src/elpa1/elpa1_solve_tridi_real_template.X90

@@ -52,7 +52,7 @@
 ! distributed along with the original code in the file "COPYING".
 #endif
 
-#include "../sanity.X90"
+#include "../general/sanity.X90"
 
 subroutine solve_tridi_&
 &PRECISION &

src/elpa1/elpa1_solve_tridi_real_template_new_interface.X90

@@ -52,7 +52,7 @@
 ! distributed along with the original code in the file "COPYING".
 #endif
 
-#include "../sanity.X90"
+#include "../general/sanity.X90"
 
 subroutine solve_tridi_&
 &PRECISION&

src/elpa1/elpa1_template_new_interface.X90

@@ -52,7 +52,7 @@
 ! distributed along with the original code in the file "COPYING".
 #endif
 
-#include "../sanity.X90"
+#include "../general/sanity.X90"
 
 function elpa_solve_evp_&
          &MATH_DATATYPE&

src/elpa1/elpa1_tools_template.X90

@@ -52,7 +52,7 @@
 ! distributed along with the original code in the file "COPYING".
 #endif
 
-#include "../sanity.X90"
+#include "../general/sanity.X90"
 
 #if REALCASE == 1
 

src/elpa1/elpa1_trans_ev_template.X90

@@ -52,7 +52,7 @@
 ! distributed along with the original code in the file "COPYING".
 #endif
 
-#include "../sanity.X90"
+#include "../general/sanity.X90"
 
 !> \brief Transforms the eigenvectors of a tridiagonal matrix back
 !>                     to the eigenvectors of the original matrix

src/elpa1/elpa1_tridiag_template.X90

@@ -81,7 +81,7 @@
 !>
 !> \param useGPU      If true,  GPU version of the subroutine will be used
 !>
-#include "../sanity.X90"
+#include "../general/sanity.X90"
 
     subroutine tridiag_&
     &MATH_DATATYPE&

src/elpa1/elpa_cholesky_template_new_interface.X90

@@ -42,7 +42,7 @@
 !    any derivatives of ELPA under the same license that we chose for
 !    the original distribution, the GNU Lesser General Public License.
 
-#include "../sanity.X90"
+#include "../general/sanity.X90"
      use elpa1_compute
      use elpa_utilities
      use elpa_mpi

src/elpa1/elpa_invert_trm_new_interface.X90

@@ -50,7 +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"
+#include "../general/sanity.X90"
 
        use precision
        use elpa1_compute

src/elpa1/elpa_multiply_a_b_new_interface.X90

@@ -53,7 +53,7 @@
 ! Author: A. Marek, MPCDF
 
 
-#include "../sanity.X90"
+#include "../general/sanity.X90"
 
 #ifdef HAVE_DETAILED_TIMINGS
       use timings

src/elpa1/elpa_reduce_add_vectors.X90

@@ -44,7 +44,7 @@
 #endif
 
 #include "config-f90.h"
-#include "../sanity.X90"
+#include "../general/sanity.X90"
 
 subroutine elpa_reduce_add_vectors_&
 &MATH_DATATYPE&

src/elpa1/elpa_solve_tridi_new_interface.X90

@@ -54,7 +54,7 @@
 
 
 
-#include "../sanity.X90"
+#include "../general/sanity.X90"
 
       use elpa1_compute, solve_tridi_&
                          &PRECISION&

src/elpa1/elpa_transpose_vectors.X90

@@ -48,7 +48,7 @@
 #endif
 
 #include "config-f90.h"
-#include "../sanity.X90"
+#include "../general/sanity.X90"
 
 subroutine elpa_transpose_vectors_&
 &MATH_DATATYPE&

src/elpa1/legacy_interface/elpa1_auxiliary_legacy.F90

@@ -283,7 +283,7 @@ module ELPA1_AUXILIARY_legacy
 
 #define REALCASE 1
 #define DOUBLE_PRECISION
-#include "../../precision_macros.h"
+#include "../../general/precision_macros.h"
 
 
    function elpa_cholesky_real_double(na, a, lda, nblk, matrixCols, mpi_comm_rows, mpi_comm_cols, &
@@ -295,7 +295,7 @@ module ELPA1_AUXILIARY_legacy
 #ifdef WANT_SINGLE_PRECISION_REAL
 #define REALCASE 1
 #define SINGLE_PRECISION
-#include "../../precision_macros.h"
+#include "../../general/precision_macros.h"
 
 !> \brief  cholesky_real_single: Cholesky factorization of a single-precision real symmetric matrix
 !> \details
@@ -324,7 +324,7 @@ module ELPA1_AUXILIARY_legacy
 
 #define REALCASE 1
 #define DOUBLE_PRECISION
-#include "../../precision_macros.h"
+#include "../../general/precision_macros.h"
 !> \brief  elpa_invert_trm_real_double: Inverts a double-precision real upper triangular matrix
 !> \details
 !> \param  na                   Order of matrix
@@ -346,7 +346,7 @@ module ELPA1_AUXILIARY_legacy
 #if WANT_SINGLE_PRECISION_REAL
 #define REALCASE 1
 #define SINGLE_PRECISION
-#include "../../precision_macros.h"
+#include "../../general/precision_macros.h"
 
 !> \brief  elpa_invert_trm_real_single: Inverts a single-precision real upper triangular matrix
 !> \details
@@ -371,7 +371,7 @@ module ELPA1_AUXILIARY_legacy
 
 #define COMPLEXCASE 1
 #define DOUBLE_PRECISION
-#include "../../precision_macros.h"
+#include "../../general/precision_macros.h"
 
 !> \brief  elpa_cholesky_complex_double: Cholesky factorization of a double-precision complex hermitian matrix
 !> \details
@@ -398,7 +398,7 @@ module ELPA1_AUXILIARY_legacy
 #ifdef WANT_SINGLE_PRECISION_COMPLEX
 #define COMPLEXCASE 1
 #define SINGLE_PRECISION
-#include "../../precision_macros.h"
+#include "../../general/precision_macros.h"
 
 !> \brief  elpa_cholesky_complex_single: Cholesky factorization of a single-precision complex hermitian matrix
 !> \details
@@ -425,7 +425,7 @@ module ELPA1_AUXILIARY_legacy
 
 #define COMPLEXCASE 1
 #define DOUBLE_PRECISION
-#include "../../precision_macros.h"
+#include "../../general/precision_macros.h"
 
 !> \brief  elpa_invert_trm_complex_double: Inverts a double-precision complex upper triangular matrix
 !> \details
@@ -449,7 +449,7 @@ module ELPA1_AUXILIARY_legacy
 #ifdef WANT_SINGLE_PRECISION_COMPLEX
 #define COMPLEXCASE 1
 #define SINGLE_PRECISION
-#include "../../precision_macros.h"
+#include "../../general/precision_macros.h"
 
 !> \brief  elpa_invert_trm_complex_single: Inverts a single-precision complex upper triangular matrix
 !> \details
@@ -474,7 +474,7 @@ module ELPA1_AUXILIARY_legacy
 
 #define REALCASE 1
 #define DOUBLE_PRECISION
-#include "../../precision_macros.h"
+#include "../../general/precision_macros.h"
 !> \brief  mult_at_b_real_double: Performs C : = A**T * B
 !>         where   A is a square matrix (na,na) which is optionally upper or lower triangular
 !>                 B is a (na,ncb) matrix
@@ -515,7 +515,7 @@ module ELPA1_AUXILIARY_legacy
 #if WANT_SINGLE_PRECISION_REAL
 #define REALCASE 1
 #define SINGLE_PRECISION
-#include "../../precision_macros.h"
+#include "../../general/precision_macros.h"
 
 !> \brief  elpa_mult_at_b_real_single: Performs C : = A**T * B
 !>         where   A is a square matrix (na,na) which is optionally upper or lower triangular
@@ -561,7 +561,7 @@ module ELPA1_AUXILIARY_legacy
 
 #define COMPLEXCASE 1
 #define DOUBLE_PRECISION
-#include "../../precision_macros.h"
+#include "../../general/precision_macros.h"
 
 !> \brief  elpa_mult_ah_b_complex_double: Performs C : = A**H * B
 !>         where   A is a square matrix (na,na) which is optionally upper or lower triangular
@@ -606,7 +606,7 @@ module ELPA1_AUXILIARY_legacy
 #ifdef WANT_SINGLE_PRECISION_COMPLEX
 #define COMPLEXCASE 1
 #define SINGLE_PRECISION
-#include "../../precision_macros.h"
+#include "../../general/precision_macros.h"
 
 !> \brief  elpa_mult_ah_b_complex_single: Performs C : = A**H * B
 !>         where   A is a square matrix (na,na) which is optionally upper or lower triangular
@@ -653,7 +653,7 @@ module ELPA1_AUXILIARY_legacy
 
 #define REALCASE 1
 #define DOUBLE_PRECISION
-#include "../../precision_macros.h"
+#include "../../general/precision_macros.h"
 
 !> \brief  elpa_solve_tridi_double: Solve tridiagonal eigensystem for a double-precision matrix with divide and conquer method
 !> \details
@@ -683,7 +683,7 @@ module ELPA1_AUXILIARY_legacy
 #ifdef WANT_SINGLE_PRECISION_REAL
 #define REALCASE 1
 #define SINGLE_PRECISION
-#include "../../precision_macros.h"
+#include "../../general/precision_macros.h"
 
 !> \brief  elpa_solve_tridi_single: Solve tridiagonal eigensystem for a single-precision matrix with divide and conquer method
 !> \details

src/elpa1/legacy_interface/elpa1_legacy.F90

@@ -559,7 +559,7 @@ end function elpa_get_communicators
 
 #define REALCASE 1
 #define DOUBLE_PRECISION 1
-#include "../../precision_macros.h"
+#include "../../general/precision_macros.h"
 #include "./elpa1_template_legacy.X90"
 #undef REALCASE
 #undef DOUBLE_PRECISION
@@ -603,7 +603,7 @@ end function elpa_get_communicators
 
 #define REALCASE 1
 #define SINGLE_PRECISION 1
-#include "../../precision_macros.h"
+#include "../../general/precision_macros.h"
 #include "./elpa1_template_legacy.X90"
 #undef REALCASE
 #undef SINGLE_PRECISION
@@ -646,7 +646,7 @@ end function elpa_get_communicators
 !>  \result                     success
 #define COMPLEXCASE 1
 #define DOUBLE_PRECISION 1
-#include "../../precision_macros.h"
+#include "../../general/precision_macros.h"
 #include "./elpa1_template_legacy.X90"
 #undef DOUBLE_PRECISION
 #undef COMPLEXCASE
@@ -692,7 +692,7 @@ end function elpa_get_communicators
 
 #define COMPLEXCASE 1
 #define SINGLE_PRECISION
-#include "../../precision_macros.h"
+#include "../../general/precision_macros.h"
 #include "./elpa1_template_legacy.X90"
 #undef COMPLEXCASE
 #undef SINGLE_PRECISION