mirror of
https://github.com/sfilippone/psblas3.git
synced 2026-10-24 23:01:48 +00:00
psblas3:
base/modules/psb_base_mat_mod.f90 base/modules/psb_c_base_mat_mod.f90 base/modules/psb_c_csc_mat_mod.f90 base/modules/psb_c_csr_mat_mod.f90 base/modules/psb_c_mat_mod.f90 base/modules/psb_d_base_mat_mod.f90 base/modules/psb_d_csc_mat_mod.f90 base/modules/psb_d_csr_mat_mod.f90 base/modules/psb_d_mat_mod.f90 base/modules/psb_s_base_mat_mod.f90 base/modules/psb_s_csc_mat_mod.f90 base/modules/psb_s_csr_mat_mod.f90 base/modules/psb_s_mat_mod.f90 base/modules/psb_serial_mod.f90 base/modules/psb_z_base_mat_mod.f90 base/modules/psb_z_csc_mat_mod.f90 base/modules/psb_z_csr_mat_mod.f90 base/modules/psb_z_mat_mod.f90 base/serial/impl/psb_c_coo_impl.f90 base/serial/impl/psb_c_csc_impl.f90 base/serial/impl/psb_c_csr_impl.f90 base/serial/impl/psb_c_mat_impl.F90 base/serial/impl/psb_d_coo_impl.f90 base/serial/impl/psb_d_csc_impl.f90 base/serial/impl/psb_d_csr_impl.f90 base/serial/impl/psb_d_mat_impl.F90 base/serial/impl/psb_s_coo_impl.f90 base/serial/impl/psb_s_csc_impl.f90 base/serial/impl/psb_s_csr_impl.f90 base/serial/impl/psb_s_mat_impl.F90 base/serial/impl/psb_z_coo_impl.f90 base/serial/impl/psb_z_csc_impl.f90 base/serial/impl/psb_z_csr_impl.f90 base/serial/impl/psb_z_mat_impl.F90 config/pac.m4 Modified interface of print. Added comments on the various methods.
This commit is contained in:
Salvatore Filippone
@@ -335,7 +335,7 @@ end subroutine psb_c_coo_allocate_mnnz
|
||||
|
||||
|
||||
|
||||
subroutine psb_c_coo_print(iout,a,iv,eirs,eics,head,ivr,ivc)
|
||||
subroutine psb_c_coo_print(iout,a,iv,head,ivr,ivc)
|
||||
use psb_c_base_mat_mod, psb_protect_name => psb_c_coo_print
|
||||
use psb_string_mod
|
||||
implicit none
|
||||
@@ -343,7 +343,6 @@ subroutine psb_c_coo_print(iout,a,iv,eirs,eics,head,ivr,ivc)
|
||||
integer, intent(in) :: iout
|
||||
class(psb_c_coo_sparse_mat), intent(in) :: a
|
||||
integer, intent(in), optional :: iv(:)
|
||||
integer, intent(in), optional :: eirs,eics
|
||||
character(len=*), optional :: head
|
||||
integer, intent(in), optional :: ivr(:), ivc(:)
|
||||
|
||||
@@ -353,18 +352,7 @@ subroutine psb_c_coo_print(iout,a,iv,eirs,eics,head,ivr,ivc)
|
||||
|
||||
character(len=*), parameter :: datatype='complex'
|
||||
character(len=80) :: frmtv
|
||||
integer :: 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
|
||||
integer :: i,j, nmx, ni, nr, nc, nz
|
||||
|
||||
if (present(head)) then
|
||||
write(iout,'(a)') '%%MatrixMarket matrix coordinate complex general'
|
||||
|
||||
@@ -2771,7 +2771,7 @@ subroutine psb_c_csc_allocate_mnnz(m,n,a,nz)
|
||||
|
||||
end subroutine psb_c_csc_allocate_mnnz
|
||||
|
||||
subroutine psb_c_csc_print(iout,a,iv,eirs,eics,head,ivr,ivc)
|
||||
subroutine psb_c_csc_print(iout,a,iv,head,ivr,ivc)
|
||||
use psb_string_mod
|
||||
use psb_c_csc_mat_mod, psb_protect_name => psb_c_csc_print
|
||||
implicit none
|
||||
@@ -2779,7 +2779,6 @@ subroutine psb_c_csc_print(iout,a,iv,eirs,eics,head,ivr,ivc)
|
||||
integer, intent(in) :: iout
|
||||
class(psb_c_csc_sparse_mat), intent(in) :: a
|
||||
integer, intent(in), optional :: iv(:)
|
||||
integer, intent(in), optional :: eirs,eics
|
||||
character(len=*), optional :: head
|
||||
integer, intent(in), optional :: ivr(:), ivc(:)
|
||||
|
||||
@@ -2789,18 +2788,7 @@ subroutine psb_c_csc_print(iout,a,iv,eirs,eics,head,ivr,ivc)
|
||||
|
||||
character(len=*), parameter :: datatype='complex'
|
||||
character(len=80) :: frmtv
|
||||
integer :: 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
|
||||
integer :: i,j, nmx, ni, nr, nc, nz
|
||||
|
||||
if (present(head)) then
|
||||
write(iout,'(a)') '%%MatrixMarket matrix coordinate complex general'
|
||||
|
||||
@@ -2585,7 +2585,7 @@ subroutine psb_c_csr_trim(a)
|
||||
|
||||
end subroutine psb_c_csr_trim
|
||||
|
||||
subroutine psb_c_csr_print(iout,a,iv,eirs,eics,head,ivr,ivc)
|
||||
subroutine psb_c_csr_print(iout,a,iv,head,ivr,ivc)
|
||||
use psb_string_mod
|
||||
use psb_c_csr_mat_mod, psb_protect_name => psb_c_csr_print
|
||||
implicit none
|
||||
@@ -2593,7 +2593,6 @@ subroutine psb_c_csr_print(iout,a,iv,eirs,eics,head,ivr,ivc)
|
||||
integer, intent(in) :: iout
|
||||
class(psb_c_csr_sparse_mat), intent(in) :: a
|
||||
integer, intent(in), optional :: iv(:)
|
||||
integer, intent(in), optional :: eirs,eics
|
||||
character(len=*), optional :: head
|
||||
integer, intent(in), optional :: ivr(:), ivc(:)
|
||||
|
||||
@@ -2604,17 +2603,6 @@ subroutine psb_c_csr_print(iout,a,iv,eirs,eics,head,ivr,ivc)
|
||||
character(len=80) :: frmtv
|
||||
integer :: 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 complex general'
|
||||
write(iout,'(a,a)') '% ',head
|
||||
|
||||
@@ -446,7 +446,7 @@ end subroutine psb_c_set_upper
|
||||
! == ===================================
|
||||
|
||||
|
||||
subroutine psb_c_sparse_print(iout,a,iv,eirs,eics,head,ivr,ivc)
|
||||
subroutine psb_c_sparse_print(iout,a,iv,head,ivr,ivc)
|
||||
use psb_c_mat_mod, psb_protect_name => psb_c_sparse_print
|
||||
use psb_error_mod
|
||||
implicit none
|
||||
@@ -454,7 +454,6 @@ subroutine psb_c_sparse_print(iout,a,iv,eirs,eics,head,ivr,ivc)
|
||||
integer, intent(in) :: iout
|
||||
class(psb_cspmat_type), intent(in) :: a
|
||||
integer, intent(in), optional :: iv(:)
|
||||
integer, intent(in), optional :: eirs,eics
|
||||
character(len=*), optional :: head
|
||||
integer, intent(in), optional :: ivr(:), ivc(:)
|
||||
|
||||
@@ -470,7 +469,7 @@ subroutine psb_c_sparse_print(iout,a,iv,eirs,eics,head,ivr,ivc)
|
||||
goto 9999
|
||||
endif
|
||||
|
||||
call a%a%print(iout,iv,eirs,eics,head,ivr,ivc)
|
||||
call a%a%print(iout,iv,head,ivr,ivc)
|
||||
|
||||
return
|
||||
|
||||
@@ -485,7 +484,7 @@ subroutine psb_c_sparse_print(iout,a,iv,eirs,eics,head,ivr,ivc)
|
||||
end subroutine psb_c_sparse_print
|
||||
|
||||
|
||||
subroutine psb_c_n_sparse_print(fname,a,iv,eirs,eics,head,ivr,ivc)
|
||||
subroutine psb_c_n_sparse_print(fname,a,iv,head,ivr,ivc)
|
||||
use psb_c_mat_mod, psb_protect_name => psb_c_n_sparse_print
|
||||
use psb_error_mod
|
||||
implicit none
|
||||
@@ -493,7 +492,6 @@ subroutine psb_c_n_sparse_print(fname,a,iv,eirs,eics,head,ivr,ivc)
|
||||
character(len=*), intent(in) :: fname
|
||||
class(psb_cspmat_type), intent(in) :: a
|
||||
integer, intent(in), optional :: iv(:)
|
||||
integer, intent(in), optional :: eirs,eics
|
||||
character(len=*), optional :: head
|
||||
integer, intent(in), optional :: ivr(:), ivc(:)
|
||||
|
||||
@@ -522,7 +520,7 @@ subroutine psb_c_n_sparse_print(fname,a,iv,eirs,eics,head,ivr,ivc)
|
||||
end if
|
||||
open(iout,file=fname,iostat=info)
|
||||
if (info == psb_success_) then
|
||||
call a%a%print(iout,iv,eirs,eics,head,ivr,ivc)
|
||||
call a%a%print(iout,iv,head,ivr,ivc)
|
||||
close(iout)
|
||||
else
|
||||
write(psb_err_unit,*) 'Error: could not open ',fname,' for output'
|
||||
|
||||
@@ -335,7 +335,7 @@ end subroutine psb_d_coo_allocate_mnnz
|
||||
|
||||
|
||||
|
||||
subroutine psb_d_coo_print(iout,a,iv,eirs,eics,head,ivr,ivc)
|
||||
subroutine psb_d_coo_print(iout,a,iv,head,ivr,ivc)
|
||||
use psb_d_base_mat_mod, psb_protect_name => psb_d_coo_print
|
||||
use psb_string_mod
|
||||
implicit none
|
||||
@@ -343,7 +343,6 @@ subroutine psb_d_coo_print(iout,a,iv,eirs,eics,head,ivr,ivc)
|
||||
integer, intent(in) :: iout
|
||||
class(psb_d_coo_sparse_mat), intent(in) :: a
|
||||
integer, intent(in), optional :: iv(:)
|
||||
integer, intent(in), optional :: eirs,eics
|
||||
character(len=*), optional :: head
|
||||
integer, intent(in), optional :: ivr(:), ivc(:)
|
||||
|
||||
@@ -353,18 +352,7 @@ subroutine psb_d_coo_print(iout,a,iv,eirs,eics,head,ivr,ivc)
|
||||
|
||||
character(len=*), parameter :: datatype='real'
|
||||
character(len=80) :: frmtv
|
||||
integer :: 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
|
||||
integer :: i,j, nmx, ni, nr, nc, nz
|
||||
|
||||
if (present(head)) then
|
||||
write(iout,'(a)') '%%MatrixMarket matrix coordinate real general'
|
||||
|
||||
@@ -2771,7 +2771,7 @@ subroutine psb_d_csc_allocate_mnnz(m,n,a,nz)
|
||||
|
||||
end subroutine psb_d_csc_allocate_mnnz
|
||||
|
||||
subroutine psb_d_csc_print(iout,a,iv,eirs,eics,head,ivr,ivc)
|
||||
subroutine psb_d_csc_print(iout,a,iv,head,ivr,ivc)
|
||||
use psb_string_mod
|
||||
use psb_d_csc_mat_mod, psb_protect_name => psb_d_csc_print
|
||||
implicit none
|
||||
@@ -2779,7 +2779,6 @@ subroutine psb_d_csc_print(iout,a,iv,eirs,eics,head,ivr,ivc)
|
||||
integer, intent(in) :: iout
|
||||
class(psb_d_csc_sparse_mat), intent(in) :: a
|
||||
integer, intent(in), optional :: iv(:)
|
||||
integer, intent(in), optional :: eirs,eics
|
||||
character(len=*), optional :: head
|
||||
integer, intent(in), optional :: ivr(:), ivc(:)
|
||||
|
||||
@@ -2789,18 +2788,7 @@ subroutine psb_d_csc_print(iout,a,iv,eirs,eics,head,ivr,ivc)
|
||||
|
||||
character(len=*), parameter :: datatype='real'
|
||||
character(len=80) :: frmtv
|
||||
integer :: 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
|
||||
integer :: i,j, nmx, ni, nr, nc, nz
|
||||
|
||||
if (present(head)) then
|
||||
write(iout,'(a)') '%%MatrixMarket matrix coordinate real general'
|
||||
|
||||
@@ -1561,7 +1561,7 @@ subroutine psb_d_csr_get_diag(a,d,info)
|
||||
end do
|
||||
end if
|
||||
do i=mnm+1,size(d)
|
||||
d(i) = czero
|
||||
d(i) = dzero
|
||||
end do
|
||||
|
||||
call psb_erractionrestore(err_act)
|
||||
@@ -2585,7 +2585,7 @@ subroutine psb_d_csr_trim(a)
|
||||
|
||||
end subroutine psb_d_csr_trim
|
||||
|
||||
subroutine psb_d_csr_print(iout,a,iv,eirs,eics,head,ivr,ivc)
|
||||
subroutine psb_d_csr_print(iout,a,iv,head,ivr,ivc)
|
||||
use psb_string_mod
|
||||
use psb_d_csr_mat_mod, psb_protect_name => psb_d_csr_print
|
||||
implicit none
|
||||
@@ -2593,7 +2593,6 @@ subroutine psb_d_csr_print(iout,a,iv,eirs,eics,head,ivr,ivc)
|
||||
integer, intent(in) :: iout
|
||||
class(psb_d_csr_sparse_mat), intent(in) :: a
|
||||
integer, intent(in), optional :: iv(:)
|
||||
integer, intent(in), optional :: eirs,eics
|
||||
character(len=*), optional :: head
|
||||
integer, intent(in), optional :: ivr(:), ivc(:)
|
||||
|
||||
@@ -2604,17 +2603,6 @@ subroutine psb_d_csr_print(iout,a,iv,eirs,eics,head,ivr,ivc)
|
||||
character(len=80) :: frmtv
|
||||
integer :: 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
|
||||
|
||||
@@ -446,7 +446,7 @@ end subroutine psb_d_set_upper
|
||||
! == ===================================
|
||||
|
||||
|
||||
subroutine psb_d_sparse_print(iout,a,iv,eirs,eics,head,ivr,ivc)
|
||||
subroutine psb_d_sparse_print(iout,a,iv,head,ivr,ivc)
|
||||
use psb_d_mat_mod, psb_protect_name => psb_d_sparse_print
|
||||
use psb_error_mod
|
||||
implicit none
|
||||
@@ -454,7 +454,6 @@ subroutine psb_d_sparse_print(iout,a,iv,eirs,eics,head,ivr,ivc)
|
||||
integer, intent(in) :: iout
|
||||
class(psb_dspmat_type), intent(in) :: a
|
||||
integer, intent(in), optional :: iv(:)
|
||||
integer, intent(in), optional :: eirs,eics
|
||||
character(len=*), optional :: head
|
||||
integer, intent(in), optional :: ivr(:), ivc(:)
|
||||
|
||||
@@ -470,7 +469,7 @@ subroutine psb_d_sparse_print(iout,a,iv,eirs,eics,head,ivr,ivc)
|
||||
goto 9999
|
||||
endif
|
||||
|
||||
call a%a%print(iout,iv,eirs,eics,head,ivr,ivc)
|
||||
call a%a%print(iout,iv,head,ivr,ivc)
|
||||
|
||||
return
|
||||
|
||||
@@ -485,7 +484,7 @@ subroutine psb_d_sparse_print(iout,a,iv,eirs,eics,head,ivr,ivc)
|
||||
end subroutine psb_d_sparse_print
|
||||
|
||||
|
||||
subroutine psb_d_n_sparse_print(fname,a,iv,eirs,eics,head,ivr,ivc)
|
||||
subroutine psb_d_n_sparse_print(fname,a,iv,head,ivr,ivc)
|
||||
use psb_d_mat_mod, psb_protect_name => psb_d_n_sparse_print
|
||||
use psb_error_mod
|
||||
implicit none
|
||||
@@ -493,7 +492,6 @@ subroutine psb_d_n_sparse_print(fname,a,iv,eirs,eics,head,ivr,ivc)
|
||||
character(len=*), intent(in) :: fname
|
||||
class(psb_dspmat_type), intent(in) :: a
|
||||
integer, intent(in), optional :: iv(:)
|
||||
integer, intent(in), optional :: eirs,eics
|
||||
character(len=*), optional :: head
|
||||
integer, intent(in), optional :: ivr(:), ivc(:)
|
||||
|
||||
@@ -522,7 +520,7 @@ subroutine psb_d_n_sparse_print(fname,a,iv,eirs,eics,head,ivr,ivc)
|
||||
end if
|
||||
open(iout,file=fname,iostat=info)
|
||||
if (info == psb_success_) then
|
||||
call a%a%print(iout,iv,eirs,eics,head,ivr,ivc)
|
||||
call a%a%print(iout,iv,head,ivr,ivc)
|
||||
close(iout)
|
||||
else
|
||||
write(psb_err_unit,*) 'Error: could not open ',fname,' for output'
|
||||
|
||||
@@ -335,7 +335,7 @@ end subroutine psb_s_coo_allocate_mnnz
|
||||
|
||||
|
||||
|
||||
subroutine psb_s_coo_print(iout,a,iv,eirs,eics,head,ivr,ivc)
|
||||
subroutine psb_s_coo_print(iout,a,iv,head,ivr,ivc)
|
||||
use psb_s_base_mat_mod, psb_protect_name => psb_s_coo_print
|
||||
use psb_string_mod
|
||||
implicit none
|
||||
@@ -343,7 +343,6 @@ subroutine psb_s_coo_print(iout,a,iv,eirs,eics,head,ivr,ivc)
|
||||
integer, intent(in) :: iout
|
||||
class(psb_s_coo_sparse_mat), intent(in) :: a
|
||||
integer, intent(in), optional :: iv(:)
|
||||
integer, intent(in), optional :: eirs,eics
|
||||
character(len=*), optional :: head
|
||||
integer, intent(in), optional :: ivr(:), ivc(:)
|
||||
|
||||
@@ -353,18 +352,7 @@ subroutine psb_s_coo_print(iout,a,iv,eirs,eics,head,ivr,ivc)
|
||||
|
||||
character(len=*), parameter :: datatype='real'
|
||||
character(len=80) :: frmtv
|
||||
integer :: 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
|
||||
integer :: i,j, nmx, ni, nr, nc, nz
|
||||
|
||||
if (present(head)) then
|
||||
write(iout,'(a)') '%%MatrixMarket matrix coordinate real general'
|
||||
|
||||
@@ -2771,7 +2771,7 @@ subroutine psb_s_csc_allocate_mnnz(m,n,a,nz)
|
||||
|
||||
end subroutine psb_s_csc_allocate_mnnz
|
||||
|
||||
subroutine psb_s_csc_print(iout,a,iv,eirs,eics,head,ivr,ivc)
|
||||
subroutine psb_s_csc_print(iout,a,iv,head,ivr,ivc)
|
||||
use psb_string_mod
|
||||
use psb_s_csc_mat_mod, psb_protect_name => psb_s_csc_print
|
||||
implicit none
|
||||
@@ -2779,7 +2779,6 @@ subroutine psb_s_csc_print(iout,a,iv,eirs,eics,head,ivr,ivc)
|
||||
integer, intent(in) :: iout
|
||||
class(psb_s_csc_sparse_mat), intent(in) :: a
|
||||
integer, intent(in), optional :: iv(:)
|
||||
integer, intent(in), optional :: eirs,eics
|
||||
character(len=*), optional :: head
|
||||
integer, intent(in), optional :: ivr(:), ivc(:)
|
||||
|
||||
@@ -2789,18 +2788,7 @@ subroutine psb_s_csc_print(iout,a,iv,eirs,eics,head,ivr,ivc)
|
||||
|
||||
character(len=*), parameter :: datatype='real'
|
||||
character(len=80) :: frmtv
|
||||
integer :: 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
|
||||
integer :: i,j, nmx, ni, nr, nc, nz
|
||||
|
||||
if (present(head)) then
|
||||
write(iout,'(a)') '%%MatrixMarket matrix coordinate real general'
|
||||
|
||||
@@ -1561,7 +1561,7 @@ subroutine psb_s_csr_get_diag(a,d,info)
|
||||
end do
|
||||
end if
|
||||
do i=mnm+1,size(d)
|
||||
d(i) = czero
|
||||
d(i) = szero
|
||||
end do
|
||||
|
||||
call psb_erractionrestore(err_act)
|
||||
@@ -2585,7 +2585,7 @@ subroutine psb_s_csr_trim(a)
|
||||
|
||||
end subroutine psb_s_csr_trim
|
||||
|
||||
subroutine psb_s_csr_print(iout,a,iv,eirs,eics,head,ivr,ivc)
|
||||
subroutine psb_s_csr_print(iout,a,iv,head,ivr,ivc)
|
||||
use psb_string_mod
|
||||
use psb_s_csr_mat_mod, psb_protect_name => psb_s_csr_print
|
||||
implicit none
|
||||
@@ -2593,7 +2593,6 @@ subroutine psb_s_csr_print(iout,a,iv,eirs,eics,head,ivr,ivc)
|
||||
integer, intent(in) :: iout
|
||||
class(psb_s_csr_sparse_mat), intent(in) :: a
|
||||
integer, intent(in), optional :: iv(:)
|
||||
integer, intent(in), optional :: eirs,eics
|
||||
character(len=*), optional :: head
|
||||
integer, intent(in), optional :: ivr(:), ivc(:)
|
||||
|
||||
@@ -2604,17 +2603,6 @@ subroutine psb_s_csr_print(iout,a,iv,eirs,eics,head,ivr,ivc)
|
||||
character(len=80) :: frmtv
|
||||
integer :: 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
|
||||
|
||||
@@ -446,7 +446,7 @@ end subroutine psb_s_set_upper
|
||||
! == ===================================
|
||||
|
||||
|
||||
subroutine psb_s_sparse_print(iout,a,iv,eirs,eics,head,ivr,ivc)
|
||||
subroutine psb_s_sparse_print(iout,a,iv,head,ivr,ivc)
|
||||
use psb_s_mat_mod, psb_protect_name => psb_s_sparse_print
|
||||
use psb_error_mod
|
||||
implicit none
|
||||
@@ -454,7 +454,6 @@ subroutine psb_s_sparse_print(iout,a,iv,eirs,eics,head,ivr,ivc)
|
||||
integer, intent(in) :: iout
|
||||
class(psb_sspmat_type), intent(in) :: a
|
||||
integer, intent(in), optional :: iv(:)
|
||||
integer, intent(in), optional :: eirs,eics
|
||||
character(len=*), optional :: head
|
||||
integer, intent(in), optional :: ivr(:), ivc(:)
|
||||
|
||||
@@ -470,7 +469,7 @@ subroutine psb_s_sparse_print(iout,a,iv,eirs,eics,head,ivr,ivc)
|
||||
goto 9999
|
||||
endif
|
||||
|
||||
call a%a%print(iout,iv,eirs,eics,head,ivr,ivc)
|
||||
call a%a%print(iout,iv,head,ivr,ivc)
|
||||
|
||||
return
|
||||
|
||||
@@ -485,7 +484,7 @@ subroutine psb_s_sparse_print(iout,a,iv,eirs,eics,head,ivr,ivc)
|
||||
end subroutine psb_s_sparse_print
|
||||
|
||||
|
||||
subroutine psb_s_n_sparse_print(fname,a,iv,eirs,eics,head,ivr,ivc)
|
||||
subroutine psb_s_n_sparse_print(fname,a,iv,head,ivr,ivc)
|
||||
use psb_s_mat_mod, psb_protect_name => psb_s_n_sparse_print
|
||||
use psb_error_mod
|
||||
implicit none
|
||||
@@ -493,7 +492,6 @@ subroutine psb_s_n_sparse_print(fname,a,iv,eirs,eics,head,ivr,ivc)
|
||||
character(len=*), intent(in) :: fname
|
||||
class(psb_sspmat_type), intent(in) :: a
|
||||
integer, intent(in), optional :: iv(:)
|
||||
integer, intent(in), optional :: eirs,eics
|
||||
character(len=*), optional :: head
|
||||
integer, intent(in), optional :: ivr(:), ivc(:)
|
||||
|
||||
@@ -522,7 +520,7 @@ subroutine psb_s_n_sparse_print(fname,a,iv,eirs,eics,head,ivr,ivc)
|
||||
end if
|
||||
open(iout,file=fname,iostat=info)
|
||||
if (info == psb_success_) then
|
||||
call a%a%print(iout,iv,eirs,eics,head,ivr,ivc)
|
||||
call a%a%print(iout,iv,head,ivr,ivc)
|
||||
close(iout)
|
||||
else
|
||||
write(psb_err_unit,*) 'Error: could not open ',fname,' for output'
|
||||
|
||||
@@ -335,7 +335,7 @@ end subroutine psb_z_coo_allocate_mnnz
|
||||
|
||||
|
||||
|
||||
subroutine psb_z_coo_print(iout,a,iv,eirs,eics,head,ivr,ivc)
|
||||
subroutine psb_z_coo_print(iout,a,iv,head,ivr,ivc)
|
||||
use psb_z_base_mat_mod, psb_protect_name => psb_z_coo_print
|
||||
use psb_string_mod
|
||||
implicit none
|
||||
@@ -343,7 +343,6 @@ subroutine psb_z_coo_print(iout,a,iv,eirs,eics,head,ivr,ivc)
|
||||
integer, intent(in) :: iout
|
||||
class(psb_z_coo_sparse_mat), intent(in) :: a
|
||||
integer, intent(in), optional :: iv(:)
|
||||
integer, intent(in), optional :: eirs,eics
|
||||
character(len=*), optional :: head
|
||||
integer, intent(in), optional :: ivr(:), ivc(:)
|
||||
|
||||
@@ -353,18 +352,7 @@ subroutine psb_z_coo_print(iout,a,iv,eirs,eics,head,ivr,ivc)
|
||||
|
||||
character(len=*), parameter :: datatype='complex'
|
||||
character(len=80) :: frmtv
|
||||
integer :: 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
|
||||
integer :: i,j, nmx, ni, nr, nc, nz
|
||||
|
||||
if (present(head)) then
|
||||
write(iout,'(a)') '%%MatrixMarket matrix coordinate complex general'
|
||||
|
||||
@@ -2771,7 +2771,7 @@ subroutine psb_z_csc_allocate_mnnz(m,n,a,nz)
|
||||
|
||||
end subroutine psb_z_csc_allocate_mnnz
|
||||
|
||||
subroutine psb_z_csc_print(iout,a,iv,eirs,eics,head,ivr,ivc)
|
||||
subroutine psb_z_csc_print(iout,a,iv,head,ivr,ivc)
|
||||
use psb_string_mod
|
||||
use psb_z_csc_mat_mod, psb_protect_name => psb_z_csc_print
|
||||
implicit none
|
||||
@@ -2779,7 +2779,6 @@ subroutine psb_z_csc_print(iout,a,iv,eirs,eics,head,ivr,ivc)
|
||||
integer, intent(in) :: iout
|
||||
class(psb_z_csc_sparse_mat), intent(in) :: a
|
||||
integer, intent(in), optional :: iv(:)
|
||||
integer, intent(in), optional :: eirs,eics
|
||||
character(len=*), optional :: head
|
||||
integer, intent(in), optional :: ivr(:), ivc(:)
|
||||
|
||||
@@ -2789,18 +2788,7 @@ subroutine psb_z_csc_print(iout,a,iv,eirs,eics,head,ivr,ivc)
|
||||
|
||||
character(len=*), parameter :: datatype='complex'
|
||||
character(len=80) :: frmtv
|
||||
integer :: 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
|
||||
integer :: i,j, nmx, ni, nr, nc, nz
|
||||
|
||||
if (present(head)) then
|
||||
write(iout,'(a)') '%%MatrixMarket matrix coordinate complex general'
|
||||
|
||||
@@ -1561,7 +1561,7 @@ subroutine psb_z_csr_get_diag(a,d,info)
|
||||
end do
|
||||
end if
|
||||
do i=mnm+1,size(d)
|
||||
d(i) = czero
|
||||
d(i) = zzero
|
||||
end do
|
||||
|
||||
call psb_erractionrestore(err_act)
|
||||
@@ -2585,7 +2585,7 @@ subroutine psb_z_csr_trim(a)
|
||||
|
||||
end subroutine psb_z_csr_trim
|
||||
|
||||
subroutine psb_z_csr_print(iout,a,iv,eirs,eics,head,ivr,ivc)
|
||||
subroutine psb_z_csr_print(iout,a,iv,head,ivr,ivc)
|
||||
use psb_string_mod
|
||||
use psb_z_csr_mat_mod, psb_protect_name => psb_z_csr_print
|
||||
implicit none
|
||||
@@ -2593,7 +2593,6 @@ subroutine psb_z_csr_print(iout,a,iv,eirs,eics,head,ivr,ivc)
|
||||
integer, intent(in) :: iout
|
||||
class(psb_z_csr_sparse_mat), intent(in) :: a
|
||||
integer, intent(in), optional :: iv(:)
|
||||
integer, intent(in), optional :: eirs,eics
|
||||
character(len=*), optional :: head
|
||||
integer, intent(in), optional :: ivr(:), ivc(:)
|
||||
|
||||
@@ -2604,17 +2603,6 @@ subroutine psb_z_csr_print(iout,a,iv,eirs,eics,head,ivr,ivc)
|
||||
character(len=80) :: frmtv
|
||||
integer :: 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 complex general'
|
||||
write(iout,'(a,a)') '% ',head
|
||||
|
||||
@@ -446,7 +446,7 @@ end subroutine psb_z_set_upper
|
||||
! == ===================================
|
||||
|
||||
|
||||
subroutine psb_z_sparse_print(iout,a,iv,eirs,eics,head,ivr,ivc)
|
||||
subroutine psb_z_sparse_print(iout,a,iv,head,ivr,ivc)
|
||||
use psb_z_mat_mod, psb_protect_name => psb_z_sparse_print
|
||||
use psb_error_mod
|
||||
implicit none
|
||||
@@ -454,7 +454,6 @@ subroutine psb_z_sparse_print(iout,a,iv,eirs,eics,head,ivr,ivc)
|
||||
integer, intent(in) :: iout
|
||||
class(psb_zspmat_type), intent(in) :: a
|
||||
integer, intent(in), optional :: iv(:)
|
||||
integer, intent(in), optional :: eirs,eics
|
||||
character(len=*), optional :: head
|
||||
integer, intent(in), optional :: ivr(:), ivc(:)
|
||||
|
||||
@@ -470,7 +469,7 @@ subroutine psb_z_sparse_print(iout,a,iv,eirs,eics,head,ivr,ivc)
|
||||
goto 9999
|
||||
endif
|
||||
|
||||
call a%a%print(iout,iv,eirs,eics,head,ivr,ivc)
|
||||
call a%a%print(iout,iv,head,ivr,ivc)
|
||||
|
||||
return
|
||||
|
||||
@@ -485,7 +484,7 @@ subroutine psb_z_sparse_print(iout,a,iv,eirs,eics,head,ivr,ivc)
|
||||
end subroutine psb_z_sparse_print
|
||||
|
||||
|
||||
subroutine psb_z_n_sparse_print(fname,a,iv,eirs,eics,head,ivr,ivc)
|
||||
subroutine psb_z_n_sparse_print(fname,a,iv,head,ivr,ivc)
|
||||
use psb_z_mat_mod, psb_protect_name => psb_z_n_sparse_print
|
||||
use psb_error_mod
|
||||
implicit none
|
||||
@@ -493,7 +492,6 @@ subroutine psb_z_n_sparse_print(fname,a,iv,eirs,eics,head,ivr,ivc)
|
||||
character(len=*), intent(in) :: fname
|
||||
class(psb_zspmat_type), intent(in) :: a
|
||||
integer, intent(in), optional :: iv(:)
|
||||
integer, intent(in), optional :: eirs,eics
|
||||
character(len=*), optional :: head
|
||||
integer, intent(in), optional :: ivr(:), ivc(:)
|
||||
|
||||
@@ -522,7 +520,7 @@ subroutine psb_z_n_sparse_print(fname,a,iv,eirs,eics,head,ivr,ivc)
|
||||
end if
|
||||
open(iout,file=fname,iostat=info)
|
||||
if (info == psb_success_) then
|
||||
call a%a%print(iout,iv,eirs,eics,head,ivr,ivc)
|
||||
call a%a%print(iout,iv,head,ivr,ivc)
|
||||
close(iout)
|
||||
else
|
||||
write(psb_err_unit,*) 'Error: could not open ',fname,' for output'
|
||||
|
||||
Reference in New Issue
Block a user