From f2e247c8a8117de0bb76a2a7312f73ce2bd34f08 Mon Sep 17 00:00:00 2001 From: Salvatore Filippone Date: Thu, 18 Oct 2018 17:58:08 +0100 Subject: [PATCH] Take out obsolete method impl. --- base/serial/impl/psb_c_csr_impl.f90 | 54 ----------------------------- base/serial/impl/psb_d_csr_impl.f90 | 54 ----------------------------- base/serial/impl/psb_s_csr_impl.f90 | 54 ----------------------------- base/serial/impl/psb_z_csr_impl.f90 | 54 ----------------------------- 4 files changed, 216 deletions(-) diff --git a/base/serial/impl/psb_c_csr_impl.f90 b/base/serial/impl/psb_c_csr_impl.f90 index 451a3bec..bb0d5309 100644 --- a/base/serial/impl/psb_c_csr_impl.f90 +++ b/base/serial/impl/psb_c_csr_impl.f90 @@ -2185,60 +2185,6 @@ contains end subroutine psb_c_csr_csgetrow -!!$subroutine psb_c_csr_csgetblk(imin,imax,a,b,info,& -!!$ & jmin,jmax,iren,append,rscale,cscale) -!!$ ! Output is always in COO format -!!$ use psb_error_mod -!!$ use psb_const_mod -!!$ use psb_c_csr_mat_mod, psb_protect_name => psb_c_csr_csgetblk -!!$ implicit none -!!$ -!!$ class(psb_c_csr_sparse_mat), intent(in) :: a -!!$ class(psb_c_coo_sparse_mat), intent(inout) :: b -!!$ integer(psb_ipk_), intent(in) :: imin,imax -!!$ integer(psb_ipk_),intent(out) :: info -!!$ logical, intent(in), optional :: append -!!$ integer(psb_ipk_), intent(in), optional :: iren(:) -!!$ integer(psb_ipk_), intent(in), optional :: jmin,jmax -!!$ logical, intent(in), optional :: rscale,cscale -!!$ integer(psb_ipk_) :: err_act, nzin, nzout -!!$ integer(psb_ipk_) :: ierr(5) -!!$ character(len=20) :: name='csget' -!!$ logical :: append_ -!!$ logical, parameter :: debug=.false. -!!$ -!!$ call psb_erractionsave(err_act) -!!$ info = psb_success_ -!!$ -!!$ if (present(append)) then -!!$ append_ = append -!!$ else -!!$ append_ = .false. -!!$ endif -!!$ if (append_) then -!!$ nzin = a%get_nzeros() -!!$ else -!!$ nzin = 0 -!!$ endif -!!$ -!!$ call a%csget(imin,imax,nzout,b%ia,b%ja,b%val,info,& -!!$ & jmin=jmin, jmax=jmax, iren=iren, append=append_, & -!!$ & nzin=nzin, rscale=rscale, cscale=cscale) -!!$ -!!$ if (info /= psb_success_) goto 9999 -!!$ -!!$ call b%set_nzeros(nzin+nzout) -!!$ call b%fix(info) -!!$ if (info /= psb_success_) goto 9999 -!!$ -!!$ call psb_erractionrestore(err_act) -!!$ return -!!$ -!!$9999 call psb_error_handler(err_act) -!!$ -!!$ return -!!$ -!!$end subroutine psb_c_csr_csgetblk ! ! CSR implementation of tril/triu diff --git a/base/serial/impl/psb_d_csr_impl.f90 b/base/serial/impl/psb_d_csr_impl.f90 index d2931fbd..868f0fe6 100644 --- a/base/serial/impl/psb_d_csr_impl.f90 +++ b/base/serial/impl/psb_d_csr_impl.f90 @@ -2185,60 +2185,6 @@ contains end subroutine psb_d_csr_csgetrow -!!$subroutine psb_d_csr_csgetblk(imin,imax,a,b,info,& -!!$ & jmin,jmax,iren,append,rscale,cscale) -!!$ ! Output is always in COO format -!!$ use psb_error_mod -!!$ use psb_const_mod -!!$ use psb_d_csr_mat_mod, psb_protect_name => psb_d_csr_csgetblk -!!$ implicit none -!!$ -!!$ class(psb_d_csr_sparse_mat), intent(in) :: a -!!$ class(psb_d_coo_sparse_mat), intent(inout) :: b -!!$ integer(psb_ipk_), intent(in) :: imin,imax -!!$ integer(psb_ipk_),intent(out) :: info -!!$ logical, intent(in), optional :: append -!!$ integer(psb_ipk_), intent(in), optional :: iren(:) -!!$ integer(psb_ipk_), intent(in), optional :: jmin,jmax -!!$ logical, intent(in), optional :: rscale,cscale -!!$ integer(psb_ipk_) :: err_act, nzin, nzout -!!$ integer(psb_ipk_) :: ierr(5) -!!$ character(len=20) :: name='csget' -!!$ logical :: append_ -!!$ logical, parameter :: debug=.false. -!!$ -!!$ call psb_erractionsave(err_act) -!!$ info = psb_success_ -!!$ -!!$ if (present(append)) then -!!$ append_ = append -!!$ else -!!$ append_ = .false. -!!$ endif -!!$ if (append_) then -!!$ nzin = a%get_nzeros() -!!$ else -!!$ nzin = 0 -!!$ endif -!!$ -!!$ call a%csget(imin,imax,nzout,b%ia,b%ja,b%val,info,& -!!$ & jmin=jmin, jmax=jmax, iren=iren, append=append_, & -!!$ & nzin=nzin, rscale=rscale, cscale=cscale) -!!$ -!!$ if (info /= psb_success_) goto 9999 -!!$ -!!$ call b%set_nzeros(nzin+nzout) -!!$ call b%fix(info) -!!$ if (info /= psb_success_) goto 9999 -!!$ -!!$ call psb_erractionrestore(err_act) -!!$ return -!!$ -!!$9999 call psb_error_handler(err_act) -!!$ -!!$ return -!!$ -!!$end subroutine psb_d_csr_csgetblk ! ! CSR implementation of tril/triu diff --git a/base/serial/impl/psb_s_csr_impl.f90 b/base/serial/impl/psb_s_csr_impl.f90 index bcb9f933..9a537360 100644 --- a/base/serial/impl/psb_s_csr_impl.f90 +++ b/base/serial/impl/psb_s_csr_impl.f90 @@ -2185,60 +2185,6 @@ contains end subroutine psb_s_csr_csgetrow -!!$subroutine psb_s_csr_csgetblk(imin,imax,a,b,info,& -!!$ & jmin,jmax,iren,append,rscale,cscale) -!!$ ! Output is always in COO format -!!$ use psb_error_mod -!!$ use psb_const_mod -!!$ use psb_s_csr_mat_mod, psb_protect_name => psb_s_csr_csgetblk -!!$ implicit none -!!$ -!!$ class(psb_s_csr_sparse_mat), intent(in) :: a -!!$ class(psb_s_coo_sparse_mat), intent(inout) :: b -!!$ integer(psb_ipk_), intent(in) :: imin,imax -!!$ integer(psb_ipk_),intent(out) :: info -!!$ logical, intent(in), optional :: append -!!$ integer(psb_ipk_), intent(in), optional :: iren(:) -!!$ integer(psb_ipk_), intent(in), optional :: jmin,jmax -!!$ logical, intent(in), optional :: rscale,cscale -!!$ integer(psb_ipk_) :: err_act, nzin, nzout -!!$ integer(psb_ipk_) :: ierr(5) -!!$ character(len=20) :: name='csget' -!!$ logical :: append_ -!!$ logical, parameter :: debug=.false. -!!$ -!!$ call psb_erractionsave(err_act) -!!$ info = psb_success_ -!!$ -!!$ if (present(append)) then -!!$ append_ = append -!!$ else -!!$ append_ = .false. -!!$ endif -!!$ if (append_) then -!!$ nzin = a%get_nzeros() -!!$ else -!!$ nzin = 0 -!!$ endif -!!$ -!!$ call a%csget(imin,imax,nzout,b%ia,b%ja,b%val,info,& -!!$ & jmin=jmin, jmax=jmax, iren=iren, append=append_, & -!!$ & nzin=nzin, rscale=rscale, cscale=cscale) -!!$ -!!$ if (info /= psb_success_) goto 9999 -!!$ -!!$ call b%set_nzeros(nzin+nzout) -!!$ call b%fix(info) -!!$ if (info /= psb_success_) goto 9999 -!!$ -!!$ call psb_erractionrestore(err_act) -!!$ return -!!$ -!!$9999 call psb_error_handler(err_act) -!!$ -!!$ return -!!$ -!!$end subroutine psb_s_csr_csgetblk ! ! CSR implementation of tril/triu diff --git a/base/serial/impl/psb_z_csr_impl.f90 b/base/serial/impl/psb_z_csr_impl.f90 index 9e99060f..502b7c5b 100644 --- a/base/serial/impl/psb_z_csr_impl.f90 +++ b/base/serial/impl/psb_z_csr_impl.f90 @@ -2185,60 +2185,6 @@ contains end subroutine psb_z_csr_csgetrow -!!$subroutine psb_z_csr_csgetblk(imin,imax,a,b,info,& -!!$ & jmin,jmax,iren,append,rscale,cscale) -!!$ ! Output is always in COO format -!!$ use psb_error_mod -!!$ use psb_const_mod -!!$ use psb_z_csr_mat_mod, psb_protect_name => psb_z_csr_csgetblk -!!$ implicit none -!!$ -!!$ class(psb_z_csr_sparse_mat), intent(in) :: a -!!$ class(psb_z_coo_sparse_mat), intent(inout) :: b -!!$ integer(psb_ipk_), intent(in) :: imin,imax -!!$ integer(psb_ipk_),intent(out) :: info -!!$ logical, intent(in), optional :: append -!!$ integer(psb_ipk_), intent(in), optional :: iren(:) -!!$ integer(psb_ipk_), intent(in), optional :: jmin,jmax -!!$ logical, intent(in), optional :: rscale,cscale -!!$ integer(psb_ipk_) :: err_act, nzin, nzout -!!$ integer(psb_ipk_) :: ierr(5) -!!$ character(len=20) :: name='csget' -!!$ logical :: append_ -!!$ logical, parameter :: debug=.false. -!!$ -!!$ call psb_erractionsave(err_act) -!!$ info = psb_success_ -!!$ -!!$ if (present(append)) then -!!$ append_ = append -!!$ else -!!$ append_ = .false. -!!$ endif -!!$ if (append_) then -!!$ nzin = a%get_nzeros() -!!$ else -!!$ nzin = 0 -!!$ endif -!!$ -!!$ call a%csget(imin,imax,nzout,b%ia,b%ja,b%val,info,& -!!$ & jmin=jmin, jmax=jmax, iren=iren, append=append_, & -!!$ & nzin=nzin, rscale=rscale, cscale=cscale) -!!$ -!!$ if (info /= psb_success_) goto 9999 -!!$ -!!$ call b%set_nzeros(nzin+nzout) -!!$ call b%fix(info) -!!$ if (info /= psb_success_) goto 9999 -!!$ -!!$ call psb_erractionrestore(err_act) -!!$ return -!!$ -!!$9999 call psb_error_handler(err_act) -!!$ -!!$ return -!!$ -!!$end subroutine psb_z_csr_csgetblk ! ! CSR implementation of tril/triu