fdurastante/psblas3
1
0
Fork 0
mirror of https://github.com/sfilippone/psblas3.git synced 2026-10-20 12:52:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

psblas3:

Browse Source 
psb_c_mmio_impl.f90
 psb_d_mmio_impl.f90
 psb_s_mmio_impl.f90
 psb_z_mmio_impl.f90

Added proper error condition on read.
This commit is contained in:
Salvatore Filippone
2014-01-27 11:18:20 +00:00
parent 8c8480ea3d
commit 51c0935493
4 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
util/psb_c_mmio_impl.f90
+5 -2
View File
@@ -285,7 +285,7 @@ subroutine cmm_mat_read(a, info, iunit, filename)
! we de-symmetrize what we are about to read
call acoo%allocate(nrow,ncol,2*nnzero)
do i=1,nnzero
read(infile,fmt=*,end=902) acoo%ia(i),acoo%ja(i),are,aim
read(infile,fmt=*,end=902,err=905) acoo%ia(i),acoo%ja(i),are,aim
acoo%val(i) = cmplx(are,aim,kind=psb_spk_)
end do
nzr = nnzero
@@ -308,7 +308,7 @@ subroutine cmm_mat_read(a, info, iunit, filename)
! we de-symmetrize what we are about to read
call acoo%allocate(nrow,ncol,2*nnzero)
do i=1,nnzero
read(infile,fmt=*,end=902) acoo%ia(i),acoo%ja(i),are,aim
read(infile,fmt=*,end=902,err=905) acoo%ia(i),acoo%ja(i),are,aim
acoo%val(i) = cmplx(are,aim,kind=psb_spk_)
end do
nzr = nnzero
@@ -340,6 +340,9 @@ subroutine cmm_mat_read(a, info, iunit, filename)
902 info=902
write(psb_err_unit,*) 'READ_MATRIX: Unexpected end of file '
return
905 info=905
write(psb_err_unit,*) 'READ_MATRIX: Error at line',i
return
993 info=993
write(psb_err_unit,*) 'READ_MATRIX: Memory allocation failure'
return
util/psb_d_mmio_impl.f90
+1 -1
View File
@@ -276,7 +276,7 @@ subroutine dmm_mat_read(a, info, iunit, filename)
! we de-symmetrize what we are about to read
call acoo%allocate(nrow,ncol,2*nnzero)
do i=1,nnzero
read(infile,fmt=*,end=902) acoo%ia(i),acoo%ja(i),acoo%val(i)
read(infile,fmt=*,end=902,err=905) acoo%ia(i),acoo%ja(i),acoo%val(i)
end do
nzr = nnzero
do i=1,nnzero
util/psb_s_mmio_impl.f90
+5 -2
View File
@@ -266,7 +266,7 @@ subroutine smm_mat_read(a, info, iunit, filename)
if ((psb_tolower(type) == 'real').and.(psb_tolower(sym) == 'general')) then
call acoo%allocate(nrow,ncol,nnzero)
do i=1,nnzero
read(infile,fmt=*,end=902) acoo%ia(i),acoo%ja(i),acoo%val(i)
read(infile,fmt=*,end=902,err=905) acoo%ia(i),acoo%ja(i),acoo%val(i)
end do
call acoo%set_nzeros(nnzero)
call acoo%fix(info)
@@ -279,7 +279,7 @@ subroutine smm_mat_read(a, info, iunit, filename)
! we de-symmetrize what we are about to read
call acoo%allocate(nrow,ncol,2*nnzero)
do i=1,nnzero
read(infile,fmt=*,end=902) acoo%ia(i),acoo%ja(i),acoo%val(i)
read(infile,fmt=*,end=902,err=905) acoo%ia(i),acoo%ja(i),acoo%val(i)
end do
nzr = nnzero
do i=1,nnzero
@@ -312,6 +312,9 @@ subroutine smm_mat_read(a, info, iunit, filename)
902 info=902
write(psb_err_unit,*) 'READ_MATRIX: Unexpected end of file '
return
905 info=905
write(psb_err_unit,*) 'READ_MATRIX: Error at line',i
return
993 info=993
write(psb_err_unit,*) 'READ_MATRIX: Memory allocation failure'
return
util/psb_z_mmio_impl.f90
+5 -2
View File
@@ -270,7 +270,7 @@ subroutine zmm_mat_read(a, info, iunit, filename)
if ((psb_tolower(type) == 'complex').and.(psb_tolower(sym) == 'general')) then
call acoo%allocate(nrow,ncol,nnzero)
do i=1,nnzero
read(infile,fmt=*,end=902) acoo%ia(i),acoo%ja(i),are,aim
read(infile,fmt=*,end=902,err=905) acoo%ia(i),acoo%ja(i),are,aim
acoo%val(i) = cmplx(are,aim,kind=psb_dpk_)
end do
call acoo%set_nzeros(nnzero)
@@ -284,7 +284,7 @@ subroutine zmm_mat_read(a, info, iunit, filename)
! we de-symmetrize what we are about to read
call acoo%allocate(nrow,ncol,2*nnzero)
do i=1,nnzero
read(infile,fmt=*,end=902) acoo%ia(i),acoo%ja(i),are,aim
read(infile,fmt=*,end=902,err=905) acoo%ia(i),acoo%ja(i),are,aim
acoo%val(i) = cmplx(are,aim,kind=psb_dpk_)
end do
nzr = nnzero
@@ -339,6 +339,9 @@ subroutine zmm_mat_read(a, info, iunit, filename)
902 info=902
write(psb_err_unit,*) 'READ_MATRIX: Unexpected end of file '
return
905 info=905
write(psb_err_unit,*) 'READ_MATRIX: Error at line',i
return
993 info=993
write(psb_err_unit,*) 'READ_MATRIX: Memory allocation failure'
return