From 5748ad54efb1cf7d48a0fcdf434d6021dc8466b9 Mon Sep 17 00:00:00 2001 From: Andreas Marek <amarek@rzg.mpg.de> Date: Thu, 7 Sep 2017 09:39:08 +0200 Subject: [PATCH] Rename various prepare matrix functions It is planned to add another matrix type for the tests. The names of the prepare routines have become a bit inconsistent and confusing. Thus the rename --- .../legacy_complex_driver_c_version.c | 2 +- .../legacy_real_driver_c_version.c | 2 +- .../legacy_single_complex_driver_c_version.c | 2 +- .../legacy_single_real_driver_c_version.c | 2 +- .../legacy_complex_1stage_c_version.c | 4 ++-- .../legacy_real_1stage_c_version.c | 4 ++-- .../legacy_complex_2stage_c_version.c | 4 ++-- .../legacy_real_2stage_c_version.c | 4 ++-- .../legacy_complex_driver.F90 | 2 +- .../legacy_interface/legacy_real_driver.F90 | 2 +- .../legacy_single_complex_driver.F90 | 2 +- .../legacy_single_real_driver.F90 | 2 +- .../elpa1/legacy_interface/legacy_complex.F90 | 2 +- .../legacy_complex_cholesky.F90 | 2 +- .../legacy_interface/legacy_complex_gpu.F90 | 2 +- .../legacy_complex_invert_trm.F90 | 2 +- .../legacy_complex_transp_multiply.F90 | 2 +- .../elpa1/legacy_interface/legacy_real.F90 | 2 +- .../legacy_interface/legacy_real_gpu.F90 | 2 +- .../legacy_real_invert_trm.F90 | 2 +- .../legacy_real_transp_multiply.F90 | 2 +- .../legacy_single_complex.F90 | 2 +- .../legacy_single_complex_cholesky.F90 | 2 +- .../legacy_single_complex_gpu.F90 | 2 +- .../legacy_single_complex_invert_trm.F90 | 2 +- .../legacy_single_complex_transp_multiply.F90 | 2 +- .../legacy_interface/legacy_single_real.F90 | 2 +- .../legacy_single_real_gpu.F90 | 2 +- .../legacy_single_real_invert_trm.F90 | 2 +- .../legacy_single_real_transp_multiply.F90 | 2 +- test/Fortran/elpa2/complex_2stage_banded.F90 | 2 +- test/Fortran/elpa2/double_instance.F90 | 4 ++-- .../elpa2/legacy_interface/legacy_complex.F90 | 2 +- .../legacy_interface/legacy_complex_api.F90 | 2 +- .../legacy_complex_default_kernel.F90 | 2 +- .../legacy_interface/legacy_complex_gpu.F90 | 2 +- .../elpa2/legacy_interface/legacy_real.F90 | 2 +- .../legacy_interface/legacy_real_api.F90 | 2 +- .../legacy_real_default_kernel.F90 | 2 +- .../legacy_interface/legacy_real_gpu.F90 | 2 +- .../elpa2/legacy_interface/legacy_real_qr.F90 | 2 +- .../legacy_single_complex.F90 | 2 +- .../legacy_single_complex_api.F90 | 2 +- .../legacy_single_complex_default_kernel.F90 | 2 +- .../legacy_single_complex_gpu.F90 | 2 +- .../legacy_interface/legacy_single_real.F90 | 2 +- .../legacy_single_real_api.F90 | 2 +- .../legacy_single_real_default_kernel.F90 | 2 +- .../legacy_single_real_gpu.F90 | 2 +- .../legacy_single_real_qr.F90 | 2 +- test/Fortran/elpa2/real_2stage_banded.F90 | 2 +- .../elpa2/single_complex_2stage_banded.F90 | 2 +- .../elpa2/single_real_2stage_banded.F90 | 2 +- test/Fortran/elpa_tests.F90 | 8 +++---- test/Fortran/test.F90 | 8 +++---- test/shared/test_prepare_matrix.F90 | 24 +++++++++---------- test/shared/test_prepare_matrix_template.F90 | 20 ++++++++-------- 57 files changed, 88 insertions(+), 88 deletions(-) diff --git a/test/C/driver/legacy_interface/legacy_complex_driver_c_version.c b/test/C/driver/legacy_interface/legacy_complex_driver_c_version.c index 86c28f3b..da553d3d 100644 --- a/test/C/driver/legacy_interface/legacy_complex_driver_c_version.c +++ b/test/C/driver/legacy_interface/legacy_complex_driver_c_version.c @@ -181,7 +181,7 @@ int main(int argc, char** argv) { as = malloc(na_rows*na_cols*sizeof(complex double)); ev = malloc(na*sizeof(double)); - prepare_matrix_complex_double_f(na, myid, na_rows, na_cols, sc_desc, a, z, as); + prepare_matrix_random_complex_double_f(na, myid, na_rows, na_cols, sc_desc, a, z, as); if (myid == 0) { printf("\n"); diff --git a/test/C/driver/legacy_interface/legacy_real_driver_c_version.c b/test/C/driver/legacy_interface/legacy_real_driver_c_version.c index 60a1181b..448a54e9 100644 --- a/test/C/driver/legacy_interface/legacy_real_driver_c_version.c +++ b/test/C/driver/legacy_interface/legacy_real_driver_c_version.c @@ -177,7 +177,7 @@ int main(int argc, char** argv) { as = malloc(na_rows*na_cols*sizeof(double)); ev = malloc(na*sizeof(double)); - prepare_matrix_real_double_f(na, myid, na_rows, na_cols, sc_desc, a, z, as); + prepare_matrix_random_real_double_f(na, myid, na_rows, na_cols, sc_desc, a, z, as); if (myid == 0) { printf("\n"); diff --git a/test/C/driver/legacy_interface/legacy_single_complex_driver_c_version.c b/test/C/driver/legacy_interface/legacy_single_complex_driver_c_version.c index 4fbff052..401a80ce 100644 --- a/test/C/driver/legacy_interface/legacy_single_complex_driver_c_version.c +++ b/test/C/driver/legacy_interface/legacy_single_complex_driver_c_version.c @@ -181,7 +181,7 @@ int main(int argc, char** argv) { as = malloc(na_rows*na_cols*sizeof(complex float)); ev = malloc(na*sizeof(float)); - prepare_matrix_complex_single_f(na, myid, na_rows, na_cols, sc_desc, a, z, as); + prepare_matrix_random_complex_single_f(na, myid, na_rows, na_cols, sc_desc, a, z, as); if (myid == 0) { printf("\n"); diff --git a/test/C/driver/legacy_interface/legacy_single_real_driver_c_version.c b/test/C/driver/legacy_interface/legacy_single_real_driver_c_version.c index a21c71d9..97a5ea57 100644 --- a/test/C/driver/legacy_interface/legacy_single_real_driver_c_version.c +++ b/test/C/driver/legacy_interface/legacy_single_real_driver_c_version.c @@ -178,7 +178,7 @@ int main(int argc, char** argv) { as = malloc(na_rows*na_cols*sizeof(float)); ev = malloc(na*sizeof(float)); - prepare_matrix_real_single_f(na, myid, na_rows, na_cols, sc_desc, a, z, as); + prepare_matrix_random_real_single_f(na, myid, na_rows, na_cols, sc_desc, a, z, as); if (myid == 0) { printf("\n"); diff --git a/test/C/elpa1/legacy_interface/legacy_complex_1stage_c_version.c b/test/C/elpa1/legacy_interface/legacy_complex_1stage_c_version.c index 9e010bce..f07354a8 100644 --- a/test/C/elpa1/legacy_interface/legacy_complex_1stage_c_version.c +++ b/test/C/elpa1/legacy_interface/legacy_complex_1stage_c_version.c @@ -202,9 +202,9 @@ int main(int argc, char** argv) { #endif #ifdef DOUBLE_PRECISION_COMPLEX - prepare_matrix_complex_double_f(na, myid, na_rows, na_cols, sc_desc, a, z, as); + prepare_matrix_random_complex_double_f(na, myid, na_rows, na_cols, sc_desc, a, z, as); #else - prepare_matrix_complex_single_f(na, myid, na_rows, na_cols, sc_desc, a, z, as); + prepare_matrix_random_complex_single_f(na, myid, na_rows, na_cols, sc_desc, a, z, as); #endif if (myid == 0) { diff --git a/test/C/elpa1/legacy_interface/legacy_real_1stage_c_version.c b/test/C/elpa1/legacy_interface/legacy_real_1stage_c_version.c index 55144fc7..fa818bd1 100644 --- a/test/C/elpa1/legacy_interface/legacy_real_1stage_c_version.c +++ b/test/C/elpa1/legacy_interface/legacy_real_1stage_c_version.c @@ -195,9 +195,9 @@ int main(int argc, char** argv) { #endif #ifdef DOUBLE_PRECISION_REAL - prepare_matrix_real_double_f(na, myid, na_rows, na_cols, sc_desc, a, z, as); + prepare_matrix_random_real_double_f(na, myid, na_rows, na_cols, sc_desc, a, z, as); #else - prepare_matrix_real_single_f(na, myid, na_rows, na_cols, sc_desc, a, z, as); + prepare_matrix_random_real_single_f(na, myid, na_rows, na_cols, sc_desc, a, z, as); #endif if (myid == 0) { printf("\n"); diff --git a/test/C/elpa2/legacy_interface/legacy_complex_2stage_c_version.c b/test/C/elpa2/legacy_interface/legacy_complex_2stage_c_version.c index b69a6b34..4d924a83 100644 --- a/test/C/elpa2/legacy_interface/legacy_complex_2stage_c_version.c +++ b/test/C/elpa2/legacy_interface/legacy_complex_2stage_c_version.c @@ -197,9 +197,9 @@ int main(int argc, char** argv) { ev = malloc(na*sizeof(float)); #endif #ifdef DOUBLE_PRECISION_COMPLEX - prepare_matrix_complex_double_f(na, myid, na_rows, na_cols, sc_desc, a, z, as); + prepare_matrix_random_complex_double_f(na, myid, na_rows, na_cols, sc_desc, a, z, as); #else - prepare_matrix_complex_single_f(na, myid, na_rows, na_cols, sc_desc, a, z, as); + prepare_matrix_random_complex_single_f(na, myid, na_rows, na_cols, sc_desc, a, z, as); #endif if (myid == 0) { diff --git a/test/C/elpa2/legacy_interface/legacy_real_2stage_c_version.c b/test/C/elpa2/legacy_interface/legacy_real_2stage_c_version.c index 941b90a2..291fe41a 100644 --- a/test/C/elpa2/legacy_interface/legacy_real_2stage_c_version.c +++ b/test/C/elpa2/legacy_interface/legacy_real_2stage_c_version.c @@ -192,9 +192,9 @@ int main(int argc, char** argv) { ev = malloc(na*sizeof(float)); #endif #ifdef DOUBLE_PRECISION_REAL - prepare_matrix_real_double_f(na, myid, na_rows, na_cols, sc_desc, a, z, as); + prepare_matrix_random_real_double_f(na, myid, na_rows, na_cols, sc_desc, a, z, as); #else - prepare_matrix_real_single_f(na, myid, na_rows, na_cols, sc_desc, a, z, as); + prepare_matrix_random_real_single_f(na, myid, na_rows, na_cols, sc_desc, a, z, as); #endif if (myid == 0) { printf("\n"); diff --git a/test/Fortran/driver/legacy_interface/legacy_complex_driver.F90 b/test/Fortran/driver/legacy_interface/legacy_complex_driver.F90 index 16b1f749..a4a4d150 100644 --- a/test/Fortran/driver/legacy_interface/legacy_complex_driver.F90 +++ b/test/Fortran/driver/legacy_interface/legacy_complex_driver.F90 @@ -201,7 +201,7 @@ program test_complex2 allocate(ev(na)) - call prepare_matrix(na, myid, sc_desc, a, z, as) + call prepare_matrix_random(na, myid, sc_desc, a, z, as) ! set print flag in elpa1 elpa_print_times = .true. diff --git a/test/Fortran/driver/legacy_interface/legacy_real_driver.F90 b/test/Fortran/driver/legacy_interface/legacy_real_driver.F90 index dc8f7acf..d32751df 100644 --- a/test/Fortran/driver/legacy_interface/legacy_real_driver.F90 +++ b/test/Fortran/driver/legacy_interface/legacy_real_driver.F90 @@ -197,7 +197,7 @@ program test_real2 allocate(ev(na)) - call prepare_matrix(na, myid, sc_desc, a, z, as) + call prepare_matrix_random(na, myid, sc_desc, a, z, as) ! set print flag in elpa1 elpa_print_times = .true. diff --git a/test/Fortran/driver/legacy_interface/legacy_single_complex_driver.F90 b/test/Fortran/driver/legacy_interface/legacy_single_complex_driver.F90 index 3455906a..a802ef4f 100644 --- a/test/Fortran/driver/legacy_interface/legacy_single_complex_driver.F90 +++ b/test/Fortran/driver/legacy_interface/legacy_single_complex_driver.F90 @@ -201,7 +201,7 @@ program test_complex2 allocate(ev(na)) - call prepare_matrix(na, myid, sc_desc, a, z, as) + call prepare_matrix_random(na, myid, sc_desc, a, z, as) ! set print flag in elpa1 elpa_print_times = .true. diff --git a/test/Fortran/driver/legacy_interface/legacy_single_real_driver.F90 b/test/Fortran/driver/legacy_interface/legacy_single_real_driver.F90 index d0366ead..0fe49390 100644 --- a/test/Fortran/driver/legacy_interface/legacy_single_real_driver.F90 +++ b/test/Fortran/driver/legacy_interface/legacy_single_real_driver.F90 @@ -196,7 +196,7 @@ program test_real2 allocate(as(na_rows,na_cols)) allocate(ev(na)) - call prepare_matrix(na, myid, sc_desc, a, z, as) + call prepare_matrix_random(na, myid, sc_desc, a, z, as) ! set print flag in elpa1 elpa_print_times = .true. diff --git a/test/Fortran/elpa1/legacy_interface/legacy_complex.F90 b/test/Fortran/elpa1/legacy_interface/legacy_complex.F90 index 8160f41f..bb077643 100644 --- a/test/Fortran/elpa1/legacy_interface/legacy_complex.F90 +++ b/test/Fortran/elpa1/legacy_interface/legacy_complex.F90 @@ -210,7 +210,7 @@ program test_complex_double_precision allocate(ev(na)) - call prepare_matrix(na, myid, sc_desc, a, z, as) + call prepare_matrix_random(na, myid, sc_desc, a, z, as) elpa_print_times = .true. !------------------------------------------------------------------------------- ! Calculate eigenvalues/eigenvectors diff --git a/test/Fortran/elpa1/legacy_interface/legacy_complex_cholesky.F90 b/test/Fortran/elpa1/legacy_interface/legacy_complex_cholesky.F90 index 807c545d..ec1a71cf 100644 --- a/test/Fortran/elpa1/legacy_interface/legacy_complex_cholesky.F90 +++ b/test/Fortran/elpa1/legacy_interface/legacy_complex_cholesky.F90 @@ -172,7 +172,7 @@ program test_cholesky allocate(as(na_rows,na_cols)) allocate(ev(na)) -! call prepare_matrix(na, myid, sc_desc, a, z, as) +! call prepare_matrix_random(na, myid, sc_desc, a, z, as) ! b(:,:) = 2.0 * a(:,:) ! c(:,:) = 0.0 diff --git a/test/Fortran/elpa1/legacy_interface/legacy_complex_gpu.F90 b/test/Fortran/elpa1/legacy_interface/legacy_complex_gpu.F90 index e694e400..adcf09f2 100644 --- a/test/Fortran/elpa1/legacy_interface/legacy_complex_gpu.F90 +++ b/test/Fortran/elpa1/legacy_interface/legacy_complex_gpu.F90 @@ -209,7 +209,7 @@ program test_complex_gpu_version_double_precision allocate(ev(na)) - call prepare_matrix(na, myid, sc_desc, a, z, as) + call prepare_matrix_random(na, myid, sc_desc, a, z, as) !------------------------------------------------------------------------------- ! Calculate eigenvalues/eigenvectors diff --git a/test/Fortran/elpa1/legacy_interface/legacy_complex_invert_trm.F90 b/test/Fortran/elpa1/legacy_interface/legacy_complex_invert_trm.F90 index 9f4827f9..062d70b7 100644 --- a/test/Fortran/elpa1/legacy_interface/legacy_complex_invert_trm.F90 +++ b/test/Fortran/elpa1/legacy_interface/legacy_complex_invert_trm.F90 @@ -173,7 +173,7 @@ program test_invert_trm allocate(as(na_rows,na_cols)) allocate(ev(na)) - call prepare_matrix(na, myid, sc_desc, b, z, bs) + call prepare_matrix_random(na, myid, sc_desc, b, z, bs) bs(:,:) = b(:,:) a(:,:) = CONE - CONE diff --git a/test/Fortran/elpa1/legacy_interface/legacy_complex_transp_multiply.F90 b/test/Fortran/elpa1/legacy_interface/legacy_complex_transp_multiply.F90 index a2929e1f..cea018e8 100644 --- a/test/Fortran/elpa1/legacy_interface/legacy_complex_transp_multiply.F90 +++ b/test/Fortran/elpa1/legacy_interface/legacy_complex_transp_multiply.F90 @@ -166,7 +166,7 @@ program test_transpose_multiply allocate(as(na_rows,na_cols)) allocate(ev(na)) - call prepare_matrix(na, myid, sc_desc, a, z, as) + call prepare_matrix_random(na, myid, sc_desc, a, z, as) b(:,:) = 2.0_ck8 * a(:,:) c(:,:) = 0.0_ck8 diff --git a/test/Fortran/elpa1/legacy_interface/legacy_real.F90 b/test/Fortran/elpa1/legacy_interface/legacy_real.F90 index 3050489e..6946d3d6 100644 --- a/test/Fortran/elpa1/legacy_interface/legacy_real.F90 +++ b/test/Fortran/elpa1/legacy_interface/legacy_real.F90 @@ -202,7 +202,7 @@ program test_real_double_precision allocate(ev(na)) - call prepare_matrix(na, myid, sc_desc, a, z, as) + call prepare_matrix_random(na, myid, sc_desc, a, z, as) elpa_print_times = .true. !------------------------------------------------------------------------------- diff --git a/test/Fortran/elpa1/legacy_interface/legacy_real_gpu.F90 b/test/Fortran/elpa1/legacy_interface/legacy_real_gpu.F90 index f267385a..730c03c5 100644 --- a/test/Fortran/elpa1/legacy_interface/legacy_real_gpu.F90 +++ b/test/Fortran/elpa1/legacy_interface/legacy_real_gpu.F90 @@ -202,7 +202,7 @@ program test_real_gpu_version_double_precision allocate(ev(na)) - call prepare_matrix(na, myid, sc_desc, a, z, as) + call prepare_matrix_random(na, myid, sc_desc, a, z, as) !------------------------------------------------------------------------------- ! Calculate eigenvalues/eigenvectors diff --git a/test/Fortran/elpa1/legacy_interface/legacy_real_invert_trm.F90 b/test/Fortran/elpa1/legacy_interface/legacy_real_invert_trm.F90 index c2dc767a..9fa82422 100644 --- a/test/Fortran/elpa1/legacy_interface/legacy_real_invert_trm.F90 +++ b/test/Fortran/elpa1/legacy_interface/legacy_real_invert_trm.F90 @@ -174,7 +174,7 @@ program test_invert_trm allocate(d (na)) allocate(e (na)) - call prepare_matrix(na, myid, sc_desc, b, z, bs) + call prepare_matrix_random(na, myid, sc_desc, b, z, bs) bs(:,:) = b(:,:) a(:,:) = 0.0_rk8 diff --git a/test/Fortran/elpa1/legacy_interface/legacy_real_transp_multiply.F90 b/test/Fortran/elpa1/legacy_interface/legacy_real_transp_multiply.F90 index d55815c9..f4fc3806 100644 --- a/test/Fortran/elpa1/legacy_interface/legacy_real_transp_multiply.F90 +++ b/test/Fortran/elpa1/legacy_interface/legacy_real_transp_multiply.F90 @@ -166,7 +166,7 @@ program test_transpose_multiply allocate(ev(na)) - call prepare_matrix(na, myid, sc_desc, a, z, as) + call prepare_matrix_random(na, myid, sc_desc, a, z, as) b(:,:) = 2.0_rk8 * a(:,:) c(:,:) = 0.0_rk8 diff --git a/test/Fortran/elpa1/legacy_interface/legacy_single_complex.F90 b/test/Fortran/elpa1/legacy_interface/legacy_single_complex.F90 index c4b9fab3..323f743c 100644 --- a/test/Fortran/elpa1/legacy_interface/legacy_single_complex.F90 +++ b/test/Fortran/elpa1/legacy_interface/legacy_single_complex.F90 @@ -210,7 +210,7 @@ program test_complex_single_precision allocate(ev(na)) - call prepare_matrix(na, myid, sc_desc, a, z, as) + call prepare_matrix_random(na, myid, sc_desc, a, z, as) !------------------------------------------------------------------------------- ! Calculate eigenvalues/eigenvectors diff --git a/test/Fortran/elpa1/legacy_interface/legacy_single_complex_cholesky.F90 b/test/Fortran/elpa1/legacy_interface/legacy_single_complex_cholesky.F90 index b8e0f59c..600a201a 100644 --- a/test/Fortran/elpa1/legacy_interface/legacy_single_complex_cholesky.F90 +++ b/test/Fortran/elpa1/legacy_interface/legacy_single_complex_cholesky.F90 @@ -172,7 +172,7 @@ program test_cholesky allocate(as(na_rows,na_cols)) allocate(ev(na)) -! call prepare_matrix(na, myid, sc_desc, a, z, as) +! call prepare_matrix_random(na, myid, sc_desc, a, z, as) ! b(:,:) = 2.0 * a(:,:) ! c(:,:) = 0.0 diff --git a/test/Fortran/elpa1/legacy_interface/legacy_single_complex_gpu.F90 b/test/Fortran/elpa1/legacy_interface/legacy_single_complex_gpu.F90 index 699179b4..4c39d3aa 100644 --- a/test/Fortran/elpa1/legacy_interface/legacy_single_complex_gpu.F90 +++ b/test/Fortran/elpa1/legacy_interface/legacy_single_complex_gpu.F90 @@ -209,7 +209,7 @@ program test_complex_gpu_version_single_precision allocate(ev(na)) - call prepare_matrix(na, myid, sc_desc, a, z, as) + call prepare_matrix_random(na, myid, sc_desc, a, z, as) !------------------------------------------------------------------------------- ! Calculate eigenvalues/eigenvectors diff --git a/test/Fortran/elpa1/legacy_interface/legacy_single_complex_invert_trm.F90 b/test/Fortran/elpa1/legacy_interface/legacy_single_complex_invert_trm.F90 index d621a5f6..d8440529 100644 --- a/test/Fortran/elpa1/legacy_interface/legacy_single_complex_invert_trm.F90 +++ b/test/Fortran/elpa1/legacy_interface/legacy_single_complex_invert_trm.F90 @@ -172,7 +172,7 @@ program test_invert_trm allocate(as(na_rows,na_cols)) allocate(ev(na)) - call prepare_matrix(na, myid, sc_desc, b, z, bs) + call prepare_matrix_random(na, myid, sc_desc, b, z, bs) bs(:,:) = b(:,:) diff --git a/test/Fortran/elpa1/legacy_interface/legacy_single_complex_transp_multiply.F90 b/test/Fortran/elpa1/legacy_interface/legacy_single_complex_transp_multiply.F90 index e30413cc..e55bf290 100644 --- a/test/Fortran/elpa1/legacy_interface/legacy_single_complex_transp_multiply.F90 +++ b/test/Fortran/elpa1/legacy_interface/legacy_single_complex_transp_multiply.F90 @@ -166,7 +166,7 @@ program test_transpose_multiply allocate(as(na_rows,na_cols)) allocate(ev(na)) - call prepare_matrix(na, myid, sc_desc, a, z, as) + call prepare_matrix_random(na, myid, sc_desc, a, z, as) b(:,:) = 2.0_ck4 * a(:,:) c(:,:) = 0.0_ck4 diff --git a/test/Fortran/elpa1/legacy_interface/legacy_single_real.F90 b/test/Fortran/elpa1/legacy_interface/legacy_single_real.F90 index 6e628eab..01c15082 100644 --- a/test/Fortran/elpa1/legacy_interface/legacy_single_real.F90 +++ b/test/Fortran/elpa1/legacy_interface/legacy_single_real.F90 @@ -202,7 +202,7 @@ program test_real_single_precision allocate(ev(na)) - call prepare_matrix(na, myid, sc_desc, a, z, as) + call prepare_matrix_random(na, myid, sc_desc, a, z, as) !------------------------------------------------------------------------------- ! Calculate eigenvalues/eigenvectors diff --git a/test/Fortran/elpa1/legacy_interface/legacy_single_real_gpu.F90 b/test/Fortran/elpa1/legacy_interface/legacy_single_real_gpu.F90 index eda3c928..85136857 100644 --- a/test/Fortran/elpa1/legacy_interface/legacy_single_real_gpu.F90 +++ b/test/Fortran/elpa1/legacy_interface/legacy_single_real_gpu.F90 @@ -202,7 +202,7 @@ program test_real_gpu_version_single_precision allocate(ev(na)) - call prepare_matrix(na, myid, sc_desc, a, z, as) + call prepare_matrix_random(na, myid, sc_desc, a, z, as) !------------------------------------------------------------------------------- ! Calculate eigenvalues/eigenvectors diff --git a/test/Fortran/elpa1/legacy_interface/legacy_single_real_invert_trm.F90 b/test/Fortran/elpa1/legacy_interface/legacy_single_real_invert_trm.F90 index 23ddeb8e..fa84cde4 100644 --- a/test/Fortran/elpa1/legacy_interface/legacy_single_real_invert_trm.F90 +++ b/test/Fortran/elpa1/legacy_interface/legacy_single_real_invert_trm.F90 @@ -174,7 +174,7 @@ program test_invert_trm allocate(d (na)) allocate(e (na)) - call prepare_matrix(na, myid, sc_desc, b, z, bs) + call prepare_matrix_random(na, myid, sc_desc, b, z, bs) bs(:,:) = b(:,:) a(:,:) = 0.0_rk4 diff --git a/test/Fortran/elpa1/legacy_interface/legacy_single_real_transp_multiply.F90 b/test/Fortran/elpa1/legacy_interface/legacy_single_real_transp_multiply.F90 index fb8a8416..18ed5052 100644 --- a/test/Fortran/elpa1/legacy_interface/legacy_single_real_transp_multiply.F90 +++ b/test/Fortran/elpa1/legacy_interface/legacy_single_real_transp_multiply.F90 @@ -167,7 +167,7 @@ program test_transpose_multiply allocate(ev(na)) - call prepare_matrix(na, myid, sc_desc, a, z, as) + call prepare_matrix_random(na, myid, sc_desc, a, z, as) b(:,:) = 2.0_rk4 * a(:,:) c(:,:) = 0.0_rk4 diff --git a/test/Fortran/elpa2/complex_2stage_banded.F90 b/test/Fortran/elpa2/complex_2stage_banded.F90 index 79862f0c..f6519a50 100644 --- a/test/Fortran/elpa2/complex_2stage_banded.F90 +++ b/test/Fortran/elpa2/complex_2stage_banded.F90 @@ -196,7 +196,7 @@ program test_complex2_double_banded allocate(ev(na)) - call prepare_matrix(na, myid, sc_desc, a, z, as) + call prepare_matrix_random(na, myid, sc_desc, a, z, as) ! set values outside of the bandwidth to zero bandwidth = nblk diff --git a/test/Fortran/elpa2/double_instance.F90 b/test/Fortran/elpa2/double_instance.F90 index 9cb615b9..863f57d4 100644 --- a/test/Fortran/elpa2/double_instance.F90 +++ b/test/Fortran/elpa2/double_instance.F90 @@ -116,7 +116,7 @@ program test_interface z1(:,:) = 0.0 ev1(:) = 0.0 - call prepare_matrix(na, myid, sc_desc, a1, z1, as1) + call prepare_matrix_random(na, myid, sc_desc, a1, z1, as1) allocate(a2 (na_rows,na_cols), as2(na_rows,na_cols)) allocate(z2 (na_rows,na_cols)) allocate(ev2(na)) @@ -125,7 +125,7 @@ program test_interface z2(:,:) = 0.0 ev2(:) = 0.0 - call prepare_matrix(na, myid, sc_desc, a2, z2, as2) + call prepare_matrix_random(na, myid, sc_desc, a2, z2, as2) if (elpa_init(CURRENT_API_VERSION) /= ELPA_OK) then print *, "ELPA API version not supported" diff --git a/test/Fortran/elpa2/legacy_interface/legacy_complex.F90 b/test/Fortran/elpa2/legacy_interface/legacy_complex.F90 index 85ba2a8b..572bacbe 100644 --- a/test/Fortran/elpa2/legacy_interface/legacy_complex.F90 +++ b/test/Fortran/elpa2/legacy_interface/legacy_complex.F90 @@ -213,7 +213,7 @@ program test_complex2_double_precision allocate(ev(na)) - call prepare_matrix(na, myid, sc_desc, a, z, as) + call prepare_matrix_random(na, myid, sc_desc, a, z, as) ! set print flag in elpa1 diff --git a/test/Fortran/elpa2/legacy_interface/legacy_complex_api.F90 b/test/Fortran/elpa2/legacy_interface/legacy_complex_api.F90 index c674352d..8b180c63 100644 --- a/test/Fortran/elpa2/legacy_interface/legacy_complex_api.F90 +++ b/test/Fortran/elpa2/legacy_interface/legacy_complex_api.F90 @@ -283,7 +283,7 @@ program test_complex2_choose_kernel_with_api_double_precision allocate(ev(na)) - call prepare_matrix(na, myid, sc_desc, a, z, as) + call prepare_matrix_random(na, myid, sc_desc, a, z, as) ! set print flag in elpa1 elpa_print_times = .true. diff --git a/test/Fortran/elpa2/legacy_interface/legacy_complex_default_kernel.F90 b/test/Fortran/elpa2/legacy_interface/legacy_complex_default_kernel.F90 index 74652155..3bf75f7d 100644 --- a/test/Fortran/elpa2/legacy_interface/legacy_complex_default_kernel.F90 +++ b/test/Fortran/elpa2/legacy_interface/legacy_complex_default_kernel.F90 @@ -229,7 +229,7 @@ program test_complex2_default_kernel_double_precision allocate(ev(na)) - call prepare_matrix(na, myid, sc_desc, a, z, as) + call prepare_matrix_random(na, myid, sc_desc, a, z, as) ! set print flag in elpa1 elpa_print_times = .true. diff --git a/test/Fortran/elpa2/legacy_interface/legacy_complex_gpu.F90 b/test/Fortran/elpa2/legacy_interface/legacy_complex_gpu.F90 index 1e44e0e5..1c941053 100644 --- a/test/Fortran/elpa2/legacy_interface/legacy_complex_gpu.F90 +++ b/test/Fortran/elpa2/legacy_interface/legacy_complex_gpu.F90 @@ -226,7 +226,7 @@ program test_complex2_gpu_version_double_precision allocate(ev(na)) - call prepare_matrix(na, myid, sc_desc, a, z, as) + call prepare_matrix_random(na, myid, sc_desc, a, z, as) ! set print flag in elpa1 diff --git a/test/Fortran/elpa2/legacy_interface/legacy_real.F90 b/test/Fortran/elpa2/legacy_interface/legacy_real.F90 index 39ae6738..eb51de57 100644 --- a/test/Fortran/elpa2/legacy_interface/legacy_real.F90 +++ b/test/Fortran/elpa2/legacy_interface/legacy_real.F90 @@ -205,7 +205,7 @@ program test_real2_double_precision allocate(ev(na)) - call prepare_matrix(na, myid, sc_desc, a, z, as) + call prepare_matrix_random(na, myid, sc_desc, a, z, as) ! set print flag in elpa1 elpa_print_times = .true. diff --git a/test/Fortran/elpa2/legacy_interface/legacy_real_api.F90 b/test/Fortran/elpa2/legacy_interface/legacy_real_api.F90 index 8fe969ae..51f72c0f 100644 --- a/test/Fortran/elpa2/legacy_interface/legacy_real_api.F90 +++ b/test/Fortran/elpa2/legacy_interface/legacy_real_api.F90 @@ -289,7 +289,7 @@ program test_real2_choose_kernel_with_api_double_precision allocate(ev(na)) - call prepare_matrix(na, myid, sc_desc, a, z, as) + call prepare_matrix_random(na, myid, sc_desc, a, z, as) ! set print flag in elpa1 elpa_print_times = .true. diff --git a/test/Fortran/elpa2/legacy_interface/legacy_real_default_kernel.F90 b/test/Fortran/elpa2/legacy_interface/legacy_real_default_kernel.F90 index 7f17e414..77d478c4 100644 --- a/test/Fortran/elpa2/legacy_interface/legacy_real_default_kernel.F90 +++ b/test/Fortran/elpa2/legacy_interface/legacy_real_default_kernel.F90 @@ -221,7 +221,7 @@ program test_real2_default_kernel_double_precision allocate(ev(na)) - call prepare_matrix(na, myid, sc_desc, a, z, as) + call prepare_matrix_random(na, myid, sc_desc, a, z, as) ! set print flag in elpa1 elpa_print_times = .true. diff --git a/test/Fortran/elpa2/legacy_interface/legacy_real_gpu.F90 b/test/Fortran/elpa2/legacy_interface/legacy_real_gpu.F90 index f2eb26b0..15ccfc99 100644 --- a/test/Fortran/elpa2/legacy_interface/legacy_real_gpu.F90 +++ b/test/Fortran/elpa2/legacy_interface/legacy_real_gpu.F90 @@ -223,7 +223,7 @@ program test_real2_gpu_version_double_precision allocate(ev(na)) - call prepare_matrix(na, myid, sc_desc, a, z, as) + call prepare_matrix_random(na, myid, sc_desc, a, z, as) ! set print flag in elpa1 elpa_print_times = .true. diff --git a/test/Fortran/elpa2/legacy_interface/legacy_real_qr.F90 b/test/Fortran/elpa2/legacy_interface/legacy_real_qr.F90 index 168709dd..9886a61b 100644 --- a/test/Fortran/elpa2/legacy_interface/legacy_real_qr.F90 +++ b/test/Fortran/elpa2/legacy_interface/legacy_real_qr.F90 @@ -263,7 +263,7 @@ program test_real2_default_kernel_qr_decomposition_double_precision allocate(ev(na)) - call prepare_matrix(na, myid, sc_desc, a, z, as) + call prepare_matrix_random(na, myid, sc_desc, a, z, as) ! set print flag in elpa1 elpa_print_times = .true. diff --git a/test/Fortran/elpa2/legacy_interface/legacy_single_complex.F90 b/test/Fortran/elpa2/legacy_interface/legacy_single_complex.F90 index aed13119..ced541a1 100644 --- a/test/Fortran/elpa2/legacy_interface/legacy_single_complex.F90 +++ b/test/Fortran/elpa2/legacy_interface/legacy_single_complex.F90 @@ -213,7 +213,7 @@ program test_complex2_single_precision allocate(ev(na)) - call prepare_matrix(na, myid, sc_desc, a, z, as) + call prepare_matrix_random(na, myid, sc_desc, a, z, as) ! set print flag in elpa1 elpa_print_times = .true. diff --git a/test/Fortran/elpa2/legacy_interface/legacy_single_complex_api.F90 b/test/Fortran/elpa2/legacy_interface/legacy_single_complex_api.F90 index 39368901..bf89908d 100644 --- a/test/Fortran/elpa2/legacy_interface/legacy_single_complex_api.F90 +++ b/test/Fortran/elpa2/legacy_interface/legacy_single_complex_api.F90 @@ -282,7 +282,7 @@ program test_complex2_choose_kernel_with_api_single_precision allocate(ev(na)) - call prepare_matrix(na, myid, sc_desc, a, z, as) + call prepare_matrix_random(na, myid, sc_desc, a, z, as) ! set print flag in elpa1 elpa_print_times = .true. diff --git a/test/Fortran/elpa2/legacy_interface/legacy_single_complex_default_kernel.F90 b/test/Fortran/elpa2/legacy_interface/legacy_single_complex_default_kernel.F90 index b8923776..a3f192ff 100644 --- a/test/Fortran/elpa2/legacy_interface/legacy_single_complex_default_kernel.F90 +++ b/test/Fortran/elpa2/legacy_interface/legacy_single_complex_default_kernel.F90 @@ -228,7 +228,7 @@ program test_complex2_default_kernel_single_precision allocate(ev(na)) - call prepare_matrix(na, myid, sc_desc, a, z, as) + call prepare_matrix_random(na, myid, sc_desc, a, z, as) ! set print flag in elpa1 elpa_print_times = .true. diff --git a/test/Fortran/elpa2/legacy_interface/legacy_single_complex_gpu.F90 b/test/Fortran/elpa2/legacy_interface/legacy_single_complex_gpu.F90 index 4b48dcc8..48f39c17 100644 --- a/test/Fortran/elpa2/legacy_interface/legacy_single_complex_gpu.F90 +++ b/test/Fortran/elpa2/legacy_interface/legacy_single_complex_gpu.F90 @@ -225,7 +225,7 @@ program test_complex2_gpu_version_single_precision allocate(ev(na)) - call prepare_matrix(na, myid, sc_desc, a, z, as) + call prepare_matrix_random(na, myid, sc_desc, a, z, as) ! set print flag in elpa1 elpa_print_times = .true. diff --git a/test/Fortran/elpa2/legacy_interface/legacy_single_real.F90 b/test/Fortran/elpa2/legacy_interface/legacy_single_real.F90 index 1a9f4310..93aa47e2 100644 --- a/test/Fortran/elpa2/legacy_interface/legacy_single_real.F90 +++ b/test/Fortran/elpa2/legacy_interface/legacy_single_real.F90 @@ -205,7 +205,7 @@ program test_real2_single_precision allocate(ev(na)) - call prepare_matrix(na, myid, sc_desc, a, z, as) + call prepare_matrix_random(na, myid, sc_desc, a, z, as) ! set print flag in elpa1 elpa_print_times = .true. diff --git a/test/Fortran/elpa2/legacy_interface/legacy_single_real_api.F90 b/test/Fortran/elpa2/legacy_interface/legacy_single_real_api.F90 index db4bcb2c..ad36b110 100644 --- a/test/Fortran/elpa2/legacy_interface/legacy_single_real_api.F90 +++ b/test/Fortran/elpa2/legacy_interface/legacy_single_real_api.F90 @@ -287,7 +287,7 @@ program test_real2_choose_kernel_with_api_single_precision allocate(ev(na)) - call prepare_matrix(na, myid, sc_desc, a, z, as) + call prepare_matrix_random(na, myid, sc_desc, a, z, as) ! set print flag in elpa1 elpa_print_times = .true. diff --git a/test/Fortran/elpa2/legacy_interface/legacy_single_real_default_kernel.F90 b/test/Fortran/elpa2/legacy_interface/legacy_single_real_default_kernel.F90 index 03e23191..cd5692b0 100644 --- a/test/Fortran/elpa2/legacy_interface/legacy_single_real_default_kernel.F90 +++ b/test/Fortran/elpa2/legacy_interface/legacy_single_real_default_kernel.F90 @@ -221,7 +221,7 @@ program test_real2_default_kernel_single_precision allocate(ev(na)) - call prepare_matrix(na, myid, sc_desc, a, z, as) + call prepare_matrix_random(na, myid, sc_desc, a, z, as) ! set print flag in elpa1 elpa_print_times = .true. diff --git a/test/Fortran/elpa2/legacy_interface/legacy_single_real_gpu.F90 b/test/Fortran/elpa2/legacy_interface/legacy_single_real_gpu.F90 index a29e0454..5b2e5797 100644 --- a/test/Fortran/elpa2/legacy_interface/legacy_single_real_gpu.F90 +++ b/test/Fortran/elpa2/legacy_interface/legacy_single_real_gpu.F90 @@ -223,7 +223,7 @@ program test_real2_gpu_version_single_precision allocate(ev(na)) - call prepare_matrix(na, myid, sc_desc, a, z, as) + call prepare_matrix_random(na, myid, sc_desc, a, z, as) ! set print flag in elpa1 elpa_print_times = .true. diff --git a/test/Fortran/elpa2/legacy_interface/legacy_single_real_qr.F90 b/test/Fortran/elpa2/legacy_interface/legacy_single_real_qr.F90 index 747ea182..8934f75c 100644 --- a/test/Fortran/elpa2/legacy_interface/legacy_single_real_qr.F90 +++ b/test/Fortran/elpa2/legacy_interface/legacy_single_real_qr.F90 @@ -267,7 +267,7 @@ program test_real2_default_kernel_qr_decomposition_single_precision allocate(ev(na)) - call prepare_matrix(na, myid, sc_desc, a, z, as) + call prepare_matrix_random(na, myid, sc_desc, a, z, as) ! set print flag in elpa1 elpa_print_times = .true. diff --git a/test/Fortran/elpa2/real_2stage_banded.F90 b/test/Fortran/elpa2/real_2stage_banded.F90 index 850182a3..9593e3c3 100644 --- a/test/Fortran/elpa2/real_2stage_banded.F90 +++ b/test/Fortran/elpa2/real_2stage_banded.F90 @@ -191,7 +191,7 @@ program test_real2_double_banded allocate(ev(na)) - call prepare_matrix(na, myid, sc_desc, a, z, as) + call prepare_matrix_random(na, myid, sc_desc, a, z, as) ! set values outside of the bandwidth to zero bandwidth = nblk diff --git a/test/Fortran/elpa2/single_complex_2stage_banded.F90 b/test/Fortran/elpa2/single_complex_2stage_banded.F90 index ed974eaa..9a1e1e59 100644 --- a/test/Fortran/elpa2/single_complex_2stage_banded.F90 +++ b/test/Fortran/elpa2/single_complex_2stage_banded.F90 @@ -196,7 +196,7 @@ program test_complex2_single_banded allocate(ev(na)) - call prepare_matrix(na, myid, sc_desc, a, z, as) + call prepare_matrix_random(na, myid, sc_desc, a, z, as) ! set values outside of the bandwidth to zero bandwidth = nblk diff --git a/test/Fortran/elpa2/single_real_2stage_banded.F90 b/test/Fortran/elpa2/single_real_2stage_banded.F90 index 18355557..d09ec67a 100644 --- a/test/Fortran/elpa2/single_real_2stage_banded.F90 +++ b/test/Fortran/elpa2/single_real_2stage_banded.F90 @@ -190,7 +190,7 @@ program test_real2_single_banded allocate(ev(na)) - call prepare_matrix(na, myid, sc_desc, a, z, as) + call prepare_matrix_random(na, myid, sc_desc, a, z, as) ! set values outside of the bandwidth to zero bandwidth = nblk diff --git a/test/Fortran/elpa_tests.F90 b/test/Fortran/elpa_tests.F90 index 872cbab5..3bb432ad 100644 --- a/test/Fortran/elpa_tests.F90 +++ b/test/Fortran/elpa_tests.F90 @@ -259,7 +259,7 @@ program test_all_real endif if (input_options%datatype .eq. 1) then - call prepare_matrix(na, myid, sc_desc, a_real, z_real, as_real) + call prepare_matrix_random(na, myid, sc_desc, a_real, z_real, as_real) if (input_options%doInvertTrm) then b_real(:,:) = a_real(:,:) @@ -267,7 +267,7 @@ program test_all_real endif endif if (input_options%datatype .eq. 2) then - call prepare_matrix(na, myid, sc_desc, a_complex, z_complex, as_complex) + call prepare_matrix_random(na, myid, sc_desc, a_complex, z_complex, as_complex) if (input_options%doInvertTrm) then b_complex(:,:) = a_complex(:,:) bs_complex(:,:) = a_complex(:,:) @@ -901,10 +901,10 @@ program test_all_real endif ! input_options%doTransposeMultiply ! if (input_options%datatype .eq. 0) then -! call prepare_matrix(na, myid, sc_desc, a_real, z_real, as_real) +! call prepare_matrix_random(na, myid, sc_desc, a_real, z_real, as_real) ! endif ! if (input_options%datatype .eq. 1) then -! call prepare_matrix(na, myid, sc_desc, a_complex, z_complex, as_complex) +! call prepare_matrix_random(na, myid, sc_desc, a_complex, z_complex, as_complex) ! endif if (input_options%do1stage) then diff --git a/test/Fortran/test.F90 b/test/Fortran/test.F90 index c2b109b5..8486e9b5 100644 --- a/test/Fortran/test.F90 +++ b/test/Fortran/test.F90 @@ -285,7 +285,7 @@ program test as(:,:) = a #else if (nev .ge. 1) then - call prepare_matrix(na, myid, sc_desc, a, z, as) + call prepare_matrix_random(na, myid, sc_desc, a, z, as) else ! zero eigenvectors and not analytic test => toeplitz matrix #ifdef TEST_SINGLE @@ -295,7 +295,7 @@ program test diagonalElement = 0.45_c_double subdiagonalElement = 0.78_c_double #endif - call prepare_toeplitz_matrix(na, diagonalElement, subdiagonalElement, & + call prepare_matrix_toeplitz(na, diagonalElement, subdiagonalElement, & d, sd, ds, sds, a, as, nblk, np_rows, & np_cols, my_prow, my_pcol) endif @@ -339,7 +339,7 @@ program test diagonalElement = 0.45_c_double subdiagonalElement = 0.78_c_double #endif - call prepare_toeplitz_matrix(na, diagonalElement, subdiagonalElement, & + call prepare_matrix_toeplitz(na, diagonalElement, subdiagonalElement, & d, sd, ds, sds, a, as, nblk, np_rows, & np_cols, my_prow, my_pcol) #endif /* EIGENVALUES OR TRIDIAGONAL */ @@ -353,7 +353,7 @@ program test diagonalElement = (2.546_c_double, 0.0_c_double) subdiagonalElement = (0.0_c_double, 0.0_c_double) #endif - call prepare_toeplitz_matrix(na, diagonalElement, subdiagonalElement, & + call prepare_matrix_toeplitz(na, diagonalElement, subdiagonalElement, & d, sd, ds, sds, a, as, nblk, np_rows, & np_cols, my_prow, my_pcol) diff --git a/test/shared/test_prepare_matrix.F90 b/test/shared/test_prepare_matrix.F90 index 155ede8f..2f727647 100644 --- a/test/shared/test_prepare_matrix.F90 +++ b/test/shared/test_prepare_matrix.F90 @@ -44,28 +44,28 @@ module test_prepare_matrix - interface prepare_matrix - module procedure prepare_matrix_complex_double - module procedure prepare_matrix_real_double + interface prepare_matrix_random + module procedure prepare_matrix_random_complex_double + module procedure prepare_matrix_random_real_double #ifdef WANT_SINGLE_PRECISION_REAL - module procedure prepare_matrix_real_single + module procedure prepare_matrix_random_real_single #endif #ifdef WANT_SINGLE_PRECISION_COMPLEX - module procedure prepare_matrix_complex_single + module procedure prepare_matrix_random_complex_single #endif end interface - interface prepare_toeplitz_matrix - module procedure prepare_toeplitz_matrix_complex_double - module procedure prepare_toeplitz_matrix_real_double - module procedure prepare_toeplitz_matrix_mixed_complex_complex_double + interface prepare_matrix_toeplitz + module procedure prepare_matrix_toeplitz_complex_double + module procedure prepare_matrix_toeplitz_real_double + module procedure prepare_matrix_toeplitz_mixed_complex_complex_double #ifdef WANT_SINGLE_PRECISION_REAL - module procedure prepare_toeplitz_matrix_real_single + module procedure prepare_matrix_toeplitz_real_single #endif #ifdef WANT_SINGLE_PRECISION_COMPLEX - module procedure prepare_toeplitz_matrix_complex_single - module procedure prepare_toeplitz_matrix_mixed_complex_complex_single + module procedure prepare_matrix_toeplitz_complex_single + module procedure prepare_matrix_toeplitz_mixed_complex_complex_single #endif end interface diff --git a/test/shared/test_prepare_matrix_template.F90 b/test/shared/test_prepare_matrix_template.F90 index 72c9407d..5276dd0e 100644 --- a/test/shared/test_prepare_matrix_template.F90 +++ b/test/shared/test_prepare_matrix_template.F90 @@ -41,7 +41,7 @@ ! ! Author: A. Marek, MPCDF - subroutine prepare_matrix_& + subroutine prepare_matrix_random_& &MATH_DATATYPE& &_& &PRECISION& @@ -149,11 +149,11 @@ #if REALCASE == 1 #ifdef DOUBLE_PRECISION_REAL - !c> void prepare_matrix_real_double_f(int na, int myid, int na_rows, int na_cols, + !c> void prepare_matrix_random_real_double_f(int na, int myid, int na_rows, int na_cols, !c> int sc_desc[9], !c> double *a, double *z, double *as); #else - !c> void prepare_matrix_real_single_f(int na, int myid, int na_rows, int na_cols, + !c> void prepare_matrix_random_real_single_f(int na, int myid, int na_rows, int na_cols, !c> int sc_desc[9], !c> float *a, float *z, float *as); #endif @@ -161,22 +161,22 @@ #if COMPLEXCASE == 1 #ifdef DOUBLE_PRECISION_COMPLEX - !c> void prepare_matrix_complex_double_f(int na, int myid, int na_rows, int na_cols, + !c> void prepare_matrix_random_complex_double_f(int na, int myid, int na_rows, int na_cols, !c> int sc_desc[9], !c> complex double *a, complex double *z, complex double *as); #else - !c> void prepare_matrix_complex_single_f(int na, int myid, int na_rows, int na_cols, + !c> void prepare_matrix_random_complex_single_f(int na, int myid, int na_rows, int na_cols, !c> int sc_desc[9], !c> complex float *a, complex float *z, complex float *as); #endif #endif /* COMPLEXCASE */ -subroutine prepare_matrix_& +subroutine prepare_matrix_random_& &MATH_DATATYPE& &_wrapper_& &PRECISION& & (na, myid, na_rows, na_cols, sc_desc, a, z, as) & - bind(C, name="prepare_matrix_& + bind(C, name="prepare_matrix_random_& &MATH_DATATYPE& &_& &PRECISION& @@ -198,7 +198,7 @@ subroutine prepare_matrix_& as(1:na_rows,1:na_cols) #endif - call prepare_matrix_& + call prepare_matrix_random_& &MATH_DATATYPE& &_& &PRECISION& @@ -206,7 +206,7 @@ subroutine prepare_matrix_& end subroutine - subroutine prepare_toeplitz_matrix_& + subroutine prepare_matrix_toeplitz_& &MATH_DATATYPE& &_& &PRECISION& @@ -264,7 +264,7 @@ subroutine prepare_matrix_& as = a end subroutine - subroutine prepare_toeplitz_matrix_mixed_complex& + subroutine prepare_matrix_toeplitz_mixed_complex& &_& &MATH_DATATYPE& &_& -- GitLab