base/Makefile
 base/comm/psb_cgather.f90
 base/comm/psb_chalo.f90
 base/comm/psb_covrl.f90
 base/comm/psb_cscatter.F90
 base/comm/psb_dgather.f90
 base/comm/psb_dhalo.f90
 base/comm/psb_dovrl.f90
 base/comm/psb_dscatter.F90
 base/comm/psb_igather.f90
 base/comm/psb_ihalo.f90
 base/comm/psb_iovrl.f90
 base/comm/psb_iscatter.F90
 base/comm/psb_sgather.f90
 base/comm/psb_shalo.f90
 base/comm/psb_sovrl.f90
 base/comm/psb_sscatter.F90
 base/comm/psb_zgather.f90
 base/comm/psb_zhalo.f90
 base/comm/psb_zovrl.f90
 base/comm/psb_zscatter.F90
 base/modules/Makefile
 base/modules/psb_serial_mod.f90
 base/modules/psb_sparse_mod.f90
 base/psblas/psb_camax.f90
 base/psblas/psb_casum.f90
 base/psblas/psb_caxpby.f90
 base/psblas/psb_cdot.f90
 base/psblas/psb_cnrmi.f90
 base/psblas/psb_cspmm.f90
 base/psblas/psb_cspsm.f90
 base/psblas/psb_damax.f90
 base/psblas/psb_dasum.f90
 base/psblas/psb_daxpby.f90
 base/psblas/psb_ddot.f90
 base/psblas/psb_dspmm.f90
 base/psblas/psb_dspnrm1.f90
 base/psblas/psb_dspsm.f90
 base/psblas/psb_samax.f90
 base/psblas/psb_sasum.f90
 base/psblas/psb_saxpby.f90
 base/psblas/psb_sdot.f90
 base/psblas/psb_sspmm.f90
 base/psblas/psb_sspsm.f90
 base/psblas/psb_sxdot.f90
 base/psblas/psb_zamax.f90
 base/psblas/psb_zasum.f90
 base/psblas/psb_zaxpby.f90
 base/psblas/psb_zdot.f90
 base/psblas/psb_zspmm.f90
 base/psblas/psb_zspsm.f90
 base/serial/psb_cnumbmm.f90
 base/serial/psb_crwextd.f90
 base/serial/psb_csymbmm.f90
 base/serial/psb_dnumbmm.f90
 base/serial/psb_drwextd.f90
 base/serial/psb_dsymbmm.f90
 base/serial/psb_snumbmm.f90
 base/serial/psb_srwextd.f90
 base/serial/psb_ssymbmm.f90
 base/serial/psb_znumbmm.f90
 base/serial/psb_zrwextd.f90
 base/serial/psb_zsymbmm.f90
 base/tools/psb_callc.f90
 base/tools/psb_casb.f90
 base/tools/psb_ccdbldext.F90
 base/tools/psb_cd_inloc.f90
 base/tools/psb_cd_lstext.f90
 base/tools/psb_cd_reinit.f90
 base/tools/psb_cd_set_bld.f90
 base/tools/psb_cd_switch_ovl_indxmap.f90
 base/tools/psb_cdals.f90
 base/tools/psb_cdalv.f90
 base/tools/psb_cdcpy.F90
 base/tools/psb_cdins.f90
 base/tools/psb_cdprt.f90
 base/tools/psb_cdren.f90
 base/tools/psb_cdrep.f90
 base/tools/psb_cfree.f90
 base/tools/psb_cins.f90
 base/tools/psb_cspalloc.f90
 base/tools/psb_cspasb.f90
 base/tools/psb_cspfree.f90
 base/tools/psb_csphalo.F90
 base/tools/psb_cspins.f90
 base/tools/psb_csprn.f90
 base/tools/psb_dallc.f90
 base/tools/psb_dasb.f90
 base/tools/psb_dcdbldext.F90
 base/tools/psb_dfree.f90
 base/tools/psb_dins.f90
 base/tools/psb_dspalloc.f90
 base/tools/psb_dspasb.f90
 base/tools/psb_dspfree.f90
 base/tools/psb_dsphalo.F90
 base/tools/psb_dspins.f90
 base/tools/psb_dsprn.f90
 base/tools/psb_get_overlap.f90
 base/tools/psb_glob_to_loc.f90
 base/tools/psb_ialloc.f90
 base/tools/psb_iasb.f90
 base/tools/psb_icdasb.F90
 base/tools/psb_ifree.f90
 base/tools/psb_iins.f90
 base/tools/psb_linmap.f90
 base/tools/psb_loc_to_glob.f90
 base/tools/psb_map.f90
 base/tools/psb_sallc.f90
 base/tools/psb_sasb.f90
 base/tools/psb_scdbldext.F90
 base/tools/psb_sfree.f90
 base/tools/psb_sins.f90
 base/tools/psb_sspalloc.f90
 base/tools/psb_sspasb.f90
 base/tools/psb_sspfree.f90
 base/tools/psb_ssphalo.F90
 base/tools/psb_sspins.f90
 base/tools/psb_ssprn.f90
 base/tools/psb_zallc.f90
 base/tools/psb_zasb.f90
 base/tools/psb_zcdbldext.F90
 base/tools/psb_zfree.f90
 base/tools/psb_zins.f90
 base/tools/psb_zspalloc.f90
 base/tools/psb_zspasb.f90
 base/tools/psb_zspfree.f90
 base/tools/psb_zsphalo.F90
 base/tools/psb_zspins.f90
 base/tools/psb_zsprn.f90
 krylov/Makefile
 krylov/psb_base_inner_krylov_mod.f90
 krylov/psb_c_inner_krylov_mod.f90
 krylov/psb_cbicg.f90
 krylov/psb_ccg.f90
 krylov/psb_ccgs.f90
 krylov/psb_ccgstab.f90
 krylov/psb_ccgstabl.f90
 krylov/psb_ckrylov.f90
 krylov/psb_crgmres.f90
 krylov/psb_d_inner_krylov_mod.f90
 krylov/psb_dbicg.f90
 krylov/psb_dcg.F90
 krylov/psb_dcgs.f90
 krylov/psb_dcgstab.F90
 krylov/psb_dcgstabl.f90
 krylov/psb_dkrylov.f90
 krylov/psb_drgmres.f90
 krylov/psb_krylov_mod.f90
 krylov/psb_s_inner_krylov_mod.f90
 krylov/psb_sbicg.f90
 krylov/psb_scg.F90
 krylov/psb_scgs.f90
 krylov/psb_scgstab.F90
 krylov/psb_scgstabl.f90
 krylov/psb_skrylov.f90
 krylov/psb_srgmres.f90
 krylov/psb_z_inner_krylov_mod.f90
 krylov/psb_zbicg.f90
 krylov/psb_zcg.F90
 krylov/psb_zcgs.f90
 krylov/psb_zcgstab.f90
 krylov/psb_zcgstabl.f90
 krylov/psb_zkrylov.f90
 krylov/psb_zrgmres.f90
 opt/psb_d_ell_impl.f90
 opt/psb_d_rsb_mat_mod.F90
 prec/Makefile
 prec/psb_c_base_prec_mod.f90
 prec/psb_c_bjacprec.f90
 prec/psb_c_diagprec.f90
 prec/psb_c_nullprec.f90
 prec/psb_c_prec_type.f90
 prec/psb_cilu_fct.f90
 prec/psb_cprecbld.f90
 prec/psb_cprecinit.f90
 prec/psb_cprecset.f90
 prec/psb_d_base_prec_mod.f90
 prec/psb_d_bjacprec.f90
 prec/psb_d_diagprec.f90
 prec/psb_d_nullprec.f90
 prec/psb_d_prec_type.f90
 prec/psb_dilu_fct.f90
 prec/psb_dprecbld.f90
 prec/psb_dprecinit.f90
 prec/psb_dprecset.f90
 prec/psb_prec_const_mod.f90
 prec/psb_prec_mod.f90
 prec/psb_s_base_prec_mod.f90
 prec/psb_s_bjacprec.f90
 prec/psb_s_diagprec.f90
 prec/psb_s_nullprec.f90
 prec/psb_s_prec_type.f90
 prec/psb_silu_fct.f90
 prec/psb_sprecbld.f90
 prec/psb_sprecinit.f90
 prec/psb_sprecset.f90
 prec/psb_z_base_prec_mod.f90
 prec/psb_z_bjacprec.f90
 prec/psb_z_diagprec.f90
 prec/psb_z_nullprec.f90
 prec/psb_z_prec_type.f90
 prec/psb_zilu_fct.f90
 prec/psb_zprecbld.f90
 prec/psb_zprecinit.f90
 prec/psb_zprecset.f90
 test/fileread/cf_sample.f90
 test/fileread/df_sample.f90
 test/fileread/getp.f90
 test/fileread/sf_sample.f90
 test/fileread/zf_sample.f90
 test/newfmt/ppde.F90
 test/newfmt/spde.f90
 test/pargen/ppde.f90
 test/pargen/spde.f90
 test/serial/d_coo_matgen.f90
 test/serial/d_matgen.f90
 test/serial/psb_d_cxx_impl.f90
 test/serial/psb_d_cyy_impl.f90
 test/torture/psb_c_mvsv_tester.f90
 test/torture/psb_d_mvsv_tester.f90
 test/torture/psb_s_mvsv_tester.f90
 test/torture/psb_z_mvsv_tester.f90
 test/torture/psbtf.f90
 test/util/dhb2mm.f90
 test/util/dmm2hb.f90
 test/util/zhb2mm.f90
 test/util/zmm2hb.f90
 util/psb_hbio_impl.f90
 util/psb_hbio_mod.f90
 util/psb_mat_dist_impl.f90
 util/psb_mat_dist_mod.f90
 util/psb_metispart_mod.F90
 util/psb_mmio_impl.f90
 util/psb_mmio_mod.f90


Changed psb_sparse_mod into psb_base_mod, added psb_csprt. This allows
the cbind stuff to be shared between version 2 and version 3.
This commit is contained in:
Salvatore Filippone
2011-03-21 15:54:31 +00:00
parent 9993b41288
commit 324830ef7b
234 changed files with 1031 additions and 923 deletions
+1 -1
View File
@@ -25,7 +25,7 @@ UTIL_MODS = psb_string_mod.o psb_desc_const_mod.o psb_indx_map_mod.o\
MODULES=$(BASIC_MODS) $(UTIL_MODS)
LIBMOD=psb_sparse_mod$(.mod)
LIBMOD=psb_base_mod$(.mod)
OBJS = error.o psb_sparse_mod.o $(EXTRA_COBJS) cutil.o
LIBDIR=..
CINCLUDES=-I.
+119 -11
View File
@@ -98,7 +98,7 @@ module psb_serial_mod
type(psb_z_csr_sparse_mat), intent(out) :: c
integer, intent(out) :: info
end subroutine psb_zbase_symbmm
end interface
end interface psb_symbmm
interface psb_numbmm
subroutine psb_snumbmm(a,b,c)
@@ -149,7 +149,7 @@ module psb_serial_mod
class(psb_z_base_sparse_mat), intent(in) :: a,b
type(psb_z_csr_sparse_mat), intent(inout) :: c
end subroutine psb_zbase_numbmm
end interface
end interface psb_numbmm
interface psb_rwextd
subroutine psb_srwextd(nr,a,info,b,rowscale)
@@ -224,7 +224,7 @@ module psb_serial_mod
class(psb_z_base_sparse_mat), intent(in), optional :: b
logical,intent(in), optional :: rowscale
end subroutine psb_zbase_rwextd
end interface
end interface psb_rwextd
interface psb_geprt
@@ -324,10 +324,13 @@ module psb_serial_mod
complex(psb_dpk_), intent(in) :: a(:)
character(len=*), optional :: head
end subroutine psb_zgeprt1
end interface
end interface psb_geprt
interface psb_csprt
module procedure psb_scsprt, psb_scsprtn, psb_dcsprt, psb_dcsprtn, &
& psb_ccsprt, psb_ccsprtn, psb_zcsprt, psb_zcsprtn
end interface psb_csprt
interface psb_spdot_srtd
function psb_s_spdot_srtd(nv1,iv1,v1,nv2,iv2,v2) result(dot)
use psb_const_mod
@@ -360,7 +363,7 @@ module psb_serial_mod
complex(psb_dpk_), intent(in) :: v1(*),v2(*)
complex(psb_dpk_) :: dot
end function psb_z_spdot_srtd
end interface
end interface psb_spdot_srtd
interface psb_spge_dot
@@ -395,7 +398,7 @@ module psb_serial_mod
complex(psb_dpk_), intent(in) :: v1(*),v2(*)
complex(psb_dpk_) :: dot
end function psb_z_spge_dot
end interface
end interface psb_spge_dot
interface psb_nspaxpby
@@ -410,7 +413,7 @@ module psb_serial_mod
real(psb_dpk_), intent (in) :: alpha, beta
integer, intent(out) :: info
end subroutine psb_d_nspaxpby
end interface
end interface psb_nspaxpby
interface psb_aspxpby
subroutine psb_s_aspxpby(alpha, nx, ix, x, beta, y, info)
@@ -449,8 +452,113 @@ module psb_serial_mod
complex(psb_dpk_), intent (in) :: alpha, beta
integer, intent(out) :: info
end subroutine psb_z_aspxpby
end interface
end interface psb_aspxpby
contains
subroutine psb_scsprt(iout,a,iv,irs,ics,head,ivr,ivc)
use psb_mat_mod
integer, intent(in) :: iout
type(psb_sspmat_type), intent(in) :: a
integer, intent(in), optional :: iv(:)
integer, intent(in), optional :: irs,ics
character(len=*), optional :: head
integer, intent(in), optional :: ivr(:),ivc(:)
call a%print(iout,iv,irs,ics,head,ivr,ivc)
end subroutine psb_scsprt
subroutine psb_scsprtn(fname,a,iv,irs,ics,head,ivr,ivc)
use psb_mat_mod
character(len=*), intent(in) :: fname
type(psb_sspmat_type), intent(in) :: a
integer, intent(in), optional :: iv(:)
integer, intent(in), optional :: irs,ics
character(len=*), optional :: head
integer, intent(in), optional :: ivr(:),ivc(:)
call a%print(fname,iv,irs,ics,head,ivr,ivc)
end subroutine psb_scsprtn
subroutine psb_dcsprt(iout,a,iv,irs,ics,head,ivr,ivc)
use psb_mat_mod
integer, intent(in) :: iout
type(psb_dspmat_type), intent(in) :: a
integer, intent(in), optional :: iv(:)
integer, intent(in), optional :: irs,ics
character(len=*), optional :: head
integer, intent(in), optional :: ivr(:),ivc(:)
call a%print(iout,iv,irs,ics,head,ivr,ivc)
end subroutine psb_dcsprt
subroutine psb_dcsprtn(fname,a,iv,irs,ics,head,ivr,ivc)
use psb_mat_mod
character(len=*), intent(in) :: fname
type(psb_dspmat_type), intent(in) :: a
integer, intent(in), optional :: iv(:)
integer, intent(in), optional :: irs,ics
character(len=*), optional :: head
integer, intent(in), optional :: ivr(:),ivc(:)
call a%print(fname,iv,irs,ics,head,ivr,ivc)
end subroutine psb_dcsprtn
subroutine psb_ccsprt(iout,a,iv,irs,ics,head,ivr,ivc)
use psb_mat_mod
integer, intent(in) :: iout
type(psb_cspmat_type), intent(in) :: a
integer, intent(in), optional :: iv(:)
integer, intent(in), optional :: irs,ics
character(len=*), optional :: head
integer, intent(in), optional :: ivr(:),ivc(:)
call a%print(iout,iv,irs,ics,head,ivr,ivc)
end subroutine psb_ccsprt
subroutine psb_ccsprtn(fname,a,iv,irs,ics,head,ivr,ivc)
use psb_mat_mod
character(len=*), intent(in) :: fname
type(psb_cspmat_type), intent(in) :: a
integer, intent(in), optional :: iv(:)
integer, intent(in), optional :: irs,ics
character(len=*), optional :: head
integer, intent(in), optional :: ivr(:),ivc(:)
call a%print(fname,iv,irs,ics,head,ivr,ivc)
end subroutine psb_ccsprtn
subroutine psb_zcsprt(iout,a,iv,irs,ics,head,ivr,ivc)
use psb_mat_mod
integer, intent(in) :: iout
type(psb_zspmat_type), intent(in) :: a
integer, intent(in), optional :: iv(:)
integer, intent(in), optional :: irs,ics
character(len=*), optional :: head
integer, intent(in), optional :: ivr(:),ivc(:)
call a%print(iout,iv,irs,ics,head,ivr,ivc)
end subroutine psb_zcsprt
subroutine psb_zcsprtn(fname,a,iv,irs,ics,head,ivr,ivc)
use psb_mat_mod
character(len=*), intent(in) :: fname
type(psb_zspmat_type), intent(in) :: a
integer, intent(in), optional :: iv(:)
integer, intent(in), optional :: irs,ics
character(len=*), optional :: head
integer, intent(in), optional :: ivr(:),ivc(:)
call a%print(fname,iv,irs,ics,head,ivr,ivc)
end subroutine psb_zcsprtn
end module psb_serial_mod
+2 -2
View File
@@ -29,7 +29,7 @@
!!$ POSSIBILITY OF SUCH DAMAGE.
!!$
!!$
module psb_sparse_mod
module psb_base_mod
use psb_string_mod
use psb_error_mod
use psb_penv_mod
@@ -42,4 +42,4 @@ module psb_sparse_mod
use psb_psblas_mod
use psb_gps_mod
use psb_tools_mod
end module psb_sparse_mod
end module psb_base_mod