fdurastante
/
psblas3
mirror of https://github.com/sfilippone/psblas3.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

In psb_rwextd use ensure_size instead of reallocate

Browse Source
merge-paraggr-newops^2
Salvatore Filippone 5 years ago
parent 57ba8ad3e2
commit dbc20d482e
4 changed files with 64 additions and 88 deletions
Show Stats Download Patch File Download Diff File

30
base/serial/psb_crwextd.f90
Unescape Escape View File

@ -123,6 +123,7 @@ subroutine psb_cbase_rwextd(nr,a,info,b,rowscale)
ma = a%get_nrows()
na = a%get_ncols()
nza = a%get_nzeros()
select type(a)
@ -137,16 +138,12 @@ subroutine psb_cbase_rwextd(nr,a,info,b,rowscale)
select type (b)
type is (psb_c_csr_sparse_mat)
call psb_ensure_size(size(a%ja)+nzb,a%ja,info)
call psb_ensure_size(size(a%val)+nzb,a%val,info)
call psb_ensure_size(nza+nzb,a%ja,info)
call psb_ensure_size(nza+nzb,a%val,info)
a%ja(nza+1:nza+nzb) = b%ja(1:nzb)
a%val(nza+1:nza+nzb) = b%val(1:nzb)
do i=1, min(nr-ma,mb)
a%irp(ma+i+1) = a%irp(ma+i) + b%irp(i+1) - b%irp(i)
ja = a%irp(ma+i)
do jb = b%irp(i), b%irp(i+1)-1
a%val(ja) = b%val(jb)
a%ja(ja) = b%ja(jb)
ja = ja + 1
end do
end do
do j=i,nr-ma
a%irp(ma+j+1) = a%irp(ma+j)
@ -175,7 +172,7 @@ subroutine psb_cbase_rwextd(nr,a,info,b,rowscale)
mb = b%get_nrows()
nb = b%get_ncols()
nzb = b%get_nzeros()
call a%reallocate(nza+nzb)
call a%ensure_size(nza+nzb)
select type(b)
type is (psb_c_coo_sparse_mat)
@ -328,6 +325,7 @@ subroutine psb_lcbase_rwextd(nr,a,info,b,rowscale)
ma = a%get_nrows()
na = a%get_ncols()
nza = a%get_nzeros()
select type(a)
@ -342,16 +340,12 @@ subroutine psb_lcbase_rwextd(nr,a,info,b,rowscale)
select type (b)
type is (psb_lc_csr_sparse_mat)
call psb_ensure_size(size(a%ja)+nzb,a%ja,info)
call psb_ensure_size(size(a%val)+nzb,a%val,info)
call psb_ensure_size(nza+nzb,a%ja,info)
call psb_ensure_size(nza+nzb,a%val,info)
a%ja(nza+1:nza+nzb) = b%ja(1:nzb)
a%val(nza+1:nza+nzb) = b%val(1:nzb)
do i=1, min(nr-ma,mb)
a%irp(ma+i+1) = a%irp(ma+i) + b%irp(i+1) - b%irp(i)
ja = a%irp(ma+i)
do jb = b%irp(i), b%irp(i+1)-1
a%val(ja) = b%val(jb)
a%ja(ja) = b%ja(jb)
ja = ja + 1
end do
end do
do j=i,nr-ma
a%irp(ma+j+1) = a%irp(ma+j)
@ -380,7 +374,7 @@ subroutine psb_lcbase_rwextd(nr,a,info,b,rowscale)
mb = b%get_nrows()
nb = b%get_ncols()
nzb = b%get_nzeros()
call a%reallocate(nza+nzb)
call a%ensure_size(nza+nzb)
select type(b)
type is (psb_lc_coo_sparse_mat)

30
base/serial/psb_drwextd.f90
Unescape Escape View File

@ -123,6 +123,7 @@ subroutine psb_dbase_rwextd(nr,a,info,b,rowscale)
ma = a%get_nrows()
na = a%get_ncols()
nza = a%get_nzeros()
select type(a)
@ -137,16 +138,12 @@ subroutine psb_dbase_rwextd(nr,a,info,b,rowscale)
select type (b)
type is (psb_d_csr_sparse_mat)
call psb_ensure_size(size(a%ja)+nzb,a%ja,info)
call psb_ensure_size(size(a%val)+nzb,a%val,info)
call psb_ensure_size(nza+nzb,a%ja,info)
call psb_ensure_size(nza+nzb,a%val,info)
a%ja(nza+1:nza+nzb) = b%ja(1:nzb)
a%val(nza+1:nza+nzb) = b%val(1:nzb)
do i=1, min(nr-ma,mb)
a%irp(ma+i+1) = a%irp(ma+i) + b%irp(i+1) - b%irp(i)
ja = a%irp(ma+i)
do jb = b%irp(i), b%irp(i+1)-1
a%val(ja) = b%val(jb)
a%ja(ja) = b%ja(jb)
ja = ja + 1
end do
end do
do j=i,nr-ma
a%irp(ma+j+1) = a%irp(ma+j)
@ -175,7 +172,7 @@ subroutine psb_dbase_rwextd(nr,a,info,b,rowscale)
mb = b%get_nrows()
nb = b%get_ncols()
nzb = b%get_nzeros()
call a%reallocate(nza+nzb)
call a%ensure_size(nza+nzb)
select type(b)
type is (psb_d_coo_sparse_mat)
@ -328,6 +325,7 @@ subroutine psb_ldbase_rwextd(nr,a,info,b,rowscale)
ma = a%get_nrows()
na = a%get_ncols()
nza = a%get_nzeros()
select type(a)
@ -342,16 +340,12 @@ subroutine psb_ldbase_rwextd(nr,a,info,b,rowscale)
select type (b)
type is (psb_ld_csr_sparse_mat)
call psb_ensure_size(size(a%ja)+nzb,a%ja,info)
call psb_ensure_size(size(a%val)+nzb,a%val,info)
call psb_ensure_size(nza+nzb,a%ja,info)
call psb_ensure_size(nza+nzb,a%val,info)
a%ja(nza+1:nza+nzb) = b%ja(1:nzb)
a%val(nza+1:nza+nzb) = b%val(1:nzb)
do i=1, min(nr-ma,mb)
a%irp(ma+i+1) = a%irp(ma+i) + b%irp(i+1) - b%irp(i)
ja = a%irp(ma+i)
do jb = b%irp(i), b%irp(i+1)-1
a%val(ja) = b%val(jb)
a%ja(ja) = b%ja(jb)
ja = ja + 1
end do
end do
do j=i,nr-ma
a%irp(ma+j+1) = a%irp(ma+j)
@ -380,7 +374,7 @@ subroutine psb_ldbase_rwextd(nr,a,info,b,rowscale)
mb = b%get_nrows()
nb = b%get_ncols()
nzb = b%get_nzeros()
call a%reallocate(nza+nzb)
call a%ensure_size(nza+nzb)
select type(b)
type is (psb_ld_coo_sparse_mat)

30
base/serial/psb_srwextd.f90
Unescape Escape View File

@ -123,6 +123,7 @@ subroutine psb_sbase_rwextd(nr,a,info,b,rowscale)
ma = a%get_nrows()
na = a%get_ncols()
nza = a%get_nzeros()
select type(a)
@ -137,16 +138,12 @@ subroutine psb_sbase_rwextd(nr,a,info,b,rowscale)
select type (b)
type is (psb_s_csr_sparse_mat)
call psb_ensure_size(size(a%ja)+nzb,a%ja,info)
call psb_ensure_size(size(a%val)+nzb,a%val,info)
call psb_ensure_size(nza+nzb,a%ja,info)
call psb_ensure_size(nza+nzb,a%val,info)
a%ja(nza+1:nza+nzb) = b%ja(1:nzb)
a%val(nza+1:nza+nzb) = b%val(1:nzb)
do i=1, min(nr-ma,mb)
a%irp(ma+i+1) = a%irp(ma+i) + b%irp(i+1) - b%irp(i)
ja = a%irp(ma+i)
do jb = b%irp(i), b%irp(i+1)-1
a%val(ja) = b%val(jb)
a%ja(ja) = b%ja(jb)
ja = ja + 1
end do
end do
do j=i,nr-ma
a%irp(ma+j+1) = a%irp(ma+j)
@ -175,7 +172,7 @@ subroutine psb_sbase_rwextd(nr,a,info,b,rowscale)
mb = b%get_nrows()
nb = b%get_ncols()
nzb = b%get_nzeros()
call a%reallocate(nza+nzb)
call a%ensure_size(nza+nzb)
select type(b)
type is (psb_s_coo_sparse_mat)
@ -328,6 +325,7 @@ subroutine psb_lsbase_rwextd(nr,a,info,b,rowscale)
ma = a%get_nrows()
na = a%get_ncols()
nza = a%get_nzeros()
select type(a)
@ -342,16 +340,12 @@ subroutine psb_lsbase_rwextd(nr,a,info,b,rowscale)
select type (b)
type is (psb_ls_csr_sparse_mat)
call psb_ensure_size(size(a%ja)+nzb,a%ja,info)
call psb_ensure_size(size(a%val)+nzb,a%val,info)
call psb_ensure_size(nza+nzb,a%ja,info)
call psb_ensure_size(nza+nzb,a%val,info)
a%ja(nza+1:nza+nzb) = b%ja(1:nzb)
a%val(nza+1:nza+nzb) = b%val(1:nzb)
do i=1, min(nr-ma,mb)
a%irp(ma+i+1) = a%irp(ma+i) + b%irp(i+1) - b%irp(i)
ja = a%irp(ma+i)
do jb = b%irp(i), b%irp(i+1)-1
a%val(ja) = b%val(jb)
a%ja(ja) = b%ja(jb)
ja = ja + 1
end do
end do
do j=i,nr-ma
a%irp(ma+j+1) = a%irp(ma+j)
@ -380,7 +374,7 @@ subroutine psb_lsbase_rwextd(nr,a,info,b,rowscale)
mb = b%get_nrows()
nb = b%get_ncols()
nzb = b%get_nzeros()
call a%reallocate(nza+nzb)
call a%ensure_size(nza+nzb)
select type(b)
type is (psb_ls_coo_sparse_mat)

30
base/serial/psb_zrwextd.f90
Unescape Escape View File

@ -123,6 +123,7 @@ subroutine psb_zbase_rwextd(nr,a,info,b,rowscale)
ma = a%get_nrows()
na = a%get_ncols()
nza = a%get_nzeros()
select type(a)
@ -137,16 +138,12 @@ subroutine psb_zbase_rwextd(nr,a,info,b,rowscale)
select type (b)
type is (psb_z_csr_sparse_mat)
call psb_ensure_size(size(a%ja)+nzb,a%ja,info)
call psb_ensure_size(size(a%val)+nzb,a%val,info)
call psb_ensure_size(nza+nzb,a%ja,info)
call psb_ensure_size(nza+nzb,a%val,info)
a%ja(nza+1:nza+nzb) = b%ja(1:nzb)
a%val(nza+1:nza+nzb) = b%val(1:nzb)
do i=1, min(nr-ma,mb)
a%irp(ma+i+1) = a%irp(ma+i) + b%irp(i+1) - b%irp(i)
ja = a%irp(ma+i)
do jb = b%irp(i), b%irp(i+1)-1
a%val(ja) = b%val(jb)
a%ja(ja) = b%ja(jb)
ja = ja + 1
end do
end do
do j=i,nr-ma
a%irp(ma+j+1) = a%irp(ma+j)
@ -175,7 +172,7 @@ subroutine psb_zbase_rwextd(nr,a,info,b,rowscale)
mb = b%get_nrows()
nb = b%get_ncols()
nzb = b%get_nzeros()
call a%reallocate(nza+nzb)
call a%ensure_size(nza+nzb)
select type(b)
type is (psb_z_coo_sparse_mat)
@ -328,6 +325,7 @@ subroutine psb_lzbase_rwextd(nr,a,info,b,rowscale)
ma = a%get_nrows()
na = a%get_ncols()
nza = a%get_nzeros()
select type(a)
@ -342,16 +340,12 @@ subroutine psb_lzbase_rwextd(nr,a,info,b,rowscale)
select type (b)
type is (psb_lz_csr_sparse_mat)
call psb_ensure_size(size(a%ja)+nzb,a%ja,info)
call psb_ensure_size(size(a%val)+nzb,a%val,info)
call psb_ensure_size(nza+nzb,a%ja,info)
call psb_ensure_size(nza+nzb,a%val,info)
a%ja(nza+1:nza+nzb) = b%ja(1:nzb)
a%val(nza+1:nza+nzb) = b%val(1:nzb)
do i=1, min(nr-ma,mb)
a%irp(ma+i+1) = a%irp(ma+i) + b%irp(i+1) - b%irp(i)
ja = a%irp(ma+i)
do jb = b%irp(i), b%irp(i+1)-1
a%val(ja) = b%val(jb)
a%ja(ja) = b%ja(jb)
ja = ja + 1
end do
end do
do j=i,nr-ma
a%irp(ma+j+1) = a%irp(ma+j)
@ -380,7 +374,7 @@ subroutine psb_lzbase_rwextd(nr,a,info,b,rowscale)
mb = b%get_nrows()
nb = b%get_ncols()
nzb = b%get_nzeros()
call a%reallocate(nza+nzb)
call a%ensure_size(nza+nzb)
select type(b)
type is (psb_lz_coo_sparse_mat)

Write Preview
Loading…
Cancel
Save