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 86c28f3bfee69eadaf20952c4904a66e34027a99..da553d3db5886698cf39cb332987df24e7ce47ac 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 60a1181b39ccad7eaaf43428a2363cb232e45119..448a54e9a4863601ee98cdd22ae85f44ee691c29 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 4fbff0520d89b726e62e5c681d35300476271108..401a80cec2644626f16906053ed5a463df939e53 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 a21c71d98e69fc1a21452866f420c49d72bd0ac6..97a5ea5778153a71686adcdc49261a2c25eb36cb 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 9e010bce925cd01aed2adf7b9a9cfdea0728711f..f07354a89437179d5a92463f91f1389fc5bc3bdc 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 55144fc730fe63cbfe9ac57511b7cd5295f22910..fa818bd18fe2ea35144076081825b25c556251a2 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 b69a6b34ae57e5ad7dc9742add0109231cc24bb7..4d924a83f0b627124ff543a52ab72d641ceb65ff 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 941b90a25b7e3dd9f33433f2a3369218b1e13a6f..291fe41a5f9e306ef3fc2bb172cb6e439cd6add9 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 16b1f7497db4b76991ac26a7c251f4133035a263..a4a4d150fd143c464c3689f4d38c2b6a276e3435 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 dc8f7acf6f0b7cac75a5fdc2bee001ed9d1f3cdc..d32751dfaf0a8066845193b52c459baa007f5e30 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 3455906a019a3afc435902a81e51557fe1c0e738..a802ef4f21da034664fba21ee964f53410d870df 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 d0366ead8e1273216aeb8ff61aa156e95fa51942..0fe493901c20b5ce8de4a5629526d81f0298b26a 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 8160f41f0a9923b472e499be400977e15d9f8af6..bb077643816aeacb01cb496f352f5598bdc94746 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 807c545d0c80f0640bf0a78778538429ecb35e36..ec1a71cfeab765dcd5b8f572bcc5cb8f31272aae 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 e694e400f2428f682bc3ee02bcef9a2c1f23ced7..adcf09f2d1d9b6bdc9338d2f0cf897216e886bff 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 9f4827f9104c12b0758f6d3bcb0d69c3d7b41608..062d70b7f9032edc9ac9a58b0d9646d085c34210 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 a2929e1f58a0649f69a56d02e1cc0fb0b42971c8..cea018e8f0a635cc14ad9d9bb535d735009fce56 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 3050489e37bff989422171b20a8698c6c8862cbc..6946d3d63ac7ddff488817645b2a1b8eda421306 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 f267385aaae0b0b46725b249b24d1d0f13490f6b..730c03c5a271c936c75f21d6e3109790e36a6fcf 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 c2dc767a2a8049684897a49fa7195ae07b8a1629..9fa8242239c0adc71cdb707f587dcb57e0f61120 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 d55815c9470880f6f5d9ad23f2e8c3e4e18a41b7..f4fc3806bc25548147b37a4188fe1bb3a6c6ea27 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 c4b9fab387d01aa28f944f0c7ebee42e5a4206f5..323f743c373f924f95a03d0e5736c4fcb08b54af 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 b8e0f59c90f09bf708f98fd4808fa600e43d0503..600a201a9745ffaee84a785e7086693ca381c723 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 699179b493e552827cd50599d8c508186f2a4769..4c39d3aab95db887dffcac826a9064b15ca63cca 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 d621a5f627712b13c8450ba33b74469940057aea..d844052946426ad0c115ee28095ace06d814b372 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 e30413cc967d91e9bda30bf07ce56ef04019928d..e55bf290875646cd0dfc0e6a38b99b2956b41af8 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 6e628eab0e14f3110615dc1de97575dac737df78..01c15082723c1a8411c189b49b1fa97514f56a4d 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 eda3c92836be44a48e3a256be99c069940a06d7c..85136857a711104bf419ba6f5a7ef6f6518d2fdc 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 23ddeb8e46551af320a0afa2ea4d23556818a856..fa84cde4e95a49af2e65f4063df318bef717c63d 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 fb8a8416d3210acb079e5f077ad2f13f5043ebee..18ed505225908467b54cd1ee00399a7784bcaf09 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 79862f0c59403a8d0b3aec534402173281d5207f..f6519a505c4259c02145182f0f6b437ddaaecb2a 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 9cb615b91b733f2753d8a754416daf8c425913d9..863f57d42610ab4db21b226e2779c992052785b0 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 85ba2a8be6b2722d66ac98ea7119e697c225c3f2..572bacbece25d5aeef042bb31862f42447ec7830 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 c674352d11b654a777cbd19152b7d6a54083d5b7..8b180c63826812ccfc403647f9009b5bafe147bd 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 746521550fa28d78be7a9fb2df7ddd205c5eff7d..3bf75f7d687a8c4da37b84030b854ae85079b6ac 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 1e44e0e56b6830fc4037ba6aafb192fe6ea31b7c..1c94105367202ca31f6e2ed819b0bbb31ff06707 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 39ae67386233afae658b4e5afd812bb3e63ca362..eb51de5703244360e3a910327969b7c67d7565bf 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 8fe969ae1e9b64b4d002d5d5301246b77b74953f..51f72c0f77a3d1ecf49467e11a9f453bd2f6abeb 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 7f17e414e6b62e16c9ff84612d81da9a38b027c6..77d478c4303afa331f0b81a9a4682e350df0fc72 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 f2eb26b00239ae620f6c607b91a2d99f54652af2..15ccfc99a625d37c1c466df6777fa95c139ce692 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 168709ddc2856e871ca0860f017302e4848ac960..9886a61bb5e95e53666279d27317fbfd39251cb9 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 aed131191eec991553007b7487a26e4fd52ebe29..ced541a1298a278b8db66a32cacc9dbccff89f23 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 393689018af5f3b7600b97d598630d17223a3edc..bf89908dc977216a26f72f3a5fa856f7419495bd 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 b89237767d5b5ae2c9f8c37818960d043e0a9d70..a3f192ffb05327adf679084edb0c6b7591b52ed5 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 4b48dcc85cfc4ec56c1c8e661a06291bb057b4a2..48f39c17f004b8add30f32be4a60e3904a39e78a 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 1a9f43106c4fd7b0be0ee9c85561497259526331..93aa47e2992a89c5df0d9eae65efb5972bcebc23 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 db4bcb2c369f993463017f52ea990b715adbcda4..ad36b110c3bc0da6d36d06d55392874b946422c3 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 03e2319119fe7accd784ee014f6c1089cdc00058..cd5692b0a7fb9187bf511beaef773423b522ef0a 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 a29e04544b9599a4f931d896f6aab051fa9fac49..5b2e5797ba257d503805b119fd94218e850da361 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 747ea18240c24ab421dc2b4261610888ca47daa8..8934f75c3dfa34c6a3be7d213f82d3c2571ca5d8 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 850182a3a16c76e104b14b6b399d6c7603007caa..9593e3c36e339be8ca20bf2ae6708f241be34ef0 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 ed974eaa51ef92ee551f101bd9fd437a356e37aa..9a1e1e59c7854058e66d48398428e4d8f89f6136 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 183555572fe89703f86885046d3affddc8e5cc26..d09ec67ad3c9a4c65dc7ee70bd4af9dc2ac74e41 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 872cbab594de846bc1f7d22fb236d4a0fa773d91..3bb432adb37a1af97fc0716222f1fecf2774d987 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 c2b109b553be76f9a7fdaf79c5822e5df6df50f3..8486e9b5929716b2b7dd43587b50ccdc27142c87 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 155ede8f98094b8ca7baf5965d6c71fac7f7d947..2f727647576cb4704aefccc275b2ecf68c609acd 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 72c9407da2afabf2dff3438b63dc9f0ce6cbcf2d..5276dd0ef0f519fd6c9b25d6539bf5ca910b4ed0 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&
&_&