From 50033dc2ec34b74a8ad53fb5d204ab7c5cf0ae0c Mon Sep 17 00:00:00 2001 From: Andreas Marek Date: Wed, 28 Sep 2016 09:03:27 +0200 Subject: [PATCH] Rename preprocessor flag for using assumed size arrays --- Makefile.am | 4 +-- configure.ac | 12 +++---- src/elpa1.F90 | 4 +-- src/elpa1_auxiliary.F90 | 14 ++++---- src/elpa1_compute_private.F90 | 14 ++++---- src/elpa2.F90 | 4 +-- src/elpa2_compute.F90 | 22 ++++++------ src/elpa2_kernels/elpa2_kernels_complex.F90 | 30 ++++++++-------- .../elpa2_kernels_complex_simple.F90 | 4 +-- src/elpa2_kernels/elpa2_kernels_real.F90 | 22 ++++++------ .../elpa2_kernels_real_simple.F90 | 2 +- src/elpa_c_interface.F90 | 22 ++++++------ src/elpa_qr/elpa_pdgeqrf.F90 | 36 +++++++++---------- src/mod_compute_hh_trafo_complex.F90 | 8 ++--- src/mod_compute_hh_trafo_real.F90 | 10 +++--- 15 files changed, 104 insertions(+), 104 deletions(-) diff --git a/Makefile.am b/Makefile.am index 459b2454..1b90b714 100644 --- a/Makefile.am +++ b/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 \ diff --git a/configure.ac b/configure.ac index 079e5b8e..e8fe4eef 100644 --- a/configure.ac +++ b/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]) diff --git a/src/elpa1.F90 b/src/elpa1.F90 index a66f0655..9626e486 100644 --- a/src/elpa1.F90 +++ b/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) diff --git a/src/elpa1_auxiliary.F90 b/src/elpa1_auxiliary.F90 index 0f75b454..642fb894 100644 --- a/src/elpa1_auxiliary.F90 +++ b/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) diff --git a/src/elpa1_compute_private.F90 b/src/elpa1_compute_private.F90 index 26cbb466..7398087d 100644 --- a/src/elpa1_compute_private.F90 +++ b/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) diff --git a/src/elpa2.F90 b/src/elpa2.F90 index 18b0f019..3abbf4c4 100644 --- a/src/elpa2.F90 +++ b/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) diff --git a/src/elpa2_compute.F90 b/src/elpa2_compute.F90 index ee77bc22..20a25a50 100644 --- a/src/elpa2_compute.F90 +++ b/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) diff --git a/src/elpa2_kernels/elpa2_kernels_complex.F90 b/src/elpa2_kernels/elpa2_kernels_complex.F90 index 7c885f36..bbc12b17 100644 --- a/src/elpa2_kernels/elpa2_kernels_complex.F90 +++ b/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) #else @@ -204,7 +204,7 @@ contains implicit none integer(kind=ik), intent(in) :: nb, ldq -#ifdef DESPERATELY_WANT_ASSUMED_SIZE +#ifdef USE_ASSUMED_SIZE complex(kind=ck), intent(inout) :: q(ldq,*) complex(kind=ck), intent(in) :: hh(*) #else @@ -311,7 +311,7 @@ contains implicit none integer(kind=ik), intent(in) :: nb, ldq -#ifdef DESPERATELY_WANT_ASSUMED_SIZE +#ifdef USE_ASSUMED_SIZE complex(kind=ck), intent(inout) :: q(ldq,*) complex(kind=ck), intent(in) :: hh(*) #else @@ -397,7 +397,7 @@ contains implicit none integer(kind=ik), intent(in) :: nb, ldq -#ifdef DESPERATELY_WANT_ASSUMED_SIZE +#ifdef USE_ASSUMED_SIZE complex(kind=ck), intent(inout) :: q(ldq,*) complex(kind=ck), intent(in) :: hh(*) #else @@ -462,7 +462,7 @@ contains implicit none integer(kind=ik), intent(in) :: nb, 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 @@ -561,7 +561,7 @@ contains implicit none integer(kind=ik), intent(in) :: nb, 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 @@ -707,7 +707,7 @@ contains implicit none integer(kind=ik), intent(in) :: nb, 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 diff --git a/src/elpa2_kernels/elpa2_kernels_complex_simple.F90 b/src/elpa2_kernels/elpa2_kernels_complex_simple.F90 index 0408a43f..c164c924 100644 --- a/src/elpa2_kernels/elpa2_kernels_complex_simple.F90 +++ b/src/elpa2_kernels/elpa2_kernels_complex_simple.F90 @@ -71,7 +71,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 @@ -114,7 +114,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 diff --git a/src/elpa2_kernels/elpa2_kernels_real.F90 b/src/elpa2_kernels/elpa2_kernels_real.F90 index 9a99d61f..8e9fb3d6 100644 --- a/src/elpa2_kernels/elpa2_kernels_real.F90 +++ b/src/elpa2_kernels/elpa2_kernels_real.F90 @@ -55,13 +55,13 @@ ! -------------------------------------------------------------------------------------------------- #include "config-f90.h" -#ifdef DESPERATELY_WANT_ASSUMED_SIZE +#ifdef USE_ASSUMED_SIZE #define PACK_REAL_TO_COMPLEX #else #undef PACK_REAL_TO_COMPLEX #endif -#ifndef DESPERATELY_WANT_ASSUMED_SIZE +#ifndef USE_ASSUMED_SIZE module real_generic_kernel private @@ -79,7 +79,7 @@ contains implicit none integer(kind=ik), intent(in) :: nb, nq, ldq, ldh -#ifdef DESPERATELY_WANT_ASSUMED_SIZE +#ifdef USE_ASSUMED_SIZE real(kind=rk), intent(inout) :: q(ldq,*) real(kind=rk), intent(in) :: hh(ldh,*) #else @@ -107,14 +107,14 @@ contains ! Do the Householder transformations -#ifndef DESPERATELY_WANT_ASSUMED_SIZE +#ifndef USE_ASSUMED_SIZE ! ! assign real data to compplex pointer ! call c_f_pointer(c_loc(q), q_complex, [size(q,dim=1)/2,size(q,dim=2)]) #endif ! 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_kernel_12_generic(q(i,1),hh, nb, ldq, ldh, s) #else call hh_trafo_kernel_12_generic(q(i:ldq,1:nb+1),hh(1:ldh,1:2), nb, ldq, ldh, s) @@ -124,7 +124,7 @@ 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 print *,"calling 8" call hh_trafo_kernel_8_generic(q(i,1),hh, nb, ldq, ldh, s) #else @@ -132,7 +132,7 @@ contains #endif else if(nq-i+1 > 0) then -#ifdef DESPERATELY_WANT_ASSUMED_SIZE +#ifdef USE_ASSUMED_SIZE print *,"calling 4" call hh_trafo_kernel_4_generic(q(i,1),hh, nb, ldq, ldh, s) #else @@ -160,7 +160,7 @@ contains implicit none integer(kind=ik), intent(in) :: nb, ldq, ldh -#ifdef DESPERATELY_WANT_ASSUMED_SIZE +#ifdef USE_ASSUMED_SIZE complex(kind=ck), intent(inout) :: q(ldq/2,*) real(kind=rk), intent(in) :: hh(ldh,*) #else @@ -379,7 +379,7 @@ contains implicit none integer(kind=ik), intent(in) :: nb, ldq, ldh -#ifdef DESPERATELY_WANT_ASSUMED_SIZE +#ifdef USE_ASSUMED_SIZE complex(kind=ck), intent(inout) :: q(ldq/2,*) real(kind=rk), intent(in) :: hh(ldh,*) #else @@ -551,7 +551,7 @@ contains implicit none integer(kind=ik), intent(in) :: nb, ldq, ldh -#ifdef DESPERATELY_WANT_ASSUMED_SIZE +#ifdef USE_ASSUMED_SIZE complex(kind=ck), intent(inout) :: q(ldq/2,*) real(kind=rk), intent(in) :: hh(ldh,*) #else @@ -668,7 +668,7 @@ contains #endif end subroutine hh_trafo_kernel_4_generic -#ifndef DESPERATELY_WANT_ASSUMED_SIZE +#ifndef USE_ASSUMED_SIZE end module real_generic_kernel #endif ! -------------------------------------------------------------------------------------------------- diff --git a/src/elpa2_kernels/elpa2_kernels_real_simple.F90 b/src/elpa2_kernels/elpa2_kernels_real_simple.F90 index 06162dcd..d1ccdf70 100644 --- a/src/elpa2_kernels/elpa2_kernels_real_simple.F90 +++ b/src/elpa2_kernels/elpa2_kernels_real_simple.F90 @@ -71,7 +71,7 @@ contains implicit none integer(kind=ik), intent(in) :: nb, nq, ldq, ldh -#ifdef DESPERATELY_WANT_ASSUMED_SIZE +#ifdef USE_ASSUMED_SIZE real(kind=rk), intent(inout) :: q(ldq,*) real(kind=rk), intent(in) :: hh(ldh,*) #else diff --git a/src/elpa_c_interface.F90 b/src/elpa_c_interface.F90 index 2e64b98f..703f8141 100644 --- a/src/elpa_c_interface.F90 +++ b/src/elpa_c_interface.F90 @@ -130,7 +130,7 @@ integer(kind=c_int) :: success integer(kind=c_int), value, intent(in) :: na, nev, lda, ldq, nblk, matrixCols, mpi_comm_cols, mpi_comm_rows real(kind=c_double) :: ev(1:na) -#ifdef DESPERATELY_WANT_ASSUMED_SIZE +#ifdef USE_ASSUMED_SIZE real(kind=c_double) :: a(lda,*), q(ldq,*) #else real(kind=c_double) :: a(1:lda,1:matrixCols), q(1:ldq,1:matrixCols) @@ -181,7 +181,7 @@ implicit none integer(kind=c_int) :: success integer(kind=c_int), value, intent(in) :: na, nev, lda, ldq, nblk, matrixCols, mpi_comm_cols, mpi_comm_rows -#ifdef DESPERATELY_WANT_ASSUMED_SIZE +#ifdef USE_ASSUMED_SIZE complex(kind=c_double_complex) :: a(lda,*), q(ldq,*) #else complex(kind=c_double_complex) :: a(1:lda,1:matrixCols), q(1:ldq,1:matrixCols) @@ -239,7 +239,7 @@ mpi_comm_all integer(kind=c_int), value, intent(in) :: THIS_REAL_ELPA_KERNEL_API, useQR real(kind=c_double) :: ev(1:na) -#ifdef DESPERATELY_WANT_ASSUMED_SIZE +#ifdef USE_ASSUMED_SIZE real(kind=c_double) :: a(lda,*), q(ldq,*) #else real(kind=c_double) :: a(1:lda,1:matrixCols), q(1:ldq,1:matrixCols) @@ -304,7 +304,7 @@ integer(kind=c_int), value, intent(in) :: na, nev, lda, ldq, nblk, matrixCols, mpi_comm_cols, mpi_comm_rows, & mpi_comm_all integer(kind=c_int), value, intent(in) :: THIS_COMPLEX_ELPA_KERNEL_API -#ifdef DESPERATELY_WANT_ASSUMED_SIZE +#ifdef USE_ASSUMED_SIZE complex(kind=c_double_complex) :: a(lda,*), q(ldq,*) #else complex(kind=c_double_complex) :: a(1:lda,1:matrixCols), q(1:ldq,1:matrixCols) @@ -353,7 +353,7 @@ integer(kind=c_int), value, intent(in) :: na, nev, ldq, nblk, matrixCols, mpi_comm_cols, mpi_comm_rows integer(kind=c_int), value :: wantDebug real(kind=c_double) :: d(1:na), e(1:na) -#ifdef DESPERATELY_WANT_ASSUMED_SIZE +#ifdef USE_ASSUMED_SIZE real(kind=c_double) :: q(ldq,*) #else real(kind=c_double) :: q(1:ldq, 1:matrixCols) @@ -425,7 +425,7 @@ integer(kind=c_int), value :: na, ncb, lda, ldb, nblk, mpi_comm_rows, mpi_comm_cols, ldc, & ldaCols, ldbCols, ldcCols integer(kind=c_int) :: success -#ifdef DESPERATELY_WANT_ASSUMED_SIZE +#ifdef USE_ASSUMED_SIZE real(kind=c_double) :: a(lda,*), b(ldb,*), c(ldc,*) #else real(kind=c_double) :: a(lda,ldaCols), b(ldb,ldbCols), c(ldc,ldcCols) @@ -492,7 +492,7 @@ character(1,C_CHAR), value :: uplo_a, uplo_c integer(kind=c_int), value :: na, ncb, lda, ldb, nblk, mpi_comm_rows, mpi_comm_cols, ldc, ldaCols, ldbCols, ldcCols integer(kind=c_int) :: success -#ifdef DESPERATELY_WANT_ASSUMED_SIZE +#ifdef USE_ASSUMED_SIZE complex(kind=c_double_complex) :: a(lda,*), b(ldb,*), c(ldc,*) #else complex(kind=c_double_complex) :: a(lda,ldaCols), b(ldb,ldbCols), c(ldc,ldcCols) @@ -538,7 +538,7 @@ integer(kind=c_int), value :: na, lda, nblk, matrixCols, mpi_comm_rows, mpi_comm_cols integer(kind=c_int), value :: wantDebug integer(kind=c_int) :: success -#ifdef DESPERATELY_WANT_ASSUMED_SIZE +#ifdef USE_ASSUMED_SIZE real(kind=c_double) :: a(lda,*) #else real(kind=c_double) :: a(lda,matrixCols) @@ -590,7 +590,7 @@ integer(kind=c_int), value :: na, lda, nblk, matrixCols, mpi_comm_rows, mpi_comm_cols integer(kind=c_int), value :: wantDebug integer(kind=c_int) :: success -#ifdef DESPERATELY_WANT_ASSUMED_SIZE +#ifdef USE_ASSUMED_SIZE complex(kind=c_double_complex) :: a(lda, *) #else complex(kind=c_double_complex) :: a(lda, matrixCols) @@ -643,7 +643,7 @@ integer(kind=c_int), value :: na, lda, nblk, matrixCols, mpi_comm_rows, mpi_comm_cols, wantDebug integer(kind=c_int) :: success -#ifdef DESPERATELY_WANT_ASSUMED_SIZE +#ifdef USE_ASSUMED_SIZE real(kind=c_double) :: a(lda,*) #else real(kind=c_double) :: a(lda,matrixCols) @@ -694,7 +694,7 @@ integer(kind=c_int), value :: na, lda, nblk, matrixCols, mpi_comm_rows, mpi_comm_cols, wantDebug integer(kind=c_int) :: success -#ifdef DESPERATELY_WANT_ASSUMED_SIZE +#ifdef USE_ASSUMED_SIZE complex(kind=c_double_complex) :: a(lda,*) #else complex(kind=c_double_complex) :: a(lda,matrixCols) diff --git a/src/elpa_qr/elpa_pdgeqrf.F90 b/src/elpa_qr/elpa_pdgeqrf.F90 index cf13cbe3..4001243c 100644 --- a/src/elpa_qr/elpa_pdgeqrf.F90 +++ b/src/elpa_qr/elpa_pdgeqrf.F90 @@ -80,7 +80,7 @@ module elpa_pdgeqrf ! input variables (global) integer(kind=ik) :: n, mb, nb, rowidx, colidx, rev, trans, mpicomm_cols, mpicomm_rows -#ifdef DESPERATELY_WANT_ASSUMED_SIZE_QR +#ifdef USE_ASSUMED_SIZE_QR integer(kind=ik) :: PQRPARAM(*) real(kind=rk) :: a(lda,*), v(ldv,*), tau(*), t(ldt,*), work(*) #else @@ -123,7 +123,7 @@ module elpa_pdgeqrf call mpi_comm_rank(mpicomm_rows,mpirank_rows,mpierr) call mpi_comm_size(mpicomm_cols,mpiprocs_cols,mpierr) -#ifdef DESPERATELY_WANT_ASSUMED_SIZE_QR +#ifdef USE_ASSUMED_SIZE_QR call qr_pdgeqrf_1dcomm(a,lda,v,ldv,tau,t,ldt,pdgeqrf_size(1),-1,m,total_cols,mb,rowidx,rowidx,rev,trans, & PQRPARAM(4),mpicomm_rows,blockheuristic) #else @@ -204,7 +204,7 @@ module elpa_pdgeqrf tau(offset:offset+lcols-1) = 0.0d0 -#ifdef DESPERATELY_WANT_ASSUMED_SIZE_QR +#ifdef USE_ASSUMED_SIZE_QR call qr_pdgeqrf_1dcomm(a(1,offset),lda,v(1,voffset),ldv,tau(offset),t(voffset,voffset),ldt, & work(work_offset),lwork,m,lcols,mb,rowidx,idx,rev,trans,PQRPARAM(4), & mpicomm_rows,blockheuristic) @@ -364,7 +364,7 @@ module elpa_pdgeqrf ! input variables (global) integer(kind=ik) :: m,n,mb,baseidx,rowidx,rev,trans,mpicomm -#ifdef DESPERATELY_WANT_ASSUMED_SIZE_QR +#ifdef USE_ASSUMED_SIZE_QR integer(kind=ik) :: PQRPARAM(*) #else @@ -389,7 +389,7 @@ module elpa_pdgeqrf tmerge = PQRPARAM(3) if (lwork .eq. -1) then -#ifdef DESPERATELY_WANT_ASSUMED_SIZE_QR +#ifdef USE_ASSUMED_SIZE_QR call qr_pdgeqr2_1dcomm(a,lda,v,ldv,tau,t,ldt,pdgeqr2_size,-1, & m,size1d,mb,baseidx,baseidx,rev,trans,PQRPARAM(4),mpicomm,blockheuristic) #else @@ -417,7 +417,7 @@ module elpa_pdgeqrf idx = rowidx-current_block*size1d updatesize = n-(current_block+1)*size1d aoffset = 1+updatesize -#ifdef DESPERATELY_WANT_ASSUMED_SIZE_QR +#ifdef USE_ASSUMED_SIZE_QR call qr_pdgeqr2_1dcomm(a(1,aoffset),lda,v(1,aoffset),ldv,tau(aoffset),t(aoffset,aoffset),ldt,work,lwork, & m,size1d,mb,baseidx,idx,1,trans,PQRPARAM(4),mpicomm,blockheuristic) @@ -456,7 +456,7 @@ module elpa_pdgeqrf if (remainder .gt. 0) then aoffset = 1 idx = rowidx-size1d*nr_blocks -#ifdef DESPERATELY_WANT_ASSUMED_SIZE_QR +#ifdef USE_ASSUMED_SIZE_QR call qr_pdgeqr2_1dcomm(a(1,aoffset),lda,v,ldv,tau,t,ldt,work,lwork, & m,remainder,mb,baseidx,idx,1,trans,PQRPARAM(4),mpicomm,blockheuristic) @@ -503,7 +503,7 @@ module elpa_pdgeqrf ! input variables (global) integer(kind=ik) :: m,n,mb,baseidx,rowidx,rev,trans,mpicomm -#ifdef DESPERATELY_WANT_ASSUMED_SIZE_QR +#ifdef USE_ASSUMED_SIZE_QR integer(kind=ik) :: PQRPARAM(*) #else integer(kind=ik) :: PQRPARAM(:) @@ -541,7 +541,7 @@ module elpa_pdgeqrf if (lwork .eq. -1) then call qr_pdlarfg_1dcomm(a,incx,tau(1),pdlarfg_size(1),-1,n,rowidx,mb,hgmode,rev,mpicomm) call qr_pdlarfl_1dcomm(v,1,baseidx,a,lda,tau(1),pdlarf_size(1),-1,m,n,rowidx,mb,rev,mpicomm) -#ifdef DESPERATELY_WANT_ASSUMED_SIZE_QR +#ifdef USE_ASSUMED_SIZE_QR call qr_pdlarfg2_1dcomm_ref(a,lda,tau,t,ldt,v,ldv,baseidx,pdlarfg2_size(1),-1,m,rowidx,mb,PQRPARAM, & rev,mpicomm,actualrank) @@ -600,7 +600,7 @@ module elpa_pdgeqrf actualrank = 1 else if (rank .eq. 2) then -#ifdef DESPERATELY_WANT_ASSUMED_SIZE_QR +#ifdef USE_ASSUMED_SIZE_QR call qr_pdlarfg2_1dcomm_ref(a(1,current_column),lda,tau(current_column), & t(current_column,current_column),ldt,v(1,current_column),ldv, & baseidx,work,lwork,m,idx,mb,PQRPARAM,1,mpicomm,actualrank) @@ -611,7 +611,7 @@ module elpa_pdgeqrf baseidx,work,lwork,m,idx,mb,PQRPARAM(:),1,mpicomm,actualrank) #endif else -#ifdef DESPERATELY_WANT_ASSUMED_SIZE_QR +#ifdef USE_ASSUMED_SIZE_QR call qr_pdlarfgk_1dcomm(a(1,current_column),lda,tau(current_column), & t(current_column,current_column),ldt,v(1,current_column),ldv, & baseidx,work,lwork,m,rank,idx,mb,PQRPARAM,1,mpicomm,actualrank) @@ -894,7 +894,7 @@ module elpa_pdgeqrf ! input variables (global) integer(kind=ik) :: m,idx,baseidx,mb,rev,mpicomm -#ifdef DESPERATELY_WANT_ASSUMED_SIZE_QR +#ifdef USE_ASSUMED_SIZE_QR integer(kind=ik) :: PQRPARAM(*) #else integer(kind=ik) :: PQRPARAM(:) @@ -1388,7 +1388,7 @@ module elpa_pdgeqrf ! input variables (global) integer(kind=ik) :: m,k,idx,baseidx,mb,rev,mpicomm -#ifdef DESPERATELY_WANT_ASSUMED_SIZE_QR +#ifdef USE_ASSUMED_SIZE_QR integer(kind=ik) ::PQRPARAM(*) #else integer(kind=ik) :: PQRPARAM(:) @@ -1419,7 +1419,7 @@ module elpa_pdgeqrf call qr_pdlarfl_1dcomm(v,1,baseidx,a,lda,tau(1),pdlarf_size(1),-1,m,k,baseidx,mb,rev,mpicomm) call qr_pdlarfgk_1dcomm_seed(a,lda,baseidx,pdlarfgk_1dcomm_seed_size(1),-1,work,work,m,k,mb,mpicomm) -#ifdef DESPERATELY_WANT_ASSUMED_SIZE_QR +#ifdef USE_ASSUMED_SIZE_QR !call qr_pdlarfgk_1dcomm_check(work,work,k,PQRPARAM,pdlarfgk_1dcomm_check_size(1),-1,actualk) call qr_pdlarfgk_1dcomm_check_improved(work,work,k,PQRPARAM,pdlarfgk_1dcomm_check_size(1),-1,actualk) @@ -1439,7 +1439,7 @@ module elpa_pdgeqrf end if call qr_pdlarfgk_1dcomm_seed(a(1,1),lda,idx,work(work_offset),lwork,work(seedC_offset),work(seedD_offset),m,k,mb,mpicomm) -#ifdef DESPERATELY_WANT_ASSUMED_SIZE_QR +#ifdef USE_ASSUMED_SIZE_QR !call qr_pdlarfgk_1dcomm_check(work(seedC_offset),work(seedD_offset),k,PQRPARAM,work(work_offset),lwork,actualk) call qr_pdlarfgk_1dcomm_check_improved(work(seedC_offset),work(seedD_offset),k,PQRPARAM,work(work_offset),lwork,actualk) #else @@ -1608,7 +1608,7 @@ module elpa_pdgeqrf ! input variables (global) integer(kind=ik) :: k,lwork -#ifdef DESPERATELY_WANT_ASSUMED_SIZE_QR +#ifdef USE_ASSUMED_SIZE_QR integer(kind=ik) :: PQRPARAM(*) #else @@ -1749,7 +1749,7 @@ module elpa_pdgeqrf ! input variables (global) integer(kind=ik) :: k,lwork -#ifdef DESPERATELY_WANT_ASSUMED_SIZE_QR +#ifdef USE_ASSUMED_SIZE_QR integer(kind=ik) :: PQRPARAM(*) #else integer(kind=ik) :: PQRPARAM(:) @@ -2330,7 +2330,7 @@ module elpa_pdgeqrf INTEGER(kind=ik) :: size2d,size1d,maxrank,eps,tmerge2d,tmerge1d ! output -#ifdef DESPERATELY_WANT_ASSUMED_SIZE_QR +#ifdef USE_ASSUMED_SIZE_QR INTEGER(kind=ik) :: PQRPARAM(*) #else INTEGER(kind=ik) :: PQRPARAM(1:11) diff --git a/src/mod_compute_hh_trafo_complex.F90 b/src/mod_compute_hh_trafo_complex.F90 index 4b5f5208..7c08033e 100644 --- a/src/mod_compute_hh_trafo_complex.F90 +++ b/src/mod_compute_hh_trafo_complex.F90 @@ -202,7 +202,7 @@ module compute_hh_trafo_complex ttt = mpi_wtime() do j = ncols, 1, -1 #ifdef WITH_OPENMP -#ifdef DESPERATELY_WANT_ASSUMED_SIZE +#ifdef USE_ASSUMED_SIZE call single_hh_trafo_complex_generic_simple(a(1,j+off+a_off,istripe,my_thread), & bcast_buffer(1,j+off),nbw,nl,stripe_width) #else @@ -211,7 +211,7 @@ module compute_hh_trafo_complex #endif #else /* WITH_OPENMP */ -#ifdef DESPERATELY_WANT_ASSUMED_SIZE +#ifdef USE_ASSUMED_SIZE call single_hh_trafo_complex_generic_simple(a(1,j+off+a_off,istripe), & bcast_buffer(1,j+off),nbw,nl,stripe_width) #else @@ -236,7 +236,7 @@ module compute_hh_trafo_complex ttt = mpi_wtime() do j = ncols, 1, -1 #ifdef WITH_OPENMP -#ifdef DESPERATELY_WANT_ASSUMED_SIZE +#ifdef USE_ASSUMED_SIZE call single_hh_trafo_complex_generic(a(1,j+off+a_off,istripe,my_thread), & bcast_buffer(1,j+off),nbw,nl,stripe_width) @@ -246,7 +246,7 @@ module compute_hh_trafo_complex #endif #else /* WITH_OPENMP */ -#ifdef DESPERATELY_WANT_ASSUMED_SIZE +#ifdef USE_ASSUMED_SIZE call single_hh_trafo_complex_generic(a(1,j+off+a_off,istripe), & bcast_buffer(1,j+off),nbw,nl,stripe_width) #else diff --git a/src/mod_compute_hh_trafo_real.F90 b/src/mod_compute_hh_trafo_real.F90 index 094c8e9f..d97c13ed 100644 --- a/src/mod_compute_hh_trafo_real.F90 +++ b/src/mod_compute_hh_trafo_real.F90 @@ -74,7 +74,7 @@ module compute_hh_trafo_real use real_generic_simple_kernel, only : double_hh_trafo_generic_simple #endif -#if defined(WITH_REAL_GENERIC_KERNEL) && !(defined(DESPERATELY_WANT_ASSUMED_SIZE)) +#if defined(WITH_REAL_GENERIC_KERNEL) && !(defined(USE_ASSUMED_SIZE)) use real_generic_kernel, only : double_hh_trafo_generic #endif @@ -171,7 +171,7 @@ module compute_hh_trafo_real w(:,2) = bcast_buffer(1:nbw,j+off-1) #ifdef WITH_OPENMP -#ifdef DESPERATELY_WANT_ASSUMED_SIZE +#ifdef USE_ASSUMED_SIZE call double_hh_trafo_generic(a(1,j+off+a_off-1,istripe,my_thread), w, & nbw, nl, stripe_width, nbw) @@ -183,7 +183,7 @@ module compute_hh_trafo_real #else /* WITH_OPENMP */ -#ifdef DESPERATELY_WANT_ASSUMED_SIZE +#ifdef USE_ASSUMED_SIZE call double_hh_trafo_generic(a(1,j+off+a_off-1,istripe),w, & nbw, nl, stripe_width, nbw) @@ -209,7 +209,7 @@ module compute_hh_trafo_real w(:,1) = bcast_buffer(1:nbw,j+off) w(:,2) = bcast_buffer(1:nbw,j+off-1) #ifdef WITH_OPENMP -#ifdef DESPERATELY_WANT_ASSUMED_SIZE +#ifdef USE_ASSUMED_SIZE call double_hh_trafo_generic_simple(a(1,j+off+a_off-1,istripe,my_thread), & w, nbw, nl, stripe_width, nbw) #else @@ -219,7 +219,7 @@ module compute_hh_trafo_real #endif #else /* WITH_OPENMP */ -#ifdef DESPERATELY_WANT_ASSUMED_SIZE +#ifdef USE_ASSUMED_SIZE call double_hh_trafo_generic_simple(a(1,j+off+a_off-1,istripe), & w, nbw, nl, stripe_width, nbw) #else -- GitLab