*** empty log message ***

psblas3-final
Salvatore Filippone 13 years ago
parent 830cdfffdf
commit 3a1b28a28e

@ -45,7 +45,7 @@
! dupl - integer What to do with duplicates: ! dupl - integer What to do with duplicates:
! psb_dupl_ovwrt_ overwrite ! psb_dupl_ovwrt_ overwrite
! psb_dupl_add_ add ! psb_dupl_add_ add
subroutine psb_iinsvi(m, irw, val, x, desc_a, info, dupl) subroutine psb_iinsvi(m, irw, val, x, desc_a, info, dupl,local)
use psb_base_mod, psb_protect_name => psb_iinsvi use psb_base_mod, psb_protect_name => psb_iinsvi
use psi_mod use psi_mod
implicit none implicit none
@ -62,12 +62,14 @@ subroutine psb_iinsvi(m, irw, val, x, desc_a, info, dupl)
type(psb_desc_type), intent(in) :: desc_a type(psb_desc_type), intent(in) :: desc_a
integer(psb_ipk_), intent(out) :: info integer(psb_ipk_), intent(out) :: info
integer(psb_ipk_), optional, intent(in) :: dupl integer(psb_ipk_), optional, intent(in) :: dupl
logical, intent(in), optional :: local
!locals..... !locals.....
integer(psb_ipk_) :: ictxt,i,& integer(psb_ipk_) :: ictxt,i,&
& loc_rows,loc_cols,mglob,err_act, int_err(5) & loc_rows,loc_cols,mglob,err_act, int_err(5)
integer(psb_ipk_) :: np, me, dupl_ integer(psb_ipk_) :: np, me, dupl_
integer(psb_ipk_), allocatable :: irl(:) integer(psb_ipk_), allocatable :: irl(:)
logical :: local_
character(len=20) :: name character(len=20) :: name
if(psb_get_errstatus() /= 0) return if(psb_get_errstatus() /= 0) return
@ -127,9 +129,17 @@ subroutine psb_iinsvi(m, irw, val, x, desc_a, info, dupl)
else else
dupl_ = psb_dupl_ovwrt_ dupl_ = psb_dupl_ovwrt_
endif endif
if (present(local)) then
local_ = local
else
local_ = .false.
endif
call psi_idx_cnv(m,irw,irl,desc_a,info,owned=.true.) if (local_) then
irl(1:m) = irw(1:m)
else
call psi_idx_cnv(m,irw,irl,desc_a,info,owned=.true.)
end if
select case(dupl_) select case(dupl_)
case(psb_dupl_ovwrt_) case(psb_dupl_ovwrt_)
do i = 1, m do i = 1, m
@ -225,7 +235,7 @@ end subroutine psb_iinsvi
! dupl - integer What to do with duplicates: ! dupl - integer What to do with duplicates:
! psb_dupl_ovwrt_ overwrite ! psb_dupl_ovwrt_ overwrite
! psb_dupl_add_ add ! psb_dupl_add_ add
subroutine psb_iinsi(m, irw, val, x, desc_a, info, dupl) subroutine psb_iinsi(m, irw, val, x, desc_a, info, dupl,local)
use psb_base_mod, psb_protect_name => psb_iinsi use psb_base_mod, psb_protect_name => psb_iinsi
use psi_mod use psi_mod
implicit none implicit none
@ -243,12 +253,14 @@ subroutine psb_iinsi(m, irw, val, x, desc_a, info, dupl)
type(psb_desc_type), intent(in) :: desc_a type(psb_desc_type), intent(in) :: desc_a
integer(psb_ipk_), intent(out) :: info integer(psb_ipk_), intent(out) :: info
integer(psb_ipk_), optional, intent(in) :: dupl integer(psb_ipk_), optional, intent(in) :: dupl
logical, intent(in), optional :: local
!locals..... !locals.....
integer(psb_ipk_) :: ictxt,i,loc_row,j,n,& integer(psb_ipk_) :: ictxt,i,loc_row,j,n,&
& loc_rows,loc_cols,mglob,err_act, int_err(5) & loc_rows,loc_cols,mglob,err_act, int_err(5)
integer(psb_ipk_) :: np,me,dupl_ integer(psb_ipk_) :: np,me,dupl_
integer(psb_ipk_), allocatable :: irl(:) integer(psb_ipk_), allocatable :: irl(:)
logical :: local_
character(len=20) :: name character(len=20) :: name
if(psb_get_errstatus() /= 0) return if(psb_get_errstatus() /= 0) return
@ -311,7 +323,17 @@ subroutine psb_iinsi(m, irw, val, x, desc_a, info, dupl)
goto 9999 goto 9999
endif endif
call psi_idx_cnv(m,irw,irl,desc_a,info,owned=.true.) if (present(local)) then
local_ = local
else
local_ = .false.
endif
if (local_) then
irl(1:m) = irw(1:m)
else
call psi_idx_cnv(m,irw,irl,desc_a,info,owned=.true.)
end if
select case(dupl_) select case(dupl_)
case(psb_dupl_ovwrt_) case(psb_dupl_ovwrt_)

Loading…
Cancel
Save