Commit 5748ad54 authored by Andreas Marek's avatar Andreas Marek
Browse files

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
parent 06b170c4
......@@ -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");
......
......@@ -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");
......
......@@ -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");
......
......@@ -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");
......
......@@ -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) {
......
......@@ -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");
......
......@@ -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) {
......
......@@ -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");
......
......@@ -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.
......
......@@ -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.
......
......@@ -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.
......
......@@ -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.
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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.
!-------------------------------------------------------------------------------
......
......@@ -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
......
......@@ -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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment