diff --git a/base/modules/Makefile b/base/modules/Makefile index 02b95020..0c73a3a2 100644 --- a/base/modules/Makefile +++ b/base/modules/Makefile @@ -1,7 +1,7 @@ include ../../Make.inc MODULES = psb_realloc_mod.o psb_string_mod.o psb_spmat_type.o \ - psb_desc_type.o psb_spsb_mod.o psb_sort_mod.o\ + psb_desc_type.o psb_sort_mod.o\ psb_serial_mod.o psb_tools_mod.o psb_blacs_mod.o \ psb_error_mod.o psb_const_mod.o psb_inter_desc_type.o \ psb_comm_mod.o psb_psblas_mod.o psi_serial_mod.o psi_mod.o \ diff --git a/base/modules/psb_spmat_type.f03 b/base/modules/psb_spmat_type.f03 index 378eb38c..2b20e7ec 100644 --- a/base/modules/psb_spmat_type.f03 +++ b/base/modules/psb_spmat_type.f03 @@ -127,7 +127,6 @@ module psb_spmat_type integer :: infoa(psb_ifasize_) integer, allocatable :: ia1(:), ia2(:) integer, allocatable :: pl(:), pr(:) - end type psb_base_spmat_type diff --git a/base/modules/psb_spsb_mod.f90 b/base/modules/psb_spsb_mod.f90 deleted file mode 100644 index 589bb691..00000000 --- a/base/modules/psb_spsb_mod.f90 +++ /dev/null @@ -1,191 +0,0 @@ -!!$ -!!$ Parallel Sparse BLAS version 2.2 -!!$ (C) Copyright 2006/2007/2008 -!!$ Salvatore Filippone University of Rome Tor Vergata -!!$ Alfredo Buttari University of Rome Tor Vergata -!!$ -!!$ Redistribution and use in source and binary forms, with or without -!!$ modification, are permitted provided that the following conditions -!!$ are met: -!!$ 1. Redistributions of source code must retain the above copyright -!!$ notice, this list of conditions and the following disclaimer. -!!$ 2. Redistributions in binary form must reproduce the above copyright -!!$ notice, this list of conditions, and the following disclaimer in the -!!$ documentation and/or other materials provided with the distribution. -!!$ 3. The name of the PSBLAS group or the names of its contributors may -!!$ not be used to endorse or promote products derived from this -!!$ software without specific written permission. -!!$ -!!$ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -!!$ ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED -!!$ TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -!!$ PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE PSBLAS GROUP OR ITS CONTRIBUTORS -!!$ BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -!!$ CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -!!$ SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -!!$ INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -!!$ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -!!$ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -!!$ POSSIBILITY OF SUCH DAMAGE. -!!$ -!!$ -module psb_spsb_mod - - interface dot - function ddot(n,dx,incx,dy,incy) - use psb_const_mod - real(psb_dpk_) :: dx(*),dy(*),dtemp - integer :: i,incx,incy,ix,iy,m,mp1,n - real(psb_dpk_) :: ddot - end function ddot - end interface - - interface axpby - subroutine daxpby(m, n, alpha, X, lldx, beta, Y, lldy, info) - use psb_const_mod - real(psb_dpk_) :: X(lldx,*), Y(lldy,*) - real(psb_dpk_) :: alpha, beta - integer :: n, m, lldx, lldy, info - end subroutine daxpby - end interface - - interface csmm - subroutine dcsmm(trans,m,n,k,alpha,pl,fida,descra,a,ia1,ia2,& - & infoa,pr,b,ldb,beta,c,ldc,work,lwork,ierror) - use psb_const_mod - integer :: m,n,k,ldb,ldc,lwork, ierror - character :: trans - real(psb_dpk_) :: alpha,beta - integer :: ia1(*),ia2(*),infoa(*),pl(*),pr(*) - character :: descra*11, fida*5 - real(psb_dpk_) :: a(*),b(ldb,*),c(ldc,*),work(*) - end subroutine dcsmm - end interface - - interface csnmi - function dcsnmi(trans,m,n,fida,descra,a,ia1,ia2,& - & infoa,ierror) - use psb_const_mod - integer :: m,n, ierror - character :: trans - integer :: ia1(*),ia2(*),infoa(*) - character :: descra*11, fida*5 - real(psb_dpk_) :: a(*) - real(psb_dpk_) :: dcsnmi - end function dcsnmi - end interface - - - interface csrp - subroutine dcsrp(trans,m,n,fida,descra,ia1,ia2,infoa,& - & p,work,lwork,ierror) - use psb_const_mod - implicit none - integer :: lwork, m, n, ierror - character :: trans - real(psb_dpk_) :: work(lwork) - integer :: ia1(*), ia2(*), infoa(*), p(*), int_val(5) - character :: descra*11, fida*5 - end subroutine dcsrp - end interface - - interface cssm - subroutine dcssm(trans,m,n,alpha,unitd,d,& - & pl,fidt,descrt,t,it1,it2,infot,pr,& - & b,ldb,beta,c,ldc,work,lwork,ierror) - use psb_const_mod - real(psb_dpk_) :: alpha, beta - integer :: n, ldb, ldc, m, lwork, ierror - character :: unitd, trans - real(psb_dpk_) :: t(*), b(ldb,*), c(ldc,*), d(*), work(*) - integer :: it1(*), it2(*), infot(*), pl(*), pr(*) - character :: descrt*11, fidt*5 - end subroutine dcssm - end interface - - - interface csupd - subroutine dcsupd(m, n, fida, descra, a, ia1,& - & ia2, infoa, ia, ja, fidh, descrh, h, ih1, ih2,& - & infoh, ih, jh, flag, glob_to_loc,& - & iwork, liwork, ierror) - use psb_const_mod - integer :: ia, ja, ih, jh, m, n,& - & ierror, flag, liwork - integer :: ia1(*),ia2(*),ih1(*),ih2(*),& - & infoa(*),infoh(*),iwork(*),& - & glob_to_loc(*) - character :: descra*11,descrh*11, fida*5, fidh*5 - real(psb_dpk_) :: a(*),h(*) - end subroutine dcsupd - end interface - - interface gelp - subroutine dgelp(trans,m,n,p,b,ldb,work,lwork,ierror) - use psb_const_mod - integer :: ldb, m, n, lwork, ierror - character :: trans - real(psb_dpk_) :: b(ldb,*), work(*) - integer :: p(*) - end subroutine dgelp - end interface - - interface lpupd - subroutine dlpupd(m,n,perm,b,ldb,beta,c,ldc) - use psb_const_mod - integer :: m, n, ldb, ldc - real(psb_dpk_) :: beta - integer :: perm(*) - real(psb_dpk_) :: b(ldb,*), c(ldc,*) - end subroutine dlpupd - end interface - - interface swmm - subroutine dswmm(trans,m,n,k,alpha,fida,descra,a,ia1,ia2,& - & infoa,b,ldb,beta,c,ldc,work,lwork,ierror) - use psb_const_mod - integer :: m,n,k,ldb,ldc,lwork,ierror - character :: trans - real(psb_dpk_) :: alpha,beta - integer :: ia1(*),ia2(*),infoa(*), int_val(5) - character :: descra*11, fida*5 - real(psb_dpk_) :: a(*),b(ldb,*),c(ldc,*),work(*) - end subroutine dswmm - end interface - - - - interface swprt - subroutine dswprt(m,n,fida,descra,a,ia1,ia2,infoa,title,& - & iout,ierror) - use psb_const_mod - integer :: m,n,iout,ierror - integer :: ia1(*),ia2(*),infoa(*) - character :: descra*11, fida*5, title*(*) - end subroutine dswprt - end interface - - interface swsm - subroutine dswsm(trans,m,n,alpha,unitd,d,fidt,descrt,t,it1,it2,& - & infot,b,ldb,beta,c,ldc,work,lwork,ierror) - use psb_const_mod - integer :: m, n, ldb, ldc, lwork, ierror - character :: unitd, trans - real(psb_dpk_) :: alpha, beta - integer :: it1(*), it2(*), infot(*) - character :: descrt*11, fidt*5 - real(psb_dpk_) :: t(*), b(ldb,*), c(ldc,*), d(*), work(*) - end subroutine dswsm - end interface - - interface symbmm - subroutine symbmm (n, m, l, ia, ja, diaga, ib,& - & jb, diagb, ic, jc, diagc, index) - integer :: ia(*), ja(*), diaga, ib(*),& - & jb(*), diagb, diagc, index(*) - integer, pointer :: ic(:),jc(:) - integer :: nze, info - end subroutine symbmm - end interface - -end module psb_spsb_mod