Rename preprocessor flag for using assumed size arrays

Makefile.am

@@ -15,13 +15,13 @@ libelpa@SUFFIX@_public_la_SOURCES = \
         src/elpa2.F90 \
 	src/elpa1_auxiliary.F90 \
         src/elpa2_utilities.F90 \
-        src/elpa_utilities.F90
+        src/elpa_utilities.F90  \
+	src/mod_precision.f90
 
 # internal parts
 noinst_LTLIBRARIES += libelpa@SUFFIX@_private.la
 libelpa@SUFFIX@_private_la_FCFLAGS = $(AM_FCFLAGS) @FC_MODOUT@private_modules @FC_MODINC@private_modules
 libelpa@SUFFIX@_private_la_SOURCES = \
-        src/mod_precision.f90 \
         src/mod_mpi.F90 \
         src/mod_mpi_stubs.F90 \
         src/mod_pack_unpack_real.F90 \

configure.ac

@@ -902,17 +902,17 @@ DX_MAN_FEATURE(ON)
 DX_HTML_FEATURE(ON)
 DX_INIT_DOXYGEN([ELPA], [Doxyfile], [docs])
 
-DESPERATELY_WANT_ASSUMED_SIZE=no
+USE_ASSUMED_SIZE=no
 AC_MSG_CHECKING(whether --enable-assumed-size is specified)
 AC_ARG_ENABLE([assumed-size],
                 AS_HELP_STRING([--enable-assumed-size],
                                [use assumed-size Fortran arrays]),
               [],
-              [DESPERATELY_WANT_ASSUMED_SIZE=no])
-AC_MSG_RESULT([${DESPERATELY_WANT_ASSUMED_SIZE}])
-AM_CONDITIONAL([WITH_DESPERATELY_WANT_ASSUMED_SIZE],[test x"$DESPERATELY_WANT_ASSUMED_SIZE" = x"yes"])
-if test x"${DESPERATELY_WANT_ASSUMED_SIZE}" = x"yes" ; then
-  AC_DEFINE([DESPERATELY_WANT_ASSUMED_SIZE],[1],[use assumed size Fortran arrays, even if not debuggable])
+              [USE_ASSUMED_SIZE=no])
+AC_MSG_RESULT([${USE_ASSUMED_SIZE}])
+AM_CONDITIONAL([WITH_USE_ASSUMED_SIZE],[test x"$USE_ASSUMED_SIZE" = x"yes"])
+if test x"${USE_ASSUMED_SIZE}" = x"yes" ; then
+  AC_DEFINE([USE_ASSUMED_SIZE],[1],[use assumed size Fortran arrays, even if not debuggable])
 fi
 
 AC_SUBST([MPI_BINARY])

src/elpa1.F90

@@ -319,7 +319,7 @@ function solve_evp_real_1stage(na, nev, a, lda, ev, q, ldq, nblk, matrixCols, mp
 
    integer(kind=ik), intent(in)  :: na, nev, lda, ldq, nblk, matrixCols, mpi_comm_rows, mpi_comm_cols
    real(kind=rk)                 :: ev(na)
-#ifdef DESPERATELY_WANT_ASSUMED_SIZE
+#ifdef USE_ASSUMED_SIZE
    real(kind=rk)                 :: a(lda,*), q(ldq,*)
 #else
    real(kind=rk)                 :: a(lda,matrixCols), q(ldq,matrixCols)
@@ -425,7 +425,7 @@ function solve_evp_complex_1stage(na, nev, a, lda, ev, q, ldq, nblk, matrixCols,
    implicit none
 
    integer(kind=ik), intent(in)     :: na, nev, lda, ldq, nblk, matrixCols, mpi_comm_rows, mpi_comm_cols
-#ifdef DESPERATELY_WANT_ASSUMED_SIZE
+#ifdef USE_ASSUMED_SIZE
    complex(kind=ck)                 :: a(lda,*), q(ldq,*)
 #else
    complex(kind=ck)                 :: a(lda,matrixCols), q(ldq,matrixCols)

src/elpa1_auxiliary.F90

@@ -254,7 +254,7 @@ module elpa1_auxiliary
       implicit none
 
       integer(kind=ik)              :: na, lda, nblk, matrixCols, mpi_comm_rows, mpi_comm_cols
-#ifdef DESPERATELY_WANT_ASSUMED_SIZE
+#ifdef USE_ASSUMED_SIZE
       real(kind=rk)                 :: a(lda,*)
 #else
       real(kind=rk)                 :: a(lda,matrixCols)
@@ -457,7 +457,7 @@ module elpa1_auxiliary
        implicit none
 
        integer(kind=ik)             :: na, lda, nblk, matrixCols, mpi_comm_rows, mpi_comm_cols
-#ifdef DESPERATELY_WANT_ASSUMED_SIZE
+#ifdef USE_ASSUMED_SIZE
        real(kind=rk)                :: a(lda,*)
 #else
        real(kind=rk)                :: a(lda,matrixCols)
@@ -619,7 +619,7 @@ module elpa1_auxiliary
       implicit none
 
       integer(kind=ik)                 :: na, lda, nblk, matrixCols, mpi_comm_rows, mpi_comm_cols
-#ifdef DESPERATELY_WANT_ASSUMED_SIZE
+#ifdef USE_ASSUMED_SIZE
       complex(kind=ck)                 :: a(lda,*)
 #else
       complex(kind=ck)                 :: a(lda,matrixCols)
@@ -821,7 +821,7 @@ module elpa1_auxiliary
        implicit none
 
        integer(kind=ik)                 :: na, lda, nblk, matrixCols, mpi_comm_rows, mpi_comm_cols
-#ifdef DESPERATELY_WANT_ASSUMED_SIZE
+#ifdef USE_ASSUMED_SIZE
        complex(kind=ck)                 :: a(lda,*)
 #else
        complex(kind=ck)                 :: a(lda,matrixCols)
@@ -1004,7 +1004,7 @@ module elpa1_auxiliary
 
       integer(kind=ik)              :: na, ncb, lda, ldb, nblk, mpi_comm_rows, mpi_comm_cols, ldc
       integer(kind=ik)              :: ldaCols, ldbCols, ldcCols
-#ifdef DESPERATELY_WANT_ASSUMED_SIZE
+#ifdef USE_ASSUMED_SIZE
       real(kind=rk)                 :: a(lda,*), b(ldb,*), c(ldc,*)
 #else
       real(kind=rk)                 :: a(lda,ldaCols), b(ldb,ldbCols), c(ldc,ldcCols)
@@ -1268,7 +1268,7 @@ module elpa1_auxiliary
 
       integer(kind=ik)              :: na, ncb, lda, ldb, nblk, mpi_comm_rows, mpi_comm_cols, ldc
       integer(kind=ik)              :: ldaCols, ldbCols, ldcCols
-#ifdef DESPERATELY_WANT_ASSUMED_SIZE
+#ifdef USE_ASSUMED_SIZE
       complex(kind=ck)              :: a(lda,*), b(ldb,*), c(ldc,*)
 #else
       complex(kind=ck)              :: a(lda,ldaCols), b(ldb,ldbCols), c(ldc,ldcCols)
@@ -1507,7 +1507,7 @@ module elpa1_auxiliary
       implicit none
       integer(kind=ik)       :: na, nev, ldq, nblk, matrixCols, mpi_comm_rows, mpi_comm_cols
       real(kind=rk)          :: d(na), e(na)
-#ifdef DESPERATELY_WANT_ASSUMED_SIZE
+#ifdef USE_ASSUMED_SIZE
       real(kind=rk)          :: q(ldq,*)
 #else
       real(kind=rk)          :: q(ldq,matrixCols)

src/elpa1_compute_private.F90

@@ -129,7 +129,7 @@ module ELPA1_compute
 
       integer(kind=ik)            :: na, lda, nblk, matrixCols, mpi_comm_rows, mpi_comm_cols
       real(kind=rk)               :: d(na), e(na), tau(na)
-#ifdef DESPERATELY_WANT_ASSUMED_SIZE
+#ifdef USE_ASSUMED_SIZE
       real(kind=rk)               :: a(lda,*)
 #else
       real(kind=rk)               :: a(lda,matrixCols)
@@ -548,7 +548,7 @@ module ELPA1_compute
 
       integer(kind=ik)           :: na, nqc, lda, ldq, nblk, matrixCols, mpi_comm_rows, mpi_comm_cols
       real(kind=rk)              :: tau(na)
-#ifdef DESPERATELY_WANT_ASSUMED_SIZE
+#ifdef USE_ASSUMED_SIZE
       real(kind=rk)              :: a(lda,*), q(ldq,*)
 #else
       real(kind=rk)              :: a(lda,matrixCols), q(ldq,matrixCols)
@@ -783,7 +783,7 @@ module ELPA1_compute
 
       integer(kind=ik)              :: na, lda, nblk, matrixCols, mpi_comm_rows, mpi_comm_cols
       complex(kind=ck)              :: tau(na)
-#ifdef DESPERATELY_WANT_ASSUMED_SIZE
+#ifdef USE_ASSUMED_SIZE
       complex(kind=ck)              :: a(lda,*)
 #else
       complex(kind=ck)              :: a(lda,matrixCols)
@@ -1228,7 +1228,7 @@ module ELPA1_compute
 
       integer(kind=ik)              ::  na, nqc, lda, ldq, nblk, matrixCols, mpi_comm_rows, mpi_comm_cols
       complex(kind=ck)              ::  tau(na)
-#ifdef DESPERATELY_WANT_ASSUMED_SIZE
+#ifdef USE_ASSUMED_SIZE
       complex(kind=ck)              :: a(lda,*), q(ldq,*)
 #else
       complex(kind=ck)              ::  a(lda,matrixCols), q(ldq,matrixCols)
@@ -1430,7 +1430,7 @@ module ELPA1_compute
 
       integer(kind=ik)              :: na, nev, ldq, nblk, matrixCols, mpi_comm_rows, mpi_comm_cols
       real(kind=rk)                 :: d(na), e(na)
-#ifdef DESPERATELY_WANT_ASSUMED_SIZE
+#ifdef USE_ASSUMED_SIZE
       real(kind=rk)                 :: q(ldq,*)
 #else
       real(kind=rk)                 :: q(ldq,matrixCols)
@@ -1709,7 +1709,7 @@ module ELPA1_compute
 
       integer(kind=ik)              :: na, nev, nqoff, ldq, nblk, matrixCols, mpi_comm_rows
       real(kind=rk)                 :: d(na), e(na)
-#ifdef DESPERATELY_WANT_ASSUMED_SIZE
+#ifdef USE_ASSUMED_SIZE
       real(kind=rk)                 :: q(ldq,*)
 #else
       real(kind=rk)                 :: q(ldq,matrixCols)
@@ -2041,7 +2041,7 @@ module ELPA1_compute
                                        mpi_comm_cols, npc_0, npc_n
       integer(kind=ik)              :: l_col(na), p_col(na), l_col_out(na), p_col_out(na)
       real(kind=rk)                 :: d(na), e
-#ifdef DESPERATELY_WANT_ASSUMED_SIZE
+#ifdef USE_ASSUMED_SIZE
       real(kind=rk)                 :: q(ldq,*)
 #else
       real(kind=rk)                 :: q(ldq,matrixCols)

src/elpa2.F90

@@ -145,7 +145,7 @@ function solve_evp_real_2stage(na, nev, a, lda, ev, q, ldq, nblk,        &
                                              mpi_comm_cols, mpi_comm_all
    integer(kind=ik), intent(in)           :: nblk
    real(kind=rk), intent(inout)           :: ev(na)
-#ifdef DESPERATELY_WANT_ASSUMED_SIZE
+#ifdef USE_ASSUMED_SIZE
    real(kind=rk), intent(inout)           :: a(lda,*), q(ldq,*)
 #else
    real(kind=rk), intent(inout)           :: a(lda,matrixCols), q(ldq,matrixCols)
@@ -385,7 +385,7 @@ function solve_evp_complex_2stage(na, nev, a, lda, ev, q, ldq, nblk, &
    integer(kind=ik), intent(in), optional :: THIS_COMPLEX_ELPA_KERNEL_API
    integer(kind=ik)                       :: THIS_COMPLEX_ELPA_KERNEL
    integer(kind=ik), intent(in)           :: na, nev, lda, ldq, nblk, matrixCols, mpi_comm_rows, mpi_comm_cols, mpi_comm_all
-#ifdef DESPERATELY_WANT_ASSUMED_SIZE
+#ifdef USE_ASSUMED_SIZE
    complex(kind=ck), intent(inout)        :: a(lda,*), q(ldq,*)
 #else
    complex(kind=ck), intent(inout)        :: a(lda,matrixCols), q(ldq,matrixCols)

src/elpa2_compute.F90

@@ -138,7 +138,7 @@ module ELPA2_compute
       implicit none
 
       integer(kind=ik)           :: na, lda, nblk, nbw, matrixCols, numBlocks, mpi_comm_rows, mpi_comm_cols
-#ifdef DESPERATELY_WANT_ASSUMED_SIZE
+#ifdef USE_ASSUMED_SIZE
       real(kind=rk)              :: a(lda,*), tmat(nbw,nbw,*)
 #else
       real(kind=rk)              :: a(lda,matrixCols), tmat(nbw,nbw,numBlocks)
@@ -204,7 +204,7 @@ module ELPA2_compute
           allocate(vmr(max(l_rows,1),na))
 
           vmrCols = na
-#ifdef DESPERATELY_WANT_ASSUMED_SIZE_QR
+#ifdef USE_ASSUMED_SIZE_QR
           call qr_pdgeqrf_2dcomm(a, lda, matrixCols, vmr, max(l_rows,1), vmrCols, tauvector(1), na, tmat(1,1,1), &
                                  nbw, nbw, dwork_size, 1, -1, na, nbw, nblk, nblk, na, na, 1, 0, PQRPARAM(1:11), &
                                  mpi_comm_rows, mpi_comm_cols, blockheuristic)
@@ -248,7 +248,7 @@ module ELPA2_compute
           if (which_qr_decomposition == 1) then
 
             vmrCols = 2*n_cols
-#ifdef DESPERATELY_WANT_ASSUMED_SIZE_QR
+#ifdef USE_ASSUMED_SIZE_QR
             call qr_pdgeqrf_2dcomm(a, lda, matrixCols, vmr, max(l_rows,1), vmrCols, tauvector(1), &
                                    na, tmat(1,1,istep), nbw, nbw, work_blocked, work_size,        &
                                      work_size, na, n_cols, nblk, nblk,        &
@@ -650,7 +650,7 @@ module ELPA2_compute
       use precision
       implicit none
       integer(kind=ik)  :: n, lda, ldb, comm
-#ifdef DESPERATELY_WANT_ASSUMED_SIZE
+#ifdef USE_ASSUMED_SIZE
       real(kind=rk)     :: a(lda,*)
 #else
       real(kind=rk)     :: a(lda,ldb)
@@ -727,7 +727,7 @@ module ELPA2_compute
       implicit none
 
       integer(kind=ik)            :: na, nqc, lda, ldq, nblk, nbw, matrixCols, numBlocks, mpi_comm_rows, mpi_comm_cols
-#ifdef DESPERATELY_WANT_ASSUMED_SIZE
+#ifdef USE_ASSUMED_SIZE
       real(kind=rk)               :: a(lda,*), q(ldq,*), tmat(nbw,nbw,*)
 #else
       real(kind=rk)               :: a(lda,matrixCols), q(ldq,matrixCols), tmat(nbw, nbw, numBlocks)
@@ -987,7 +987,7 @@ module ELPA2_compute
       implicit none
 
       integer(kind=ik), intent(in)  ::  na, nb, nblk, lda, matrixCols, mpi_comm_rows, mpi_comm_cols, mpi_comm
-#ifdef DESPERATELY_WANT_ASSUMED_SIZE
+#ifdef USE_ASSUMED_SIZE
       real(kind=rk), intent(in)     :: a(lda,*)
 #else
       real(kind=rk), intent(in)     :: a(lda,matrixCols)
@@ -1751,7 +1751,7 @@ module ELPA2_compute
 
       integer(kind=ik), intent(in)  :: THIS_REAL_ELPA_KERNEL
       integer(kind=ik), intent(in)  :: na, nev, nblk, nbw, ldq, matrixCols, mpi_comm_rows, mpi_comm_cols
-#ifdef DESPERATELY_WANT_ASSUMED_SIZE
+#ifdef USE_ASSUMED_SIZE
       real(kind=rk)                 :: q(ldq,*)
 #else
       real(kind=rk)                 :: q(ldq,matrixCols)
@@ -2926,7 +2926,7 @@ top_msg_length, current_local_n-top_msg_length-bottom_msg_length, i, &
       implicit none
 
       integer(kind=ik)              :: na, lda, nblk, nbw, matrixCols, numBlocks, mpi_comm_rows, mpi_comm_cols
-#ifdef DESPERATELY_WANT_ASSUMED_SIZE
+#ifdef USE_ASSUMED_SIZE
       complex(kind=ck)              :: a(lda,*), tmat(nbw,nbw,*)
 #else
       complex(kind=ck)              :: a(lda,matrixCols), tmat(nbw,nbw,numBlocks)
@@ -3293,7 +3293,7 @@ top_msg_length, current_local_n-top_msg_length-bottom_msg_length, i, &
       implicit none
 
       integer(kind=ik)              :: na, nqc, lda, ldq, nblk, nbw, matrixCols, numBlocks, mpi_comm_rows, mpi_comm_cols
-#ifdef DESPERATELY_WANT_ASSUMED_SIZE
+#ifdef USE_ASSUMED_SIZE
       complex(kind=ck)              :: a(lda,*), q(ldq,*), tmat(nbw,nbw,*)
 #else
       complex(kind=ck)              :: a(lda,matrixCols), q(ldq,matrixCols), tmat(nbw, nbw, numBlocks)
@@ -3440,7 +3440,7 @@ top_msg_length, current_local_n-top_msg_length-bottom_msg_length, i, &
       implicit none
 
       integer(kind=ik), intent(in)   ::  na, nb, nblk, lda, matrixCols, mpi_comm_rows, mpi_comm_cols, mpi_comm
-#ifdef DESPERATELY_WANT_ASSUMED_SIZE
+#ifdef USE_ASSUMED_SIZE
       complex(kind=ck),intent(in)    :: a(lda,*)
 #else
       complex(kind=ck), intent(in)   :: a(lda,matrixCols)
@@ -4182,7 +4182,7 @@ top_msg_length, current_local_n-top_msg_length-bottom_msg_length, i, &
 
       integer(kind=ik), intent(in)  :: THIS_COMPLEX_ELPA_KERNEL
       integer(kind=ik), intent(in)  :: na, nev, nblk, nbw, ldq, matrixCols, mpi_comm_rows, mpi_comm_cols
-#ifdef DESPERATELY_WANT_ASSUMED_SIZE
+#ifdef USE_ASSUMED_SIZE
       complex(kind=ck)              :: q(ldq,*)
 #else
       complex(kind=ck)              :: q(ldq,matrixCols)

src/elpa2_kernels/elpa2_kernels_complex.F90

@@ -69,7 +69,7 @@ contains
     implicit none
 
     integer(kind=ik), intent(in)    :: nb, nq, ldq
-#ifdef DESPERATELY_WANT_ASSUMED_SIZE
+#ifdef USE_ASSUMED_SIZE
     complex(kind=ck), intent(inout) :: q(ldq,*)
     complex(kind=ck), intent(in)    :: hh(*)
 #else
@@ -91,7 +91,7 @@ contains
     ! Always a multiple of 4 Q-rows is transformed, even if nq is smaller
 
     do i=1,nq-8,12
-#ifdef DESPERATELY_WANT_ASSUMED_SIZE
+#ifdef USE_ASSUMED_SIZE
        call hh_trafo_complex_kernel_12(q(i,1),hh, nb, ldq)
 #else
        call hh_trafo_complex_kernel_12(q(i:ldq,1:nb),hh(1:nb), nb, ldq)
@@ -101,13 +101,13 @@ contains
     ! i > nq-8 now, i.e. at most 8 rows remain
 
     if(nq-i+1 > 4) then
-#ifdef DESPERATELY_WANT_ASSUMED_SIZE
+#ifdef USE_ASSUMED_SIZE
        call hh_trafo_complex_kernel_8(q(i,1),hh, nb, ldq)
 #else
        call hh_trafo_complex_kernel_8(q(i:ldq,1:nb),hh(1:nb), nb, ldq)
 #endif
     else if(nq-i+1 > 0) then
-#ifdef DESPERATELY_WANT_ASSUMED_SIZE
+#ifdef USE_ASSUMED_SIZE
        call hh_trafo_complex_kernel_4(q(i,1),hh, nb, ldq)
 #else
        call hh_trafo_complex_kernel_4(q(i:ldq,1:nb),hh(1:nb), nb, ldq)
@@ -128,7 +128,7 @@ contains
     implicit none
 
     integer(kind=ik), intent(in)    :: nb, nq, ldq, ldh
-#ifdef DESPERATELY_WANT_ASSUMED_SIZE
+#ifdef USE_ASSUMED_SIZE
     complex(kind=ck), intent(inout) :: q(ldq,*)
     complex(kind=ck), intent(in)    :: hh(ldh,*)
 #else
@@ -158,7 +158,7 @@ contains
     ! Always a multiple of 4 Q-rows is transformed, even if nq is smaller
 
     do i=1,nq,4
-#ifdef DESPERATELY_WANT_ASSUMED_SIZE
+#ifdef USE_ASSUMED_SIZE
        call hh_trafo_complex_kernel_4_2hv(q(i,1),hh, nb, ldq, ldh, s)
 #else
        call hh_trafo_complex_kernel_4_2hv(q(i:ldq,1:nb+1),hh(1:ldh,1:2), nb, ldq, ldh, s)
@@ -166,7 +166,7 @@ contains
     enddo
 
     !do i=1,nq-8,12
-#ifdef DESPERATELY_WANT_ASSUMED_SIZE
+#ifdef USE_ASSUMED_SIZE
     !   call hh_trafo_complex_kernel_12_2hv(q(i,1),hh, nb, ldq, ldh, s)
 #else
     !   call hh_trafo_complex_kernel_12_2hv(q(i:ldq,1:nb+1),hh(1:ldh,1:2), nb, ldq, ldh, s)
@@ -176,13 +176,13 @@ contains
     ! i > nq-8 now, i.e. at most 8 rows remain
 
     !if(nq-i+1 > 4) then
-#ifdef DESPERATELY_WANT_ASSUMED_SIZE
+#ifdef USE_ASSUMED_SIZE
     !   call hh_trafo_complex_kernel_8_2hv(q(i,1),hh, nb, ldq, ldh, s)
 #else
     !   call hh_trafo_complex_kernel_8_2hv(q(i:ldq,1:nb+1),hh(1:ldh,1:2), nb, ldq, ldh, s)
 #endif
     !else if(nq-i+1 > 0) then
-#ifdef DESPERATELY_WANT_ASSUMED_SIZE
+#ifdef USE_ASSUMED_SIZE
     !   call hh_trafo_complex_kernel_4_2hv(q(i:ldq,1:nb+1),hh(1:ldh,1:2), nb, ldq, ldh, s)