Unverified Commit ff61bd20 authored by Andreas Marek's avatar Andreas Marek
Browse files

Correct usage of MPI abort

In the test programms "MPI_ABORT" has been used incorrectly.
parent 22ea5a24
...@@ -222,7 +222,8 @@ function solve_evp_real_2stage(na, nev, a, lda, ev, q, ldq, nblk, & ...@@ -222,7 +222,8 @@ function solve_evp_real_2stage(na, nev, a, lda, ev, q, ldq, nblk, &
write(error_unit,*) "solve_evp_real_2stage: QR-decomposition: blocksize does not fit with matrixsize" write(error_unit,*) "solve_evp_real_2stage: QR-decomposition: blocksize does not fit with matrixsize"
endif endif
print *, "Do not use QR-decomposition for this matrix and blocksize." print *, "Do not use QR-decomposition for this matrix and blocksize."
call mpi_abort(mpi_comm_world,0,mpierr) success = .false.
return
endif endif
endif endif
...@@ -452,7 +453,6 @@ function solve_evp_complex_2stage(na, nev, a, lda, ev, q, ldq, nblk, & ...@@ -452,7 +453,6 @@ function solve_evp_complex_2stage(na, nev, a, lda, ev, q, ldq, nblk, &
write(error_unit,*) "The defaul kernel COMPLEX_ELPA_KERNEL_GENERIC will be used !" write(error_unit,*) "The defaul kernel COMPLEX_ELPA_KERNEL_GENERIC will be used !"
endif endif
THIS_COMPLEX_ELPA_KERNEL = COMPLEX_ELPA_KERNEL_GENERIC THIS_COMPLEX_ELPA_KERNEL = COMPLEX_ELPA_KERNEL_GENERIC
! call MPI_ABORT(mpi_comm_all, mpierr)
endif endif
! Choose bandwidth, must be a multiple of nblk, set to a value >= 32 ! Choose bandwidth, must be a multiple of nblk, set to a value >= 32
......
...@@ -178,12 +178,12 @@ program read_real ...@@ -178,12 +178,12 @@ program read_real
call get_command_argument(1,filename,lenarg,info) call get_command_argument(1,filename,lenarg,info)
if(info/=0) then if(info/=0) then
write(error_unit,*) 'Usage: test_real matrix_file' write(error_unit,*) 'Usage: test_real matrix_file'
call mpi_abort(mpi_comm_world,0,mpierr) call mpi_abort(mpi_comm_world,1,mpierr)
endif endif
open(10,file=filename,action='READ',status='OLD',iostat=info) open(10,file=filename,action='READ',status='OLD',iostat=info)
if(info/=0) then if(info/=0) then
write(error_unit,*) 'Error: Unable to open ',trim(filename) write(error_unit,*) 'Error: Unable to open ',trim(filename)
call mpi_abort(mpi_comm_world,0,mpierr) call mpi_abort(mpi_comm_world,1,mpierr)
endif endif
endif endif
call mpi_barrier(mpi_comm_world, mpierr) ! Just for safety call mpi_barrier(mpi_comm_world, mpierr) ! Just for safety
......
...@@ -366,7 +366,7 @@ program test_complex ...@@ -366,7 +366,7 @@ program test_complex
if (.not.(success)) then if (.not.(success)) then
write(error_unit,*) "solve_evp_complex produced an error! Aborting..." write(error_unit,*) "solve_evp_complex produced an error! Aborting..."
call MPI_ABORT(mpi_comm_world, mpierr) call MPI_ABORT(mpi_comm_world, 1, mpierr)
endif endif
if (myid==0) then if (myid==0) then
......
...@@ -377,7 +377,7 @@ program test_complex2 ...@@ -377,7 +377,7 @@ program test_complex2
if (.not.(success)) then if (.not.(success)) then
write(error_unit,*) "solve_evp_complex_2stage produced an error! Aborting..." write(error_unit,*) "solve_evp_complex_2stage produced an error! Aborting..."
call MPI_ABORT(mpi_comm_world, mpierr) call MPI_ABORT(mpi_comm_world, 1, mpierr)
endif endif
if(myid == 0) print *,'Time transform to tridi :',time_evp_fwd if(myid == 0) print *,'Time transform to tridi :',time_evp_fwd
......
...@@ -389,7 +389,7 @@ program test_complex2 ...@@ -389,7 +389,7 @@ program test_complex2
if (.not.(success)) then if (.not.(success)) then
write(error_unit,*) "solve_evp_complex_2stage produced an error! Aborting..." write(error_unit,*) "solve_evp_complex_2stage produced an error! Aborting..."
call MPI_ABORT(mpi_comm_world, mpierr) call MPI_ABORT(mpi_comm_world, 1, mpierr)
endif endif
if(myid == 0) print *,'Time transform to tridi :',time_evp_fwd if(myid == 0) print *,'Time transform to tridi :',time_evp_fwd
......
...@@ -390,7 +390,7 @@ program test_complex2 ...@@ -390,7 +390,7 @@ program test_complex2
if (.not.(success)) then if (.not.(success)) then
write(error_unit,*) "solve_evp_complex_2stage produced an error! Aborting..." write(error_unit,*) "solve_evp_complex_2stage produced an error! Aborting..."
call MPI_ABORT(mpi_comm_world, mpierr) call MPI_ABORT(mpi_comm_world, 1, mpierr)
endif endif
if(myid == 0) print *,'Time transform to tridi :',time_evp_fwd if(myid == 0) print *,'Time transform to tridi :',time_evp_fwd
......
...@@ -365,7 +365,7 @@ program test_real ...@@ -365,7 +365,7 @@ program test_real
if (.not.(success)) then if (.not.(success)) then
write(error_unit,*) "solve_evp_real produced an error! Aborting..." write(error_unit,*) "solve_evp_real produced an error! Aborting..."
call MPI_ABORT(mpi_comm_world, mpierr) call MPI_ABORT(mpi_comm_world, 1, mpierr)
endif endif
......
...@@ -396,7 +396,7 @@ program test_real2 ...@@ -396,7 +396,7 @@ program test_real2
if (.not.(success)) then if (.not.(success)) then
write(error_unit,*) "solve_evp_real_2stage produced an error! Aborting..." write(error_unit,*) "solve_evp_real_2stage produced an error! Aborting..."
call MPI_ABORT(mpi_comm_world, mpierr) call MPI_ABORT(mpi_comm_world, 1, mpierr)
endif endif
if (myid==0) then if (myid==0) then
......
...@@ -385,7 +385,7 @@ program test_real2 ...@@ -385,7 +385,7 @@ program test_real2
if (.not.(success)) then if (.not.(success)) then
write(error_unit,*) "solve_evp_real_2stage produced an error! Aborting..." write(error_unit,*) "solve_evp_real_2stage produced an error! Aborting..."
call MPI_ABORT(mpi_comm_world, mpierr) call MPI_ABORT(mpi_comm_world, 1, mpierr)
endif endif
if (myid==0) then if (myid==0) then
......
...@@ -387,7 +387,7 @@ program test_real2 ...@@ -387,7 +387,7 @@ program test_real2
if (.not.(success)) then if (.not.(success)) then
write(error_unit,*) "solve_evp_real_2stage produced an error! Aborting..." write(error_unit,*) "solve_evp_real_2stage produced an error! Aborting..."
call MPI_ABORT(mpi_comm_world, mpierr) call MPI_ABORT(mpi_comm_world, 1, mpierr)
endif endif
if (myid==0) then if (myid==0) then
......
...@@ -391,7 +391,7 @@ program test_real2 ...@@ -391,7 +391,7 @@ program test_real2
if (.not.(success)) then if (.not.(success)) then
write(error_unit,*) "solve_evp_real_2stage produced an error! Aborting..." write(error_unit,*) "solve_evp_real_2stage produced an error! Aborting..."
call MPI_ABORT(mpi_comm_world, mpierr) call MPI_ABORT(mpi_comm_world, 1, mpierr)
endif endif
if (myid==0) then if (myid==0) then
......
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