psblas2-dev:

base/serial/psb_dspcnv.f90
 base/serial/psb_zspcnv.f90

Merged fix trimming of sparse matrices in assembly.
psblas3-type-indexed
Salvatore Filippone 17 years ago
parent a435bbda7e
commit 098bb7ea04

@ -350,8 +350,9 @@ subroutine psb_dspcnv2(a, b,info,afmt,upd,dupl)
end select end select
if (psb_sp_getifld(psb_upd_,b,info) /= psb_upd_perm_) & if (psb_sp_getifld(psb_upd_,b,info) /= psb_upd_perm_) then
& call psb_sp_trim(b,info) call psb_sp_trim(b,info)
end if
call psb_sp_setifld(psb_spmat_asb_,psb_state_,b,info) 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)) select case(psb_tolower(afmt))
case('coo') case('coo')
call psb_fixcoo(a,info) call psb_fixcoo(a,info)
call psb_sp_trim(a,info)
goto 9998 goto 9998
case('csr') case('csr')
call psb_ipcoo2csr(a,info) call psb_ipcoo2csr(a,info)
call psb_sp_trim(a,info)
goto 9998 goto 9998
case('csc') case('csc')
call psb_ipcoo2csc(a,info) call psb_ipcoo2csc(a,info)
call psb_sp_trim(a,info)
goto 9998 goto 9998
end select end select
case('csr') case('csr')
select case(psb_tolower(afmt)) select case(psb_tolower(afmt))
case('coo') case('coo')
call psb_ipcsr2coo(a,info) call psb_ipcsr2coo(a,info)
call psb_sp_trim(a,info)
goto 9998 goto 9998
end select end select
end select end select

@ -350,8 +350,9 @@ subroutine psb_zspcnv2(a, b,info,afmt,upd,dupl)
end select end select
if (psb_sp_getifld(psb_upd_,b,info) /= psb_upd_perm_) & if (psb_sp_getifld(psb_upd_,b,info) /= psb_upd_perm_) then
& call psb_sp_trim(b,info) call psb_sp_trim(b,info)
end if
call psb_sp_setifld(psb_spmat_asb_,psb_state_,b,info) 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)) select case(psb_tolower(afmt))
case('coo') case('coo')
call psb_fixcoo(a,info) call psb_fixcoo(a,info)
call psb_sp_trim(a,info)
goto 9998 goto 9998
case('csr') case('csr')
call psb_ipcoo2csr(a,info) call psb_ipcoo2csr(a,info)
call psb_sp_trim(a,info)
goto 9998 goto 9998
case('csc') case('csc')
call psb_ipcoo2csc(a,info) call psb_ipcoo2csc(a,info)
call psb_sp_trim(a,info)
goto 9998 goto 9998
end select end select
case('csr') case('csr')
select case(psb_tolower(afmt)) select case(psb_tolower(afmt))
case('coo') case('coo')
call psb_ipcsr2coo(a,info) call psb_ipcsr2coo(a,info)
call psb_sp_trim(a,info)
goto 9998 goto 9998
end select end select
end select end select

Loading…
Cancel
Save