From b3a84f9b061e90f5c70cfafd8550add7ddb2f473 Mon Sep 17 00:00:00 2001 From: Salvatore Filippone Date: Wed, 5 Oct 2011 09:10:13 +0000 Subject: [PATCH] --- test/kernel/d_file_spmv.f90 | 12 ++---------- test/kernel/s_file_spmv.f90 | 12 ++---------- 2 files changed, 4 insertions(+), 20 deletions(-) diff --git a/test/kernel/d_file_spmv.f90 b/test/kernel/d_file_spmv.f90 index fdd5255a..bf5d535f 100644 --- a/test/kernel/d_file_spmv.f90 +++ b/test/kernel/d_file_spmv.f90 @@ -31,8 +31,6 @@ !!$ program d_file_spmv use psb_base_mod - use psb_prec_mod - use psb_krylov_mod use psb_util_mod implicit none @@ -42,9 +40,6 @@ program d_file_spmv ! sparse matrices type(psb_dspmat_type) :: a, aux_a - ! preconditioner data - type(psb_dprec_type) :: prec - ! dense matrices real(psb_dpk_), allocatable, target :: aux_b(:,:), d(:) real(psb_dpk_), allocatable , save :: b_col(:), x_col(:), r_col(:), & @@ -59,7 +54,7 @@ program d_file_spmv ! solver paramters integer :: iter, itmax, ierr, itrace, ircode, ipart,& & methd, istopc, irst, nr - integer(psb_long_int_k_) :: amatsize, precsize, descsize, annz, nbytes + integer(psb_long_int_k_) :: amatsize, descsize, annz, nbytes real(psb_dpk_) :: err, eps,cond character(len=5) :: afmt @@ -72,7 +67,7 @@ program d_file_spmv ! other variables integer :: i,info,j,m_problem integer :: internal, m,ii,nnzero - real(psb_dpk_) :: t1, t2, tprec, r_amax, b_amax,& + real(psb_dpk_) :: t1, t2, r_amax, b_amax,& &scale,resmx,resmxp, flops, bdwdth real(psb_dpk_) :: tt1, tt2, tflops integer :: nrhs, nrow, n_row, dim, nv, ne @@ -99,9 +94,6 @@ program d_file_spmv if (iam == psb_root_) then write(*,*) 'Welcome to PSBLAS version: ',psb_version_string_ write(*,*) 'This is the ',trim(name),' sample program' - end if - - if (iam == 0) then read(psb_inp_unit,*) mtrx_file read(psb_inp_unit,*) filefmt read(psb_inp_unit,*) ipart diff --git a/test/kernel/s_file_spmv.f90 b/test/kernel/s_file_spmv.f90 index 155ec7f1..2b9eb06f 100644 --- a/test/kernel/s_file_spmv.f90 +++ b/test/kernel/s_file_spmv.f90 @@ -31,8 +31,6 @@ !!$ program s_file_spmv use psb_base_mod - use psb_prec_mod - use psb_krylov_mod use psb_util_mod implicit none @@ -42,9 +40,6 @@ program s_file_spmv ! sparse matrices type(psb_sspmat_type) :: a, aux_a - ! preconditioner data - type(psb_sprec_type) :: prec - ! dense matrices real(psb_spk_), allocatable, target :: aux_b(:,:), d(:) real(psb_spk_), allocatable , save :: b_col(:), x_col(:), r_col(:), & @@ -59,7 +54,7 @@ program s_file_spmv ! solver paramters integer :: iter, itmax, ierr, itrace, ircode, ipart,& & methd, istopc, irst, nr - integer(psb_long_int_k_) :: amatsize, precsize, descsize, annz, nbytes + integer(psb_long_int_k_) :: amatsize, descsize, annz, nbytes real(psb_spk_) :: err, eps,cond character(len=5) :: afmt @@ -72,7 +67,7 @@ program s_file_spmv ! other variables integer :: i,info,j,m_problem integer :: internal, m,ii,nnzero - real(psb_dpk_) :: t1, t2, tprec, r_amax, b_amax,& + real(psb_dpk_) :: t1, t2, r_amax, b_amax,& &scale,resmx,resmxp, flops, bdwdth real(psb_dpk_) :: tt1, tt2, tflops integer :: nrhs, nrow, n_row, dim, nv, ne @@ -99,9 +94,6 @@ program s_file_spmv if (iam == psb_root_) then write(*,*) 'Welcome to PSBLAS version: ',psb_version_string_ write(*,*) 'This is the ',trim(name),' sample program' - end if - - if (iam == 0) then read(psb_inp_unit,*) mtrx_file read(psb_inp_unit,*) filefmt read(psb_inp_unit,*) ipart