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

Fixed usage of psb_spcnv.

Browse Source
This commit is contained in:
Salvatore Filippone
2007-09-20 08:58:05 +00:00
parent 6fdc3c2c0e
commit 031c0a6007
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
util/psb_hbio_mod.f90
+6 -6
View File
@@ -124,7 +124,7 @@ contains
if (info == 0) read (infile,fmt=rhsfmt) (b(i),i=1,nrow)
endif
call psb_ipcsr2coo(a,ircode)
call psb_spcnv(a,ircode,afmt='csr')
if (ircode /= 0) goto 993
call psb_sp_reall(a,2*nnzero,ircode)
@@ -139,7 +139,7 @@ contains
end if
end do
a%infoa(psb_nnz_) = nzr
call psb_ipcoo2csr(a,ircode)
call psb_spcnv(a,ircode,afmt='csr')
if (ircode /= 0) goto 993
else
@@ -384,7 +384,7 @@ contains
endif
call psb_ipcsr2coo(a,ircode)
call psb_spcnv(a,ircode,afmt='coo')
if (ircode /= 0) then
write(0,*) 'ipcsr2coo ',ircode
goto 993
@@ -408,7 +408,7 @@ contains
end if
end do
a%infoa(psb_nnz_) = nzr
call psb_ipcoo2csr(a,ircode)
call psb_spcnv(a,ircode,afmt='csr')
if (ircode /= 0) then
write(0,*) 'ipcoo2csr ',ircode
goto 993
@@ -439,7 +439,7 @@ contains
if (info == 0) read (infile,fmt=rhsfmt) (b(i),i=1,nrow)
endif
call psb_ipcsr2coo(a,ircode)
call psb_spcnv(a,ircode,afmt='coo')
if (ircode /= 0) then
write(0,*) 'ipcsr2coo ',ircode
goto 993
@@ -462,7 +462,7 @@ contains
end if
end do
a%infoa(psb_nnz_) = nzr
call psb_ipcoo2csr(a,ircode)
call psb_spcnv(a,ircode,afmt='csr')
if (ircode /= 0) then
write(0,*) 'ipcoo2csr ',ircode
goto 993
util/psb_mmio_mod.f90
+5 -5
View File
@@ -100,7 +100,7 @@ contains
read(infile,fmt=*,end=902) a%ia1(i),a%ia2(i),a%aspk(i)
end do
a%infoa(psb_nnz_) = nnzero
call psb_ipcoo2csr(a,ircode)
call psb_spcnv(a,ircode,afmt='csr')
else if ((tolower(type) == 'real').and.(tolower(sym) == 'symmetric')) then
! we are generally working with non-symmetric matrices, so
@@ -123,7 +123,7 @@ contains
end if
end do
a%infoa(psb_nnz_) = nzr
call psb_ipcoo2csr(a,ircode)
call psb_spcnv(a,ircode,afmt='csr')
else
write(0,*) 'read_matrix: matrix type not yet supported'
@@ -259,7 +259,7 @@ contains
end do
a%infoa(psb_nnz_) = nnzero
call psb_ipcoo2csr(a,ircode)
call psb_spcnv(a,ircode,afmt='csr')
else if ((tolower(type) == 'complex').and.(tolower(sym) == 'symmetric')) then
! we are generally working with non-symmetric matrices, so
@@ -283,7 +283,7 @@ contains
end if
end do
a%infoa(psb_nnz_) = nzr
call psb_ipcoo2csr(a,ircode)
call psb_spcnv(a,ircode,afmt='csr')
else if ((tolower(type) == 'complex').and.(tolower(sym) == 'hermitian')) then
! we are generally working with non-symmetric matrices, so
@@ -307,7 +307,7 @@ contains
end if
end do
a%infoa(psb_nnz_) = nzr
call psb_ipcoo2csr(a,ircode)
call psb_spcnv(a,ircode,afmt='csr')
else
write(0,*) 'read_matrix: matrix type not yet supported'