From 6bb59888ab6a5c5558d1200083cb47ee765b37ab Mon Sep 17 00:00:00 2001 From: Andreas Marek Date: Sun, 23 Apr 2017 11:29:45 +0200 Subject: [PATCH] Rename of legacy elpa_driver module --- man/elpa_solve_evp_complex.3 | 4 ++-- man/elpa_solve_evp_complex_double.3 | 4 ++-- man/elpa_solve_evp_complex_single.3 | 4 ++-- man/elpa_solve_evp_real.3 | 4 ++-- man/elpa_solve_evp_real_double.3 | 4 ++-- man/elpa_solve_evp_real_single.3 | 4 ++-- .../elpa_driver_c_interface_template_legacy.X90 | 4 ++-- src/elpa_driver/legacy_interface/elpa_legacy.F90 | 4 ++-- src/elpa_t.F90 | 2 +- test/Fortran/test_driver_complex.F90 | 2 +- test/Fortran/test_driver_complex_single.F90 | 2 +- test/Fortran/test_driver_real.F90 | 2 +- test/Fortran/test_driver_real_single.F90 | 2 +- 13 files changed, 21 insertions(+), 21 deletions(-) diff --git a/man/elpa_solve_evp_complex.3 b/man/elpa_solve_evp_complex.3 index 7ab40de8..e91e140b 100644 --- a/man/elpa_solve_evp_complex.3 +++ b/man/elpa_solve_evp_complex.3 @@ -1,4 +1,4 @@ -.TH "elpa_solve_evp_complex" 3 "Mon Oct 10 2015" "ELPA" \" -*- nroff -*- +.TH "elpa_solve_evp_complex" 3 "Sun Mar 23 2017" "ELPA" \" -*- nroff -*- .ad l .nh .SH NAME @@ -8,7 +8,7 @@ elpa_solve_evp_complex \- solve the complex eigenvalue problem with either the 1 .SH SYNOPSIS .br .SS FORTRAN INTERFACE -use elpa +use elpa_driver .br .br .RI "success = \fBelpa_solve_evp_complex\fP (na, nev, a(lda,matrixCols), ev(nev), q(ldq, matrixCols), ldq, nblk, matrixCols, mpi_comm_rows, mpi_comm_cols, mpi_comm_all, THIS_COMPLEX_ELPA_KERNEL, useGPU, method)" diff --git a/man/elpa_solve_evp_complex_double.3 b/man/elpa_solve_evp_complex_double.3 index db460a27..d5a568b9 100644 --- a/man/elpa_solve_evp_complex_double.3 +++ b/man/elpa_solve_evp_complex_double.3 @@ -1,4 +1,4 @@ -.TH "elpa_solve_evp_complex_double" 3 "Mon Oct 10 2015" "ELPA" \" -*- nroff -*- +.TH "elpa_solve_evp_complex_double" 3 "Sun Mar 24 2017" "ELPA" \" -*- nroff -*- .ad l .nh .SH NAME @@ -8,7 +8,7 @@ elpa_solve_evp_complex_double \- solve the complex eigenvalue problem with eithe .SH SYNOPSIS .br .SS FORTRAN INTERFACE -use elpa +use elpa_driver .br .br .RI "success = \fBelpa_solve_evp_complex_double\fP (na, nev, a(lda,matrixCols), ev(nev), q(ldq, matrixCols), ldq, nblk, matrixCols, mpi_comm_rows, mpi_comm_cols, mpi_comm_all, THIS_COMPLEX_ELPA_KERNEL, useGPU, method)" diff --git a/man/elpa_solve_evp_complex_single.3 b/man/elpa_solve_evp_complex_single.3 index da0d5a47..ef0e7060 100644 --- a/man/elpa_solve_evp_complex_single.3 +++ b/man/elpa_solve_evp_complex_single.3 @@ -1,4 +1,4 @@ -.TH "elpa_solve_evp_complex_single" 3 "Mon Oct 10 2015" "ELPA" \" -*- nroff -*- +.TH "elpa_solve_evp_complex_single" 3 "Sun Mar 23 2017" "ELPA" \" -*- nroff -*- .ad l .nh .SH NAME @@ -8,7 +8,7 @@ elpa_solve_evp_complex_single \- solve the complex eigenvalue problem with eithe .SH SYNOPSIS .br .SS FORTRAN INTERFACE -use elpa +use elpa_driver .br .br .RI "success = \fBelpa_solve_evp_complex_single\fP (na, nev, a(lda,matrixCols), ev(nev), q(ldq, matrixCols), ldq, nblk, matrixCols, mpi_comm_rows, mpi_comm_cols, mpi_comm_all, THIS_COMPLEX_ELPA_KERNE, useGPU, method)" diff --git a/man/elpa_solve_evp_real.3 b/man/elpa_solve_evp_real.3 index b31ace7d..31a8f29a 100644 --- a/man/elpa_solve_evp_real.3 +++ b/man/elpa_solve_evp_real.3 @@ -1,4 +1,4 @@ -.TH "elpa_solve_evp_real" 3 "Mon Oct 10 2016" "ELPA" \" -*- nroff -*- +.TH "elpa_solve_evp_real" 3 "Sun Mar 23 2017" "ELPA" \" -*- nroff -*- .ad l .nh .SH NAME @@ -8,7 +8,7 @@ elpa_solve_evp_real \- solve the real eigenvalue problem .SH SYNOPSIS .br .SS FORTRAN INTERFACE -use elpa +use elpa_driver .br .br .RI "success = \fBelpa_solve_evp_real\fP (na, nev, a(lda,matrixCols), ev(nev), q(ldq, matrixCols), ldq, nblk, matrixCols, mpi_comm_rows, mpi_comm_cols, mpi_comm_all, THIS_REAL_ELPA_KERNEL=THIS_REAL_ELPA_KERNEL, useQr, useGPU, method)" diff --git a/man/elpa_solve_evp_real_double.3 b/man/elpa_solve_evp_real_double.3 index e1b2d07e..825ae032 100644 --- a/man/elpa_solve_evp_real_double.3 +++ b/man/elpa_solve_evp_real_double.3 @@ -1,4 +1,4 @@ -.TH "elpa_solve_evp_real_double" 3 "Mon Oct 10 2016" "ELPA" \" -*- nroff -*- +.TH "elpa_solve_evp_real_double" 3 "Sun Mar 24 2017" "ELPA" \" -*- nroff -*- .ad l .nh .SH NAME @@ -8,7 +8,7 @@ elpa_solve_evp_real_double \- solve the real eigenvalue problem .SH SYNOPSIS .br .SS FORTRAN INTERFACE -use elpa +use elpa_driver .br .br .RI "success = \fBelpa_solve_evp_real_double\fP (na, nev, a(lda,matrixCols), ev(nev), q(ldq, matrixCols), ldq, nblk, matrixCols, mpi_comm_rows, mpi_comm_cols, mpi_comm_all, THIS_REAL_ELPA_KERNEL, useQr, useGPU, method=method)" diff --git a/man/elpa_solve_evp_real_single.3 b/man/elpa_solve_evp_real_single.3 index 96fcdf9a..1b641bd4 100644 --- a/man/elpa_solve_evp_real_single.3 +++ b/man/elpa_solve_evp_real_single.3 @@ -1,4 +1,4 @@ -.TH "elpa_solve_evp_real_single" 3 "Mon Oct 10 2016" "ELPA" \" -*- nroff -*- +.TH "elpa_solve_evp_real_single" 3 "Sun Mar 24 2017" "ELPA" \" -*- nroff -*- .ad l .nh .SH NAME @@ -8,7 +8,7 @@ elpa_solve_evp_real_single \- solve the real eigenvalue problem .SH SYNOPSIS .br .SS FORTRAN INTERFACE -use elpa +use elpa_driver .br .br .RI "success = \fBelpa_solve_evp_real_single\fP (na, nev, a(lda,matrixCols), ev(nev), q(ldq, matrixCols), ldq, nblk, matrixCols, mpi_comm_rows, mpi_comm_cols, mpi_comm_all, THIS_REAL_ELPA_KERNE, useQr, useGPU, method)" diff --git a/src/elpa_driver/legacy_interface/elpa_driver_c_interface_template_legacy.X90 b/src/elpa_driver/legacy_interface/elpa_driver_c_interface_template_legacy.X90 index 80f49b82..3c08ebde 100644 --- a/src/elpa_driver/legacy_interface/elpa_driver_c_interface_template_legacy.X90 +++ b/src/elpa_driver/legacy_interface/elpa_driver_c_interface_template_legacy.X90 @@ -62,14 +62,14 @@ function elpa_solve_evp_& &") use, intrinsic :: iso_c_binding - use elpa, only : elpa_solve_evp_& + use elpa_driver, only : elpa_solve_evp_& &MATH_DATATYPE& &_& &PRECISION implicit none integer(kind=c_int) :: success - integer(kind=c_int), value, intent(in) :: na, nev, lda, ldq, nblk, matrixCols, & + 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) :: useGPU #if REALCASE == 1 diff --git a/src/elpa_driver/legacy_interface/elpa_legacy.F90 b/src/elpa_driver/legacy_interface/elpa_legacy.F90 index eae4761d..2ddb07ce 100644 --- a/src/elpa_driver/legacy_interface/elpa_legacy.F90 +++ b/src/elpa_driver/legacy_interface/elpa_legacy.F90 @@ -53,7 +53,7 @@ #include "config-f90.h" !> \brief Fortran module which provides the routines to the ELPA solver (1 and 2 stage) -module ELPA +module elpa_driver use, intrinsic :: iso_c_binding, only : c_double, c_int, c_float, c_float_complex, c_double_complex use elpa1 use elpa2 @@ -562,5 +562,5 @@ module ELPA end function elpa_solve_evp_complex_single #endif /* WANT_SINGLE_PRECISION_COMPLEX */ -end module elpa +end module elpa_driver diff --git a/src/elpa_t.F90 b/src/elpa_t.F90 index 2bcfab53..b66db0df 100644 --- a/src/elpa_t.F90 +++ b/src/elpa_t.F90 @@ -42,7 +42,7 @@ ! any derivatives of ELPA under the same license that we chose for ! the original distribution, the GNU Lesser General Public License. ! -! This file has been rewritten by L. Huedepohl and A. Marek, MPCDF +! This file has been written by L. Huedepohl and A. Marek, MPCDF #include diff --git a/test/Fortran/test_driver_complex.F90 b/test/Fortran/test_driver_complex.F90 index f38e5463..c3c0afce 100644 --- a/test/Fortran/test_driver_complex.F90 +++ b/test/Fortran/test_driver_complex.F90 @@ -78,7 +78,7 @@ program test_complex2 ! distributed along with the original code in the file "COPYING". !------------------------------------------------------------------------------- use precision - use ELPA + use elpa_driver use elpa_utilities, only : error_unit #ifdef WITH_OPENMP use test_util diff --git a/test/Fortran/test_driver_complex_single.F90 b/test/Fortran/test_driver_complex_single.F90 index ccab408b..a09456d3 100644 --- a/test/Fortran/test_driver_complex_single.F90 +++ b/test/Fortran/test_driver_complex_single.F90 @@ -78,7 +78,7 @@ program test_complex2 ! distributed along with the original code in the file "COPYING". !------------------------------------------------------------------------------- use precision - use ELPA + use elpa_driver use elpa_utilities, only : error_unit #ifdef WITH_OPENMP use test_util diff --git a/test/Fortran/test_driver_real.F90 b/test/Fortran/test_driver_real.F90 index ef30d3f0..74dbc658 100644 --- a/test/Fortran/test_driver_real.F90 +++ b/test/Fortran/test_driver_real.F90 @@ -79,7 +79,7 @@ program test_real2 ! !------------------------------------------------------------------------------- use precision - use ELPA + use elpa_driver use elpa_utilities, only : error_unit #ifdef WITH_OPENMP use test_util diff --git a/test/Fortran/test_driver_real_single.F90 b/test/Fortran/test_driver_real_single.F90 index 112601bc..b16a74cf 100644 --- a/test/Fortran/test_driver_real_single.F90 +++ b/test/Fortran/test_driver_real_single.F90 @@ -79,7 +79,7 @@ program test_real2 ! !------------------------------------------------------------------------------- use precision - use ELPA + use elpa_driver use elpa_utilities, only : error_unit #ifdef WITH_OPENMP use test_util -- GitLab