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

psblas2-dev/base:

Browse Source 
modules/psb_spmat_type.f90
 serial/psb_dipcoo2csc.f90
 serial/psb_zipcoo2csc.f90

Fixed handling of trim for CSC (needed for UMFPACK).
This commit is contained in:
Salvatore Filippone
2008-05-08 09:06:15 +00:00
parent 05983fc8c2
commit afe8e6bdbc
3 changed files with 32 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
base/modules/psb_spmat_type.f90
+10
View File
@@ -751,6 +751,11 @@ contains
ia = nza
i1 = nza
i2 = a%m + 1
case('csc')
nza = a%ia2(a%k+1)-1
ia = nza
i1 = nza
i2 = a%k + 1
case('coo','coi')
nza = a%infoa(psb_nnz_)
i1 = nza
@@ -1238,6 +1243,11 @@ contains
ia = nza
i1 = nza
i2 = a%m + 1
case('csc')
nza = a%ia2(a%k+1)-1
ia = nza
i1 = nza
i2 = a%k + 1
case('coo','coi')
nza = a%infoa(psb_nnz_)
i1 = nza
base/serial/psb_dipcoo2csc.f90
+11 -4
View File
@@ -76,9 +76,11 @@ subroutine psb_dipcoo2csc(a,info,clshr)
end if
call psb_fixcoo(a,info,idir=1)
nc = a%k
nza = a%infoa(psb_nnz_)
allocate(iaux(max(nc+1,1)),stat=info)
if (info == 0) then
nc = a%k
nza = a%infoa(psb_nnz_)
allocate(iaux(max(nc+1,1)),stat=info)
end if
if (info /= 0) then
info=4025
call psb_errpush(info,name,a_err='integer',i_err=(/max(nc+1,1),0,0,0,0/))
@@ -88,7 +90,12 @@ subroutine psb_dipcoo2csc(a,info,clshr)
& ': out of fixcoo',nza,nc,size(a%ia2),size(iaux)
call psb_transfer(a%ia2,itemp,info)
call psb_transfer(iaux,a%ia2,info)
if (info == 0) call psb_transfer(iaux,a%ia2,info)
if (info /= 0) then
info=4010
call psb_errpush(info,name,a_err='psb_transfer')
goto 9999
end if
!
! This routine can be used in two modes:
base/serial/psb_zipcoo2csc.f90
+11 -4
View File
@@ -76,9 +76,11 @@ subroutine psb_zipcoo2csc(a,info,clshr)
end if
call psb_fixcoo(a,info,idir=1)
nc = a%k
nza = a%infoa(psb_nnz_)
allocate(iaux(max(nc+1,1)),stat=info)
if (info == 0) then
nc = a%k
nza = a%infoa(psb_nnz_)
allocate(iaux(max(nc+1,1)),stat=info)
end if
if (info /= 0) then
info=4025
call psb_errpush(info,name,a_err='integer',i_err=(/max(nc+1,1),0,0,0,0/))
@@ -88,7 +90,12 @@ subroutine psb_zipcoo2csc(a,info,clshr)
& ': out of fixcoo',nza,nc,size(a%ia2),size(iaux)
call psb_transfer(a%ia2,itemp,info)
call psb_transfer(iaux,a%ia2,info)
if (info == 0) call psb_transfer(iaux,a%ia2,info)
if (info /= 0) then
info=4010
call psb_errpush(info,name,a_err='psb_transfer')
goto 9999
end if
!
! This routine can be used in two modes: