psblas2-dev:

base/serial/psb_dspcnv.f90
 base/serial/psb_zspcnv.f90
 base/tools/psb_dsphalo.F90
 base/tools/psb_zsphalo.F90

Fix spcnv with tolower. 
Fix bad initialization of a%m,a%k in sphalo.
psblas3-type-indexed
Salvatore Filippone 17 years ago
parent 62c02b93a5
commit 05983fc8c2

@ -98,7 +98,7 @@ subroutine psb_dspcnv2(a, b,info,afmt,upd,dupl)
call psb_sp_setifld(dupl,psb_dupl_,b,info) call psb_sp_setifld(dupl,psb_dupl_,b,info)
end if end if
if (present(afmt)) then if (present(afmt)) then
afmt_ = afmt afmt_ = psb_tolower(afmt)
else else
afmt_ = psb_fidef_ afmt_ = psb_fidef_
end if end if
@ -126,7 +126,7 @@ subroutine psb_dspcnv2(a, b,info,afmt,upd,dupl)
! ...matrix conversion... ! ...matrix conversion...
b%m=a%m b%m=a%m
b%k=a%k b%k=a%k
b%fida=afmt_ b%fida=psb_tolower(afmt_)
size_req = psb_sp_get_nnzeros(a) size_req = psb_sp_get_nnzeros(a)
! !
n_row=b%m n_row=b%m

@ -98,7 +98,7 @@ subroutine psb_zspcnv2(a, b,info,afmt,upd,dupl)
call psb_sp_setifld(dupl,psb_dupl_,b,info) call psb_sp_setifld(dupl,psb_dupl_,b,info)
end if end if
if (present(afmt)) then if (present(afmt)) then
afmt_ = afmt afmt_ = psb_tolower(afmt)
else else
afmt_ = psb_fidef_ afmt_ = psb_fidef_
end if end if
@ -126,7 +126,7 @@ subroutine psb_zspcnv2(a, b,info,afmt,upd,dupl)
! ...matrix conversion... ! ...matrix conversion...
b%m=a%m b%m=a%m
b%k=a%k b%k=a%k
b%fida=afmt_ b%fida=psb_tolower(afmt_)
size_req = psb_sp_get_nnzeros(a) size_req = psb_sp_get_nnzeros(a)
! !
n_row=b%m n_row=b%m

@ -338,13 +338,13 @@ Subroutine psb_dsphalo(a,desc_a,blk,info,rowcnv,colcnv,&
End If End If
Enddo Enddo
if (rowscale_) then if (rowscale_) then
blk%m = irmax-irmin+1 blk%m = max(irmax-irmin+1,0)
blk%ia1(1:l1) = blk%ia1(1:l1) - irmin + 1 blk%ia1(1:l1) = blk%ia1(1:l1) - irmin + 1
else else
blk%m = irmax blk%m = irmax
end if end if
if (colscale_) then if (colscale_) then
blk%k = icmax-icmin+1 blk%k = max(icmax-icmin+1,0)
blk%ia2(1:l1) = blk%ia2(1:l1) - icmin + 1 blk%ia2(1:l1) = blk%ia2(1:l1) - icmin + 1
else else
blk%k = icmax blk%k = icmax

@ -337,13 +337,13 @@ Subroutine psb_zsphalo(a,desc_a,blk,info,rowcnv,colcnv,&
End If End If
Enddo Enddo
if (rowscale_) then if (rowscale_) then
blk%m = irmax-irmin+1 blk%m = max(irmax-irmin+1,0)
blk%ia1(1:l1) = blk%ia1(1:l1) - irmin + 1 blk%ia1(1:l1) = blk%ia1(1:l1) - irmin + 1
else else
blk%m = irmax blk%m = irmax
end if end if
if (colscale_) then if (colscale_) then
blk%k = icmax-icmin+1 blk%k = max(icmax-icmin+1,0)
blk%ia2(1:l1) = blk%ia2(1:l1) - icmin + 1 blk%ia2(1:l1) = blk%ia2(1:l1) - icmin + 1
else else
blk%k = icmax blk%k = icmax

Loading…
Cancel
Save