Skip to content

GitLab

Unverified Commit fc80ad07 authored by Andreas Marek's avatar Andreas Marek
Browse files
Options

Change of get_elpa_row_col_comms to a function 

The procedure "get_elpa_row_col_comms" is now a function instead
a subroutine and returns an error code.

This should have been done previously when all the other ELPA
function have been updated to return an error code.

This requires an ABI change in the next ELPA release !
parent 6515c5ea
Hide whitespace changes
Inline Side-by-side
Showing with 25 additions and 24 deletions
src/elpa1.F90
View file @ fc80ad07
......@@ -115,7 +115,7 @@ contains
!-------------------------------------------------------------------------------
subroutine get_elpa_row_col_comms(mpi_comm_global, my_prow, my_pcol, mpi_comm_rows, mpi_comm_cols)
function get_elpa_row_col_comms(mpi_comm_global, my_prow, my_pcol, mpi_comm_rows, mpi_comm_cols) result(mpierr)
!-------------------------------------------------------------------------------
! get_elpa_row_col_comms:
......@@ -152,7 +152,7 @@ subroutine get_elpa_row_col_comms(mpi_comm_global, my_prow, my_pcol, mpi_comm_ro
call mpi_comm_split(mpi_comm_global,my_pcol,my_prow,mpi_comm_rows,mpierr)
call mpi_comm_split(mpi_comm_global,my_prow,my_pcol,mpi_comm_cols,mpierr)
end subroutine get_elpa_row_col_comms
end function get_elpa_row_col_comms
!-------------------------------------------------------------------------------
......
test/test_complex.F90
View file @ fc80ad07
......@@ -281,8 +281,8 @@ program test_complex
! All ELPA routines need MPI communicators for communicating within
! rows or columns of processes, these are set in get_elpa_row_col_comms.
call get_elpa_row_col_comms(mpi_comm_world, my_prow, my_pcol, &
mpi_comm_rows, mpi_comm_cols)
mpierr = get_elpa_row_col_comms(mpi_comm_world, my_prow, my_pcol, &
mpi_comm_rows, mpi_comm_cols)
if (myid==0) then
print '(a)','| Past split communicator setup for rows and columns.'
......
test/test_complex2.F90
View file @ fc80ad07
......@@ -309,8 +309,8 @@ program test_complex2
! All ELPA routines need MPI communicators for communicating within
! rows or columns of processes, these are set in get_elpa_row_col_comms.
call get_elpa_row_col_comms(mpi_comm_world, my_prow, my_pcol, &
mpi_comm_rows, mpi_comm_cols)
mpierr = get_elpa_row_col_comms(mpi_comm_world, my_prow, my_pcol, &
mpi_comm_rows, mpi_comm_cols)
! Determine the necessary size of the distributed matrices,
! we use the Scalapack tools routine NUMROC for that.
......
test/test_complex2_choose_kernel_with_api.F90
View file @ fc80ad07
......@@ -306,8 +306,8 @@ program test_complex2
! All ELPA routines need MPI communicators for communicating within
! rows or columns of processes, these are set in get_elpa_row_col_comms.
call get_elpa_row_col_comms(mpi_comm_world, my_prow, my_pcol, &
mpi_comm_rows, mpi_comm_cols)
mpierr = get_elpa_row_col_comms(mpi_comm_world, my_prow, my_pcol, &
mpi_comm_rows, mpi_comm_cols)
if (myid==0) then
print '(a)','| Past split communicator setup for rows and columns.'
......
test/test_complex2_default_kernel.F90
View file @ fc80ad07
......@@ -307,8 +307,8 @@ program test_complex2
! All ELPA routines need MPI communicators for communicating within
! rows or columns of processes, these are set in get_elpa_row_col_comms.
call get_elpa_row_col_comms(mpi_comm_world, my_prow, my_pcol, &
mpi_comm_rows, mpi_comm_cols)
mpierr = get_elpa_row_col_comms(mpi_comm_world, my_prow, my_pcol, &
mpi_comm_rows, mpi_comm_cols)
if (myid==0) then
print '(a)','| Past split communicator setup for rows and columns.'
end if
......
test/test_real.F90
View file @ fc80ad07
......@@ -286,8 +286,8 @@ program test_real
! All ELPA routines need MPI communicators for communicating within
! rows or columns of processes, these are set in get_elpa_row_col_comms.
call get_elpa_row_col_comms(mpi_comm_world, my_prow, my_pcol, &
mpi_comm_rows, mpi_comm_cols)
mpierr = get_elpa_row_col_comms(mpi_comm_world, my_prow, my_pcol, &
mpi_comm_rows, mpi_comm_cols)
if (myid==0) then
print '(a)','| Past split communicator setup for rows and columns.'
......
test/test_real2.F90
View file @ fc80ad07
......@@ -315,8 +315,8 @@ program test_real2
! All ELPA routines need MPI communicators for communicating within
! rows or columns of processes, these are set in get_elpa_row_col_comms.
call get_elpa_row_col_comms(mpi_comm_world, my_prow, my_pcol, &
mpi_comm_rows, mpi_comm_cols)
mpierr = get_elpa_row_col_comms(mpi_comm_world, my_prow, my_pcol, &
mpi_comm_rows, mpi_comm_cols)
if (myid==0) then
print '(a)','| Past split communicator setup for rows and columns.'
......
test/test_real2_choose_kernel_with_api.F90
View file @ fc80ad07
......@@ -300,8 +300,8 @@ program test_real2
! All ELPA routines need MPI communicators for communicating within
! rows or columns of processes, these are set in get_elpa_row_col_comms.
call get_elpa_row_col_comms(mpi_comm_world, my_prow, my_pcol, &
mpi_comm_rows, mpi_comm_cols)
mpierr = get_elpa_row_col_comms(mpi_comm_world, my_prow, my_pcol, &
mpi_comm_rows, mpi_comm_cols)
if (myid==0) then
print '(a)','| Past split communicator setup for rows and columns.'
......
test/test_real2_default_kernel.F90
View file @ fc80ad07
......@@ -299,8 +299,8 @@ program test_real2
! All ELPA routines need MPI communicators for communicating within
! rows or columns of processes, these are set in get_elpa_row_col_comms.
call get_elpa_row_col_comms(mpi_comm_world, my_prow, my_pcol, &
mpi_comm_rows, mpi_comm_cols)
mpierr = get_elpa_row_col_comms(mpi_comm_world, my_prow, my_pcol, &
mpi_comm_rows, mpi_comm_cols)
if (myid==0) then
print '(a)','| Past split communicator setup for rows and columns.'
......
test/test_real2_default_kernel_qr_decomposition.F90
View file @ fc80ad07
......@@ -145,10 +145,6 @@ program test_real2
success = .true.
write_to_file = .false.
nblk = 2
na = 4000
nev = 1500
if (COMMAND_ARGUMENT_COUNT() == 3) then
call GET_COMMAND_ARGUMENT(1, arg1)
call GET_COMMAND_ARGUMENT(2, arg2)
......@@ -169,6 +165,11 @@ program test_real2
read(arg3, *) nblk
endif
nblk = 2
na = 4000
nev = 1500
!-------------------------------------------------------------------------------
! MPI Initialization
#ifndef WITH_OPENMP
......@@ -301,8 +302,8 @@ program test_real2
! All ELPA routines need MPI communicators for communicating within
! rows or columns of processes, these are set in get_elpa_row_col_comms.
call get_elpa_row_col_comms(mpi_comm_world, my_prow, my_pcol, &
mpi_comm_rows, mpi_comm_cols)
mpierr = get_elpa_row_col_comms(mpi_comm_world, my_prow, my_pcol, &
mpi_comm_rows, mpi_comm_cols)
if (myid==0) then
print '(a)','| Past split communicator setup for rows and columns.'
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment