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

psblas3:

Browse Source 
psb_d_cxx_impl.f90
 psb_d_cxx_mat_mod.f90
 psb_d_cyy_impl.f90
 psb_d_cyy_mat_mod.f90

Fixed import of psb_ipk_
This commit is contained in:
Salvatore Filippone
2012-01-29 20:59:21 +00:00
parent 720d1ca091
commit 235f1de194
4 changed files with 37 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/serial/psb_d_cxx_impl.f90
+1 -13
View File
@@ -2331,7 +2331,7 @@ subroutine psb_d_cxx_trim(a)
end subroutine psb_d_cxx_trim
subroutine psb_d_cxx_print(iout,a,iv,eirs,eics,head,ivr,ivc)
subroutine psb_d_cxx_print(iout,a,iv,head,ivr,ivc)
use psb_base_mod
use psb_d_cxx_mat_mod, psb_protect_name => psb_d_cxx_print
implicit none
@@ -2339,7 +2339,6 @@ subroutine psb_d_cxx_print(iout,a,iv,eirs,eics,head,ivr,ivc)
integer(psb_ipk_), intent(in) :: iout
class(psb_d_cxx_sparse_mat), intent(in) :: a
integer(psb_ipk_), intent(in), optional :: iv(:)
integer(psb_ipk_), intent(in), optional :: eirs,eics
character(len=*), optional :: head
integer(psb_ipk_), intent(in), optional :: ivr(:), ivc(:)
@@ -2350,17 +2349,6 @@ subroutine psb_d_cxx_print(iout,a,iv,eirs,eics,head,ivr,ivc)
character(len=80) :: frmtv
integer(psb_ipk_) :: irs,ics,i,j, nmx, ni, nr, nc, nz
if (present(eirs)) then
irs = eirs
else
irs = 0
endif
if (present(eics)) then
ics = eics
else
ics = 0
endif
if (present(head)) then
write(iout,'(a)') '%%MatrixMarket matrix coordinate real general'
write(iout,'(a,a)') '% ',head
test/serial/psb_d_cxx_mat_mod.f90
+1 -2
View File
@@ -96,12 +96,11 @@ module psb_d_cxx_mat_mod
end interface
interface
subroutine psb_d_cxx_print(iout,a,iv,eirs,eics,head,ivr,ivc)
subroutine psb_d_cxx_print(iout,a,iv,head,ivr,ivc)
import :: psb_d_cxx_sparse_mat, psb_ipk_
integer(psb_ipk_), intent(in) :: iout
class(psb_d_cxx_sparse_mat), intent(in) :: a
integer(psb_ipk_), intent(in), optional :: iv(:)
integer(psb_ipk_), intent(in), optional :: eirs,eics
character(len=*), optional :: head
integer(psb_ipk_), intent(in), optional :: ivr(:), ivc(:)
end subroutine psb_d_cxx_print
test/serial/psb_d_cyy_impl.f90
+1 -2
View File
@@ -382,7 +382,7 @@ subroutine psb_d_cyy_trim(a)
info = psb_success_
end subroutine psb_d_cyy_trim
subroutine psb_d_cyy_print(iout,a,iv,eirs,eics,head,ivr,ivc)
subroutine psb_d_cyy_print(iout,a,iv,head,ivr,ivc)
use psb_base_mod
use psb_d_cyy_mat_mod, psb_protect_name => psb_d_cyy_print
implicit none
@@ -390,7 +390,6 @@ subroutine psb_d_cyy_print(iout,a,iv,eirs,eics,head,ivr,ivc)
integer(psb_ipk_), intent(in) :: iout
class(psb_d_cyy_sparse_mat), intent(in) :: a
integer(psb_ipk_), intent(in), optional :: iv(:)
integer(psb_ipk_), intent(in), optional :: eirs,eics
character(len=*), optional :: head
integer(psb_ipk_), intent(in), optional :: ivr(:), ivc(:)
test/serial/psb_d_cyy_mat_mod.f90
+34 -35
View File
@@ -56,7 +56,7 @@ module psb_d_cyy_mat_mod
interface
subroutine psb_d_cyy_reallocate_nz(nz,a)
import :: psb_d_cyy_sparse_mat
import :: psb_ipk_, psb_d_cyy_sparse_mat
integer(psb_ipk_), intent(in) :: nz
class(psb_d_cyy_sparse_mat), intent(inout) :: a
end subroutine psb_d_cyy_reallocate_nz
@@ -64,7 +64,7 @@ module psb_d_cyy_mat_mod
interface
subroutine psb_d_cyy_reinit(a,clear)
import :: psb_d_cyy_sparse_mat
import :: psb_ipk_, psb_d_cyy_sparse_mat
class(psb_d_cyy_sparse_mat), intent(inout) :: a
logical, intent(in), optional :: clear
end subroutine psb_d_cyy_reinit
@@ -72,14 +72,14 @@ module psb_d_cyy_mat_mod
interface
subroutine psb_d_cyy_trim(a)
import :: psb_d_cyy_sparse_mat
import :: psb_ipk_, psb_d_cyy_sparse_mat
class(psb_d_cyy_sparse_mat), intent(inout) :: a
end subroutine psb_d_cyy_trim
end interface
interface
subroutine psb_d_cyy_mold(a,b,info)
import :: psb_d_cyy_sparse_mat, psb_d_base_sparse_mat, psb_long_int_k_
import :: psb_ipk_, psb_d_cyy_sparse_mat, psb_d_base_sparse_mat, psb_long_int_k_
class(psb_d_cyy_sparse_mat), intent(in) :: a
class(psb_d_base_sparse_mat), intent(out), allocatable :: b
integer(psb_ipk_), intent(out) :: info
@@ -88,7 +88,7 @@ module psb_d_cyy_mat_mod
interface
subroutine psb_d_cyy_allocate_mnnz(m,n,a,nz)
import :: psb_d_cyy_sparse_mat
import :: psb_ipk_, psb_d_cyy_sparse_mat
integer(psb_ipk_), intent(in) :: m,n
class(psb_d_cyy_sparse_mat), intent(inout) :: a
integer(psb_ipk_), intent(in), optional :: nz
@@ -96,12 +96,11 @@ module psb_d_cyy_mat_mod
end interface
interface
subroutine psb_d_cyy_print(iout,a,iv,eirs,eics,head,ivr,ivc)
import :: psb_d_cyy_sparse_mat
subroutine psb_d_cyy_print(iout,a,iv,head,ivr,ivc)
import :: psb_ipk_, psb_d_cyy_sparse_mat
integer(psb_ipk_), intent(in) :: iout
class(psb_d_cyy_sparse_mat), intent(in) :: a
integer(psb_ipk_), intent(in), optional :: iv(:)
integer(psb_ipk_), intent(in), optional :: eirs,eics
character(len=*), optional :: head
integer(psb_ipk_), intent(in), optional :: ivr(:), ivc(:)
end subroutine psb_d_cyy_print
@@ -109,7 +108,7 @@ module psb_d_cyy_mat_mod
interface
subroutine psb_d_cp_cyy_to_coo(a,b,info)
import :: psb_d_coo_sparse_mat, psb_d_cyy_sparse_mat
import :: psb_ipk_, psb_d_coo_sparse_mat, psb_d_cyy_sparse_mat
class(psb_d_cyy_sparse_mat), intent(in) :: a
class(psb_d_coo_sparse_mat), intent(inout) :: b
integer(psb_ipk_), intent(out) :: info
@@ -118,7 +117,7 @@ module psb_d_cyy_mat_mod
interface
subroutine psb_d_cp_cyy_from_coo(a,b,info)
import :: psb_d_cyy_sparse_mat, psb_d_coo_sparse_mat
import :: psb_ipk_, psb_d_cyy_sparse_mat, psb_d_coo_sparse_mat
class(psb_d_cyy_sparse_mat), intent(inout) :: a
class(psb_d_coo_sparse_mat), intent(in) :: b
integer(psb_ipk_), intent(out) :: info
@@ -127,7 +126,7 @@ module psb_d_cyy_mat_mod
interface
subroutine psb_d_cp_cyy_to_fmt(a,b,info)
import :: psb_d_cyy_sparse_mat, psb_d_base_sparse_mat
import :: psb_ipk_, psb_d_cyy_sparse_mat, psb_d_base_sparse_mat
class(psb_d_cyy_sparse_mat), intent(in) :: a
class(psb_d_base_sparse_mat), intent(inout) :: b
integer(psb_ipk_), intent(out) :: info
@@ -136,7 +135,7 @@ module psb_d_cyy_mat_mod
interface
subroutine psb_d_cp_cyy_from_fmt(a,b,info)
import :: psb_d_cyy_sparse_mat, psb_d_base_sparse_mat
import :: psb_ipk_, psb_d_cyy_sparse_mat, psb_d_base_sparse_mat
class(psb_d_cyy_sparse_mat), intent(inout) :: a
class(psb_d_base_sparse_mat), intent(in) :: b
integer(psb_ipk_), intent(out) :: info
@@ -145,7 +144,7 @@ module psb_d_cyy_mat_mod
interface
subroutine psb_d_mv_cyy_to_coo(a,b,info)
import :: psb_d_cyy_sparse_mat, psb_d_coo_sparse_mat
import :: psb_ipk_, psb_d_cyy_sparse_mat, psb_d_coo_sparse_mat
class(psb_d_cyy_sparse_mat), intent(inout) :: a
class(psb_d_coo_sparse_mat), intent(inout) :: b
integer(psb_ipk_), intent(out) :: info
@@ -154,7 +153,7 @@ module psb_d_cyy_mat_mod
interface
subroutine psb_d_mv_cyy_from_coo(a,b,info)
import :: psb_d_cyy_sparse_mat, psb_d_coo_sparse_mat
import :: psb_ipk_, psb_d_cyy_sparse_mat, psb_d_coo_sparse_mat
class(psb_d_cyy_sparse_mat), intent(inout) :: a
class(psb_d_coo_sparse_mat), intent(inout) :: b
integer(psb_ipk_), intent(out) :: info
@@ -163,7 +162,7 @@ module psb_d_cyy_mat_mod
interface
subroutine psb_d_mv_cyy_to_fmt(a,b,info)
import :: psb_d_cyy_sparse_mat, psb_d_base_sparse_mat
import :: psb_ipk_, psb_d_cyy_sparse_mat, psb_d_base_sparse_mat
class(psb_d_cyy_sparse_mat), intent(inout) :: a
class(psb_d_base_sparse_mat), intent(inout) :: b
integer(psb_ipk_), intent(out) :: info
@@ -172,7 +171,7 @@ module psb_d_cyy_mat_mod
interface
subroutine psb_d_mv_cyy_from_fmt(a,b,info)
import :: psb_d_cyy_sparse_mat, psb_d_base_sparse_mat
import :: psb_ipk_, psb_d_cyy_sparse_mat, psb_d_base_sparse_mat
class(psb_d_cyy_sparse_mat), intent(inout) :: a
class(psb_d_base_sparse_mat), intent(inout) :: b
integer(psb_ipk_), intent(out) :: info
@@ -181,7 +180,7 @@ module psb_d_cyy_mat_mod
interface
subroutine psb_d_cyy_cp_from(a,b)
import :: psb_d_cyy_sparse_mat, psb_dpk_
import :: psb_ipk_, psb_d_cyy_sparse_mat, psb_dpk_
class(psb_d_cyy_sparse_mat), intent(inout) :: a
type(psb_d_cyy_sparse_mat), intent(in) :: b
end subroutine psb_d_cyy_cp_from
@@ -189,7 +188,7 @@ module psb_d_cyy_mat_mod
interface
subroutine psb_d_cyy_mv_from(a,b)
import :: psb_d_cyy_sparse_mat, psb_dpk_
import :: psb_ipk_, psb_d_cyy_sparse_mat, psb_dpk_
class(psb_d_cyy_sparse_mat), intent(inout) :: a
type(psb_d_cyy_sparse_mat), intent(inout) :: b
end subroutine psb_d_cyy_mv_from
@@ -198,7 +197,7 @@ module psb_d_cyy_mat_mod
interface
subroutine psb_d_cyy_csput(nz,ia,ja,val,a,imin,imax,jmin,jmax,info,gtl)
import :: psb_d_cyy_sparse_mat, psb_dpk_
import :: psb_ipk_, psb_d_cyy_sparse_mat, psb_dpk_
class(psb_d_cyy_sparse_mat), intent(inout) :: a
real(psb_dpk_), intent(in) :: val(:)
integer(psb_ipk_), intent(in) :: nz,ia(:), ja(:),&
@@ -211,7 +210,7 @@ module psb_d_cyy_mat_mod
interface
subroutine psb_d_cyy_csgetptn(imin,imax,a,nz,ia,ja,info,&
& jmin,jmax,iren,append,nzin,rscale,cscale)
import :: psb_d_cyy_sparse_mat, psb_dpk_
import :: psb_ipk_, psb_d_cyy_sparse_mat, psb_dpk_
class(psb_d_cyy_sparse_mat), intent(in) :: a
integer(psb_ipk_), intent(in) :: imin,imax
integer(psb_ipk_), intent(out) :: nz
@@ -227,7 +226,7 @@ module psb_d_cyy_mat_mod
interface
subroutine psb_d_cyy_csgetrow(imin,imax,a,nz,ia,ja,val,info,&
& jmin,jmax,iren,append,nzin,rscale,cscale)
import :: psb_d_cyy_sparse_mat, psb_dpk_
import :: psb_ipk_, psb_d_cyy_sparse_mat, psb_dpk_
class(psb_d_cyy_sparse_mat), intent(in) :: a
integer(psb_ipk_), intent(in) :: imin,imax
integer(psb_ipk_), intent(out) :: nz
@@ -244,7 +243,7 @@ module psb_d_cyy_mat_mod
interface
subroutine psb_d_cyy_csgetblk(imin,imax,a,b,info,&
& jmin,jmax,iren,append,rscale,cscale)
import :: psb_d_cyy_sparse_mat, psb_dpk_, psb_d_coo_sparse_mat
import :: psb_ipk_, psb_d_cyy_sparse_mat, psb_dpk_, psb_d_coo_sparse_mat
class(psb_d_cyy_sparse_mat), intent(in) :: a
class(psb_d_coo_sparse_mat), intent(inout) :: b
integer(psb_ipk_), intent(in) :: imin,imax
@@ -258,7 +257,7 @@ module psb_d_cyy_mat_mod
interface
subroutine psb_d_cyy_cssv(alpha,a,x,beta,y,info,trans)
import :: psb_d_cyy_sparse_mat, psb_dpk_
import :: psb_ipk_, psb_d_cyy_sparse_mat, psb_dpk_
class(psb_d_cyy_sparse_mat), intent(in) :: a
real(psb_dpk_), intent(in) :: alpha, beta, x(:)
real(psb_dpk_), intent(inout) :: y(:)
@@ -266,7 +265,7 @@ module psb_d_cyy_mat_mod
character, optional, intent(in) :: trans
end subroutine psb_d_cyy_cssv
subroutine psb_d_cyy_cssm(alpha,a,x,beta,y,info,trans)
import :: psb_d_cyy_sparse_mat, psb_dpk_
import :: psb_ipk_, psb_d_cyy_sparse_mat, psb_dpk_
class(psb_d_cyy_sparse_mat), intent(in) :: a
real(psb_dpk_), intent(in) :: alpha, beta, x(:,:)
real(psb_dpk_), intent(inout) :: y(:,:)
@@ -277,7 +276,7 @@ module psb_d_cyy_mat_mod
interface
subroutine psb_d_cyy_csmv(alpha,a,x,beta,y,info,trans)
import :: psb_d_cyy_sparse_mat, psb_dpk_
import :: psb_ipk_, psb_d_cyy_sparse_mat, psb_dpk_
class(psb_d_cyy_sparse_mat), intent(in) :: a
real(psb_dpk_), intent(in) :: alpha, beta, x(:)
real(psb_dpk_), intent(inout) :: y(:)
@@ -285,7 +284,7 @@ module psb_d_cyy_mat_mod
character, optional, intent(in) :: trans
end subroutine psb_d_cyy_csmv
subroutine psb_d_cyy_csmm(alpha,a,x,beta,y,info,trans)
import :: psb_d_cyy_sparse_mat, psb_dpk_
import :: psb_ipk_, psb_d_cyy_sparse_mat, psb_dpk_
class(psb_d_cyy_sparse_mat), intent(in) :: a
real(psb_dpk_), intent(in) :: alpha, beta, x(:,:)
real(psb_dpk_), intent(inout) :: y(:,:)
@@ -297,7 +296,7 @@ module psb_d_cyy_mat_mod
interface
function psb_d_cyy_csnmi(a) result(res)
import :: psb_d_cyy_sparse_mat, psb_dpk_
import :: psb_ipk_, psb_d_cyy_sparse_mat, psb_dpk_
class(psb_d_cyy_sparse_mat), intent(in) :: a
real(psb_dpk_) :: res
end function psb_d_cyy_csnmi
@@ -305,7 +304,7 @@ module psb_d_cyy_mat_mod
interface
function psb_d_cyy_csnm1(a) result(res)
import :: psb_d_cyy_sparse_mat, psb_dpk_
import :: psb_ipk_, psb_d_cyy_sparse_mat, psb_dpk_
class(psb_d_cyy_sparse_mat), intent(in) :: a
real(psb_dpk_) :: res
end function psb_d_cyy_csnm1
@@ -313,7 +312,7 @@ module psb_d_cyy_mat_mod
interface
subroutine psb_d_cyy_rowsum(d,a)
import :: psb_d_cyy_sparse_mat, psb_dpk_
import :: psb_ipk_, psb_d_cyy_sparse_mat, psb_dpk_
class(psb_d_cyy_sparse_mat), intent(in) :: a
real(psb_dpk_), intent(out) :: d(:)
end subroutine psb_d_cyy_rowsum
@@ -321,7 +320,7 @@ module psb_d_cyy_mat_mod
interface
subroutine psb_d_cyy_arwsum(d,a)
import :: psb_d_cyy_sparse_mat, psb_dpk_
import :: psb_ipk_, psb_d_cyy_sparse_mat, psb_dpk_
class(psb_d_cyy_sparse_mat), intent(in) :: a
real(psb_dpk_), intent(out) :: d(:)
end subroutine psb_d_cyy_arwsum
@@ -329,7 +328,7 @@ module psb_d_cyy_mat_mod
interface
subroutine psb_d_cyy_colsum(d,a)
import :: psb_d_cyy_sparse_mat, psb_dpk_
import :: psb_ipk_, psb_d_cyy_sparse_mat, psb_dpk_
class(psb_d_cyy_sparse_mat), intent(in) :: a
real(psb_dpk_), intent(out) :: d(:)
end subroutine psb_d_cyy_colsum
@@ -337,7 +336,7 @@ module psb_d_cyy_mat_mod
interface
subroutine psb_d_cyy_aclsum(d,a)
import :: psb_d_cyy_sparse_mat, psb_dpk_
import :: psb_ipk_, psb_d_cyy_sparse_mat, psb_dpk_
class(psb_d_cyy_sparse_mat), intent(in) :: a
real(psb_dpk_), intent(out) :: d(:)
end subroutine psb_d_cyy_aclsum
@@ -345,7 +344,7 @@ module psb_d_cyy_mat_mod
interface
subroutine psb_d_cyy_get_diag(a,d,info)
import :: psb_d_cyy_sparse_mat, psb_dpk_
import :: psb_ipk_, psb_d_cyy_sparse_mat, psb_dpk_
class(psb_d_cyy_sparse_mat), intent(in) :: a
real(psb_dpk_), intent(out) :: d(:)
integer(psb_ipk_), intent(out) :: info
@@ -354,7 +353,7 @@ module psb_d_cyy_mat_mod
interface
subroutine psb_d_cyy_scal(d,a,info)
import :: psb_d_cyy_sparse_mat, psb_dpk_
import :: psb_ipk_, psb_d_cyy_sparse_mat, psb_dpk_
class(psb_d_cyy_sparse_mat), intent(inout) :: a
real(psb_dpk_), intent(in) :: d(:)
integer(psb_ipk_), intent(out) :: info
@@ -363,7 +362,7 @@ module psb_d_cyy_mat_mod
interface
subroutine psb_d_cyy_scals(d,a,info)
import :: psb_d_cyy_sparse_mat, psb_dpk_
import :: psb_ipk_, psb_d_cyy_sparse_mat, psb_dpk_
class(psb_d_cyy_sparse_mat), intent(inout) :: a
real(psb_dpk_), intent(in) :: d
integer(psb_ipk_), intent(out) :: info