test/fileread/runs/dfs.inp
 test/fileread/runs/sfs.inp
 util/psb_mmio_mod.f90

Fixed MMIO bg in handling simmetric/hermitian matrix input.
psblas3-type-indexed
Salvatore Filippone 15 years ago
parent feeb610418
commit 84ce5afbc0

@ -1,5 +1,5 @@
11 Number of inputs 11 Number of inputs
10974x10974.mtx sherman3.mtx This (and others) from: http://math.nist.gov/MatrixMarket/ or sherman3.mtx This (and others) from: http://math.nist.gov/MatrixMarket/ or
NONE sherman3_rhs1.mtx http://www.cise.ufl.edu/research/sparse/matrices/index.html NONE sherman3_rhs1.mtx http://www.cise.ufl.edu/research/sparse/matrices/index.html
MM File format: MM: Matrix Market HB: Harwell-Boeing. MM File format: MM: Matrix Market HB: Harwell-Boeing.
BICGSTAB Iterative method: BiCGSTAB CGS RGMRES BiCGSTABL BICG CG BICGSTAB Iterative method: BiCGSTAB CGS RGMRES BiCGSTABL BICG CG

@ -1,5 +1,5 @@
11 Number of inputs 11 Number of inputs
young1r.mtx This (and others) from: http://math.nist.gov/MatrixMarket/ or sherman3.mtx This (and others) from: http://math.nist.gov/MatrixMarket/ or
NONE http://www.cise.ufl.edu/research/sparse/matrices/index.html NONE http://www.cise.ufl.edu/research/sparse/matrices/index.html
MM File format: MM: Matrix Market HB: Harwell-Boeing. MM File format: MM: Matrix Market HB: Harwell-Boeing.
BICGSTAB Iterative method: BiCGSTAB CGS RGMRES BiCGSTABL BICG CG BICGSTAB Iterative method: BiCGSTAB CGS RGMRES BiCGSTABL BICG CG

@ -405,7 +405,7 @@ contains
else if ((psb_tolower(type) == 'real').and.(psb_tolower(sym) == 'symmetric')) then else if ((psb_tolower(type) == 'real').and.(psb_tolower(sym) == 'symmetric')) then
! we are generally working with non-symmetric matrices, so ! we are generally working with non-symmetric matrices, so
! we de-symmetrize what we are about to read ! we de-symmetrize what we are about to read
call acoo%allocate(nrow,ncol,nnzero) call acoo%allocate(nrow,ncol,2*nnzero)
do i=1,nnzero do i=1,nnzero
read(infile,fmt=*,end=902) acoo%ia(i),acoo%ja(i),acoo%val(i) read(infile,fmt=*,end=902) acoo%ia(i),acoo%ja(i),acoo%val(i)
end do end do
@ -559,7 +559,7 @@ contains
else if ((psb_tolower(type) == 'real').and.(psb_tolower(sym) == 'symmetric')) then else if ((psb_tolower(type) == 'real').and.(psb_tolower(sym) == 'symmetric')) then
! we are generally working with non-symmetric matrices, so ! we are generally working with non-symmetric matrices, so
! we de-symmetrize what we are about to read ! we de-symmetrize what we are about to read
call acoo%allocate(nrow,ncol,nnzero) call acoo%allocate(nrow,ncol,2*nnzero)
do i=1,nnzero do i=1,nnzero
read(infile,fmt=*,end=902) acoo%ia(i),acoo%ja(i),acoo%val(i) read(infile,fmt=*,end=902) acoo%ia(i),acoo%ja(i),acoo%val(i)
end do end do
@ -712,7 +712,7 @@ contains
else if ((psb_tolower(type) == 'complex').and.(psb_tolower(sym) == 'symmetric')) then else if ((psb_tolower(type) == 'complex').and.(psb_tolower(sym) == 'symmetric')) then
! we are generally working with non-symmetric matrices, so ! we are generally working with non-symmetric matrices, so
! we de-symmetrize what we are about to read ! we de-symmetrize what we are about to read
call acoo%allocate(nrow,ncol,nnzero) call acoo%allocate(nrow,ncol,2*nnzero)
do i=1,nnzero do i=1,nnzero
read(infile,fmt=*,end=902) acoo%ia(i),acoo%ja(i),are,aim read(infile,fmt=*,end=902) acoo%ia(i),acoo%ja(i),are,aim
acoo%val(i) = cmplx(are,aim,kind=psb_spk_) acoo%val(i) = cmplx(are,aim,kind=psb_spk_)
@ -735,7 +735,7 @@ contains
else if ((psb_tolower(type) == 'complex').and.(psb_tolower(sym) == 'hermitian')) then else if ((psb_tolower(type) == 'complex').and.(psb_tolower(sym) == 'hermitian')) then
! we are generally working with non-symmetric matrices, so ! we are generally working with non-symmetric matrices, so
! we de-symmetrize what we are about to read ! we de-symmetrize what we are about to read
call acoo%allocate(nrow,ncol,nnzero) call acoo%allocate(nrow,ncol,2*nnzero)
do i=1,nnzero do i=1,nnzero
read(infile,fmt=*,end=902) acoo%ia(i),acoo%ja(i),are,aim read(infile,fmt=*,end=902) acoo%ia(i),acoo%ja(i),are,aim
acoo%val(i) = cmplx(are,aim,kind=psb_spk_) acoo%val(i) = cmplx(are,aim,kind=psb_spk_)
@ -889,7 +889,7 @@ contains
else if ((psb_tolower(type) == 'complex').and.(psb_tolower(sym) == 'symmetric')) then else if ((psb_tolower(type) == 'complex').and.(psb_tolower(sym) == 'symmetric')) then
! we are generally working with non-symmetric matrices, so ! we are generally working with non-symmetric matrices, so
! we de-symmetrize what we are about to read ! we de-symmetrize what we are about to read
call acoo%allocate(nrow,ncol,nnzero) call acoo%allocate(nrow,ncol,2*nnzero)
do i=1,nnzero do i=1,nnzero
read(infile,fmt=*,end=902) acoo%ia(i),acoo%ja(i),are,aim read(infile,fmt=*,end=902) acoo%ia(i),acoo%ja(i),are,aim
acoo%val(i) = cmplx(are,aim,kind=psb_dpk_) acoo%val(i) = cmplx(are,aim,kind=psb_dpk_)
@ -912,7 +912,7 @@ contains
else if ((psb_tolower(type) == 'complex').and.(psb_tolower(sym) == 'hermitian')) then else if ((psb_tolower(type) == 'complex').and.(psb_tolower(sym) == 'hermitian')) then
! we are generally working with non-symmetric matrices, so ! we are generally working with non-symmetric matrices, so
! we de-symmetrize what we are about to read ! we de-symmetrize what we are about to read
call acoo%allocate(nrow,ncol,nnzero) call acoo%allocate(nrow,ncol,2*nnzero)
do i=1,nnzero do i=1,nnzero
read(infile,fmt=*,end=902) acoo%ia(i),acoo%ja(i),are,aim read(infile,fmt=*,end=902) acoo%ia(i),acoo%ja(i),are,aim
acoo%val(i) = cmplx(are,aim,kind=psb_dpk_) acoo%val(i) = cmplx(are,aim,kind=psb_dpk_)

Loading…
Cancel
Save