Remove unused parameters

cp2k · Jan 29, 2023 · 94dc867 · 94dc867
1 parent 8f18a4e
commit 94dc867
Show file tree

Hide file tree

Showing 5 changed files with 68 additions and 77 deletions.
diff --git a/src/input_cp2k_pwdft.F b/src/input_cp2k_pwdft.F
@@ -440,9 +440,6 @@ END SUBROUTINE create_dos_section
    SUBROUTINE create_pwdft_section(section)
       TYPE(section_type), POINTER                        :: section
 
-      CHARACTER(len=*), PARAMETER :: routineN = 'create_pwdft_section', &
-         routineP = moduleN//':'//routineN
-
       CPASSERT(.NOT. ASSOCIATED(section))
 
       CALL section_create(section, __LOCATION__, name="PW_DFT", &

diff --git a/src/mpiwrap/message_passing.F b/src/mpiwrap/message_passing.F
@@ -3276,8 +3276,6 @@ SUBROUTINE mp_get_library_version(version, resultlen)
       CHARACTER(len=*), INTENT(OUT)                      :: version
       INTEGER, INTENT(OUT)                               :: resultlen
 
-      CHARACTER(len=*), PARAMETER :: routineN = 'mp_get_library_version'
-
       INTEGER                                            :: ierr
 
       ierr = 0
@@ -3286,7 +3284,7 @@ SUBROUTINE mp_get_library_version(version, resultlen)
 
 #if defined(__parallel)
       CALL mpi_get_library_version(version, resultlen, ierr)
-      IF (ierr /= 0) CALL mp_stop(ierr, "mpi_get_library_version @ "//routineN)
+      IF (ierr /= 0) CALL mp_stop(ierr, "mpi_get_library_version @ mp_get_library_version")
 #else
       MARK_USED(version)
       resultlen = 0
@@ -3484,16 +3482,14 @@ SUBROUTINE mp_file_write_at_chv(fh, offset, msg, msglen)
       INTEGER, INTENT(IN), OPTIONAL              :: msglen
       INTEGER(kind=file_offset), INTENT(IN)      :: offset
 
-      CHARACTER(len=*), PARAMETER :: routineN = 'mp_file_write_at_chv'
-
 #if defined(__parallel)
       INTEGER                                    :: ierr, msg_len
 
       msg_len = SIZE(msg)
       IF (PRESENT(msglen)) msg_len = msglen
       CALL MPI_FILE_WRITE_AT(fh%handle, offset, msg, msg_len, MPI_CHARACTER, MPI_STATUS_IGNORE, ierr)
       IF (ierr .NE. 0) &
-         CPABORT("mpi_file_write_at_chv @ "//routineN)
+         CPABORT("mpi_file_write_at_chv @ mp_file_write_at_chv")
 #else
       MARK_USED(msglen)
       WRITE (UNIT=fh%handle, POS=offset + 1) msg
@@ -3511,14 +3507,12 @@ SUBROUTINE mp_file_write_at_ch(fh, offset, msg)
       TYPE(mp_file_type), INTENT(IN)                        :: fh
       INTEGER(kind=file_offset), INTENT(IN)      :: offset
 
-      CHARACTER(len=*), PARAMETER :: routineN = 'mp_file_write_at_ch'
-
 #if defined(__parallel)
       INTEGER                                    :: ierr
 
       CALL MPI_FILE_WRITE_AT(fh%handle, offset, msg, LEN(msg), MPI_CHARACTER, MPI_STATUS_IGNORE, ierr)
       IF (ierr .NE. 0) &
-         CPABORT("mpi_file_write_at_ch @ "//routineN)
+         CPABORT("mpi_file_write_at_ch @ mp_file_write_at_ch")
 #else
       WRITE (UNIT=fh%handle, POS=offset + 1) msg
 #endif
@@ -3540,16 +3534,14 @@ SUBROUTINE mp_file_write_at_all_chv(fh, offset, msg, msglen)
       INTEGER, INTENT(IN), OPTIONAL              :: msglen
       INTEGER(kind=file_offset), INTENT(IN)      :: offset
 
-      CHARACTER(len=*), PARAMETER :: routineN = 'mp_file_write_at_all_chv'
-
 #if defined(__parallel)
       INTEGER                                    :: ierr, msg_len
 
       msg_len = SIZE(msg)
       IF (PRESENT(msglen)) msg_len = msglen
       CALL MPI_FILE_WRITE_AT_ALL(fh%handle, offset, msg, msg_len, MPI_CHARACTER, MPI_STATUS_IGNORE, ierr)
       IF (ierr .NE. 0) &
-         CPABORT("mpi_file_write_at_all_chv @ "//routineN)
+         CPABORT("mpi_file_write_at_all_chv @ mp_file_write_at_all_chv")
 #else
       MARK_USED(msglen)
       WRITE (UNIT=fh%handle, POS=offset + 1) msg
@@ -3567,14 +3559,12 @@ SUBROUTINE mp_file_write_at_all_ch(fh, offset, msg)
       TYPE(mp_file_type), INTENT(IN)                        :: fh
       INTEGER(kind=file_offset), INTENT(IN)      :: offset
 
-      CHARACTER(len=*), PARAMETER :: routineN = 'mp_file_write_at_all_ch'
-
 #if defined(__parallel)
       INTEGER                                    :: ierr
 
       CALL MPI_FILE_WRITE_AT_ALL(fh%handle, offset, msg, LEN(msg), MPI_CHARACTER, MPI_STATUS_IGNORE, ierr)
       IF (ierr .NE. 0) &
-         CPABORT("mpi_file_write_at_all_ch @ "//routineN)
+         CPABORT("mpi_file_write_at_all_ch @ mp_file_write_at_all_ch")
 #else
       WRITE (UNIT=fh%handle, POS=offset + 1) msg
 #endif
@@ -3597,16 +3587,14 @@ SUBROUTINE mp_file_read_at_chv(fh, offset, msg, msglen)
       INTEGER, INTENT(IN), OPTIONAL              :: msglen
       INTEGER(kind=file_offset), INTENT(IN)      :: offset
 
-      CHARACTER(len=*), PARAMETER :: routineN = 'mp_file_read_at_chv'
-
 #if defined(__parallel)
       INTEGER                                    :: ierr, msg_len
 
       msg_len = SIZE(msg)
       IF (PRESENT(msglen)) msg_len = msglen
       CALL MPI_FILE_READ_AT(fh%handle, offset, msg, msg_len, MPI_CHARACTER, MPI_STATUS_IGNORE, ierr)
       IF (ierr .NE. 0) &
-         CPABORT("mpi_file_read_at_chv @ "//routineN)
+         CPABORT("mpi_file_read_at_chv @ mp_file_read_at_chv")
 #else
       MARK_USED(msglen)
       READ (UNIT=fh%handle, POS=offset + 1) msg
@@ -3624,14 +3612,12 @@ SUBROUTINE mp_file_read_at_ch(fh, offset, msg)
       TYPE(mp_file_type), INTENT(IN)                        :: fh
       INTEGER(kind=file_offset), INTENT(IN)      :: offset
 
-      CHARACTER(len=*), PARAMETER :: routineN = 'mp_file_read_at_ch'
-
 #if defined(__parallel)
       INTEGER                                    :: ierr
 
       CALL MPI_FILE_READ_AT(fh%handle, offset, msg, LEN(msg), MPI_CHARACTER, MPI_STATUS_IGNORE, ierr)
       IF (ierr .NE. 0) &
-         CPABORT("mpi_file_read_at_ch @ "//routineN)
+         CPABORT("mpi_file_read_at_ch @ mp_file_read_at_ch")
 #else
       READ (UNIT=fh%handle, POS=offset + 1) msg
 #endif
@@ -3653,16 +3639,14 @@ SUBROUTINE mp_file_read_at_all_chv(fh, offset, msg, msglen)
       INTEGER, INTENT(IN), OPTIONAL              :: msglen
       INTEGER(kind=file_offset), INTENT(IN)      :: offset
 
-      CHARACTER(len=*), PARAMETER :: routineN = 'mp_file_read_at_all_chv'
-
 #if defined(__parallel)
       INTEGER                                    :: ierr, msg_len
 
       msg_len = SIZE(msg)
       IF (PRESENT(msglen)) msg_len = msglen
       CALL MPI_FILE_READ_AT_ALL(fh%handle, offset, msg, msg_len, MPI_CHARACTER, MPI_STATUS_IGNORE, ierr)
       IF (ierr .NE. 0) &
-         CPABORT("mpi_file_read_at_all_chv @ "//routineN)
+         CPABORT("mpi_file_read_at_all_chv @ mp_file_read_at_all_chv")
 #else
       MARK_USED(msglen)
       READ (UNIT=fh%handle, POS=offset + 1) msg
@@ -3680,14 +3664,12 @@ SUBROUTINE mp_file_read_at_all_ch(fh, offset, msg)
       TYPE(mp_file_type), INTENT(IN)                        :: fh
       INTEGER(kind=file_offset), INTENT(IN)      :: offset
 
-      CHARACTER(len=*), PARAMETER :: routineN = 'mp_file_read_at_all_ch'
-
 #if defined(__parallel)
       INTEGER                                    :: ierr
 
       CALL MPI_FILE_READ_AT_ALL(fh%handle, offset, msg, LEN(msg), MPI_CHARACTER, MPI_STATUS_IGNORE, ierr)
       IF (ierr .NE. 0) &
-         CPABORT("mpi_file_read_at_all_ch @ "//routineN)
+         CPABORT("mpi_file_read_at_all_ch @ mp_file_read_at_all_ch")
 #else
       READ (UNIT=fh%handle, POS=offset + 1) msg
 #endif
@@ -3705,15 +3687,13 @@ SUBROUTINE mp_type_size(type_descriptor, type_size)
       TYPE(mp_type_descriptor_type), INTENT(IN)          :: type_descriptor
       INTEGER, INTENT(OUT)                               :: type_size
 
-      CHARACTER(len=*), PARAMETER :: routineN = 'mp_type_size'
-
       INTEGER                                            :: ierr
 
       ierr = 0
 #if defined(__parallel)
       CALL MPI_TYPE_SIZE(type_descriptor%type_handle, type_size, ierr)
       IF (ierr .NE. 0) &
-         CPABORT("mpi_type_size @ "//routineN)
+         CPABORT("mpi_type_size failed @ mp_type_size")
 #else
       SELECT CASE (type_descriptor%type_handle)
       CASE (1)
@@ -4211,8 +4191,6 @@ SUBROUTINE mp_isend_custom(msgin, dest, comm, request, tag)
       TYPE(mp_request_type), INTENT(out)                               :: request
       INTEGER, INTENT(in), OPTIONAL                      :: tag
 
-      CHARACTER(len=*), PARAMETER :: routineN = 'mp_isend_custom'
-
       INTEGER                                            :: ierr, my_tag
 
       ierr = 0
@@ -4223,7 +4201,7 @@ SUBROUTINE mp_isend_custom(msgin, dest, comm, request, tag)
 
       CALL mpi_isend(MPI_BOTTOM, 1, msgin%type_handle, dest, my_tag, &
                      comm%handle, request%handle, ierr)
-      IF (ierr /= 0) CALL mp_stop(ierr, "mpi_isend @ "//routineN)
+      IF (ierr /= 0) CALL mp_stop(ierr, "mpi_isend @ mp_isend_custom")
 #else
       MARK_USED(msgin)
       MARK_USED(dest)
@@ -4250,8 +4228,6 @@ SUBROUTINE mp_irecv_custom(msgout, source, comm, request, tag)
       TYPE(mp_request_type), INTENT(out)                               :: request
       INTEGER, INTENT(in), OPTIONAL                      :: tag
 
-      CHARACTER(len=*), PARAMETER :: routineN = 'mp_irecv_custom'
-
       INTEGER                                            :: ierr, my_tag
 
       ierr = 0
@@ -4262,7 +4238,7 @@ SUBROUTINE mp_irecv_custom(msgout, source, comm, request, tag)
 
       CALL mpi_irecv(MPI_BOTTOM, 1, msgout%type_handle, source, my_tag, &
                      comm%handle, request%handle, ierr)
-      IF (ierr /= 0) CALL mp_stop(ierr, "mpi_irecv @ "//routineN)
+      IF (ierr /= 0) CALL mp_stop(ierr, "mpi_irecv @ mp_irecv_custom")
 #else
       MARK_USED(msgout)
       MARK_USED(source)

diff --git a/src/mpiwrap/message_passing.fypp b/src/mpiwrap/message_passing.fypp
@@ -3892,8 +3892,6 @@
       INTEGER, INTENT(IN), OPTIONAL              :: msglen
       INTEGER(kind=file_offset), INTENT(IN)      :: offset
 
-      CHARACTER(len=*), PARAMETER :: routineN = 'mp_file_write_at_${nametype1}$v'
-
       INTEGER                                    :: ierr, msg_len
 
       ierr = 0
@@ -3902,7 +3900,7 @@
 #if defined(__parallel)
       CALL MPI_FILE_WRITE_AT(fh%handle, offset, msg, msg_len, ${mpi_type1}$, MPI_STATUS_IGNORE, ierr)
       IF (ierr .NE. 0) &
-         CPABORT("mpi_file_write_at_${nametype1}$v @ "//routineN)
+         CPABORT("mpi_file_write_at_${nametype1}$v @ mp_file_write_at_${nametype1}$v")
 #else
       WRITE (UNIT=fh%handle, POS=offset + 1) msg(1:msg_len)
 #endif
@@ -3919,15 +3917,13 @@
       TYPE(mp_file_type), INTENT(IN)                        :: fh
       INTEGER(kind=file_offset), INTENT(IN)      :: offset
 
-      CHARACTER(len=*), PARAMETER :: routineN = 'mp_file_write_at_${nametype1}$'
-
       INTEGER                                    :: ierr
 
       ierr = 0
 #if defined(__parallel)
       CALL MPI_FILE_WRITE_AT(fh%handle, offset, msg, 1, ${mpi_type1}$, MPI_STATUS_IGNORE, ierr)
       IF (ierr .NE. 0) &
-         CPABORT("mpi_file_write_at_${nametype1}$ @ "//routineN)
+         CPABORT("mpi_file_write_at_${nametype1}$ @ mp_file_write_at_${nametype1}$")
 #else
       WRITE (UNIT=fh%handle, POS=offset + 1) msg
 #endif
@@ -3949,8 +3945,6 @@
       INTEGER, INTENT(IN), OPTIONAL              :: msglen
       INTEGER(kind=file_offset), INTENT(IN)      :: offset
 
-      CHARACTER(len=*), PARAMETER :: routineN = 'mp_file_write_at_all_${nametype1}$v'
-
       INTEGER                                    :: ierr, msg_len
 
       ierr = 0
@@ -3959,7 +3953,7 @@
 #if defined(__parallel)
       CALL MPI_FILE_WRITE_AT_ALL(fh%handle, offset, msg, msg_len, ${mpi_type1}$, MPI_STATUS_IGNORE, ierr)
       IF (ierr .NE. 0) &
-         CPABORT("mpi_file_write_at_all_${nametype1}$v @ "//routineN)
+         CPABORT("mpi_file_write_at_all_${nametype1}$v @ mp_file_write_at_all_${nametype1}$v")
 #else
       WRITE (UNIT=fh%handle, POS=offset + 1) msg(1:msg_len)
 #endif
@@ -3976,15 +3970,13 @@
       TYPE(mp_file_type), INTENT(IN)                        :: fh
       INTEGER(kind=file_offset), INTENT(IN)      :: offset
 
-      CHARACTER(len=*), PARAMETER :: routineN = 'mp_file_write_at_all_${nametype1}$'
-
       INTEGER                                    :: ierr
 
       ierr = 0
 #if defined(__parallel)
       CALL MPI_FILE_WRITE_AT_ALL(fh%handle, offset, msg, 1, ${mpi_type1}$, MPI_STATUS_IGNORE, ierr)
       IF (ierr .NE. 0) &
-         CPABORT("mpi_file_write_at_all_${nametype1}$ @ "//routineN)
+         CPABORT("mpi_file_write_at_all_${nametype1}$ @ mp_file_write_at_all_${nametype1}$")
 #else
       WRITE (UNIT=fh%handle, POS=offset + 1) msg
 #endif
@@ -4007,8 +3999,6 @@
       INTEGER, INTENT(IN), OPTIONAL              :: msglen
       INTEGER(kind=file_offset), INTENT(IN)      :: offset
 
-      CHARACTER(len=*), PARAMETER :: routineN = 'mp_file_read_at_${nametype1}$v'
-
       INTEGER                                    :: ierr, msg_len
 
       ierr = 0
@@ -4017,7 +4007,7 @@
 #if defined(__parallel)
       CALL MPI_FILE_READ_AT(fh%handle, offset, msg, msg_len, ${mpi_type1}$, MPI_STATUS_IGNORE, ierr)
       IF (ierr .NE. 0) &
-         CPABORT("mpi_file_read_at_${nametype1}$v @ "//routineN)
+         CPABORT("mpi_file_read_at_${nametype1}$v @ mp_file_read_at_${nametype1}$v")
 #else
       READ (UNIT=fh%handle, POS=offset + 1) msg(1:msg_len)
 #endif
@@ -4034,15 +4024,13 @@
       TYPE(mp_file_type), INTENT(IN)                        :: fh
       INTEGER(kind=file_offset), INTENT(IN)      :: offset
 
-      CHARACTER(len=*), PARAMETER :: routineN = 'mp_file_read_at_${nametype1}$'
-
       INTEGER                                    :: ierr
 
       ierr = 0
 #if defined(__parallel)
       CALL MPI_FILE_READ_AT(fh%handle, offset, msg, 1, ${mpi_type1}$, MPI_STATUS_IGNORE, ierr)
       IF (ierr .NE. 0) &
-         CPABORT("mpi_file_read_at_${nametype1}$ @ "//routineN)
+         CPABORT("mpi_file_read_at_${nametype1}$ @ mp_file_read_at_${nametype1}$")
 #else
       READ (UNIT=fh%handle, POS=offset + 1) msg
 #endif
@@ -4064,8 +4052,6 @@
       INTEGER, INTENT(IN), OPTIONAL              :: msglen
       INTEGER(kind=file_offset), INTENT(IN)      :: offset
 
-      CHARACTER(len=*), PARAMETER :: routineN = 'mp_file_read_at_all_${nametype1}$v'
-
       INTEGER                                    :: ierr, msg_len
 
       ierr = 0
@@ -4074,7 +4060,7 @@
 #if defined(__parallel)
       CALL MPI_FILE_READ_AT_ALL(fh%handle, offset, msg, msg_len, ${mpi_type1}$, MPI_STATUS_IGNORE, ierr)
       IF (ierr .NE. 0) &
-         CPABORT("mpi_file_read_at_all_${nametype1}$v @ "//routineN)
+         CPABORT("mpi_file_read_at_all_${nametype1}$v @ mp_file_read_at_all_${nametype1}$v")
 #else
       READ (UNIT=fh%handle, POS=offset + 1) msg(1:msg_len)
 #endif
@@ -4091,15 +4077,13 @@
       TYPE(mp_file_type), INTENT(IN)                        :: fh
       INTEGER(kind=file_offset), INTENT(IN)      :: offset
 
-      CHARACTER(len=*), PARAMETER :: routineN = 'mp_file_read_at_all_${nametype1}$'
-
       INTEGER                                    :: ierr
 
       ierr = 0
 #if defined(__parallel)
       CALL MPI_FILE_READ_AT_ALL(fh%handle, offset, msg, 1, ${mpi_type1}$, MPI_STATUS_IGNORE, ierr)
       IF (ierr .NE. 0) &
-         CPABORT("mpi_file_read_at_all_${nametype1}$ @ "//routineN)
+         CPABORT("mpi_file_read_at_all_${nametype1}$ @ mp_file_read_at_all_${nametype1}$")
 #else
       READ (UNIT=fh%handle, POS=offset + 1) msg
 #endif

diff --git a/src/pao_param_methods.F b/src/pao_param_methods.F
@@ -51,8 +51,7 @@ SUBROUTINE pao_calc_grad_lnv_wrt_U(qs_env, ls_scf_env, matrix_M_diag)
       TYPE(ls_scf_env_type), TARGET                      :: ls_scf_env
       TYPE(dbcsr_type)                                   :: matrix_M_diag
 
-      CHARACTER(len=*), PARAMETER :: routineN = 'pao_calc_grad_lnv_wrt_U', &
-         routineP = moduleN//':'//routineN
+      CHARACTER(len=*), PARAMETER :: routineN = 'pao_calc_grad_lnv_wrt_U'
 
       INTEGER                                            :: handle
       REAL(KIND=dp)                                      :: filter_eps
@@ -187,8 +186,7 @@ SUBROUTINE pao_assert_unitary(pao, matrix_U)
       TYPE(pao_env_type), POINTER                        :: pao
       TYPE(dbcsr_type)                                   :: matrix_U
 
-      CHARACTER(len=*), PARAMETER :: routineN = 'pao_assert_unitary', &
-         routineP = moduleN//':'//routineN
+      CHARACTER(len=*), PARAMETER :: routineN = 'pao_assert_unitary'
 
       INTEGER                                            :: acol, arow, group_handle, handle, i, &
                                                             iatom, M, N
@@ -254,8 +252,7 @@ SUBROUTINE pao_calc_grad_lnv_wrt_AB(qs_env, ls_scf_env, matrix_Ma, matrix_Mb)
       TYPE(ls_scf_env_type), TARGET                      :: ls_scf_env
       TYPE(dbcsr_type)                                   :: matrix_Ma, matrix_Mb
 
-      CHARACTER(len=*), PARAMETER :: routineN = 'pao_calc_grad_lnv_wrt_AB', &
-         routineP = moduleN//':'//routineN
+      CHARACTER(len=*), PARAMETER :: routineN = 'pao_calc_grad_lnv_wrt_AB'
 
       INTEGER                                            :: handle, nspin
       INTEGER, DIMENSION(:), POINTER                     :: pao_blk_sizes