From 640e4ef4b07fb2fca9c2ca799fadcd9f07f0aef6 Mon Sep 17 00:00:00 2001 From: Andreas Marek Date: Fri, 8 Sep 2017 08:59:24 +0200 Subject: [PATCH] Also do numerical residual check in analytical test --- test/Fortran/test.F90 | 13 ++++++++++++- test/shared/test_check_correctness_template.F90 | 2 +- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/test/Fortran/test.F90 b/test/Fortran/test.F90 index 4c5cafda..20647867 100644 --- a/test/Fortran/test.F90 +++ b/test/Fortran/test.F90 @@ -501,7 +501,15 @@ program test #if defined(TEST_EIGENVECTORS) || defined(TEST_QR_DECOMPOSITION) #ifdef TEST_MATRIX_ANALYTIC +! +!#if defined(TEST_MATRIX_ANALYTIC) status = check_correctness_analytic(na, nev, ev, z, nblk, myid, np_rows, np_cols, my_prow, my_pcol, check_all_evals) + call check_status(status, myid) + if (.true.) then + ! also check residuals + status = check_correctness_evp_numeric_residuals(na, nev, as, z, ev, sc_desc, nblk, myid, np_rows,np_cols, my_prow, my_pcol) + call check_status(status, myid) + endif #else !#elif defined(TEST_MATRIX_FRANK) ! status = check_correctness_evp_numeric_residuals(na, nev, as, z, ev, sc_desc, nblk, myid, np_rows,np_cols, my_prow, my_pcol) @@ -513,9 +521,12 @@ program test status = check_correctness_eigenvalues_toeplitz(na, diagonalElement, & subdiagonalElement, ev, z, myid) endif -#endif call check_status(status, myid) +!#else +!#error "MATRIX TYPE" +!#endif #endif +#endif /* defined(TEST_EIGENVECTORS) || defined(TEST_QR_DECOMPOSITION) */ #if defined(TEST_EIGENVALUES) || defined(TEST_SOLVE_TRIDIAGONAL) status = check_correctness_eigenvalues_toeplitz(na, diagonalElement, & diff --git a/test/shared/test_check_correctness_template.F90 b/test/shared/test_check_correctness_template.F90 index eb79a52f..a5858f48 100644 --- a/test/shared/test_check_correctness_template.F90 +++ b/test/shared/test_check_correctness_template.F90 @@ -187,7 +187,7 @@ #else /* WITH_MPI */ errmax = err #endif /* WITH_MPI */ - + if (myid==0) print *,'Results of numerical residual checks:' if (myid==0) print *,'Error Residual :',errmax #if REALCASE == 1 if (nev .ge. 2) then -- GitLab