From 4e4e779833353be557285d42d127fe5766c5b49f Mon Sep 17 00:00:00 2001 From: Salvatore Filippone Date: Fri, 30 Oct 2009 13:05:26 +0000 Subject: [PATCH] psblas3: Fixed message in solution dump on file. --- test/fileread/cf_sample.f90 | 3 ++- test/fileread/df_sample.f90 | 3 ++- test/fileread/runs/cfs.inp | 2 +- test/fileread/sf_sample.f90 | 3 ++- test/fileread/zf_sample.f90 | 3 ++- 5 files changed, 9 insertions(+), 5 deletions(-) diff --git a/test/fileread/cf_sample.f90 b/test/fileread/cf_sample.f90 index a9f26390..35e6704f 100644 --- a/test/fileread/cf_sample.f90 +++ b/test/fileread/cf_sample.f90 @@ -282,7 +282,8 @@ program cf_sample write(20,*) 'iterations to convergence: ',iter write(20,*) 'error estimate (infinity norm) on exit:', & & ' ||r||/(||a||||x||+||b||) = ',err - write(20,*) 'max residual = ',resmx, resmxp + write(20,'("Residual norm 2 : ",es12.5)')resmx + write(20,'("Residual norm inf : ",es12.5)')resmxp write(20,'(a8,4(2x,a20))') 'I','X(I)','R(I)','B(I)' do i=1,m_problem write(20,998) i,x_col_glob(i),r_col_glob(i),b_col_glob(i) diff --git a/test/fileread/df_sample.f90 b/test/fileread/df_sample.f90 index 6eed604e..ac66e210 100644 --- a/test/fileread/df_sample.f90 +++ b/test/fileread/df_sample.f90 @@ -287,7 +287,8 @@ program df_sample write(20,*) 'iterations to convergence: ',iter write(20,*) 'error estimate (infinity norm) on exit:', & & ' ||r||/(||a||||x||+||b||) = ',err - write(20,*) 'max residual = ',resmx, resmxp + write(20,'("Residual norm 2 : ",es12.5)')resmx + write(20,'("Residual norm inf : ",es12.5)')resmxp write(20,'(a8,4(2x,a20))') 'I','X(I)','R(I)','B(I)' do i=1,m_problem write(20,998) i,x_col_glob(i),r_col_glob(i),b_col_glob(i) diff --git a/test/fileread/runs/cfs.inp b/test/fileread/runs/cfs.inp index 5b4a01f4..bf147e2a 100644 --- a/test/fileread/runs/cfs.inp +++ b/test/fileread/runs/cfs.inp @@ -1,5 +1,5 @@ 11 Number of inputs -waveguide3D.mtx This (and others) from: http://math.nist.gov/MatrixMarket/ or +young1c.mtx This (and others) from: http://math.nist.gov/MatrixMarket/ or NONE http://www.cise.ufl.edu/research/sparse/matrices/index.html MM File format: MM: Matrix Market HB: Harwell-Boeing. BICGSTAB Iterative method: BiCGSTAB CGS RGMRES BiCGSTABL BICG CG diff --git a/test/fileread/sf_sample.f90 b/test/fileread/sf_sample.f90 index c2b73caf..627f4691 100644 --- a/test/fileread/sf_sample.f90 +++ b/test/fileread/sf_sample.f90 @@ -284,7 +284,8 @@ program sf_sample write(20,*) 'iterations to convergence: ',iter write(20,*) 'error estimate (infinity norm) on exit:', & & ' ||r||/(||a||||x||+||b||) = ',err - write(20,*) 'max residual = ',resmx, resmxp + write(20,'("Residual norm 2 : ",es12.5)')resmx + write(20,'("Residual norm inf : ",es12.5)')resmxp write(20,'(a8,4(2x,a20))') 'I','X(I)','R(I)','B(I)' do i=1,m_problem write(20,998) i,x_col_glob(i),r_col_glob(i),b_col_glob(i) diff --git a/test/fileread/zf_sample.f90 b/test/fileread/zf_sample.f90 index f957aa2c..0748d667 100644 --- a/test/fileread/zf_sample.f90 +++ b/test/fileread/zf_sample.f90 @@ -282,7 +282,8 @@ program zf_sample write(20,*) 'iterations to convergence: ',iter write(20,*) 'error estimate (infinity norm) on exit:', & & ' ||r||/(||a||||x||+||b||) = ',err - write(20,*) 'max residual = ',resmx, resmxp + write(20,'("Residual norm 2 : ",es12.5)')resmx + write(20,'("Residual norm inf : ",es12.5)')resmxp write(20,'(a8,4(2x,a20))') 'I','X(I)','R(I)','B(I)' do i=1,m_problem write(20,998) i,x_col_glob(i),r_col_glob(i),b_col_glob(i)