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

psblas2-dev:

Browse Source 
base/serial/psb_dspcnv.f90
 base/serial/psb_zspcnv.f90

Merged fix trimming of sparse matrices in assembly.
This commit is contained in:
Salvatore Filippone
2008-04-28 10:08:20 +00:00
parent a435bbda7e
commit 098bb7ea04
2 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
base/serial/psb_dspcnv.f90
+7 -2
View File
@@ -350,8 +350,9 @@ subroutine psb_dspcnv2(a, b,info,afmt,upd,dupl)
end select
if (psb_sp_getifld(psb_upd_,b,info) /= psb_upd_perm_) &
& call psb_sp_trim(b,info)
if (psb_sp_getifld(psb_upd_,b,info) /= psb_upd_perm_) then
call psb_sp_trim(b,info)
end if
call psb_sp_setifld(psb_spmat_asb_,psb_state_,b,info)
@@ -462,18 +463,22 @@ subroutine psb_dspcnv1(a, info, afmt, upd, dupl)
select case(psb_tolower(afmt))
case('coo')
call psb_fixcoo(a,info)
call psb_sp_trim(a,info)
goto 9998
case('csr')
call psb_ipcoo2csr(a,info)
call psb_sp_trim(a,info)
goto 9998
case('csc')
call psb_ipcoo2csc(a,info)
call psb_sp_trim(a,info)
goto 9998
end select
case('csr')
select case(psb_tolower(afmt))
case('coo')
call psb_ipcsr2coo(a,info)
call psb_sp_trim(a,info)
goto 9998
end select
end select
base/serial/psb_zspcnv.f90
+7 -2
View File
@@ -350,8 +350,9 @@ subroutine psb_zspcnv2(a, b,info,afmt,upd,dupl)
end select
if (psb_sp_getifld(psb_upd_,b,info) /= psb_upd_perm_) &
& call psb_sp_trim(b,info)
if (psb_sp_getifld(psb_upd_,b,info) /= psb_upd_perm_) then
call psb_sp_trim(b,info)
end if
call psb_sp_setifld(psb_spmat_asb_,psb_state_,b,info)
@@ -462,18 +463,22 @@ subroutine psb_zspcnv1(a, info, afmt, upd, dupl)
select case(psb_tolower(afmt))
case('coo')
call psb_fixcoo(a,info)
call psb_sp_trim(a,info)
goto 9998
case('csr')
call psb_ipcoo2csr(a,info)
call psb_sp_trim(a,info)
goto 9998
case('csc')
call psb_ipcoo2csc(a,info)
call psb_sp_trim(a,info)
goto 9998
end select
case('csr')
select case(psb_tolower(afmt))
case('coo')
call psb_ipcsr2coo(a,info)
call psb_sp_trim(a,info)
goto 9998
end select
end select