From 8c6358a2266d70d73e9a439f22f964889755202a Mon Sep 17 00:00:00 2001 From: Salvatore Filippone Date: Tue, 2 Nov 2010 10:17:55 +0000 Subject: [PATCH] psblas3: base/comm/psb_dspgather.F90 base/modules/psb_c_linmap_mod.f90 base/modules/psb_c_mat_mod.f03 base/modules/psb_c_psblas_mod.f90 base/modules/psb_c_tools_mod.f90 base/modules/psb_comm_mod.f90 base/modules/psb_d_linmap_mod.f90 base/modules/psb_d_mat_mod.f03 base/modules/psb_d_psblas_mod.f90 base/modules/psb_d_tools_mod.f90 base/modules/psb_linmap_type_mod.f90 base/modules/psb_s_linmap_mod.f90 base/modules/psb_s_mat_mod.f03 base/modules/psb_s_psblas_mod.f90 base/modules/psb_s_tools_mod.f90 base/modules/psb_serial_mod.f90 base/modules/psb_z_linmap_mod.f90 base/modules/psb_z_mat_mod.f03 base/modules/psb_z_psblas_mod.f90 base/modules/psb_z_tools_mod.f90 base/psblas/psb_cnrmi.f90 base/psblas/psb_cspmm.f90 base/psblas/psb_cspsm.f90 base/psblas/psb_dnrmi.f90 base/psblas/psb_dspmm.f90 base/psblas/psb_dspnrm1.f90 base/psblas/psb_dspsm.f90 base/psblas/psb_snrmi.f90 base/psblas/psb_sspmm.f90 base/psblas/psb_sspsm.f90 base/psblas/psb_znrmi.f90 base/psblas/psb_zspmm.f90 base/psblas/psb_zspsm.f90 base/serial/f03/psb_c_mat_impl.F03 base/serial/f03/psb_d_mat_impl.F03 base/serial/f03/psb_s_mat_impl.F03 base/serial/f03/psb_z_mat_impl.F03 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_ccdbldext.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_dcdbldext.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_linmap.f90 base/tools/psb_scdbldext.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_zcdbldext.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/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 prec/psb_c_base_prec_mod.f03 prec/psb_c_bjacprec.f03 prec/psb_c_diagprec.f03 prec/psb_c_nullprec.f03 prec/psb_c_prec_type.f03 prec/psb_cilu_fct.f90 prec/psb_cprecbld.f90 prec/psb_d_base_prec_mod.f03 prec/psb_d_bjacprec.f03 prec/psb_d_diagprec.f03 prec/psb_d_nullprec.f03 prec/psb_d_prec_type.f03 prec/psb_dilu_fct.f90 prec/psb_dprecbld.f90 prec/psb_prec_mod.f90 prec/psb_s_base_prec_mod.f03 prec/psb_s_bjacprec.f03 prec/psb_s_diagprec.f03 prec/psb_s_nullprec.f03 prec/psb_s_prec_type.f03 prec/psb_silu_fct.f90 prec/psb_sprecbld.f90 prec/psb_z_base_prec_mod.f03 prec/psb_z_bjacprec.f03 prec/psb_z_diagprec.f03 prec/psb_z_nullprec.f03 prec/psb_z_prec_type.f03 prec/psb_zilu_fct.f90 prec/psb_zprecbld.f90 test/fileread/cf_sample.f90 test/fileread/df_sample.f90 test/fileread/sf_sample.f90 test/fileread/zf_sample.f90 test/pargen/ppde.f90 test/pargen/spde.f90 test/serial/d_coo_matgen.f03 test/serial/d_matgen.f03 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/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 Revised name of outer sparse type to be backward-compatible. --- base/comm/psb_dspgather.F90 | 4 +- base/modules/psb_c_linmap_mod.f90 | 4 +- base/modules/psb_c_mat_mod.f03 | 260 ++++++++++++------------- base/modules/psb_c_psblas_mod.f90 | 20 +- base/modules/psb_c_tools_mod.f90 | 40 ++-- base/modules/psb_comm_mod.f90 | 4 +- base/modules/psb_d_linmap_mod.f90 | 4 +- base/modules/psb_d_mat_mod.f03 | 280 +++++++++++++-------------- base/modules/psb_d_psblas_mod.f90 | 24 +-- base/modules/psb_d_tools_mod.f90 | 40 ++-- base/modules/psb_linmap_type_mod.f90 | 10 +- base/modules/psb_s_linmap_mod.f90 | 4 +- base/modules/psb_s_mat_mod.f03 | 260 ++++++++++++------------- base/modules/psb_s_psblas_mod.f90 | 20 +- base/modules/psb_s_tools_mod.f90 | 40 ++-- base/modules/psb_serial_mod.f90 | 72 +++---- base/modules/psb_z_linmap_mod.f90 | 4 +- base/modules/psb_z_mat_mod.f03 | 260 ++++++++++++------------- base/modules/psb_z_psblas_mod.f90 | 20 +- base/modules/psb_z_tools_mod.f90 | 40 ++-- base/psblas/psb_cnrmi.f90 | 2 +- base/psblas/psb_cspmm.f90 | 6 +- base/psblas/psb_cspsm.f90 | 8 +- base/psblas/psb_dnrmi.f90 | 2 +- base/psblas/psb_dspmm.f90 | 4 +- base/psblas/psb_dspnrm1.f90 | 2 +- base/psblas/psb_dspsm.f90 | 4 +- base/psblas/psb_snrmi.f90 | 2 +- base/psblas/psb_sspmm.f90 | 4 +- base/psblas/psb_sspsm.f90 | 4 +- base/psblas/psb_znrmi.f90 | 4 +- base/psblas/psb_zspmm.f90 | 8 +- base/psblas/psb_zspsm.f90 | 8 +- base/serial/f03/psb_c_mat_impl.F03 | 126 ++++++------ base/serial/f03/psb_d_mat_impl.F03 | 136 ++++++------- base/serial/f03/psb_s_mat_impl.F03 | 126 ++++++------ base/serial/f03/psb_z_mat_impl.F03 | 126 ++++++------ base/serial/psb_cnumbmm.f90 | 4 +- base/serial/psb_crwextd.f90 | 4 +- base/serial/psb_csymbmm.f90 | 4 +- base/serial/psb_dnumbmm.f90 | 4 +- base/serial/psb_drwextd.f90 | 4 +- base/serial/psb_dsymbmm.f90 | 4 +- base/serial/psb_snumbmm.f90 | 4 +- base/serial/psb_srwextd.f90 | 4 +- base/serial/psb_ssymbmm.f90 | 4 +- base/serial/psb_znumbmm.f90 | 4 +- base/serial/psb_zrwextd.f90 | 4 +- base/serial/psb_zsymbmm.f90 | 4 +- base/tools/psb_ccdbldext.F90 | 4 +- base/tools/psb_cspalloc.f90 | 4 +- base/tools/psb_cspasb.f90 | 4 +- base/tools/psb_cspfree.f90 | 4 +- base/tools/psb_csphalo.F90 | 8 +- base/tools/psb_cspins.f90 | 6 +- base/tools/psb_csprn.f90 | 4 +- base/tools/psb_dcdbldext.F90 | 4 +- base/tools/psb_dspalloc.f90 | 4 +- base/tools/psb_dspasb.f90 | 4 +- base/tools/psb_dspfree.f90 | 4 +- base/tools/psb_dsphalo.F90 | 4 +- base/tools/psb_dspins.f90 | 6 +- base/tools/psb_dsprn.f90 | 4 +- base/tools/psb_linmap.f90 | 8 +- base/tools/psb_scdbldext.F90 | 2 +- base/tools/psb_sspalloc.f90 | 4 +- base/tools/psb_sspasb.f90 | 4 +- base/tools/psb_sspfree.f90 | 2 +- base/tools/psb_ssphalo.F90 | 4 +- base/tools/psb_sspins.f90 | 6 +- base/tools/psb_ssprn.f90 | 4 +- base/tools/psb_zcdbldext.F90 | 4 +- base/tools/psb_zspalloc.f90 | 4 +- base/tools/psb_zspasb.f90 | 4 +- base/tools/psb_zspfree.f90 | 4 +- base/tools/psb_zsphalo.F90 | 8 +- base/tools/psb_zspins.f90 | 6 +- base/tools/psb_zsprn.f90 | 4 +- krylov/psb_c_inner_krylov_mod.f90 | 2 +- krylov/psb_cbicg.f90 | 4 +- krylov/psb_ccg.f90 | 4 +- krylov/psb_ccgs.f90 | 4 +- krylov/psb_ccgstab.f90 | 4 +- krylov/psb_ccgstabl.f90 | 4 +- krylov/psb_ckrylov.f90 | 28 +-- krylov/psb_crgmres.f90 | 4 +- krylov/psb_d_inner_krylov_mod.f90 | 2 +- krylov/psb_dbicg.f90 | 4 +- krylov/psb_dcg.F90 | 4 +- krylov/psb_dcgs.f90 | 4 +- krylov/psb_dcgstab.F90 | 4 +- krylov/psb_dcgstabl.f90 | 4 +- krylov/psb_dkrylov.f90 | 28 +-- krylov/psb_drgmres.f90 | 4 +- krylov/psb_krylov_mod.f90 | 16 +- krylov/psb_s_inner_krylov_mod.f90 | 2 +- krylov/psb_sbicg.f90 | 4 +- krylov/psb_scg.F90 | 4 +- krylov/psb_scgs.f90 | 4 +- krylov/psb_scgstab.F90 | 4 +- krylov/psb_scgstabl.f90 | 4 +- krylov/psb_skrylov.f90 | 28 +-- krylov/psb_srgmres.f90 | 4 +- krylov/psb_z_inner_krylov_mod.f90 | 2 +- krylov/psb_zbicg.f90 | 4 +- krylov/psb_zcg.F90 | 4 +- krylov/psb_zcgs.f90 | 4 +- krylov/psb_zcgstab.f90 | 4 +- krylov/psb_zcgstabl.f90 | 4 +- krylov/psb_zkrylov.f90 | 28 +-- krylov/psb_zrgmres.f90 | 4 +- prec/psb_c_base_prec_mod.f03 | 4 +- prec/psb_c_bjacprec.f03 | 4 +- prec/psb_c_diagprec.f03 | 2 +- prec/psb_c_nullprec.f03 | 2 +- prec/psb_c_prec_type.f03 | 2 +- prec/psb_cilu_fct.f90 | 8 +- prec/psb_cprecbld.f90 | 2 +- prec/psb_d_base_prec_mod.f03 | 4 +- prec/psb_d_bjacprec.f03 | 4 +- prec/psb_d_diagprec.f03 | 2 +- prec/psb_d_nullprec.f03 | 2 +- prec/psb_d_prec_type.f03 | 2 +- prec/psb_dilu_fct.f90 | 10 +- prec/psb_dprecbld.f90 | 2 +- prec/psb_prec_mod.f90 | 54 +++--- prec/psb_s_base_prec_mod.f03 | 4 +- prec/psb_s_bjacprec.f03 | 4 +- prec/psb_s_diagprec.f03 | 2 +- prec/psb_s_nullprec.f03 | 2 +- prec/psb_s_prec_type.f03 | 2 +- prec/psb_silu_fct.f90 | 10 +- prec/psb_sprecbld.f90 | 2 +- prec/psb_z_base_prec_mod.f03 | 4 +- prec/psb_z_bjacprec.f03 | 4 +- prec/psb_z_diagprec.f03 | 2 +- prec/psb_z_nullprec.f03 | 2 +- prec/psb_z_prec_type.f03 | 2 +- prec/psb_zilu_fct.f90 | 8 +- prec/psb_zprecbld.f90 | 2 +- test/fileread/cf_sample.f90 | 2 +- test/fileread/df_sample.f90 | 2 +- test/fileread/sf_sample.f90 | 2 +- test/fileread/zf_sample.f90 | 2 +- test/pargen/ppde.f90 | 4 +- test/pargen/spde.f90 | 4 +- test/serial/d_coo_matgen.f03 | 4 +- test/serial/d_matgen.f03 | 6 +- test/torture/psb_c_mvsv_tester.f90 | 72 +++---- test/torture/psb_d_mvsv_tester.f90 | 72 +++---- test/torture/psb_s_mvsv_tester.f90 | 72 +++---- test/torture/psb_z_mvsv_tester.f90 | 72 +++---- test/util/dhb2mm.f90 | 2 +- test/util/dmm2hb.f90 | 2 +- test/util/zhb2mm.f90 | 2 +- test/util/zmm2hb.f90 | 2 +- util/psb_hbio_impl.f90 | 16 +- util/psb_hbio_mod.f90 | 32 +-- util/psb_mat_dist_impl.f90 | 16 +- util/psb_mat_dist_mod.f90 | 24 +-- util/psb_metispart_mod.F90 | 8 +- util/psb_mmio_impl.f90 | 16 +- util/psb_mmio_mod.f90 | 32 +-- 163 files changed, 1507 insertions(+), 1507 deletions(-) diff --git a/base/comm/psb_dspgather.F90 b/base/comm/psb_dspgather.F90 index d69ed79c..d452293d 100644 --- a/base/comm/psb_dspgather.F90 +++ b/base/comm/psb_dspgather.F90 @@ -10,8 +10,8 @@ subroutine psb_dsp_allgather(globa, loca, desc_a, info, root, dupl,keepnum,keep #ifdef MPI_H include 'mpif.h' #endif - type(psb_d_sparse_mat), intent(inout) :: loca - type(psb_d_sparse_mat), intent(inout) :: globa + type(psb_dspmat_type), intent(inout) :: loca + type(psb_dspmat_type), intent(inout) :: globa type(psb_desc_type), intent(in) :: desc_a integer, intent(out) :: info integer, intent(in), optional :: root, dupl diff --git a/base/modules/psb_c_linmap_mod.f90 b/base/modules/psb_c_linmap_mod.f90 index 87be88fa..69e2cfd9 100644 --- a/base/modules/psb_c_linmap_mod.f90 +++ b/base/modules/psb_c_linmap_mod.f90 @@ -98,7 +98,7 @@ module psb_c_linmap_mod implicit none type(psb_clinmap_type) :: psb_c_linmap type(psb_desc_type), target :: desc_X, desc_Y - type(psb_c_sparse_mat), intent(in) :: map_X2Y, map_Y2X + type(psb_cspmat_type), intent(in) :: map_X2Y, map_Y2X integer, intent(in) :: map_kind integer, intent(in), optional :: iaggr(:), naggr(:) end function psb_c_linmap @@ -200,7 +200,7 @@ contains implicit none type(psb_clinmap_type), intent(out) :: out_map type(psb_desc_type), target :: desc_X, desc_Y - type(psb_c_sparse_mat), intent(in) :: map_X2Y, map_Y2X + type(psb_cspmat_type), intent(in) :: map_X2Y, map_Y2X integer, intent(in) :: map_kind integer, intent(in), optional :: iaggr(:), naggr(:) out_map = psb_linmap(map_kind,desc_X,desc_Y,map_X2Y,map_Y2X,iaggr,naggr) diff --git a/base/modules/psb_c_mat_mod.f03 b/base/modules/psb_c_mat_mod.f03 index b7a00341..071ee00d 100644 --- a/base/modules/psb_c_mat_mod.f03 +++ b/base/modules/psb_c_mat_mod.f03 @@ -48,7 +48,7 @@ module psb_c_mat_mod use psb_c_csr_mat_mod, only : psb_c_csr_sparse_mat use psb_c_csc_mat_mod, only : psb_c_csc_sparse_mat - type :: psb_c_sparse_mat + type :: psb_cspmat_type class(psb_c_base_sparse_mat), allocatable :: a @@ -141,7 +141,7 @@ module psb_c_mat_mod procedure, pass(a) :: c_cssm => psb_c_cssm generic, public :: cssm => c_cssm, c_cssv - end type psb_c_sparse_mat + end type psb_cspmat_type private :: psb_c_get_nrows, psb_c_get_ncols, psb_c_get_nzeros, psb_c_get_size, & & psb_c_get_state, psb_c_get_dupl, psb_c_is_null, psb_c_is_bld, psb_c_is_upd, & @@ -169,100 +169,100 @@ module psb_c_mat_mod interface subroutine psb_c_set_nrows(m,a) - import :: psb_c_sparse_mat - class(psb_c_sparse_mat), intent(inout) :: a + import :: psb_cspmat_type + class(psb_cspmat_type), intent(inout) :: a integer, intent(in) :: m end subroutine psb_c_set_nrows end interface interface subroutine psb_c_set_ncols(n,a) - import :: psb_c_sparse_mat - class(psb_c_sparse_mat), intent(inout) :: a + import :: psb_cspmat_type + class(psb_cspmat_type), intent(inout) :: a integer, intent(in) :: n end subroutine psb_c_set_ncols end interface interface subroutine psb_c_set_state(n,a) - import :: psb_c_sparse_mat - class(psb_c_sparse_mat), intent(inout) :: a + import :: psb_cspmat_type + class(psb_cspmat_type), intent(inout) :: a integer, intent(in) :: n end subroutine psb_c_set_state end interface interface subroutine psb_c_set_dupl(n,a) - import :: psb_c_sparse_mat - class(psb_c_sparse_mat), intent(inout) :: a + import :: psb_cspmat_type + class(psb_cspmat_type), intent(inout) :: a integer, intent(in) :: n end subroutine psb_c_set_dupl end interface interface subroutine psb_c_set_null(a) - import :: psb_c_sparse_mat - class(psb_c_sparse_mat), intent(inout) :: a + import :: psb_cspmat_type + class(psb_cspmat_type), intent(inout) :: a end subroutine psb_c_set_null end interface interface subroutine psb_c_set_bld(a) - import :: psb_c_sparse_mat - class(psb_c_sparse_mat), intent(inout) :: a + import :: psb_cspmat_type + class(psb_cspmat_type), intent(inout) :: a end subroutine psb_c_set_bld end interface interface subroutine psb_c_set_upd(a) - import :: psb_c_sparse_mat - class(psb_c_sparse_mat), intent(inout) :: a + import :: psb_cspmat_type + class(psb_cspmat_type), intent(inout) :: a end subroutine psb_c_set_upd end interface interface subroutine psb_c_set_asb(a) - import :: psb_c_sparse_mat - class(psb_c_sparse_mat), intent(inout) :: a + import :: psb_cspmat_type + class(psb_cspmat_type), intent(inout) :: a end subroutine psb_c_set_asb end interface interface subroutine psb_c_set_sorted(a,val) - import :: psb_c_sparse_mat - class(psb_c_sparse_mat), intent(inout) :: a + import :: psb_cspmat_type + class(psb_cspmat_type), intent(inout) :: a logical, intent(in), optional :: val end subroutine psb_c_set_sorted end interface interface subroutine psb_c_set_triangle(a,val) - import :: psb_c_sparse_mat - class(psb_c_sparse_mat), intent(inout) :: a + import :: psb_cspmat_type + class(psb_cspmat_type), intent(inout) :: a logical, intent(in), optional :: val end subroutine psb_c_set_triangle end interface interface subroutine psb_c_set_unit(a,val) - import :: psb_c_sparse_mat - class(psb_c_sparse_mat), intent(inout) :: a + import :: psb_cspmat_type + class(psb_cspmat_type), intent(inout) :: a logical, intent(in), optional :: val end subroutine psb_c_set_unit end interface interface subroutine psb_c_set_lower(a,val) - import :: psb_c_sparse_mat - class(psb_c_sparse_mat), intent(inout) :: a + import :: psb_cspmat_type + class(psb_cspmat_type), intent(inout) :: a logical, intent(in), optional :: val end subroutine psb_c_set_lower end interface interface subroutine psb_c_set_upper(a,val) - import :: psb_c_sparse_mat - class(psb_c_sparse_mat), intent(inout) :: a + import :: psb_cspmat_type + class(psb_cspmat_type), intent(inout) :: a logical, intent(in), optional :: val end subroutine psb_c_set_upper end interface @@ -270,9 +270,9 @@ module psb_c_mat_mod interface subroutine psb_c_sparse_print(iout,a,iv,eirs,eics,head,ivr,ivc) - import :: psb_c_sparse_mat + import :: psb_cspmat_type integer, intent(in) :: iout - class(psb_c_sparse_mat), intent(in) :: a + class(psb_cspmat_type), intent(in) :: a integer, intent(in), optional :: iv(:) integer, intent(in), optional :: eirs,eics character(len=*), optional :: head @@ -282,8 +282,8 @@ module psb_c_mat_mod interface subroutine psb_c_get_neigh(a,idx,neigh,n,info,lev) - import :: psb_c_sparse_mat - class(psb_c_sparse_mat), intent(in) :: a + import :: psb_cspmat_type + class(psb_cspmat_type), intent(in) :: a integer, intent(in) :: idx integer, intent(out) :: n integer, allocatable, intent(out) :: neigh(:) @@ -294,8 +294,8 @@ module psb_c_mat_mod interface subroutine psb_c_csall(nr,nc,a,info,nz) - import :: psb_c_sparse_mat - class(psb_c_sparse_mat), intent(out) :: a + import :: psb_cspmat_type + class(psb_cspmat_type), intent(out) :: a integer, intent(in) :: nr,nc integer, intent(out) :: info integer, intent(in), optional :: nz @@ -304,30 +304,30 @@ module psb_c_mat_mod interface subroutine psb_c_reallocate_nz(nz,a) - import :: psb_c_sparse_mat + import :: psb_cspmat_type integer, intent(in) :: nz - class(psb_c_sparse_mat), intent(inout) :: a + class(psb_cspmat_type), intent(inout) :: a end subroutine psb_c_reallocate_nz end interface interface subroutine psb_c_free(a) - import :: psb_c_sparse_mat - class(psb_c_sparse_mat), intent(inout) :: a + import :: psb_cspmat_type + class(psb_cspmat_type), intent(inout) :: a end subroutine psb_c_free end interface interface subroutine psb_c_trim(a) - import :: psb_c_sparse_mat - class(psb_c_sparse_mat), intent(inout) :: a + import :: psb_cspmat_type + class(psb_cspmat_type), intent(inout) :: a end subroutine psb_c_trim end interface interface subroutine psb_c_csput(nz,ia,ja,val,a,imin,imax,jmin,jmax,info,gtl) - import :: psb_c_sparse_mat, psb_spk_ - class(psb_c_sparse_mat), intent(inout) :: a + import :: psb_cspmat_type, psb_spk_ + class(psb_cspmat_type), intent(inout) :: a complex(psb_spk_), intent(in) :: val(:) integer, intent(in) :: nz, ia(:), ja(:), imin,imax,jmin,jmax integer, intent(out) :: info @@ -338,8 +338,8 @@ module psb_c_mat_mod interface subroutine psb_c_csgetptn(imin,imax,a,nz,ia,ja,info,& & jmin,jmax,iren,append,nzin,rscale,cscale) - import :: psb_c_sparse_mat, psb_spk_ - class(psb_c_sparse_mat), intent(in) :: a + import :: psb_cspmat_type, psb_spk_ + class(psb_cspmat_type), intent(in) :: a integer, intent(in) :: imin,imax integer, intent(out) :: nz integer, allocatable, intent(inout) :: ia(:), ja(:) @@ -354,8 +354,8 @@ module psb_c_mat_mod interface subroutine psb_c_csgetrow(imin,imax,a,nz,ia,ja,val,info,& & jmin,jmax,iren,append,nzin,rscale,cscale) - import :: psb_c_sparse_mat, psb_spk_ - class(psb_c_sparse_mat), intent(in) :: a + import :: psb_cspmat_type, psb_spk_ + class(psb_cspmat_type), intent(in) :: a integer, intent(in) :: imin,imax integer, intent(out) :: nz integer, allocatable, intent(inout) :: ia(:), ja(:) @@ -371,9 +371,9 @@ module psb_c_mat_mod interface subroutine psb_c_csgetblk(imin,imax,a,b,info,& & jmin,jmax,iren,append,rscale,cscale) - import :: psb_c_sparse_mat, psb_spk_ - class(psb_c_sparse_mat), intent(in) :: a - class(psb_c_sparse_mat), intent(out) :: b + import :: psb_cspmat_type, psb_spk_ + class(psb_cspmat_type), intent(in) :: a + class(psb_cspmat_type), intent(out) :: b integer, intent(in) :: imin,imax integer,intent(out) :: info logical, intent(in), optional :: append @@ -386,9 +386,9 @@ module psb_c_mat_mod interface subroutine psb_c_csclip(a,b,info,& & imin,imax,jmin,jmax,rscale,cscale) - import :: psb_c_sparse_mat, psb_spk_ - class(psb_c_sparse_mat), intent(in) :: a - class(psb_c_sparse_mat), intent(out) :: b + import :: psb_cspmat_type, psb_spk_ + class(psb_cspmat_type), intent(in) :: a + class(psb_cspmat_type), intent(out) :: b integer,intent(out) :: info integer, intent(in), optional :: imin,imax,jmin,jmax logical, intent(in), optional :: rscale,cscale @@ -398,8 +398,8 @@ module psb_c_mat_mod interface subroutine psb_c_b_csclip(a,b,info,& & imin,imax,jmin,jmax,rscale,cscale) - import :: psb_c_sparse_mat, psb_spk_, psb_c_coo_sparse_mat - class(psb_c_sparse_mat), intent(in) :: a + import :: psb_cspmat_type, psb_spk_, psb_c_coo_sparse_mat + class(psb_cspmat_type), intent(in) :: a type(psb_c_coo_sparse_mat), intent(out) :: b integer,intent(out) :: info integer, intent(in), optional :: imin,imax,jmin,jmax @@ -409,9 +409,9 @@ module psb_c_mat_mod interface subroutine psb_c_cscnv(a,b,info,type,mold,upd,dupl) - import :: psb_c_sparse_mat, psb_spk_, psb_c_base_sparse_mat - class(psb_c_sparse_mat), intent(in) :: a - class(psb_c_sparse_mat), intent(out) :: b + import :: psb_cspmat_type, psb_spk_, psb_c_base_sparse_mat + class(psb_cspmat_type), intent(in) :: a + class(psb_cspmat_type), intent(out) :: b integer, intent(out) :: info integer,optional, intent(in) :: dupl, upd character(len=*), optional, intent(in) :: type @@ -422,8 +422,8 @@ module psb_c_mat_mod interface subroutine psb_c_cscnv_ip(a,iinfo,type,mold,dupl) - import :: psb_c_sparse_mat, psb_spk_, psb_c_base_sparse_mat - class(psb_c_sparse_mat), intent(inout) :: a + import :: psb_cspmat_type, psb_spk_, psb_c_base_sparse_mat + class(psb_cspmat_type), intent(inout) :: a integer, intent(out) :: iinfo integer,optional, intent(in) :: dupl character(len=*), optional, intent(in) :: type @@ -434,8 +434,8 @@ module psb_c_mat_mod interface subroutine psb_c_cscnv_base(a,b,info,dupl) - import :: psb_c_sparse_mat, psb_spk_, psb_c_base_sparse_mat - class(psb_c_sparse_mat), intent(in) :: a + import :: psb_cspmat_type, psb_spk_, psb_c_base_sparse_mat + class(psb_cspmat_type), intent(in) :: a class(psb_c_base_sparse_mat), intent(out) :: b integer, intent(out) :: info integer,optional, intent(in) :: dupl @@ -444,106 +444,106 @@ module psb_c_mat_mod interface subroutine psb_c_clip_d(a,b,info) - import :: psb_c_sparse_mat - class(psb_c_sparse_mat), intent(in) :: a - class(psb_c_sparse_mat), intent(out) :: b + import :: psb_cspmat_type + class(psb_cspmat_type), intent(in) :: a + class(psb_cspmat_type), intent(out) :: b integer,intent(out) :: info end subroutine psb_c_clip_d end interface interface subroutine psb_c_clip_d_ip(a,info) - import :: psb_c_sparse_mat - class(psb_c_sparse_mat), intent(inout) :: a + import :: psb_cspmat_type + class(psb_cspmat_type), intent(inout) :: a integer,intent(out) :: info end subroutine psb_c_clip_d_ip end interface interface subroutine psb_c_mv_from(a,b) - import :: psb_c_sparse_mat, psb_spk_, psb_c_base_sparse_mat - class(psb_c_sparse_mat), intent(out) :: a + import :: psb_cspmat_type, psb_spk_, psb_c_base_sparse_mat + class(psb_cspmat_type), intent(out) :: a class(psb_c_base_sparse_mat), intent(inout) :: b end subroutine psb_c_mv_from end interface interface subroutine psb_c_cp_from(a,b) - import :: psb_c_sparse_mat, psb_spk_, psb_c_base_sparse_mat - class(psb_c_sparse_mat), intent(out) :: a + import :: psb_cspmat_type, psb_spk_, psb_c_base_sparse_mat + class(psb_cspmat_type), intent(out) :: a class(psb_c_base_sparse_mat), intent(inout), allocatable :: b end subroutine psb_c_cp_from end interface interface subroutine psb_c_mv_to(a,b) - import :: psb_c_sparse_mat, psb_spk_, psb_c_base_sparse_mat - class(psb_c_sparse_mat), intent(inout) :: a + import :: psb_cspmat_type, psb_spk_, psb_c_base_sparse_mat + class(psb_cspmat_type), intent(inout) :: a class(psb_c_base_sparse_mat), intent(out) :: b end subroutine psb_c_mv_to end interface interface subroutine psb_c_cp_to(a,b) - import :: psb_c_sparse_mat, psb_spk_, psb_c_base_sparse_mat - class(psb_c_sparse_mat), intent(in) :: a + import :: psb_cspmat_type, psb_spk_, psb_c_base_sparse_mat + class(psb_cspmat_type), intent(in) :: a class(psb_c_base_sparse_mat), intent(out) :: b end subroutine psb_c_cp_to end interface interface psb_move_alloc - subroutine psb_c_sparse_mat_move(a,b,info) - import :: psb_c_sparse_mat - class(psb_c_sparse_mat), intent(inout) :: a - class(psb_c_sparse_mat), intent(out) :: b + subroutine psb_cspmat_type_move(a,b,info) + import :: psb_cspmat_type + class(psb_cspmat_type), intent(inout) :: a + class(psb_cspmat_type), intent(out) :: b integer, intent(out) :: info - end subroutine psb_c_sparse_mat_move + end subroutine psb_cspmat_type_move end interface interface psb_clone - subroutine psb_c_sparse_mat_clone(a,b,info) - import :: psb_c_sparse_mat - class(psb_c_sparse_mat), intent(in) :: a - class(psb_c_sparse_mat), intent(out) :: b + subroutine psb_cspmat_type_clone(a,b,info) + import :: psb_cspmat_type + class(psb_cspmat_type), intent(in) :: a + class(psb_cspmat_type), intent(out) :: b integer, intent(out) :: info - end subroutine psb_c_sparse_mat_clone + end subroutine psb_cspmat_type_clone end interface interface subroutine psb_c_transp_1mat(a) - import :: psb_c_sparse_mat - class(psb_c_sparse_mat), intent(inout) :: a + import :: psb_cspmat_type + class(psb_cspmat_type), intent(inout) :: a end subroutine psb_c_transp_1mat end interface interface subroutine psb_c_transp_2mat(a,b) - import :: psb_c_sparse_mat - class(psb_c_sparse_mat), intent(out) :: a - class(psb_c_sparse_mat), intent(in) :: b + import :: psb_cspmat_type + class(psb_cspmat_type), intent(out) :: a + class(psb_cspmat_type), intent(in) :: b end subroutine psb_c_transp_2mat end interface interface subroutine psb_c_transc_1mat(a) - import :: psb_c_sparse_mat - class(psb_c_sparse_mat), intent(inout) :: a + import :: psb_cspmat_type + class(psb_cspmat_type), intent(inout) :: a end subroutine psb_c_transc_1mat end interface interface subroutine psb_c_transc_2mat(a,b) - import :: psb_c_sparse_mat - class(psb_c_sparse_mat), intent(out) :: a - class(psb_c_sparse_mat), intent(in) :: b + import :: psb_cspmat_type + class(psb_cspmat_type), intent(out) :: a + class(psb_cspmat_type), intent(in) :: b end subroutine psb_c_transc_2mat end interface interface subroutine psb_c_reinit(a,clear) - import :: psb_c_sparse_mat - class(psb_c_sparse_mat), intent(inout) :: a + import :: psb_cspmat_type + class(psb_cspmat_type), intent(inout) :: a logical, intent(in), optional :: clear end subroutine psb_c_reinit @@ -566,16 +566,16 @@ module psb_c_mat_mod interface psb_csmm subroutine psb_c_csmm(alpha,a,x,beta,y,info,trans) - import :: psb_c_sparse_mat, psb_spk_ - class(psb_c_sparse_mat), intent(in) :: a + import :: psb_cspmat_type, psb_spk_ + class(psb_cspmat_type), intent(in) :: a complex(psb_spk_), intent(in) :: alpha, beta, x(:,:) complex(psb_spk_), intent(inout) :: y(:,:) integer, intent(out) :: info character, optional, intent(in) :: trans end subroutine psb_c_csmm subroutine psb_c_csmv(alpha,a,x,beta,y,info,trans) - import :: psb_c_sparse_mat, psb_spk_ - class(psb_c_sparse_mat), intent(in) :: a + import :: psb_cspmat_type, psb_spk_ + class(psb_cspmat_type), intent(in) :: a complex(psb_spk_), intent(in) :: alpha, beta, x(:) complex(psb_spk_), intent(inout) :: y(:) integer, intent(out) :: info @@ -585,8 +585,8 @@ module psb_c_mat_mod interface psb_cssm subroutine psb_c_cssm(alpha,a,x,beta,y,info,trans,scale,d) - import :: psb_c_sparse_mat, psb_spk_ - class(psb_c_sparse_mat), intent(in) :: a + import :: psb_cspmat_type, psb_spk_ + class(psb_cspmat_type), intent(in) :: a complex(psb_spk_), intent(in) :: alpha, beta, x(:,:) complex(psb_spk_), intent(inout) :: y(:,:) integer, intent(out) :: info @@ -594,8 +594,8 @@ module psb_c_mat_mod complex(psb_spk_), intent(in), optional :: d(:) end subroutine psb_c_cssm subroutine psb_c_cssv(alpha,a,x,beta,y,info,trans,scale,d) - import :: psb_c_sparse_mat, psb_spk_ - class(psb_c_sparse_mat), intent(in) :: a + import :: psb_cspmat_type, psb_spk_ + class(psb_cspmat_type), intent(in) :: a complex(psb_spk_), intent(in) :: alpha, beta, x(:) complex(psb_spk_), intent(inout) :: y(:) integer, intent(out) :: info @@ -606,16 +606,16 @@ module psb_c_mat_mod interface function psb_c_csnmi(a) result(res) - import :: psb_c_sparse_mat, psb_spk_ - class(psb_c_sparse_mat), intent(in) :: a + import :: psb_cspmat_type, psb_spk_ + class(psb_cspmat_type), intent(in) :: a real(psb_spk_) :: res end function psb_c_csnmi end interface interface subroutine psb_c_get_diag(a,d,info) - import :: psb_c_sparse_mat, psb_spk_ - class(psb_c_sparse_mat), intent(in) :: a + import :: psb_cspmat_type, psb_spk_ + class(psb_cspmat_type), intent(in) :: a complex(psb_spk_), intent(out) :: d(:) integer, intent(out) :: info end subroutine psb_c_get_diag @@ -623,14 +623,14 @@ module psb_c_mat_mod interface psb_scal subroutine psb_c_scal(d,a,info) - import :: psb_c_sparse_mat, psb_spk_ - class(psb_c_sparse_mat), intent(inout) :: a + import :: psb_cspmat_type, psb_spk_ + class(psb_cspmat_type), intent(inout) :: a complex(psb_spk_), intent(in) :: d(:) integer, intent(out) :: info end subroutine psb_c_scal subroutine psb_c_scals(d,a,info) - import :: psb_c_sparse_mat, psb_spk_ - class(psb_c_sparse_mat), intent(inout) :: a + import :: psb_cspmat_type, psb_spk_ + class(psb_cspmat_type), intent(inout) :: a complex(psb_spk_), intent(in) :: d integer, intent(out) :: info end subroutine psb_c_scals @@ -657,7 +657,7 @@ contains function psb_c_sizeof(a) result(res) implicit none - class(psb_c_sparse_mat), intent(in) :: a + class(psb_cspmat_type), intent(in) :: a integer(psb_long_int_k_) :: res res = 0 @@ -671,7 +671,7 @@ contains function psb_c_get_fmt(a) result(res) implicit none - class(psb_c_sparse_mat), intent(in) :: a + class(psb_cspmat_type), intent(in) :: a character(len=5) :: res if (allocated(a%a)) then @@ -685,7 +685,7 @@ contains function psb_c_get_dupl(a) result(res) implicit none - class(psb_c_sparse_mat), intent(in) :: a + class(psb_cspmat_type), intent(in) :: a integer :: res if (allocated(a%a)) then @@ -698,7 +698,7 @@ contains function psb_c_get_state(a) result(res) implicit none - class(psb_c_sparse_mat), intent(in) :: a + class(psb_cspmat_type), intent(in) :: a integer :: res if (allocated(a%a)) then @@ -710,7 +710,7 @@ contains function psb_c_get_nrows(a) result(res) implicit none - class(psb_c_sparse_mat), intent(in) :: a + class(psb_cspmat_type), intent(in) :: a integer :: res if (allocated(a%a)) then @@ -723,7 +723,7 @@ contains function psb_c_get_ncols(a) result(res) implicit none - class(psb_c_sparse_mat), intent(in) :: a + class(psb_cspmat_type), intent(in) :: a integer :: res if (allocated(a%a)) then @@ -736,7 +736,7 @@ contains function psb_c_is_triangle(a) result(res) implicit none - class(psb_c_sparse_mat), intent(in) :: a + class(psb_cspmat_type), intent(in) :: a logical :: res if (allocated(a%a)) then @@ -749,7 +749,7 @@ contains function psb_c_is_unit(a) result(res) implicit none - class(psb_c_sparse_mat), intent(in) :: a + class(psb_cspmat_type), intent(in) :: a logical :: res if (allocated(a%a)) then @@ -762,7 +762,7 @@ contains function psb_c_is_upper(a) result(res) implicit none - class(psb_c_sparse_mat), intent(in) :: a + class(psb_cspmat_type), intent(in) :: a logical :: res if (allocated(a%a)) then @@ -775,7 +775,7 @@ contains function psb_c_is_lower(a) result(res) implicit none - class(psb_c_sparse_mat), intent(in) :: a + class(psb_cspmat_type), intent(in) :: a logical :: res if (allocated(a%a)) then @@ -788,7 +788,7 @@ contains function psb_c_is_null(a) result(res) implicit none - class(psb_c_sparse_mat), intent(in) :: a + class(psb_cspmat_type), intent(in) :: a logical :: res if (allocated(a%a)) then @@ -801,7 +801,7 @@ contains function psb_c_is_bld(a) result(res) implicit none - class(psb_c_sparse_mat), intent(in) :: a + class(psb_cspmat_type), intent(in) :: a logical :: res if (allocated(a%a)) then @@ -814,7 +814,7 @@ contains function psb_c_is_upd(a) result(res) implicit none - class(psb_c_sparse_mat), intent(in) :: a + class(psb_cspmat_type), intent(in) :: a logical :: res if (allocated(a%a)) then @@ -827,7 +827,7 @@ contains function psb_c_is_asb(a) result(res) implicit none - class(psb_c_sparse_mat), intent(in) :: a + class(psb_cspmat_type), intent(in) :: a logical :: res if (allocated(a%a)) then @@ -840,7 +840,7 @@ contains function psb_c_is_sorted(a) result(res) implicit none - class(psb_c_sparse_mat), intent(in) :: a + class(psb_cspmat_type), intent(in) :: a logical :: res if (allocated(a%a)) then @@ -855,7 +855,7 @@ contains function psb_c_get_nzeros(a) result(res) implicit none - class(psb_c_sparse_mat), intent(in) :: a + class(psb_cspmat_type), intent(in) :: a integer :: res res = 0 @@ -868,7 +868,7 @@ contains function psb_c_get_size(a) result(res) implicit none - class(psb_c_sparse_mat), intent(in) :: a + class(psb_cspmat_type), intent(in) :: a integer :: res @@ -883,7 +883,7 @@ contains function psb_c_get_nz_row(idx,a) result(res) implicit none integer, intent(in) :: idx - class(psb_c_sparse_mat), intent(in) :: a + class(psb_cspmat_type), intent(in) :: a integer :: res res = 0 diff --git a/base/modules/psb_c_psblas_mod.f90 b/base/modules/psb_c_psblas_mod.f90 index 84ef1fa3..540b0755 100644 --- a/base/modules/psb_c_psblas_mod.f90 +++ b/base/modules/psb_c_psblas_mod.f90 @@ -193,9 +193,9 @@ module psb_c_psblas_mod interface psb_spnrmi function psb_cnrmi(a, desc_a,info) use psb_descriptor_type, only : psb_desc_type, psb_spk_, psb_dpk_ - use psb_mat_mod, only : psb_c_sparse_mat + use psb_mat_mod, only : psb_cspmat_type real(psb_spk_) :: psb_cnrmi - type(psb_c_sparse_mat), intent (in) :: a + type(psb_cspmat_type), intent (in) :: a type(psb_desc_type), intent (in) :: desc_a integer, intent(out) :: info end function psb_cnrmi @@ -205,8 +205,8 @@ module psb_c_psblas_mod subroutine psb_cspmm(alpha, a, x, beta, y, desc_a, info,& &trans, k, jx, jy,work,doswap) use psb_descriptor_type, only : psb_desc_type, psb_spk_, psb_dpk_ - use psb_mat_mod, only : psb_c_sparse_mat - type(psb_c_sparse_mat), intent(in) :: a + use psb_mat_mod, only : psb_cspmat_type + type(psb_cspmat_type), intent(in) :: a complex(psb_spk_), intent(inout) :: x(:,:) complex(psb_spk_), intent(inout) :: y(:,:) complex(psb_spk_), intent(in) :: alpha, beta @@ -220,8 +220,8 @@ module psb_c_psblas_mod subroutine psb_cspmv(alpha, a, x, beta, y,& & desc_a, info, trans, work,doswap) use psb_descriptor_type, only : psb_desc_type, psb_spk_, psb_dpk_ - use psb_mat_mod, only : psb_c_sparse_mat - type(psb_c_sparse_mat), intent(in) :: a + use psb_mat_mod, only : psb_cspmat_type + type(psb_cspmat_type), intent(in) :: a complex(psb_spk_), intent(inout) :: x(:) complex(psb_spk_), intent(inout) :: y(:) complex(psb_spk_), intent(in) :: alpha, beta @@ -238,8 +238,8 @@ module psb_c_psblas_mod & desc_a, info, trans, scale, choice,& & diag, n, jx, jy, work) use psb_descriptor_type, only : psb_desc_type, psb_spk_, psb_dpk_ - use psb_mat_mod, only : psb_c_sparse_mat - type(psb_c_sparse_mat), intent(in) :: t + use psb_mat_mod, only : psb_cspmat_type + type(psb_cspmat_type), intent(in) :: t complex(psb_spk_), intent(in) :: x(:,:) complex(psb_spk_), intent(inout) :: y(:,:) complex(psb_spk_), intent(in) :: alpha, beta @@ -255,8 +255,8 @@ module psb_c_psblas_mod & desc_a, info, trans, scale, choice,& & diag, work) use psb_descriptor_type, only : psb_desc_type, psb_spk_, psb_dpk_ - use psb_mat_mod, only : psb_c_sparse_mat - type(psb_c_sparse_mat), intent(in) :: t + use psb_mat_mod, only : psb_cspmat_type + type(psb_cspmat_type), intent(in) :: t complex(psb_spk_), intent(in) :: x(:) complex(psb_spk_), intent(inout) :: y(:) complex(psb_spk_), intent(in) :: alpha, beta diff --git a/base/modules/psb_c_tools_mod.f90 b/base/modules/psb_c_tools_mod.f90 index aaa3f993..02c268d7 100644 --- a/base/modules/psb_c_tools_mod.f90 +++ b/base/modules/psb_c_tools_mod.f90 @@ -70,9 +70,9 @@ Module psb_c_tools_mod Subroutine psb_csphalo(a,desc_a,blk,info,rowcnv,colcnv,& & rowscale,colscale,outfmt,data) use psb_descriptor_type, only : psb_desc_type, psb_spk_, psb_dpk_ - use psb_mat_mod, only : psb_c_sparse_mat - Type(psb_c_sparse_mat),Intent(in) :: a - Type(psb_c_sparse_mat),Intent(inout) :: blk + use psb_mat_mod, only : psb_cspmat_type + Type(psb_cspmat_type),Intent(in) :: a + Type(psb_cspmat_type),Intent(inout) :: blk Type(psb_desc_type),Intent(in) :: desc_a integer, intent(out) :: info logical, optional, intent(in) :: rowcnv,colcnv,rowscale,colscale @@ -124,9 +124,9 @@ Module psb_c_tools_mod interface psb_cdbldext Subroutine psb_ccdbldext(a,desc_a,novr,desc_ov,info,extype) use psb_descriptor_type, only : psb_desc_type, psb_spk_, psb_dpk_ - use psb_mat_mod, only : psb_c_sparse_mat + use psb_mat_mod, only : psb_cspmat_type integer, intent(in) :: novr - Type(psb_c_sparse_mat), Intent(in) :: a + Type(psb_cspmat_type), Intent(in) :: a Type(psb_desc_type), Intent(in), target :: desc_a Type(psb_desc_type), Intent(out) :: desc_ov integer, intent(out) :: info @@ -137,9 +137,9 @@ Module psb_c_tools_mod interface psb_spall subroutine psb_cspalloc(a, desc_a, info, nnz) use psb_descriptor_type, only : psb_desc_type, psb_spk_, psb_dpk_ - use psb_mat_mod, only : psb_c_sparse_mat + use psb_mat_mod, only : psb_cspmat_type type(psb_desc_type), intent(in) :: desc_a - type(psb_c_sparse_mat), intent(inout) :: a + type(psb_cspmat_type), intent(inout) :: a integer, intent(out) :: info integer, optional, intent(in) :: nnz end subroutine psb_cspalloc @@ -148,8 +148,8 @@ Module psb_c_tools_mod interface psb_spasb subroutine psb_cspasb(a,desc_a, info, afmt, upd, dupl,mold) use psb_descriptor_type, only : psb_desc_type, psb_spk_, psb_dpk_ - use psb_mat_mod, only : psb_c_sparse_mat, psb_c_base_sparse_mat - type(psb_c_sparse_mat), intent (inout) :: a + use psb_mat_mod, only : psb_cspmat_type, psb_c_base_sparse_mat + type(psb_cspmat_type), intent (inout) :: a type(psb_desc_type), intent(in) :: desc_a integer, intent(out) :: info integer,optional, intent(in) :: dupl, upd @@ -161,9 +161,9 @@ Module psb_c_tools_mod interface psb_spfree subroutine psb_cspfree(a, desc_a,info) use psb_descriptor_type, only : psb_desc_type, psb_spk_, psb_dpk_ - use psb_mat_mod, only : psb_c_sparse_mat + use psb_mat_mod, only : psb_cspmat_type type(psb_desc_type), intent(in) :: desc_a - type(psb_c_sparse_mat), intent(inout) ::a + type(psb_cspmat_type), intent(inout) ::a integer, intent(out) :: info end subroutine psb_cspfree end interface @@ -172,9 +172,9 @@ Module psb_c_tools_mod interface psb_spins subroutine psb_cspins(nz,ia,ja,val,a,desc_a,info,rebuild) use psb_descriptor_type, only : psb_desc_type, psb_spk_, psb_dpk_ - use psb_mat_mod, only : psb_c_sparse_mat + use psb_mat_mod, only : psb_cspmat_type type(psb_desc_type), intent(inout) :: desc_a - type(psb_c_sparse_mat), intent(inout) :: a + type(psb_cspmat_type), intent(inout) :: a integer, intent(in) :: nz,ia(:),ja(:) complex(psb_spk_), intent(in) :: val(:) integer, intent(out) :: info @@ -182,10 +182,10 @@ Module psb_c_tools_mod end subroutine psb_cspins subroutine psb_cspins_2desc(nz,ia,ja,val,a,desc_ar,desc_ac,info) use psb_descriptor_type, only : psb_desc_type, psb_spk_, psb_dpk_ - use psb_mat_mod, only : psb_c_sparse_mat + use psb_mat_mod, only : psb_cspmat_type type(psb_desc_type), intent(in) :: desc_ar type(psb_desc_type), intent(inout) :: desc_ac - type(psb_c_sparse_mat), intent(inout) :: a + type(psb_cspmat_type), intent(inout) :: a integer, intent(in) :: nz,ia(:),ja(:) complex(psb_spk_), intent(in) :: val(:) integer, intent(out) :: info @@ -196,9 +196,9 @@ Module psb_c_tools_mod interface psb_sprn subroutine psb_csprn(a, desc_a,info,clear) use psb_descriptor_type, only : psb_desc_type, psb_spk_, psb_dpk_ - use psb_mat_mod, only : psb_c_sparse_mat + use psb_mat_mod, only : psb_cspmat_type type(psb_desc_type), intent(in) :: desc_a - type(psb_c_sparse_mat), intent(inout) :: a + type(psb_cspmat_type), intent(inout) :: a integer, intent(out) :: info logical, intent(in), optional :: clear end subroutine psb_csprn @@ -226,7 +226,7 @@ Module psb_c_tools_mod !!$ use psb_penv_mod !!$ use psb_error_mod !!$ implicit none -!!$ type(psb_c_sparse_mat), intent(out) :: a_map +!!$ type(psb_cspmat_type), intent(out) :: a_map !!$ type(psb_desc_type), intent(out) :: cd_xt !!$ type(psb_desc_type), intent(in) :: descin, descout !!$ @@ -259,7 +259,7 @@ Module psb_c_tools_mod !!$ integer, intent(in) :: nz !!$ integer, intent(in) :: ir(:),ic(:) !!$ complex(psb_spk_), intent(in) :: val(:) -!!$ type(psb_c_sparse_mat), intent(inout) :: a_map +!!$ type(psb_cspmat_type), intent(inout) :: a_map !!$ type(psb_desc_type), intent(inout) :: cd_xt !!$ type(psb_desc_type), intent(in) :: descin, descout !!$ integer :: info @@ -274,7 +274,7 @@ Module psb_c_tools_mod !!$ use psb_descriptor_type !!$ use psb_serial_mod !!$ implicit none -!!$ type(psb_c_sparse_mat), intent(inout) :: a_map +!!$ type(psb_cspmat_type), intent(inout) :: a_map !!$ type(psb_desc_type), intent(inout) :: cd_xt !!$ type(psb_desc_type), intent(in) :: descin, descout !!$ character(len=*), optional, intent(in) :: afmt diff --git a/base/modules/psb_comm_mod.f90 b/base/modules/psb_comm_mod.f90 index 94f4fc51..a6a02c8a 100644 --- a/base/modules/psb_comm_mod.f90 +++ b/base/modules/psb_comm_mod.f90 @@ -306,8 +306,8 @@ module psb_comm_mod use psb_descriptor_type use psb_mat_mod implicit none - type(psb_d_sparse_mat), intent(inout) :: loca - type(psb_d_sparse_mat), intent(out) :: globa + type(psb_dspmat_type), intent(inout) :: loca + type(psb_dspmat_type), intent(out) :: globa type(psb_desc_type), intent(in) :: desc_a integer, intent(out) :: info integer, intent(in), optional :: root,dupl diff --git a/base/modules/psb_d_linmap_mod.f90 b/base/modules/psb_d_linmap_mod.f90 index f363bb15..169279a8 100644 --- a/base/modules/psb_d_linmap_mod.f90 +++ b/base/modules/psb_d_linmap_mod.f90 @@ -98,7 +98,7 @@ module psb_d_linmap_mod implicit none type(psb_dlinmap_type) :: psb_d_linmap type(psb_desc_type), target :: desc_X, desc_Y - type(psb_d_sparse_mat), intent(in) :: map_X2Y, map_Y2X + type(psb_dspmat_type), intent(in) :: map_X2Y, map_Y2X integer, intent(in) :: map_kind integer, intent(in), optional :: iaggr(:), naggr(:) end function psb_d_linmap @@ -201,7 +201,7 @@ contains implicit none type(psb_dlinmap_type), intent(out) :: out_map type(psb_desc_type), target :: desc_X, desc_Y - type(psb_d_sparse_mat), intent(in) :: map_X2Y, map_Y2X + type(psb_dspmat_type), intent(in) :: map_X2Y, map_Y2X integer, intent(in) :: map_kind integer, intent(in), optional :: iaggr(:), naggr(:) out_map = psb_linmap(map_kind,desc_X,desc_Y,map_X2Y,map_Y2X,iaggr,naggr) diff --git a/base/modules/psb_d_mat_mod.f03 b/base/modules/psb_d_mat_mod.f03 index 92f28a05..e3ad013c 100644 --- a/base/modules/psb_d_mat_mod.f03 +++ b/base/modules/psb_d_mat_mod.f03 @@ -47,7 +47,7 @@ module psb_d_mat_mod use psb_d_csr_mat_mod, only : psb_d_csr_sparse_mat use psb_d_csc_mat_mod, only : psb_d_csc_sparse_mat - type :: psb_d_sparse_mat + type :: psb_dspmat_type class(psb_d_base_sparse_mat), allocatable :: a @@ -145,7 +145,7 @@ module psb_d_mat_mod procedure, pass(a) :: d_cssm => psb_d_cssm generic, public :: cssm => d_cssm, d_cssv - end type psb_d_sparse_mat + end type psb_dspmat_type private :: psb_d_get_nrows, psb_d_get_ncols, psb_d_get_nzeros, psb_d_get_size, & & psb_d_get_state, psb_d_get_dupl, psb_d_is_null, psb_d_is_bld, psb_d_is_upd, & @@ -173,100 +173,100 @@ module psb_d_mat_mod interface subroutine psb_d_set_nrows(m,a) - import :: psb_d_sparse_mat - class(psb_d_sparse_mat), intent(inout) :: a + import :: psb_dspmat_type + class(psb_dspmat_type), intent(inout) :: a integer, intent(in) :: m end subroutine psb_d_set_nrows end interface interface subroutine psb_d_set_ncols(n,a) - import :: psb_d_sparse_mat - class(psb_d_sparse_mat), intent(inout) :: a + import :: psb_dspmat_type + class(psb_dspmat_type), intent(inout) :: a integer, intent(in) :: n end subroutine psb_d_set_ncols end interface interface subroutine psb_d_set_state(n,a) - import :: psb_d_sparse_mat - class(psb_d_sparse_mat), intent(inout) :: a + import :: psb_dspmat_type + class(psb_dspmat_type), intent(inout) :: a integer, intent(in) :: n end subroutine psb_d_set_state end interface interface subroutine psb_d_set_dupl(n,a) - import :: psb_d_sparse_mat - class(psb_d_sparse_mat), intent(inout) :: a + import :: psb_dspmat_type + class(psb_dspmat_type), intent(inout) :: a integer, intent(in) :: n end subroutine psb_d_set_dupl end interface interface subroutine psb_d_set_null(a) - import :: psb_d_sparse_mat - class(psb_d_sparse_mat), intent(inout) :: a + import :: psb_dspmat_type + class(psb_dspmat_type), intent(inout) :: a end subroutine psb_d_set_null end interface interface subroutine psb_d_set_bld(a) - import :: psb_d_sparse_mat - class(psb_d_sparse_mat), intent(inout) :: a + import :: psb_dspmat_type + class(psb_dspmat_type), intent(inout) :: a end subroutine psb_d_set_bld end interface interface subroutine psb_d_set_upd(a) - import :: psb_d_sparse_mat - class(psb_d_sparse_mat), intent(inout) :: a + import :: psb_dspmat_type + class(psb_dspmat_type), intent(inout) :: a end subroutine psb_d_set_upd end interface interface subroutine psb_d_set_asb(a) - import :: psb_d_sparse_mat - class(psb_d_sparse_mat), intent(inout) :: a + import :: psb_dspmat_type + class(psb_dspmat_type), intent(inout) :: a end subroutine psb_d_set_asb end interface interface subroutine psb_d_set_sorted(a,val) - import :: psb_d_sparse_mat - class(psb_d_sparse_mat), intent(inout) :: a + import :: psb_dspmat_type + class(psb_dspmat_type), intent(inout) :: a logical, intent(in), optional :: val end subroutine psb_d_set_sorted end interface interface subroutine psb_d_set_triangle(a,val) - import :: psb_d_sparse_mat - class(psb_d_sparse_mat), intent(inout) :: a + import :: psb_dspmat_type + class(psb_dspmat_type), intent(inout) :: a logical, intent(in), optional :: val end subroutine psb_d_set_triangle end interface interface subroutine psb_d_set_unit(a,val) - import :: psb_d_sparse_mat - class(psb_d_sparse_mat), intent(inout) :: a + import :: psb_dspmat_type + class(psb_dspmat_type), intent(inout) :: a logical, intent(in), optional :: val end subroutine psb_d_set_unit end interface interface subroutine psb_d_set_lower(a,val) - import :: psb_d_sparse_mat - class(psb_d_sparse_mat), intent(inout) :: a + import :: psb_dspmat_type + class(psb_dspmat_type), intent(inout) :: a logical, intent(in), optional :: val end subroutine psb_d_set_lower end interface interface subroutine psb_d_set_upper(a,val) - import :: psb_d_sparse_mat - class(psb_d_sparse_mat), intent(inout) :: a + import :: psb_dspmat_type + class(psb_dspmat_type), intent(inout) :: a logical, intent(in), optional :: val end subroutine psb_d_set_upper end interface @@ -274,9 +274,9 @@ module psb_d_mat_mod interface subroutine psb_d_sparse_print(iout,a,iv,eirs,eics,head,ivr,ivc) - import :: psb_d_sparse_mat + import :: psb_dspmat_type integer, intent(in) :: iout - class(psb_d_sparse_mat), intent(in) :: a + class(psb_dspmat_type), intent(in) :: a integer, intent(in), optional :: iv(:) integer, intent(in), optional :: eirs,eics character(len=*), optional :: head @@ -286,8 +286,8 @@ module psb_d_mat_mod interface subroutine psb_d_get_neigh(a,idx,neigh,n,info,lev) - import :: psb_d_sparse_mat - class(psb_d_sparse_mat), intent(in) :: a + import :: psb_dspmat_type + class(psb_dspmat_type), intent(in) :: a integer, intent(in) :: idx integer, intent(out) :: n integer, allocatable, intent(out) :: neigh(:) @@ -298,8 +298,8 @@ module psb_d_mat_mod interface subroutine psb_d_csall(nr,nc,a,info,nz) - import :: psb_d_sparse_mat - class(psb_d_sparse_mat), intent(out) :: a + import :: psb_dspmat_type + class(psb_dspmat_type), intent(out) :: a integer, intent(in) :: nr,nc integer, intent(out) :: info integer, intent(in), optional :: nz @@ -308,30 +308,30 @@ module psb_d_mat_mod interface subroutine psb_d_reallocate_nz(nz,a) - import :: psb_d_sparse_mat + import :: psb_dspmat_type integer, intent(in) :: nz - class(psb_d_sparse_mat), intent(inout) :: a + class(psb_dspmat_type), intent(inout) :: a end subroutine psb_d_reallocate_nz end interface interface subroutine psb_d_free(a) - import :: psb_d_sparse_mat - class(psb_d_sparse_mat), intent(inout) :: a + import :: psb_dspmat_type + class(psb_dspmat_type), intent(inout) :: a end subroutine psb_d_free end interface interface subroutine psb_d_trim(a) - import :: psb_d_sparse_mat - class(psb_d_sparse_mat), intent(inout) :: a + import :: psb_dspmat_type + class(psb_dspmat_type), intent(inout) :: a end subroutine psb_d_trim end interface interface subroutine psb_d_csput(nz,ia,ja,val,a,imin,imax,jmin,jmax,info,gtl) - import :: psb_d_sparse_mat, psb_dpk_ - class(psb_d_sparse_mat), intent(inout) :: a + import :: psb_dspmat_type, psb_dpk_ + class(psb_dspmat_type), intent(inout) :: a real(psb_dpk_), intent(in) :: val(:) integer, intent(in) :: nz, ia(:), ja(:), imin,imax,jmin,jmax integer, intent(out) :: info @@ -342,8 +342,8 @@ module psb_d_mat_mod interface subroutine psb_d_csgetptn(imin,imax,a,nz,ia,ja,info,& & jmin,jmax,iren,append,nzin,rscale,cscale) - import :: psb_d_sparse_mat, psb_dpk_ - class(psb_d_sparse_mat), intent(in) :: a + import :: psb_dspmat_type, psb_dpk_ + class(psb_dspmat_type), intent(in) :: a integer, intent(in) :: imin,imax integer, intent(out) :: nz integer, allocatable, intent(inout) :: ia(:), ja(:) @@ -358,8 +358,8 @@ module psb_d_mat_mod interface subroutine psb_d_csgetrow(imin,imax,a,nz,ia,ja,val,info,& & jmin,jmax,iren,append,nzin,rscale,cscale) - import :: psb_d_sparse_mat, psb_dpk_ - class(psb_d_sparse_mat), intent(in) :: a + import :: psb_dspmat_type, psb_dpk_ + class(psb_dspmat_type), intent(in) :: a integer, intent(in) :: imin,imax integer, intent(out) :: nz integer, allocatable, intent(inout) :: ia(:), ja(:) @@ -375,9 +375,9 @@ module psb_d_mat_mod interface subroutine psb_d_csgetblk(imin,imax,a,b,info,& & jmin,jmax,iren,append,rscale,cscale) - import :: psb_d_sparse_mat, psb_dpk_ - class(psb_d_sparse_mat), intent(in) :: a - class(psb_d_sparse_mat), intent(out) :: b + import :: psb_dspmat_type, psb_dpk_ + class(psb_dspmat_type), intent(in) :: a + class(psb_dspmat_type), intent(out) :: b integer, intent(in) :: imin,imax integer,intent(out) :: info logical, intent(in), optional :: append @@ -390,9 +390,9 @@ module psb_d_mat_mod interface subroutine psb_d_csclip(a,b,info,& & imin,imax,jmin,jmax,rscale,cscale) - import :: psb_d_sparse_mat, psb_dpk_ - class(psb_d_sparse_mat), intent(in) :: a - class(psb_d_sparse_mat), intent(out) :: b + import :: psb_dspmat_type, psb_dpk_ + class(psb_dspmat_type), intent(in) :: a + class(psb_dspmat_type), intent(out) :: b integer,intent(out) :: info integer, intent(in), optional :: imin,imax,jmin,jmax logical, intent(in), optional :: rscale,cscale @@ -402,8 +402,8 @@ module psb_d_mat_mod interface subroutine psb_d_b_csclip(a,b,info,& & imin,imax,jmin,jmax,rscale,cscale) - import :: psb_d_sparse_mat, psb_dpk_, psb_d_coo_sparse_mat - class(psb_d_sparse_mat), intent(in) :: a + import :: psb_dspmat_type, psb_dpk_, psb_d_coo_sparse_mat + class(psb_dspmat_type), intent(in) :: a type(psb_d_coo_sparse_mat), intent(out) :: b integer,intent(out) :: info integer, intent(in), optional :: imin,imax,jmin,jmax @@ -413,9 +413,9 @@ module psb_d_mat_mod interface subroutine psb_d_cscnv(a,b,info,type,mold,upd,dupl) - import :: psb_d_sparse_mat, psb_dpk_, psb_d_base_sparse_mat - class(psb_d_sparse_mat), intent(in) :: a - class(psb_d_sparse_mat), intent(out) :: b + import :: psb_dspmat_type, psb_dpk_, psb_d_base_sparse_mat + class(psb_dspmat_type), intent(in) :: a + class(psb_dspmat_type), intent(out) :: b integer, intent(out) :: info integer,optional, intent(in) :: dupl, upd character(len=*), optional, intent(in) :: type @@ -426,8 +426,8 @@ module psb_d_mat_mod interface subroutine psb_d_cscnv_ip(a,iinfo,type,mold,dupl) - import :: psb_d_sparse_mat, psb_dpk_, psb_d_base_sparse_mat - class(psb_d_sparse_mat), intent(inout) :: a + import :: psb_dspmat_type, psb_dpk_, psb_d_base_sparse_mat + class(psb_dspmat_type), intent(inout) :: a integer, intent(out) :: iinfo integer,optional, intent(in) :: dupl character(len=*), optional, intent(in) :: type @@ -438,8 +438,8 @@ module psb_d_mat_mod interface subroutine psb_d_cscnv_base(a,b,info,dupl) - import :: psb_d_sparse_mat, psb_dpk_, psb_d_base_sparse_mat - class(psb_d_sparse_mat), intent(in) :: a + import :: psb_dspmat_type, psb_dpk_, psb_d_base_sparse_mat + class(psb_dspmat_type), intent(in) :: a class(psb_d_base_sparse_mat), intent(out) :: b integer, intent(out) :: info integer,optional, intent(in) :: dupl @@ -448,106 +448,106 @@ module psb_d_mat_mod interface subroutine psb_d_clip_d(a,b,info) - import :: psb_d_sparse_mat - class(psb_d_sparse_mat), intent(in) :: a - class(psb_d_sparse_mat), intent(out) :: b + import :: psb_dspmat_type + class(psb_dspmat_type), intent(in) :: a + class(psb_dspmat_type), intent(out) :: b integer,intent(out) :: info end subroutine psb_d_clip_d end interface interface subroutine psb_d_clip_d_ip(a,info) - import :: psb_d_sparse_mat - class(psb_d_sparse_mat), intent(inout) :: a + import :: psb_dspmat_type + class(psb_dspmat_type), intent(inout) :: a integer,intent(out) :: info end subroutine psb_d_clip_d_ip end interface interface subroutine psb_d_mv_from(a,b) - import :: psb_d_sparse_mat, psb_dpk_, psb_d_base_sparse_mat - class(psb_d_sparse_mat), intent(out) :: a + import :: psb_dspmat_type, psb_dpk_, psb_d_base_sparse_mat + class(psb_dspmat_type), intent(out) :: a class(psb_d_base_sparse_mat), intent(inout) :: b end subroutine psb_d_mv_from end interface interface subroutine psb_d_cp_from(a,b) - import :: psb_d_sparse_mat, psb_dpk_, psb_d_base_sparse_mat - class(psb_d_sparse_mat), intent(out) :: a + import :: psb_dspmat_type, psb_dpk_, psb_d_base_sparse_mat + class(psb_dspmat_type), intent(out) :: a class(psb_d_base_sparse_mat), intent(inout), allocatable :: b end subroutine psb_d_cp_from end interface interface subroutine psb_d_mv_to(a,b) - import :: psb_d_sparse_mat, psb_dpk_, psb_d_base_sparse_mat - class(psb_d_sparse_mat), intent(inout) :: a + import :: psb_dspmat_type, psb_dpk_, psb_d_base_sparse_mat + class(psb_dspmat_type), intent(inout) :: a class(psb_d_base_sparse_mat), intent(out) :: b end subroutine psb_d_mv_to end interface interface subroutine psb_d_cp_to(a,b) - import :: psb_d_sparse_mat, psb_dpk_, psb_d_base_sparse_mat - class(psb_d_sparse_mat), intent(in) :: a + import :: psb_dspmat_type, psb_dpk_, psb_d_base_sparse_mat + class(psb_dspmat_type), intent(in) :: a class(psb_d_base_sparse_mat), intent(out) :: b end subroutine psb_d_cp_to end interface interface psb_move_alloc - subroutine psb_d_sparse_mat_move(a,b,info) - import :: psb_d_sparse_mat - class(psb_d_sparse_mat), intent(inout) :: a - class(psb_d_sparse_mat), intent(out) :: b + subroutine psb_dspmat_type_move(a,b,info) + import :: psb_dspmat_type + class(psb_dspmat_type), intent(inout) :: a + class(psb_dspmat_type), intent(out) :: b integer, intent(out) :: info - end subroutine psb_d_sparse_mat_move + end subroutine psb_dspmat_type_move end interface interface psb_clone - subroutine psb_d_sparse_mat_clone(a,b,info) - import :: psb_d_sparse_mat - class(psb_d_sparse_mat), intent(in) :: a - class(psb_d_sparse_mat), intent(out) :: b + subroutine psb_dspmat_type_clone(a,b,info) + import :: psb_dspmat_type + class(psb_dspmat_type), intent(in) :: a + class(psb_dspmat_type), intent(out) :: b integer, intent(out) :: info - end subroutine psb_d_sparse_mat_clone + end subroutine psb_dspmat_type_clone end interface interface subroutine psb_d_transp_1mat(a) - import :: psb_d_sparse_mat - class(psb_d_sparse_mat), intent(inout) :: a + import :: psb_dspmat_type + class(psb_dspmat_type), intent(inout) :: a end subroutine psb_d_transp_1mat end interface interface subroutine psb_d_transp_2mat(a,b) - import :: psb_d_sparse_mat - class(psb_d_sparse_mat), intent(out) :: a - class(psb_d_sparse_mat), intent(in) :: b + import :: psb_dspmat_type + class(psb_dspmat_type), intent(out) :: a + class(psb_dspmat_type), intent(in) :: b end subroutine psb_d_transp_2mat end interface interface subroutine psb_d_transc_1mat(a) - import :: psb_d_sparse_mat - class(psb_d_sparse_mat), intent(inout) :: a + import :: psb_dspmat_type + class(psb_dspmat_type), intent(inout) :: a end subroutine psb_d_transc_1mat end interface interface subroutine psb_d_transc_2mat(a,b) - import :: psb_d_sparse_mat - class(psb_d_sparse_mat), intent(out) :: a - class(psb_d_sparse_mat), intent(in) :: b + import :: psb_dspmat_type + class(psb_dspmat_type), intent(out) :: a + class(psb_dspmat_type), intent(in) :: b end subroutine psb_d_transc_2mat end interface interface subroutine psb_d_reinit(a,clear) - import :: psb_d_sparse_mat - class(psb_d_sparse_mat), intent(inout) :: a + import :: psb_dspmat_type + class(psb_dspmat_type), intent(inout) :: a logical, intent(in), optional :: clear end subroutine psb_d_reinit @@ -569,16 +569,16 @@ module psb_d_mat_mod interface psb_csmm subroutine psb_d_csmm(alpha,a,x,beta,y,info,trans) - import :: psb_d_sparse_mat, psb_dpk_ - class(psb_d_sparse_mat), intent(in) :: a + import :: psb_dspmat_type, psb_dpk_ + class(psb_dspmat_type), intent(in) :: a real(psb_dpk_), intent(in) :: alpha, beta, x(:,:) real(psb_dpk_), intent(inout) :: y(:,:) integer, intent(out) :: info character, optional, intent(in) :: trans end subroutine psb_d_csmm subroutine psb_d_csmv(alpha,a,x,beta,y,info,trans) - import :: psb_d_sparse_mat, psb_dpk_ - class(psb_d_sparse_mat), intent(in) :: a + import :: psb_dspmat_type, psb_dpk_ + class(psb_dspmat_type), intent(in) :: a real(psb_dpk_), intent(in) :: alpha, beta, x(:) real(psb_dpk_), intent(inout) :: y(:) integer, intent(out) :: info @@ -588,8 +588,8 @@ module psb_d_mat_mod interface psb_cssm subroutine psb_d_cssm(alpha,a,x,beta,y,info,trans,scale,d) - import :: psb_d_sparse_mat, psb_dpk_ - class(psb_d_sparse_mat), intent(in) :: a + import :: psb_dspmat_type, psb_dpk_ + class(psb_dspmat_type), intent(in) :: a real(psb_dpk_), intent(in) :: alpha, beta, x(:,:) real(psb_dpk_), intent(inout) :: y(:,:) integer, intent(out) :: info @@ -597,8 +597,8 @@ module psb_d_mat_mod real(psb_dpk_), intent(in), optional :: d(:) end subroutine psb_d_cssm subroutine psb_d_cssv(alpha,a,x,beta,y,info,trans,scale,d) - import :: psb_d_sparse_mat, psb_dpk_ - class(psb_d_sparse_mat), intent(in) :: a + import :: psb_dspmat_type, psb_dpk_ + class(psb_dspmat_type), intent(in) :: a real(psb_dpk_), intent(in) :: alpha, beta, x(:) real(psb_dpk_), intent(inout) :: y(:) integer, intent(out) :: info @@ -609,48 +609,48 @@ module psb_d_mat_mod interface function psb_d_csnmi(a) result(res) - import :: psb_d_sparse_mat, psb_dpk_ - class(psb_d_sparse_mat), intent(in) :: a + import :: psb_dspmat_type, psb_dpk_ + class(psb_dspmat_type), intent(in) :: a real(psb_dpk_) :: res end function psb_d_csnmi end interface interface function psb_d_csnm1(a) result(res) - import :: psb_d_sparse_mat, psb_dpk_ - class(psb_d_sparse_mat), intent(in) :: a + import :: psb_dspmat_type, psb_dpk_ + class(psb_dspmat_type), intent(in) :: a real(psb_dpk_) :: res end function psb_d_csnm1 end interface interface subroutine psb_d_rowsum(d,a) - import :: psb_d_sparse_mat, psb_dpk_ - class(psb_d_sparse_mat), intent(in) :: a + import :: psb_dspmat_type, psb_dpk_ + class(psb_dspmat_type), intent(in) :: a real(psb_dpk_), intent(out) :: d(:) end subroutine psb_d_rowsum end interface interface subroutine psb_d_arwsum(d,a) - import :: psb_d_sparse_mat, psb_dpk_ - class(psb_d_sparse_mat), intent(in) :: a + import :: psb_dspmat_type, psb_dpk_ + class(psb_dspmat_type), intent(in) :: a real(psb_dpk_), intent(out) :: d(:) end subroutine psb_d_arwsum end interface interface subroutine psb_d_colsum(d,a) - import :: psb_d_sparse_mat, psb_dpk_ - class(psb_d_sparse_mat), intent(in) :: a + import :: psb_dspmat_type, psb_dpk_ + class(psb_dspmat_type), intent(in) :: a real(psb_dpk_), intent(out) :: d(:) end subroutine psb_d_colsum end interface interface subroutine psb_d_aclsum(d,a) - import :: psb_d_sparse_mat, psb_dpk_ - class(psb_d_sparse_mat), intent(in) :: a + import :: psb_dspmat_type, psb_dpk_ + class(psb_dspmat_type), intent(in) :: a real(psb_dpk_), intent(out) :: d(:) end subroutine psb_d_aclsum end interface @@ -658,8 +658,8 @@ module psb_d_mat_mod interface subroutine psb_d_get_diag(a,d,info) - import :: psb_d_sparse_mat, psb_dpk_ - class(psb_d_sparse_mat), intent(in) :: a + import :: psb_dspmat_type, psb_dpk_ + class(psb_dspmat_type), intent(in) :: a real(psb_dpk_), intent(out) :: d(:) integer, intent(out) :: info end subroutine psb_d_get_diag @@ -667,14 +667,14 @@ module psb_d_mat_mod interface psb_scal subroutine psb_d_scal(d,a,info) - import :: psb_d_sparse_mat, psb_dpk_ - class(psb_d_sparse_mat), intent(inout) :: a + import :: psb_dspmat_type, psb_dpk_ + class(psb_dspmat_type), intent(inout) :: a real(psb_dpk_), intent(in) :: d(:) integer, intent(out) :: info end subroutine psb_d_scal subroutine psb_d_scals(d,a,info) - import :: psb_d_sparse_mat, psb_dpk_ - class(psb_d_sparse_mat), intent(inout) :: a + import :: psb_dspmat_type, psb_dpk_ + class(psb_dspmat_type), intent(inout) :: a real(psb_dpk_), intent(in) :: d integer, intent(out) :: info end subroutine psb_d_scals @@ -701,7 +701,7 @@ contains function psb_d_sizeof(a) result(res) implicit none - class(psb_d_sparse_mat), intent(in) :: a + class(psb_dspmat_type), intent(in) :: a integer(psb_long_int_k_) :: res res = 0 @@ -715,7 +715,7 @@ contains function psb_d_get_fmt(a) result(res) implicit none - class(psb_d_sparse_mat), intent(in) :: a + class(psb_dspmat_type), intent(in) :: a character(len=5) :: res if (allocated(a%a)) then @@ -730,7 +730,7 @@ contains function psb_d_get_dupl(a) result(res) implicit none - class(psb_d_sparse_mat), intent(in) :: a + class(psb_dspmat_type), intent(in) :: a integer :: res if (allocated(a%a)) then @@ -743,7 +743,7 @@ contains function psb_d_get_state(a) result(res) implicit none - class(psb_d_sparse_mat), intent(in) :: a + class(psb_dspmat_type), intent(in) :: a integer :: res if (allocated(a%a)) then @@ -755,7 +755,7 @@ contains function psb_d_get_nrows(a) result(res) implicit none - class(psb_d_sparse_mat), intent(in) :: a + class(psb_dspmat_type), intent(in) :: a integer :: res if (allocated(a%a)) then @@ -768,7 +768,7 @@ contains function psb_d_get_ncols(a) result(res) implicit none - class(psb_d_sparse_mat), intent(in) :: a + class(psb_dspmat_type), intent(in) :: a integer :: res if (allocated(a%a)) then @@ -781,7 +781,7 @@ contains function psb_d_is_triangle(a) result(res) implicit none - class(psb_d_sparse_mat), intent(in) :: a + class(psb_dspmat_type), intent(in) :: a logical :: res if (allocated(a%a)) then @@ -794,7 +794,7 @@ contains function psb_d_is_unit(a) result(res) implicit none - class(psb_d_sparse_mat), intent(in) :: a + class(psb_dspmat_type), intent(in) :: a logical :: res if (allocated(a%a)) then @@ -807,7 +807,7 @@ contains function psb_d_is_upper(a) result(res) implicit none - class(psb_d_sparse_mat), intent(in) :: a + class(psb_dspmat_type), intent(in) :: a logical :: res if (allocated(a%a)) then @@ -820,7 +820,7 @@ contains function psb_d_is_lower(a) result(res) implicit none - class(psb_d_sparse_mat), intent(in) :: a + class(psb_dspmat_type), intent(in) :: a logical :: res if (allocated(a%a)) then @@ -833,7 +833,7 @@ contains function psb_d_is_null(a) result(res) implicit none - class(psb_d_sparse_mat), intent(in) :: a + class(psb_dspmat_type), intent(in) :: a logical :: res if (allocated(a%a)) then @@ -846,7 +846,7 @@ contains function psb_d_is_bld(a) result(res) implicit none - class(psb_d_sparse_mat), intent(in) :: a + class(psb_dspmat_type), intent(in) :: a logical :: res if (allocated(a%a)) then @@ -859,7 +859,7 @@ contains function psb_d_is_upd(a) result(res) implicit none - class(psb_d_sparse_mat), intent(in) :: a + class(psb_dspmat_type), intent(in) :: a logical :: res if (allocated(a%a)) then @@ -872,7 +872,7 @@ contains function psb_d_is_asb(a) result(res) implicit none - class(psb_d_sparse_mat), intent(in) :: a + class(psb_dspmat_type), intent(in) :: a logical :: res if (allocated(a%a)) then @@ -885,7 +885,7 @@ contains function psb_d_is_sorted(a) result(res) implicit none - class(psb_d_sparse_mat), intent(in) :: a + class(psb_dspmat_type), intent(in) :: a logical :: res if (allocated(a%a)) then @@ -900,7 +900,7 @@ contains function psb_d_get_nzeros(a) result(res) implicit none - class(psb_d_sparse_mat), intent(in) :: a + class(psb_dspmat_type), intent(in) :: a integer :: res res = 0 @@ -913,7 +913,7 @@ contains function psb_d_get_size(a) result(res) implicit none - class(psb_d_sparse_mat), intent(in) :: a + class(psb_dspmat_type), intent(in) :: a integer :: res @@ -928,7 +928,7 @@ contains function psb_d_get_nz_row(idx,a) result(res) implicit none integer, intent(in) :: idx - class(psb_d_sparse_mat), intent(in) :: a + class(psb_dspmat_type), intent(in) :: a integer :: res Integer :: err_act diff --git a/base/modules/psb_d_psblas_mod.f90 b/base/modules/psb_d_psblas_mod.f90 index 22a1be82..6e4c3ea7 100644 --- a/base/modules/psb_d_psblas_mod.f90 +++ b/base/modules/psb_d_psblas_mod.f90 @@ -193,9 +193,9 @@ module psb_d_psblas_mod interface psb_spnrmi function psb_dnrmi(a, desc_a,info) use psb_descriptor_type, only : psb_desc_type, psb_spk_, psb_dpk_ - use psb_mat_mod, only : psb_d_sparse_mat + use psb_mat_mod, only : psb_dspmat_type real(psb_dpk_) :: psb_dnrmi - type(psb_d_sparse_mat), intent (in) :: a + type(psb_dspmat_type), intent (in) :: a type(psb_desc_type), intent (in) :: desc_a integer, intent(out) :: info end function psb_dnrmi @@ -204,9 +204,9 @@ module psb_d_psblas_mod interface psb_spnrm1 function psb_dspnrm1(a, desc_a,info) use psb_descriptor_type, only : psb_desc_type, psb_spk_, psb_dpk_ - use psb_mat_mod, only : psb_d_sparse_mat + use psb_mat_mod, only : psb_dspmat_type real(psb_dpk_) :: psb_dspnrm1 - type(psb_d_sparse_mat), intent (in) :: a + type(psb_dspmat_type), intent (in) :: a type(psb_desc_type), intent (in) :: desc_a integer, intent(out) :: info end function psb_dspnrm1 @@ -216,8 +216,8 @@ module psb_d_psblas_mod subroutine psb_dspmm(alpha, a, x, beta, y, desc_a, info,& &trans, k, jx, jy,work,doswap) use psb_descriptor_type, only : psb_desc_type, psb_spk_, psb_dpk_ - use psb_mat_mod, only : psb_d_sparse_mat - type(psb_d_sparse_mat), intent(in) :: a + use psb_mat_mod, only : psb_dspmat_type + type(psb_dspmat_type), intent(in) :: a real(psb_dpk_), intent(inout) :: x(:,:) real(psb_dpk_), intent(inout) :: y(:,:) real(psb_dpk_), intent(in) :: alpha, beta @@ -231,8 +231,8 @@ module psb_d_psblas_mod subroutine psb_dspmv(alpha, a, x, beta, y,& & desc_a, info, trans, work,doswap) use psb_descriptor_type, only : psb_desc_type, psb_spk_, psb_dpk_ - use psb_mat_mod, only : psb_d_sparse_mat - type(psb_d_sparse_mat), intent(in) :: a + use psb_mat_mod, only : psb_dspmat_type + type(psb_dspmat_type), intent(in) :: a real(psb_dpk_), intent(inout) :: x(:) real(psb_dpk_), intent(inout) :: y(:) real(psb_dpk_), intent(in) :: alpha, beta @@ -249,8 +249,8 @@ module psb_d_psblas_mod & desc_a, info, trans, scale, choice,& & diag, n, jx, jy, work) use psb_descriptor_type, only : psb_desc_type, psb_spk_, psb_dpk_ - use psb_mat_mod, only : psb_d_sparse_mat - type(psb_d_sparse_mat), intent(in) :: t + use psb_mat_mod, only : psb_dspmat_type + type(psb_dspmat_type), intent(in) :: t real(psb_dpk_), intent(in) :: x(:,:) real(psb_dpk_), intent(inout) :: y(:,:) real(psb_dpk_), intent(in) :: alpha, beta @@ -266,8 +266,8 @@ module psb_d_psblas_mod & desc_a, info, trans, scale, choice,& & diag, work) use psb_descriptor_type, only : psb_desc_type, psb_spk_, psb_dpk_ - use psb_mat_mod, only : psb_d_sparse_mat - type(psb_d_sparse_mat), intent(in) :: t + use psb_mat_mod, only : psb_dspmat_type + type(psb_dspmat_type), intent(in) :: t real(psb_dpk_), intent(in) :: x(:) real(psb_dpk_), intent(inout) :: y(:) real(psb_dpk_), intent(in) :: alpha, beta diff --git a/base/modules/psb_d_tools_mod.f90 b/base/modules/psb_d_tools_mod.f90 index 937f1957..397cc1e2 100644 --- a/base/modules/psb_d_tools_mod.f90 +++ b/base/modules/psb_d_tools_mod.f90 @@ -70,9 +70,9 @@ Module psb_d_tools_mod Subroutine psb_dsphalo(a,desc_a,blk,info,rowcnv,colcnv,& & rowscale,colscale,outfmt,data) use psb_descriptor_type, only : psb_desc_type, psb_spk_, psb_dpk_ - use psb_mat_mod, only : psb_d_sparse_mat - Type(psb_d_sparse_mat),Intent(in) :: a - Type(psb_d_sparse_mat),Intent(inout) :: blk + use psb_mat_mod, only : psb_dspmat_type + Type(psb_dspmat_type),Intent(in) :: a + Type(psb_dspmat_type),Intent(inout) :: blk Type(psb_desc_type),Intent(in),target :: desc_a integer, intent(out) :: info logical, optional, intent(in) :: rowcnv,colcnv,rowscale,colscale @@ -123,9 +123,9 @@ Module psb_d_tools_mod interface psb_cdbldext Subroutine psb_dcdbldext(a,desc_a,novr,desc_ov,info,extype) use psb_descriptor_type, only : psb_desc_type, psb_spk_, psb_dpk_ - Use psb_mat_mod, only : psb_d_sparse_mat + Use psb_mat_mod, only : psb_dspmat_type integer, intent(in) :: novr - Type(psb_d_sparse_mat), Intent(in) :: a + Type(psb_dspmat_type), Intent(in) :: a Type(psb_desc_type), Intent(in), target :: desc_a Type(psb_desc_type), Intent(out) :: desc_ov integer, intent(out) :: info @@ -136,9 +136,9 @@ Module psb_d_tools_mod interface psb_spall subroutine psb_dspalloc(a, desc_a, info, nnz) use psb_descriptor_type, only : psb_desc_type, psb_spk_, psb_dpk_ - use psb_mat_mod, only : psb_d_sparse_mat + use psb_mat_mod, only : psb_dspmat_type type(psb_desc_type), intent(in) :: desc_a - type(psb_d_sparse_mat), intent(inout) :: a + type(psb_dspmat_type), intent(inout) :: a integer, intent(out) :: info integer, optional, intent(in) :: nnz end subroutine psb_dspalloc @@ -147,8 +147,8 @@ Module psb_d_tools_mod interface psb_spasb subroutine psb_dspasb(a,desc_a, info, afmt, upd, dupl,mold) use psb_descriptor_type, only : psb_desc_type, psb_spk_, psb_dpk_ - use psb_mat_mod, only : psb_d_sparse_mat, psb_d_base_sparse_mat - type(psb_d_sparse_mat), intent (inout) :: a + use psb_mat_mod, only : psb_dspmat_type, psb_d_base_sparse_mat + type(psb_dspmat_type), intent (inout) :: a type(psb_desc_type), intent(in) :: desc_a integer, intent(out) :: info integer,optional, intent(in) :: dupl, upd @@ -160,9 +160,9 @@ Module psb_d_tools_mod interface psb_spfree subroutine psb_dspfree(a, desc_a,info) use psb_descriptor_type, only : psb_desc_type, psb_spk_, psb_dpk_ - use psb_mat_mod, only : psb_d_sparse_mat + use psb_mat_mod, only : psb_dspmat_type type(psb_desc_type), intent(in) :: desc_a - type(psb_d_sparse_mat), intent(inout) :: a + type(psb_dspmat_type), intent(inout) :: a integer, intent(out) :: info end subroutine psb_dspfree end interface @@ -171,9 +171,9 @@ Module psb_d_tools_mod interface psb_spins subroutine psb_dspins(nz,ia,ja,val,a,desc_a,info,rebuild) use psb_descriptor_type, only : psb_desc_type, psb_spk_, psb_dpk_ - use psb_mat_mod, only : psb_d_sparse_mat + use psb_mat_mod, only : psb_dspmat_type type(psb_desc_type), intent(inout) :: desc_a - type(psb_d_sparse_mat), intent(inout) :: a + type(psb_dspmat_type), intent(inout) :: a integer, intent(in) :: nz,ia(:),ja(:) real(psb_dpk_), intent(in) :: val(:) integer, intent(out) :: info @@ -181,8 +181,8 @@ Module psb_d_tools_mod end subroutine psb_dspins subroutine psb_dspins_2desc(nz,ia,ja,val,a,desc_ar,desc_ac,info) use psb_descriptor_type, only : psb_desc_type, psb_spk_, psb_dpk_ - use psb_mat_mod, only : psb_d_sparse_mat - type(psb_d_sparse_mat), intent(inout) :: a + use psb_mat_mod, only : psb_dspmat_type + type(psb_dspmat_type), intent(inout) :: a type(psb_desc_type), intent(in) :: desc_ar type(psb_desc_type), intent(inout) :: desc_ac integer, intent(in) :: nz,ia(:),ja(:) @@ -195,9 +195,9 @@ Module psb_d_tools_mod interface psb_sprn subroutine psb_dsprn(a, desc_a,info,clear) use psb_descriptor_type, only : psb_desc_type, psb_spk_, psb_dpk_ - use psb_mat_mod, only : psb_d_sparse_mat + use psb_mat_mod, only : psb_dspmat_type type(psb_desc_type), intent(in) :: desc_a - type(psb_d_sparse_mat), intent(inout) :: a + type(psb_dspmat_type), intent(inout) :: a integer, intent(out) :: info logical, intent(in), optional :: clear end subroutine psb_dsprn @@ -226,7 +226,7 @@ Module psb_d_tools_mod !!$ use psb_base_tools_mod !!$ use psb_d_mat_mod !!$ implicit none -!!$ type(psb_d_sparse_mat), intent(out) :: a_map +!!$ type(psb_dspmat_type), intent(out) :: a_map !!$ type(psb_desc_type), intent(out) :: cd_xt !!$ type(psb_desc_type), intent(in) :: descin, descout !!$ @@ -257,7 +257,7 @@ Module psb_d_tools_mod !!$ integer, intent(in) :: nz !!$ integer, intent(in) :: ir(:),ic(:) !!$ real(psb_dpk_), intent(in) :: val(:) -!!$ type(psb_d_sparse_mat), intent(inout) :: a_map +!!$ type(psb_dspmat_type), intent(inout) :: a_map !!$ type(psb_desc_type), intent(inout) :: cd_xt !!$ type(psb_desc_type), intent(in) :: descin, descout !!$ integer :: info @@ -271,7 +271,7 @@ Module psb_d_tools_mod !!$ use psb_descriptor_type !!$ use psb_serial_mod !!$ implicit none -!!$ type(psb_d_sparse_mat), intent(inout) :: a_map +!!$ type(psb_dspmat_type), intent(inout) :: a_map !!$ type(psb_desc_type), intent(inout) :: cd_xt !!$ type(psb_desc_type), intent(in) :: descin, descout !!$ character(len=*), optional, intent(in) :: afmt diff --git a/base/modules/psb_linmap_type_mod.f90 b/base/modules/psb_linmap_type_mod.f90 index 9bee4ea5..927c28c1 100644 --- a/base/modules/psb_linmap_type_mod.f90 +++ b/base/modules/psb_linmap_type_mod.f90 @@ -37,7 +37,7 @@ ! module psb_linmap_type_mod use psb_const_mod - use psb_mat_mod, only: psb_d_sparse_mat, psb_s_sparse_mat, psb_z_sparse_mat, psb_c_sparse_mat + use psb_mat_mod, only: psb_dspmat_type, psb_sspmat_type, psb_zspmat_type, psb_cspmat_type use psb_descriptor_type, only: psb_desc_type @@ -57,28 +57,28 @@ module psb_linmap_type_mod integer, allocatable :: itd_data(:), iaggr(:), naggr(:) type(psb_desc_type), pointer :: p_desc_X=>null(), p_desc_Y=>null() type(psb_desc_type) :: desc_X, desc_Y - type(psb_s_sparse_mat) :: map_X2Y, map_Y2X + type(psb_sspmat_type) :: map_X2Y, map_Y2X end type psb_slinmap_type type psb_dlinmap_type integer, allocatable :: itd_data(:), iaggr(:), naggr(:) type(psb_desc_type), pointer :: p_desc_X=>null(), p_desc_Y=>null() type(psb_desc_type) :: desc_X, desc_Y - type(psb_d_sparse_mat) :: map_X2Y, map_Y2X + type(psb_dspmat_type) :: map_X2Y, map_Y2X end type psb_dlinmap_type type psb_clinmap_type integer, allocatable :: itd_data(:), iaggr(:), naggr(:) type(psb_desc_type), pointer :: p_desc_X=>null(), p_desc_Y=>null() type(psb_desc_type) :: desc_X, desc_Y - type(psb_c_sparse_mat) :: map_X2Y, map_Y2X + type(psb_cspmat_type) :: map_X2Y, map_Y2X end type psb_clinmap_type type psb_zlinmap_type integer, allocatable :: itd_data(:), iaggr(:), naggr(:) type(psb_desc_type), pointer :: p_desc_X=>null(), p_desc_Y=>null() type(psb_desc_type) :: desc_X, desc_Y - type(psb_z_sparse_mat) :: map_X2Y, map_Y2X + type(psb_zspmat_type) :: map_X2Y, map_Y2X end type psb_zlinmap_type end module psb_linmap_type_mod diff --git a/base/modules/psb_s_linmap_mod.f90 b/base/modules/psb_s_linmap_mod.f90 index 2a19eb0d..e1d119b6 100644 --- a/base/modules/psb_s_linmap_mod.f90 +++ b/base/modules/psb_s_linmap_mod.f90 @@ -98,7 +98,7 @@ module psb_s_linmap_mod implicit none type(psb_slinmap_type) :: psb_s_linmap type(psb_desc_type), target :: desc_X, desc_Y - type(psb_s_sparse_mat), intent(in) :: map_X2Y, map_Y2X + type(psb_sspmat_type), intent(in) :: map_X2Y, map_Y2X integer, intent(in) :: map_kind integer, intent(in), optional :: iaggr(:), naggr(:) end function psb_s_linmap @@ -203,7 +203,7 @@ contains implicit none type(psb_slinmap_type), intent(out) :: out_map type(psb_desc_type), target :: desc_X, desc_Y - type(psb_s_sparse_mat), intent(in) :: map_X2Y, map_Y2X + type(psb_sspmat_type), intent(in) :: map_X2Y, map_Y2X integer, intent(in) :: map_kind integer, intent(in), optional :: iaggr(:), naggr(:) out_map = psb_linmap(map_kind,desc_X,desc_Y,map_X2Y,map_Y2X,iaggr,naggr) diff --git a/base/modules/psb_s_mat_mod.f03 b/base/modules/psb_s_mat_mod.f03 index 15741950..4fb2028c 100644 --- a/base/modules/psb_s_mat_mod.f03 +++ b/base/modules/psb_s_mat_mod.f03 @@ -48,7 +48,7 @@ module psb_s_mat_mod use psb_s_csr_mat_mod, only : psb_s_csr_sparse_mat use psb_s_csc_mat_mod, only : psb_s_csc_sparse_mat - type :: psb_s_sparse_mat + type :: psb_sspmat_type class(psb_s_base_sparse_mat), allocatable :: a @@ -141,7 +141,7 @@ module psb_s_mat_mod procedure, pass(a) :: s_cssm => psb_s_cssm generic, public :: cssm => s_cssm, s_cssv - end type psb_s_sparse_mat + end type psb_sspmat_type private :: psb_s_get_nrows, psb_s_get_ncols, get_nzeros, psb_s_get_size, & & psb_s_get_state, psb_s_get_dupl, psb_s_is_null, psb_s_is_bld, psb_s_is_upd, & @@ -169,100 +169,100 @@ module psb_s_mat_mod interface subroutine psb_s_set_nrows(m,a) - import :: psb_s_sparse_mat - class(psb_s_sparse_mat), intent(inout) :: a + import :: psb_sspmat_type + class(psb_sspmat_type), intent(inout) :: a integer, intent(in) :: m end subroutine psb_s_set_nrows end interface interface subroutine psb_s_set_ncols(n,a) - import :: psb_s_sparse_mat - class(psb_s_sparse_mat), intent(inout) :: a + import :: psb_sspmat_type + class(psb_sspmat_type), intent(inout) :: a integer, intent(in) :: n end subroutine psb_s_set_ncols end interface interface subroutine psb_s_set_state(n,a) - import :: psb_s_sparse_mat - class(psb_s_sparse_mat), intent(inout) :: a + import :: psb_sspmat_type + class(psb_sspmat_type), intent(inout) :: a integer, intent(in) :: n end subroutine psb_s_set_state end interface interface subroutine psb_s_set_dupl(n,a) - import :: psb_s_sparse_mat - class(psb_s_sparse_mat), intent(inout) :: a + import :: psb_sspmat_type + class(psb_sspmat_type), intent(inout) :: a integer, intent(in) :: n end subroutine psb_s_set_dupl end interface interface subroutine psb_s_set_null(a) - import :: psb_s_sparse_mat - class(psb_s_sparse_mat), intent(inout) :: a + import :: psb_sspmat_type + class(psb_sspmat_type), intent(inout) :: a end subroutine psb_s_set_null end interface interface subroutine psb_s_set_bld(a) - import :: psb_s_sparse_mat - class(psb_s_sparse_mat), intent(inout) :: a + import :: psb_sspmat_type + class(psb_sspmat_type), intent(inout) :: a end subroutine psb_s_set_bld end interface interface subroutine psb_s_set_upd(a) - import :: psb_s_sparse_mat - class(psb_s_sparse_mat), intent(inout) :: a + import :: psb_sspmat_type + class(psb_sspmat_type), intent(inout) :: a end subroutine psb_s_set_upd end interface interface subroutine psb_s_set_asb(a) - import :: psb_s_sparse_mat - class(psb_s_sparse_mat), intent(inout) :: a + import :: psb_sspmat_type + class(psb_sspmat_type), intent(inout) :: a end subroutine psb_s_set_asb end interface interface subroutine psb_s_set_sorted(a,val) - import :: psb_s_sparse_mat - class(psb_s_sparse_mat), intent(inout) :: a + import :: psb_sspmat_type + class(psb_sspmat_type), intent(inout) :: a logical, intent(in), optional :: val end subroutine psb_s_set_sorted end interface interface subroutine psb_s_set_triangle(a,val) - import :: psb_s_sparse_mat - class(psb_s_sparse_mat), intent(inout) :: a + import :: psb_sspmat_type + class(psb_sspmat_type), intent(inout) :: a logical, intent(in), optional :: val end subroutine psb_s_set_triangle end interface interface subroutine psb_s_set_unit(a,val) - import :: psb_s_sparse_mat - class(psb_s_sparse_mat), intent(inout) :: a + import :: psb_sspmat_type + class(psb_sspmat_type), intent(inout) :: a logical, intent(in), optional :: val end subroutine psb_s_set_unit end interface interface subroutine psb_s_set_lower(a,val) - import :: psb_s_sparse_mat - class(psb_s_sparse_mat), intent(inout) :: a + import :: psb_sspmat_type + class(psb_sspmat_type), intent(inout) :: a logical, intent(in), optional :: val end subroutine psb_s_set_lower end interface interface subroutine psb_s_set_upper(a,val) - import :: psb_s_sparse_mat - class(psb_s_sparse_mat), intent(inout) :: a + import :: psb_sspmat_type + class(psb_sspmat_type), intent(inout) :: a logical, intent(in), optional :: val end subroutine psb_s_set_upper end interface @@ -270,9 +270,9 @@ module psb_s_mat_mod interface subroutine psb_s_sparse_print(iout,a,iv,eirs,eics,head,ivr,ivc) - import :: psb_s_sparse_mat + import :: psb_sspmat_type integer, intent(in) :: iout - class(psb_s_sparse_mat), intent(in) :: a + class(psb_sspmat_type), intent(in) :: a integer, intent(in), optional :: iv(:) integer, intent(in), optional :: eirs,eics character(len=*), optional :: head @@ -282,8 +282,8 @@ module psb_s_mat_mod interface subroutine psb_s_get_neigh(a,idx,neigh,n,info,lev) - import :: psb_s_sparse_mat - class(psb_s_sparse_mat), intent(in) :: a + import :: psb_sspmat_type + class(psb_sspmat_type), intent(in) :: a integer, intent(in) :: idx integer, intent(out) :: n integer, allocatable, intent(out) :: neigh(:) @@ -294,8 +294,8 @@ module psb_s_mat_mod interface subroutine psb_s_csall(nr,nc,a,info,nz) - import :: psb_s_sparse_mat - class(psb_s_sparse_mat), intent(out) :: a + import :: psb_sspmat_type + class(psb_sspmat_type), intent(out) :: a integer, intent(in) :: nr,nc integer, intent(out) :: info integer, intent(in), optional :: nz @@ -304,30 +304,30 @@ module psb_s_mat_mod interface subroutine psb_s_reallocate_nz(nz,a) - import :: psb_s_sparse_mat + import :: psb_sspmat_type integer, intent(in) :: nz - class(psb_s_sparse_mat), intent(inout) :: a + class(psb_sspmat_type), intent(inout) :: a end subroutine psb_s_reallocate_nz end interface interface subroutine psb_s_free(a) - import :: psb_s_sparse_mat - class(psb_s_sparse_mat), intent(inout) :: a + import :: psb_sspmat_type + class(psb_sspmat_type), intent(inout) :: a end subroutine psb_s_free end interface interface subroutine psb_s_trim(a) - import :: psb_s_sparse_mat - class(psb_s_sparse_mat), intent(inout) :: a + import :: psb_sspmat_type + class(psb_sspmat_type), intent(inout) :: a end subroutine psb_s_trim end interface interface subroutine psb_s_csput(nz,ia,ja,val,a,imin,imax,jmin,jmax,info,gtl) - import :: psb_s_sparse_mat, psb_spk_ - class(psb_s_sparse_mat), intent(inout) :: a + import :: psb_sspmat_type, psb_spk_ + class(psb_sspmat_type), intent(inout) :: a real(psb_spk_), intent(in) :: val(:) integer, intent(in) :: nz, ia(:), ja(:), imin,imax,jmin,jmax integer, intent(out) :: info @@ -338,8 +338,8 @@ module psb_s_mat_mod interface subroutine psb_s_csgetptn(imin,imax,a,nz,ia,ja,info,& & jmin,jmax,iren,append,nzin,rscale,cscale) - import :: psb_s_sparse_mat, psb_spk_ - class(psb_s_sparse_mat), intent(in) :: a + import :: psb_sspmat_type, psb_spk_ + class(psb_sspmat_type), intent(in) :: a integer, intent(in) :: imin,imax integer, intent(out) :: nz integer, allocatable, intent(inout) :: ia(:), ja(:) @@ -354,8 +354,8 @@ module psb_s_mat_mod interface subroutine psb_s_csgetrow(imin,imax,a,nz,ia,ja,val,info,& & jmin,jmax,iren,append,nzin,rscale,cscale) - import :: psb_s_sparse_mat, psb_spk_ - class(psb_s_sparse_mat), intent(in) :: a + import :: psb_sspmat_type, psb_spk_ + class(psb_sspmat_type), intent(in) :: a integer, intent(in) :: imin,imax integer, intent(out) :: nz integer, allocatable, intent(inout) :: ia(:), ja(:) @@ -371,9 +371,9 @@ module psb_s_mat_mod interface subroutine psb_s_csgetblk(imin,imax,a,b,info,& & jmin,jmax,iren,append,rscale,cscale) - import :: psb_s_sparse_mat, psb_spk_ - class(psb_s_sparse_mat), intent(in) :: a - class(psb_s_sparse_mat), intent(out) :: b + import :: psb_sspmat_type, psb_spk_ + class(psb_sspmat_type), intent(in) :: a + class(psb_sspmat_type), intent(out) :: b integer, intent(in) :: imin,imax integer,intent(out) :: info logical, intent(in), optional :: append @@ -386,9 +386,9 @@ module psb_s_mat_mod interface subroutine psb_s_csclip(a,b,info,& & imin,imax,jmin,jmax,rscale,cscale) - import :: psb_s_sparse_mat, psb_spk_ - class(psb_s_sparse_mat), intent(in) :: a - class(psb_s_sparse_mat), intent(out) :: b + import :: psb_sspmat_type, psb_spk_ + class(psb_sspmat_type), intent(in) :: a + class(psb_sspmat_type), intent(out) :: b integer,intent(out) :: info integer, intent(in), optional :: imin,imax,jmin,jmax logical, intent(in), optional :: rscale,cscale @@ -398,8 +398,8 @@ module psb_s_mat_mod interface subroutine psb_s_b_csclip(a,b,info,& & imin,imax,jmin,jmax,rscale,cscale) - import :: psb_s_sparse_mat, psb_spk_, psb_s_coo_sparse_mat - class(psb_s_sparse_mat), intent(in) :: a + import :: psb_sspmat_type, psb_spk_, psb_s_coo_sparse_mat + class(psb_sspmat_type), intent(in) :: a type(psb_s_coo_sparse_mat), intent(out) :: b integer,intent(out) :: info integer, intent(in), optional :: imin,imax,jmin,jmax @@ -409,9 +409,9 @@ module psb_s_mat_mod interface subroutine psb_s_cscnv(a,b,info,type,mold,upd,dupl) - import :: psb_s_sparse_mat, psb_spk_, psb_s_base_sparse_mat - class(psb_s_sparse_mat), intent(in) :: a - class(psb_s_sparse_mat), intent(out) :: b + import :: psb_sspmat_type, psb_spk_, psb_s_base_sparse_mat + class(psb_sspmat_type), intent(in) :: a + class(psb_sspmat_type), intent(out) :: b integer, intent(out) :: info integer,optional, intent(in) :: dupl, upd character(len=*), optional, intent(in) :: type @@ -422,8 +422,8 @@ module psb_s_mat_mod interface subroutine psb_s_cscnv_ip(a,iinfo,type,mold,dupl) - import :: psb_s_sparse_mat, psb_spk_, psb_s_base_sparse_mat - class(psb_s_sparse_mat), intent(inout) :: a + import :: psb_sspmat_type, psb_spk_, psb_s_base_sparse_mat + class(psb_sspmat_type), intent(inout) :: a integer, intent(out) :: iinfo integer,optional, intent(in) :: dupl character(len=*), optional, intent(in) :: type @@ -434,8 +434,8 @@ module psb_s_mat_mod interface subroutine psb_s_cscnv_base(a,b,info,dupl) - import :: psb_s_sparse_mat, psb_spk_, psb_s_base_sparse_mat - class(psb_s_sparse_mat), intent(in) :: a + import :: psb_sspmat_type, psb_spk_, psb_s_base_sparse_mat + class(psb_sspmat_type), intent(in) :: a class(psb_s_base_sparse_mat), intent(out) :: b integer, intent(out) :: info integer,optional, intent(in) :: dupl @@ -444,106 +444,106 @@ module psb_s_mat_mod interface subroutine psb_s_clip_d(a,b,info) - import :: psb_s_sparse_mat - class(psb_s_sparse_mat), intent(in) :: a - class(psb_s_sparse_mat), intent(out) :: b + import :: psb_sspmat_type + class(psb_sspmat_type), intent(in) :: a + class(psb_sspmat_type), intent(out) :: b integer,intent(out) :: info end subroutine psb_s_clip_d end interface interface subroutine psb_s_clip_d_ip(a,info) - import :: psb_s_sparse_mat - class(psb_s_sparse_mat), intent(inout) :: a + import :: psb_sspmat_type + class(psb_sspmat_type), intent(inout) :: a integer,intent(out) :: info end subroutine psb_s_clip_d_ip end interface interface subroutine psb_s_mv_from(a,b) - import :: psb_s_sparse_mat, psb_spk_, psb_s_base_sparse_mat - class(psb_s_sparse_mat), intent(out) :: a + import :: psb_sspmat_type, psb_spk_, psb_s_base_sparse_mat + class(psb_sspmat_type), intent(out) :: a class(psb_s_base_sparse_mat), intent(inout) :: b end subroutine psb_s_mv_from end interface interface subroutine psb_s_cp_from(a,b) - import :: psb_s_sparse_mat, psb_spk_, psb_s_base_sparse_mat - class(psb_s_sparse_mat), intent(out) :: a + import :: psb_sspmat_type, psb_spk_, psb_s_base_sparse_mat + class(psb_sspmat_type), intent(out) :: a class(psb_s_base_sparse_mat), intent(inout), allocatable :: b end subroutine psb_s_cp_from end interface interface subroutine psb_s_mv_to(a,b) - import :: psb_s_sparse_mat, psb_spk_, psb_s_base_sparse_mat - class(psb_s_sparse_mat), intent(inout) :: a + import :: psb_sspmat_type, psb_spk_, psb_s_base_sparse_mat + class(psb_sspmat_type), intent(inout) :: a class(psb_s_base_sparse_mat), intent(out) :: b end subroutine psb_s_mv_to end interface interface subroutine psb_s_cp_to(a,b) - import :: psb_s_sparse_mat, psb_spk_, psb_s_base_sparse_mat - class(psb_s_sparse_mat), intent(in) :: a + import :: psb_sspmat_type, psb_spk_, psb_s_base_sparse_mat + class(psb_sspmat_type), intent(in) :: a class(psb_s_base_sparse_mat), intent(out) :: b end subroutine psb_s_cp_to end interface interface psb_move_alloc - subroutine psb_s_sparse_mat_move(a,b,info) - import :: psb_s_sparse_mat - class(psb_s_sparse_mat), intent(inout) :: a - class(psb_s_sparse_mat), intent(out) :: b + subroutine psb_sspmat_type_move(a,b,info) + import :: psb_sspmat_type + class(psb_sspmat_type), intent(inout) :: a + class(psb_sspmat_type), intent(out) :: b integer, intent(out) :: info - end subroutine psb_s_sparse_mat_move + end subroutine psb_sspmat_type_move end interface interface psb_clone - subroutine psb_s_sparse_mat_clone(a,b,info) - import :: psb_s_sparse_mat - class(psb_s_sparse_mat), intent(in) :: a - class(psb_s_sparse_mat), intent(out) :: b + subroutine psb_sspmat_type_clone(a,b,info) + import :: psb_sspmat_type + class(psb_sspmat_type), intent(in) :: a + class(psb_sspmat_type), intent(out) :: b integer, intent(out) :: info - end subroutine psb_s_sparse_mat_clone + end subroutine psb_sspmat_type_clone end interface interface subroutine psb_s_transp_1mat(a) - import :: psb_s_sparse_mat - class(psb_s_sparse_mat), intent(inout) :: a + import :: psb_sspmat_type + class(psb_sspmat_type), intent(inout) :: a end subroutine psb_s_transp_1mat end interface interface subroutine psb_s_transp_2mat(a,b) - import :: psb_s_sparse_mat - class(psb_s_sparse_mat), intent(out) :: a - class(psb_s_sparse_mat), intent(in) :: b + import :: psb_sspmat_type + class(psb_sspmat_type), intent(out) :: a + class(psb_sspmat_type), intent(in) :: b end subroutine psb_s_transp_2mat end interface interface subroutine psb_s_transc_1mat(a) - import :: psb_s_sparse_mat - class(psb_s_sparse_mat), intent(inout) :: a + import :: psb_sspmat_type + class(psb_sspmat_type), intent(inout) :: a end subroutine psb_s_transc_1mat end interface interface subroutine psb_s_transc_2mat(a,b) - import :: psb_s_sparse_mat - class(psb_s_sparse_mat), intent(out) :: a - class(psb_s_sparse_mat), intent(in) :: b + import :: psb_sspmat_type + class(psb_sspmat_type), intent(out) :: a + class(psb_sspmat_type), intent(in) :: b end subroutine psb_s_transc_2mat end interface interface subroutine psb_s_reinit(a,clear) - import :: psb_s_sparse_mat - class(psb_s_sparse_mat), intent(inout) :: a + import :: psb_sspmat_type + class(psb_sspmat_type), intent(inout) :: a logical, intent(in), optional :: clear end subroutine psb_s_reinit @@ -565,16 +565,16 @@ module psb_s_mat_mod interface psb_csmm subroutine psb_s_csmm(alpha,a,x,beta,y,info,trans) - import :: psb_s_sparse_mat, psb_spk_ - class(psb_s_sparse_mat), intent(in) :: a + import :: psb_sspmat_type, psb_spk_ + class(psb_sspmat_type), intent(in) :: a real(psb_spk_), intent(in) :: alpha, beta, x(:,:) real(psb_spk_), intent(inout) :: y(:,:) integer, intent(out) :: info character, optional, intent(in) :: trans end subroutine psb_s_csmm subroutine psb_s_csmv(alpha,a,x,beta,y,info,trans) - import :: psb_s_sparse_mat, psb_spk_ - class(psb_s_sparse_mat), intent(in) :: a + import :: psb_sspmat_type, psb_spk_ + class(psb_sspmat_type), intent(in) :: a real(psb_spk_), intent(in) :: alpha, beta, x(:) real(psb_spk_), intent(inout) :: y(:) integer, intent(out) :: info @@ -584,8 +584,8 @@ module psb_s_mat_mod interface psb_cssm subroutine psb_s_cssm(alpha,a,x,beta,y,info,trans,scale,d) - import :: psb_s_sparse_mat, psb_spk_ - class(psb_s_sparse_mat), intent(in) :: a + import :: psb_sspmat_type, psb_spk_ + class(psb_sspmat_type), intent(in) :: a real(psb_spk_), intent(in) :: alpha, beta, x(:,:) real(psb_spk_), intent(inout) :: y(:,:) integer, intent(out) :: info @@ -593,8 +593,8 @@ module psb_s_mat_mod real(psb_spk_), intent(in), optional :: d(:) end subroutine psb_s_cssm subroutine psb_s_cssv(alpha,a,x,beta,y,info,trans,scale,d) - import :: psb_s_sparse_mat, psb_spk_ - class(psb_s_sparse_mat), intent(in) :: a + import :: psb_sspmat_type, psb_spk_ + class(psb_sspmat_type), intent(in) :: a real(psb_spk_), intent(in) :: alpha, beta, x(:) real(psb_spk_), intent(inout) :: y(:) integer, intent(out) :: info @@ -605,16 +605,16 @@ module psb_s_mat_mod interface function psb_s_csnmi(a) result(res) - import :: psb_s_sparse_mat, psb_spk_ - class(psb_s_sparse_mat), intent(in) :: a + import :: psb_sspmat_type, psb_spk_ + class(psb_sspmat_type), intent(in) :: a real(psb_spk_) :: res end function psb_s_csnmi end interface interface subroutine psb_s_get_diag(a,d,info) - import :: psb_s_sparse_mat, psb_spk_ - class(psb_s_sparse_mat), intent(in) :: a + import :: psb_sspmat_type, psb_spk_ + class(psb_sspmat_type), intent(in) :: a real(psb_spk_), intent(out) :: d(:) integer, intent(out) :: info end subroutine psb_s_get_diag @@ -622,14 +622,14 @@ module psb_s_mat_mod interface psb_scal subroutine psb_s_scal(d,a,info) - import :: psb_s_sparse_mat, psb_spk_ - class(psb_s_sparse_mat), intent(inout) :: a + import :: psb_sspmat_type, psb_spk_ + class(psb_sspmat_type), intent(inout) :: a real(psb_spk_), intent(in) :: d(:) integer, intent(out) :: info end subroutine psb_s_scal subroutine psb_s_scals(d,a,info) - import :: psb_s_sparse_mat, psb_spk_ - class(psb_s_sparse_mat), intent(inout) :: a + import :: psb_sspmat_type, psb_spk_ + class(psb_sspmat_type), intent(inout) :: a real(psb_spk_), intent(in) :: d integer, intent(out) :: info end subroutine psb_s_scals @@ -656,7 +656,7 @@ contains function psb_s_sizeof(a) result(res) implicit none - class(psb_s_sparse_mat), intent(in) :: a + class(psb_sspmat_type), intent(in) :: a integer(psb_long_int_k_) :: res res = 0 @@ -670,7 +670,7 @@ contains function psb_s_get_fmt(a) result(res) implicit none - class(psb_s_sparse_mat), intent(in) :: a + class(psb_sspmat_type), intent(in) :: a character(len=5) :: res if (allocated(a%a)) then @@ -684,7 +684,7 @@ contains function psb_s_get_dupl(a) result(res) implicit none - class(psb_s_sparse_mat), intent(in) :: a + class(psb_sspmat_type), intent(in) :: a integer :: res if (allocated(a%a)) then @@ -697,7 +697,7 @@ contains function psb_s_get_state(a) result(res) implicit none - class(psb_s_sparse_mat), intent(in) :: a + class(psb_sspmat_type), intent(in) :: a integer :: res if (allocated(a%a)) then @@ -709,7 +709,7 @@ contains function psb_s_get_nrows(a) result(res) implicit none - class(psb_s_sparse_mat), intent(in) :: a + class(psb_sspmat_type), intent(in) :: a integer :: res if (allocated(a%a)) then @@ -722,7 +722,7 @@ contains function psb_s_get_ncols(a) result(res) implicit none - class(psb_s_sparse_mat), intent(in) :: a + class(psb_sspmat_type), intent(in) :: a integer :: res if (allocated(a%a)) then @@ -735,7 +735,7 @@ contains function psb_s_is_triangle(a) result(res) implicit none - class(psb_s_sparse_mat), intent(in) :: a + class(psb_sspmat_type), intent(in) :: a logical :: res if (allocated(a%a)) then @@ -748,7 +748,7 @@ contains function psb_s_is_unit(a) result(res) implicit none - class(psb_s_sparse_mat), intent(in) :: a + class(psb_sspmat_type), intent(in) :: a logical :: res if (allocated(a%a)) then @@ -761,7 +761,7 @@ contains function psb_s_is_upper(a) result(res) implicit none - class(psb_s_sparse_mat), intent(in) :: a + class(psb_sspmat_type), intent(in) :: a logical :: res if (allocated(a%a)) then @@ -774,7 +774,7 @@ contains function psb_s_is_lower(a) result(res) implicit none - class(psb_s_sparse_mat), intent(in) :: a + class(psb_sspmat_type), intent(in) :: a logical :: res if (allocated(a%a)) then @@ -787,7 +787,7 @@ contains function psb_s_is_null(a) result(res) implicit none - class(psb_s_sparse_mat), intent(in) :: a + class(psb_sspmat_type), intent(in) :: a logical :: res if (allocated(a%a)) then @@ -800,7 +800,7 @@ contains function psb_s_is_bld(a) result(res) implicit none - class(psb_s_sparse_mat), intent(in) :: a + class(psb_sspmat_type), intent(in) :: a logical :: res if (allocated(a%a)) then @@ -813,7 +813,7 @@ contains function psb_s_is_upd(a) result(res) implicit none - class(psb_s_sparse_mat), intent(in) :: a + class(psb_sspmat_type), intent(in) :: a logical :: res if (allocated(a%a)) then @@ -826,7 +826,7 @@ contains function psb_s_is_asb(a) result(res) implicit none - class(psb_s_sparse_mat), intent(in) :: a + class(psb_sspmat_type), intent(in) :: a logical :: res if (allocated(a%a)) then @@ -839,7 +839,7 @@ contains function psb_s_is_sorted(a) result(res) implicit none - class(psb_s_sparse_mat), intent(in) :: a + class(psb_sspmat_type), intent(in) :: a logical :: res if (allocated(a%a)) then @@ -854,7 +854,7 @@ contains function psb_s_get_nzeros(a) result(res) implicit none - class(psb_s_sparse_mat), intent(in) :: a + class(psb_sspmat_type), intent(in) :: a integer :: res res = 0 @@ -867,7 +867,7 @@ contains function psb_s_get_size(a) result(res) implicit none - class(psb_s_sparse_mat), intent(in) :: a + class(psb_sspmat_type), intent(in) :: a integer :: res @@ -882,7 +882,7 @@ contains function psb_s_get_nz_row(idx,a) result(res) implicit none integer, intent(in) :: idx - class(psb_s_sparse_mat), intent(in) :: a + class(psb_sspmat_type), intent(in) :: a integer :: res Integer :: err_act diff --git a/base/modules/psb_s_psblas_mod.f90 b/base/modules/psb_s_psblas_mod.f90 index d9eac1a8..d662efbb 100644 --- a/base/modules/psb_s_psblas_mod.f90 +++ b/base/modules/psb_s_psblas_mod.f90 @@ -193,9 +193,9 @@ module psb_s_psblas_mod interface psb_spnrmi function psb_snrmi(a, desc_a,info) use psb_descriptor_type, only : psb_desc_type, psb_spk_, psb_dpk_ - use psb_mat_mod, only : psb_s_sparse_mat + use psb_mat_mod, only : psb_sspmat_type real(psb_spk_) :: psb_snrmi - type(psb_s_sparse_mat), intent (in) :: a + type(psb_sspmat_type), intent (in) :: a type(psb_desc_type), intent (in) :: desc_a integer, intent(out) :: info end function psb_snrmi @@ -205,8 +205,8 @@ module psb_s_psblas_mod subroutine psb_sspmm(alpha, a, x, beta, y, desc_a, info,& &trans, k, jx, jy,work,doswap) use psb_descriptor_type, only : psb_desc_type, psb_spk_, psb_dpk_ - use psb_mat_mod, only : psb_s_sparse_mat - type(psb_s_sparse_mat), intent(in) :: a + use psb_mat_mod, only : psb_sspmat_type + type(psb_sspmat_type), intent(in) :: a real(psb_spk_), intent(inout) :: x(:,:) real(psb_spk_), intent(inout) :: y(:,:) real(psb_spk_), intent(in) :: alpha, beta @@ -220,8 +220,8 @@ module psb_s_psblas_mod subroutine psb_sspmv(alpha, a, x, beta, y,& & desc_a, info, trans, work,doswap) use psb_descriptor_type, only : psb_desc_type, psb_spk_, psb_dpk_ - use psb_mat_mod, only : psb_s_sparse_mat - type(psb_s_sparse_mat), intent(in) :: a + use psb_mat_mod, only : psb_sspmat_type + type(psb_sspmat_type), intent(in) :: a real(psb_spk_), intent(inout) :: x(:) real(psb_spk_), intent(inout) :: y(:) real(psb_spk_), intent(in) :: alpha, beta @@ -238,8 +238,8 @@ module psb_s_psblas_mod & desc_a, info, trans, scale, choice,& & diag, n, jx, jy, work) use psb_descriptor_type, only : psb_desc_type, psb_spk_, psb_dpk_ - use psb_mat_mod, only : psb_s_sparse_mat - type(psb_s_sparse_mat), intent(in) :: t + use psb_mat_mod, only : psb_sspmat_type + type(psb_sspmat_type), intent(in) :: t real(psb_spk_), intent(in) :: x(:,:) real(psb_spk_), intent(inout) :: y(:,:) real(psb_spk_), intent(in) :: alpha, beta @@ -255,8 +255,8 @@ module psb_s_psblas_mod & desc_a, info, trans, scale, choice,& & diag, work) use psb_descriptor_type, only : psb_desc_type, psb_spk_, psb_dpk_ - use psb_mat_mod, only : psb_s_sparse_mat - type(psb_s_sparse_mat), intent(in) :: t + use psb_mat_mod, only : psb_sspmat_type + type(psb_sspmat_type), intent(in) :: t real(psb_spk_), intent(in) :: x(:) real(psb_spk_), intent(inout) :: y(:) real(psb_spk_), intent(in) :: alpha, beta diff --git a/base/modules/psb_s_tools_mod.f90 b/base/modules/psb_s_tools_mod.f90 index 85bbf3fb..def5c57b 100644 --- a/base/modules/psb_s_tools_mod.f90 +++ b/base/modules/psb_s_tools_mod.f90 @@ -70,9 +70,9 @@ Module psb_s_tools_mod Subroutine psb_ssphalo(a,desc_a,blk,info,rowcnv,colcnv,& & rowscale,colscale,outfmt,data) use psb_descriptor_type, only : psb_desc_type, psb_spk_, psb_dpk_ - use psb_mat_mod, only : psb_s_sparse_mat - Type(psb_s_sparse_mat),Intent(in) :: a - Type(psb_s_sparse_mat),Intent(inout) :: blk + use psb_mat_mod, only : psb_sspmat_type + Type(psb_sspmat_type),Intent(in) :: a + Type(psb_sspmat_type),Intent(inout) :: blk Type(psb_desc_type),Intent(in),target :: desc_a integer, intent(out) :: info logical, optional, intent(in) :: rowcnv,colcnv,rowscale,colscale @@ -124,9 +124,9 @@ Module psb_s_tools_mod interface psb_cdbldext Subroutine psb_scdbldext(a,desc_a,novr,desc_ov,info,extype) use psb_descriptor_type, only : psb_desc_type, psb_spk_, psb_dpk_ - Use psb_mat_mod, only : psb_s_sparse_mat + Use psb_mat_mod, only : psb_sspmat_type integer, intent(in) :: novr - Type(psb_s_sparse_mat), Intent(in) :: a + Type(psb_sspmat_type), Intent(in) :: a Type(psb_desc_type), Intent(in), target :: desc_a Type(psb_desc_type), Intent(out) :: desc_ov integer, intent(out) :: info @@ -137,9 +137,9 @@ Module psb_s_tools_mod interface psb_spall subroutine psb_sspalloc(a, desc_a, info, nnz) use psb_descriptor_type, only : psb_desc_type, psb_spk_, psb_dpk_ - use psb_mat_mod, only : psb_s_sparse_mat + use psb_mat_mod, only : psb_sspmat_type type(psb_desc_type), intent(in) :: desc_a - type(psb_s_sparse_mat), intent(inout) :: a + type(psb_sspmat_type), intent(inout) :: a integer, intent(out) :: info integer, optional, intent(in) :: nnz end subroutine psb_sspalloc @@ -148,8 +148,8 @@ Module psb_s_tools_mod interface psb_spasb subroutine psb_sspasb(a,desc_a, info, afmt, upd, dupl, mold) use psb_descriptor_type, only : psb_desc_type, psb_spk_, psb_dpk_ - use psb_mat_mod, only : psb_s_base_sparse_mat, psb_s_sparse_mat - type(psb_s_sparse_mat), intent (inout) :: a + use psb_mat_mod, only : psb_s_base_sparse_mat, psb_sspmat_type + type(psb_sspmat_type), intent (inout) :: a type(psb_desc_type), intent(in) :: desc_a integer, intent(out) :: info integer,optional, intent(in) :: dupl, upd @@ -161,9 +161,9 @@ Module psb_s_tools_mod interface psb_spfree subroutine psb_sspfree(a, desc_a,info) use psb_descriptor_type, only : psb_desc_type, psb_spk_, psb_dpk_ - use psb_mat_mod, only : psb_s_sparse_mat + use psb_mat_mod, only : psb_sspmat_type type(psb_desc_type), intent(in) :: desc_a - type(psb_s_sparse_mat), intent(inout) :: a + type(psb_sspmat_type), intent(inout) :: a integer, intent(out) :: info end subroutine psb_sspfree end interface @@ -172,9 +172,9 @@ Module psb_s_tools_mod interface psb_spins subroutine psb_sspins(nz,ia,ja,val,a,desc_a,info,rebuild) use psb_descriptor_type, only : psb_desc_type, psb_spk_, psb_dpk_ - use psb_mat_mod, only : psb_s_sparse_mat + use psb_mat_mod, only : psb_sspmat_type type(psb_desc_type), intent(inout) :: desc_a - type(psb_s_sparse_mat), intent(inout) :: a + type(psb_sspmat_type), intent(inout) :: a integer, intent(in) :: nz,ia(:),ja(:) real(psb_spk_), intent(in) :: val(:) integer, intent(out) :: info @@ -182,10 +182,10 @@ Module psb_s_tools_mod end subroutine psb_sspins subroutine psb_sspins_2desc(nz,ia,ja,val,a,desc_ar,desc_ac,info) use psb_descriptor_type, only : psb_desc_type, psb_spk_, psb_dpk_ - use psb_mat_mod, only : psb_s_sparse_mat + use psb_mat_mod, only : psb_sspmat_type type(psb_desc_type), intent(in) :: desc_ar type(psb_desc_type), intent(inout) :: desc_ac - type(psb_s_sparse_mat), intent(inout) :: a + type(psb_sspmat_type), intent(inout) :: a integer, intent(in) :: nz,ia(:),ja(:) real(psb_spk_), intent(in) :: val(:) integer, intent(out) :: info @@ -196,9 +196,9 @@ Module psb_s_tools_mod interface psb_sprn subroutine psb_ssprn(a, desc_a,info,clear) use psb_descriptor_type, only : psb_desc_type, psb_spk_, psb_dpk_ - use psb_mat_mod, only : psb_s_sparse_mat + use psb_mat_mod, only : psb_sspmat_type type(psb_desc_type), intent(in) :: desc_a - type(psb_s_sparse_mat), intent(inout) :: a + type(psb_sspmat_type), intent(inout) :: a integer, intent(out) :: info logical, intent(in), optional :: clear end subroutine psb_ssprn @@ -228,7 +228,7 @@ Module psb_s_tools_mod !!$ use psb_base_tools_mod !!$ use psb_s_mat_mod !!$ implicit none -!!$ type(psb_s_sparse_mat), intent(out) :: a_map +!!$ type(psb_sspmat_type), intent(out) :: a_map !!$ type(psb_desc_type), intent(out) :: cd_xt !!$ type(psb_desc_type), intent(in) :: descin, descout !!$ @@ -259,7 +259,7 @@ Module psb_s_tools_mod !!$ integer, intent(in) :: nz !!$ integer, intent(in) :: ir(:),ic(:) !!$ real(psb_spk_), intent(in) :: val(:) -!!$ type(psb_s_sparse_mat), intent(inout) :: a_map +!!$ type(psb_sspmat_type), intent(inout) :: a_map !!$ type(psb_desc_type), intent(inout) :: cd_xt !!$ type(psb_desc_type), intent(in) :: descin, descout !!$ integer :: info @@ -273,7 +273,7 @@ Module psb_s_tools_mod !!$ use psb_descriptor_type !!$ use psb_serial_mod !!$ implicit none -!!$ type(psb_s_sparse_mat), intent(inout) :: a_map +!!$ type(psb_sspmat_type), intent(inout) :: a_map !!$ type(psb_desc_type), intent(inout) :: cd_xt !!$ type(psb_desc_type), intent(in) :: descin, descout !!$ character(len=*), optional, intent(in) :: afmt diff --git a/base/modules/psb_serial_mod.f90 b/base/modules/psb_serial_mod.f90 index 9613088f..03661970 100644 --- a/base/modules/psb_serial_mod.f90 +++ b/base/modules/psb_serial_mod.f90 @@ -43,10 +43,10 @@ module psb_serial_mod interface psb_symbmm subroutine psb_ssymbmm(a,b,c,info) - use psb_mat_mod, only : psb_s_sparse_mat + use psb_mat_mod, only : psb_sspmat_type implicit none - type(psb_s_sparse_mat), intent(in) :: a,b - type(psb_s_sparse_mat), intent(out) :: c + type(psb_sspmat_type), intent(in) :: a,b + type(psb_sspmat_type), intent(out) :: c integer, intent(out) :: info end subroutine psb_ssymbmm subroutine psb_sbase_symbmm(a,b,c,info) @@ -57,10 +57,10 @@ module psb_serial_mod integer, intent(out) :: info end subroutine psb_sbase_symbmm subroutine psb_dsymbmm(a,b,c,info) - use psb_mat_mod, only : psb_d_sparse_mat + use psb_mat_mod, only : psb_dspmat_type implicit none - type(psb_d_sparse_mat), intent(in) :: a,b - type(psb_d_sparse_mat), intent(out) :: c + type(psb_dspmat_type), intent(in) :: a,b + type(psb_dspmat_type), intent(out) :: c integer, intent(out) :: info end subroutine psb_dsymbmm subroutine psb_dbase_symbmm(a,b,c,info) @@ -71,10 +71,10 @@ module psb_serial_mod integer, intent(out) :: info end subroutine psb_dbase_symbmm subroutine psb_csymbmm(a,b,c,info) - use psb_mat_mod, only : psb_c_sparse_mat + use psb_mat_mod, only : psb_cspmat_type implicit none - type(psb_c_sparse_mat), intent(in) :: a,b - type(psb_c_sparse_mat), intent(out) :: c + type(psb_cspmat_type), intent(in) :: a,b + type(psb_cspmat_type), intent(out) :: c integer, intent(out) :: info end subroutine psb_csymbmm subroutine psb_cbase_symbmm(a,b,c,info) @@ -85,10 +85,10 @@ module psb_serial_mod integer, intent(out) :: info end subroutine psb_cbase_symbmm subroutine psb_zsymbmm(a,b,c,info) - use psb_mat_mod, only : psb_z_sparse_mat + use psb_mat_mod, only : psb_zspmat_type implicit none - type(psb_z_sparse_mat), intent(in) :: a,b - type(psb_z_sparse_mat), intent(out) :: c + type(psb_zspmat_type), intent(in) :: a,b + type(psb_zspmat_type), intent(out) :: c integer, intent(out) :: info end subroutine psb_zsymbmm subroutine psb_zbase_symbmm(a,b,c,info) @@ -102,10 +102,10 @@ module psb_serial_mod interface psb_numbmm subroutine psb_snumbmm(a,b,c) - use psb_mat_mod, only : psb_s_sparse_mat + use psb_mat_mod, only : psb_sspmat_type implicit none - type(psb_s_sparse_mat), intent(in) :: a,b - type(psb_s_sparse_mat), intent(inout) :: c + type(psb_sspmat_type), intent(in) :: a,b + type(psb_sspmat_type), intent(inout) :: c end subroutine psb_snumbmm subroutine psb_sbase_numbmm(a,b,c) use psb_mat_mod, only : psb_s_base_sparse_mat, psb_s_csr_sparse_mat @@ -114,10 +114,10 @@ module psb_serial_mod type(psb_s_csr_sparse_mat), intent(inout) :: c end subroutine psb_sbase_numbmm subroutine psb_dnumbmm(a,b,c) - use psb_mat_mod, only : psb_d_sparse_mat + use psb_mat_mod, only : psb_dspmat_type implicit none - type(psb_d_sparse_mat), intent(in) :: a,b - type(psb_d_sparse_mat), intent(inout) :: c + type(psb_dspmat_type), intent(in) :: a,b + type(psb_dspmat_type), intent(inout) :: c end subroutine psb_dnumbmm subroutine psb_dbase_numbmm(a,b,c) use psb_mat_mod, only : psb_d_base_sparse_mat, psb_d_csr_sparse_mat @@ -126,10 +126,10 @@ module psb_serial_mod type(psb_d_csr_sparse_mat), intent(inout) :: c end subroutine psb_dbase_numbmm subroutine psb_cnumbmm(a,b,c) - use psb_mat_mod, only : psb_c_sparse_mat + use psb_mat_mod, only : psb_cspmat_type implicit none - type(psb_c_sparse_mat), intent(in) :: a,b - type(psb_c_sparse_mat), intent(inout) :: c + type(psb_cspmat_type), intent(in) :: a,b + type(psb_cspmat_type), intent(inout) :: c end subroutine psb_cnumbmm subroutine psb_cbase_numbmm(a,b,c) use psb_mat_mod, only : psb_c_base_sparse_mat, psb_c_csr_sparse_mat @@ -138,10 +138,10 @@ module psb_serial_mod type(psb_c_csr_sparse_mat), intent(inout) :: c end subroutine psb_cbase_numbmm subroutine psb_znumbmm(a,b,c) - use psb_mat_mod, only : psb_z_sparse_mat + use psb_mat_mod, only : psb_zspmat_type implicit none - type(psb_z_sparse_mat), intent(in) :: a,b - type(psb_z_sparse_mat), intent(inout) :: c + type(psb_zspmat_type), intent(in) :: a,b + type(psb_zspmat_type), intent(inout) :: c end subroutine psb_znumbmm subroutine psb_zbase_numbmm(a,b,c) use psb_mat_mod, only : psb_z_base_sparse_mat, psb_z_csr_sparse_mat @@ -153,12 +153,12 @@ module psb_serial_mod interface psb_rwextd subroutine psb_srwextd(nr,a,info,b,rowscale) - use psb_mat_mod, only : psb_s_sparse_mat + use psb_mat_mod, only : psb_sspmat_type implicit none integer, intent(in) :: nr - type(psb_s_sparse_mat), intent(inout) :: a + type(psb_sspmat_type), intent(inout) :: a integer,intent(out) :: info - type(psb_s_sparse_mat), intent(in), optional :: b + type(psb_sspmat_type), intent(in), optional :: b logical,intent(in), optional :: rowscale end subroutine psb_srwextd subroutine psb_sbase_rwextd(nr,a,info,b,rowscale) @@ -171,12 +171,12 @@ module psb_serial_mod logical,intent(in), optional :: rowscale end subroutine psb_sbase_rwextd subroutine psb_drwextd(nr,a,info,b,rowscale) - use psb_mat_mod, only : psb_d_sparse_mat + use psb_mat_mod, only : psb_dspmat_type implicit none integer, intent(in) :: nr - type(psb_d_sparse_mat), intent(inout) :: a + type(psb_dspmat_type), intent(inout) :: a integer,intent(out) :: info - type(psb_d_sparse_mat), intent(in), optional :: b + type(psb_dspmat_type), intent(in), optional :: b logical,intent(in), optional :: rowscale end subroutine psb_drwextd subroutine psb_dbase_rwextd(nr,a,info,b,rowscale) @@ -189,12 +189,12 @@ module psb_serial_mod logical,intent(in), optional :: rowscale end subroutine psb_dbase_rwextd subroutine psb_crwextd(nr,a,info,b,rowscale) - use psb_mat_mod, only : psb_c_sparse_mat + use psb_mat_mod, only : psb_cspmat_type implicit none integer, intent(in) :: nr - type(psb_c_sparse_mat), intent(inout) :: a + type(psb_cspmat_type), intent(inout) :: a integer,intent(out) :: info - type(psb_c_sparse_mat), intent(in), optional :: b + type(psb_cspmat_type), intent(in), optional :: b logical,intent(in), optional :: rowscale end subroutine psb_crwextd subroutine psb_cbase_rwextd(nr,a,info,b,rowscale) @@ -207,12 +207,12 @@ module psb_serial_mod logical,intent(in), optional :: rowscale end subroutine psb_cbase_rwextd subroutine psb_zrwextd(nr,a,info,b,rowscale) - use psb_mat_mod, only : psb_z_sparse_mat + use psb_mat_mod, only : psb_zspmat_type implicit none integer, intent(in) :: nr - type(psb_z_sparse_mat), intent(inout) :: a + type(psb_zspmat_type), intent(inout) :: a integer,intent(out) :: info - type(psb_z_sparse_mat), intent(in), optional :: b + type(psb_zspmat_type), intent(in), optional :: b logical,intent(in), optional :: rowscale end subroutine psb_zrwextd subroutine psb_zbase_rwextd(nr,a,info,b,rowscale) diff --git a/base/modules/psb_z_linmap_mod.f90 b/base/modules/psb_z_linmap_mod.f90 index bd746963..4cf1c5d2 100644 --- a/base/modules/psb_z_linmap_mod.f90 +++ b/base/modules/psb_z_linmap_mod.f90 @@ -99,7 +99,7 @@ module psb_z_linmap_mod implicit none type(psb_zlinmap_type) :: psb_z_linmap type(psb_desc_type), target :: desc_X, desc_Y - type(psb_z_sparse_mat), intent(in) :: map_X2Y, map_Y2X + type(psb_zspmat_type), intent(in) :: map_X2Y, map_Y2X integer, intent(in) :: map_kind integer, intent(in), optional :: iaggr(:), naggr(:) end function psb_z_linmap @@ -201,7 +201,7 @@ contains implicit none type(psb_zlinmap_type), intent(out) :: out_map type(psb_desc_type), target :: desc_X, desc_Y - type(psb_z_sparse_mat), intent(in) :: map_X2Y, map_Y2X + type(psb_zspmat_type), intent(in) :: map_X2Y, map_Y2X integer, intent(in) :: map_kind integer, intent(in), optional :: iaggr(:), naggr(:) out_map = psb_linmap(map_kind,desc_X,desc_Y,map_X2Y,map_Y2X,iaggr,naggr) diff --git a/base/modules/psb_z_mat_mod.f03 b/base/modules/psb_z_mat_mod.f03 index 61c06a74..b1abb024 100644 --- a/base/modules/psb_z_mat_mod.f03 +++ b/base/modules/psb_z_mat_mod.f03 @@ -48,7 +48,7 @@ module psb_z_mat_mod use psb_z_csr_mat_mod, only : psb_z_csr_sparse_mat use psb_z_csc_mat_mod, only : psb_z_csc_sparse_mat - type :: psb_z_sparse_mat + type :: psb_zspmat_type class(psb_z_base_sparse_mat), allocatable :: a @@ -141,7 +141,7 @@ module psb_z_mat_mod procedure, pass(a) :: z_cssm => psb_z_cssm generic, public :: cssm => z_cssm, z_cssv - end type psb_z_sparse_mat + end type psb_zspmat_type private :: psb_z_get_nrows, psb_z_get_ncols, psb_z_get_nzeros, psb_z_get_size, & & psb_z_get_state, psb_z_get_dupl, psb_z_is_null, psb_z_is_bld, psb_z_is_upd, & @@ -169,100 +169,100 @@ module psb_z_mat_mod interface subroutine psb_z_set_nrows(m,a) - import :: psb_z_sparse_mat - class(psb_z_sparse_mat), intent(inout) :: a + import :: psb_zspmat_type + class(psb_zspmat_type), intent(inout) :: a integer, intent(in) :: m end subroutine psb_z_set_nrows end interface interface subroutine psb_z_set_ncols(n,a) - import :: psb_z_sparse_mat - class(psb_z_sparse_mat), intent(inout) :: a + import :: psb_zspmat_type + class(psb_zspmat_type), intent(inout) :: a integer, intent(in) :: n end subroutine psb_z_set_ncols end interface interface subroutine psb_z_set_state(n,a) - import :: psb_z_sparse_mat - class(psb_z_sparse_mat), intent(inout) :: a + import :: psb_zspmat_type + class(psb_zspmat_type), intent(inout) :: a integer, intent(in) :: n end subroutine psb_z_set_state end interface interface subroutine psb_z_set_dupl(n,a) - import :: psb_z_sparse_mat - class(psb_z_sparse_mat), intent(inout) :: a + import :: psb_zspmat_type + class(psb_zspmat_type), intent(inout) :: a integer, intent(in) :: n end subroutine psb_z_set_dupl end interface interface subroutine psb_z_set_null(a) - import :: psb_z_sparse_mat - class(psb_z_sparse_mat), intent(inout) :: a + import :: psb_zspmat_type + class(psb_zspmat_type), intent(inout) :: a end subroutine psb_z_set_null end interface interface subroutine psb_z_set_bld(a) - import :: psb_z_sparse_mat - class(psb_z_sparse_mat), intent(inout) :: a + import :: psb_zspmat_type + class(psb_zspmat_type), intent(inout) :: a end subroutine psb_z_set_bld end interface interface subroutine psb_z_set_upd(a) - import :: psb_z_sparse_mat - class(psb_z_sparse_mat), intent(inout) :: a + import :: psb_zspmat_type + class(psb_zspmat_type), intent(inout) :: a end subroutine psb_z_set_upd end interface interface subroutine psb_z_set_asb(a) - import :: psb_z_sparse_mat - class(psb_z_sparse_mat), intent(inout) :: a + import :: psb_zspmat_type + class(psb_zspmat_type), intent(inout) :: a end subroutine psb_z_set_asb end interface interface subroutine psb_z_set_sorted(a,val) - import :: psb_z_sparse_mat - class(psb_z_sparse_mat), intent(inout) :: a + import :: psb_zspmat_type + class(psb_zspmat_type), intent(inout) :: a logical, intent(in), optional :: val end subroutine psb_z_set_sorted end interface interface subroutine psb_z_set_triangle(a,val) - import :: psb_z_sparse_mat - class(psb_z_sparse_mat), intent(inout) :: a + import :: psb_zspmat_type + class(psb_zspmat_type), intent(inout) :: a logical, intent(in), optional :: val end subroutine psb_z_set_triangle end interface interface subroutine psb_z_set_unit(a,val) - import :: psb_z_sparse_mat - class(psb_z_sparse_mat), intent(inout) :: a + import :: psb_zspmat_type + class(psb_zspmat_type), intent(inout) :: a logical, intent(in), optional :: val end subroutine psb_z_set_unit end interface interface subroutine psb_z_set_lower(a,val) - import :: psb_z_sparse_mat - class(psb_z_sparse_mat), intent(inout) :: a + import :: psb_zspmat_type + class(psb_zspmat_type), intent(inout) :: a logical, intent(in), optional :: val end subroutine psb_z_set_lower end interface interface subroutine psb_z_set_upper(a,val) - import :: psb_z_sparse_mat - class(psb_z_sparse_mat), intent(inout) :: a + import :: psb_zspmat_type + class(psb_zspmat_type), intent(inout) :: a logical, intent(in), optional :: val end subroutine psb_z_set_upper end interface @@ -270,9 +270,9 @@ module psb_z_mat_mod interface subroutine psb_z_sparse_print(iout,a,iv,eirs,eics,head,ivr,ivc) - import :: psb_z_sparse_mat + import :: psb_zspmat_type integer, intent(in) :: iout - class(psb_z_sparse_mat), intent(in) :: a + class(psb_zspmat_type), intent(in) :: a integer, intent(in), optional :: iv(:) integer, intent(in), optional :: eirs,eics character(len=*), optional :: head @@ -282,8 +282,8 @@ module psb_z_mat_mod interface subroutine psb_z_get_neigh(a,idx,neigh,n,info,lev) - import :: psb_z_sparse_mat - class(psb_z_sparse_mat), intent(in) :: a + import :: psb_zspmat_type + class(psb_zspmat_type), intent(in) :: a integer, intent(in) :: idx integer, intent(out) :: n integer, allocatable, intent(out) :: neigh(:) @@ -294,8 +294,8 @@ module psb_z_mat_mod interface subroutine psb_z_csall(nr,nc,a,info,nz) - import :: psb_z_sparse_mat - class(psb_z_sparse_mat), intent(out) :: a + import :: psb_zspmat_type + class(psb_zspmat_type), intent(out) :: a integer, intent(in) :: nr,nc integer, intent(out) :: info integer, intent(in), optional :: nz @@ -304,30 +304,30 @@ module psb_z_mat_mod interface subroutine psb_z_reallocate_nz(nz,a) - import :: psb_z_sparse_mat + import :: psb_zspmat_type integer, intent(in) :: nz - class(psb_z_sparse_mat), intent(inout) :: a + class(psb_zspmat_type), intent(inout) :: a end subroutine psb_z_reallocate_nz end interface interface subroutine psb_z_free(a) - import :: psb_z_sparse_mat - class(psb_z_sparse_mat), intent(inout) :: a + import :: psb_zspmat_type + class(psb_zspmat_type), intent(inout) :: a end subroutine psb_z_free end interface interface subroutine psb_z_trim(a) - import :: psb_z_sparse_mat - class(psb_z_sparse_mat), intent(inout) :: a + import :: psb_zspmat_type + class(psb_zspmat_type), intent(inout) :: a end subroutine psb_z_trim end interface interface subroutine psb_z_csput(nz,ia,ja,val,a,imin,imax,jmin,jmax,info,gtl) - import :: psb_z_sparse_mat, psb_dpk_ - class(psb_z_sparse_mat), intent(inout) :: a + import :: psb_zspmat_type, psb_dpk_ + class(psb_zspmat_type), intent(inout) :: a complex(psb_dpk_), intent(in) :: val(:) integer, intent(in) :: nz, ia(:), ja(:), imin,imax,jmin,jmax integer, intent(out) :: info @@ -338,8 +338,8 @@ module psb_z_mat_mod interface subroutine psb_z_csgetptn(imin,imax,a,nz,ia,ja,info,& & jmin,jmax,iren,append,nzin,rscale,cscale) - import :: psb_z_sparse_mat, psb_dpk_ - class(psb_z_sparse_mat), intent(in) :: a + import :: psb_zspmat_type, psb_dpk_ + class(psb_zspmat_type), intent(in) :: a integer, intent(in) :: imin,imax integer, intent(out) :: nz integer, allocatable, intent(inout) :: ia(:), ja(:) @@ -354,8 +354,8 @@ module psb_z_mat_mod interface subroutine psb_z_csgetrow(imin,imax,a,nz,ia,ja,val,info,& & jmin,jmax,iren,append,nzin,rscale,cscale) - import :: psb_z_sparse_mat, psb_dpk_ - class(psb_z_sparse_mat), intent(in) :: a + import :: psb_zspmat_type, psb_dpk_ + class(psb_zspmat_type), intent(in) :: a integer, intent(in) :: imin,imax integer, intent(out) :: nz integer, allocatable, intent(inout) :: ia(:), ja(:) @@ -371,9 +371,9 @@ module psb_z_mat_mod interface subroutine psb_z_csgetblk(imin,imax,a,b,info,& & jmin,jmax,iren,append,rscale,cscale) - import :: psb_z_sparse_mat, psb_dpk_ - class(psb_z_sparse_mat), intent(in) :: a - class(psb_z_sparse_mat), intent(out) :: b + import :: psb_zspmat_type, psb_dpk_ + class(psb_zspmat_type), intent(in) :: a + class(psb_zspmat_type), intent(out) :: b integer, intent(in) :: imin,imax integer,intent(out) :: info logical, intent(in), optional :: append @@ -386,9 +386,9 @@ module psb_z_mat_mod interface subroutine psb_z_csclip(a,b,info,& & imin,imax,jmin,jmax,rscale,cscale) - import :: psb_z_sparse_mat, psb_dpk_ - class(psb_z_sparse_mat), intent(in) :: a - class(psb_z_sparse_mat), intent(out) :: b + import :: psb_zspmat_type, psb_dpk_ + class(psb_zspmat_type), intent(in) :: a + class(psb_zspmat_type), intent(out) :: b integer,intent(out) :: info integer, intent(in), optional :: imin,imax,jmin,jmax logical, intent(in), optional :: rscale,cscale @@ -398,8 +398,8 @@ module psb_z_mat_mod interface subroutine psb_z_b_csclip(a,b,info,& & imin,imax,jmin,jmax,rscale,cscale) - import :: psb_z_sparse_mat, psb_dpk_, psb_z_coo_sparse_mat - class(psb_z_sparse_mat), intent(in) :: a + import :: psb_zspmat_type, psb_dpk_, psb_z_coo_sparse_mat + class(psb_zspmat_type), intent(in) :: a type(psb_z_coo_sparse_mat), intent(out) :: b integer,intent(out) :: info integer, intent(in), optional :: imin,imax,jmin,jmax @@ -409,9 +409,9 @@ module psb_z_mat_mod interface subroutine psb_z_cscnv(a,b,info,type,mold,upd,dupl) - import :: psb_z_sparse_mat, psb_dpk_, psb_z_base_sparse_mat - class(psb_z_sparse_mat), intent(in) :: a - class(psb_z_sparse_mat), intent(out) :: b + import :: psb_zspmat_type, psb_dpk_, psb_z_base_sparse_mat + class(psb_zspmat_type), intent(in) :: a + class(psb_zspmat_type), intent(out) :: b integer, intent(out) :: info integer,optional, intent(in) :: dupl, upd character(len=*), optional, intent(in) :: type @@ -422,8 +422,8 @@ module psb_z_mat_mod interface subroutine psb_z_cscnv_ip(a,iinfo,type,mold,dupl) - import :: psb_z_sparse_mat, psb_dpk_, psb_z_base_sparse_mat - class(psb_z_sparse_mat), intent(inout) :: a + import :: psb_zspmat_type, psb_dpk_, psb_z_base_sparse_mat + class(psb_zspmat_type), intent(inout) :: a integer, intent(out) :: iinfo integer,optional, intent(in) :: dupl character(len=*), optional, intent(in) :: type @@ -434,8 +434,8 @@ module psb_z_mat_mod interface subroutine psb_z_cscnv_base(a,b,info,dupl) - import :: psb_z_sparse_mat, psb_dpk_, psb_z_base_sparse_mat - class(psb_z_sparse_mat), intent(in) :: a + import :: psb_zspmat_type, psb_dpk_, psb_z_base_sparse_mat + class(psb_zspmat_type), intent(in) :: a class(psb_z_base_sparse_mat), intent(out) :: b integer, intent(out) :: info integer,optional, intent(in) :: dupl @@ -444,106 +444,106 @@ module psb_z_mat_mod interface subroutine psb_z_clip_d(a,b,info) - import :: psb_z_sparse_mat - class(psb_z_sparse_mat), intent(in) :: a - class(psb_z_sparse_mat), intent(out) :: b + import :: psb_zspmat_type + class(psb_zspmat_type), intent(in) :: a + class(psb_zspmat_type), intent(out) :: b integer,intent(out) :: info end subroutine psb_z_clip_d end interface interface subroutine psb_z_clip_d_ip(a,info) - import :: psb_z_sparse_mat - class(psb_z_sparse_mat), intent(inout) :: a + import :: psb_zspmat_type + class(psb_zspmat_type), intent(inout) :: a integer,intent(out) :: info end subroutine psb_z_clip_d_ip end interface interface subroutine psb_z_mv_from(a,b) - import :: psb_z_sparse_mat, psb_dpk_, psb_z_base_sparse_mat - class(psb_z_sparse_mat), intent(out) :: a + import :: psb_zspmat_type, psb_dpk_, psb_z_base_sparse_mat + class(psb_zspmat_type), intent(out) :: a class(psb_z_base_sparse_mat), intent(inout) :: b end subroutine psb_z_mv_from end interface interface subroutine psb_z_cp_from(a,b) - import :: psb_z_sparse_mat, psb_dpk_, psb_z_base_sparse_mat - class(psb_z_sparse_mat), intent(out) :: a + import :: psb_zspmat_type, psb_dpk_, psb_z_base_sparse_mat + class(psb_zspmat_type), intent(out) :: a class(psb_z_base_sparse_mat), intent(inout), allocatable :: b end subroutine psb_z_cp_from end interface interface subroutine psb_z_mv_to(a,b) - import :: psb_z_sparse_mat, psb_dpk_, psb_z_base_sparse_mat - class(psb_z_sparse_mat), intent(inout) :: a + import :: psb_zspmat_type, psb_dpk_, psb_z_base_sparse_mat + class(psb_zspmat_type), intent(inout) :: a class(psb_z_base_sparse_mat), intent(out) :: b end subroutine psb_z_mv_to end interface interface subroutine psb_z_cp_to(a,b) - import :: psb_z_sparse_mat, psb_dpk_, psb_z_base_sparse_mat - class(psb_z_sparse_mat), intent(in) :: a + import :: psb_zspmat_type, psb_dpk_, psb_z_base_sparse_mat + class(psb_zspmat_type), intent(in) :: a class(psb_z_base_sparse_mat), intent(out) :: b end subroutine psb_z_cp_to end interface interface psb_move_alloc - subroutine psb_z_sparse_mat_move(a,b,info) - import :: psb_z_sparse_mat - class(psb_z_sparse_mat), intent(inout) :: a - class(psb_z_sparse_mat), intent(out) :: b + subroutine psb_zspmat_type_move(a,b,info) + import :: psb_zspmat_type + class(psb_zspmat_type), intent(inout) :: a + class(psb_zspmat_type), intent(out) :: b integer, intent(out) :: info - end subroutine psb_z_sparse_mat_move + end subroutine psb_zspmat_type_move end interface interface psb_clone - subroutine psb_z_sparse_mat_clone(a,b,info) - import :: psb_z_sparse_mat - class(psb_z_sparse_mat), intent(in) :: a - class(psb_z_sparse_mat), intent(out) :: b + subroutine psb_zspmat_type_clone(a,b,info) + import :: psb_zspmat_type + class(psb_zspmat_type), intent(in) :: a + class(psb_zspmat_type), intent(out) :: b integer, intent(out) :: info - end subroutine psb_z_sparse_mat_clone + end subroutine psb_zspmat_type_clone end interface interface subroutine psb_z_transp_1mat(a) - import :: psb_z_sparse_mat - class(psb_z_sparse_mat), intent(inout) :: a + import :: psb_zspmat_type + class(psb_zspmat_type), intent(inout) :: a end subroutine psb_z_transp_1mat end interface interface subroutine psb_z_transp_2mat(a,b) - import :: psb_z_sparse_mat - class(psb_z_sparse_mat), intent(out) :: a - class(psb_z_sparse_mat), intent(in) :: b + import :: psb_zspmat_type + class(psb_zspmat_type), intent(out) :: a + class(psb_zspmat_type), intent(in) :: b end subroutine psb_z_transp_2mat end interface interface subroutine psb_z_transc_1mat(a) - import :: psb_z_sparse_mat - class(psb_z_sparse_mat), intent(inout) :: a + import :: psb_zspmat_type + class(psb_zspmat_type), intent(inout) :: a end subroutine psb_z_transc_1mat end interface interface subroutine psb_z_transc_2mat(a,b) - import :: psb_z_sparse_mat - class(psb_z_sparse_mat), intent(out) :: a - class(psb_z_sparse_mat), intent(in) :: b + import :: psb_zspmat_type + class(psb_zspmat_type), intent(out) :: a + class(psb_zspmat_type), intent(in) :: b end subroutine psb_z_transc_2mat end interface interface subroutine psb_z_reinit(a,clear) - import :: psb_z_sparse_mat - class(psb_z_sparse_mat), intent(inout) :: a + import :: psb_zspmat_type + class(psb_zspmat_type), intent(inout) :: a logical, intent(in), optional :: clear end subroutine psb_z_reinit @@ -566,16 +566,16 @@ module psb_z_mat_mod interface psb_csmm subroutine psb_z_csmm(alpha,a,x,beta,y,info,trans) - import :: psb_z_sparse_mat, psb_dpk_ - class(psb_z_sparse_mat), intent(in) :: a + import :: psb_zspmat_type, psb_dpk_ + class(psb_zspmat_type), intent(in) :: a complex(psb_dpk_), intent(in) :: alpha, beta, x(:,:) complex(psb_dpk_), intent(inout) :: y(:,:) integer, intent(out) :: info character, optional, intent(in) :: trans end subroutine psb_z_csmm subroutine psb_z_csmv(alpha,a,x,beta,y,info,trans) - import :: psb_z_sparse_mat, psb_dpk_ - class(psb_z_sparse_mat), intent(in) :: a + import :: psb_zspmat_type, psb_dpk_ + class(psb_zspmat_type), intent(in) :: a complex(psb_dpk_), intent(in) :: alpha, beta, x(:) complex(psb_dpk_), intent(inout) :: y(:) integer, intent(out) :: info @@ -585,8 +585,8 @@ module psb_z_mat_mod interface psb_cssm subroutine psb_z_cssm(alpha,a,x,beta,y,info,trans,scale,d) - import :: psb_z_sparse_mat, psb_dpk_ - class(psb_z_sparse_mat), intent(in) :: a + import :: psb_zspmat_type, psb_dpk_ + class(psb_zspmat_type), intent(in) :: a complex(psb_dpk_), intent(in) :: alpha, beta, x(:,:) complex(psb_dpk_), intent(inout) :: y(:,:) integer, intent(out) :: info @@ -594,8 +594,8 @@ module psb_z_mat_mod complex(psb_dpk_), intent(in), optional :: d(:) end subroutine psb_z_cssm subroutine psb_z_cssv(alpha,a,x,beta,y,info,trans,scale,d) - import :: psb_z_sparse_mat, psb_dpk_ - class(psb_z_sparse_mat), intent(in) :: a + import :: psb_zspmat_type, psb_dpk_ + class(psb_zspmat_type), intent(in) :: a complex(psb_dpk_), intent(in) :: alpha, beta, x(:) complex(psb_dpk_), intent(inout) :: y(:) integer, intent(out) :: info @@ -606,16 +606,16 @@ module psb_z_mat_mod interface function psb_z_csnmi(a) result(res) - import :: psb_z_sparse_mat, psb_dpk_ - class(psb_z_sparse_mat), intent(in) :: a + import :: psb_zspmat_type, psb_dpk_ + class(psb_zspmat_type), intent(in) :: a real(psb_dpk_) :: res end function psb_z_csnmi end interface interface subroutine psb_z_get_diag(a,d,info) - import :: psb_z_sparse_mat, psb_dpk_ - class(psb_z_sparse_mat), intent(in) :: a + import :: psb_zspmat_type, psb_dpk_ + class(psb_zspmat_type), intent(in) :: a complex(psb_dpk_), intent(out) :: d(:) integer, intent(out) :: info end subroutine psb_z_get_diag @@ -623,14 +623,14 @@ module psb_z_mat_mod interface psb_scal subroutine psb_z_scal(d,a,info) - import :: psb_z_sparse_mat, psb_dpk_ - class(psb_z_sparse_mat), intent(inout) :: a + import :: psb_zspmat_type, psb_dpk_ + class(psb_zspmat_type), intent(inout) :: a complex(psb_dpk_), intent(in) :: d(:) integer, intent(out) :: info end subroutine psb_z_scal subroutine psb_z_scals(d,a,info) - import :: psb_z_sparse_mat, psb_dpk_ - class(psb_z_sparse_mat), intent(inout) :: a + import :: psb_zspmat_type, psb_dpk_ + class(psb_zspmat_type), intent(inout) :: a complex(psb_dpk_), intent(in) :: d integer, intent(out) :: info end subroutine psb_z_scals @@ -657,7 +657,7 @@ contains function psb_z_sizeof(a) result(res) implicit none - class(psb_z_sparse_mat), intent(in) :: a + class(psb_zspmat_type), intent(in) :: a integer(psb_long_int_k_) :: res res = 0 @@ -670,7 +670,7 @@ contains function psb_z_get_fmt(a) result(res) implicit none - class(psb_z_sparse_mat), intent(in) :: a + class(psb_zspmat_type), intent(in) :: a character(len=5) :: res if (allocated(a%a)) then @@ -684,7 +684,7 @@ contains function psb_z_get_dupl(a) result(res) implicit none - class(psb_z_sparse_mat), intent(in) :: a + class(psb_zspmat_type), intent(in) :: a integer :: res if (allocated(a%a)) then @@ -697,7 +697,7 @@ contains function psb_z_get_state(a) result(res) implicit none - class(psb_z_sparse_mat), intent(in) :: a + class(psb_zspmat_type), intent(in) :: a integer :: res if (allocated(a%a)) then @@ -709,7 +709,7 @@ contains function psb_z_get_nrows(a) result(res) implicit none - class(psb_z_sparse_mat), intent(in) :: a + class(psb_zspmat_type), intent(in) :: a integer :: res if (allocated(a%a)) then @@ -722,7 +722,7 @@ contains function psb_z_get_ncols(a) result(res) implicit none - class(psb_z_sparse_mat), intent(in) :: a + class(psb_zspmat_type), intent(in) :: a integer :: res if (allocated(a%a)) then @@ -735,7 +735,7 @@ contains function psb_z_is_triangle(a) result(res) implicit none - class(psb_z_sparse_mat), intent(in) :: a + class(psb_zspmat_type), intent(in) :: a logical :: res if (allocated(a%a)) then @@ -748,7 +748,7 @@ contains function psb_z_is_unit(a) result(res) implicit none - class(psb_z_sparse_mat), intent(in) :: a + class(psb_zspmat_type), intent(in) :: a logical :: res if (allocated(a%a)) then @@ -761,7 +761,7 @@ contains function psb_z_is_upper(a) result(res) implicit none - class(psb_z_sparse_mat), intent(in) :: a + class(psb_zspmat_type), intent(in) :: a logical :: res if (allocated(a%a)) then @@ -774,7 +774,7 @@ contains function psb_z_is_lower(a) result(res) implicit none - class(psb_z_sparse_mat), intent(in) :: a + class(psb_zspmat_type), intent(in) :: a logical :: res if (allocated(a%a)) then @@ -787,7 +787,7 @@ contains function psb_z_is_null(a) result(res) implicit none - class(psb_z_sparse_mat), intent(in) :: a + class(psb_zspmat_type), intent(in) :: a logical :: res if (allocated(a%a)) then @@ -800,7 +800,7 @@ contains function psb_z_is_bld(a) result(res) implicit none - class(psb_z_sparse_mat), intent(in) :: a + class(psb_zspmat_type), intent(in) :: a logical :: res if (allocated(a%a)) then @@ -813,7 +813,7 @@ contains function psb_z_is_upd(a) result(res) implicit none - class(psb_z_sparse_mat), intent(in) :: a + class(psb_zspmat_type), intent(in) :: a logical :: res if (allocated(a%a)) then @@ -826,7 +826,7 @@ contains function psb_z_is_asb(a) result(res) implicit none - class(psb_z_sparse_mat), intent(in) :: a + class(psb_zspmat_type), intent(in) :: a logical :: res if (allocated(a%a)) then @@ -839,7 +839,7 @@ contains function psb_z_is_sorted(a) result(res) implicit none - class(psb_z_sparse_mat), intent(in) :: a + class(psb_zspmat_type), intent(in) :: a logical :: res if (allocated(a%a)) then @@ -854,7 +854,7 @@ contains function psb_z_get_nzeros(a) result(res) implicit none - class(psb_z_sparse_mat), intent(in) :: a + class(psb_zspmat_type), intent(in) :: a integer :: res res = 0 @@ -867,7 +867,7 @@ contains function psb_z_get_size(a) result(res) implicit none - class(psb_z_sparse_mat), intent(in) :: a + class(psb_zspmat_type), intent(in) :: a integer :: res @@ -882,7 +882,7 @@ contains function psb_z_get_nz_row(idx,a) result(res) implicit none integer, intent(in) :: idx - class(psb_z_sparse_mat), intent(in) :: a + class(psb_zspmat_type), intent(in) :: a integer :: res Integer :: err_act diff --git a/base/modules/psb_z_psblas_mod.f90 b/base/modules/psb_z_psblas_mod.f90 index b0d60dec..9a8941e9 100644 --- a/base/modules/psb_z_psblas_mod.f90 +++ b/base/modules/psb_z_psblas_mod.f90 @@ -193,9 +193,9 @@ module psb_z_psblas_mod interface psb_spnrmi function psb_znrmi(a, desc_a,info) use psb_descriptor_type, only : psb_desc_type, psb_spk_, psb_dpk_ - use psb_mat_mod, only : psb_z_sparse_mat + use psb_mat_mod, only : psb_zspmat_type real(psb_dpk_) :: psb_znrmi - type(psb_z_sparse_mat), intent (in) :: a + type(psb_zspmat_type), intent (in) :: a type(psb_desc_type), intent (in) :: desc_a integer, intent(out) :: info end function psb_znrmi @@ -205,8 +205,8 @@ module psb_z_psblas_mod subroutine psb_zspmm(alpha, a, x, beta, y, desc_a, info,& &trans, k, jx, jy,work,doswap) use psb_descriptor_type, only : psb_desc_type, psb_spk_, psb_dpk_ - use psb_mat_mod, only : psb_z_sparse_mat - type(psb_z_sparse_mat), intent(in) :: a + use psb_mat_mod, only : psb_zspmat_type + type(psb_zspmat_type), intent(in) :: a complex(psb_dpk_), intent(inout) :: x(:,:) complex(psb_dpk_), intent(inout) :: y(:,:) complex(psb_dpk_), intent(in) :: alpha, beta @@ -220,8 +220,8 @@ module psb_z_psblas_mod subroutine psb_zspmv(alpha, a, x, beta, y,& & desc_a, info, trans, work,doswap) use psb_descriptor_type, only : psb_desc_type, psb_spk_, psb_dpk_ - use psb_mat_mod, only : psb_z_sparse_mat - type(psb_z_sparse_mat), intent(in) :: a + use psb_mat_mod, only : psb_zspmat_type + type(psb_zspmat_type), intent(in) :: a complex(psb_dpk_), intent(inout) :: x(:) complex(psb_dpk_), intent(inout) :: y(:) complex(psb_dpk_), intent(in) :: alpha, beta @@ -238,8 +238,8 @@ module psb_z_psblas_mod & desc_a, info, trans, scale, choice,& & diag, n, jx, jy, work) use psb_descriptor_type, only : psb_desc_type, psb_spk_, psb_dpk_ - use psb_mat_mod, only : psb_z_sparse_mat - type(psb_z_sparse_mat), intent(in) :: t + use psb_mat_mod, only : psb_zspmat_type + type(psb_zspmat_type), intent(in) :: t complex(psb_dpk_), intent(in) :: x(:,:) complex(psb_dpk_), intent(inout) :: y(:,:) complex(psb_dpk_), intent(in) :: alpha, beta @@ -255,8 +255,8 @@ module psb_z_psblas_mod & desc_a, info, trans, scale, choice,& & diag, work) use psb_descriptor_type, only : psb_desc_type, psb_spk_, psb_dpk_ - use psb_mat_mod, only : psb_z_sparse_mat - type(psb_z_sparse_mat), intent(in) :: t + use psb_mat_mod, only : psb_zspmat_type + type(psb_zspmat_type), intent(in) :: t complex(psb_dpk_), intent(in) :: x(:) complex(psb_dpk_), intent(inout) :: y(:) complex(psb_dpk_), intent(in) :: alpha, beta diff --git a/base/modules/psb_z_tools_mod.f90 b/base/modules/psb_z_tools_mod.f90 index e48a3a5a..3b9552e2 100644 --- a/base/modules/psb_z_tools_mod.f90 +++ b/base/modules/psb_z_tools_mod.f90 @@ -69,9 +69,9 @@ Module psb_z_tools_mod Subroutine psb_zsphalo(a,desc_a,blk,info,rowcnv,colcnv,& & rowscale,colscale,outfmt,data) use psb_descriptor_type, only : psb_desc_type, psb_spk_, psb_dpk_ - use psb_mat_mod, only : psb_z_sparse_mat - Type(psb_z_sparse_mat),Intent(in) :: a - Type(psb_z_sparse_mat),Intent(inout) :: blk + use psb_mat_mod, only : psb_zspmat_type + Type(psb_zspmat_type),Intent(in) :: a + Type(psb_zspmat_type),Intent(inout) :: blk Type(psb_desc_type),Intent(in) :: desc_a integer, intent(out) :: info logical, optional, intent(in) :: rowcnv,colcnv,rowscale,colscale @@ -124,9 +124,9 @@ Module psb_z_tools_mod interface psb_cdbldext Subroutine psb_zcdbldext(a,desc_a,novr,desc_ov,info,extype) use psb_descriptor_type, only : psb_desc_type, psb_spk_, psb_dpk_ - Use psb_mat_mod, only : psb_z_sparse_mat + Use psb_mat_mod, only : psb_zspmat_type integer, intent(in) :: novr - Type(psb_z_sparse_mat), Intent(in) :: a + Type(psb_zspmat_type), Intent(in) :: a Type(psb_desc_type), Intent(in), target :: desc_a Type(psb_desc_type), Intent(out) :: desc_ov integer, intent(out) :: info @@ -137,9 +137,9 @@ Module psb_z_tools_mod interface psb_spall subroutine psb_zspalloc(a, desc_a, info, nnz) use psb_descriptor_type, only : psb_desc_type, psb_spk_, psb_dpk_ - use psb_mat_mod, only : psb_z_sparse_mat + use psb_mat_mod, only : psb_zspmat_type type(psb_desc_type), intent(in) :: desc_a - type(psb_z_sparse_mat), intent(inout) :: a + type(psb_zspmat_type), intent(inout) :: a integer, intent(out) :: info integer, optional, intent(in) :: nnz end subroutine psb_zspalloc @@ -148,8 +148,8 @@ Module psb_z_tools_mod interface psb_spasb subroutine psb_zspasb(a,desc_a, info, afmt, upd, dupl,mold) use psb_descriptor_type, only : psb_desc_type, psb_spk_, psb_dpk_ - use psb_mat_mod, only : psb_z_sparse_mat, psb_z_base_sparse_mat - type(psb_z_sparse_mat), intent (inout) :: a + use psb_mat_mod, only : psb_zspmat_type, psb_z_base_sparse_mat + type(psb_zspmat_type), intent (inout) :: a type(psb_desc_type), intent(in) :: desc_a integer, intent(out) :: info integer,optional, intent(in) :: dupl, upd @@ -161,9 +161,9 @@ Module psb_z_tools_mod interface psb_spfree subroutine psb_zspfree(a, desc_a,info) use psb_descriptor_type, only : psb_desc_type, psb_spk_, psb_dpk_ - use psb_mat_mod, only : psb_z_sparse_mat + use psb_mat_mod, only : psb_zspmat_type type(psb_desc_type), intent(in) :: desc_a - type(psb_z_sparse_mat), intent(inout) ::a + type(psb_zspmat_type), intent(inout) ::a integer, intent(out) :: info end subroutine psb_zspfree end interface @@ -172,9 +172,9 @@ Module psb_z_tools_mod interface psb_spins subroutine psb_zspins(nz,ia,ja,val,a,desc_a,info,rebuild) use psb_descriptor_type, only : psb_desc_type, psb_spk_, psb_dpk_ - use psb_mat_mod, only : psb_z_sparse_mat + use psb_mat_mod, only : psb_zspmat_type type(psb_desc_type), intent(inout) :: desc_a - type(psb_z_sparse_mat), intent(inout) :: a + type(psb_zspmat_type), intent(inout) :: a integer, intent(in) :: nz,ia(:),ja(:) complex(psb_dpk_), intent(in) :: val(:) integer, intent(out) :: info @@ -182,10 +182,10 @@ Module psb_z_tools_mod end subroutine psb_zspins subroutine psb_zspins_2desc(nz,ia,ja,val,a,desc_ar,desc_ac,info) use psb_descriptor_type, only : psb_desc_type, psb_spk_, psb_dpk_ - use psb_mat_mod, only : psb_z_sparse_mat + use psb_mat_mod, only : psb_zspmat_type type(psb_desc_type), intent(in) :: desc_ar type(psb_desc_type), intent(inout) :: desc_ac - type(psb_z_sparse_mat), intent(inout) :: a + type(psb_zspmat_type), intent(inout) :: a integer, intent(in) :: nz,ia(:),ja(:) complex(psb_dpk_), intent(in) :: val(:) integer, intent(out) :: info @@ -196,9 +196,9 @@ Module psb_z_tools_mod interface psb_sprn subroutine psb_zsprn(a, desc_a,info,clear) use psb_descriptor_type, only : psb_desc_type, psb_spk_, psb_dpk_ - use psb_mat_mod, only : psb_z_sparse_mat + use psb_mat_mod, only : psb_zspmat_type type(psb_desc_type), intent(in) :: desc_a - type(psb_z_sparse_mat), intent(inout) :: a + type(psb_zspmat_type), intent(inout) :: a integer, intent(out) :: info logical, intent(in), optional :: clear end subroutine psb_zsprn @@ -228,7 +228,7 @@ Module psb_z_tools_mod !!$ use psb_penv_mod !!$ use psb_error_mod !!$ implicit none -!!$ type(psb_z_sparse_mat), intent(out) :: a_map +!!$ type(psb_zspmat_type), intent(out) :: a_map !!$ type(psb_desc_type), intent(out) :: cd_xt !!$ type(psb_desc_type), intent(in) :: descin, descout !!$ @@ -261,7 +261,7 @@ Module psb_z_tools_mod !!$ integer, intent(in) :: nz !!$ integer, intent(in) :: ir(:),ic(:) !!$ complex(psb_dpk_), intent(in) :: val(:) -!!$ type(psb_z_sparse_mat), intent(inout) :: a_map +!!$ type(psb_zspmat_type), intent(inout) :: a_map !!$ type(psb_desc_type), intent(inout) :: cd_xt !!$ type(psb_desc_type), intent(in) :: descin, descout !!$ integer :: info @@ -276,7 +276,7 @@ Module psb_z_tools_mod !!$ use psb_descriptor_type !!$ use psb_serial_mod !!$ implicit none -!!$ type(psb_z_sparse_mat), intent(inout) :: a_map +!!$ type(psb_zspmat_type), intent(inout) :: a_map !!$ type(psb_desc_type), intent(inout) :: cd_xt !!$ type(psb_desc_type), intent(in) :: descin, descout !!$ character(len=*), optional, intent(in) :: afmt diff --git a/base/psblas/psb_cnrmi.f90 b/base/psblas/psb_cnrmi.f90 index a389ab5e..02957498 100644 --- a/base/psblas/psb_cnrmi.f90 +++ b/base/psblas/psb_cnrmi.f90 @@ -45,7 +45,7 @@ function psb_cnrmi(a,desc_a,info) use psb_sparse_mod, psb_protect_name => psb_cnrmi implicit none - type(psb_c_sparse_mat), intent(in) :: a + type(psb_cspmat_type), intent(in) :: a integer, intent(out) :: info type(psb_desc_type), intent(in) :: desc_a real(psb_spk_) :: psb_cnrmi diff --git a/base/psblas/psb_cspmm.f90 b/base/psblas/psb_cspmm.f90 index dc68602e..6ce15a31 100644 --- a/base/psblas/psb_cspmm.f90 +++ b/base/psblas/psb_cspmm.f90 @@ -71,7 +71,7 @@ subroutine psb_cspmm(alpha,a,x,beta,y,desc_a,info,& complex(psb_spk_), intent(in) :: alpha, beta complex(psb_spk_), intent(inout), target :: x(:,:) complex(psb_spk_), intent(inout), target :: y(:,:) - type(psb_c_sparse_mat), intent(in) :: a + type(psb_cspmat_type), intent(in) :: a type(psb_desc_type), intent(in) :: desc_a integer, intent(out) :: info complex(psb_spk_), optional, target, intent(inout) :: work(:) @@ -404,7 +404,7 @@ end subroutine psb_cspmm ! ! Arguments: ! alpha - complex The scalar alpha. -! a - type(psb_c_sparse_mat). The sparse matrix containing A. +! a - type(psb_cspmat_type). The sparse matrix containing A. ! x(:) - complex The input vector containing the entries of ( X ). ! beta - complex The scalar beta. ! y(:) - complex The input vector containing the entries of ( Y ). @@ -423,7 +423,7 @@ subroutine psb_cspmv(alpha,a,x,beta,y,desc_a,info,& complex(psb_spk_), intent(in) :: alpha, beta complex(psb_spk_), intent(inout), target :: x(:) complex(psb_spk_), intent(inout), target :: y(:) - type(psb_c_sparse_mat), intent(in) :: a + type(psb_cspmat_type), intent(in) :: a type(psb_desc_type), intent(in) :: desc_a integer, intent(out) :: info complex(psb_spk_), optional, target, intent(inout) :: work(:) diff --git a/base/psblas/psb_cspsm.f90 b/base/psblas/psb_cspsm.f90 index ffe17b67..1b73dbe5 100644 --- a/base/psblas/psb_cspsm.f90 +++ b/base/psblas/psb_cspsm.f90 @@ -57,7 +57,7 @@ ! ! Arguments: ! alpha - complex. The scalar alpha. -! a - type(psb_c_sparse_mat). The sparse matrix containing A. +! a - type(psb_cspmat_type). The sparse matrix containing A. ! x(:,:) - complex The input vector containing the entries of ( X ). ! beta - complex The scalar beta. ! y(:,:) - complex The input vector containing the entries of ( Y ). @@ -82,7 +82,7 @@ subroutine psb_cspsm(alpha,a,x,beta,y,desc_a,info,& complex(psb_spk_), intent(in) :: alpha, beta complex(psb_spk_), intent(in), target :: x(:,:) complex(psb_spk_), intent(inout), target :: y(:,:) - type (psb_c_sparse_mat), intent(in) :: a + type (psb_cspmat_type), intent(in) :: a type(psb_desc_type), intent(in) :: desc_a integer, intent(out) :: info complex(psb_spk_), intent(in), optional, target :: diag(:) @@ -339,7 +339,7 @@ end subroutine psb_cspsm ! ! Arguments: ! alpha - complex. The scalar alpha. -! a - type(psb_c_sparse_mat). The sparse matrix containing A. +! a - type(psb_cspmat_type). The sparse matrix containing A. ! x(:) - complex The input vector containing the entries of ( X ). ! beta - complex The scalar beta. ! y(:) - complex The input vector containing the entries of ( Y ). @@ -361,7 +361,7 @@ subroutine psb_cspsv(alpha,a,x,beta,y,desc_a,info,& complex(psb_spk_), intent(in) :: alpha, beta complex(psb_spk_), intent(in), target :: x(:) complex(psb_spk_), intent(inout), target :: y(:) - type(psb_c_sparse_mat), intent(in) :: a + type(psb_cspmat_type), intent(in) :: a type(psb_desc_type), intent(in) :: desc_a integer, intent(out) :: info complex(psb_spk_), intent(in), optional, target :: diag(:) diff --git a/base/psblas/psb_dnrmi.f90 b/base/psblas/psb_dnrmi.f90 index 893bf6ae..f1f46247 100644 --- a/base/psblas/psb_dnrmi.f90 +++ b/base/psblas/psb_dnrmi.f90 @@ -50,7 +50,7 @@ function psb_dnrmi(a,desc_a,info) use psb_mat_mod implicit none - type(psb_d_sparse_mat), intent(in) :: a + type(psb_dspmat_type), intent(in) :: a integer, intent(out) :: info type(psb_desc_type), intent(in) :: desc_a real(psb_dpk_) :: psb_dnrmi diff --git a/base/psblas/psb_dspmm.f90 b/base/psblas/psb_dspmm.f90 index 07a845b3..55428e10 100644 --- a/base/psblas/psb_dspmm.f90 +++ b/base/psblas/psb_dspmm.f90 @@ -71,7 +71,7 @@ subroutine psb_dspmm(alpha,a,x,beta,y,desc_a,info,& real(psb_dpk_), intent(in) :: alpha, beta real(psb_dpk_), intent(inout), target :: x(:,:) real(psb_dpk_), intent(inout), target :: y(:,:) - type(psb_d_sparse_mat), intent(in) :: a + type(psb_dspmat_type), intent(in) :: a type(psb_desc_type), intent(in) :: desc_a integer, intent(out) :: info real(psb_dpk_), optional, target, intent(inout) :: work(:) @@ -423,7 +423,7 @@ subroutine psb_dspmv(alpha,a,x,beta,y,desc_a,info,& real(psb_dpk_), intent(in) :: alpha, beta real(psb_dpk_), intent(inout), target :: x(:) real(psb_dpk_), intent(inout), target :: y(:) - type(psb_d_sparse_mat), intent(in) :: a + type(psb_dspmat_type), intent(in) :: a type(psb_desc_type), intent(in) :: desc_a integer, intent(out) :: info real(psb_dpk_), optional, target, intent(inout) :: work(:) diff --git a/base/psblas/psb_dspnrm1.f90 b/base/psblas/psb_dspnrm1.f90 index ccfea27e..fb659f2b 100644 --- a/base/psblas/psb_dspnrm1.f90 +++ b/base/psblas/psb_dspnrm1.f90 @@ -52,7 +52,7 @@ function psb_dspnrm1(a,desc_a,info) use psb_sparse_mod, psb_protect_name => psb_dspnrm1 implicit none - type(psb_d_sparse_mat), intent(in) :: a + type(psb_dspmat_type), intent(in) :: a integer, intent(out) :: info type(psb_desc_type), intent(in) :: desc_a real(psb_dpk_) :: psb_dspnrm1 diff --git a/base/psblas/psb_dspsm.f90 b/base/psblas/psb_dspsm.f90 index 9aff8a71..a39cd7ac 100644 --- a/base/psblas/psb_dspsm.f90 +++ b/base/psblas/psb_dspsm.f90 @@ -83,7 +83,7 @@ subroutine psb_dspsm(alpha,a,x,beta,y,desc_a,info,& real(psb_dpk_), intent(in) :: alpha, beta real(psb_dpk_), intent(in), target :: x(:,:) real(psb_dpk_), intent(inout), target :: y(:,:) - type(psb_d_sparse_mat), intent(in) :: a + type(psb_dspmat_type), intent(in) :: a type(psb_desc_type), intent(in) :: desc_a integer, intent(out) :: info real(psb_dpk_), intent(in), optional, target :: diag(:) @@ -362,7 +362,7 @@ subroutine psb_dspsv(alpha,a,x,beta,y,desc_a,info,& real(psb_dpk_), intent(in) :: alpha, beta real(psb_dpk_), intent(in), target :: x(:) real(psb_dpk_), intent(inout), target :: y(:) - type(psb_d_sparse_mat), intent(in) :: a + type(psb_dspmat_type), intent(in) :: a type(psb_desc_type), intent(in) :: desc_a integer, intent(out) :: info real(psb_dpk_), intent(in), optional, target :: diag(:) diff --git a/base/psblas/psb_snrmi.f90 b/base/psblas/psb_snrmi.f90 index 827b6fa1..829d6890 100644 --- a/base/psblas/psb_snrmi.f90 +++ b/base/psblas/psb_snrmi.f90 @@ -50,7 +50,7 @@ function psb_snrmi(a,desc_a,info) use psb_mat_mod implicit none - type(psb_s_sparse_mat), intent(in) :: a + type(psb_sspmat_type), intent(in) :: a integer, intent(out) :: info type(psb_desc_type), intent(in) :: desc_a real(psb_spk_) :: psb_snrmi diff --git a/base/psblas/psb_sspmm.f90 b/base/psblas/psb_sspmm.f90 index d3e20355..9fe3204c 100644 --- a/base/psblas/psb_sspmm.f90 +++ b/base/psblas/psb_sspmm.f90 @@ -71,7 +71,7 @@ subroutine psb_sspmm(alpha,a,x,beta,y,desc_a,info,& real(psb_spk_), intent(in) :: alpha, beta real(psb_spk_), intent(inout), target :: x(:,:) real(psb_spk_), intent(inout), target :: y(:,:) - type(psb_s_sparse_mat), intent(in) :: a + type(psb_sspmat_type), intent(in) :: a type(psb_desc_type), intent(in) :: desc_a integer, intent(out) :: info real(psb_spk_), optional, target, intent(inout) :: work(:) @@ -423,7 +423,7 @@ subroutine psb_sspmv(alpha,a,x,beta,y,desc_a,info,& real(psb_spk_), intent(in) :: alpha, beta real(psb_spk_), intent(inout), target :: x(:) real(psb_spk_), intent(inout), target :: y(:) - type(psb_s_sparse_mat), intent(in) :: a + type(psb_sspmat_type), intent(in) :: a type(psb_desc_type), intent(in) :: desc_a integer, intent(out) :: info real(psb_spk_), optional, target, intent(inout) :: work(:) diff --git a/base/psblas/psb_sspsm.f90 b/base/psblas/psb_sspsm.f90 index f627d0f0..8e8cd672 100644 --- a/base/psblas/psb_sspsm.f90 +++ b/base/psblas/psb_sspsm.f90 @@ -83,7 +83,7 @@ subroutine psb_sspsm(alpha,a,x,beta,y,desc_a,info,& real(psb_spk_), intent(in) :: alpha, beta real(psb_spk_), intent(in), target :: x(:,:) real(psb_spk_), intent(inout), target :: y(:,:) - type (psb_s_sparse_mat), intent(in) :: a + type (psb_sspmat_type), intent(in) :: a type(psb_desc_type), intent(in) :: desc_a integer, intent(out) :: info real(psb_spk_), intent(in), optional, target :: diag(:) @@ -362,7 +362,7 @@ subroutine psb_sspsv(alpha,a,x,beta,y,desc_a,info,& real(psb_spk_), intent(in) :: alpha, beta real(psb_spk_), intent(in), target :: x(:) real(psb_spk_), intent(inout), target :: y(:) - type(psb_s_sparse_mat), intent(in) :: a + type(psb_sspmat_type), intent(in) :: a type(psb_desc_type), intent(in) :: desc_a integer, intent(out) :: info real(psb_spk_), intent(in), optional, target :: diag(:) diff --git a/base/psblas/psb_znrmi.f90 b/base/psblas/psb_znrmi.f90 index e5c03c51..2529c785 100644 --- a/base/psblas/psb_znrmi.f90 +++ b/base/psblas/psb_znrmi.f90 @@ -37,7 +37,7 @@ ! normi := max(abs(sum(A(i,j)))) ! ! Arguments: -! a - type(psb_d_sparse_mat). The sparse matrix containing A. +! a - type(psb_dspmat_type). The sparse matrix containing A. ! desc_a - type(psb_desc_type). The communication descriptor. ! info - integer. Return code ! @@ -50,7 +50,7 @@ function psb_znrmi(a,desc_a,info) use psb_mat_mod implicit none - type(psb_z_sparse_mat), intent(in) :: a + type(psb_zspmat_type), intent(in) :: a integer, intent(out) :: info type(psb_desc_type), intent(in) :: desc_a real(psb_dpk_) :: psb_znrmi diff --git a/base/psblas/psb_zspmm.f90 b/base/psblas/psb_zspmm.f90 index 1bd731d5..22036879 100644 --- a/base/psblas/psb_zspmm.f90 +++ b/base/psblas/psb_zspmm.f90 @@ -49,7 +49,7 @@ ! ! Arguments: ! alpha - complex The scalar alpha. -! a - type(psb_z_sparse_mat). The sparse matrix containing A. +! a - type(psb_zspmat_type). The sparse matrix containing A. ! x(:,:) - complex The input vector containing the entries of ( X ). ! beta - complex The scalar beta. ! y(:,:) - complex The input vector containing the entries of ( Y ). @@ -71,7 +71,7 @@ subroutine psb_zspmm(alpha,a,x,beta,y,desc_a,info,& complex(psb_dpk_), intent(in) :: alpha, beta complex(psb_dpk_), intent(inout), target :: x(:,:) complex(psb_dpk_), intent(inout), target :: y(:,:) - type(psb_z_sparse_mat), intent(in) :: a + type(psb_zspmat_type), intent(in) :: a type(psb_desc_type), intent(in) :: desc_a integer, intent(out) :: info complex(psb_dpk_), optional, target, intent(inout) :: work(:) @@ -404,7 +404,7 @@ end subroutine psb_zspmm ! ! Arguments: ! alpha - complex The scalar alpha. -! a - type(psb_z_sparse_mat). The sparse matrix containing A. +! a - type(psb_zspmat_type). The sparse matrix containing A. ! x(:) - complex The input vector containing the entries of ( X ). ! beta - complex The scalar beta. ! y(:) - complex The input vector containing the entries of ( Y ). @@ -423,7 +423,7 @@ subroutine psb_zspmv(alpha,a,x,beta,y,desc_a,info,& complex(psb_dpk_), intent(in) :: alpha, beta complex(psb_dpk_), intent(inout), target :: x(:) complex(psb_dpk_), intent(inout), target :: y(:) - type(psb_z_sparse_mat), intent(in) :: a + type(psb_zspmat_type), intent(in) :: a type(psb_desc_type), intent(in) :: desc_a integer, intent(out) :: info complex(psb_dpk_), optional, target, intent(inout) :: work(:) diff --git a/base/psblas/psb_zspsm.f90 b/base/psblas/psb_zspsm.f90 index 488c705e..3ee03960 100644 --- a/base/psblas/psb_zspsm.f90 +++ b/base/psblas/psb_zspsm.f90 @@ -57,7 +57,7 @@ ! ! Arguments: ! alpha - complex. The scalar alpha. -! a - type(psb_z_sparse_mat). The sparse matrix containing A. +! a - type(psb_zspmat_type). The sparse matrix containing A. ! x(:,:) - complex The input vector containing the entries of ( X ). ! beta - complex The scalar beta. ! y(:,:) - complex The input vector containing the entries of ( Y ). @@ -82,7 +82,7 @@ subroutine psb_zspsm(alpha,a,x,beta,y,desc_a,info,& complex(psb_dpk_), intent(in) :: alpha, beta complex(psb_dpk_), intent(in), target :: x(:,:) complex(psb_dpk_), intent(inout), target :: y(:,:) - type (psb_z_sparse_mat), intent(in) :: a + type (psb_zspmat_type), intent(in) :: a type(psb_desc_type), intent(in) :: desc_a integer, intent(out) :: info complex(psb_dpk_), intent(in), optional, target :: diag(:) @@ -339,7 +339,7 @@ end subroutine psb_zspsm ! ! Arguments: ! alpha - complex. The scalar alpha. -! a - type(psb_z_sparse_mat). The sparse matrix containing A. +! a - type(psb_zspmat_type). The sparse matrix containing A. ! x(:) - complex The input vector containing the entries of ( X ). ! beta - complex The scalar beta. ! y(:) - complex The input vector containing the entries of ( Y ). @@ -361,7 +361,7 @@ subroutine psb_zspsv(alpha,a,x,beta,y,desc_a,info,& complex(psb_dpk_), intent(in) :: alpha, beta complex(psb_dpk_), intent(in), target :: x(:) complex(psb_dpk_), intent(inout), target :: y(:) - type(psb_z_sparse_mat), intent(in) :: a + type(psb_zspmat_type), intent(in) :: a type(psb_desc_type), intent(in) :: desc_a integer, intent(out) :: info complex(psb_dpk_), intent(in), optional, target :: diag(:) diff --git a/base/serial/f03/psb_c_mat_impl.F03 b/base/serial/f03/psb_c_mat_impl.F03 index 3e0775cb..f598148f 100644 --- a/base/serial/f03/psb_c_mat_impl.F03 +++ b/base/serial/f03/psb_c_mat_impl.F03 @@ -16,7 +16,7 @@ subroutine psb_c_set_nrows(m,a) use psb_c_mat_mod, psb_protect_name => psb_c_set_nrows use psb_error_mod implicit none - class(psb_c_sparse_mat), intent(inout) :: a + class(psb_cspmat_type), intent(inout) :: a integer, intent(in) :: m Integer :: err_act, info character(len=20) :: name='set_nrows' @@ -50,7 +50,7 @@ subroutine psb_c_set_ncols(n,a) use psb_c_mat_mod, psb_protect_name => psb_c_set_ncols use psb_error_mod implicit none - class(psb_c_sparse_mat), intent(inout) :: a + class(psb_cspmat_type), intent(inout) :: a integer, intent(in) :: n Integer :: err_act, info character(len=20) :: name='get_nzeros' @@ -84,7 +84,7 @@ subroutine psb_c_set_state(n,a) use psb_c_mat_mod, psb_protect_name => psb_c_set_state use psb_error_mod implicit none - class(psb_c_sparse_mat), intent(inout) :: a + class(psb_cspmat_type), intent(inout) :: a integer, intent(in) :: n Integer :: err_act, info character(len=20) :: name='get_nzeros' @@ -118,7 +118,7 @@ subroutine psb_c_set_dupl(n,a) use psb_c_mat_mod, psb_protect_name => psb_c_set_dupl use psb_error_mod implicit none - class(psb_c_sparse_mat), intent(inout) :: a + class(psb_cspmat_type), intent(inout) :: a integer, intent(in) :: n Integer :: err_act, info character(len=20) :: name='get_nzeros' @@ -152,7 +152,7 @@ subroutine psb_c_set_null(a) use psb_c_mat_mod, psb_protect_name => psb_c_set_null use psb_error_mod implicit none - class(psb_c_sparse_mat), intent(inout) :: a + class(psb_cspmat_type), intent(inout) :: a Integer :: err_act, info character(len=20) :: name='get_nzeros' logical, parameter :: debug=.false. @@ -185,7 +185,7 @@ subroutine psb_c_set_bld(a) use psb_c_mat_mod, psb_protect_name => psb_c_set_bld use psb_error_mod implicit none - class(psb_c_sparse_mat), intent(inout) :: a + class(psb_cspmat_type), intent(inout) :: a Integer :: err_act, info character(len=20) :: name='get_nzeros' logical, parameter :: debug=.false. @@ -217,7 +217,7 @@ subroutine psb_c_set_upd(a) use psb_c_mat_mod, psb_protect_name => psb_c_set_upd use psb_error_mod implicit none - class(psb_c_sparse_mat), intent(inout) :: a + class(psb_cspmat_type), intent(inout) :: a Integer :: err_act, info character(len=20) :: name='get_nzeros' logical, parameter :: debug=.false. @@ -250,7 +250,7 @@ subroutine psb_c_set_asb(a) use psb_c_mat_mod, psb_protect_name => psb_c_set_asb use psb_error_mod implicit none - class(psb_c_sparse_mat), intent(inout) :: a + class(psb_cspmat_type), intent(inout) :: a Integer :: err_act, info character(len=20) :: name='get_nzeros' logical, parameter :: debug=.false. @@ -282,7 +282,7 @@ subroutine psb_c_set_sorted(a,val) use psb_c_mat_mod, psb_protect_name => psb_c_set_sorted use psb_error_mod implicit none - class(psb_c_sparse_mat), intent(inout) :: a + class(psb_cspmat_type), intent(inout) :: a logical, intent(in), optional :: val Integer :: err_act, info character(len=20) :: name='get_nzeros' @@ -315,7 +315,7 @@ subroutine psb_c_set_triangle(a,val) use psb_c_mat_mod, psb_protect_name => psb_c_set_triangle use psb_error_mod implicit none - class(psb_c_sparse_mat), intent(inout) :: a + class(psb_cspmat_type), intent(inout) :: a logical, intent(in), optional :: val Integer :: err_act, info character(len=20) :: name='get_nzeros' @@ -348,7 +348,7 @@ subroutine psb_c_set_unit(a,val) use psb_c_mat_mod, psb_protect_name => psb_c_set_unit use psb_error_mod implicit none - class(psb_c_sparse_mat), intent(inout) :: a + class(psb_cspmat_type), intent(inout) :: a logical, intent(in), optional :: val Integer :: err_act, info character(len=20) :: name='get_nzeros' @@ -381,7 +381,7 @@ subroutine psb_c_set_lower(a,val) use psb_c_mat_mod, psb_protect_name => psb_c_set_lower use psb_error_mod implicit none - class(psb_c_sparse_mat), intent(inout) :: a + class(psb_cspmat_type), intent(inout) :: a logical, intent(in), optional :: val Integer :: err_act, info character(len=20) :: name='get_nzeros' @@ -414,7 +414,7 @@ subroutine psb_c_set_upper(a,val) use psb_c_mat_mod, psb_protect_name => psb_c_set_upper use psb_error_mod implicit none - class(psb_c_sparse_mat), intent(inout) :: a + class(psb_cspmat_type), intent(inout) :: a logical, intent(in), optional :: val Integer :: err_act, info character(len=20) :: name='get_nzeros' @@ -463,7 +463,7 @@ subroutine psb_c_sparse_print(iout,a,iv,eirs,eics,head,ivr,ivc) implicit none integer, intent(in) :: iout - class(psb_c_sparse_mat), intent(in) :: a + class(psb_cspmat_type), intent(in) :: a integer, intent(in), optional :: iv(:) integer, intent(in), optional :: eirs,eics character(len=*), optional :: head @@ -502,7 +502,7 @@ subroutine psb_c_get_neigh(a,idx,neigh,n,info,lev) use psb_c_mat_mod, psb_protect_name => psb_c_get_neigh use psb_error_mod implicit none - class(psb_c_sparse_mat), intent(in) :: a + class(psb_cspmat_type), intent(in) :: a integer, intent(in) :: idx integer, intent(out) :: n integer, allocatable, intent(out) :: neigh(:) @@ -546,7 +546,7 @@ subroutine psb_c_csall(nr,nc,a,info,nz) use psb_c_base_mat_mod use psb_error_mod implicit none - class(psb_c_sparse_mat), intent(out) :: a + class(psb_cspmat_type), intent(out) :: a integer, intent(in) :: nr,nc integer, intent(out) :: info integer, intent(in), optional :: nz @@ -585,7 +585,7 @@ subroutine psb_c_reallocate_nz(nz,a) use psb_error_mod implicit none integer, intent(in) :: nz - class(psb_c_sparse_mat), intent(inout) :: a + class(psb_cspmat_type), intent(inout) :: a Integer :: err_act, info character(len=20) :: name='reallocate_nz' logical, parameter :: debug=.false. @@ -617,7 +617,7 @@ subroutine psb_c_free(a) use psb_c_mat_mod, psb_protect_name => psb_c_free use psb_error_mod implicit none - class(psb_c_sparse_mat), intent(inout) :: a + class(psb_cspmat_type), intent(inout) :: a if (allocated(a%a)) then call a%a%free() @@ -631,7 +631,7 @@ subroutine psb_c_trim(a) use psb_c_mat_mod, psb_protect_name => psb_c_trim use psb_error_mod implicit none - class(psb_c_sparse_mat), intent(inout) :: a + class(psb_cspmat_type), intent(inout) :: a Integer :: err_act, info character(len=20) :: name='trim' logical, parameter :: debug=.false. @@ -664,7 +664,7 @@ subroutine psb_c_csput(nz,ia,ja,val,a,imin,imax,jmin,jmax,info,gtl) use psb_c_base_mat_mod use psb_error_mod implicit none - class(psb_c_sparse_mat), intent(inout) :: a + class(psb_cspmat_type), intent(inout) :: a complex(psb_spk_), intent(in) :: val(:) integer, intent(in) :: nz, ia(:), ja(:), imin,imax,jmin,jmax integer, intent(out) :: info @@ -709,7 +709,7 @@ subroutine psb_c_csgetptn(imin,imax,a,nz,ia,ja,info,& use psb_c_mat_mod, psb_protect_name => psb_c_csgetptn implicit none - class(psb_c_sparse_mat), intent(in) :: a + class(psb_cspmat_type), intent(in) :: a integer, intent(in) :: imin,imax integer, intent(out) :: nz integer, allocatable, intent(inout) :: ia(:), ja(:) @@ -759,7 +759,7 @@ subroutine psb_c_csgetrow(imin,imax,a,nz,ia,ja,val,info,& use psb_c_mat_mod, psb_protect_name => psb_c_csgetrow implicit none - class(psb_c_sparse_mat), intent(in) :: a + class(psb_cspmat_type), intent(in) :: a integer, intent(in) :: imin,imax integer, intent(out) :: nz integer, allocatable, intent(inout) :: ia(:), ja(:) @@ -812,8 +812,8 @@ subroutine psb_c_csgetblk(imin,imax,a,b,info,& use psb_c_mat_mod, psb_protect_name => psb_c_csgetblk implicit none - class(psb_c_sparse_mat), intent(in) :: a - class(psb_c_sparse_mat), intent(out) :: b + class(psb_cspmat_type), intent(in) :: a + class(psb_cspmat_type), intent(out) :: b integer, intent(in) :: imin,imax integer,intent(out) :: info logical, intent(in), optional :: append @@ -867,8 +867,8 @@ subroutine psb_c_csclip(a,b,info,& use psb_c_mat_mod, psb_protect_name => psb_c_csclip implicit none - class(psb_c_sparse_mat), intent(in) :: a - class(psb_c_sparse_mat), intent(out) :: b + class(psb_cspmat_type), intent(in) :: a + class(psb_cspmat_type), intent(out) :: b integer,intent(out) :: info integer, intent(in), optional :: imin,imax,jmin,jmax logical, intent(in), optional :: rscale,cscale @@ -915,7 +915,7 @@ subroutine psb_c_b_csclip(a,b,info,& use psb_c_mat_mod, psb_protect_name => psb_c_b_csclip implicit none - class(psb_c_sparse_mat), intent(in) :: a + class(psb_cspmat_type), intent(in) :: a type(psb_c_coo_sparse_mat), intent(out) :: b integer,intent(out) :: info integer, intent(in), optional :: imin,imax,jmin,jmax @@ -958,8 +958,8 @@ subroutine psb_c_cscnv(a,b,info,type,mold,upd,dupl) use psb_string_mod use psb_c_mat_mod, psb_protect_name => psb_c_cscnv implicit none - class(psb_c_sparse_mat), intent(in) :: a - class(psb_c_sparse_mat), intent(out) :: b + class(psb_cspmat_type), intent(in) :: a + class(psb_cspmat_type), intent(out) :: b integer, intent(out) :: info integer,optional, intent(in) :: dupl, upd character(len=*), optional, intent(in) :: type @@ -1060,7 +1060,7 @@ subroutine psb_c_cscnv_ip(a,info,type,mold,dupl) use psb_c_mat_mod, psb_protect_name => psb_c_cscnv_ip implicit none - class(psb_c_sparse_mat), intent(inout) :: a + class(psb_cspmat_type), intent(inout) :: a integer, intent(out) :: info integer,optional, intent(in) :: dupl character(len=*), optional, intent(in) :: type @@ -1159,7 +1159,7 @@ subroutine psb_c_cscnv_base(a,b,info,dupl) use psb_string_mod use psb_c_mat_mod, psb_protect_name => psb_c_cscnv_base implicit none - class(psb_c_sparse_mat), intent(in) :: a + class(psb_cspmat_type), intent(in) :: a class(psb_c_base_sparse_mat), intent(out) :: b integer, intent(out) :: info integer,optional, intent(in) :: dupl @@ -1217,8 +1217,8 @@ subroutine psb_c_clip_d(a,b,info) use psb_c_mat_mod, psb_protect_name => psb_c_clip_d implicit none - class(psb_c_sparse_mat), intent(in) :: a - class(psb_c_sparse_mat), intent(out) :: b + class(psb_cspmat_type), intent(in) :: a + class(psb_cspmat_type), intent(out) :: b integer,intent(out) :: info Integer :: err_act @@ -1280,7 +1280,7 @@ subroutine psb_c_clip_d_ip(a,info) use psb_c_mat_mod, psb_protect_name => psb_c_clip_d_ip implicit none - class(psb_c_sparse_mat), intent(inout) :: a + class(psb_cspmat_type), intent(inout) :: a integer,intent(out) :: info Integer :: err_act @@ -1338,7 +1338,7 @@ subroutine psb_c_mv_from(a,b) use psb_string_mod use psb_c_mat_mod, psb_protect_name => psb_c_mv_from implicit none - class(psb_c_sparse_mat), intent(out) :: a + class(psb_cspmat_type), intent(out) :: a class(psb_c_base_sparse_mat), intent(inout) :: b integer :: info @@ -1359,7 +1359,7 @@ subroutine psb_c_cp_from(a,b) use psb_string_mod use psb_c_mat_mod, psb_protect_name => psb_c_cp_from implicit none - class(psb_c_sparse_mat), intent(out) :: a + class(psb_cspmat_type), intent(out) :: a class(psb_c_base_sparse_mat), intent(inout), allocatable :: b Integer :: err_act, info character(len=20) :: name='clone' @@ -1396,7 +1396,7 @@ subroutine psb_c_mv_to(a,b) use psb_string_mod use psb_c_mat_mod, psb_protect_name => psb_c_mv_to implicit none - class(psb_c_sparse_mat), intent(inout) :: a + class(psb_cspmat_type), intent(inout) :: a class(psb_c_base_sparse_mat), intent(out) :: b integer :: info @@ -1411,7 +1411,7 @@ subroutine psb_c_cp_to(a,b) use psb_string_mod use psb_c_mat_mod, psb_protect_name => psb_c_cp_to implicit none - class(psb_c_sparse_mat), intent(in) :: a + class(psb_cspmat_type), intent(in) :: a class(psb_c_base_sparse_mat), intent(out) :: b integer :: info @@ -1422,13 +1422,13 @@ end subroutine psb_c_cp_to -subroutine psb_c_sparse_mat_move(a,b,info) +subroutine psb_cspmat_type_move(a,b,info) use psb_error_mod use psb_string_mod - use psb_c_mat_mod, psb_protect_name => psb_c_sparse_mat_move + use psb_c_mat_mod, psb_protect_name => psb_cspmat_type_move implicit none - class(psb_c_sparse_mat), intent(inout) :: a - class(psb_c_sparse_mat), intent(out) :: b + class(psb_cspmat_type), intent(inout) :: a + class(psb_cspmat_type), intent(out) :: b integer, intent(out) :: info Integer :: err_act @@ -1439,16 +1439,16 @@ subroutine psb_c_sparse_mat_move(a,b,info) call move_alloc(a%a,b%a) return -end subroutine psb_c_sparse_mat_move +end subroutine psb_cspmat_type_move -subroutine psb_c_sparse_mat_clone(a,b,info) +subroutine psb_cspmat_type_clone(a,b,info) use psb_error_mod use psb_string_mod - use psb_c_mat_mod, psb_protect_name => psb_c_sparse_mat_clone + use psb_c_mat_mod, psb_protect_name => psb_cspmat_type_clone implicit none - class(psb_c_sparse_mat), intent(in) :: a - class(psb_c_sparse_mat), intent(out) :: b + class(psb_cspmat_type), intent(in) :: a + class(psb_cspmat_type), intent(out) :: b integer, intent(out) :: info Integer :: err_act @@ -1479,7 +1479,7 @@ subroutine psb_c_sparse_mat_clone(a,b,info) return end if -end subroutine psb_c_sparse_mat_clone +end subroutine psb_cspmat_type_clone @@ -1488,7 +1488,7 @@ subroutine psb_c_transp_1mat(a) use psb_string_mod use psb_c_mat_mod, psb_protect_name => psb_c_transp_1mat implicit none - class(psb_c_sparse_mat), intent(inout) :: a + class(psb_cspmat_type), intent(inout) :: a Integer :: err_act, info character(len=20) :: name='transp' @@ -1524,8 +1524,8 @@ subroutine psb_c_transp_2mat(a,b) use psb_string_mod use psb_c_mat_mod, psb_protect_name => psb_c_transp_2mat implicit none - class(psb_c_sparse_mat), intent(out) :: a - class(psb_c_sparse_mat), intent(in) :: b + class(psb_cspmat_type), intent(out) :: a + class(psb_cspmat_type), intent(in) :: b Integer :: err_act, info character(len=20) :: name='transp' @@ -1569,7 +1569,7 @@ subroutine psb_c_transc_1mat(a) use psb_string_mod use psb_c_mat_mod, psb_protect_name => psb_c_transc_1mat implicit none - class(psb_c_sparse_mat), intent(inout) :: a + class(psb_cspmat_type), intent(inout) :: a Integer :: err_act, info character(len=20) :: name='transc' @@ -1605,8 +1605,8 @@ subroutine psb_c_transc_2mat(a,b) use psb_string_mod use psb_c_mat_mod, psb_protect_name => psb_c_transc_2mat implicit none - class(psb_c_sparse_mat), intent(out) :: a - class(psb_c_sparse_mat), intent(in) :: b + class(psb_cspmat_type), intent(out) :: a + class(psb_cspmat_type), intent(in) :: b Integer :: err_act, info character(len=20) :: name='transc' @@ -1652,7 +1652,7 @@ subroutine psb_c_reinit(a,clear) use psb_error_mod implicit none - class(psb_c_sparse_mat), intent(inout) :: a + class(psb_cspmat_type), intent(inout) :: a logical, intent(in), optional :: clear Integer :: err_act, info character(len=20) :: name='reinit' @@ -1700,7 +1700,7 @@ subroutine psb_c_csmm(alpha,a,x,beta,y,info,trans) use psb_error_mod use psb_c_mat_mod, psb_protect_name => psb_c_csmm implicit none - class(psb_c_sparse_mat), intent(in) :: a + class(psb_cspmat_type), intent(in) :: a complex(psb_spk_), intent(in) :: alpha, beta, x(:,:) complex(psb_spk_), intent(inout) :: y(:,:) integer, intent(out) :: info @@ -1738,7 +1738,7 @@ subroutine psb_c_csmv(alpha,a,x,beta,y,info,trans) use psb_error_mod use psb_c_mat_mod, psb_protect_name => psb_c_csmv implicit none - class(psb_c_sparse_mat), intent(in) :: a + class(psb_cspmat_type), intent(in) :: a complex(psb_spk_), intent(in) :: alpha, beta, x(:) complex(psb_spk_), intent(inout) :: y(:) integer, intent(out) :: info @@ -1776,7 +1776,7 @@ subroutine psb_c_cssm(alpha,a,x,beta,y,info,trans,scale,d) use psb_error_mod use psb_c_mat_mod, psb_protect_name => psb_c_cssm implicit none - class(psb_c_sparse_mat), intent(in) :: a + class(psb_cspmat_type), intent(in) :: a complex(psb_spk_), intent(in) :: alpha, beta, x(:,:) complex(psb_spk_), intent(inout) :: y(:,:) integer, intent(out) :: info @@ -1816,7 +1816,7 @@ subroutine psb_c_cssv(alpha,a,x,beta,y,info,trans,scale,d) use psb_error_mod use psb_c_mat_mod, psb_protect_name => psb_c_cssv implicit none - class(psb_c_sparse_mat), intent(in) :: a + class(psb_cspmat_type), intent(in) :: a complex(psb_spk_), intent(in) :: alpha, beta, x(:) complex(psb_spk_), intent(inout) :: y(:) integer, intent(out) :: info @@ -1859,7 +1859,7 @@ function psb_c_csnmi(a) result(res) use psb_error_mod use psb_const_mod implicit none - class(psb_c_sparse_mat), intent(in) :: a + class(psb_cspmat_type), intent(in) :: a real(psb_spk_) :: res Integer :: err_act, info @@ -1892,7 +1892,7 @@ subroutine psb_c_get_diag(a,d,info) use psb_error_mod use psb_const_mod implicit none - class(psb_c_sparse_mat), intent(in) :: a + class(psb_cspmat_type), intent(in) :: a complex(psb_spk_), intent(out) :: d(:) integer, intent(out) :: info @@ -1930,7 +1930,7 @@ subroutine psb_c_scal(d,a,info) use psb_const_mod use psb_c_mat_mod, psb_protect_name => psb_c_scal implicit none - class(psb_c_sparse_mat), intent(inout) :: a + class(psb_cspmat_type), intent(inout) :: a complex(psb_spk_), intent(in) :: d(:) integer, intent(out) :: info @@ -1968,7 +1968,7 @@ subroutine psb_c_scals(d,a,info) use psb_const_mod use psb_c_mat_mod, psb_protect_name => psb_c_scals implicit none - class(psb_c_sparse_mat), intent(inout) :: a + class(psb_cspmat_type), intent(inout) :: a complex(psb_spk_), intent(in) :: d integer, intent(out) :: info diff --git a/base/serial/f03/psb_d_mat_impl.F03 b/base/serial/f03/psb_d_mat_impl.F03 index aae3d813..bb1335f4 100644 --- a/base/serial/f03/psb_d_mat_impl.F03 +++ b/base/serial/f03/psb_d_mat_impl.F03 @@ -16,7 +16,7 @@ subroutine psb_d_set_nrows(m,a) use psb_d_mat_mod, psb_protect_name => psb_d_set_nrows use psb_error_mod implicit none - class(psb_d_sparse_mat), intent(inout) :: a + class(psb_dspmat_type), intent(inout) :: a integer, intent(in) :: m Integer :: err_act, info character(len=20) :: name='set_nrows' @@ -50,7 +50,7 @@ subroutine psb_d_set_ncols(n,a) use psb_d_mat_mod, psb_protect_name => psb_d_set_ncols use psb_error_mod implicit none - class(psb_d_sparse_mat), intent(inout) :: a + class(psb_dspmat_type), intent(inout) :: a integer, intent(in) :: n Integer :: err_act, info character(len=20) :: name='get_nzeros' @@ -84,7 +84,7 @@ subroutine psb_d_set_state(n,a) use psb_d_mat_mod, psb_protect_name => psb_d_set_state use psb_error_mod implicit none - class(psb_d_sparse_mat), intent(inout) :: a + class(psb_dspmat_type), intent(inout) :: a integer, intent(in) :: n Integer :: err_act, info character(len=20) :: name='get_nzeros' @@ -118,7 +118,7 @@ subroutine psb_d_set_dupl(n,a) use psb_d_mat_mod, psb_protect_name => psb_d_set_dupl use psb_error_mod implicit none - class(psb_d_sparse_mat), intent(inout) :: a + class(psb_dspmat_type), intent(inout) :: a integer, intent(in) :: n Integer :: err_act, info character(len=20) :: name='get_nzeros' @@ -152,7 +152,7 @@ subroutine psb_d_set_null(a) use psb_d_mat_mod, psb_protect_name => psb_d_set_null use psb_error_mod implicit none - class(psb_d_sparse_mat), intent(inout) :: a + class(psb_dspmat_type), intent(inout) :: a Integer :: err_act, info character(len=20) :: name='get_nzeros' logical, parameter :: debug=.false. @@ -185,7 +185,7 @@ subroutine psb_d_set_bld(a) use psb_d_mat_mod, psb_protect_name => psb_d_set_bld use psb_error_mod implicit none - class(psb_d_sparse_mat), intent(inout) :: a + class(psb_dspmat_type), intent(inout) :: a Integer :: err_act, info character(len=20) :: name='get_nzeros' logical, parameter :: debug=.false. @@ -217,7 +217,7 @@ subroutine psb_d_set_upd(a) use psb_d_mat_mod, psb_protect_name => psb_d_set_upd use psb_error_mod implicit none - class(psb_d_sparse_mat), intent(inout) :: a + class(psb_dspmat_type), intent(inout) :: a Integer :: err_act, info character(len=20) :: name='get_nzeros' logical, parameter :: debug=.false. @@ -250,7 +250,7 @@ subroutine psb_d_set_asb(a) use psb_d_mat_mod, psb_protect_name => psb_d_set_asb use psb_error_mod implicit none - class(psb_d_sparse_mat), intent(inout) :: a + class(psb_dspmat_type), intent(inout) :: a Integer :: err_act, info character(len=20) :: name='get_nzeros' logical, parameter :: debug=.false. @@ -282,7 +282,7 @@ subroutine psb_d_set_sorted(a,val) use psb_d_mat_mod, psb_protect_name => psb_d_set_sorted use psb_error_mod implicit none - class(psb_d_sparse_mat), intent(inout) :: a + class(psb_dspmat_type), intent(inout) :: a logical, intent(in), optional :: val Integer :: err_act, info character(len=20) :: name='get_nzeros' @@ -315,7 +315,7 @@ subroutine psb_d_set_triangle(a,val) use psb_d_mat_mod, psb_protect_name => psb_d_set_triangle use psb_error_mod implicit none - class(psb_d_sparse_mat), intent(inout) :: a + class(psb_dspmat_type), intent(inout) :: a logical, intent(in), optional :: val Integer :: err_act, info character(len=20) :: name='get_nzeros' @@ -348,7 +348,7 @@ subroutine psb_d_set_unit(a,val) use psb_d_mat_mod, psb_protect_name => psb_d_set_unit use psb_error_mod implicit none - class(psb_d_sparse_mat), intent(inout) :: a + class(psb_dspmat_type), intent(inout) :: a logical, intent(in), optional :: val Integer :: err_act, info character(len=20) :: name='get_nzeros' @@ -381,7 +381,7 @@ subroutine psb_d_set_lower(a,val) use psb_d_mat_mod, psb_protect_name => psb_d_set_lower use psb_error_mod implicit none - class(psb_d_sparse_mat), intent(inout) :: a + class(psb_dspmat_type), intent(inout) :: a logical, intent(in), optional :: val Integer :: err_act, info character(len=20) :: name='get_nzeros' @@ -414,7 +414,7 @@ subroutine psb_d_set_upper(a,val) use psb_d_mat_mod, psb_protect_name => psb_d_set_upper use psb_error_mod implicit none - class(psb_d_sparse_mat), intent(inout) :: a + class(psb_dspmat_type), intent(inout) :: a logical, intent(in), optional :: val Integer :: err_act, info character(len=20) :: name='get_nzeros' @@ -463,7 +463,7 @@ subroutine psb_d_sparse_print(iout,a,iv,eirs,eics,head,ivr,ivc) implicit none integer, intent(in) :: iout - class(psb_d_sparse_mat), intent(in) :: a + class(psb_dspmat_type), intent(in) :: a integer, intent(in), optional :: iv(:) integer, intent(in), optional :: eirs,eics character(len=*), optional :: head @@ -502,7 +502,7 @@ subroutine psb_d_get_neigh(a,idx,neigh,n,info,lev) use psb_d_mat_mod, psb_protect_name => psb_d_get_neigh use psb_error_mod implicit none - class(psb_d_sparse_mat), intent(in) :: a + class(psb_dspmat_type), intent(in) :: a integer, intent(in) :: idx integer, intent(out) :: n integer, allocatable, intent(out) :: neigh(:) @@ -546,7 +546,7 @@ subroutine psb_d_csall(nr,nc,a,info,nz) use psb_d_base_mat_mod use psb_error_mod implicit none - class(psb_d_sparse_mat), intent(out) :: a + class(psb_dspmat_type), intent(out) :: a integer, intent(in) :: nr,nc integer, intent(out) :: info integer, intent(in), optional :: nz @@ -585,7 +585,7 @@ subroutine psb_d_reallocate_nz(nz,a) use psb_error_mod implicit none integer, intent(in) :: nz - class(psb_d_sparse_mat), intent(inout) :: a + class(psb_dspmat_type), intent(inout) :: a Integer :: err_act, info character(len=20) :: name='reallocate_nz' logical, parameter :: debug=.false. @@ -617,7 +617,7 @@ subroutine psb_d_free(a) use psb_d_mat_mod, psb_protect_name => psb_d_free use psb_error_mod implicit none - class(psb_d_sparse_mat), intent(inout) :: a + class(psb_dspmat_type), intent(inout) :: a if (allocated(a%a)) then call a%a%free() @@ -631,7 +631,7 @@ subroutine psb_d_trim(a) use psb_d_mat_mod, psb_protect_name => psb_d_trim use psb_error_mod implicit none - class(psb_d_sparse_mat), intent(inout) :: a + class(psb_dspmat_type), intent(inout) :: a Integer :: err_act, info character(len=20) :: name='trim' logical, parameter :: debug=.false. @@ -664,7 +664,7 @@ subroutine psb_d_csput(nz,ia,ja,val,a,imin,imax,jmin,jmax,info,gtl) use psb_d_base_mat_mod use psb_error_mod implicit none - class(psb_d_sparse_mat), intent(inout) :: a + class(psb_dspmat_type), intent(inout) :: a real(psb_dpk_), intent(in) :: val(:) integer, intent(in) :: nz, ia(:), ja(:), imin,imax,jmin,jmax integer, intent(out) :: info @@ -709,7 +709,7 @@ subroutine psb_d_csgetptn(imin,imax,a,nz,ia,ja,info,& use psb_d_mat_mod, psb_protect_name => psb_d_csgetptn implicit none - class(psb_d_sparse_mat), intent(in) :: a + class(psb_dspmat_type), intent(in) :: a integer, intent(in) :: imin,imax integer, intent(out) :: nz integer, allocatable, intent(inout) :: ia(:), ja(:) @@ -759,7 +759,7 @@ subroutine psb_d_csgetrow(imin,imax,a,nz,ia,ja,val,info,& use psb_d_mat_mod, psb_protect_name => psb_d_csgetrow implicit none - class(psb_d_sparse_mat), intent(in) :: a + class(psb_dspmat_type), intent(in) :: a integer, intent(in) :: imin,imax integer, intent(out) :: nz integer, allocatable, intent(inout) :: ia(:), ja(:) @@ -812,8 +812,8 @@ subroutine psb_d_csgetblk(imin,imax,a,b,info,& use psb_d_mat_mod, psb_protect_name => psb_d_csgetblk implicit none - class(psb_d_sparse_mat), intent(in) :: a - class(psb_d_sparse_mat), intent(out) :: b + class(psb_dspmat_type), intent(in) :: a + class(psb_dspmat_type), intent(out) :: b integer, intent(in) :: imin,imax integer,intent(out) :: info logical, intent(in), optional :: append @@ -867,8 +867,8 @@ subroutine psb_d_csclip(a,b,info,& use psb_d_mat_mod, psb_protect_name => psb_d_csclip implicit none - class(psb_d_sparse_mat), intent(in) :: a - class(psb_d_sparse_mat), intent(out) :: b + class(psb_dspmat_type), intent(in) :: a + class(psb_dspmat_type), intent(out) :: b integer,intent(out) :: info integer, intent(in), optional :: imin,imax,jmin,jmax logical, intent(in), optional :: rscale,cscale @@ -915,7 +915,7 @@ subroutine psb_d_b_csclip(a,b,info,& use psb_d_mat_mod, psb_protect_name => psb_d_b_csclip implicit none - class(psb_d_sparse_mat), intent(in) :: a + class(psb_dspmat_type), intent(in) :: a type(psb_d_coo_sparse_mat), intent(out) :: b integer,intent(out) :: info integer, intent(in), optional :: imin,imax,jmin,jmax @@ -958,8 +958,8 @@ subroutine psb_d_cscnv(a,b,info,type,mold,upd,dupl) use psb_string_mod use psb_d_mat_mod, psb_protect_name => psb_d_cscnv implicit none - class(psb_d_sparse_mat), intent(in) :: a - class(psb_d_sparse_mat), intent(out) :: b + class(psb_dspmat_type), intent(in) :: a + class(psb_dspmat_type), intent(out) :: b integer, intent(out) :: info integer,optional, intent(in) :: dupl, upd character(len=*), optional, intent(in) :: type @@ -1060,7 +1060,7 @@ subroutine psb_d_cscnv_ip(a,info,type,mold,dupl) use psb_d_mat_mod, psb_protect_name => psb_d_cscnv_ip implicit none - class(psb_d_sparse_mat), intent(inout) :: a + class(psb_dspmat_type), intent(inout) :: a integer, intent(out) :: info integer,optional, intent(in) :: dupl character(len=*), optional, intent(in) :: type @@ -1159,7 +1159,7 @@ subroutine psb_d_cscnv_base(a,b,info,dupl) use psb_string_mod use psb_d_mat_mod, psb_protect_name => psb_d_cscnv_base implicit none - class(psb_d_sparse_mat), intent(in) :: a + class(psb_dspmat_type), intent(in) :: a class(psb_d_base_sparse_mat), intent(out) :: b integer, intent(out) :: info integer,optional, intent(in) :: dupl @@ -1217,8 +1217,8 @@ subroutine psb_d_clip_d(a,b,info) use psb_d_mat_mod, psb_protect_name => psb_d_clip_d implicit none - class(psb_d_sparse_mat), intent(in) :: a - class(psb_d_sparse_mat), intent(out) :: b + class(psb_dspmat_type), intent(in) :: a + class(psb_dspmat_type), intent(out) :: b integer,intent(out) :: info Integer :: err_act @@ -1280,7 +1280,7 @@ subroutine psb_d_clip_d_ip(a,info) use psb_d_mat_mod, psb_protect_name => psb_d_clip_d_ip implicit none - class(psb_d_sparse_mat), intent(inout) :: a + class(psb_dspmat_type), intent(inout) :: a integer,intent(out) :: info Integer :: err_act @@ -1338,7 +1338,7 @@ subroutine psb_d_mv_from(a,b) use psb_string_mod use psb_d_mat_mod, psb_protect_name => psb_d_mv_from implicit none - class(psb_d_sparse_mat), intent(out) :: a + class(psb_dspmat_type), intent(out) :: a class(psb_d_base_sparse_mat), intent(inout) :: b integer :: info @@ -1359,7 +1359,7 @@ subroutine psb_d_cp_from(a,b) use psb_string_mod use psb_d_mat_mod, psb_protect_name => psb_d_cp_from implicit none - class(psb_d_sparse_mat), intent(out) :: a + class(psb_dspmat_type), intent(out) :: a class(psb_d_base_sparse_mat), intent(inout), allocatable :: b Integer :: err_act, info character(len=20) :: name='clone' @@ -1395,7 +1395,7 @@ subroutine psb_d_mv_to(a,b) use psb_string_mod use psb_d_mat_mod, psb_protect_name => psb_d_mv_to implicit none - class(psb_d_sparse_mat), intent(inout) :: a + class(psb_dspmat_type), intent(inout) :: a class(psb_d_base_sparse_mat), intent(out) :: b integer :: info @@ -1410,7 +1410,7 @@ subroutine psb_d_cp_to(a,b) use psb_string_mod use psb_d_mat_mod, psb_protect_name => psb_d_cp_to implicit none - class(psb_d_sparse_mat), intent(in) :: a + class(psb_dspmat_type), intent(in) :: a class(psb_d_base_sparse_mat), intent(out) :: b integer :: info @@ -1421,13 +1421,13 @@ end subroutine psb_d_cp_to -subroutine psb_d_sparse_mat_move(a,b,info) +subroutine psb_dspmat_type_move(a,b,info) use psb_error_mod use psb_string_mod - use psb_d_mat_mod, psb_protect_name => psb_d_sparse_mat_move + use psb_d_mat_mod, psb_protect_name => psb_dspmat_type_move implicit none - class(psb_d_sparse_mat), intent(inout) :: a - class(psb_d_sparse_mat), intent(out) :: b + class(psb_dspmat_type), intent(inout) :: a + class(psb_dspmat_type), intent(out) :: b integer, intent(out) :: info Integer :: err_act @@ -1438,16 +1438,16 @@ subroutine psb_d_sparse_mat_move(a,b,info) call move_alloc(a%a,b%a) return -end subroutine psb_d_sparse_mat_move +end subroutine psb_dspmat_type_move -subroutine psb_d_sparse_mat_clone(a,b,info) +subroutine psb_dspmat_type_clone(a,b,info) use psb_error_mod use psb_string_mod - use psb_d_mat_mod, psb_protect_name => psb_d_sparse_mat_clone + use psb_d_mat_mod, psb_protect_name => psb_dspmat_type_clone implicit none - class(psb_d_sparse_mat), intent(in) :: a - class(psb_d_sparse_mat), intent(out) :: b + class(psb_dspmat_type), intent(in) :: a + class(psb_dspmat_type), intent(out) :: b integer, intent(out) :: info Integer :: err_act @@ -1477,7 +1477,7 @@ subroutine psb_d_sparse_mat_clone(a,b,info) return end if -end subroutine psb_d_sparse_mat_clone +end subroutine psb_dspmat_type_clone @@ -1486,7 +1486,7 @@ subroutine psb_d_transp_1mat(a) use psb_string_mod use psb_d_mat_mod, psb_protect_name => psb_d_transp_1mat implicit none - class(psb_d_sparse_mat), intent(inout) :: a + class(psb_dspmat_type), intent(inout) :: a Integer :: err_act, info character(len=20) :: name='transp' @@ -1522,8 +1522,8 @@ subroutine psb_d_transp_2mat(a,b) use psb_string_mod use psb_d_mat_mod, psb_protect_name => psb_d_transp_2mat implicit none - class(psb_d_sparse_mat), intent(out) :: a - class(psb_d_sparse_mat), intent(in) :: b + class(psb_dspmat_type), intent(out) :: a + class(psb_dspmat_type), intent(in) :: b Integer :: err_act, info character(len=20) :: name='transp' @@ -1567,7 +1567,7 @@ subroutine psb_d_transc_1mat(a) use psb_string_mod use psb_d_mat_mod, psb_protect_name => psb_d_transc_1mat implicit none - class(psb_d_sparse_mat), intent(inout) :: a + class(psb_dspmat_type), intent(inout) :: a Integer :: err_act, info character(len=20) :: name='transc' @@ -1603,8 +1603,8 @@ subroutine psb_d_transc_2mat(a,b) use psb_string_mod use psb_d_mat_mod, psb_protect_name => psb_d_transc_2mat implicit none - class(psb_d_sparse_mat), intent(out) :: a - class(psb_d_sparse_mat), intent(in) :: b + class(psb_dspmat_type), intent(out) :: a + class(psb_dspmat_type), intent(in) :: b Integer :: err_act, info character(len=20) :: name='transc' @@ -1650,7 +1650,7 @@ subroutine psb_d_reinit(a,clear) use psb_error_mod implicit none - class(psb_d_sparse_mat), intent(inout) :: a + class(psb_dspmat_type), intent(inout) :: a logical, intent(in), optional :: clear Integer :: err_act, info character(len=20) :: name='reinit' @@ -1698,7 +1698,7 @@ subroutine psb_d_csmm(alpha,a,x,beta,y,info,trans) use psb_error_mod use psb_d_mat_mod, psb_protect_name => psb_d_csmm implicit none - class(psb_d_sparse_mat), intent(in) :: a + class(psb_dspmat_type), intent(in) :: a real(psb_dpk_), intent(in) :: alpha, beta, x(:,:) real(psb_dpk_), intent(inout) :: y(:,:) integer, intent(out) :: info @@ -1736,7 +1736,7 @@ subroutine psb_d_csmv(alpha,a,x,beta,y,info,trans) use psb_error_mod use psb_d_mat_mod, psb_protect_name => psb_d_csmv implicit none - class(psb_d_sparse_mat), intent(in) :: a + class(psb_dspmat_type), intent(in) :: a real(psb_dpk_), intent(in) :: alpha, beta, x(:) real(psb_dpk_), intent(inout) :: y(:) integer, intent(out) :: info @@ -1774,7 +1774,7 @@ subroutine psb_d_cssm(alpha,a,x,beta,y,info,trans,scale,d) use psb_error_mod use psb_d_mat_mod, psb_protect_name => psb_d_cssm implicit none - class(psb_d_sparse_mat), intent(in) :: a + class(psb_dspmat_type), intent(in) :: a real(psb_dpk_), intent(in) :: alpha, beta, x(:,:) real(psb_dpk_), intent(inout) :: y(:,:) integer, intent(out) :: info @@ -1814,7 +1814,7 @@ subroutine psb_d_cssv(alpha,a,x,beta,y,info,trans,scale,d) use psb_error_mod use psb_d_mat_mod, psb_protect_name => psb_d_cssv implicit none - class(psb_d_sparse_mat), intent(in) :: a + class(psb_dspmat_type), intent(in) :: a real(psb_dpk_), intent(in) :: alpha, beta, x(:) real(psb_dpk_), intent(inout) :: y(:) integer, intent(out) :: info @@ -1857,7 +1857,7 @@ function psb_d_csnmi(a) result(res) use psb_error_mod use psb_const_mod implicit none - class(psb_d_sparse_mat), intent(in) :: a + class(psb_dspmat_type), intent(in) :: a real(psb_dpk_) :: res Integer :: err_act, info @@ -1890,7 +1890,7 @@ function psb_d_csnm1(a) result(res) use psb_error_mod use psb_const_mod implicit none - class(psb_d_sparse_mat), intent(in) :: a + class(psb_dspmat_type), intent(in) :: a real(psb_dpk_) :: res Integer :: err_act, info @@ -1923,7 +1923,7 @@ subroutine psb_d_rowsum(d,a,info) use psb_error_mod use psb_const_mod implicit none - class(psb_d_sparse_mat), intent(in) :: a + class(psb_dspmat_type), intent(in) :: a real(psb_dpk_), intent(out) :: d(:) integer, intent(out) :: info @@ -1960,7 +1960,7 @@ subroutine psb_d_arwsum(d,a,info) use psb_error_mod use psb_const_mod implicit none - class(psb_d_sparse_mat), intent(in) :: a + class(psb_dspmat_type), intent(in) :: a real(psb_dpk_), intent(out) :: d(:) integer, intent(out) :: info @@ -1997,7 +1997,7 @@ subroutine psb_d_colsum(d,a,info) use psb_error_mod use psb_const_mod implicit none - class(psb_d_sparse_mat), intent(in) :: a + class(psb_dspmat_type), intent(in) :: a real(psb_dpk_), intent(out) :: d(:) integer, intent(out) :: info @@ -2034,7 +2034,7 @@ subroutine psb_d_aclsum(d,a,info) use psb_error_mod use psb_const_mod implicit none - class(psb_d_sparse_mat), intent(in) :: a + class(psb_dspmat_type), intent(in) :: a real(psb_dpk_), intent(out) :: d(:) integer, intent(out) :: info @@ -2071,7 +2071,7 @@ subroutine psb_d_get_diag(a,d,info) use psb_error_mod use psb_const_mod implicit none - class(psb_d_sparse_mat), intent(in) :: a + class(psb_dspmat_type), intent(in) :: a real(psb_dpk_), intent(out) :: d(:) integer, intent(out) :: info @@ -2109,7 +2109,7 @@ subroutine psb_d_scal(d,a,info) use psb_const_mod use psb_d_mat_mod, psb_protect_name => psb_d_scal implicit none - class(psb_d_sparse_mat), intent(inout) :: a + class(psb_dspmat_type), intent(inout) :: a real(psb_dpk_), intent(in) :: d(:) integer, intent(out) :: info @@ -2147,7 +2147,7 @@ subroutine psb_d_scals(d,a,info) use psb_const_mod use psb_d_mat_mod, psb_protect_name => psb_d_scals implicit none - class(psb_d_sparse_mat), intent(inout) :: a + class(psb_dspmat_type), intent(inout) :: a real(psb_dpk_), intent(in) :: d integer, intent(out) :: info diff --git a/base/serial/f03/psb_s_mat_impl.F03 b/base/serial/f03/psb_s_mat_impl.F03 index 20d66e14..1cc31802 100644 --- a/base/serial/f03/psb_s_mat_impl.F03 +++ b/base/serial/f03/psb_s_mat_impl.F03 @@ -16,7 +16,7 @@ subroutine psb_s_set_nrows(m,a) use psb_s_mat_mod, psb_protect_name => psb_s_set_nrows use psb_error_mod implicit none - class(psb_s_sparse_mat), intent(inout) :: a + class(psb_sspmat_type), intent(inout) :: a integer, intent(in) :: m Integer :: err_act, info character(len=20) :: name='set_nrows' @@ -50,7 +50,7 @@ subroutine psb_s_set_ncols(n,a) use psb_s_mat_mod, psb_protect_name => psb_s_set_ncols use psb_error_mod implicit none - class(psb_s_sparse_mat), intent(inout) :: a + class(psb_sspmat_type), intent(inout) :: a integer, intent(in) :: n Integer :: err_act, info character(len=20) :: name='get_nzeros' @@ -84,7 +84,7 @@ subroutine psb_s_set_state(n,a) use psb_s_mat_mod, psb_protect_name => psb_s_set_state use psb_error_mod implicit none - class(psb_s_sparse_mat), intent(inout) :: a + class(psb_sspmat_type), intent(inout) :: a integer, intent(in) :: n Integer :: err_act, info character(len=20) :: name='get_nzeros' @@ -118,7 +118,7 @@ subroutine psb_s_set_dupl(n,a) use psb_s_mat_mod, psb_protect_name => psb_s_set_dupl use psb_error_mod implicit none - class(psb_s_sparse_mat), intent(inout) :: a + class(psb_sspmat_type), intent(inout) :: a integer, intent(in) :: n Integer :: err_act, info character(len=20) :: name='get_nzeros' @@ -152,7 +152,7 @@ subroutine psb_s_set_null(a) use psb_s_mat_mod, psb_protect_name => psb_s_set_null use psb_error_mod implicit none - class(psb_s_sparse_mat), intent(inout) :: a + class(psb_sspmat_type), intent(inout) :: a Integer :: err_act, info character(len=20) :: name='get_nzeros' logical, parameter :: debug=.false. @@ -185,7 +185,7 @@ subroutine psb_s_set_bld(a) use psb_s_mat_mod, psb_protect_name => psb_s_set_bld use psb_error_mod implicit none - class(psb_s_sparse_mat), intent(inout) :: a + class(psb_sspmat_type), intent(inout) :: a Integer :: err_act, info character(len=20) :: name='get_nzeros' logical, parameter :: debug=.false. @@ -217,7 +217,7 @@ subroutine psb_s_set_upd(a) use psb_s_mat_mod, psb_protect_name => psb_s_set_upd use psb_error_mod implicit none - class(psb_s_sparse_mat), intent(inout) :: a + class(psb_sspmat_type), intent(inout) :: a Integer :: err_act, info character(len=20) :: name='get_nzeros' logical, parameter :: debug=.false. @@ -250,7 +250,7 @@ subroutine psb_s_set_asb(a) use psb_s_mat_mod, psb_protect_name => psb_s_set_asb use psb_error_mod implicit none - class(psb_s_sparse_mat), intent(inout) :: a + class(psb_sspmat_type), intent(inout) :: a Integer :: err_act, info character(len=20) :: name='get_nzeros' logical, parameter :: debug=.false. @@ -282,7 +282,7 @@ subroutine psb_s_set_sorted(a,val) use psb_s_mat_mod, psb_protect_name => psb_s_set_sorted use psb_error_mod implicit none - class(psb_s_sparse_mat), intent(inout) :: a + class(psb_sspmat_type), intent(inout) :: a logical, intent(in), optional :: val Integer :: err_act, info character(len=20) :: name='get_nzeros' @@ -315,7 +315,7 @@ subroutine psb_s_set_triangle(a,val) use psb_s_mat_mod, psb_protect_name => psb_s_set_triangle use psb_error_mod implicit none - class(psb_s_sparse_mat), intent(inout) :: a + class(psb_sspmat_type), intent(inout) :: a logical, intent(in), optional :: val Integer :: err_act, info character(len=20) :: name='get_nzeros' @@ -348,7 +348,7 @@ subroutine psb_s_set_unit(a,val) use psb_s_mat_mod, psb_protect_name => psb_s_set_unit use psb_error_mod implicit none - class(psb_s_sparse_mat), intent(inout) :: a + class(psb_sspmat_type), intent(inout) :: a logical, intent(in), optional :: val Integer :: err_act, info character(len=20) :: name='get_nzeros' @@ -381,7 +381,7 @@ subroutine psb_s_set_lower(a,val) use psb_s_mat_mod, psb_protect_name => psb_s_set_lower use psb_error_mod implicit none - class(psb_s_sparse_mat), intent(inout) :: a + class(psb_sspmat_type), intent(inout) :: a logical, intent(in), optional :: val Integer :: err_act, info character(len=20) :: name='get_nzeros' @@ -414,7 +414,7 @@ subroutine psb_s_set_upper(a,val) use psb_s_mat_mod, psb_protect_name => psb_s_set_upper use psb_error_mod implicit none - class(psb_s_sparse_mat), intent(inout) :: a + class(psb_sspmat_type), intent(inout) :: a logical, intent(in), optional :: val Integer :: err_act, info character(len=20) :: name='get_nzeros' @@ -463,7 +463,7 @@ subroutine psb_s_sparse_print(iout,a,iv,eirs,eics,head,ivr,ivc) implicit none integer, intent(in) :: iout - class(psb_s_sparse_mat), intent(in) :: a + class(psb_sspmat_type), intent(in) :: a integer, intent(in), optional :: iv(:) integer, intent(in), optional :: eirs,eics character(len=*), optional :: head @@ -502,7 +502,7 @@ subroutine psb_s_get_neigh(a,idx,neigh,n,info,lev) use psb_s_mat_mod, psb_protect_name => psb_s_get_neigh use psb_error_mod implicit none - class(psb_s_sparse_mat), intent(in) :: a + class(psb_sspmat_type), intent(in) :: a integer, intent(in) :: idx integer, intent(out) :: n integer, allocatable, intent(out) :: neigh(:) @@ -546,7 +546,7 @@ subroutine psb_s_csall(nr,nc,a,info,nz) use psb_s_base_mat_mod use psb_error_mod implicit none - class(psb_s_sparse_mat), intent(out) :: a + class(psb_sspmat_type), intent(out) :: a integer, intent(in) :: nr,nc integer, intent(out) :: info integer, intent(in), optional :: nz @@ -585,7 +585,7 @@ subroutine psb_s_reallocate_nz(nz,a) use psb_error_mod implicit none integer, intent(in) :: nz - class(psb_s_sparse_mat), intent(inout) :: a + class(psb_sspmat_type), intent(inout) :: a Integer :: err_act, info character(len=20) :: name='reallocate_nz' logical, parameter :: debug=.false. @@ -617,7 +617,7 @@ subroutine psb_s_free(a) use psb_s_mat_mod, psb_protect_name => psb_s_free use psb_error_mod implicit none - class(psb_s_sparse_mat), intent(inout) :: a + class(psb_sspmat_type), intent(inout) :: a if (allocated(a%a)) then call a%a%free() @@ -631,7 +631,7 @@ subroutine psb_s_trim(a) use psb_s_mat_mod, psb_protect_name => psb_s_trim use psb_error_mod implicit none - class(psb_s_sparse_mat), intent(inout) :: a + class(psb_sspmat_type), intent(inout) :: a Integer :: err_act, info character(len=20) :: name='trim' logical, parameter :: debug=.false. @@ -664,7 +664,7 @@ subroutine psb_s_csput(nz,ia,ja,val,a,imin,imax,jmin,jmax,info,gtl) use psb_s_base_mat_mod use psb_error_mod implicit none - class(psb_s_sparse_mat), intent(inout) :: a + class(psb_sspmat_type), intent(inout) :: a real(psb_spk_), intent(in) :: val(:) integer, intent(in) :: nz, ia(:), ja(:), imin,imax,jmin,jmax integer, intent(out) :: info @@ -709,7 +709,7 @@ subroutine psb_s_csgetptn(imin,imax,a,nz,ia,ja,info,& use psb_s_mat_mod, psb_protect_name => psb_s_csgetptn implicit none - class(psb_s_sparse_mat), intent(in) :: a + class(psb_sspmat_type), intent(in) :: a integer, intent(in) :: imin,imax integer, intent(out) :: nz integer, allocatable, intent(inout) :: ia(:), ja(:) @@ -759,7 +759,7 @@ subroutine psb_s_csgetrow(imin,imax,a,nz,ia,ja,val,info,& use psb_s_mat_mod, psb_protect_name => psb_s_csgetrow implicit none - class(psb_s_sparse_mat), intent(in) :: a + class(psb_sspmat_type), intent(in) :: a integer, intent(in) :: imin,imax integer, intent(out) :: nz integer, allocatable, intent(inout) :: ia(:), ja(:) @@ -812,8 +812,8 @@ subroutine psb_s_csgetblk(imin,imax,a,b,info,& use psb_s_mat_mod, psb_protect_name => psb_s_csgetblk implicit none - class(psb_s_sparse_mat), intent(in) :: a - class(psb_s_sparse_mat), intent(out) :: b + class(psb_sspmat_type), intent(in) :: a + class(psb_sspmat_type), intent(out) :: b integer, intent(in) :: imin,imax integer,intent(out) :: info logical, intent(in), optional :: append @@ -867,8 +867,8 @@ subroutine psb_s_csclip(a,b,info,& use psb_s_mat_mod, psb_protect_name => psb_s_csclip implicit none - class(psb_s_sparse_mat), intent(in) :: a - class(psb_s_sparse_mat), intent(out) :: b + class(psb_sspmat_type), intent(in) :: a + class(psb_sspmat_type), intent(out) :: b integer,intent(out) :: info integer, intent(in), optional :: imin,imax,jmin,jmax logical, intent(in), optional :: rscale,cscale @@ -915,7 +915,7 @@ subroutine psb_s_b_csclip(a,b,info,& use psb_s_mat_mod, psb_protect_name => psb_s_b_csclip implicit none - class(psb_s_sparse_mat), intent(in) :: a + class(psb_sspmat_type), intent(in) :: a type(psb_s_coo_sparse_mat), intent(out) :: b integer,intent(out) :: info integer, intent(in), optional :: imin,imax,jmin,jmax @@ -958,8 +958,8 @@ subroutine psb_s_cscnv(a,b,info,type,mold,upd,dupl) use psb_string_mod use psb_s_mat_mod, psb_protect_name => psb_s_cscnv implicit none - class(psb_s_sparse_mat), intent(in) :: a - class(psb_s_sparse_mat), intent(out) :: b + class(psb_sspmat_type), intent(in) :: a + class(psb_sspmat_type), intent(out) :: b integer, intent(out) :: info integer,optional, intent(in) :: dupl, upd character(len=*), optional, intent(in) :: type @@ -1060,7 +1060,7 @@ subroutine psb_s_cscnv_ip(a,info,type,mold,dupl) use psb_s_mat_mod, psb_protect_name => psb_s_cscnv_ip implicit none - class(psb_s_sparse_mat), intent(inout) :: a + class(psb_sspmat_type), intent(inout) :: a integer, intent(out) :: info integer,optional, intent(in) :: dupl character(len=*), optional, intent(in) :: type @@ -1159,7 +1159,7 @@ subroutine psb_s_cscnv_base(a,b,info,dupl) use psb_string_mod use psb_s_mat_mod, psb_protect_name => psb_s_cscnv_base implicit none - class(psb_s_sparse_mat), intent(in) :: a + class(psb_sspmat_type), intent(in) :: a class(psb_s_base_sparse_mat), intent(out) :: b integer, intent(out) :: info integer,optional, intent(in) :: dupl @@ -1217,8 +1217,8 @@ subroutine psb_s_clip_d(a,b,info) use psb_s_mat_mod, psb_protect_name => psb_s_clip_d implicit none - class(psb_s_sparse_mat), intent(in) :: a - class(psb_s_sparse_mat), intent(out) :: b + class(psb_sspmat_type), intent(in) :: a + class(psb_sspmat_type), intent(out) :: b integer,intent(out) :: info Integer :: err_act @@ -1280,7 +1280,7 @@ subroutine psb_s_clip_d_ip(a,info) use psb_s_mat_mod, psb_protect_name => psb_s_clip_d_ip implicit none - class(psb_s_sparse_mat), intent(inout) :: a + class(psb_sspmat_type), intent(inout) :: a integer,intent(out) :: info Integer :: err_act @@ -1338,7 +1338,7 @@ subroutine psb_s_mv_from(a,b) use psb_string_mod use psb_s_mat_mod, psb_protect_name => psb_s_mv_from implicit none - class(psb_s_sparse_mat), intent(out) :: a + class(psb_sspmat_type), intent(out) :: a class(psb_s_base_sparse_mat), intent(inout) :: b integer :: info @@ -1359,7 +1359,7 @@ subroutine psb_s_cp_from(a,b) use psb_string_mod use psb_s_mat_mod, psb_protect_name => psb_s_cp_from implicit none - class(psb_s_sparse_mat), intent(out) :: a + class(psb_sspmat_type), intent(out) :: a class(psb_s_base_sparse_mat), intent(inout), allocatable :: b Integer :: err_act, info character(len=20) :: name='clone' @@ -1395,7 +1395,7 @@ subroutine psb_s_mv_to(a,b) use psb_string_mod use psb_s_mat_mod, psb_protect_name => psb_s_mv_to implicit none - class(psb_s_sparse_mat), intent(inout) :: a + class(psb_sspmat_type), intent(inout) :: a class(psb_s_base_sparse_mat), intent(out) :: b integer :: info @@ -1410,7 +1410,7 @@ subroutine psb_s_cp_to(a,b) use psb_string_mod use psb_s_mat_mod, psb_protect_name => psb_s_cp_to implicit none - class(psb_s_sparse_mat), intent(in) :: a + class(psb_sspmat_type), intent(in) :: a class(psb_s_base_sparse_mat), intent(out) :: b integer :: info @@ -1421,13 +1421,13 @@ end subroutine psb_s_cp_to -subroutine psb_s_sparse_mat_move(a,b,info) +subroutine psb_sspmat_type_move(a,b,info) use psb_error_mod use psb_string_mod - use psb_s_mat_mod, psb_protect_name => psb_s_sparse_mat_move + use psb_s_mat_mod, psb_protect_name => psb_sspmat_type_move implicit none - class(psb_s_sparse_mat), intent(inout) :: a - class(psb_s_sparse_mat), intent(out) :: b + class(psb_sspmat_type), intent(inout) :: a + class(psb_sspmat_type), intent(out) :: b integer, intent(out) :: info Integer :: err_act @@ -1438,16 +1438,16 @@ subroutine psb_s_sparse_mat_move(a,b,info) call move_alloc(a%a,b%a) return -end subroutine psb_s_sparse_mat_move +end subroutine psb_sspmat_type_move -subroutine psb_s_sparse_mat_clone(a,b,info) +subroutine psb_sspmat_type_clone(a,b,info) use psb_error_mod use psb_string_mod - use psb_s_mat_mod, psb_protect_name => psb_s_sparse_mat_clone + use psb_s_mat_mod, psb_protect_name => psb_sspmat_type_clone implicit none - class(psb_s_sparse_mat), intent(in) :: a - class(psb_s_sparse_mat), intent(out) :: b + class(psb_sspmat_type), intent(in) :: a + class(psb_sspmat_type), intent(out) :: b integer, intent(out) :: info Integer :: err_act @@ -1478,7 +1478,7 @@ subroutine psb_s_sparse_mat_clone(a,b,info) return end if -end subroutine psb_s_sparse_mat_clone +end subroutine psb_sspmat_type_clone @@ -1487,7 +1487,7 @@ subroutine psb_s_transp_1mat(a) use psb_string_mod use psb_s_mat_mod, psb_protect_name => psb_s_transp_1mat implicit none - class(psb_s_sparse_mat), intent(inout) :: a + class(psb_sspmat_type), intent(inout) :: a Integer :: err_act, info character(len=20) :: name='transp' @@ -1523,8 +1523,8 @@ subroutine psb_s_transp_2mat(a,b) use psb_string_mod use psb_s_mat_mod, psb_protect_name => psb_s_transp_2mat implicit none - class(psb_s_sparse_mat), intent(out) :: a - class(psb_s_sparse_mat), intent(in) :: b + class(psb_sspmat_type), intent(out) :: a + class(psb_sspmat_type), intent(in) :: b Integer :: err_act, info character(len=20) :: name='transp' @@ -1568,7 +1568,7 @@ subroutine psb_s_transc_1mat(a) use psb_string_mod use psb_s_mat_mod, psb_protect_name => psb_s_transc_1mat implicit none - class(psb_s_sparse_mat), intent(inout) :: a + class(psb_sspmat_type), intent(inout) :: a Integer :: err_act, info character(len=20) :: name='transc' @@ -1604,8 +1604,8 @@ subroutine psb_s_transc_2mat(a,b) use psb_string_mod use psb_s_mat_mod, psb_protect_name => psb_s_transc_2mat implicit none - class(psb_s_sparse_mat), intent(out) :: a - class(psb_s_sparse_mat), intent(in) :: b + class(psb_sspmat_type), intent(out) :: a + class(psb_sspmat_type), intent(in) :: b Integer :: err_act, info character(len=20) :: name='transc' @@ -1651,7 +1651,7 @@ subroutine psb_s_reinit(a,clear) use psb_error_mod implicit none - class(psb_s_sparse_mat), intent(inout) :: a + class(psb_sspmat_type), intent(inout) :: a logical, intent(in), optional :: clear Integer :: err_act, info character(len=20) :: name='reinit' @@ -1699,7 +1699,7 @@ subroutine psb_s_csmm(alpha,a,x,beta,y,info,trans) use psb_error_mod use psb_s_mat_mod, psb_protect_name => psb_s_csmm implicit none - class(psb_s_sparse_mat), intent(in) :: a + class(psb_sspmat_type), intent(in) :: a real(psb_spk_), intent(in) :: alpha, beta, x(:,:) real(psb_spk_), intent(inout) :: y(:,:) integer, intent(out) :: info @@ -1737,7 +1737,7 @@ subroutine psb_s_csmv(alpha,a,x,beta,y,info,trans) use psb_error_mod use psb_s_mat_mod, psb_protect_name => psb_s_csmv implicit none - class(psb_s_sparse_mat), intent(in) :: a + class(psb_sspmat_type), intent(in) :: a real(psb_spk_), intent(in) :: alpha, beta, x(:) real(psb_spk_), intent(inout) :: y(:) integer, intent(out) :: info @@ -1775,7 +1775,7 @@ subroutine psb_s_cssm(alpha,a,x,beta,y,info,trans,scale,d) use psb_error_mod use psb_s_mat_mod, psb_protect_name => psb_s_cssm implicit none - class(psb_s_sparse_mat), intent(in) :: a + class(psb_sspmat_type), intent(in) :: a real(psb_spk_), intent(in) :: alpha, beta, x(:,:) real(psb_spk_), intent(inout) :: y(:,:) integer, intent(out) :: info @@ -1815,7 +1815,7 @@ subroutine psb_s_cssv(alpha,a,x,beta,y,info,trans,scale,d) use psb_error_mod use psb_s_mat_mod, psb_protect_name => psb_s_cssv implicit none - class(psb_s_sparse_mat), intent(in) :: a + class(psb_sspmat_type), intent(in) :: a real(psb_spk_), intent(in) :: alpha, beta, x(:) real(psb_spk_), intent(inout) :: y(:) integer, intent(out) :: info @@ -1858,7 +1858,7 @@ function psb_s_csnmi(a) result(res) use psb_error_mod use psb_const_mod implicit none - class(psb_s_sparse_mat), intent(in) :: a + class(psb_sspmat_type), intent(in) :: a real(psb_spk_) :: res Integer :: err_act, info @@ -1891,7 +1891,7 @@ subroutine psb_s_get_diag(a,d,info) use psb_error_mod use psb_const_mod implicit none - class(psb_s_sparse_mat), intent(in) :: a + class(psb_sspmat_type), intent(in) :: a real(psb_spk_), intent(out) :: d(:) integer, intent(out) :: info @@ -1929,7 +1929,7 @@ subroutine psb_s_scal(d,a,info) use psb_const_mod use psb_s_mat_mod, psb_protect_name => psb_s_scal implicit none - class(psb_s_sparse_mat), intent(inout) :: a + class(psb_sspmat_type), intent(inout) :: a real(psb_spk_), intent(in) :: d(:) integer, intent(out) :: info @@ -1967,7 +1967,7 @@ subroutine psb_s_scals(d,a,info) use psb_const_mod use psb_s_mat_mod, psb_protect_name => psb_s_scals implicit none - class(psb_s_sparse_mat), intent(inout) :: a + class(psb_sspmat_type), intent(inout) :: a real(psb_spk_), intent(in) :: d integer, intent(out) :: info diff --git a/base/serial/f03/psb_z_mat_impl.F03 b/base/serial/f03/psb_z_mat_impl.F03 index 9089f361..7873074d 100644 --- a/base/serial/f03/psb_z_mat_impl.F03 +++ b/base/serial/f03/psb_z_mat_impl.F03 @@ -16,7 +16,7 @@ subroutine psb_z_set_nrows(m,a) use psb_z_mat_mod, psb_protect_name => psb_z_set_nrows use psb_error_mod implicit none - class(psb_z_sparse_mat), intent(inout) :: a + class(psb_zspmat_type), intent(inout) :: a integer, intent(in) :: m Integer :: err_act, info character(len=20) :: name='set_nrows' @@ -50,7 +50,7 @@ subroutine psb_z_set_ncols(n,a) use psb_z_mat_mod, psb_protect_name => psb_z_set_ncols use psb_error_mod implicit none - class(psb_z_sparse_mat), intent(inout) :: a + class(psb_zspmat_type), intent(inout) :: a integer, intent(in) :: n Integer :: err_act, info character(len=20) :: name='get_nzeros' @@ -84,7 +84,7 @@ subroutine psb_z_set_state(n,a) use psb_z_mat_mod, psb_protect_name => psb_z_set_state use psb_error_mod implicit none - class(psb_z_sparse_mat), intent(inout) :: a + class(psb_zspmat_type), intent(inout) :: a integer, intent(in) :: n Integer :: err_act, info character(len=20) :: name='get_nzeros' @@ -118,7 +118,7 @@ subroutine psb_z_set_dupl(n,a) use psb_z_mat_mod, psb_protect_name => psb_z_set_dupl use psb_error_mod implicit none - class(psb_z_sparse_mat), intent(inout) :: a + class(psb_zspmat_type), intent(inout) :: a integer, intent(in) :: n Integer :: err_act, info character(len=20) :: name='get_nzeros' @@ -152,7 +152,7 @@ subroutine psb_z_set_null(a) use psb_z_mat_mod, psb_protect_name => psb_z_set_null use psb_error_mod implicit none - class(psb_z_sparse_mat), intent(inout) :: a + class(psb_zspmat_type), intent(inout) :: a Integer :: err_act, info character(len=20) :: name='get_nzeros' logical, parameter :: debug=.false. @@ -185,7 +185,7 @@ subroutine psb_z_set_bld(a) use psb_z_mat_mod, psb_protect_name => psb_z_set_bld use psb_error_mod implicit none - class(psb_z_sparse_mat), intent(inout) :: a + class(psb_zspmat_type), intent(inout) :: a Integer :: err_act, info character(len=20) :: name='get_nzeros' logical, parameter :: debug=.false. @@ -217,7 +217,7 @@ subroutine psb_z_set_upd(a) use psb_z_mat_mod, psb_protect_name => psb_z_set_upd use psb_error_mod implicit none - class(psb_z_sparse_mat), intent(inout) :: a + class(psb_zspmat_type), intent(inout) :: a Integer :: err_act, info character(len=20) :: name='get_nzeros' logical, parameter :: debug=.false. @@ -250,7 +250,7 @@ subroutine psb_z_set_asb(a) use psb_z_mat_mod, psb_protect_name => psb_z_set_asb use psb_error_mod implicit none - class(psb_z_sparse_mat), intent(inout) :: a + class(psb_zspmat_type), intent(inout) :: a Integer :: err_act, info character(len=20) :: name='get_nzeros' logical, parameter :: debug=.false. @@ -282,7 +282,7 @@ subroutine psb_z_set_sorted(a,val) use psb_z_mat_mod, psb_protect_name => psb_z_set_sorted use psb_error_mod implicit none - class(psb_z_sparse_mat), intent(inout) :: a + class(psb_zspmat_type), intent(inout) :: a logical, intent(in), optional :: val Integer :: err_act, info character(len=20) :: name='get_nzeros' @@ -315,7 +315,7 @@ subroutine psb_z_set_triangle(a,val) use psb_z_mat_mod, psb_protect_name => psb_z_set_triangle use psb_error_mod implicit none - class(psb_z_sparse_mat), intent(inout) :: a + class(psb_zspmat_type), intent(inout) :: a logical, intent(in), optional :: val Integer :: err_act, info character(len=20) :: name='get_nzeros' @@ -348,7 +348,7 @@ subroutine psb_z_set_unit(a,val) use psb_z_mat_mod, psb_protect_name => psb_z_set_unit use psb_error_mod implicit none - class(psb_z_sparse_mat), intent(inout) :: a + class(psb_zspmat_type), intent(inout) :: a logical, intent(in), optional :: val Integer :: err_act, info character(len=20) :: name='get_nzeros' @@ -381,7 +381,7 @@ subroutine psb_z_set_lower(a,val) use psb_z_mat_mod, psb_protect_name => psb_z_set_lower use psb_error_mod implicit none - class(psb_z_sparse_mat), intent(inout) :: a + class(psb_zspmat_type), intent(inout) :: a logical, intent(in), optional :: val Integer :: err_act, info character(len=20) :: name='get_nzeros' @@ -414,7 +414,7 @@ subroutine psb_z_set_upper(a,val) use psb_z_mat_mod, psb_protect_name => psb_z_set_upper use psb_error_mod implicit none - class(psb_z_sparse_mat), intent(inout) :: a + class(psb_zspmat_type), intent(inout) :: a logical, intent(in), optional :: val Integer :: err_act, info character(len=20) :: name='get_nzeros' @@ -463,7 +463,7 @@ subroutine psb_z_sparse_print(iout,a,iv,eirs,eics,head,ivr,ivc) implicit none integer, intent(in) :: iout - class(psb_z_sparse_mat), intent(in) :: a + class(psb_zspmat_type), intent(in) :: a integer, intent(in), optional :: iv(:) integer, intent(in), optional :: eirs,eics character(len=*), optional :: head @@ -502,7 +502,7 @@ subroutine psb_z_get_neigh(a,idx,neigh,n,info,lev) use psb_z_mat_mod, psb_protect_name => psb_z_get_neigh use psb_error_mod implicit none - class(psb_z_sparse_mat), intent(in) :: a + class(psb_zspmat_type), intent(in) :: a integer, intent(in) :: idx integer, intent(out) :: n integer, allocatable, intent(out) :: neigh(:) @@ -546,7 +546,7 @@ subroutine psb_z_csall(nr,nc,a,info,nz) use psb_z_base_mat_mod use psb_error_mod implicit none - class(psb_z_sparse_mat), intent(out) :: a + class(psb_zspmat_type), intent(out) :: a integer, intent(in) :: nr,nc integer, intent(out) :: info integer, intent(in), optional :: nz @@ -585,7 +585,7 @@ subroutine psb_z_reallocate_nz(nz,a) use psb_error_mod implicit none integer, intent(in) :: nz - class(psb_z_sparse_mat), intent(inout) :: a + class(psb_zspmat_type), intent(inout) :: a Integer :: err_act, info character(len=20) :: name='reallocate_nz' logical, parameter :: debug=.false. @@ -617,7 +617,7 @@ subroutine psb_z_free(a) use psb_z_mat_mod, psb_protect_name => psb_z_free use psb_error_mod implicit none - class(psb_z_sparse_mat), intent(inout) :: a + class(psb_zspmat_type), intent(inout) :: a if (allocated(a%a)) then call a%a%free() @@ -631,7 +631,7 @@ subroutine psb_z_trim(a) use psb_z_mat_mod, psb_protect_name => psb_z_trim use psb_error_mod implicit none - class(psb_z_sparse_mat), intent(inout) :: a + class(psb_zspmat_type), intent(inout) :: a Integer :: err_act, info character(len=20) :: name='trim' logical, parameter :: debug=.false. @@ -664,7 +664,7 @@ subroutine psb_z_csput(nz,ia,ja,val,a,imin,imax,jmin,jmax,info,gtl) use psb_z_base_mat_mod use psb_error_mod implicit none - class(psb_z_sparse_mat), intent(inout) :: a + class(psb_zspmat_type), intent(inout) :: a complex(psb_dpk_), intent(in) :: val(:) integer, intent(in) :: nz, ia(:), ja(:), imin,imax,jmin,jmax integer, intent(out) :: info @@ -709,7 +709,7 @@ subroutine psb_z_csgetptn(imin,imax,a,nz,ia,ja,info,& use psb_z_mat_mod, psb_protect_name => psb_z_csgetptn implicit none - class(psb_z_sparse_mat), intent(in) :: a + class(psb_zspmat_type), intent(in) :: a integer, intent(in) :: imin,imax integer, intent(out) :: nz integer, allocatable, intent(inout) :: ia(:), ja(:) @@ -759,7 +759,7 @@ subroutine psb_z_csgetrow(imin,imax,a,nz,ia,ja,val,info,& use psb_z_mat_mod, psb_protect_name => psb_z_csgetrow implicit none - class(psb_z_sparse_mat), intent(in) :: a + class(psb_zspmat_type), intent(in) :: a integer, intent(in) :: imin,imax integer, intent(out) :: nz integer, allocatable, intent(inout) :: ia(:), ja(:) @@ -812,8 +812,8 @@ subroutine psb_z_csgetblk(imin,imax,a,b,info,& use psb_z_mat_mod, psb_protect_name => psb_z_csgetblk implicit none - class(psb_z_sparse_mat), intent(in) :: a - class(psb_z_sparse_mat), intent(out) :: b + class(psb_zspmat_type), intent(in) :: a + class(psb_zspmat_type), intent(out) :: b integer, intent(in) :: imin,imax integer,intent(out) :: info logical, intent(in), optional :: append @@ -867,8 +867,8 @@ subroutine psb_z_csclip(a,b,info,& use psb_z_mat_mod, psb_protect_name => psb_z_csclip implicit none - class(psb_z_sparse_mat), intent(in) :: a - class(psb_z_sparse_mat), intent(out) :: b + class(psb_zspmat_type), intent(in) :: a + class(psb_zspmat_type), intent(out) :: b integer,intent(out) :: info integer, intent(in), optional :: imin,imax,jmin,jmax logical, intent(in), optional :: rscale,cscale @@ -915,7 +915,7 @@ subroutine psb_z_b_csclip(a,b,info,& use psb_z_mat_mod, psb_protect_name => psb_z_b_csclip implicit none - class(psb_z_sparse_mat), intent(in) :: a + class(psb_zspmat_type), intent(in) :: a type(psb_z_coo_sparse_mat), intent(out) :: b integer,intent(out) :: info integer, intent(in), optional :: imin,imax,jmin,jmax @@ -958,8 +958,8 @@ subroutine psb_z_cscnv(a,b,info,type,mold,upd,dupl) use psb_string_mod use psb_z_mat_mod, psb_protect_name => psb_z_cscnv implicit none - class(psb_z_sparse_mat), intent(in) :: a - class(psb_z_sparse_mat), intent(out) :: b + class(psb_zspmat_type), intent(in) :: a + class(psb_zspmat_type), intent(out) :: b integer, intent(out) :: info integer,optional, intent(in) :: dupl, upd character(len=*), optional, intent(in) :: type @@ -1060,7 +1060,7 @@ subroutine psb_z_cscnv_ip(a,info,type,mold,dupl) use psb_z_mat_mod, psb_protect_name => psb_z_cscnv_ip implicit none - class(psb_z_sparse_mat), intent(inout) :: a + class(psb_zspmat_type), intent(inout) :: a integer, intent(out) :: info integer,optional, intent(in) :: dupl character(len=*), optional, intent(in) :: type @@ -1159,7 +1159,7 @@ subroutine psb_z_cscnv_base(a,b,info,dupl) use psb_string_mod use psb_z_mat_mod, psb_protect_name => psb_z_cscnv_base implicit none - class(psb_z_sparse_mat), intent(in) :: a + class(psb_zspmat_type), intent(in) :: a class(psb_z_base_sparse_mat), intent(out) :: b integer, intent(out) :: info integer,optional, intent(in) :: dupl @@ -1217,8 +1217,8 @@ subroutine psb_z_clip_d(a,b,info) use psb_z_mat_mod, psb_protect_name => psb_z_clip_d implicit none - class(psb_z_sparse_mat), intent(in) :: a - class(psb_z_sparse_mat), intent(out) :: b + class(psb_zspmat_type), intent(in) :: a + class(psb_zspmat_type), intent(out) :: b integer,intent(out) :: info Integer :: err_act @@ -1280,7 +1280,7 @@ subroutine psb_z_clip_d_ip(a,info) use psb_z_mat_mod, psb_protect_name => psb_z_clip_d_ip implicit none - class(psb_z_sparse_mat), intent(inout) :: a + class(psb_zspmat_type), intent(inout) :: a integer,intent(out) :: info Integer :: err_act @@ -1338,7 +1338,7 @@ subroutine psb_z_mv_from(a,b) use psb_string_mod use psb_z_mat_mod, psb_protect_name => psb_z_mv_from implicit none - class(psb_z_sparse_mat), intent(out) :: a + class(psb_zspmat_type), intent(out) :: a class(psb_z_base_sparse_mat), intent(inout) :: b integer :: info @@ -1359,7 +1359,7 @@ subroutine psb_z_cp_from(a,b) use psb_string_mod use psb_z_mat_mod, psb_protect_name => psb_z_cp_from implicit none - class(psb_z_sparse_mat), intent(out) :: a + class(psb_zspmat_type), intent(out) :: a class(psb_z_base_sparse_mat), intent(inout), allocatable :: b Integer :: err_act, info character(len=20) :: name='clone' @@ -1395,7 +1395,7 @@ subroutine psb_z_mv_to(a,b) use psb_string_mod use psb_z_mat_mod, psb_protect_name => psb_z_mv_to implicit none - class(psb_z_sparse_mat), intent(inout) :: a + class(psb_zspmat_type), intent(inout) :: a class(psb_z_base_sparse_mat), intent(out) :: b integer :: info @@ -1410,7 +1410,7 @@ subroutine psb_z_cp_to(a,b) use psb_string_mod use psb_z_mat_mod, psb_protect_name => psb_z_cp_to implicit none - class(psb_z_sparse_mat), intent(in) :: a + class(psb_zspmat_type), intent(in) :: a class(psb_z_base_sparse_mat), intent(out) :: b integer :: info @@ -1421,13 +1421,13 @@ end subroutine psb_z_cp_to -subroutine psb_z_sparse_mat_move(a,b,info) +subroutine psb_zspmat_type_move(a,b,info) use psb_error_mod use psb_string_mod - use psb_z_mat_mod, psb_protect_name => psb_z_sparse_mat_move + use psb_z_mat_mod, psb_protect_name => psb_zspmat_type_move implicit none - class(psb_z_sparse_mat), intent(inout) :: a - class(psb_z_sparse_mat), intent(out) :: b + class(psb_zspmat_type), intent(inout) :: a + class(psb_zspmat_type), intent(out) :: b integer, intent(out) :: info Integer :: err_act @@ -1438,16 +1438,16 @@ subroutine psb_z_sparse_mat_move(a,b,info) call move_alloc(a%a,b%a) return -end subroutine psb_z_sparse_mat_move +end subroutine psb_zspmat_type_move -subroutine psb_z_sparse_mat_clone(a,b,info) +subroutine psb_zspmat_type_clone(a,b,info) use psb_error_mod use psb_string_mod - use psb_z_mat_mod, psb_protect_name => psb_z_sparse_mat_clone + use psb_z_mat_mod, psb_protect_name => psb_zspmat_type_clone implicit none - class(psb_z_sparse_mat), intent(in) :: a - class(psb_z_sparse_mat), intent(out) :: b + class(psb_zspmat_type), intent(in) :: a + class(psb_zspmat_type), intent(out) :: b integer, intent(out) :: info Integer :: err_act @@ -1477,7 +1477,7 @@ subroutine psb_z_sparse_mat_clone(a,b,info) return end if -end subroutine psb_z_sparse_mat_clone +end subroutine psb_zspmat_type_clone @@ -1486,7 +1486,7 @@ subroutine psb_z_transp_1mat(a) use psb_string_mod use psb_z_mat_mod, psb_protect_name => psb_z_transp_1mat implicit none - class(psb_z_sparse_mat), intent(inout) :: a + class(psb_zspmat_type), intent(inout) :: a Integer :: err_act, info character(len=20) :: name='transp' @@ -1522,8 +1522,8 @@ subroutine psb_z_transp_2mat(a,b) use psb_string_mod use psb_z_mat_mod, psb_protect_name => psb_z_transp_2mat implicit none - class(psb_z_sparse_mat), intent(out) :: a - class(psb_z_sparse_mat), intent(in) :: b + class(psb_zspmat_type), intent(out) :: a + class(psb_zspmat_type), intent(in) :: b Integer :: err_act, info character(len=20) :: name='transp' @@ -1567,7 +1567,7 @@ subroutine psb_z_transc_1mat(a) use psb_string_mod use psb_z_mat_mod, psb_protect_name => psb_z_transc_1mat implicit none - class(psb_z_sparse_mat), intent(inout) :: a + class(psb_zspmat_type), intent(inout) :: a Integer :: err_act, info character(len=20) :: name='transc' @@ -1603,8 +1603,8 @@ subroutine psb_z_transc_2mat(a,b) use psb_string_mod use psb_z_mat_mod, psb_protect_name => psb_z_transc_2mat implicit none - class(psb_z_sparse_mat), intent(out) :: a - class(psb_z_sparse_mat), intent(in) :: b + class(psb_zspmat_type), intent(out) :: a + class(psb_zspmat_type), intent(in) :: b Integer :: err_act, info character(len=20) :: name='transc' @@ -1650,7 +1650,7 @@ subroutine psb_z_reinit(a,clear) use psb_error_mod implicit none - class(psb_z_sparse_mat), intent(inout) :: a + class(psb_zspmat_type), intent(inout) :: a logical, intent(in), optional :: clear Integer :: err_act, info character(len=20) :: name='reinit' @@ -1698,7 +1698,7 @@ subroutine psb_z_csmm(alpha,a,x,beta,y,info,trans) use psb_error_mod use psb_z_mat_mod, psb_protect_name => psb_z_csmm implicit none - class(psb_z_sparse_mat), intent(in) :: a + class(psb_zspmat_type), intent(in) :: a complex(psb_dpk_), intent(in) :: alpha, beta, x(:,:) complex(psb_dpk_), intent(inout) :: y(:,:) integer, intent(out) :: info @@ -1736,7 +1736,7 @@ subroutine psb_z_csmv(alpha,a,x,beta,y,info,trans) use psb_error_mod use psb_z_mat_mod, psb_protect_name => psb_z_csmv implicit none - class(psb_z_sparse_mat), intent(in) :: a + class(psb_zspmat_type), intent(in) :: a complex(psb_dpk_), intent(in) :: alpha, beta, x(:) complex(psb_dpk_), intent(inout) :: y(:) integer, intent(out) :: info @@ -1774,7 +1774,7 @@ subroutine psb_z_cssm(alpha,a,x,beta,y,info,trans,scale,d) use psb_error_mod use psb_z_mat_mod, psb_protect_name => psb_z_cssm implicit none - class(psb_z_sparse_mat), intent(in) :: a + class(psb_zspmat_type), intent(in) :: a complex(psb_dpk_), intent(in) :: alpha, beta, x(:,:) complex(psb_dpk_), intent(inout) :: y(:,:) integer, intent(out) :: info @@ -1814,7 +1814,7 @@ subroutine psb_z_cssv(alpha,a,x,beta,y,info,trans,scale,d) use psb_error_mod use psb_z_mat_mod, psb_protect_name => psb_z_cssv implicit none - class(psb_z_sparse_mat), intent(in) :: a + class(psb_zspmat_type), intent(in) :: a complex(psb_dpk_), intent(in) :: alpha, beta, x(:) complex(psb_dpk_), intent(inout) :: y(:) integer, intent(out) :: info @@ -1857,7 +1857,7 @@ function psb_z_csnmi(a) result(res) use psb_error_mod use psb_const_mod implicit none - class(psb_z_sparse_mat), intent(in) :: a + class(psb_zspmat_type), intent(in) :: a real(psb_dpk_) :: res Integer :: err_act, info @@ -1890,7 +1890,7 @@ subroutine psb_z_get_diag(a,d,info) use psb_error_mod use psb_const_mod implicit none - class(psb_z_sparse_mat), intent(in) :: a + class(psb_zspmat_type), intent(in) :: a complex(psb_dpk_), intent(out) :: d(:) integer, intent(out) :: info @@ -1928,7 +1928,7 @@ subroutine psb_z_scal(d,a,info) use psb_const_mod use psb_z_mat_mod, psb_protect_name => psb_z_scal implicit none - class(psb_z_sparse_mat), intent(inout) :: a + class(psb_zspmat_type), intent(inout) :: a complex(psb_dpk_), intent(in) :: d(:) integer, intent(out) :: info @@ -1966,7 +1966,7 @@ subroutine psb_z_scals(d,a,info) use psb_const_mod use psb_z_mat_mod, psb_protect_name => psb_z_scals implicit none - class(psb_z_sparse_mat), intent(inout) :: a + class(psb_zspmat_type), intent(inout) :: a complex(psb_dpk_), intent(in) :: d integer, intent(out) :: info diff --git a/base/serial/psb_cnumbmm.f90 b/base/serial/psb_cnumbmm.f90 index a9ade274..4bca53b8 100644 --- a/base/serial/psb_cnumbmm.f90 +++ b/base/serial/psb_cnumbmm.f90 @@ -44,8 +44,8 @@ subroutine psb_cnumbmm(a,b,c) use psb_sparse_mod, psb_protect_name => psb_cnumbmm implicit none - type(psb_c_sparse_mat), intent(in) :: a,b - type(psb_c_sparse_mat), intent(inout) :: c + type(psb_cspmat_type), intent(in) :: a,b + type(psb_cspmat_type), intent(inout) :: c integer :: info integer :: err_act character(len=*), parameter :: name='psb_numbmm' diff --git a/base/serial/psb_crwextd.f90 b/base/serial/psb_crwextd.f90 index e31ea423..0a1a51af 100644 --- a/base/serial/psb_crwextd.f90 +++ b/base/serial/psb_crwextd.f90 @@ -44,9 +44,9 @@ subroutine psb_crwextd(nr,a,info,b,rowscale) ! Extend matrix A up to NR rows with empty ones (i.e.: all zeroes) integer, intent(in) :: nr - type(psb_c_sparse_mat), intent(inout) :: a + type(psb_cspmat_type), intent(inout) :: a integer,intent(out) :: info - type(psb_c_sparse_mat), intent(in), optional :: b + type(psb_cspmat_type), intent(in), optional :: b logical,intent(in), optional :: rowscale integer :: i,j,ja,jb,err_act,nza,nzb diff --git a/base/serial/psb_csymbmm.f90 b/base/serial/psb_csymbmm.f90 index 157221b2..d16fa2b5 100644 --- a/base/serial/psb_csymbmm.f90 +++ b/base/serial/psb_csymbmm.f90 @@ -43,8 +43,8 @@ subroutine psb_csymbmm(a,b,c,info) use psb_sparse_mod, psb_protect_name => psb_csymbmm implicit none - type(psb_c_sparse_mat), intent(in) :: a,b - type(psb_c_sparse_mat), intent(out) :: c + type(psb_cspmat_type), intent(in) :: a,b + type(psb_cspmat_type), intent(out) :: c integer, intent(out) :: info type(psb_c_csr_sparse_mat), allocatable :: ccsr integer :: err_act diff --git a/base/serial/psb_dnumbmm.f90 b/base/serial/psb_dnumbmm.f90 index 4735adc0..651f6ce2 100644 --- a/base/serial/psb_dnumbmm.f90 +++ b/base/serial/psb_dnumbmm.f90 @@ -44,8 +44,8 @@ subroutine psb_dnumbmm(a,b,c) use psb_sparse_mod, psb_protect_name => psb_dnumbmm implicit none - type(psb_d_sparse_mat), intent(in) :: a,b - type(psb_d_sparse_mat), intent(inout) :: c + type(psb_dspmat_type), intent(in) :: a,b + type(psb_dspmat_type), intent(inout) :: c integer :: info integer :: err_act character(len=*), parameter :: name='psb_numbmm' diff --git a/base/serial/psb_drwextd.f90 b/base/serial/psb_drwextd.f90 index 42f65ede..0c557f5e 100644 --- a/base/serial/psb_drwextd.f90 +++ b/base/serial/psb_drwextd.f90 @@ -44,9 +44,9 @@ subroutine psb_drwextd(nr,a,info,b,rowscale) ! Extend matrix A up to NR rows with empty ones (i.e.: all zeroes) integer, intent(in) :: nr - type(psb_d_sparse_mat), intent(inout) :: a + type(psb_dspmat_type), intent(inout) :: a integer,intent(out) :: info - type(psb_d_sparse_mat), intent(in), optional :: b + type(psb_dspmat_type), intent(in), optional :: b logical,intent(in), optional :: rowscale integer :: i,j,ja,jb,err_act,nza,nzb diff --git a/base/serial/psb_dsymbmm.f90 b/base/serial/psb_dsymbmm.f90 index cff7a3a0..56788346 100644 --- a/base/serial/psb_dsymbmm.f90 +++ b/base/serial/psb_dsymbmm.f90 @@ -43,8 +43,8 @@ subroutine psb_dsymbmm(a,b,c,info) use psb_sparse_mod, psb_protect_name => psb_dsymbmm implicit none - type(psb_d_sparse_mat), intent(in) :: a,b - type(psb_d_sparse_mat), intent(out) :: c + type(psb_dspmat_type), intent(in) :: a,b + type(psb_dspmat_type), intent(out) :: c integer, intent(out) :: info type(psb_d_csr_sparse_mat), allocatable :: ccsr integer :: err_act diff --git a/base/serial/psb_snumbmm.f90 b/base/serial/psb_snumbmm.f90 index 93c47e38..82da0c3b 100644 --- a/base/serial/psb_snumbmm.f90 +++ b/base/serial/psb_snumbmm.f90 @@ -44,8 +44,8 @@ subroutine psb_snumbmm(a,b,c) use psb_sparse_mod, psb_protect_name => psb_snumbmm implicit none - type(psb_s_sparse_mat), intent(in) :: a,b - type(psb_s_sparse_mat), intent(inout) :: c + type(psb_sspmat_type), intent(in) :: a,b + type(psb_sspmat_type), intent(inout) :: c integer :: info integer :: err_act character(len=*), parameter :: name='psb_numbmm' diff --git a/base/serial/psb_srwextd.f90 b/base/serial/psb_srwextd.f90 index 6d79f22f..f9c7b702 100644 --- a/base/serial/psb_srwextd.f90 +++ b/base/serial/psb_srwextd.f90 @@ -44,9 +44,9 @@ subroutine psb_srwextd(nr,a,info,b,rowscale) ! Extend matrix A up to NR rows with empty ones (i.e.: all zeroes) integer, intent(in) :: nr - type(psb_s_sparse_mat), intent(inout) :: a + type(psb_sspmat_type), intent(inout) :: a integer,intent(out) :: info - type(psb_s_sparse_mat), intent(in), optional :: b + type(psb_sspmat_type), intent(in), optional :: b logical,intent(in), optional :: rowscale integer :: i,j,ja,jb,err_act,nza,nzb diff --git a/base/serial/psb_ssymbmm.f90 b/base/serial/psb_ssymbmm.f90 index 933e1d1b..c18fb4a6 100644 --- a/base/serial/psb_ssymbmm.f90 +++ b/base/serial/psb_ssymbmm.f90 @@ -43,8 +43,8 @@ subroutine psb_ssymbmm(a,b,c,info) use psb_sparse_mod, psb_protect_name => psb_ssymbmm implicit none - type(psb_s_sparse_mat), intent(in) :: a,b - type(psb_s_sparse_mat), intent(out) :: c + type(psb_sspmat_type), intent(in) :: a,b + type(psb_sspmat_type), intent(out) :: c integer, intent(out) :: info type(psb_s_csr_sparse_mat), allocatable :: ccsr integer :: err_act diff --git a/base/serial/psb_znumbmm.f90 b/base/serial/psb_znumbmm.f90 index 5e7bdf5c..35081cbe 100644 --- a/base/serial/psb_znumbmm.f90 +++ b/base/serial/psb_znumbmm.f90 @@ -44,8 +44,8 @@ subroutine psb_znumbmm(a,b,c) use psb_sparse_mod, psb_protect_name => psb_znumbmm implicit none - type(psb_z_sparse_mat), intent(in) :: a,b - type(psb_z_sparse_mat), intent(inout) :: c + type(psb_zspmat_type), intent(in) :: a,b + type(psb_zspmat_type), intent(inout) :: c integer :: info integer :: err_act character(len=*), parameter :: name='psb_numbmm' diff --git a/base/serial/psb_zrwextd.f90 b/base/serial/psb_zrwextd.f90 index e5cd4e75..1039f8e3 100644 --- a/base/serial/psb_zrwextd.f90 +++ b/base/serial/psb_zrwextd.f90 @@ -44,9 +44,9 @@ subroutine psb_zrwextd(nr,a,info,b,rowscale) ! Extend matrix A up to NR rows with empty ones (i.e.: all zeroes) integer, intent(in) :: nr - type(psb_z_sparse_mat), intent(inout) :: a + type(psb_zspmat_type), intent(inout) :: a integer,intent(out) :: info - type(psb_z_sparse_mat), intent(in), optional :: b + type(psb_zspmat_type), intent(in), optional :: b logical,intent(in), optional :: rowscale integer :: i,j,ja,jb,err_act,nza,nzb diff --git a/base/serial/psb_zsymbmm.f90 b/base/serial/psb_zsymbmm.f90 index c149cdf5..a858c9a0 100644 --- a/base/serial/psb_zsymbmm.f90 +++ b/base/serial/psb_zsymbmm.f90 @@ -43,8 +43,8 @@ subroutine psb_zsymbmm(a,b,c,info) use psb_sparse_mod, psb_protect_name => psb_zsymbmm implicit none - type(psb_z_sparse_mat), intent(in) :: a,b - type(psb_z_sparse_mat), intent(out) :: c + type(psb_zspmat_type), intent(in) :: a,b + type(psb_zspmat_type), intent(out) :: c integer, intent(out) :: info type(psb_z_csr_sparse_mat), allocatable :: ccsr integer :: err_act diff --git a/base/tools/psb_ccdbldext.F90 b/base/tools/psb_ccdbldext.F90 index e0399aa3..22cbba19 100644 --- a/base/tools/psb_ccdbldext.F90 +++ b/base/tools/psb_ccdbldext.F90 @@ -37,7 +37,7 @@ ! specified on input. ! ! Arguments: -! a - type(psb_c_sparse_mat). The input sparse matrix. +! a - type(psb_cspmat_type). The input sparse matrix. ! desc_a - type(psb_desc_type). The input communication descriptor. ! novr - integer. The number of overlap levels. ! desc_ov - type(psb_desc_type). The auxiliary output communication @@ -74,7 +74,7 @@ Subroutine psb_ccdbldext(a,desc_a,novr,desc_ov,info, extype) ! .. Array Arguments .. integer, intent(in) :: novr - Type(psb_c_sparse_mat), Intent(in) :: a + Type(psb_cspmat_type), Intent(in) :: a Type(psb_desc_type), Intent(in), target :: desc_a Type(psb_desc_type), Intent(out) :: desc_ov integer, intent(out) :: info diff --git a/base/tools/psb_cspalloc.f90 b/base/tools/psb_cspalloc.f90 index 5656f328..10ca42d8 100644 --- a/base/tools/psb_cspalloc.f90 +++ b/base/tools/psb_cspalloc.f90 @@ -35,7 +35,7 @@ ! Allocate sparse matrix structure for psblas routines. ! ! Arguments: -! a - type(psb_c_sparse_mat). The sparse matrix to be allocated. +! a - type(psb_cspmat_type). The sparse matrix to be allocated. ! desc_a - type(psb_desc_type). The communication descriptor to be updated. ! info - integer. Return code. ! nnz - integer(optional). The number of nonzeroes in the matrix. @@ -47,7 +47,7 @@ subroutine psb_cspalloc(a, desc_a, info, nnz) !....parameters... type(psb_desc_type), intent(in) :: desc_a - type(psb_c_sparse_mat), intent(inout) :: a + type(psb_cspmat_type), intent(inout) :: a integer, intent(out) :: info integer, optional, intent(in) :: nnz diff --git a/base/tools/psb_cspasb.f90 b/base/tools/psb_cspasb.f90 index 152d2455..066fcce4 100644 --- a/base/tools/psb_cspasb.f90 +++ b/base/tools/psb_cspasb.f90 @@ -35,7 +35,7 @@ ! Assemble sparse matrix ! ! Arguments: -! a - type(psb_c_sparse_mat). The sparse matrix to be assembled +! a - type(psb_cspmat_type). The sparse matrix to be assembled ! desc_a - type(psb_desc_type). The communication descriptor. ! info - integer. return code. ! afmt - character(optional) The desired output storage format. @@ -55,7 +55,7 @@ subroutine psb_cspasb(a,desc_a, info, afmt, upd, dupl,mold) !...Parameters.... - type(psb_c_sparse_mat), intent (inout) :: a + type(psb_cspmat_type), intent (inout) :: a type(psb_desc_type), intent(in) :: desc_a integer, intent(out) :: info integer,optional, intent(in) :: dupl, upd diff --git a/base/tools/psb_cspfree.f90 b/base/tools/psb_cspfree.f90 index 800c7a63..e739ec1f 100644 --- a/base/tools/psb_cspfree.f90 +++ b/base/tools/psb_cspfree.f90 @@ -35,7 +35,7 @@ ! Frees a sparse matrix structure. ! ! Arguments: -! a - type(psb_c_sparse_mat). The sparse matrix to be freed. +! a - type(psb_cspmat_type). The sparse matrix to be freed. ! desc_a - type(psb_desc_type). The communication descriptor. ! info - integer. return code. ! @@ -45,7 +45,7 @@ subroutine psb_cspfree(a, desc_a,info) !....parameters... type(psb_desc_type), intent(in) :: desc_a - type(psb_c_sparse_mat), intent(inout) :: a + type(psb_cspmat_type), intent(inout) :: a integer, intent(out) :: info !...locals.... integer :: ictxt, err_act diff --git a/base/tools/psb_csphalo.F90 b/base/tools/psb_csphalo.F90 index b621fb95..d2128284 100644 --- a/base/tools/psb_csphalo.F90 +++ b/base/tools/psb_csphalo.F90 @@ -38,9 +38,9 @@ ! ! ! Arguments: -! a - type(psb_c_sparse_mat) The local part of input matrix A +! a - type(psb_cspmat_type) The local part of input matrix A ! desc_a - type(psb_desc_type). The communication descriptor. -! blck - type(psb_c_sparse_mat) The local part of output matrix BLCK +! blck - type(psb_cspmat_type) The local part of output matrix BLCK ! info - integer. Return code ! rowcnv - logical Should row/col indices be converted ! colcnv - logical to/from global numbering when sent/received? @@ -68,8 +68,8 @@ Subroutine psb_csphalo(a,desc_a,blk,info,rowcnv,colcnv,& include 'mpif.h' #endif - Type(psb_c_sparse_mat),Intent(in) :: a - Type(psb_c_sparse_mat),Intent(inout) :: blk + Type(psb_cspmat_type),Intent(in) :: a + Type(psb_cspmat_type),Intent(inout) :: blk Type(psb_desc_type),Intent(in), target :: desc_a integer, intent(out) :: info logical, optional, intent(in) :: rowcnv,colcnv,rowscale,colscale diff --git a/base/tools/psb_cspins.f90 b/base/tools/psb_cspins.f90 index d98165a3..7a35f82e 100644 --- a/base/tools/psb_cspins.f90 +++ b/base/tools/psb_cspins.f90 @@ -42,7 +42,7 @@ ! ia(:) - integer The row indices of the coefficients. ! ja(:) - integer The column indices of the coefficients. ! val(:) - complex The values of the coefficients to be inserted. -! a - type(psb_d_sparse_mat). The sparse destination matrix. +! a - type(psb_dspmat_type). The sparse destination matrix. ! desc_a - type(psb_desc_type). The communication descriptor. ! info - integer. Error code ! rebuild - logical Allows to reopen a matrix under @@ -55,7 +55,7 @@ subroutine psb_cspins(nz,ia,ja,val,a,desc_a,info,rebuild) !....parameters... type(psb_desc_type), intent(inout) :: desc_a - type(psb_c_sparse_mat), intent(inout) :: a + type(psb_cspmat_type), intent(inout) :: a integer, intent(in) :: nz,ia(:),ja(:) complex(psb_spk_), intent(in) :: val(:) integer, intent(out) :: info @@ -239,7 +239,7 @@ subroutine psb_cspins_2desc(nz,ia,ja,val,a,desc_ar,desc_ac,info) !....parameters... type(psb_desc_type), intent(in) :: desc_ar type(psb_desc_type), intent(inout) :: desc_ac - type(psb_c_sparse_mat), intent(inout) :: a + type(psb_cspmat_type), intent(inout) :: a integer, intent(in) :: nz,ia(:),ja(:) complex(psb_spk_), intent(in) :: val(:) integer, intent(out) :: info diff --git a/base/tools/psb_csprn.f90 b/base/tools/psb_csprn.f90 index 6235c3a7..0f1585ad 100644 --- a/base/tools/psb_csprn.f90 +++ b/base/tools/psb_csprn.f90 @@ -36,7 +36,7 @@ ! is in the update state. ! ! Arguments: -! a - type(psb_c_sparse_mat). The sparse matrix to be reinitiated. +! a - type(psb_cspmat_type). The sparse matrix to be reinitiated. ! desc_a - type(psb_desc_type). The communication descriptor. ! info - integer. Return code. ! clear - logical, optional Whether the coefficients should be zeroed @@ -48,7 +48,7 @@ Subroutine psb_csprn(a, desc_a,info,clear) !....Parameters... Type(psb_desc_type), intent(in) :: desc_a - Type(psb_c_sparse_mat), intent(inout) :: a + Type(psb_cspmat_type), intent(inout) :: a integer, intent(out) :: info logical, intent(in), optional :: clear diff --git a/base/tools/psb_dcdbldext.F90 b/base/tools/psb_dcdbldext.F90 index 60a9660b..a998ba66 100644 --- a/base/tools/psb_dcdbldext.F90 +++ b/base/tools/psb_dcdbldext.F90 @@ -37,7 +37,7 @@ ! specified on input. ! ! Arguments: -! a - type(psb_d_sparse_mat). The input sparse matrix. +! a - type(psb_dspmat_type). The input sparse matrix. ! desc_a - type(psb_desc_type). The input communication descriptor. ! novr - integer. The number of overlap levels. ! desc_ov - type(psb_desc_type). The auxiliary output communication @@ -74,7 +74,7 @@ Subroutine psb_dcdbldext(a,desc_a,novr,desc_ov,info, extype) ! .. Array Arguments .. integer, intent(in) :: novr - Type(psb_d_sparse_mat), Intent(in) :: a + Type(psb_dspmat_type), Intent(in) :: a Type(psb_desc_type), Intent(in), target :: desc_a Type(psb_desc_type), Intent(out) :: desc_ov integer, intent(out) :: info diff --git a/base/tools/psb_dspalloc.f90 b/base/tools/psb_dspalloc.f90 index 01f101b3..6b90c332 100644 --- a/base/tools/psb_dspalloc.f90 +++ b/base/tools/psb_dspalloc.f90 @@ -35,7 +35,7 @@ ! Allocate sparse matrix structure for psblas routines. ! ! Arguments: -! a - type(psb_d_sparse_mat). The sparse matrix to be allocated. +! a - type(psb_dspmat_type). The sparse matrix to be allocated. ! desc_a - type(psb_desc_type). The communication descriptor to be updated. ! info - integer. Return code. ! nnz - integer(optional). The number of nonzeroes in the matrix. @@ -47,7 +47,7 @@ subroutine psb_dspalloc(a, desc_a, info, nnz) !....parameters... type(psb_desc_type), intent(in) :: desc_a - type(psb_d_sparse_mat), intent(inout) :: a + type(psb_dspmat_type), intent(inout) :: a integer, intent(out) :: info integer, optional, intent(in) :: nnz diff --git a/base/tools/psb_dspasb.f90 b/base/tools/psb_dspasb.f90 index 60739a9a..f2fcb646 100644 --- a/base/tools/psb_dspasb.f90 +++ b/base/tools/psb_dspasb.f90 @@ -35,7 +35,7 @@ ! Assemble sparse matrix ! ! Arguments: -! a - type(psb_d_sparse_mat). The sparse matrix to be allocated. +! a - type(psb_dspmat_type). The sparse matrix to be allocated. ! desc_a - type(psb_desc_type). The communication descriptor. ! info - integer. return code. ! afmt - character(optional) The desired output storage format. @@ -55,7 +55,7 @@ subroutine psb_dspasb(a,desc_a, info, afmt, upd, dupl, mold) !...Parameters.... - type(psb_d_sparse_mat), intent (inout) :: a + type(psb_dspmat_type), intent (inout) :: a type(psb_desc_type), intent(in) :: desc_a integer, intent(out) :: info integer,optional, intent(in) :: dupl, upd diff --git a/base/tools/psb_dspfree.f90 b/base/tools/psb_dspfree.f90 index 25330538..44751c9e 100644 --- a/base/tools/psb_dspfree.f90 +++ b/base/tools/psb_dspfree.f90 @@ -35,7 +35,7 @@ ! Frees a sparse matrix structure. ! ! Arguments: -! a - type(psb_d_sparse_mat). The sparse matrix to be freed. +! a - type(psb_dspmat_type). The sparse matrix to be freed. ! desc_a - type(psb_desc_type). The communication descriptor. ! info - integer. return code. ! @@ -45,7 +45,7 @@ subroutine psb_dspfree(a, desc_a,info) !....parameters... type(psb_desc_type), intent(in) :: desc_a - type(psb_d_sparse_mat), intent(inout) :: a + type(psb_dspmat_type), intent(inout) :: a integer, intent(out) :: info !...locals.... integer :: ictxt,err_act diff --git a/base/tools/psb_dsphalo.F90 b/base/tools/psb_dsphalo.F90 index 9006ee64..0c4bc93b 100644 --- a/base/tools/psb_dsphalo.F90 +++ b/base/tools/psb_dsphalo.F90 @@ -68,8 +68,8 @@ Subroutine psb_dsphalo(a,desc_a,blk,info,rowcnv,colcnv,& include 'mpif.h' #endif - type(psb_d_sparse_mat),intent(in) :: a - type(psb_d_sparse_mat),intent(inout) :: blk + type(psb_dspmat_type),intent(in) :: a + type(psb_dspmat_type),intent(inout) :: blk type(psb_desc_type),intent(in), target :: desc_a integer, intent(out) :: info logical, optional, intent(in) :: rowcnv,colcnv,rowscale,colscale diff --git a/base/tools/psb_dspins.f90 b/base/tools/psb_dspins.f90 index cd16fab9..e361e3f7 100644 --- a/base/tools/psb_dspins.f90 +++ b/base/tools/psb_dspins.f90 @@ -42,7 +42,7 @@ ! ia(:) - integer The row indices of the coefficients. ! ja(:) - integer The column indices of the coefficients. ! val(:) - real The values of the coefficients to be inserted. -! a - type(psb_d_sparse_mat). The sparse destination matrix. +! a - type(psb_dspmat_type). The sparse destination matrix. ! desc_a - type(psb_desc_type). The communication descriptor. ! info - integer. Error code ! rebuild - logical Allows to reopen a matrix under @@ -54,7 +54,7 @@ subroutine psb_dspins(nz,ia,ja,val,a,desc_a,info,rebuild) !....parameters... type(psb_desc_type), intent(inout) :: desc_a - type(psb_d_sparse_mat), intent(inout) :: a + type(psb_dspmat_type), intent(inout) :: a integer, intent(in) :: nz,ia(:),ja(:) real(psb_dpk_), intent(in) :: val(:) integer, intent(out) :: info @@ -237,7 +237,7 @@ subroutine psb_dspins_2desc(nz,ia,ja,val,a,desc_ar,desc_ac,info) !....parameters... type(psb_desc_type), intent(in) :: desc_ar type(psb_desc_type), intent(inout) :: desc_ac - type(psb_d_sparse_mat), intent(inout) :: a + type(psb_dspmat_type), intent(inout) :: a integer, intent(in) :: nz,ia(:),ja(:) real(kind=psb_dpk_), intent(in) :: val(:) integer, intent(out) :: info diff --git a/base/tools/psb_dsprn.f90 b/base/tools/psb_dsprn.f90 index 37e64745..93ce3c13 100644 --- a/base/tools/psb_dsprn.f90 +++ b/base/tools/psb_dsprn.f90 @@ -36,7 +36,7 @@ ! is in the update state. ! ! Arguments: -! a - type(psb_d_sparse_mat). The sparse matrix to be reinitiated. +! a - type(psb_dspmat_type). The sparse matrix to be reinitiated. ! desc_a - type(psb_desc_type). The communication descriptor. ! info - integer. Return code. ! clear - logical, optional Whether the coefficients should be zeroed @@ -47,7 +47,7 @@ Subroutine psb_dsprn(a, desc_a,info,clear) !....Parameters... Type(psb_desc_type), intent(in) :: desc_a - Type(psb_d_sparse_mat), intent(inout) :: a + Type(psb_dspmat_type), intent(inout) :: a integer, intent(out) :: info logical, intent(in), optional :: clear diff --git a/base/tools/psb_linmap.f90 b/base/tools/psb_linmap.f90 index 39b6ef76..153ad947 100644 --- a/base/tools/psb_linmap.f90 +++ b/base/tools/psb_linmap.f90 @@ -37,7 +37,7 @@ function psb_c_linmap(map_kind,desc_X, desc_Y, map_X2Y, map_Y2X,iaggr,naggr) res implicit none type(psb_clinmap_type) :: this type(psb_desc_type), target :: desc_X, desc_Y - type(psb_c_sparse_mat), intent(in) :: map_X2Y, map_Y2X + type(psb_cspmat_type), intent(in) :: map_X2Y, map_Y2X integer, intent(in) :: map_kind integer, intent(in), optional :: iaggr(:), naggr(:) ! @@ -113,7 +113,7 @@ function psb_d_linmap(map_kind,desc_X, desc_Y, map_X2Y, map_Y2X,iaggr,naggr) res implicit none type(psb_dlinmap_type) :: this type(psb_desc_type), target :: desc_X, desc_Y - type(psb_d_sparse_mat), intent(in) :: map_X2Y, map_Y2X + type(psb_dspmat_type), intent(in) :: map_X2Y, map_Y2X integer, intent(in) :: map_kind integer, intent(in), optional :: iaggr(:), naggr(:) ! @@ -195,7 +195,7 @@ function psb_s_linmap(map_kind,desc_X, desc_Y, map_X2Y, map_Y2X,iaggr,naggr) res implicit none type(psb_slinmap_type) :: this type(psb_desc_type), target :: desc_X, desc_Y - type(psb_s_sparse_mat), intent(in) :: map_X2Y, map_Y2X + type(psb_sspmat_type), intent(in) :: map_X2Y, map_Y2X integer, intent(in) :: map_kind integer, intent(in), optional :: iaggr(:), naggr(:) ! @@ -274,7 +274,7 @@ function psb_z_linmap(map_kind,desc_X, desc_Y, map_X2Y, map_Y2X,iaggr,naggr) res implicit none type(psb_zlinmap_type) :: this type(psb_desc_type), target :: desc_X, desc_Y - type(psb_z_sparse_mat), intent(in) :: map_X2Y, map_Y2X + type(psb_zspmat_type), intent(in) :: map_X2Y, map_Y2X integer, intent(in) :: map_kind integer, intent(in), optional :: iaggr(:), naggr(:) ! diff --git a/base/tools/psb_scdbldext.F90 b/base/tools/psb_scdbldext.F90 index 00200017..3bfa2164 100644 --- a/base/tools/psb_scdbldext.F90 +++ b/base/tools/psb_scdbldext.F90 @@ -73,7 +73,7 @@ Subroutine psb_scdbldext(a,desc_a,novr,desc_ov,info, extype) ! .. Array Arguments .. integer, intent(in) :: novr - Type(psb_s_sparse_mat), Intent(in) :: a + Type(psb_sspmat_type), Intent(in) :: a Type(psb_desc_type), Intent(in), target :: desc_a Type(psb_desc_type), Intent(out) :: desc_ov integer, intent(out) :: info diff --git a/base/tools/psb_sspalloc.f90 b/base/tools/psb_sspalloc.f90 index 46e5be92..03966410 100644 --- a/base/tools/psb_sspalloc.f90 +++ b/base/tools/psb_sspalloc.f90 @@ -35,7 +35,7 @@ ! Allocate sparse matrix structure for psblas routines. ! ! Arguments: -! a - type(psb_s_sparse_mat). The sparse matrix to be allocated. +! a - type(psb_sspmat_type). The sparse matrix to be allocated. ! desc_a - type(psb_desc_type). The communication descriptor to be updated. ! info - integer. Return code. ! nnz - integer(optional). The number of nonzeroes in the matrix. @@ -47,7 +47,7 @@ subroutine psb_sspalloc(a, desc_a, info, nnz) !....parameters... type(psb_desc_type), intent(in) :: desc_a - type(psb_s_sparse_mat), intent(inout) :: a + type(psb_sspmat_type), intent(inout) :: a integer, intent(out) :: info integer, optional, intent(in) :: nnz diff --git a/base/tools/psb_sspasb.f90 b/base/tools/psb_sspasb.f90 index f07c42d1..a55e80d2 100644 --- a/base/tools/psb_sspasb.f90 +++ b/base/tools/psb_sspasb.f90 @@ -35,7 +35,7 @@ ! Assemble sparse matrix ! ! Arguments: -! a - type(psb_s_sparse_mat). The sparse matrix to be allocated. +! a - type(psb_sspmat_type). The sparse matrix to be allocated. ! desc_a - type(psb_desc_type). The communication descriptor. ! info - integer. return code. ! afmt - character(optional) The desired output storage format. @@ -55,7 +55,7 @@ subroutine psb_sspasb(a,desc_a, info, afmt, upd, dupl, mold) !...Parameters.... - type(psb_s_sparse_mat), intent (inout) :: a + type(psb_sspmat_type), intent (inout) :: a type(psb_desc_type), intent(in) :: desc_a integer, intent(out) :: info integer,optional, intent(in) :: dupl, upd diff --git a/base/tools/psb_sspfree.f90 b/base/tools/psb_sspfree.f90 index d3b37e23..76f4ad46 100644 --- a/base/tools/psb_sspfree.f90 +++ b/base/tools/psb_sspfree.f90 @@ -45,7 +45,7 @@ subroutine psb_sspfree(a, desc_a,info) !....parameters... type(psb_desc_type), intent(in) :: desc_a - type(psb_s_sparse_mat), intent(inout) :: a + type(psb_sspmat_type), intent(inout) :: a integer, intent(out) :: info !...locals.... integer :: ictxt,err_act diff --git a/base/tools/psb_ssphalo.F90 b/base/tools/psb_ssphalo.F90 index ffce7520..2c83f975 100644 --- a/base/tools/psb_ssphalo.F90 +++ b/base/tools/psb_ssphalo.F90 @@ -68,8 +68,8 @@ Subroutine psb_ssphalo(a,desc_a,blk,info,rowcnv,colcnv,& include 'mpif.h' #endif - Type(psb_s_sparse_mat),Intent(in) :: a - Type(psb_s_sparse_mat),Intent(inout) :: blk + Type(psb_sspmat_type),Intent(in) :: a + Type(psb_sspmat_type),Intent(inout) :: blk Type(psb_desc_type),Intent(in), target :: desc_a integer, intent(out) :: info logical, optional, intent(in) :: rowcnv,colcnv,rowscale,colscale diff --git a/base/tools/psb_sspins.f90 b/base/tools/psb_sspins.f90 index f71e981c..3ebebd77 100644 --- a/base/tools/psb_sspins.f90 +++ b/base/tools/psb_sspins.f90 @@ -42,7 +42,7 @@ ! ia(:) - integer The row indices of the coefficients. ! ja(:) - integer The column indices of the coefficients. ! val(:) - real The values of the coefficients to be inserted. -! a - type(psb_s_sparse_mat). The sparse destination matrix. +! a - type(psb_sspmat_type). The sparse destination matrix. ! desc_a - type(psb_desc_type). The communication descriptor. ! info - integer. Error code ! rebuild - logical Allows to reopen a matrix under @@ -54,7 +54,7 @@ subroutine psb_sspins(nz,ia,ja,val,a,desc_a,info,rebuild) !....parameters... type(psb_desc_type), intent(inout) :: desc_a - type(psb_s_sparse_mat), intent(inout) :: a + type(psb_sspmat_type), intent(inout) :: a integer, intent(in) :: nz,ia(:),ja(:) real(psb_spk_), intent(in) :: val(:) integer, intent(out) :: info @@ -237,7 +237,7 @@ subroutine psb_sspins_2desc(nz,ia,ja,val,a,desc_ar,desc_ac,info) !....parameters... type(psb_desc_type), intent(in) :: desc_ar type(psb_desc_type), intent(inout) :: desc_ac - type(psb_s_sparse_mat), intent(inout) :: a + type(psb_sspmat_type), intent(inout) :: a integer, intent(in) :: nz,ia(:),ja(:) real(kind=psb_spk_), intent(in) :: val(:) integer, intent(out) :: info diff --git a/base/tools/psb_ssprn.f90 b/base/tools/psb_ssprn.f90 index 56417001..ee68a1bf 100644 --- a/base/tools/psb_ssprn.f90 +++ b/base/tools/psb_ssprn.f90 @@ -36,7 +36,7 @@ ! is in the update state. ! ! Arguments: -! a - type(psb_s_sparse_mat). The sparse matrix to be reinitiated. +! a - type(psb_sspmat_type). The sparse matrix to be reinitiated. ! desc_a - type(psb_desc_type). The communication descriptor. ! info - integer. Return code. ! clear - logical, optional Whether the coefficients should be zeroed @@ -47,7 +47,7 @@ Subroutine psb_ssprn(a, desc_a,info,clear) !....Parameters... Type(psb_desc_type), intent(in) :: desc_a - Type(psb_s_sparse_mat), intent(inout) :: a + Type(psb_sspmat_type), intent(inout) :: a integer, intent(out) :: info logical, intent(in), optional :: clear diff --git a/base/tools/psb_zcdbldext.F90 b/base/tools/psb_zcdbldext.F90 index e3550417..7e0f1886 100644 --- a/base/tools/psb_zcdbldext.F90 +++ b/base/tools/psb_zcdbldext.F90 @@ -37,7 +37,7 @@ ! specified on input. ! ! Arguments: -! a - type(psb_z_sparse_mat). The input sparse matrix. +! a - type(psb_zspmat_type). The input sparse matrix. ! desc_a - type(psb_desc_type). The input communication descriptor. ! novr - integer. The number of overlap levels. ! desc_ov - type(psb_desc_type). The auxiliary output communication @@ -73,7 +73,7 @@ Subroutine psb_zcdbldext(a,desc_a,novr,desc_ov,info, extype) ! .. Array Arguments .. integer, intent(in) :: novr - Type(psb_z_sparse_mat), Intent(in) :: a + Type(psb_zspmat_type), Intent(in) :: a Type(psb_desc_type), Intent(in), target :: desc_a Type(psb_desc_type), Intent(out) :: desc_ov integer, intent(out) :: info diff --git a/base/tools/psb_zspalloc.f90 b/base/tools/psb_zspalloc.f90 index 0f14cfad..b5b9499c 100644 --- a/base/tools/psb_zspalloc.f90 +++ b/base/tools/psb_zspalloc.f90 @@ -35,7 +35,7 @@ ! Allocate sparse matrix structure for psblas routines. ! ! Arguments: -! a - type(psb_z_sparse_mat). The sparse matrix to be allocated. +! a - type(psb_zspmat_type). The sparse matrix to be allocated. ! desc_a - type(psb_desc_type). The communication descriptor to be updated. ! info - integer. Return code. ! nnz - integer(optional). The number of nonzeroes in the matrix. @@ -47,7 +47,7 @@ subroutine psb_zspalloc(a, desc_a, info, nnz) !....parameters... type(psb_desc_type), intent(in) :: desc_a - type(psb_z_sparse_mat), intent(inout) :: a + type(psb_zspmat_type), intent(inout) :: a integer, intent(out) :: info integer, optional, intent(in) :: nnz diff --git a/base/tools/psb_zspasb.f90 b/base/tools/psb_zspasb.f90 index aa35151c..bd986e31 100644 --- a/base/tools/psb_zspasb.f90 +++ b/base/tools/psb_zspasb.f90 @@ -35,7 +35,7 @@ ! Assemble sparse matrix ! ! Arguments: -! a - type(psb_z_sparse_mat). The sparse matrix to be assembled +! a - type(psb_zspmat_type). The sparse matrix to be assembled ! desc_a - type(psb_desc_type). The communication descriptor. ! info - integer. return code. ! afmt - character(optional) The desired output storage format. @@ -55,7 +55,7 @@ subroutine psb_zspasb(a,desc_a, info, afmt, upd, dupl, mold) !...Parameters.... - type(psb_z_sparse_mat), intent (inout) :: a + type(psb_zspmat_type), intent (inout) :: a type(psb_desc_type), intent(in) :: desc_a integer, intent(out) :: info integer,optional, intent(in) :: dupl, upd diff --git a/base/tools/psb_zspfree.f90 b/base/tools/psb_zspfree.f90 index ec1b1d10..b44bc423 100644 --- a/base/tools/psb_zspfree.f90 +++ b/base/tools/psb_zspfree.f90 @@ -35,7 +35,7 @@ ! Frees a sparse matrix structure. ! ! Arguments: -! a - type(psb_z_sparse_mat). The sparse matrix to be freed. +! a - type(psb_zspmat_type). The sparse matrix to be freed. ! desc_a - type(psb_desc_type). The communication descriptor. ! info - integer. return code. ! @@ -45,7 +45,7 @@ subroutine psb_zspfree(a, desc_a,info) !....parameters... type(psb_desc_type), intent(in) :: desc_a - type(psb_z_sparse_mat), intent(inout) :: a + type(psb_zspmat_type), intent(inout) :: a integer, intent(out) :: info !...locals.... integer :: ictxt, err_act diff --git a/base/tools/psb_zsphalo.F90 b/base/tools/psb_zsphalo.F90 index b188b191..0a2bafc2 100644 --- a/base/tools/psb_zsphalo.F90 +++ b/base/tools/psb_zsphalo.F90 @@ -38,9 +38,9 @@ ! ! ! Arguments: -! a - type(psb_z_sparse_mat) The local part of input matrix A +! a - type(psb_zspmat_type) The local part of input matrix A ! desc_a - type(psb_desc_type). The communication descriptor. -! blck - type(psb_z_sparse_mat) The local part of output matrix BLCK +! blck - type(psb_zspmat_type) The local part of output matrix BLCK ! info - integer. Return code ! rowcnv - logical Should row/col indices be converted ! colcnv - logical to/from global numbering when sent/received? @@ -67,8 +67,8 @@ Subroutine psb_zsphalo(a,desc_a,blk,info,rowcnv,colcnv,& include 'mpif.h' #endif - Type(psb_z_sparse_mat),Intent(in) :: a - Type(psb_z_sparse_mat),Intent(inout) :: blk + Type(psb_zspmat_type),Intent(in) :: a + Type(psb_zspmat_type),Intent(inout) :: blk Type(psb_desc_type),Intent(in), target :: desc_a integer, intent(out) :: info logical, optional, intent(in) :: rowcnv,colcnv,rowscale,colscale diff --git a/base/tools/psb_zspins.f90 b/base/tools/psb_zspins.f90 index 520d163e..5dfa9607 100644 --- a/base/tools/psb_zspins.f90 +++ b/base/tools/psb_zspins.f90 @@ -42,7 +42,7 @@ ! ia(:) - integer The row indices of the coefficients. ! ja(:) - integer The column indices of the coefficients. ! val(:) - complex The values of the coefficients to be inserted. -! a - type(psb_d_sparse_mat). The sparse destination matrix. +! a - type(psb_dspmat_type). The sparse destination matrix. ! desc_a - type(psb_desc_type). The communication descriptor. ! info - integer. Error code ! rebuild - logical Allows to reopen a matrix under @@ -54,7 +54,7 @@ subroutine psb_zspins(nz,ia,ja,val,a,desc_a,info,rebuild) !....parameters... type(psb_desc_type), intent(inout) :: desc_a - type(psb_z_sparse_mat), intent(inout) :: a + type(psb_zspmat_type), intent(inout) :: a integer, intent(in) :: nz,ia(:),ja(:) complex(psb_dpk_), intent(in) :: val(:) integer, intent(out) :: info @@ -237,7 +237,7 @@ subroutine psb_zspins_2desc(nz,ia,ja,val,a,desc_ar,desc_ac,info) !....parameters... type(psb_desc_type), intent(in) :: desc_ar type(psb_desc_type), intent(inout) :: desc_ac - type(psb_z_sparse_mat), intent(inout) :: a + type(psb_zspmat_type), intent(inout) :: a integer, intent(in) :: nz,ia(:),ja(:) complex(psb_dpk_), intent(in) :: val(:) integer, intent(out) :: info diff --git a/base/tools/psb_zsprn.f90 b/base/tools/psb_zsprn.f90 index c09d507d..e3899153 100644 --- a/base/tools/psb_zsprn.f90 +++ b/base/tools/psb_zsprn.f90 @@ -36,7 +36,7 @@ ! is in the update state. ! ! Arguments: -! a - type(psb_z_sparse_mat). The sparse matrix to be reinitiated. +! a - type(psb_zspmat_type). The sparse matrix to be reinitiated. ! desc_a - type(psb_desc_type). The communication descriptor. ! info - integer. Return code. ! clear - logical, optional Whether the coefficients should be zeroed @@ -48,7 +48,7 @@ Subroutine psb_zsprn(a, desc_a,info,clear) !....Parameters... Type(psb_desc_type), intent(in) :: desc_a - Type(psb_z_sparse_mat), intent(inout) :: a + Type(psb_zspmat_type), intent(inout) :: a integer, intent(out) :: info logical, intent(in), optional :: clear diff --git a/krylov/psb_c_inner_krylov_mod.f90 b/krylov/psb_c_inner_krylov_mod.f90 index be1c5f69..f373e832 100644 --- a/krylov/psb_c_inner_krylov_mod.f90 +++ b/krylov/psb_c_inner_krylov_mod.f90 @@ -52,7 +52,7 @@ contains implicit none character(len=*), intent(in) :: methdname integer, intent(in) :: stopc, trace, itmax - type(psb_c_sparse_mat), intent(in) :: a + type(psb_cspmat_type), intent(in) :: a complex(psb_spk_), intent(in) :: b(:) real(psb_spk_), intent(in) :: eps type(psb_desc_type), intent(in) :: desc_a diff --git a/krylov/psb_cbicg.f90 b/krylov/psb_cbicg.f90 index 54ed8349..e1cee613 100644 --- a/krylov/psb_cbicg.f90 +++ b/krylov/psb_cbicg.f90 @@ -62,7 +62,7 @@ ! ! Arguments: ! -! a - type(psb_c_sparse_mat) Input: sparse matrix containing A. +! a - type(psb_cspmat_type) Input: sparse matrix containing A. ! prec - class(psb_cprec_type) Input: preconditioner ! b(:) - complex Input: vector containing the ! right hand side B @@ -101,7 +101,7 @@ subroutine psb_cbicg(a,prec,b,x,eps,desc_a,info,itmax,iter,err,itrace,istop) implicit none !!$ parameters - type(psb_c_sparse_mat), intent(in) :: a + type(psb_cspmat_type), intent(in) :: a class(psb_cprec_type), intent(in) :: prec type(psb_desc_type), intent(in) :: desc_a complex(psb_spk_), intent(in) :: b(:) diff --git a/krylov/psb_ccg.f90 b/krylov/psb_ccg.f90 index 24c05f69..6c1cef09 100644 --- a/krylov/psb_ccg.f90 +++ b/krylov/psb_ccg.f90 @@ -63,7 +63,7 @@ ! ! Arguments: ! -! a - type(psb_c_sparse_mat) Input: sparse matrix containing A. +! a - type(psb_cspmat_type) Input: sparse matrix containing A. ! prec - class(psb_cprec_type) Input: preconditioner ! b(:) - complex Input: vector containing the ! right hand side B @@ -103,7 +103,7 @@ subroutine psb_ccg(a,prec,b,x,eps,desc_a,info,itmax,iter,err,itrace,istop) implicit none !!$ Parameters - Type(psb_c_sparse_mat), Intent(in) :: a + Type(psb_cspmat_type), Intent(in) :: a class(psb_cprec_type), Intent(in) :: prec Type(psb_desc_type), Intent(in) :: desc_a complex(psb_spk_), Intent(in) :: b(:) diff --git a/krylov/psb_ccgs.f90 b/krylov/psb_ccgs.f90 index 8a313297..7c4b211c 100644 --- a/krylov/psb_ccgs.f90 +++ b/krylov/psb_ccgs.f90 @@ -61,7 +61,7 @@ ! ! Arguments: ! -! a - type(psb_c_sparse_mat) Input: sparse matrix containing A. +! a - type(psb_cspmat_type) Input: sparse matrix containing A. ! prec - class(psb_cprec_type) Input: preconditioner ! b - complex,dimension(:) Input: vector containing the ! right hand side B @@ -100,7 +100,7 @@ Subroutine psb_ccgs(a,prec,b,x,eps,desc_a,info,itmax,iter,err,itrace,istop) implicit none !!$ parameters - Type(psb_c_sparse_mat), Intent(in) :: a + Type(psb_cspmat_type), Intent(in) :: a Type(psb_desc_type), Intent(in) :: desc_a class(psb_cprec_type), Intent(in) :: prec Complex(psb_spk_), Intent(in) :: b(:) diff --git a/krylov/psb_ccgstab.f90 b/krylov/psb_ccgstab.f90 index 1eff9ae7..44b1f8fb 100644 --- a/krylov/psb_ccgstab.f90 +++ b/krylov/psb_ccgstab.f90 @@ -62,7 +62,7 @@ ! ! Arguments: ! -! a - type(psb_c_sparse_mat) Input: sparse matrix containing A. +! a - type(psb_cspmat_type) Input: sparse matrix containing A. ! prec - class(psb_cprec_type) Input: preconditioner ! b - complex,dimension(:) Input: vector containing the ! right hand side B @@ -100,7 +100,7 @@ subroutine psb_ccgstab(a,prec,b,x,eps,desc_a,info,itmax,iter,err,itrace,istop) use psb_krylov_mod Implicit None !!$ parameters - Type(psb_c_sparse_mat), Intent(in) :: a + Type(psb_cspmat_type), Intent(in) :: a class(psb_cprec_type), Intent(in) :: prec Type(psb_desc_type), Intent(in) :: desc_a Complex(psb_spk_), Intent(in) :: b(:) diff --git a/krylov/psb_ccgstabl.f90 b/krylov/psb_ccgstabl.f90 index 4c7122c3..72002609 100644 --- a/krylov/psb_ccgstabl.f90 +++ b/krylov/psb_ccgstabl.f90 @@ -69,7 +69,7 @@ ! ! Arguments: ! -! a - type(psb_c_sparse_mat) Input: sparse matrix containing A. +! a - type(psb_cspmat_type) Input: sparse matrix containing A. ! prec - class(psb_cprec_type) Input: preconditioner ! b(:) - complex Input: vector containing the ! right hand side B @@ -111,7 +111,7 @@ Subroutine psb_ccgstabl(a,prec,b,x,eps,desc_a,info,itmax,iter,err,itrace,irst,is implicit none !!$ parameters - Type(psb_c_sparse_mat), Intent(in) :: a + Type(psb_cspmat_type), Intent(in) :: a class(psb_cprec_type), Intent(in) :: prec Type(psb_desc_type), Intent(in) :: desc_a complex(psb_spk_), Intent(in) :: b(:) diff --git a/krylov/psb_ckrylov.f90 b/krylov/psb_ckrylov.f90 index 1c21437b..d10c7185 100644 --- a/krylov/psb_ckrylov.f90 +++ b/krylov/psb_ckrylov.f90 @@ -49,7 +49,7 @@ ! BICGSTABL ! RGMRES ! - ! a - type(psb_c_sparse_mat) Input: sparse matrix containing A. + ! a - type(psb_cspmat_type) Input: sparse matrix containing A. ! prec - class(psb_cprec_type) Input: preconditioner ! b - complex,dimension(:) Input: vector containing the ! right hand side B @@ -84,7 +84,7 @@ Subroutine psb_ckrylov(method,a,prec,b,x,eps,desc_a,info,itmax,iter,err,itrace,i use psb_prec_mod,only : psb_sprec_type, psb_dprec_type, psb_cprec_type, psb_zprec_type use psb_krylov_mod, psb_protect_name => psb_ckrylov character(len=*) :: method - Type(psb_c_sparse_mat), Intent(in) :: a + Type(psb_cspmat_type), Intent(in) :: a Type(psb_desc_type), Intent(in) :: desc_a class(psb_cprec_type), intent(in) :: prec complex(psb_spk_), Intent(in) :: b(:) @@ -97,9 +97,9 @@ Subroutine psb_ckrylov(method,a,prec,b,x,eps,desc_a,info,itmax,iter,err,itrace,i interface subroutine psb_ccg(a,prec,b,x,eps,& & desc_a,info,itmax,iter,err,itrace,istop) - use psb_sparse_mod, only : psb_desc_type, psb_c_sparse_mat, psb_spk_ + use psb_sparse_mod, only : psb_desc_type, psb_cspmat_type, psb_spk_ use psb_prec_mod, only : psb_cprec_type - type(psb_c_sparse_mat), intent(in) :: a + type(psb_cspmat_type), intent(in) :: a type(psb_desc_type), intent(in) :: desc_a complex(psb_spk_), intent(in) :: b(:) complex(psb_spk_), intent(inout) :: x(:) @@ -112,9 +112,9 @@ Subroutine psb_ckrylov(method,a,prec,b,x,eps,desc_a,info,itmax,iter,err,itrace,i end subroutine psb_ccg subroutine psb_cbicg(a,prec,b,x,eps,& & desc_a,info,itmax,iter,err,itrace,istop) - use psb_sparse_mod, only : psb_desc_type, psb_c_sparse_mat, psb_spk_ + use psb_sparse_mod, only : psb_desc_type, psb_cspmat_type, psb_spk_ use psb_prec_mod, only : psb_cprec_type - type(psb_c_sparse_mat), intent(in) :: a + type(psb_cspmat_type), intent(in) :: a type(psb_desc_type), intent(in) :: desc_a complex(psb_spk_), intent(in) :: b(:) complex(psb_spk_), intent(inout) :: x(:) @@ -127,9 +127,9 @@ Subroutine psb_ckrylov(method,a,prec,b,x,eps,desc_a,info,itmax,iter,err,itrace,i end subroutine psb_cbicg subroutine psb_ccgstab(a,prec,b,x,eps,& & desc_a,info,itmax,iter,err,itrace,istop) - use psb_sparse_mod, only : psb_desc_type, psb_c_sparse_mat, psb_spk_ + use psb_sparse_mod, only : psb_desc_type, psb_cspmat_type, psb_spk_ use psb_prec_mod, only : psb_cprec_type - type(psb_c_sparse_mat), intent(in) :: a + type(psb_cspmat_type), intent(in) :: a type(psb_desc_type), intent(in) :: desc_a complex(psb_spk_), intent(in) :: b(:) complex(psb_spk_), intent(inout) :: x(:) @@ -142,9 +142,9 @@ Subroutine psb_ckrylov(method,a,prec,b,x,eps,desc_a,info,itmax,iter,err,itrace,i end subroutine psb_ccgstab Subroutine psb_ccgstabl(a,prec,b,x,eps,desc_a,info,& &itmax,iter,err,itrace,irst,istop) - use psb_sparse_mod, only : psb_desc_type, psb_c_sparse_mat, psb_spk_ + use psb_sparse_mod, only : psb_desc_type, psb_cspmat_type, psb_spk_ use psb_prec_mod, only : psb_cprec_type - Type(psb_c_sparse_mat), Intent(in) :: a + Type(psb_cspmat_type), Intent(in) :: a Type(psb_desc_type), Intent(in) :: desc_a class(psb_cprec_type), intent(in) :: prec complex(psb_spk_), Intent(in) :: b(:) @@ -157,9 +157,9 @@ Subroutine psb_ckrylov(method,a,prec,b,x,eps,desc_a,info,itmax,iter,err,itrace,i end subroutine psb_ccgstabl Subroutine psb_crgmres(a,prec,b,x,eps,desc_a,info,& &itmax,iter,err,itrace,irst,istop) - use psb_sparse_mod, only : psb_desc_type, psb_c_sparse_mat, psb_spk_ + use psb_sparse_mod, only : psb_desc_type, psb_cspmat_type, psb_spk_ use psb_prec_mod, only : psb_cprec_type - Type(psb_c_sparse_mat), Intent(in) :: a + Type(psb_cspmat_type), Intent(in) :: a Type(psb_desc_type), Intent(in) :: desc_a class(psb_cprec_type), intent(in) :: prec complex(psb_spk_), Intent(in) :: b(:) @@ -172,9 +172,9 @@ Subroutine psb_ckrylov(method,a,prec,b,x,eps,desc_a,info,itmax,iter,err,itrace,i end subroutine psb_crgmres subroutine psb_ccgs(a,prec,b,x,eps,& & desc_a,info,itmax,iter,err,itrace,istop) - use psb_sparse_mod, only : psb_desc_type, psb_c_sparse_mat, psb_spk_ + use psb_sparse_mod, only : psb_desc_type, psb_cspmat_type, psb_spk_ use psb_prec_mod, only : psb_cprec_type - type(psb_c_sparse_mat), intent(in) :: a + type(psb_cspmat_type), intent(in) :: a type(psb_desc_type), intent(in) :: desc_a complex(psb_spk_), intent(in) :: b(:) complex(psb_spk_), intent(inout) :: x(:) diff --git a/krylov/psb_crgmres.f90 b/krylov/psb_crgmres.f90 index be50e5cc..b2f0dce4 100644 --- a/krylov/psb_crgmres.f90 +++ b/krylov/psb_crgmres.f90 @@ -73,7 +73,7 @@ ! ! Arguments: ! -! a - type(psb_c_sparse_mat) Input: sparse matrix containing A. +! a - type(psb_cspmat_type) Input: sparse matrix containing A. ! prec - class(psb_cprec_type) Input: preconditioner ! b - complex,dimension(:) Input: vector containing the ! right hand side B @@ -113,7 +113,7 @@ Subroutine psb_crgmres(a,prec,b,x,eps,desc_a,info,itmax,iter,err,itrace,irst,ist implicit none !!$ Parameters - Type(psb_c_sparse_mat), Intent(in) :: a + Type(psb_cspmat_type), Intent(in) :: a class(psb_cprec_type), Intent(in) :: prec Type(psb_desc_type), Intent(in) :: desc_a complex(psb_spk_), Intent(in) :: b(:) diff --git a/krylov/psb_d_inner_krylov_mod.f90 b/krylov/psb_d_inner_krylov_mod.f90 index a094aacf..03ba3db9 100644 --- a/krylov/psb_d_inner_krylov_mod.f90 +++ b/krylov/psb_d_inner_krylov_mod.f90 @@ -54,7 +54,7 @@ contains implicit none character(len=*), intent(in) :: methdname integer, intent(in) :: stopc, trace,itmax - type(psb_d_sparse_mat), intent(in) :: a + type(psb_dspmat_type), intent(in) :: a real(psb_dpk_), intent(in) :: b(:), eps type(psb_desc_type), intent(in) :: desc_a type(psb_itconv_type) :: stopdat diff --git a/krylov/psb_dbicg.f90 b/krylov/psb_dbicg.f90 index 3d397c3a..bb145afa 100644 --- a/krylov/psb_dbicg.f90 +++ b/krylov/psb_dbicg.f90 @@ -62,7 +62,7 @@ ! ! Arguments: ! -! a - type(psb_d_sparse_mat) Input: sparse matrix containing A. +! a - type(psb_dspmat_type) Input: sparse matrix containing A. ! prec - class(psb_dprec_type) Input: preconditioner ! b - real,dimension(:) Input: vector containing the ! right hand side B @@ -100,7 +100,7 @@ subroutine psb_dbicg(a,prec,b,x,eps,desc_a,info,itmax,iter,err,itrace,istop) use psb_inner_krylov_mod use psb_krylov_mod implicit none - type(psb_d_sparse_mat), intent(in) :: a + type(psb_dspmat_type), intent(in) :: a class(psb_dprec_type), intent(in) :: prec type(psb_desc_type), intent(in) :: desc_a diff --git a/krylov/psb_dcg.F90 b/krylov/psb_dcg.F90 index bd786ef5..876782d4 100644 --- a/krylov/psb_dcg.F90 +++ b/krylov/psb_dcg.F90 @@ -63,7 +63,7 @@ ! ! Arguments: ! -! a - type(psb_d_sparse_mat) Input: sparse matrix containing A. +! a - type(psb_dspmat_type) Input: sparse matrix containing A. ! prec - class(psb_dprec_type) Input: preconditioner ! b - real,dimension(:) Input: vector containing the ! right hand side B @@ -101,7 +101,7 @@ subroutine psb_dcg(a,prec,b,x,eps,desc_a,info,itmax,iter,err,itrace,istop,cond) use psb_inner_krylov_mod use psb_krylov_mod implicit none - type(psb_d_sparse_mat), intent(in) :: a + type(psb_dspmat_type), intent(in) :: a diff --git a/krylov/psb_dcgs.f90 b/krylov/psb_dcgs.f90 index 6add50b0..ecbf1c35 100644 --- a/krylov/psb_dcgs.f90 +++ b/krylov/psb_dcgs.f90 @@ -62,7 +62,7 @@ ! ! Arguments: ! -! a - type(psb_d_sparse_mat) Input: sparse matrix containing A. +! a - type(psb_dspmat_type) Input: sparse matrix containing A. ! prec - class(psb_dprec_type) Input: preconditioner ! b - real,dimension(:) Input: vector containing the ! right hand side B @@ -100,7 +100,7 @@ Subroutine psb_dcgs(a,prec,b,x,eps,desc_a,info,itmax,iter,err,itrace,istop) use psb_inner_krylov_mod use psb_krylov_mod implicit none - type(psb_d_sparse_mat), intent(in) :: a + type(psb_dspmat_type), intent(in) :: a Type(psb_desc_type), Intent(in) :: desc_a diff --git a/krylov/psb_dcgstab.F90 b/krylov/psb_dcgstab.F90 index d47a4ee4..21842316 100644 --- a/krylov/psb_dcgstab.F90 +++ b/krylov/psb_dcgstab.F90 @@ -62,7 +62,7 @@ ! ! Arguments: ! -! a - type(psb_d_sparse_mat) Input: sparse matrix containing A. +! a - type(psb_dspmat_type) Input: sparse matrix containing A. ! prec - class(psb_dprec_type) Input: preconditioner ! b - real,dimension(:) Input: vector containing the ! right hand side B @@ -100,7 +100,7 @@ Subroutine psb_dcgstab(a,prec,b,x,eps,desc_a,info,itmax,iter,err,itrace,istop) use psb_inner_krylov_mod use psb_krylov_mod implicit none - type(psb_d_sparse_mat), intent(in) :: a + type(psb_dspmat_type), intent(in) :: a class(psb_dprec_type), Intent(in) :: prec diff --git a/krylov/psb_dcgstabl.f90 b/krylov/psb_dcgstabl.f90 index 36125356..9ea1d1d9 100644 --- a/krylov/psb_dcgstabl.f90 +++ b/krylov/psb_dcgstabl.f90 @@ -69,7 +69,7 @@ ! ! Arguments: ! -! a - type(psb_d_sparse_mat) Input: sparse matrix containing A. +! a - type(psb_dspmat_type) Input: sparse matrix containing A. ! prec - class(psb_dprec_type) Input: preconditioner ! b - real,dimension(:) Input: vector containing the ! right hand side B @@ -109,7 +109,7 @@ Subroutine psb_dcgstabl(a,prec,b,x,eps,desc_a,info,itmax,iter,err,itrace,irst,is use psb_inner_krylov_mod use psb_krylov_mod implicit none - type(psb_d_sparse_mat), intent(in) :: a + type(psb_dspmat_type), intent(in) :: a class(psb_dprec_type), Intent(in) :: prec diff --git a/krylov/psb_dkrylov.f90 b/krylov/psb_dkrylov.f90 index 04331047..ef6e65fa 100644 --- a/krylov/psb_dkrylov.f90 +++ b/krylov/psb_dkrylov.f90 @@ -47,7 +47,7 @@ ! BICGSTABL ! RGMRES ! - ! a - type(psb_d_sparse_mat) Input: sparse matrix containing A. + ! a - type(psb_dspmat_type) Input: sparse matrix containing A. ! prec - class(psb_dprec_type) Input: preconditioner ! b - real,dimension(:) Input: vector containing the ! right hand side B @@ -84,7 +84,7 @@ Subroutine psb_dkrylov(method,a,prec,b,x,eps,desc_a,info,itmax,iter,err,itrace,i use psb_krylov_mod, psb_protect_name => psb_dkrylov character(len=*) :: method - Type(psb_d_sparse_mat), Intent(in) :: a + Type(psb_dspmat_type), Intent(in) :: a Type(psb_desc_type), Intent(in) :: desc_a class(psb_dprec_type), intent(in) :: prec Real(psb_dpk_), Intent(in) :: b(:) @@ -98,9 +98,9 @@ Subroutine psb_dkrylov(method,a,prec,b,x,eps,desc_a,info,itmax,iter,err,itrace,i interface subroutine psb_dcg(a,prec,b,x,eps,& & desc_a,info,itmax,iter,err,itrace,istop,cond) - use psb_sparse_mod, only : psb_desc_type, psb_d_sparse_mat, psb_dpk_ + use psb_sparse_mod, only : psb_desc_type, psb_dspmat_type, psb_dpk_ use psb_prec_mod, only : psb_dprec_type - type(psb_d_sparse_mat), intent(in) :: a + type(psb_dspmat_type), intent(in) :: a type(psb_desc_type), intent(in) :: desc_a real(psb_dpk_), intent(in) :: b(:) real(psb_dpk_), intent(inout) :: x(:) @@ -113,9 +113,9 @@ Subroutine psb_dkrylov(method,a,prec,b,x,eps,desc_a,info,itmax,iter,err,itrace,i end subroutine psb_dcg subroutine psb_dbicg(a,prec,b,x,eps,& & desc_a,info,itmax,iter,err,itrace,istop) - use psb_sparse_mod, only : psb_desc_type, psb_d_sparse_mat, psb_dpk_ + use psb_sparse_mod, only : psb_desc_type, psb_dspmat_type, psb_dpk_ use psb_prec_mod, only : psb_dprec_type - type(psb_d_sparse_mat), intent(in) :: a + type(psb_dspmat_type), intent(in) :: a type(psb_desc_type), intent(in) :: desc_a real(psb_dpk_), intent(in) :: b(:) real(psb_dpk_), intent(inout) :: x(:) @@ -128,9 +128,9 @@ Subroutine psb_dkrylov(method,a,prec,b,x,eps,desc_a,info,itmax,iter,err,itrace,i end subroutine psb_dbicg subroutine psb_dcgstab(a,prec,b,x,eps,& & desc_a,info,itmax,iter,err,itrace,istop) - use psb_sparse_mod, only : psb_desc_type, psb_d_sparse_mat, psb_dpk_ + use psb_sparse_mod, only : psb_desc_type, psb_dspmat_type, psb_dpk_ use psb_prec_mod, only : psb_dprec_type - type(psb_d_sparse_mat), intent(in) :: a + type(psb_dspmat_type), intent(in) :: a type(psb_desc_type), intent(in) :: desc_a real(psb_dpk_), intent(in) :: b(:) real(psb_dpk_), intent(inout) :: x(:) @@ -143,9 +143,9 @@ Subroutine psb_dkrylov(method,a,prec,b,x,eps,desc_a,info,itmax,iter,err,itrace,i end subroutine psb_dcgstab Subroutine psb_dcgstabl(a,prec,b,x,eps,desc_a,info,& &itmax,iter,err, itrace,irst,istop) - use psb_sparse_mod, only : psb_desc_type, psb_d_sparse_mat, psb_dpk_ + use psb_sparse_mod, only : psb_desc_type, psb_dspmat_type, psb_dpk_ use psb_prec_mod, only : psb_dprec_type - Type(psb_d_sparse_mat), Intent(in) :: a + Type(psb_dspmat_type), Intent(in) :: a Type(psb_desc_type), Intent(in) :: desc_a class(psb_dprec_type), intent(in) :: prec Real(psb_dpk_), Intent(in) :: b(:) @@ -158,9 +158,9 @@ Subroutine psb_dkrylov(method,a,prec,b,x,eps,desc_a,info,itmax,iter,err,itrace,i end subroutine psb_dcgstabl Subroutine psb_drgmres(a,prec,b,x,eps,desc_a,info,& &itmax,iter,err,itrace,irst,istop) - use psb_sparse_mod, only : psb_desc_type, psb_d_sparse_mat, psb_dpk_ + use psb_sparse_mod, only : psb_desc_type, psb_dspmat_type, psb_dpk_ use psb_prec_mod, only : psb_dprec_type - Type(psb_d_sparse_mat), Intent(in) :: a + Type(psb_dspmat_type), Intent(in) :: a Type(psb_desc_type), Intent(in) :: desc_a class(psb_dprec_type), intent(in) :: prec Real(psb_dpk_), Intent(in) :: b(:) @@ -173,9 +173,9 @@ Subroutine psb_dkrylov(method,a,prec,b,x,eps,desc_a,info,itmax,iter,err,itrace,i end subroutine psb_drgmres subroutine psb_dcgs(a,prec,b,x,eps,desc_a,info,& &itmax,iter,err,itrace,istop) - use psb_sparse_mod, only : psb_desc_type, psb_d_sparse_mat, psb_dpk_ + use psb_sparse_mod, only : psb_desc_type, psb_dspmat_type, psb_dpk_ use psb_prec_mod, only : psb_dprec_type - type(psb_d_sparse_mat), intent(in) :: a + type(psb_dspmat_type), intent(in) :: a type(psb_desc_type), intent(in) :: desc_a class(psb_dprec_type), intent(in) :: prec real(psb_dpk_), intent(in) :: b(:) diff --git a/krylov/psb_drgmres.f90 b/krylov/psb_drgmres.f90 index c7cc4a10..437320b4 100644 --- a/krylov/psb_drgmres.f90 +++ b/krylov/psb_drgmres.f90 @@ -73,7 +73,7 @@ ! ! Arguments: ! -! a - type(psb_d_sparse_mat) Input: sparse matrix containing A. +! a - type(psb_dspmat_type) Input: sparse matrix containing A. ! prec - class(psb_dprec_type) Input: preconditioner ! b - real,dimension(:) Input: vector containing the ! right hand side B @@ -112,7 +112,7 @@ subroutine psb_drgmres(a,prec,b,x,eps,desc_a,info,itmax,iter,err,itrace,irst,ist use psb_inner_krylov_mod use psb_krylov_mod implicit none - type(psb_d_sparse_mat), intent(in) :: a + type(psb_dspmat_type), intent(in) :: a class(psb_dprec_type), Intent(in) :: prec diff --git a/krylov/psb_krylov_mod.f90 b/krylov/psb_krylov_mod.f90 index 2c205c83..20401867 100644 --- a/krylov/psb_krylov_mod.f90 +++ b/krylov/psb_krylov_mod.f90 @@ -41,11 +41,11 @@ Module psb_krylov_mod interface psb_krylov Subroutine psb_skrylov(method,a,prec,b,x,eps,desc_a,info,itmax,iter,err,itrace,irst,istop,cond) - use psb_sparse_mod, only : psb_desc_type, psb_s_sparse_mat, psb_spk_ + use psb_sparse_mod, only : psb_desc_type, psb_sspmat_type, psb_spk_ use psb_prec_mod,only : psb_sprec_type, psb_dprec_type, psb_cprec_type, psb_zprec_type character(len=*) :: method - Type(psb_s_sparse_mat), Intent(in) :: a + Type(psb_sspmat_type), Intent(in) :: a Type(psb_desc_type), Intent(in) :: desc_a class(psb_sprec_type), intent(in) :: prec Real(psb_spk_), Intent(in) :: b(:) @@ -57,10 +57,10 @@ Module psb_krylov_mod Real(psb_spk_), Optional, Intent(out) :: err,cond end Subroutine psb_skrylov Subroutine psb_ckrylov(method,a,prec,b,x,eps,desc_a,info,itmax,iter,err,itrace,irst,istop) - use psb_sparse_mod, only : psb_desc_type, psb_c_sparse_mat, psb_spk_ + use psb_sparse_mod, only : psb_desc_type, psb_cspmat_type, psb_spk_ use psb_prec_mod,only : psb_sprec_type, psb_dprec_type, psb_cprec_type, psb_zprec_type character(len=*) :: method - Type(psb_c_sparse_mat), Intent(in) :: a + Type(psb_cspmat_type), Intent(in) :: a Type(psb_desc_type), Intent(in) :: desc_a class(psb_cprec_type), intent(in) :: prec complex(psb_spk_), Intent(in) :: b(:) @@ -73,11 +73,11 @@ Module psb_krylov_mod end Subroutine psb_ckrylov Subroutine psb_dkrylov(method,a,prec,b,x,eps,desc_a,info,itmax,iter,err,itrace,irst,istop,cond) - use psb_sparse_mod, only : psb_desc_type, psb_d_sparse_mat, psb_dpk_ + use psb_sparse_mod, only : psb_desc_type, psb_dspmat_type, psb_dpk_ use psb_prec_mod,only : psb_sprec_type, psb_dprec_type, psb_cprec_type, psb_zprec_type character(len=*) :: method - Type(psb_d_sparse_mat), Intent(in) :: a + Type(psb_dspmat_type), Intent(in) :: a Type(psb_desc_type), Intent(in) :: desc_a class(psb_dprec_type), intent(in) :: prec Real(psb_dpk_), Intent(in) :: b(:) @@ -90,10 +90,10 @@ Module psb_krylov_mod end Subroutine psb_dkrylov Subroutine psb_zkrylov(method,a,prec,b,x,eps,desc_a,info,itmax,iter,err,itrace,irst,istop) - use psb_sparse_mod, only : psb_desc_type, psb_z_sparse_mat, psb_dpk_ + use psb_sparse_mod, only : psb_desc_type, psb_zspmat_type, psb_dpk_ use psb_prec_mod,only : psb_sprec_type, psb_dprec_type, psb_cprec_type, psb_zprec_type character(len=*) :: method - Type(psb_z_sparse_mat), Intent(in) :: a + Type(psb_zspmat_type), Intent(in) :: a Type(psb_desc_type), Intent(in) :: desc_a class(psb_zprec_type), intent(in) :: prec complex(psb_dpk_), Intent(in) :: b(:) diff --git a/krylov/psb_s_inner_krylov_mod.f90 b/krylov/psb_s_inner_krylov_mod.f90 index 9c339e7c..c74b5e29 100644 --- a/krylov/psb_s_inner_krylov_mod.f90 +++ b/krylov/psb_s_inner_krylov_mod.f90 @@ -54,7 +54,7 @@ contains implicit none character(len=*), intent(in) :: methdname integer, intent(in) :: stopc, trace,itmax - type(psb_s_sparse_mat), intent(in) :: a + type(psb_sspmat_type), intent(in) :: a real(psb_spk_), intent(in) :: b(:), eps type(psb_desc_type), intent(in) :: desc_a type(psb_itconv_type) :: stopdat diff --git a/krylov/psb_sbicg.f90 b/krylov/psb_sbicg.f90 index d4000577..66800722 100644 --- a/krylov/psb_sbicg.f90 +++ b/krylov/psb_sbicg.f90 @@ -62,7 +62,7 @@ ! ! Arguments: ! -! a - type(psb_s_sparse_mat) Input: sparse matrix containing A. +! a - type(psb_sspmat_type) Input: sparse matrix containing A. ! prec - class(psb_sprec_type) Input: preconditioner ! b - real,dimension(:) Input: vector containing the ! right hand side B @@ -102,7 +102,7 @@ subroutine psb_sbicg(a,prec,b,x,eps,desc_a,info,itmax,iter,err,itrace,istop) implicit none !!$ parameters - type(psb_s_sparse_mat), intent(in) :: a + type(psb_sspmat_type), intent(in) :: a class(psb_sprec_type), intent(in) :: prec type(psb_desc_type), intent(in) :: desc_a real(psb_spk_), intent(in) :: b(:) diff --git a/krylov/psb_scg.F90 b/krylov/psb_scg.F90 index 3ad10ac5..48ba665f 100644 --- a/krylov/psb_scg.F90 +++ b/krylov/psb_scg.F90 @@ -63,7 +63,7 @@ ! ! Arguments: ! -! a - type(psb_s_sparse_mat) Input: sparse matrix containing A. +! a - type(psb_sspmat_type) Input: sparse matrix containing A. ! prec - class(psb_sprec_type) Input: preconditioner ! b - real,dimension(:) Input: vector containing the ! right hand side B @@ -103,7 +103,7 @@ subroutine psb_scg(a,prec,b,x,eps,desc_a,info,itmax,iter,err,itrace,istop,cond) implicit none !!$ Parameters - Type(psb_s_sparse_mat), Intent(in) :: a + Type(psb_sspmat_type), Intent(in) :: a class(psb_sprec_type), Intent(in) :: prec Type(psb_desc_type), Intent(in) :: desc_a Real(psb_spk_), Intent(in) :: b(:) diff --git a/krylov/psb_scgs.f90 b/krylov/psb_scgs.f90 index ae390f78..aa846c6e 100644 --- a/krylov/psb_scgs.f90 +++ b/krylov/psb_scgs.f90 @@ -62,7 +62,7 @@ ! ! Arguments: ! -! a - type(psb_s_sparse_mat) Input: sparse matrix containing A. +! a - type(psb_sspmat_type) Input: sparse matrix containing A. ! prec - class(psb_sprec_type) Input: preconditioner ! b - real,dimension(:) Input: vector containing the ! right hand side B @@ -102,7 +102,7 @@ Subroutine psb_scgs(a,prec,b,x,eps,desc_a,info,itmax,iter,err,itrace,istop) implicit none !!$ parameters - Type(psb_s_sparse_mat), Intent(in) :: a + Type(psb_sspmat_type), Intent(in) :: a Type(psb_desc_type), Intent(in) :: desc_a class(psb_sprec_type), Intent(in) :: prec Real(psb_spk_), Intent(in) :: b(:) diff --git a/krylov/psb_scgstab.F90 b/krylov/psb_scgstab.F90 index acd36603..3957c99e 100644 --- a/krylov/psb_scgstab.F90 +++ b/krylov/psb_scgstab.F90 @@ -62,7 +62,7 @@ ! ! Arguments: ! -! a - type(psb_s_sparse_mat) Input: sparse matrix containing A. +! a - type(psb_sspmat_type) Input: sparse matrix containing A. ! prec - class(psb_sprec_type) Input: preconditioner ! b - real,dimension(:) Input: vector containing the ! right hand side B @@ -101,7 +101,7 @@ Subroutine psb_scgstab(a,prec,b,x,eps,desc_a,info,itmax,iter,err,itrace,istop) use psb_krylov_mod Implicit None !!$ parameters - Type(psb_s_sparse_mat), Intent(in) :: a + Type(psb_sspmat_type), Intent(in) :: a class(psb_sprec_type), Intent(in) :: prec Type(psb_desc_type), Intent(in) :: desc_a Real(psb_spk_), Intent(in) :: b(:) diff --git a/krylov/psb_scgstabl.f90 b/krylov/psb_scgstabl.f90 index 76bbae68..07597261 100644 --- a/krylov/psb_scgstabl.f90 +++ b/krylov/psb_scgstabl.f90 @@ -69,7 +69,7 @@ ! ! Arguments: ! -! a - type(psb_s_sparse_mat) Input: sparse matrix containing A. +! a - type(psb_sspmat_type) Input: sparse matrix containing A. ! prec - class(psb_sprec_type) Input: preconditioner ! b - real,dimension(:) Input: vector containing the ! right hand side B @@ -111,7 +111,7 @@ Subroutine psb_scgstabl(a,prec,b,x,eps,desc_a,info,itmax,iter,err,itrace,irst,is implicit none !!$ parameters - Type(psb_s_sparse_mat), Intent(in) :: a + Type(psb_sspmat_type), Intent(in) :: a class(psb_sprec_type), Intent(in) :: prec Type(psb_desc_type), Intent(in) :: desc_a Real(psb_spk_), Intent(in) :: b(:) diff --git a/krylov/psb_skrylov.f90 b/krylov/psb_skrylov.f90 index 22df1c71..ff045446 100644 --- a/krylov/psb_skrylov.f90 +++ b/krylov/psb_skrylov.f90 @@ -46,7 +46,7 @@ ! BICGSTABL ! RGMRES ! - ! a - type(psb_s_sparse_mat) Input: sparse matrix containing A. + ! a - type(psb_sspmat_type) Input: sparse matrix containing A. ! prec - class(psb_sprec_type) Input: preconditioner ! b - real,dimension(:) Input: vector containing the ! right hand side B @@ -82,7 +82,7 @@ Subroutine psb_skrylov(method,a,prec,b,x,eps,desc_a,info,itmax,iter,err,itrace,i use psb_prec_mod,only : psb_sprec_type, psb_dprec_type, psb_cprec_type, psb_zprec_type use psb_krylov_mod, psb_protect_name => psb_skrylov character(len=*) :: method - Type(psb_s_sparse_mat), Intent(in) :: a + Type(psb_sspmat_type), Intent(in) :: a Type(psb_desc_type), Intent(in) :: desc_a class(psb_sprec_type), intent(in) :: prec Real(psb_spk_), Intent(in) :: b(:) @@ -96,9 +96,9 @@ Subroutine psb_skrylov(method,a,prec,b,x,eps,desc_a,info,itmax,iter,err,itrace,i interface subroutine psb_scg(a,prec,b,x,eps,& & desc_a,info,itmax,iter,err,itrace,istop,cond) - use psb_sparse_mod, only : psb_desc_type, psb_s_sparse_mat, psb_spk_ + use psb_sparse_mod, only : psb_desc_type, psb_sspmat_type, psb_spk_ use psb_prec_mod, only : psb_sprec_type - type(psb_s_sparse_mat), intent(in) :: a + type(psb_sspmat_type), intent(in) :: a type(psb_desc_type), intent(in) :: desc_a real(psb_spk_), intent(in) :: b(:) real(psb_spk_), intent(inout) :: x(:) @@ -112,9 +112,9 @@ Subroutine psb_skrylov(method,a,prec,b,x,eps,desc_a,info,itmax,iter,err,itrace,i subroutine psb_sbicg(a,prec,b,x,eps,& & desc_a,info,itmax,iter,err,itrace,istop) - use psb_sparse_mod, only : psb_desc_type, psb_s_sparse_mat, psb_spk_ + use psb_sparse_mod, only : psb_desc_type, psb_sspmat_type, psb_spk_ use psb_prec_mod, only : psb_sprec_type - type(psb_s_sparse_mat), intent(in) :: a + type(psb_sspmat_type), intent(in) :: a type(psb_desc_type), intent(in) :: desc_a real(psb_spk_), intent(in) :: b(:) real(psb_spk_), intent(inout) :: x(:) @@ -128,9 +128,9 @@ Subroutine psb_skrylov(method,a,prec,b,x,eps,desc_a,info,itmax,iter,err,itrace,i subroutine psb_scgstab(a,prec,b,x,eps,& & desc_a,info,itmax,iter,err,itrace,istop) - use psb_sparse_mod, only : psb_desc_type, psb_s_sparse_mat, psb_spk_ + use psb_sparse_mod, only : psb_desc_type, psb_sspmat_type, psb_spk_ use psb_prec_mod, only : psb_sprec_type - type(psb_s_sparse_mat), intent(in) :: a + type(psb_sspmat_type), intent(in) :: a type(psb_desc_type), intent(in) :: desc_a real(psb_spk_), intent(in) :: b(:) real(psb_spk_), intent(inout) :: x(:) @@ -144,9 +144,9 @@ Subroutine psb_skrylov(method,a,prec,b,x,eps,desc_a,info,itmax,iter,err,itrace,i Subroutine psb_scgstabl(a,prec,b,x,eps,desc_a,info,& &itmax,iter,err, itrace,irst,istop) - use psb_sparse_mod, only : psb_desc_type, psb_s_sparse_mat, psb_spk_ + use psb_sparse_mod, only : psb_desc_type, psb_sspmat_type, psb_spk_ use psb_prec_mod, only : psb_sprec_type - Type(psb_s_sparse_mat), Intent(in) :: a + Type(psb_sspmat_type), Intent(in) :: a Type(psb_desc_type), Intent(in) :: desc_a class(psb_sprec_type), intent(in) :: prec Real(psb_spk_), Intent(in) :: b(:) @@ -159,9 +159,9 @@ Subroutine psb_skrylov(method,a,prec,b,x,eps,desc_a,info,itmax,iter,err,itrace,i end subroutine psb_scgstabl Subroutine psb_srgmres(a,prec,b,x,eps,desc_a,info,& &itmax,iter,err,itrace,irst,istop) - use psb_sparse_mod, only : psb_desc_type, psb_s_sparse_mat, psb_spk_ + use psb_sparse_mod, only : psb_desc_type, psb_sspmat_type, psb_spk_ use psb_prec_mod, only : psb_sprec_type - Type(psb_s_sparse_mat), Intent(in) :: a + Type(psb_sspmat_type), Intent(in) :: a Type(psb_desc_type), Intent(in) :: desc_a class(psb_sprec_type), intent(in) :: prec Real(psb_spk_), Intent(in) :: b(:) @@ -174,9 +174,9 @@ Subroutine psb_skrylov(method,a,prec,b,x,eps,desc_a,info,itmax,iter,err,itrace,i end subroutine psb_srgmres subroutine psb_scgs(a,prec,b,x,eps,desc_a,info,& &itmax,iter,err,itrace,istop) - use psb_sparse_mod, only : psb_desc_type, psb_s_sparse_mat, psb_spk_ + use psb_sparse_mod, only : psb_desc_type, psb_sspmat_type, psb_spk_ use psb_prec_mod, only : psb_sprec_type - type(psb_s_sparse_mat), intent(in) :: a + type(psb_sspmat_type), intent(in) :: a type(psb_desc_type), intent(in) :: desc_a class(psb_sprec_type), intent(in) :: prec real(psb_spk_), intent(in) :: b(:) diff --git a/krylov/psb_srgmres.f90 b/krylov/psb_srgmres.f90 index 7eb39811..a9c94735 100644 --- a/krylov/psb_srgmres.f90 +++ b/krylov/psb_srgmres.f90 @@ -73,7 +73,7 @@ ! ! Arguments: ! -! a - type(psb_s_sparse_mat) Input: sparse matrix containing A. +! a - type(psb_sspmat_type) Input: sparse matrix containing A. ! prec - class(psb_sprec_type) Input: preconditioner ! b - real,dimension(:) Input: vector containing the ! right hand side B @@ -114,7 +114,7 @@ subroutine psb_srgmres(a,prec,b,x,eps,desc_a,info,itmax,iter,err,itrace,irst,ist implicit none !!$ Parameters - Type(psb_s_sparse_mat), Intent(in) :: a + Type(psb_sspmat_type), Intent(in) :: a class(psb_sprec_type), Intent(in) :: prec Type(psb_desc_type), Intent(in) :: desc_a Real(psb_spk_), Intent(in) :: b(:) diff --git a/krylov/psb_z_inner_krylov_mod.f90 b/krylov/psb_z_inner_krylov_mod.f90 index 8ecfe65e..16b17e5c 100644 --- a/krylov/psb_z_inner_krylov_mod.f90 +++ b/krylov/psb_z_inner_krylov_mod.f90 @@ -56,7 +56,7 @@ contains implicit none character(len=*), intent(in) :: methdname integer, intent(in) :: stopc, trace, itmax - type(psb_z_sparse_mat), intent(in) :: a + type(psb_zspmat_type), intent(in) :: a complex(psb_dpk_), intent(in) :: b(:) real(psb_dpk_), intent(in) :: eps type(psb_desc_type), intent(in) :: desc_a diff --git a/krylov/psb_zbicg.f90 b/krylov/psb_zbicg.f90 index 4937e761..cd6c7caf 100644 --- a/krylov/psb_zbicg.f90 +++ b/krylov/psb_zbicg.f90 @@ -62,7 +62,7 @@ ! ! Arguments: ! -! a - type(psb_z_sparse_mat) Input: sparse matrix containing A. +! a - type(psb_zspmat_type) Input: sparse matrix containing A. ! prec - class(psb_zprec_type) Input: preconditioner ! b(:) - complex Input: vector containing the ! right hand side B @@ -101,7 +101,7 @@ subroutine psb_zbicg(a,prec,b,x,eps,desc_a,info,itmax,iter,err,itrace,istop) implicit none !!$ parameters - type(psb_z_sparse_mat), intent(in) :: a + type(psb_zspmat_type), intent(in) :: a class(psb_zprec_type), intent(in) :: prec type(psb_desc_type), intent(in) :: desc_a complex(psb_dpk_), intent(in) :: b(:) diff --git a/krylov/psb_zcg.F90 b/krylov/psb_zcg.F90 index 8b305157..51d3d784 100644 --- a/krylov/psb_zcg.F90 +++ b/krylov/psb_zcg.F90 @@ -63,7 +63,7 @@ ! ! Arguments: ! -! a - type(psb_z_sparse_mat) Input: sparse matrix containing A. +! a - type(psb_zspmat_type) Input: sparse matrix containing A. ! prec - class(psb_zprec_type) Input: preconditioner ! b(:) - complex Input: vector containing the ! right hand side B @@ -103,7 +103,7 @@ subroutine psb_zcg(a,prec,b,x,eps,desc_a,info,itmax,iter,err,itrace,istop) implicit none !!$ Parameters - Type(psb_z_sparse_mat), Intent(in) :: a + Type(psb_zspmat_type), Intent(in) :: a class(psb_zprec_type), Intent(in) :: prec Type(psb_desc_type), Intent(in) :: desc_a complex(psb_dpk_), Intent(in) :: b(:) diff --git a/krylov/psb_zcgs.f90 b/krylov/psb_zcgs.f90 index 6fca93aa..b83c62df 100644 --- a/krylov/psb_zcgs.f90 +++ b/krylov/psb_zcgs.f90 @@ -61,7 +61,7 @@ ! ! Arguments: ! -! a - type(psb_z_sparse_mat) Input: sparse matrix containing A. +! a - type(psb_zspmat_type) Input: sparse matrix containing A. ! prec - class(psb_zprec_type) Input: preconditioner ! b - complex,dimension(:) Input: vector containing the ! right hand side B @@ -100,7 +100,7 @@ Subroutine psb_zcgs(a,prec,b,x,eps,desc_a,info,itmax,iter,err,itrace,istop) implicit none !!$ parameters - Type(psb_z_sparse_mat), Intent(in) :: a + Type(psb_zspmat_type), Intent(in) :: a Type(psb_desc_type), Intent(in) :: desc_a class(psb_zprec_type), Intent(in) :: prec Complex(psb_dpk_), Intent(in) :: b(:) diff --git a/krylov/psb_zcgstab.f90 b/krylov/psb_zcgstab.f90 index 6eb1c02c..66153b0d 100644 --- a/krylov/psb_zcgstab.f90 +++ b/krylov/psb_zcgstab.f90 @@ -62,7 +62,7 @@ ! ! Arguments: ! -! a - type(psb_z_sparse_mat) Input: sparse matrix containing A. +! a - type(psb_zspmat_type) Input: sparse matrix containing A. ! prec - class(psb_zprec_type) Input: preconditioner ! b - complex,dimension(:) Input: vector containing the ! right hand side B @@ -100,7 +100,7 @@ subroutine psb_zcgstab(a,prec,b,x,eps,desc_a,info,itmax,iter,err,itrace,istop) use psb_krylov_mod Implicit None !!$ parameters - Type(psb_z_sparse_mat), Intent(in) :: a + Type(psb_zspmat_type), Intent(in) :: a class(psb_zprec_type), Intent(in) :: prec Type(psb_desc_type), Intent(in) :: desc_a Complex(psb_dpk_), Intent(in) :: b(:) diff --git a/krylov/psb_zcgstabl.f90 b/krylov/psb_zcgstabl.f90 index dfa48c21..4d8192cf 100644 --- a/krylov/psb_zcgstabl.f90 +++ b/krylov/psb_zcgstabl.f90 @@ -69,7 +69,7 @@ ! ! Arguments: ! -! a - type(psb_z_sparse_mat) Input: sparse matrix containing A. +! a - type(psb_zspmat_type) Input: sparse matrix containing A. ! prec - class(psb_zprec_type) Input: preconditioner ! b(:) - complex Input: vector containing the ! right hand side B @@ -111,7 +111,7 @@ Subroutine psb_zcgstabl(a,prec,b,x,eps,desc_a,info,itmax,iter,err,itrace,irst,is implicit none !!$ parameters - Type(psb_z_sparse_mat), Intent(in) :: a + Type(psb_zspmat_type), Intent(in) :: a class(psb_zprec_type), Intent(in) :: prec Type(psb_desc_type), Intent(in) :: desc_a complex(psb_dpk_), Intent(in) :: b(:) diff --git a/krylov/psb_zkrylov.f90 b/krylov/psb_zkrylov.f90 index d2f89fa8..6a20445a 100644 --- a/krylov/psb_zkrylov.f90 +++ b/krylov/psb_zkrylov.f90 @@ -47,7 +47,7 @@ ! BICGSTABL ! RGMRES ! - ! a - type(psb_z_sparse_mat) Input: sparse matrix containing A. + ! a - type(psb_zspmat_type) Input: sparse matrix containing A. ! prec - class(psb_zprec_type) Input: preconditioner ! b - complex,dimension(:) Input: vector containing the ! right hand side B @@ -83,7 +83,7 @@ Subroutine psb_zkrylov(method,a,prec,b,x,eps,desc_a,info,itmax,iter,err,itrace,i use psb_krylov_mod, psb_protect_name => psb_zkrylov character(len=*) :: method - Type(psb_z_sparse_mat), Intent(in) :: a + Type(psb_zspmat_type), Intent(in) :: a Type(psb_desc_type), Intent(in) :: desc_a class(psb_zprec_type), intent(in) :: prec complex(psb_dpk_), Intent(in) :: b(:) @@ -97,9 +97,9 @@ Subroutine psb_zkrylov(method,a,prec,b,x,eps,desc_a,info,itmax,iter,err,itrace,i interface subroutine psb_zcg(a,prec,b,x,eps,& & desc_a,info,itmax,iter,err,itrace,istop) - use psb_sparse_mod, only : psb_desc_type, psb_z_sparse_mat, psb_dpk_ + use psb_sparse_mod, only : psb_desc_type, psb_zspmat_type, psb_dpk_ use psb_prec_mod, only : psb_zprec_type - type(psb_z_sparse_mat), intent(in) :: a + type(psb_zspmat_type), intent(in) :: a type(psb_desc_type), intent(in) :: desc_a complex(psb_dpk_), intent(in) :: b(:) complex(psb_dpk_), intent(inout) :: x(:) @@ -112,9 +112,9 @@ Subroutine psb_zkrylov(method,a,prec,b,x,eps,desc_a,info,itmax,iter,err,itrace,i end subroutine psb_zcg subroutine psb_zbicg(a,prec,b,x,eps,& & desc_a,info,itmax,iter,err,itrace,istop) - use psb_sparse_mod, only : psb_desc_type, psb_z_sparse_mat, psb_dpk_ + use psb_sparse_mod, only : psb_desc_type, psb_zspmat_type, psb_dpk_ use psb_prec_mod, only : psb_zprec_type - type(psb_z_sparse_mat), intent(in) :: a + type(psb_zspmat_type), intent(in) :: a type(psb_desc_type), intent(in) :: desc_a complex(psb_dpk_), intent(in) :: b(:) complex(psb_dpk_), intent(inout) :: x(:) @@ -127,9 +127,9 @@ Subroutine psb_zkrylov(method,a,prec,b,x,eps,desc_a,info,itmax,iter,err,itrace,i end subroutine psb_zbicg subroutine psb_zcgstab(a,prec,b,x,eps,& & desc_a,info,itmax,iter,err,itrace,istop) - use psb_sparse_mod, only : psb_desc_type, psb_z_sparse_mat, psb_dpk_ + use psb_sparse_mod, only : psb_desc_type, psb_zspmat_type, psb_dpk_ use psb_prec_mod, only : psb_zprec_type - type(psb_z_sparse_mat), intent(in) :: a + type(psb_zspmat_type), intent(in) :: a type(psb_desc_type), intent(in) :: desc_a complex(psb_dpk_), intent(in) :: b(:) complex(psb_dpk_), intent(inout) :: x(:) @@ -142,9 +142,9 @@ Subroutine psb_zkrylov(method,a,prec,b,x,eps,desc_a,info,itmax,iter,err,itrace,i end subroutine psb_zcgstab Subroutine psb_zcgstabl(a,prec,b,x,eps,desc_a,info,& &itmax,iter,err,itrace,irst,istop) - use psb_sparse_mod, only : psb_desc_type, psb_z_sparse_mat, psb_dpk_ + use psb_sparse_mod, only : psb_desc_type, psb_zspmat_type, psb_dpk_ use psb_prec_mod, only : psb_zprec_type - Type(psb_z_sparse_mat), Intent(in) :: a + Type(psb_zspmat_type), Intent(in) :: a Type(psb_desc_type), Intent(in) :: desc_a class(psb_zprec_type), intent(in) :: prec complex(psb_dpk_), Intent(in) :: b(:) @@ -157,9 +157,9 @@ Subroutine psb_zkrylov(method,a,prec,b,x,eps,desc_a,info,itmax,iter,err,itrace,i end subroutine psb_zcgstabl Subroutine psb_zrgmres(a,prec,b,x,eps,desc_a,info,& &itmax,iter,err,itrace,irst,istop) - use psb_sparse_mod, only : psb_desc_type, psb_z_sparse_mat, psb_dpk_ + use psb_sparse_mod, only : psb_desc_type, psb_zspmat_type, psb_dpk_ use psb_prec_mod, only : psb_zprec_type - Type(psb_z_sparse_mat), Intent(in) :: a + Type(psb_zspmat_type), Intent(in) :: a Type(psb_desc_type), Intent(in) :: desc_a class(psb_zprec_type), intent(in) :: prec complex(psb_dpk_), Intent(in) :: b(:) @@ -172,9 +172,9 @@ Subroutine psb_zkrylov(method,a,prec,b,x,eps,desc_a,info,itmax,iter,err,itrace,i end subroutine psb_zrgmres subroutine psb_zcgs(a,prec,b,x,eps,& & desc_a,info,itmax,iter,err,itrace,istop) - use psb_sparse_mod, only : psb_desc_type, psb_z_sparse_mat, psb_dpk_ + use psb_sparse_mod, only : psb_desc_type, psb_zspmat_type, psb_dpk_ use psb_prec_mod, only : psb_zprec_type - type(psb_z_sparse_mat), intent(in) :: a + type(psb_zspmat_type), intent(in) :: a type(psb_desc_type), intent(in) :: desc_a complex(psb_dpk_), intent(in) :: b(:) complex(psb_dpk_), intent(inout) :: x(:) diff --git a/krylov/psb_zrgmres.f90 b/krylov/psb_zrgmres.f90 index 885ed90a..ed8b0a94 100644 --- a/krylov/psb_zrgmres.f90 +++ b/krylov/psb_zrgmres.f90 @@ -73,7 +73,7 @@ ! ! Arguments: ! -! a - type(psb_z_sparse_mat) Input: sparse matrix containing A. +! a - type(psb_zspmat_type) Input: sparse matrix containing A. ! prec - class(psb_zprec_type) Input: preconditioner ! b - complex,dimension(:) Input: vector containing the ! right hand side B @@ -113,7 +113,7 @@ Subroutine psb_zrgmres(a,prec,b,x,eps,desc_a,info,itmax,iter,err,itrace,irst,ist implicit none !!$ Parameters - Type(psb_z_sparse_mat), Intent(in) :: a + Type(psb_zspmat_type), Intent(in) :: a class(psb_zprec_type), Intent(in) :: prec Type(psb_desc_type), Intent(in) :: desc_a complex(psb_dpk_), Intent(in) :: b(:) diff --git a/prec/psb_c_base_prec_mod.f03 b/prec/psb_c_base_prec_mod.f03 index 8de51ece..68e0525e 100644 --- a/prec/psb_c_base_prec_mod.f03 +++ b/prec/psb_c_base_prec_mod.f03 @@ -39,7 +39,7 @@ module psb_c_base_prec_mod use psb_sparse_mod, only : psb_dpk_, psb_spk_, psb_long_int_k_,& & psb_desc_type, psb_sizeof, psb_free, psb_cdfree,& & psb_erractionsave, psb_erractionrestore, psb_error, psb_get_errstatus,& - & psb_c_sparse_mat + & psb_cspmat_type use psb_prec_const_mod @@ -137,7 +137,7 @@ contains use psb_sparse_mod Implicit None - type(psb_c_sparse_mat), intent(in), target :: a + type(psb_cspmat_type), intent(in), target :: a type(psb_desc_type), intent(in), target :: desc_a class(psb_c_base_prec_type),intent(inout) :: prec integer, intent(out) :: info diff --git a/prec/psb_c_bjacprec.f03 b/prec/psb_c_bjacprec.f03 index 3221a396..02a0c73b 100644 --- a/prec/psb_c_bjacprec.f03 +++ b/prec/psb_c_bjacprec.f03 @@ -4,7 +4,7 @@ module psb_c_bjacprec type, extends(psb_c_base_prec_type) :: psb_c_bjac_prec_type integer, allocatable :: iprcparm(:) - type(psb_c_sparse_mat), allocatable :: av(:) + type(psb_cspmat_type), allocatable :: av(:) complex(psb_spk_), allocatable :: d(:) contains procedure, pass(prec) :: apply => psb_c_bjac_apply @@ -221,7 +221,7 @@ contains use psb_prec_mod Implicit None - type(psb_c_sparse_mat), intent(in), target :: a + type(psb_cspmat_type), intent(in), target :: a type(psb_desc_type), intent(in), target :: desc_a class(psb_c_bjac_prec_type),intent(inout) :: prec integer, intent(out) :: info diff --git a/prec/psb_c_diagprec.f03 b/prec/psb_c_diagprec.f03 index 29c7e727..d4b91992 100644 --- a/prec/psb_c_diagprec.f03 +++ b/prec/psb_c_diagprec.f03 @@ -158,7 +158,7 @@ contains use psb_sparse_mod Implicit None - type(psb_c_sparse_mat), intent(in), target :: a + type(psb_cspmat_type), intent(in), target :: a type(psb_desc_type), intent(in), target :: desc_a class(psb_c_diag_prec_type),intent(inout) :: prec integer, intent(out) :: info diff --git a/prec/psb_c_nullprec.f03 b/prec/psb_c_nullprec.f03 index 628f8322..f961cae5 100644 --- a/prec/psb_c_nullprec.f03 +++ b/prec/psb_c_nullprec.f03 @@ -108,7 +108,7 @@ contains use psb_sparse_mod Implicit None - type(psb_c_sparse_mat), intent(in), target :: a + type(psb_cspmat_type), intent(in), target :: a type(psb_desc_type), intent(in), target :: desc_a class(psb_c_null_prec_type),intent(inout) :: prec integer, intent(out) :: info diff --git a/prec/psb_c_prec_type.f03 b/prec/psb_c_prec_type.f03 index f0264628..49c1f645 100644 --- a/prec/psb_c_prec_type.f03 +++ b/prec/psb_c_prec_type.f03 @@ -39,7 +39,7 @@ module psb_c_prec_type use psb_sparse_mod, only : psb_dpk_, psb_spk_, psb_long_int_k_,& & psb_desc_type, psb_sizeof, psb_free, psb_cdfree,& & psb_erractionsave, psb_erractionrestore, psb_error, psb_get_errstatus,& - & psb_c_sparse_mat + & psb_cspmat_type use psb_prec_const_mod use psb_c_base_prec_mod diff --git a/prec/psb_cilu_fct.f90 b/prec/psb_cilu_fct.f90 index 6a822a4f..22c10c84 100644 --- a/prec/psb_cilu_fct.f90 +++ b/prec/psb_cilu_fct.f90 @@ -41,13 +41,13 @@ subroutine psb_cilu_fct(a,l,u,d,info,blck) ! .. Scalar Arguments .. integer, intent(out) :: info ! .. Array Arguments .. - type(psb_c_sparse_mat),intent(in) :: a + type(psb_cspmat_type),intent(in) :: a type(psb_c_csr_sparse_mat),intent(inout) :: l,u - type(psb_c_sparse_mat),intent(in), optional, target :: blck + type(psb_cspmat_type),intent(in), optional, target :: blck complex(psb_spk_), intent(inout) :: d(:) ! .. Local Scalars .. integer :: l1, l2,m,err_act - type(psb_c_sparse_mat), pointer :: blck_ + type(psb_cspmat_type), pointer :: blck_ character(len=20) :: name, ch_err name='psb_ilu_fct' info = psb_success_ @@ -117,7 +117,7 @@ contains & d,laspk,lia1,lia2,uaspk,uia1,uia2,l1,l2,info) implicit none - type(psb_c_sparse_mat) :: a,b + type(psb_cspmat_type) :: a,b integer :: m,ma,mb,l1,l2,info integer, dimension(:) :: lia1,lia2,uia1,uia2 complex(psb_spk_), dimension(:) :: laspk,uaspk,d diff --git a/prec/psb_cprecbld.f90 b/prec/psb_cprecbld.f90 index 89e73cf0..d72578cf 100644 --- a/prec/psb_cprecbld.f90 +++ b/prec/psb_cprecbld.f90 @@ -35,7 +35,7 @@ subroutine psb_cprecbld(a,desc_a,p,info,upd) use psb_prec_mod, psb_protect_name => psb_cprecbld Implicit None - type(psb_c_sparse_mat), intent(in), target :: a + type(psb_cspmat_type), intent(in), target :: a type(psb_desc_type), intent(in), target :: desc_a type(psb_cprec_type),intent(inout) :: p integer, intent(out) :: info diff --git a/prec/psb_d_base_prec_mod.f03 b/prec/psb_d_base_prec_mod.f03 index dfd42987..62ebe560 100644 --- a/prec/psb_d_base_prec_mod.f03 +++ b/prec/psb_d_base_prec_mod.f03 @@ -39,7 +39,7 @@ module psb_d_base_prec_mod use psb_sparse_mod, only : psb_dpk_, psb_spk_, psb_long_int_k_,& & psb_desc_type, psb_sizeof, psb_free, psb_cdfree,& & psb_erractionsave, psb_erractionrestore, psb_error, psb_get_errstatus,& - & psb_d_sparse_mat + & psb_dspmat_type use psb_prec_const_mod @@ -138,7 +138,7 @@ contains use psb_sparse_mod Implicit None - type(psb_d_sparse_mat), intent(in), target :: a + type(psb_dspmat_type), intent(in), target :: a type(psb_desc_type), intent(in), target :: desc_a class(psb_d_base_prec_type),intent(inout) :: prec integer, intent(out) :: info diff --git a/prec/psb_d_bjacprec.f03 b/prec/psb_d_bjacprec.f03 index ea3c46fb..c49dc75c 100644 --- a/prec/psb_d_bjacprec.f03 +++ b/prec/psb_d_bjacprec.f03 @@ -4,7 +4,7 @@ module psb_d_bjacprec type, extends(psb_d_base_prec_type) :: psb_d_bjac_prec_type integer, allocatable :: iprcparm(:) - type(psb_d_sparse_mat), allocatable :: av(:) + type(psb_dspmat_type), allocatable :: av(:) real(psb_dpk_), allocatable :: d(:) contains procedure, pass(prec) :: apply => psb_d_bjac_apply @@ -215,7 +215,7 @@ contains use psb_prec_mod Implicit None - type(psb_d_sparse_mat), intent(in), target :: a + type(psb_dspmat_type), intent(in), target :: a type(psb_desc_type), intent(in), target :: desc_a class(psb_d_bjac_prec_type),intent(inout) :: prec integer, intent(out) :: info diff --git a/prec/psb_d_diagprec.f03 b/prec/psb_d_diagprec.f03 index 8d905ca1..03b7c9be 100644 --- a/prec/psb_d_diagprec.f03 +++ b/prec/psb_d_diagprec.f03 @@ -135,7 +135,7 @@ contains use psb_sparse_mod Implicit None - type(psb_d_sparse_mat), intent(in), target :: a + type(psb_dspmat_type), intent(in), target :: a type(psb_desc_type), intent(in), target :: desc_a class(psb_d_diag_prec_type),intent(inout) :: prec integer, intent(out) :: info diff --git a/prec/psb_d_nullprec.f03 b/prec/psb_d_nullprec.f03 index 6efee9dc..2a7308fc 100644 --- a/prec/psb_d_nullprec.f03 +++ b/prec/psb_d_nullprec.f03 @@ -108,7 +108,7 @@ contains use psb_sparse_mod Implicit None - type(psb_d_sparse_mat), intent(in), target :: a + type(psb_dspmat_type), intent(in), target :: a type(psb_desc_type), intent(in), target :: desc_a class(psb_d_null_prec_type),intent(inout) :: prec integer, intent(out) :: info diff --git a/prec/psb_d_prec_type.f03 b/prec/psb_d_prec_type.f03 index d27a323b..a1ea9918 100644 --- a/prec/psb_d_prec_type.f03 +++ b/prec/psb_d_prec_type.f03 @@ -39,7 +39,7 @@ module psb_d_prec_type use psb_sparse_mod, only : psb_dpk_, psb_spk_, psb_long_int_k_,& & psb_desc_type, psb_sizeof, psb_free, psb_cdfree,& & psb_erractionsave, psb_erractionrestore, psb_error, psb_get_errstatus,& - & psb_d_sparse_mat + & psb_dspmat_type use psb_prec_const_mod diff --git a/prec/psb_dilu_fct.f90 b/prec/psb_dilu_fct.f90 index d3e1a0bd..777b3863 100644 --- a/prec/psb_dilu_fct.f90 +++ b/prec/psb_dilu_fct.f90 @@ -41,13 +41,13 @@ subroutine psb_dilu_fct(a,l,u,d,info,blck) ! .. Scalar Arguments .. integer, intent(out) :: info ! .. Array Arguments .. - type(psb_d_sparse_mat),intent(in) :: a + type(psb_dspmat_type),intent(in) :: a type(psb_d_csr_sparse_mat),intent(inout) :: l,u - type(psb_d_sparse_mat),intent(in), optional, target :: blck + type(psb_dspmat_type),intent(in), optional, target :: blck real(psb_dpk_), intent(inout) :: d(:) ! .. Local Scalars .. integer :: l1,l2,m,err_act - type(psb_d_sparse_mat), pointer :: blck_ + type(psb_dspmat_type), pointer :: blck_ character(len=20) :: name, ch_err name='psb_ilu_fct' info = psb_success_ @@ -119,8 +119,8 @@ contains implicit none - type(psb_d_sparse_mat), target :: a - type(psb_d_sparse_mat), target :: b + type(psb_dspmat_type), target :: a + type(psb_dspmat_type), target :: b integer :: m,ma,mb,l1,l2,info integer, dimension(:) :: lia1,lia2,uia1,uia2 real(psb_dpk_), dimension(:) :: laspk,uaspk,d diff --git a/prec/psb_dprecbld.f90 b/prec/psb_dprecbld.f90 index c3f848f6..0555615b 100644 --- a/prec/psb_dprecbld.f90 +++ b/prec/psb_dprecbld.f90 @@ -35,7 +35,7 @@ subroutine psb_dprecbld(a,desc_a,p,info,upd) use psb_prec_mod, psb_protect_name => psb_dprecbld Implicit None - type(psb_d_sparse_mat), intent(in), target :: a + type(psb_dspmat_type), intent(in), target :: a type(psb_desc_type), intent(in), target :: desc_a type(psb_dprec_type),intent(inout) :: p integer, intent(out) :: info diff --git a/prec/psb_prec_mod.f90 b/prec/psb_prec_mod.f90 index 74870be3..a2f0dd71 100644 --- a/prec/psb_prec_mod.f90 +++ b/prec/psb_prec_mod.f90 @@ -35,40 +35,40 @@ module psb_prec_mod interface psb_precbld subroutine psb_sprecbld(a,desc_a,prec,info,upd) - use psb_sparse_mod, only : psb_desc_type, psb_s_sparse_mat, psb_spk_ + use psb_sparse_mod, only : psb_desc_type, psb_sspmat_type, psb_spk_ use psb_prec_type, only : psb_sprec_type implicit none - type(psb_s_sparse_mat), intent(in), target :: a + type(psb_sspmat_type), intent(in), target :: a type(psb_desc_type), intent(in), target :: desc_a type(psb_sprec_type), intent(inout) :: prec integer, intent(out) :: info character, intent(in),optional :: upd end subroutine psb_sprecbld subroutine psb_dprecbld(a,desc_a,prec,info,upd) - use psb_sparse_mod, only : psb_desc_type, psb_d_sparse_mat, psb_dpk_ + use psb_sparse_mod, only : psb_desc_type, psb_dspmat_type, psb_dpk_ use psb_prec_type, only : psb_dprec_type implicit none - type(psb_d_sparse_mat), intent(in), target :: a + type(psb_dspmat_type), intent(in), target :: a type(psb_desc_type), intent(in), target :: desc_a type(psb_dprec_type), intent(inout) :: prec integer, intent(out) :: info character, intent(in),optional :: upd end subroutine psb_dprecbld subroutine psb_cprecbld(a,desc_a,prec,info,upd) - use psb_sparse_mod, only : psb_desc_type, psb_c_sparse_mat, psb_spk_ + use psb_sparse_mod, only : psb_desc_type, psb_cspmat_type, psb_spk_ use psb_prec_type, only : psb_cprec_type implicit none - type(psb_c_sparse_mat), intent(in), target :: a + type(psb_cspmat_type), intent(in), target :: a type(psb_desc_type), intent(in), target :: desc_a type(psb_cprec_type), intent(inout) :: prec integer, intent(out) :: info character, intent(in),optional :: upd end subroutine psb_cprecbld subroutine psb_zprecbld(a,desc_a,prec,info,upd) - use psb_sparse_mod, only : psb_desc_type, psb_z_sparse_mat, psb_dpk_ + use psb_sparse_mod, only : psb_desc_type, psb_zspmat_type, psb_dpk_ use psb_prec_type, only : psb_zprec_type implicit none - type(psb_z_sparse_mat), intent(in), target :: a + type(psb_zspmat_type), intent(in), target :: a type(psb_desc_type), intent(in), target :: desc_a type(psb_zprec_type), intent(inout) :: prec integer, intent(out) :: info @@ -78,7 +78,7 @@ module psb_prec_mod interface psb_precinit subroutine psb_sprecinit(prec,ptype,info) - use psb_sparse_mod, only : psb_desc_type, psb_s_sparse_mat, psb_spk_ + use psb_sparse_mod, only : psb_desc_type, psb_sspmat_type, psb_spk_ use psb_prec_type, only : psb_sprec_type implicit none type(psb_sprec_type), intent(inout) :: prec @@ -113,7 +113,7 @@ module psb_prec_mod interface psb_precset subroutine psb_sprecseti(prec,what,val,info) - use psb_sparse_mod, only : psb_desc_type, psb_s_sparse_mat, psb_spk_ + use psb_sparse_mod, only : psb_desc_type, psb_sspmat_type, psb_spk_ use psb_prec_type, only : psb_sprec_type implicit none type(psb_sprec_type), intent(inout) :: prec @@ -121,7 +121,7 @@ module psb_prec_mod integer, intent(out) :: info end subroutine psb_sprecseti subroutine psb_sprecsets(prec,what,val,info) - use psb_sparse_mod, only : psb_desc_type, psb_s_sparse_mat, psb_spk_ + use psb_sparse_mod, only : psb_desc_type, psb_sspmat_type, psb_spk_ use psb_prec_type, only : psb_sprec_type implicit none type(psb_sprec_type), intent(inout) :: prec @@ -147,7 +147,7 @@ module psb_prec_mod integer, intent(out) :: info end subroutine psb_dprecsetd subroutine psb_cprecseti(prec,what,val,info) - use psb_sparse_mod, only : psb_desc_type, psb_c_sparse_mat, psb_spk_ + use psb_sparse_mod, only : psb_desc_type, psb_cspmat_type, psb_spk_ use psb_prec_type, only : psb_cprec_type implicit none type(psb_cprec_type), intent(inout) :: prec @@ -155,7 +155,7 @@ module psb_prec_mod integer, intent(out) :: info end subroutine psb_cprecseti subroutine psb_cprecsets(prec,what,val,info) - use psb_sparse_mod, only : psb_desc_type, psb_c_sparse_mat, psb_spk_ + use psb_sparse_mod, only : psb_desc_type, psb_cspmat_type, psb_spk_ use psb_prec_type, only : psb_cprec_type implicit none type(psb_cprec_type), intent(inout) :: prec @@ -164,7 +164,7 @@ module psb_prec_mod integer, intent(out) :: info end subroutine psb_cprecsets subroutine psb_zprecseti(prec,what,val,info) - use psb_sparse_mod, only : psb_desc_type, psb_z_sparse_mat, psb_dpk_ + use psb_sparse_mod, only : psb_desc_type, psb_zspmat_type, psb_dpk_ use psb_prec_type, only : psb_zprec_type implicit none type(psb_zprec_type), intent(inout) :: prec @@ -172,7 +172,7 @@ module psb_prec_mod integer, intent(out) :: info end subroutine psb_zprecseti subroutine psb_zprecsetd(prec,what,val,info) - use psb_sparse_mod, only : psb_desc_type, psb_z_sparse_mat, psb_dpk_ + use psb_sparse_mod, only : psb_desc_type, psb_zspmat_type, psb_dpk_ use psb_prec_type, only : psb_zprec_type implicit none type(psb_zprec_type), intent(inout) :: prec @@ -184,39 +184,39 @@ module psb_prec_mod interface psb_ilu_fct subroutine psb_silu_fct(a,l,u,d,info,blck) - use psb_sparse_mod, only : psb_desc_type, psb_s_sparse_mat,& + use psb_sparse_mod, only : psb_desc_type, psb_sspmat_type,& & psb_s_csr_sparse_mat, psb_spk_ integer, intent(out) :: info - type(psb_s_sparse_mat),intent(in) :: a + type(psb_sspmat_type),intent(in) :: a type(psb_s_csr_sparse_mat),intent(inout) :: l,u - type(psb_s_sparse_mat),intent(in), optional, target :: blck + type(psb_sspmat_type),intent(in), optional, target :: blck real(psb_spk_), intent(inout) :: d(:) end subroutine psb_silu_fct subroutine psb_dilu_fct(a,l,u,d,info,blck) - use psb_sparse_mod, only : psb_desc_type, psb_d_sparse_mat,& + use psb_sparse_mod, only : psb_desc_type, psb_dspmat_type,& & psb_d_csr_sparse_mat, psb_dpk_ integer, intent(out) :: info - type(psb_d_sparse_mat),intent(in) :: a + type(psb_dspmat_type),intent(in) :: a type(psb_d_csr_sparse_mat),intent(inout) :: l,u - type(psb_d_sparse_mat),intent(in), optional, target :: blck + type(psb_dspmat_type),intent(in), optional, target :: blck real(psb_dpk_), intent(inout) :: d(:) end subroutine psb_dilu_fct subroutine psb_cilu_fct(a,l,u,d,info,blck) - use psb_sparse_mod, only : psb_desc_type, psb_c_sparse_mat, & + use psb_sparse_mod, only : psb_desc_type, psb_cspmat_type, & & psb_c_csr_sparse_mat, psb_spk_ integer, intent(out) :: info - type(psb_c_sparse_mat),intent(in) :: a + type(psb_cspmat_type),intent(in) :: a type(psb_c_csr_sparse_mat),intent(inout) :: l,u - type(psb_c_sparse_mat),intent(in), optional, target :: blck + type(psb_cspmat_type),intent(in), optional, target :: blck complex(psb_spk_), intent(inout) :: d(:) end subroutine psb_cilu_fct subroutine psb_zilu_fct(a,l,u,d,info,blck) - use psb_sparse_mod, only : psb_desc_type, psb_z_sparse_mat, & + use psb_sparse_mod, only : psb_desc_type, psb_zspmat_type, & & psb_z_csr_sparse_mat, psb_dpk_ integer, intent(out) :: info - type(psb_z_sparse_mat),intent(in) :: a + type(psb_zspmat_type),intent(in) :: a type(psb_z_csr_sparse_mat),intent(inout) :: l,u - type(psb_z_sparse_mat),intent(in), optional, target :: blck + type(psb_zspmat_type),intent(in), optional, target :: blck complex(psb_dpk_), intent(inout) :: d(:) end subroutine psb_zilu_fct end interface diff --git a/prec/psb_s_base_prec_mod.f03 b/prec/psb_s_base_prec_mod.f03 index 4f858fd4..bf377d5d 100644 --- a/prec/psb_s_base_prec_mod.f03 +++ b/prec/psb_s_base_prec_mod.f03 @@ -39,7 +39,7 @@ module psb_s_base_prec_mod use psb_sparse_mod, only : psb_dpk_, psb_spk_, psb_long_int_k_,& & psb_desc_type, psb_sizeof, psb_free, psb_cdfree,& & psb_erractionsave, psb_erractionrestore, psb_error, psb_get_errstatus,& - & psb_s_sparse_mat + & psb_sspmat_type use psb_prec_const_mod @@ -137,7 +137,7 @@ contains use psb_sparse_mod Implicit None - type(psb_s_sparse_mat), intent(in), target :: a + type(psb_sspmat_type), intent(in), target :: a type(psb_desc_type), intent(in), target :: desc_a class(psb_s_base_prec_type),intent(inout) :: prec integer, intent(out) :: info diff --git a/prec/psb_s_bjacprec.f03 b/prec/psb_s_bjacprec.f03 index d449a2c0..52086c2d 100644 --- a/prec/psb_s_bjacprec.f03 +++ b/prec/psb_s_bjacprec.f03 @@ -4,7 +4,7 @@ module psb_s_bjacprec type, extends(psb_s_base_prec_type) :: psb_s_bjac_prec_type integer, allocatable :: iprcparm(:) - type(psb_s_sparse_mat), allocatable :: av(:) + type(psb_sspmat_type), allocatable :: av(:) real(psb_spk_), allocatable :: d(:) contains procedure, pass(prec) :: apply => psb_s_bjac_apply @@ -215,7 +215,7 @@ contains use psb_prec_mod Implicit None - type(psb_s_sparse_mat), intent(in), target :: a + type(psb_sspmat_type), intent(in), target :: a type(psb_desc_type), intent(in), target :: desc_a class(psb_s_bjac_prec_type),intent(inout) :: prec integer, intent(out) :: info diff --git a/prec/psb_s_diagprec.f03 b/prec/psb_s_diagprec.f03 index 4c289f84..aff2b24f 100644 --- a/prec/psb_s_diagprec.f03 +++ b/prec/psb_s_diagprec.f03 @@ -135,7 +135,7 @@ contains use psb_sparse_mod Implicit None - type(psb_s_sparse_mat), intent(in), target :: a + type(psb_sspmat_type), intent(in), target :: a type(psb_desc_type), intent(in), target :: desc_a class(psb_s_diag_prec_type),intent(inout) :: prec integer, intent(out) :: info diff --git a/prec/psb_s_nullprec.f03 b/prec/psb_s_nullprec.f03 index 591962a2..893e25a2 100644 --- a/prec/psb_s_nullprec.f03 +++ b/prec/psb_s_nullprec.f03 @@ -107,7 +107,7 @@ contains use psb_sparse_mod Implicit None - type(psb_s_sparse_mat), intent(in), target :: a + type(psb_sspmat_type), intent(in), target :: a type(psb_desc_type), intent(in), target :: desc_a class(psb_s_null_prec_type),intent(inout) :: prec integer, intent(out) :: info diff --git a/prec/psb_s_prec_type.f03 b/prec/psb_s_prec_type.f03 index dd6279e5..68d7f68d 100644 --- a/prec/psb_s_prec_type.f03 +++ b/prec/psb_s_prec_type.f03 @@ -39,7 +39,7 @@ module psb_s_prec_type use psb_sparse_mod, only : psb_dpk_, psb_spk_, psb_long_int_k_,& & psb_desc_type, psb_sizeof, psb_free, psb_cdfree,& & psb_erractionsave, psb_erractionrestore, psb_error, psb_get_errstatus,& - & psb_s_sparse_mat + & psb_sspmat_type use psb_prec_const_mod use psb_s_base_prec_mod diff --git a/prec/psb_silu_fct.f90 b/prec/psb_silu_fct.f90 index ff8520a0..7ab1824f 100644 --- a/prec/psb_silu_fct.f90 +++ b/prec/psb_silu_fct.f90 @@ -41,13 +41,13 @@ subroutine psb_silu_fct(a,l,u,d,info,blck) ! .. Scalar Arguments .. integer, intent(out) :: info ! .. Array Arguments .. - type(psb_s_sparse_mat),intent(in) :: a + type(psb_sspmat_type),intent(in) :: a type(psb_s_csr_sparse_mat),intent(inout) :: l,u - type(psb_s_sparse_mat),intent(in), optional, target :: blck + type(psb_sspmat_type),intent(in), optional, target :: blck real(psb_spk_), intent(inout) :: d(:) ! .. Local Scalars .. integer :: l1,l2,m,err_act - type(psb_s_sparse_mat), pointer :: blck_ + type(psb_sspmat_type), pointer :: blck_ character(len=20) :: name, ch_err name='psb_ilu_fct' info = psb_success_ @@ -119,8 +119,8 @@ contains implicit none - type(psb_s_sparse_mat) :: a - type(psb_s_sparse_mat) :: b + type(psb_sspmat_type) :: a + type(psb_sspmat_type) :: b integer :: m,ma,mb,l1,l2,info integer, dimension(:) :: lia1,lia2,uia1,uia2 real(psb_spk_), dimension(:) :: laspk,uaspk,d diff --git a/prec/psb_sprecbld.f90 b/prec/psb_sprecbld.f90 index 776a07ac..1ec1ccde 100644 --- a/prec/psb_sprecbld.f90 +++ b/prec/psb_sprecbld.f90 @@ -35,7 +35,7 @@ subroutine psb_sprecbld(a,desc_a,p,info,upd) use psb_prec_mod, psb_protect_name => psb_sprecbld Implicit None - type(psb_s_sparse_mat), intent(in), target :: a + type(psb_sspmat_type), intent(in), target :: a type(psb_desc_type), intent(in), target :: desc_a type(psb_sprec_type),intent(inout) :: p integer, intent(out) :: info diff --git a/prec/psb_z_base_prec_mod.f03 b/prec/psb_z_base_prec_mod.f03 index cb2f0e2c..f259b12b 100644 --- a/prec/psb_z_base_prec_mod.f03 +++ b/prec/psb_z_base_prec_mod.f03 @@ -39,7 +39,7 @@ module psb_z_base_prec_mod use psb_sparse_mod, only : psb_dpk_, psb_spk_, psb_long_int_k_,& & psb_desc_type, psb_sizeof, psb_free, psb_cdfree,& & psb_erractionsave, psb_erractionrestore, psb_error, psb_get_errstatus,& - & psb_z_sparse_mat + & psb_zspmat_type use psb_prec_const_mod @@ -138,7 +138,7 @@ contains use psb_sparse_mod Implicit None - type(psb_z_sparse_mat), intent(in), target :: a + type(psb_zspmat_type), intent(in), target :: a type(psb_desc_type), intent(in), target :: desc_a class(psb_z_base_prec_type),intent(inout) :: prec integer, intent(out) :: info diff --git a/prec/psb_z_bjacprec.f03 b/prec/psb_z_bjacprec.f03 index c7cf0ede..a8913609 100644 --- a/prec/psb_z_bjacprec.f03 +++ b/prec/psb_z_bjacprec.f03 @@ -4,7 +4,7 @@ module psb_z_bjacprec type, extends(psb_z_base_prec_type) :: psb_z_bjac_prec_type integer, allocatable :: iprcparm(:) - type(psb_z_sparse_mat), allocatable :: av(:) + type(psb_zspmat_type), allocatable :: av(:) complex(psb_dpk_), allocatable :: d(:) contains procedure, pass(prec) :: apply => psb_z_bjac_apply @@ -221,7 +221,7 @@ contains use psb_prec_mod Implicit None - type(psb_z_sparse_mat), intent(in), target :: a + type(psb_zspmat_type), intent(in), target :: a type(psb_desc_type), intent(in), target :: desc_a class(psb_z_bjac_prec_type),intent(inout) :: prec integer, intent(out) :: info diff --git a/prec/psb_z_diagprec.f03 b/prec/psb_z_diagprec.f03 index 33f04b51..71b20948 100644 --- a/prec/psb_z_diagprec.f03 +++ b/prec/psb_z_diagprec.f03 @@ -158,7 +158,7 @@ contains use psb_sparse_mod Implicit None - type(psb_z_sparse_mat), intent(in), target :: a + type(psb_zspmat_type), intent(in), target :: a type(psb_desc_type), intent(in), target :: desc_a class(psb_z_diag_prec_type),intent(inout) :: prec integer, intent(out) :: info diff --git a/prec/psb_z_nullprec.f03 b/prec/psb_z_nullprec.f03 index 7f2d1ae2..a8c0e728 100644 --- a/prec/psb_z_nullprec.f03 +++ b/prec/psb_z_nullprec.f03 @@ -109,7 +109,7 @@ contains use psb_sparse_mod Implicit None - type(psb_z_sparse_mat), intent(in), target :: a + type(psb_zspmat_type), intent(in), target :: a type(psb_desc_type), intent(in), target :: desc_a class(psb_z_null_prec_type),intent(inout) :: prec integer, intent(out) :: info diff --git a/prec/psb_z_prec_type.f03 b/prec/psb_z_prec_type.f03 index 04e3472e..e6d47ea2 100644 --- a/prec/psb_z_prec_type.f03 +++ b/prec/psb_z_prec_type.f03 @@ -39,7 +39,7 @@ module psb_z_prec_type use psb_sparse_mod, only : psb_dpk_, psb_spk_, psb_long_int_k_,& & psb_desc_type, psb_sizeof, psb_free, psb_cdfree,& & psb_erractionsave, psb_erractionrestore, psb_error, psb_get_errstatus,& - & psb_z_sparse_mat + & psb_zspmat_type use psb_prec_const_mod use psb_z_base_prec_mod diff --git a/prec/psb_zilu_fct.f90 b/prec/psb_zilu_fct.f90 index e761b02a..ca57cac7 100644 --- a/prec/psb_zilu_fct.f90 +++ b/prec/psb_zilu_fct.f90 @@ -41,13 +41,13 @@ subroutine psb_zilu_fct(a,l,u,d,info,blck) ! .. Scalar Arguments .. integer, intent(out) :: info ! .. Array Arguments .. - type(psb_z_sparse_mat),intent(in) :: a + type(psb_zspmat_type),intent(in) :: a type(psb_z_csr_sparse_mat),intent(inout) :: l,u - type(psb_z_sparse_mat),intent(in), optional, target :: blck + type(psb_zspmat_type),intent(in), optional, target :: blck complex(psb_dpk_), intent(inout) :: d(:) ! .. Local Scalars .. integer :: l1, l2,m,err_act - type(psb_z_sparse_mat), pointer :: blck_ + type(psb_zspmat_type), pointer :: blck_ character(len=20) :: name, ch_err name='psb_ilu_fct' info = psb_success_ @@ -117,7 +117,7 @@ contains & d,laspk,lia1,lia2,uaspk,uia1,uia2,l1,l2,info) implicit none - type(psb_z_sparse_mat) :: a,b + type(psb_zspmat_type) :: a,b integer :: m,ma,mb,l1,l2,info integer, dimension(:) :: lia1,lia2,uia1,uia2 complex(psb_dpk_), dimension(:) :: laspk,uaspk,d diff --git a/prec/psb_zprecbld.f90 b/prec/psb_zprecbld.f90 index 7cebae9f..ef4d80f1 100644 --- a/prec/psb_zprecbld.f90 +++ b/prec/psb_zprecbld.f90 @@ -35,7 +35,7 @@ subroutine psb_zprecbld(a,desc_a,p,info,upd) use psb_prec_mod, psb_protect_name => psb_zprecbld Implicit None - type(psb_z_sparse_mat), intent(in), target :: a + type(psb_zspmat_type), intent(in), target :: a type(psb_desc_type), intent(in), target :: desc_a type(psb_zprec_type),intent(inout) :: p integer, intent(out) :: info diff --git a/test/fileread/cf_sample.f90 b/test/fileread/cf_sample.f90 index 1b3d8364..f17b8a25 100644 --- a/test/fileread/cf_sample.f90 +++ b/test/fileread/cf_sample.f90 @@ -41,7 +41,7 @@ program cf_sample character(len=40) :: kmethd, ptype, mtrx_file, rhs_file ! sparse matrices - type(psb_c_sparse_mat) :: a, aux_a + type(psb_cspmat_type) :: a, aux_a ! preconditioner data type(psb_cprec_type) :: prec diff --git a/test/fileread/df_sample.f90 b/test/fileread/df_sample.f90 index ccf3181c..b9b7d279 100644 --- a/test/fileread/df_sample.f90 +++ b/test/fileread/df_sample.f90 @@ -41,7 +41,7 @@ program df_sample character(len=40) :: kmethd, ptype, mtrx_file, rhs_file ! sparse matrices - type(psb_d_sparse_mat) :: a, aux_a + type(psb_dspmat_type) :: a, aux_a ! preconditioner data type(psb_dprec_type) :: prec diff --git a/test/fileread/sf_sample.f90 b/test/fileread/sf_sample.f90 index 9f8949b2..40084da0 100644 --- a/test/fileread/sf_sample.f90 +++ b/test/fileread/sf_sample.f90 @@ -41,7 +41,7 @@ program sf_sample character(len=40) :: kmethd, ptype, mtrx_file, rhs_file ! sparse matrices - type(psb_s_sparse_mat) :: a, aux_a + type(psb_sspmat_type) :: a, aux_a ! preconditioner data type(psb_sprec_type) :: prec diff --git a/test/fileread/zf_sample.f90 b/test/fileread/zf_sample.f90 index 82b9a737..1d791b4a 100644 --- a/test/fileread/zf_sample.f90 +++ b/test/fileread/zf_sample.f90 @@ -41,7 +41,7 @@ program zf_sample character(len=40) :: kmethd, ptype, mtrx_file, rhs_file ! sparse matrices - type(psb_z_sparse_mat) :: a, aux_a + type(psb_zspmat_type) :: a, aux_a ! preconditioner data type(psb_zprec_type) :: prec diff --git a/test/pargen/ppde.f90 b/test/pargen/ppde.f90 index c3272af7..f418e512 100644 --- a/test/pargen/ppde.f90 +++ b/test/pargen/ppde.f90 @@ -77,7 +77,7 @@ program ppde real(psb_dpk_) :: t1, t2, tprec ! sparse matrix and preconditioner - type(psb_d_sparse_mat) :: a + type(psb_dspmat_type) :: a type(psb_dprec_type) :: prec ! descriptor type(psb_desc_type) :: desc_a @@ -348,7 +348,7 @@ contains type(psb_desc_type) :: desc_a integer :: ictxt, info character :: afmt*5 - type(psb_d_sparse_mat) :: a + type(psb_dspmat_type) :: a type(psb_d_csc_sparse_mat) :: acsc type(psb_d_coo_sparse_mat) :: acoo type(psb_d_csr_sparse_mat) :: acsr diff --git a/test/pargen/spde.f90 b/test/pargen/spde.f90 index e2295690..31bcbb7c 100644 --- a/test/pargen/spde.f90 +++ b/test/pargen/spde.f90 @@ -77,7 +77,7 @@ program ppde real(psb_dpk_) :: t1, t2, tprec ! sparse matrix and preconditioner - type(psb_s_sparse_mat) :: a + type(psb_sspmat_type) :: a type(psb_sprec_type) :: prec ! descriptor type(psb_desc_type) :: desc_a @@ -348,7 +348,7 @@ contains type(psb_desc_type) :: desc_a integer :: ictxt, info character :: afmt*5 - type(psb_s_sparse_mat) :: a + type(psb_sspmat_type) :: a type(psb_s_coo_sparse_mat) :: acoo type(psb_s_csr_sparse_mat) :: acsr real(psb_spk_) :: zt(nb),x,y,z diff --git a/test/serial/d_coo_matgen.f03 b/test/serial/d_coo_matgen.f03 index 0a062303..36fb6d17 100644 --- a/test/serial/d_coo_matgen.f03 +++ b/test/serial/d_coo_matgen.f03 @@ -17,7 +17,7 @@ program d_coo_matgen real(psb_dpk_) :: t1, t2, tprec ! sparse matrix and preconditioner - type(psb_d_sparse_mat) :: a + type(psb_dspmat_type) :: a !!$ type(psb_dprec_type) :: prec ! descriptor type(psb_desc_type) :: desc_a @@ -147,7 +147,7 @@ contains type(psb_desc_type) :: desc_a integer :: ictxt, info character :: afmt*5 - type(psb_d_sparse_mat) :: a + type(psb_dspmat_type) :: a real(psb_dpk_) :: zt(nb),glob_x,glob_y,glob_z integer :: m,n,nnz,glob_row,nlr,i,ii,ib,k integer :: x,y,z,ia,indx_owner diff --git a/test/serial/d_matgen.f03 b/test/serial/d_matgen.f03 index fffb5f89..31832377 100644 --- a/test/serial/d_matgen.f03 +++ b/test/serial/d_matgen.f03 @@ -18,7 +18,7 @@ program d_matgen real(psb_dpk_) :: t1, t2, tprec ! sparse matrix and preconditioner - type(psb_d_sparse_mat) :: a + type(psb_dspmat_type) :: a !!$ type(psb_dprec_type) :: prec ! descriptor type(psb_desc_type) :: desc_a @@ -147,7 +147,7 @@ contains type(psb_desc_type) :: desc_a integer :: ictxt, info character :: afmt*5 - type(psb_d_sparse_mat) :: a + type(psb_dspmat_type) :: a real(psb_dpk_) :: zt(nb),glob_x,glob_y,glob_z integer :: m,n,nnz,glob_row,nlr,i,ii,ib,k integer :: x,y,z,ia,indx_owner @@ -155,7 +155,7 @@ contains integer :: element integer, allocatable :: irow(:),icol(:),myidx(:) real(psb_dpk_), allocatable :: val(:), diag(:) - type(psb_d_sparse_mat) :: a_n + type(psb_dspmat_type) :: a_n class(psb_d_coo_sparse_mat), allocatable :: acoo class(psb_d_csr_sparse_mat), allocatable :: acsr class(psb_d_cxx_sparse_mat), allocatable :: acxx diff --git a/test/torture/psb_c_mvsv_tester.f90 b/test/torture/psb_c_mvsv_tester.f90 index a1f44a08..75bee7cd 100644 --- a/test/torture/psb_c_mvsv_tester.f90 +++ b/test/torture/psb_c_mvsv_tester.f90 @@ -5,7 +5,7 @@ contains use psb_sparse_mod implicit none character(len=*) :: afmt - type(psb_c_sparse_mat) :: a + type(psb_cspmat_type) :: a type(psb_desc_type) :: desc_a integer :: ictxt, iam=-1, np=-1 integer :: info=-1 @@ -81,7 +81,7 @@ contains use psb_sparse_mod implicit none character(len=*) :: afmt - type(psb_c_sparse_mat) :: a + type(psb_cspmat_type) :: a type(psb_desc_type) :: desc_a integer :: ictxt, iam=-1, np=-1 integer :: info=-1 @@ -157,7 +157,7 @@ contains use psb_sparse_mod implicit none character(len=*) :: afmt - type(psb_c_sparse_mat) :: a + type(psb_cspmat_type) :: a type(psb_desc_type) :: desc_a integer :: ictxt, iam=-1, np=-1 integer :: info=-1 @@ -233,7 +233,7 @@ contains use psb_sparse_mod implicit none character(len=*) :: afmt - type(psb_c_sparse_mat) :: a + type(psb_cspmat_type) :: a type(psb_desc_type) :: desc_a integer :: ictxt, iam=-1, np=-1 integer :: info=-1 @@ -309,7 +309,7 @@ contains use psb_sparse_mod implicit none character(len=*) :: afmt - type(psb_c_sparse_mat) :: a + type(psb_cspmat_type) :: a type(psb_desc_type) :: desc_a integer :: ictxt, iam=-1, np=-1 integer :: info=-1 @@ -385,7 +385,7 @@ contains use psb_sparse_mod implicit none character(len=*) :: afmt - type(psb_c_sparse_mat) :: a + type(psb_cspmat_type) :: a type(psb_desc_type) :: desc_a integer :: ictxt, iam=-1, np=-1 integer :: info=-1 @@ -461,7 +461,7 @@ contains use psb_sparse_mod implicit none character(len=*) :: afmt - type(psb_c_sparse_mat) :: a + type(psb_cspmat_type) :: a type(psb_desc_type) :: desc_a integer :: ictxt, iam=-1, np=-1 integer :: info=-1 @@ -537,7 +537,7 @@ contains use psb_sparse_mod implicit none character(len=*) :: afmt - type(psb_c_sparse_mat) :: a + type(psb_cspmat_type) :: a type(psb_desc_type) :: desc_a integer :: ictxt, iam=-1, np=-1 integer :: info=-1 @@ -613,7 +613,7 @@ contains use psb_sparse_mod implicit none character(len=*) :: afmt - type(psb_c_sparse_mat) :: a + type(psb_cspmat_type) :: a type(psb_desc_type) :: desc_a integer :: ictxt, iam=-1, np=-1 integer :: info=-1 @@ -689,7 +689,7 @@ contains use psb_sparse_mod implicit none character(len=*) :: afmt - type(psb_c_sparse_mat) :: a + type(psb_cspmat_type) :: a type(psb_desc_type) :: desc_a integer :: ictxt, iam=-1, np=-1 integer :: info=-1 @@ -765,7 +765,7 @@ contains use psb_sparse_mod implicit none character(len=*) :: afmt - type(psb_c_sparse_mat) :: a + type(psb_cspmat_type) :: a type(psb_desc_type) :: desc_a integer :: ictxt, iam=-1, np=-1 integer :: info=-1 @@ -841,7 +841,7 @@ contains use psb_sparse_mod implicit none character(len=*) :: afmt - type(psb_c_sparse_mat) :: a + type(psb_cspmat_type) :: a type(psb_desc_type) :: desc_a integer :: ictxt, iam=-1, np=-1 integer :: info=-1 @@ -917,7 +917,7 @@ contains use psb_sparse_mod implicit none character(len=*) :: afmt - type(psb_c_sparse_mat) :: a + type(psb_cspmat_type) :: a type(psb_desc_type) :: desc_a integer :: ictxt, iam=-1, np=-1 integer :: info=-1 @@ -993,7 +993,7 @@ contains use psb_sparse_mod implicit none character(len=*) :: afmt - type(psb_c_sparse_mat) :: a + type(psb_cspmat_type) :: a type(psb_desc_type) :: desc_a integer :: ictxt, iam=-1, np=-1 integer :: info=-1 @@ -1069,7 +1069,7 @@ contains use psb_sparse_mod implicit none character(len=*) :: afmt - type(psb_c_sparse_mat) :: a + type(psb_cspmat_type) :: a type(psb_desc_type) :: desc_a integer :: ictxt, iam=-1, np=-1 integer :: info=-1 @@ -1145,7 +1145,7 @@ contains use psb_sparse_mod implicit none character(len=*) :: afmt - type(psb_c_sparse_mat) :: a + type(psb_cspmat_type) :: a type(psb_desc_type) :: desc_a integer :: ictxt, iam=-1, np=-1 integer :: info=-1 @@ -1221,7 +1221,7 @@ contains use psb_sparse_mod implicit none character(len=*) :: afmt - type(psb_c_sparse_mat) :: a + type(psb_cspmat_type) :: a type(psb_desc_type) :: desc_a integer :: ictxt, iam=-1, np=-1 integer :: info=-1 @@ -1297,7 +1297,7 @@ contains use psb_sparse_mod implicit none character(len=*) :: afmt - type(psb_c_sparse_mat) :: a + type(psb_cspmat_type) :: a type(psb_desc_type) :: desc_a integer :: ictxt, iam=-1, np=-1 integer :: info=-1 @@ -1373,7 +1373,7 @@ contains use psb_sparse_mod implicit none character(len=*) :: afmt - type(psb_c_sparse_mat) :: a + type(psb_cspmat_type) :: a type(psb_desc_type) :: desc_a integer :: ictxt, iam=-1, np=-1 integer :: info=-1 @@ -1449,7 +1449,7 @@ contains use psb_sparse_mod implicit none character(len=*) :: afmt - type(psb_c_sparse_mat) :: a + type(psb_cspmat_type) :: a type(psb_desc_type) :: desc_a integer :: ictxt, iam=-1, np=-1 integer :: info=-1 @@ -1525,7 +1525,7 @@ contains use psb_sparse_mod implicit none character(len=*) :: afmt - type(psb_c_sparse_mat) :: a + type(psb_cspmat_type) :: a type(psb_desc_type) :: desc_a integer :: ictxt, iam=-1, np=-1 integer :: info=-1 @@ -1601,7 +1601,7 @@ contains use psb_sparse_mod implicit none character(len=*) :: afmt - type(psb_c_sparse_mat) :: a + type(psb_cspmat_type) :: a type(psb_desc_type) :: desc_a integer :: ictxt, iam=-1, np=-1 integer :: info=-1 @@ -1677,7 +1677,7 @@ contains use psb_sparse_mod implicit none character(len=*) :: afmt - type(psb_c_sparse_mat) :: a + type(psb_cspmat_type) :: a type(psb_desc_type) :: desc_a integer :: ictxt, iam=-1, np=-1 integer :: info=-1 @@ -1753,7 +1753,7 @@ contains use psb_sparse_mod implicit none character(len=*) :: afmt - type(psb_c_sparse_mat) :: a + type(psb_cspmat_type) :: a type(psb_desc_type) :: desc_a integer :: ictxt, iam=-1, np=-1 integer :: info=-1 @@ -1829,7 +1829,7 @@ contains use psb_sparse_mod implicit none character(len=*) :: afmt - type(psb_c_sparse_mat) :: a + type(psb_cspmat_type) :: a type(psb_desc_type) :: desc_a integer :: ictxt, iam=-1, np=-1 integer :: info=-1 @@ -1908,7 +1908,7 @@ contains use psb_sparse_mod implicit none character(len=*) :: afmt - type(psb_c_sparse_mat) :: a + type(psb_cspmat_type) :: a type(psb_desc_type) :: desc_a integer :: ictxt, iam=-1, np=-1 integer :: info=-1 @@ -1987,7 +1987,7 @@ contains use psb_sparse_mod implicit none character(len=*) :: afmt - type(psb_c_sparse_mat) :: a + type(psb_cspmat_type) :: a type(psb_desc_type) :: desc_a integer :: ictxt, iam=-1, np=-1 integer :: info=-1 @@ -2066,7 +2066,7 @@ contains use psb_sparse_mod implicit none character(len=*) :: afmt - type(psb_c_sparse_mat) :: a + type(psb_cspmat_type) :: a type(psb_desc_type) :: desc_a integer :: ictxt, iam=-1, np=-1 integer :: info=-1 @@ -2145,7 +2145,7 @@ contains use psb_sparse_mod implicit none character(len=*) :: afmt - type(psb_c_sparse_mat) :: a + type(psb_cspmat_type) :: a type(psb_desc_type) :: desc_a integer :: ictxt, iam=-1, np=-1 integer :: info=-1 @@ -2224,7 +2224,7 @@ contains use psb_sparse_mod implicit none character(len=*) :: afmt - type(psb_c_sparse_mat) :: a + type(psb_cspmat_type) :: a type(psb_desc_type) :: desc_a integer :: ictxt, iam=-1, np=-1 integer :: info=-1 @@ -2303,7 +2303,7 @@ contains use psb_sparse_mod implicit none character(len=*) :: afmt - type(psb_c_sparse_mat) :: a + type(psb_cspmat_type) :: a type(psb_desc_type) :: desc_a integer :: ictxt, iam=-1, np=-1 integer :: info=-1 @@ -2382,7 +2382,7 @@ contains use psb_sparse_mod implicit none character(len=*) :: afmt - type(psb_c_sparse_mat) :: a + type(psb_cspmat_type) :: a type(psb_desc_type) :: desc_a integer :: ictxt, iam=-1, np=-1 integer :: info=-1 @@ -2461,7 +2461,7 @@ contains use psb_sparse_mod implicit none character(len=*) :: afmt - type(psb_c_sparse_mat) :: a + type(psb_cspmat_type) :: a type(psb_desc_type) :: desc_a integer :: ictxt, iam=-1, np=-1 integer :: info=-1 @@ -2540,7 +2540,7 @@ contains use psb_sparse_mod implicit none character(len=*) :: afmt - type(psb_c_sparse_mat) :: a + type(psb_cspmat_type) :: a type(psb_desc_type) :: desc_a integer :: ictxt, iam=-1, np=-1 integer :: info=-1 @@ -2619,7 +2619,7 @@ contains use psb_sparse_mod implicit none character(len=*) :: afmt - type(psb_c_sparse_mat) :: a + type(psb_cspmat_type) :: a type(psb_desc_type) :: desc_a integer :: ictxt, iam=-1, np=-1 integer :: info=-1 @@ -2698,7 +2698,7 @@ contains use psb_sparse_mod implicit none character(len=*) :: afmt - type(psb_c_sparse_mat) :: a + type(psb_cspmat_type) :: a type(psb_desc_type) :: desc_a integer :: ictxt, iam=-1, np=-1 integer :: info=-1 diff --git a/test/torture/psb_d_mvsv_tester.f90 b/test/torture/psb_d_mvsv_tester.f90 index aabe72b5..25c13ca3 100644 --- a/test/torture/psb_d_mvsv_tester.f90 +++ b/test/torture/psb_d_mvsv_tester.f90 @@ -6,7 +6,7 @@ contains use psb_sparse_mod implicit none character(len=*) :: afmt - type(psb_d_sparse_mat) :: a + type(psb_dspmat_type) :: a type(psb_desc_type) :: desc_a integer :: ictxt, iam=-1, np=-1 integer :: info=-1 @@ -82,7 +82,7 @@ contains use psb_sparse_mod implicit none character(len=*) :: afmt - type(psb_d_sparse_mat) :: a + type(psb_dspmat_type) :: a type(psb_desc_type) :: desc_a integer :: ictxt, iam=-1, np=-1 integer :: info=-1 @@ -158,7 +158,7 @@ contains use psb_sparse_mod implicit none character(len=*) :: afmt - type(psb_d_sparse_mat) :: a + type(psb_dspmat_type) :: a type(psb_desc_type) :: desc_a integer :: ictxt, iam=-1, np=-1 integer :: info=-1 @@ -234,7 +234,7 @@ contains use psb_sparse_mod implicit none character(len=*) :: afmt - type(psb_d_sparse_mat) :: a + type(psb_dspmat_type) :: a type(psb_desc_type) :: desc_a integer :: ictxt, iam=-1, np=-1 integer :: info=-1 @@ -310,7 +310,7 @@ contains use psb_sparse_mod implicit none character(len=*) :: afmt - type(psb_d_sparse_mat) :: a + type(psb_dspmat_type) :: a type(psb_desc_type) :: desc_a integer :: ictxt, iam=-1, np=-1 integer :: info=-1 @@ -386,7 +386,7 @@ contains use psb_sparse_mod implicit none character(len=*) :: afmt - type(psb_d_sparse_mat) :: a + type(psb_dspmat_type) :: a type(psb_desc_type) :: desc_a integer :: ictxt, iam=-1, np=-1 integer :: info=-1 @@ -462,7 +462,7 @@ contains use psb_sparse_mod implicit none character(len=*) :: afmt - type(psb_d_sparse_mat) :: a + type(psb_dspmat_type) :: a type(psb_desc_type) :: desc_a integer :: ictxt, iam=-1, np=-1 integer :: info=-1 @@ -538,7 +538,7 @@ contains use psb_sparse_mod implicit none character(len=*) :: afmt - type(psb_d_sparse_mat) :: a + type(psb_dspmat_type) :: a type(psb_desc_type) :: desc_a integer :: ictxt, iam=-1, np=-1 integer :: info=-1 @@ -614,7 +614,7 @@ contains use psb_sparse_mod implicit none character(len=*) :: afmt - type(psb_d_sparse_mat) :: a + type(psb_dspmat_type) :: a type(psb_desc_type) :: desc_a integer :: ictxt, iam=-1, np=-1 integer :: info=-1 @@ -690,7 +690,7 @@ contains use psb_sparse_mod implicit none character(len=*) :: afmt - type(psb_d_sparse_mat) :: a + type(psb_dspmat_type) :: a type(psb_desc_type) :: desc_a integer :: ictxt, iam=-1, np=-1 integer :: info=-1 @@ -766,7 +766,7 @@ contains use psb_sparse_mod implicit none character(len=*) :: afmt - type(psb_d_sparse_mat) :: a + type(psb_dspmat_type) :: a type(psb_desc_type) :: desc_a integer :: ictxt, iam=-1, np=-1 integer :: info=-1 @@ -842,7 +842,7 @@ contains use psb_sparse_mod implicit none character(len=*) :: afmt - type(psb_d_sparse_mat) :: a + type(psb_dspmat_type) :: a type(psb_desc_type) :: desc_a integer :: ictxt, iam=-1, np=-1 integer :: info=-1 @@ -918,7 +918,7 @@ contains use psb_sparse_mod implicit none character(len=*) :: afmt - type(psb_d_sparse_mat) :: a + type(psb_dspmat_type) :: a type(psb_desc_type) :: desc_a integer :: ictxt, iam=-1, np=-1 integer :: info=-1 @@ -994,7 +994,7 @@ contains use psb_sparse_mod implicit none character(len=*) :: afmt - type(psb_d_sparse_mat) :: a + type(psb_dspmat_type) :: a type(psb_desc_type) :: desc_a integer :: ictxt, iam=-1, np=-1 integer :: info=-1 @@ -1070,7 +1070,7 @@ contains use psb_sparse_mod implicit none character(len=*) :: afmt - type(psb_d_sparse_mat) :: a + type(psb_dspmat_type) :: a type(psb_desc_type) :: desc_a integer :: ictxt, iam=-1, np=-1 integer :: info=-1 @@ -1146,7 +1146,7 @@ contains use psb_sparse_mod implicit none character(len=*) :: afmt - type(psb_d_sparse_mat) :: a + type(psb_dspmat_type) :: a type(psb_desc_type) :: desc_a integer :: ictxt, iam=-1, np=-1 integer :: info=-1 @@ -1222,7 +1222,7 @@ contains use psb_sparse_mod implicit none character(len=*) :: afmt - type(psb_d_sparse_mat) :: a + type(psb_dspmat_type) :: a type(psb_desc_type) :: desc_a integer :: ictxt, iam=-1, np=-1 integer :: info=-1 @@ -1298,7 +1298,7 @@ contains use psb_sparse_mod implicit none character(len=*) :: afmt - type(psb_d_sparse_mat) :: a + type(psb_dspmat_type) :: a type(psb_desc_type) :: desc_a integer :: ictxt, iam=-1, np=-1 integer :: info=-1 @@ -1374,7 +1374,7 @@ contains use psb_sparse_mod implicit none character(len=*) :: afmt - type(psb_d_sparse_mat) :: a + type(psb_dspmat_type) :: a type(psb_desc_type) :: desc_a integer :: ictxt, iam=-1, np=-1 integer :: info=-1 @@ -1450,7 +1450,7 @@ contains use psb_sparse_mod implicit none character(len=*) :: afmt - type(psb_d_sparse_mat) :: a + type(psb_dspmat_type) :: a type(psb_desc_type) :: desc_a integer :: ictxt, iam=-1, np=-1 integer :: info=-1 @@ -1526,7 +1526,7 @@ contains use psb_sparse_mod implicit none character(len=*) :: afmt - type(psb_d_sparse_mat) :: a + type(psb_dspmat_type) :: a type(psb_desc_type) :: desc_a integer :: ictxt, iam=-1, np=-1 integer :: info=-1 @@ -1602,7 +1602,7 @@ contains use psb_sparse_mod implicit none character(len=*) :: afmt - type(psb_d_sparse_mat) :: a + type(psb_dspmat_type) :: a type(psb_desc_type) :: desc_a integer :: ictxt, iam=-1, np=-1 integer :: info=-1 @@ -1678,7 +1678,7 @@ contains use psb_sparse_mod implicit none character(len=*) :: afmt - type(psb_d_sparse_mat) :: a + type(psb_dspmat_type) :: a type(psb_desc_type) :: desc_a integer :: ictxt, iam=-1, np=-1 integer :: info=-1 @@ -1754,7 +1754,7 @@ contains use psb_sparse_mod implicit none character(len=*) :: afmt - type(psb_d_sparse_mat) :: a + type(psb_dspmat_type) :: a type(psb_desc_type) :: desc_a integer :: ictxt, iam=-1, np=-1 integer :: info=-1 @@ -1830,7 +1830,7 @@ contains use psb_sparse_mod implicit none character(len=*) :: afmt - type(psb_d_sparse_mat) :: a + type(psb_dspmat_type) :: a type(psb_desc_type) :: desc_a integer :: ictxt, iam=-1, np=-1 integer :: info=-1 @@ -1909,7 +1909,7 @@ contains use psb_sparse_mod implicit none character(len=*) :: afmt - type(psb_d_sparse_mat) :: a + type(psb_dspmat_type) :: a type(psb_desc_type) :: desc_a integer :: ictxt, iam=-1, np=-1 integer :: info=-1 @@ -1988,7 +1988,7 @@ contains use psb_sparse_mod implicit none character(len=*) :: afmt - type(psb_d_sparse_mat) :: a + type(psb_dspmat_type) :: a type(psb_desc_type) :: desc_a integer :: ictxt, iam=-1, np=-1 integer :: info=-1 @@ -2067,7 +2067,7 @@ contains use psb_sparse_mod implicit none character(len=*) :: afmt - type(psb_d_sparse_mat) :: a + type(psb_dspmat_type) :: a type(psb_desc_type) :: desc_a integer :: ictxt, iam=-1, np=-1 integer :: info=-1 @@ -2146,7 +2146,7 @@ contains use psb_sparse_mod implicit none character(len=*) :: afmt - type(psb_d_sparse_mat) :: a + type(psb_dspmat_type) :: a type(psb_desc_type) :: desc_a integer :: ictxt, iam=-1, np=-1 integer :: info=-1 @@ -2225,7 +2225,7 @@ contains use psb_sparse_mod implicit none character(len=*) :: afmt - type(psb_d_sparse_mat) :: a + type(psb_dspmat_type) :: a type(psb_desc_type) :: desc_a integer :: ictxt, iam=-1, np=-1 integer :: info=-1 @@ -2304,7 +2304,7 @@ contains use psb_sparse_mod implicit none character(len=*) :: afmt - type(psb_d_sparse_mat) :: a + type(psb_dspmat_type) :: a type(psb_desc_type) :: desc_a integer :: ictxt, iam=-1, np=-1 integer :: info=-1 @@ -2383,7 +2383,7 @@ contains use psb_sparse_mod implicit none character(len=*) :: afmt - type(psb_d_sparse_mat) :: a + type(psb_dspmat_type) :: a type(psb_desc_type) :: desc_a integer :: ictxt, iam=-1, np=-1 integer :: info=-1 @@ -2462,7 +2462,7 @@ contains use psb_sparse_mod implicit none character(len=*) :: afmt - type(psb_d_sparse_mat) :: a + type(psb_dspmat_type) :: a type(psb_desc_type) :: desc_a integer :: ictxt, iam=-1, np=-1 integer :: info=-1 @@ -2541,7 +2541,7 @@ contains use psb_sparse_mod implicit none character(len=*) :: afmt - type(psb_d_sparse_mat) :: a + type(psb_dspmat_type) :: a type(psb_desc_type) :: desc_a integer :: ictxt, iam=-1, np=-1 integer :: info=-1 @@ -2620,7 +2620,7 @@ contains use psb_sparse_mod implicit none character(len=*) :: afmt - type(psb_d_sparse_mat) :: a + type(psb_dspmat_type) :: a type(psb_desc_type) :: desc_a integer :: ictxt, iam=-1, np=-1 integer :: info=-1 @@ -2699,7 +2699,7 @@ contains use psb_sparse_mod implicit none character(len=*) :: afmt - type(psb_d_sparse_mat) :: a + type(psb_dspmat_type) :: a type(psb_desc_type) :: desc_a integer :: ictxt, iam=-1, np=-1 integer :: info=-1 diff --git a/test/torture/psb_s_mvsv_tester.f90 b/test/torture/psb_s_mvsv_tester.f90 index 245927ff..8f2fb432 100644 --- a/test/torture/psb_s_mvsv_tester.f90 +++ b/test/torture/psb_s_mvsv_tester.f90 @@ -4,7 +4,7 @@ contains use psb_sparse_mod implicit none character(len=*) :: afmt - type(psb_s_sparse_mat) :: a + type(psb_sspmat_type) :: a type(psb_desc_type) :: desc_a integer :: ictxt, iam=-1, np=-1 integer :: info=-1 @@ -80,7 +80,7 @@ contains use psb_sparse_mod implicit none character(len=*) :: afmt - type(psb_s_sparse_mat) :: a + type(psb_sspmat_type) :: a type(psb_desc_type) :: desc_a integer :: ictxt, iam=-1, np=-1 integer :: info=-1 @@ -156,7 +156,7 @@ contains use psb_sparse_mod implicit none character(len=*) :: afmt - type(psb_s_sparse_mat) :: a + type(psb_sspmat_type) :: a type(psb_desc_type) :: desc_a integer :: ictxt, iam=-1, np=-1 integer :: info=-1 @@ -232,7 +232,7 @@ contains use psb_sparse_mod implicit none character(len=*) :: afmt - type(psb_s_sparse_mat) :: a + type(psb_sspmat_type) :: a type(psb_desc_type) :: desc_a integer :: ictxt, iam=-1, np=-1 integer :: info=-1 @@ -308,7 +308,7 @@ contains use psb_sparse_mod implicit none character(len=*) :: afmt - type(psb_s_sparse_mat) :: a + type(psb_sspmat_type) :: a type(psb_desc_type) :: desc_a integer :: ictxt, iam=-1, np=-1 integer :: info=-1 @@ -384,7 +384,7 @@ contains use psb_sparse_mod implicit none character(len=*) :: afmt - type(psb_s_sparse_mat) :: a + type(psb_sspmat_type) :: a type(psb_desc_type) :: desc_a integer :: ictxt, iam=-1, np=-1 integer :: info=-1 @@ -460,7 +460,7 @@ contains use psb_sparse_mod implicit none character(len=*) :: afmt - type(psb_s_sparse_mat) :: a + type(psb_sspmat_type) :: a type(psb_desc_type) :: desc_a integer :: ictxt, iam=-1, np=-1 integer :: info=-1 @@ -536,7 +536,7 @@ contains use psb_sparse_mod implicit none character(len=*) :: afmt - type(psb_s_sparse_mat) :: a + type(psb_sspmat_type) :: a type(psb_desc_type) :: desc_a integer :: ictxt, iam=-1, np=-1 integer :: info=-1 @@ -612,7 +612,7 @@ contains use psb_sparse_mod implicit none character(len=*) :: afmt - type(psb_s_sparse_mat) :: a + type(psb_sspmat_type) :: a type(psb_desc_type) :: desc_a integer :: ictxt, iam=-1, np=-1 integer :: info=-1 @@ -688,7 +688,7 @@ contains use psb_sparse_mod implicit none character(len=*) :: afmt - type(psb_s_sparse_mat) :: a + type(psb_sspmat_type) :: a type(psb_desc_type) :: desc_a integer :: ictxt, iam=-1, np=-1 integer :: info=-1 @@ -764,7 +764,7 @@ contains use psb_sparse_mod implicit none character(len=*) :: afmt - type(psb_s_sparse_mat) :: a + type(psb_sspmat_type) :: a type(psb_desc_type) :: desc_a integer :: ictxt, iam=-1, np=-1 integer :: info=-1 @@ -840,7 +840,7 @@ contains use psb_sparse_mod implicit none character(len=*) :: afmt - type(psb_s_sparse_mat) :: a + type(psb_sspmat_type) :: a type(psb_desc_type) :: desc_a integer :: ictxt, iam=-1, np=-1 integer :: info=-1 @@ -916,7 +916,7 @@ contains use psb_sparse_mod implicit none character(len=*) :: afmt - type(psb_s_sparse_mat) :: a + type(psb_sspmat_type) :: a type(psb_desc_type) :: desc_a integer :: ictxt, iam=-1, np=-1 integer :: info=-1 @@ -992,7 +992,7 @@ contains use psb_sparse_mod implicit none character(len=*) :: afmt - type(psb_s_sparse_mat) :: a + type(psb_sspmat_type) :: a type(psb_desc_type) :: desc_a integer :: ictxt, iam=-1, np=-1 integer :: info=-1 @@ -1068,7 +1068,7 @@ contains use psb_sparse_mod implicit none character(len=*) :: afmt - type(psb_s_sparse_mat) :: a + type(psb_sspmat_type) :: a type(psb_desc_type) :: desc_a integer :: ictxt, iam=-1, np=-1 integer :: info=-1 @@ -1144,7 +1144,7 @@ contains use psb_sparse_mod implicit none character(len=*) :: afmt - type(psb_s_sparse_mat) :: a + type(psb_sspmat_type) :: a type(psb_desc_type) :: desc_a integer :: ictxt, iam=-1, np=-1 integer :: info=-1 @@ -1220,7 +1220,7 @@ contains use psb_sparse_mod implicit none character(len=*) :: afmt - type(psb_s_sparse_mat) :: a + type(psb_sspmat_type) :: a type(psb_desc_type) :: desc_a integer :: ictxt, iam=-1, np=-1 integer :: info=-1 @@ -1296,7 +1296,7 @@ contains use psb_sparse_mod implicit none character(len=*) :: afmt - type(psb_s_sparse_mat) :: a + type(psb_sspmat_type) :: a type(psb_desc_type) :: desc_a integer :: ictxt, iam=-1, np=-1 integer :: info=-1 @@ -1372,7 +1372,7 @@ contains use psb_sparse_mod implicit none character(len=*) :: afmt - type(psb_s_sparse_mat) :: a + type(psb_sspmat_type) :: a type(psb_desc_type) :: desc_a integer :: ictxt, iam=-1, np=-1 integer :: info=-1 @@ -1448,7 +1448,7 @@ contains use psb_sparse_mod implicit none character(len=*) :: afmt - type(psb_s_sparse_mat) :: a + type(psb_sspmat_type) :: a type(psb_desc_type) :: desc_a integer :: ictxt, iam=-1, np=-1 integer :: info=-1 @@ -1524,7 +1524,7 @@ contains use psb_sparse_mod implicit none character(len=*) :: afmt - type(psb_s_sparse_mat) :: a + type(psb_sspmat_type) :: a type(psb_desc_type) :: desc_a integer :: ictxt, iam=-1, np=-1 integer :: info=-1 @@ -1600,7 +1600,7 @@ contains use psb_sparse_mod implicit none character(len=*) :: afmt - type(psb_s_sparse_mat) :: a + type(psb_sspmat_type) :: a type(psb_desc_type) :: desc_a integer :: ictxt, iam=-1, np=-1 integer :: info=-1 @@ -1676,7 +1676,7 @@ contains use psb_sparse_mod implicit none character(len=*) :: afmt - type(psb_s_sparse_mat) :: a + type(psb_sspmat_type) :: a type(psb_desc_type) :: desc_a integer :: ictxt, iam=-1, np=-1 integer :: info=-1 @@ -1752,7 +1752,7 @@ contains use psb_sparse_mod implicit none character(len=*) :: afmt - type(psb_s_sparse_mat) :: a + type(psb_sspmat_type) :: a type(psb_desc_type) :: desc_a integer :: ictxt, iam=-1, np=-1 integer :: info=-1 @@ -1828,7 +1828,7 @@ contains use psb_sparse_mod implicit none character(len=*) :: afmt - type(psb_s_sparse_mat) :: a + type(psb_sspmat_type) :: a type(psb_desc_type) :: desc_a integer :: ictxt, iam=-1, np=-1 integer :: info=-1 @@ -1906,7 +1906,7 @@ contains use psb_sparse_mod implicit none character(len=*) :: afmt - type(psb_s_sparse_mat) :: a + type(psb_sspmat_type) :: a type(psb_desc_type) :: desc_a integer :: ictxt, iam=-1, np=-1 integer :: info=-1 @@ -1985,7 +1985,7 @@ contains use psb_sparse_mod implicit none character(len=*) :: afmt - type(psb_s_sparse_mat) :: a + type(psb_sspmat_type) :: a type(psb_desc_type) :: desc_a integer :: ictxt, iam=-1, np=-1 integer :: info=-1 @@ -2064,7 +2064,7 @@ contains use psb_sparse_mod implicit none character(len=*) :: afmt - type(psb_s_sparse_mat) :: a + type(psb_sspmat_type) :: a type(psb_desc_type) :: desc_a integer :: ictxt, iam=-1, np=-1 integer :: info=-1 @@ -2143,7 +2143,7 @@ contains use psb_sparse_mod implicit none character(len=*) :: afmt - type(psb_s_sparse_mat) :: a + type(psb_sspmat_type) :: a type(psb_desc_type) :: desc_a integer :: ictxt, iam=-1, np=-1 integer :: info=-1 @@ -2222,7 +2222,7 @@ contains use psb_sparse_mod implicit none character(len=*) :: afmt - type(psb_s_sparse_mat) :: a + type(psb_sspmat_type) :: a type(psb_desc_type) :: desc_a integer :: ictxt, iam=-1, np=-1 integer :: info=-1 @@ -2301,7 +2301,7 @@ contains use psb_sparse_mod implicit none character(len=*) :: afmt - type(psb_s_sparse_mat) :: a + type(psb_sspmat_type) :: a type(psb_desc_type) :: desc_a integer :: ictxt, iam=-1, np=-1 integer :: info=-1 @@ -2380,7 +2380,7 @@ contains use psb_sparse_mod implicit none character(len=*) :: afmt - type(psb_s_sparse_mat) :: a + type(psb_sspmat_type) :: a type(psb_desc_type) :: desc_a integer :: ictxt, iam=-1, np=-1 integer :: info=-1 @@ -2459,7 +2459,7 @@ contains use psb_sparse_mod implicit none character(len=*) :: afmt - type(psb_s_sparse_mat) :: a + type(psb_sspmat_type) :: a type(psb_desc_type) :: desc_a integer :: ictxt, iam=-1, np=-1 integer :: info=-1 @@ -2538,7 +2538,7 @@ contains use psb_sparse_mod implicit none character(len=*) :: afmt - type(psb_s_sparse_mat) :: a + type(psb_sspmat_type) :: a type(psb_desc_type) :: desc_a integer :: ictxt, iam=-1, np=-1 integer :: info=-1 @@ -2617,7 +2617,7 @@ contains use psb_sparse_mod implicit none character(len=*) :: afmt - type(psb_s_sparse_mat) :: a + type(psb_sspmat_type) :: a type(psb_desc_type) :: desc_a integer :: ictxt, iam=-1, np=-1 integer :: info=-1 @@ -2696,7 +2696,7 @@ contains use psb_sparse_mod implicit none character(len=*) :: afmt - type(psb_s_sparse_mat) :: a + type(psb_sspmat_type) :: a type(psb_desc_type) :: desc_a integer :: ictxt, iam=-1, np=-1 integer :: info=-1 diff --git a/test/torture/psb_z_mvsv_tester.f90 b/test/torture/psb_z_mvsv_tester.f90 index a10b1500..8afe0e9a 100644 --- a/test/torture/psb_z_mvsv_tester.f90 +++ b/test/torture/psb_z_mvsv_tester.f90 @@ -5,7 +5,7 @@ contains use psb_sparse_mod implicit none character(len=*) :: afmt - type(psb_z_sparse_mat) :: a + type(psb_zspmat_type) :: a type(psb_desc_type) :: desc_a integer :: ictxt, iam=-1, np=-1 integer :: info=-1 @@ -81,7 +81,7 @@ contains use psb_sparse_mod implicit none character(len=*) :: afmt - type(psb_z_sparse_mat) :: a + type(psb_zspmat_type) :: a type(psb_desc_type) :: desc_a integer :: ictxt, iam=-1, np=-1 integer :: info=-1 @@ -157,7 +157,7 @@ contains use psb_sparse_mod implicit none character(len=*) :: afmt - type(psb_z_sparse_mat) :: a + type(psb_zspmat_type) :: a type(psb_desc_type) :: desc_a integer :: ictxt, iam=-1, np=-1 integer :: info=-1 @@ -233,7 +233,7 @@ contains use psb_sparse_mod implicit none character(len=*) :: afmt - type(psb_z_sparse_mat) :: a + type(psb_zspmat_type) :: a type(psb_desc_type) :: desc_a integer :: ictxt, iam=-1, np=-1 integer :: info=-1 @@ -309,7 +309,7 @@ contains use psb_sparse_mod implicit none character(len=*) :: afmt - type(psb_z_sparse_mat) :: a + type(psb_zspmat_type) :: a type(psb_desc_type) :: desc_a integer :: ictxt, iam=-1, np=-1 integer :: info=-1 @@ -385,7 +385,7 @@ contains use psb_sparse_mod implicit none character(len=*) :: afmt - type(psb_z_sparse_mat) :: a + type(psb_zspmat_type) :: a type(psb_desc_type) :: desc_a integer :: ictxt, iam=-1, np=-1 integer :: info=-1 @@ -461,7 +461,7 @@ contains use psb_sparse_mod implicit none character(len=*) :: afmt - type(psb_z_sparse_mat) :: a + type(psb_zspmat_type) :: a type(psb_desc_type) :: desc_a integer :: ictxt, iam=-1, np=-1 integer :: info=-1 @@ -537,7 +537,7 @@ contains use psb_sparse_mod implicit none character(len=*) :: afmt - type(psb_z_sparse_mat) :: a + type(psb_zspmat_type) :: a type(psb_desc_type) :: desc_a integer :: ictxt, iam=-1, np=-1 integer :: info=-1 @@ -613,7 +613,7 @@ contains use psb_sparse_mod implicit none character(len=*) :: afmt - type(psb_z_sparse_mat) :: a + type(psb_zspmat_type) :: a type(psb_desc_type) :: desc_a integer :: ictxt, iam=-1, np=-1 integer :: info=-1 @@ -689,7 +689,7 @@ contains use psb_sparse_mod implicit none character(len=*) :: afmt - type(psb_z_sparse_mat) :: a + type(psb_zspmat_type) :: a type(psb_desc_type) :: desc_a integer :: ictxt, iam=-1, np=-1 integer :: info=-1 @@ -765,7 +765,7 @@ contains use psb_sparse_mod implicit none character(len=*) :: afmt - type(psb_z_sparse_mat) :: a + type(psb_zspmat_type) :: a type(psb_desc_type) :: desc_a integer :: ictxt, iam=-1, np=-1 integer :: info=-1 @@ -841,7 +841,7 @@ contains use psb_sparse_mod implicit none character(len=*) :: afmt - type(psb_z_sparse_mat) :: a + type(psb_zspmat_type) :: a type(psb_desc_type) :: desc_a integer :: ictxt, iam=-1, np=-1 integer :: info=-1 @@ -917,7 +917,7 @@ contains use psb_sparse_mod implicit none character(len=*) :: afmt - type(psb_z_sparse_mat) :: a + type(psb_zspmat_type) :: a type(psb_desc_type) :: desc_a integer :: ictxt, iam=-1, np=-1 integer :: info=-1 @@ -993,7 +993,7 @@ contains use psb_sparse_mod implicit none character(len=*) :: afmt - type(psb_z_sparse_mat) :: a + type(psb_zspmat_type) :: a type(psb_desc_type) :: desc_a integer :: ictxt, iam=-1, np=-1 integer :: info=-1 @@ -1069,7 +1069,7 @@ contains use psb_sparse_mod implicit none character(len=*) :: afmt - type(psb_z_sparse_mat) :: a + type(psb_zspmat_type) :: a type(psb_desc_type) :: desc_a integer :: ictxt, iam=-1, np=-1 integer :: info=-1 @@ -1145,7 +1145,7 @@ contains use psb_sparse_mod implicit none character(len=*) :: afmt - type(psb_z_sparse_mat) :: a + type(psb_zspmat_type) :: a type(psb_desc_type) :: desc_a integer :: ictxt, iam=-1, np=-1 integer :: info=-1 @@ -1221,7 +1221,7 @@ contains use psb_sparse_mod implicit none character(len=*) :: afmt - type(psb_z_sparse_mat) :: a + type(psb_zspmat_type) :: a type(psb_desc_type) :: desc_a integer :: ictxt, iam=-1, np=-1 integer :: info=-1 @@ -1297,7 +1297,7 @@ contains use psb_sparse_mod implicit none character(len=*) :: afmt - type(psb_z_sparse_mat) :: a + type(psb_zspmat_type) :: a type(psb_desc_type) :: desc_a integer :: ictxt, iam=-1, np=-1 integer :: info=-1 @@ -1373,7 +1373,7 @@ contains use psb_sparse_mod implicit none character(len=*) :: afmt - type(psb_z_sparse_mat) :: a + type(psb_zspmat_type) :: a type(psb_desc_type) :: desc_a integer :: ictxt, iam=-1, np=-1 integer :: info=-1 @@ -1449,7 +1449,7 @@ contains use psb_sparse_mod implicit none character(len=*) :: afmt - type(psb_z_sparse_mat) :: a + type(psb_zspmat_type) :: a type(psb_desc_type) :: desc_a integer :: ictxt, iam=-1, np=-1 integer :: info=-1 @@ -1525,7 +1525,7 @@ contains use psb_sparse_mod implicit none character(len=*) :: afmt - type(psb_z_sparse_mat) :: a + type(psb_zspmat_type) :: a type(psb_desc_type) :: desc_a integer :: ictxt, iam=-1, np=-1 integer :: info=-1 @@ -1601,7 +1601,7 @@ contains use psb_sparse_mod implicit none character(len=*) :: afmt - type(psb_z_sparse_mat) :: a + type(psb_zspmat_type) :: a type(psb_desc_type) :: desc_a integer :: ictxt, iam=-1, np=-1 integer :: info=-1 @@ -1677,7 +1677,7 @@ contains use psb_sparse_mod implicit none character(len=*) :: afmt - type(psb_z_sparse_mat) :: a + type(psb_zspmat_type) :: a type(psb_desc_type) :: desc_a integer :: ictxt, iam=-1, np=-1 integer :: info=-1 @@ -1753,7 +1753,7 @@ contains use psb_sparse_mod implicit none character(len=*) :: afmt - type(psb_z_sparse_mat) :: a + type(psb_zspmat_type) :: a type(psb_desc_type) :: desc_a integer :: ictxt, iam=-1, np=-1 integer :: info=-1 @@ -1829,7 +1829,7 @@ contains use psb_sparse_mod implicit none character(len=*) :: afmt - type(psb_z_sparse_mat) :: a + type(psb_zspmat_type) :: a type(psb_desc_type) :: desc_a integer :: ictxt, iam=-1, np=-1 integer :: info=-1 @@ -1908,7 +1908,7 @@ contains use psb_sparse_mod implicit none character(len=*) :: afmt - type(psb_z_sparse_mat) :: a + type(psb_zspmat_type) :: a type(psb_desc_type) :: desc_a integer :: ictxt, iam=-1, np=-1 integer :: info=-1 @@ -1987,7 +1987,7 @@ contains use psb_sparse_mod implicit none character(len=*) :: afmt - type(psb_z_sparse_mat) :: a + type(psb_zspmat_type) :: a type(psb_desc_type) :: desc_a integer :: ictxt, iam=-1, np=-1 integer :: info=-1 @@ -2066,7 +2066,7 @@ contains use psb_sparse_mod implicit none character(len=*) :: afmt - type(psb_z_sparse_mat) :: a + type(psb_zspmat_type) :: a type(psb_desc_type) :: desc_a integer :: ictxt, iam=-1, np=-1 integer :: info=-1 @@ -2145,7 +2145,7 @@ contains use psb_sparse_mod implicit none character(len=*) :: afmt - type(psb_z_sparse_mat) :: a + type(psb_zspmat_type) :: a type(psb_desc_type) :: desc_a integer :: ictxt, iam=-1, np=-1 integer :: info=-1 @@ -2224,7 +2224,7 @@ contains use psb_sparse_mod implicit none character(len=*) :: afmt - type(psb_z_sparse_mat) :: a + type(psb_zspmat_type) :: a type(psb_desc_type) :: desc_a integer :: ictxt, iam=-1, np=-1 integer :: info=-1 @@ -2303,7 +2303,7 @@ contains use psb_sparse_mod implicit none character(len=*) :: afmt - type(psb_z_sparse_mat) :: a + type(psb_zspmat_type) :: a type(psb_desc_type) :: desc_a integer :: ictxt, iam=-1, np=-1 integer :: info=-1 @@ -2382,7 +2382,7 @@ contains use psb_sparse_mod implicit none character(len=*) :: afmt - type(psb_z_sparse_mat) :: a + type(psb_zspmat_type) :: a type(psb_desc_type) :: desc_a integer :: ictxt, iam=-1, np=-1 integer :: info=-1 @@ -2461,7 +2461,7 @@ contains use psb_sparse_mod implicit none character(len=*) :: afmt - type(psb_z_sparse_mat) :: a + type(psb_zspmat_type) :: a type(psb_desc_type) :: desc_a integer :: ictxt, iam=-1, np=-1 integer :: info=-1 @@ -2540,7 +2540,7 @@ contains use psb_sparse_mod implicit none character(len=*) :: afmt - type(psb_z_sparse_mat) :: a + type(psb_zspmat_type) :: a type(psb_desc_type) :: desc_a integer :: ictxt, iam=-1, np=-1 integer :: info=-1 @@ -2619,7 +2619,7 @@ contains use psb_sparse_mod implicit none character(len=*) :: afmt - type(psb_z_sparse_mat) :: a + type(psb_zspmat_type) :: a type(psb_desc_type) :: desc_a integer :: ictxt, iam=-1, np=-1 integer :: info=-1 @@ -2698,7 +2698,7 @@ contains use psb_sparse_mod implicit none character(len=*) :: afmt - type(psb_z_sparse_mat) :: a + type(psb_zspmat_type) :: a type(psb_desc_type) :: desc_a integer :: ictxt, iam=-1, np=-1 integer :: info=-1 diff --git a/test/util/dhb2mm.f90 b/test/util/dhb2mm.f90 index 0b220f3b..7a178f98 100644 --- a/test/util/dhb2mm.f90 +++ b/test/util/dhb2mm.f90 @@ -37,7 +37,7 @@ program dhb2mm use psb_sparse_mod use psb_util_mod - type(psb_d_sparse_mat) :: a + type(psb_dspmat_type) :: a integer :: info character(len=72) :: mtitle diff --git a/test/util/dmm2hb.f90 b/test/util/dmm2hb.f90 index 22463166..4ad1003b 100644 --- a/test/util/dmm2hb.f90 +++ b/test/util/dmm2hb.f90 @@ -37,7 +37,7 @@ program dmm2hb use psb_sparse_mod use psb_util_mod - type(psb_d_sparse_mat) :: a + type(psb_dspmat_type) :: a integer info diff --git a/test/util/zhb2mm.f90 b/test/util/zhb2mm.f90 index ef88fdb8..5114ab47 100644 --- a/test/util/zhb2mm.f90 +++ b/test/util/zhb2mm.f90 @@ -37,7 +37,7 @@ program zhb2mm use psb_sparse_mod use psb_util_mod - type(psb_z_sparse_mat) :: a + type(psb_zspmat_type) :: a integer :: info character(len=72) :: mtitle diff --git a/test/util/zmm2hb.f90 b/test/util/zmm2hb.f90 index 4237d842..dee4abf6 100644 --- a/test/util/zmm2hb.f90 +++ b/test/util/zmm2hb.f90 @@ -37,7 +37,7 @@ program zmm2hb use psb_sparse_mod use psb_util_mod - type(psb_z_sparse_mat) :: a + type(psb_zspmat_type) :: a integer info diff --git a/util/psb_hbio_impl.f90 b/util/psb_hbio_impl.f90 index e16370bc..6aaffdaf 100644 --- a/util/psb_hbio_impl.f90 +++ b/util/psb_hbio_impl.f90 @@ -32,7 +32,7 @@ subroutine shb_read(a, iret, iunit, filename,b,g,x,mtitle) use psb_sparse_mod implicit none - type(psb_s_sparse_mat), intent(out) :: a + type(psb_sspmat_type), intent(out) :: a integer, intent(out) :: iret integer, optional, intent(in) :: iunit character(len=*), optional, intent(in) :: filename @@ -190,7 +190,7 @@ end subroutine shb_read subroutine shb_write(a,iret,iunit,filename,key,rhs,g,x,mtitle) use psb_sparse_mod implicit none - type(psb_s_sparse_mat), intent(in), target :: a + type(psb_sspmat_type), intent(in), target :: a integer, intent(out) :: iret character(len=*), optional, intent(in) :: mtitle integer, optional, intent(in) :: iunit @@ -331,7 +331,7 @@ end subroutine shb_write subroutine dhb_read(a, iret, iunit, filename,b,g,x,mtitle) use psb_sparse_mod implicit none - type(psb_d_sparse_mat), intent(out) :: a + type(psb_dspmat_type), intent(out) :: a integer, intent(out) :: iret integer, optional, intent(in) :: iunit character(len=*), optional, intent(in) :: filename @@ -489,7 +489,7 @@ end subroutine dhb_read subroutine dhb_write(a,iret,iunit,filename,key,rhs,g,x,mtitle) use psb_sparse_mod implicit none - type(psb_d_sparse_mat), intent(in), target :: a + type(psb_dspmat_type), intent(in), target :: a integer, intent(out) :: iret character(len=*), optional, intent(in) :: mtitle integer, optional, intent(in) :: iunit @@ -631,7 +631,7 @@ end subroutine dhb_write subroutine chb_read(a, iret, iunit, filename,b,g,x,mtitle) use psb_sparse_mod implicit none - type(psb_c_sparse_mat), intent(out) :: a + type(psb_cspmat_type), intent(out) :: a integer, intent(out) :: iret integer, optional, intent(in) :: iunit character(len=*), optional, intent(in) :: filename @@ -836,7 +836,7 @@ end subroutine chb_read subroutine chb_write(a,iret,iunit,filename,key,rhs,g,x,mtitle) use psb_sparse_mod implicit none - type(psb_c_sparse_mat), intent(in), target :: a + type(psb_cspmat_type), intent(in), target :: a integer, intent(out) :: iret character(len=*), optional, intent(in) :: mtitle integer, optional, intent(in) :: iunit @@ -977,7 +977,7 @@ end subroutine chb_write subroutine zhb_read(a, iret, iunit, filename,b,g,x,mtitle) use psb_sparse_mod implicit none - type(psb_z_sparse_mat), intent(out) :: a + type(psb_zspmat_type), intent(out) :: a integer, intent(out) :: iret integer, optional, intent(in) :: iunit character(len=*), optional, intent(in) :: filename @@ -1182,7 +1182,7 @@ end subroutine zhb_read subroutine zhb_write(a,iret,iunit,filename,key,rhs,g,x,mtitle) use psb_sparse_mod implicit none - type(psb_z_sparse_mat), intent(in), target :: a + type(psb_zspmat_type), intent(in), target :: a integer, intent(out) :: iret character(len=*), optional, intent(in) :: mtitle integer, optional, intent(in) :: iunit diff --git a/util/psb_hbio_mod.f90 b/util/psb_hbio_mod.f90 index d7d7025a..284f3290 100644 --- a/util/psb_hbio_mod.f90 +++ b/util/psb_hbio_mod.f90 @@ -34,9 +34,9 @@ module psb_hbio_mod public hb_read, hb_write interface hb_read subroutine shb_read(a, iret, iunit, filename,b,g,x,mtitle) - use psb_sparse_mod, only : psb_s_sparse_mat, psb_spk_ + use psb_sparse_mod, only : psb_sspmat_type, psb_spk_ implicit none - type(psb_s_sparse_mat), intent(out) :: a + type(psb_sspmat_type), intent(out) :: a integer, intent(out) :: iret integer, optional, intent(in) :: iunit character(len=*), optional, intent(in) :: filename @@ -44,9 +44,9 @@ module psb_hbio_mod character(len=72), optional, intent(out) :: mtitle end subroutine shb_read subroutine dhb_read(a, iret, iunit, filename,b,g,x,mtitle) - use psb_sparse_mod, only : psb_d_sparse_mat, psb_dpk_ + use psb_sparse_mod, only : psb_dspmat_type, psb_dpk_ implicit none - type(psb_d_sparse_mat), intent(out) :: a + type(psb_dspmat_type), intent(out) :: a integer, intent(out) :: iret integer, optional, intent(in) :: iunit character(len=*), optional, intent(in) :: filename @@ -54,9 +54,9 @@ module psb_hbio_mod character(len=72), optional, intent(out) :: mtitle end subroutine dhb_read subroutine chb_read(a, iret, iunit, filename,b,g,x,mtitle) - use psb_sparse_mod, only : psb_c_sparse_mat, psb_spk_ + use psb_sparse_mod, only : psb_cspmat_type, psb_spk_ implicit none - type(psb_c_sparse_mat), intent(out) :: a + type(psb_cspmat_type), intent(out) :: a integer, intent(out) :: iret integer, optional, intent(in) :: iunit character(len=*), optional, intent(in) :: filename @@ -64,9 +64,9 @@ module psb_hbio_mod character(len=72), optional, intent(out) :: mtitle end subroutine chb_read subroutine zhb_read(a, iret, iunit, filename,b,g,x,mtitle) - use psb_sparse_mod, only : psb_z_sparse_mat, psb_dpk_ + use psb_sparse_mod, only : psb_zspmat_type, psb_dpk_ implicit none - type(psb_z_sparse_mat), intent(out) :: a + type(psb_zspmat_type), intent(out) :: a integer, intent(out) :: iret integer, optional, intent(in) :: iunit character(len=*), optional, intent(in) :: filename @@ -77,9 +77,9 @@ module psb_hbio_mod interface hb_write subroutine shb_write(a,iret,iunit,filename,key,rhs,g,x,mtitle) - use psb_sparse_mod, only : psb_s_sparse_mat, psb_spk_ + use psb_sparse_mod, only : psb_sspmat_type, psb_spk_ implicit none - type(psb_s_sparse_mat), intent(inout) :: a + type(psb_sspmat_type), intent(inout) :: a integer, intent(out) :: iret character(len=*), optional, intent(in) :: mtitle integer, optional, intent(in) :: iunit @@ -88,9 +88,9 @@ module psb_hbio_mod real(psb_spk_), optional :: rhs(:), g(:), x(:) end subroutine shb_write subroutine dhb_write(a,iret,iunit,filename,key,rhs,g,x,mtitle) - use psb_sparse_mod, only : psb_d_sparse_mat, psb_dpk_ + use psb_sparse_mod, only : psb_dspmat_type, psb_dpk_ implicit none - type(psb_d_sparse_mat), intent(inout) :: a + type(psb_dspmat_type), intent(inout) :: a integer, intent(out) :: iret character(len=*), optional, intent(in) :: mtitle integer, optional, intent(in) :: iunit @@ -99,9 +99,9 @@ module psb_hbio_mod real(psb_dpk_), optional :: rhs(:), g(:), x(:) end subroutine dhb_write subroutine chb_write(a,iret,iunit,filename,key,rhs,g,x,mtitle) - use psb_sparse_mod, only : psb_c_sparse_mat, psb_spk_ + use psb_sparse_mod, only : psb_cspmat_type, psb_spk_ implicit none - type(psb_c_sparse_mat), intent(inout) :: a + type(psb_cspmat_type), intent(inout) :: a integer, intent(out) :: iret character(len=*), optional, intent(in) :: mtitle integer, optional, intent(in) :: iunit @@ -110,9 +110,9 @@ module psb_hbio_mod complex(psb_spk_), optional :: rhs(:), g(:), x(:) end subroutine chb_write subroutine zhb_write(a,iret,iunit,filename,key,rhs,g,x,mtitle) - use psb_sparse_mod, only : psb_z_sparse_mat, psb_dpk_ + use psb_sparse_mod, only : psb_zspmat_type, psb_dpk_ implicit none - type(psb_z_sparse_mat), intent(inout) :: a + type(psb_zspmat_type), intent(inout) :: a integer, intent(out) :: iret character(len=*), optional, intent(in) :: mtitle integer, optional, intent(in) :: iunit diff --git a/util/psb_mat_dist_impl.f90 b/util/psb_mat_dist_impl.f90 index 7efa5858..336defe0 100644 --- a/util/psb_mat_dist_impl.f90 +++ b/util/psb_mat_dist_impl.f90 @@ -92,10 +92,10 @@ subroutine smatdist(a_glob, a, ictxt, desc_a,& implicit none ! parameters - type(psb_s_sparse_mat) :: a_glob + type(psb_sspmat_type) :: a_glob real(psb_spk_) :: b_glob(:) integer :: ictxt - type(psb_s_sparse_mat) :: a + type(psb_sspmat_type) :: a real(psb_spk_), allocatable :: b(:) type(psb_desc_type) :: desc_a integer, intent(out) :: info @@ -537,10 +537,10 @@ subroutine dmatdist(a_glob, a, ictxt, desc_a,& implicit none ! parameters - type(psb_d_sparse_mat) :: a_glob + type(psb_dspmat_type) :: a_glob real(psb_dpk_) :: b_glob(:) integer :: ictxt - type(psb_d_sparse_mat) :: a + type(psb_dspmat_type) :: a real(psb_dpk_), allocatable :: b(:) type(psb_desc_type) :: desc_a integer, intent(out) :: info @@ -982,10 +982,10 @@ subroutine cmatdist(a_glob, a, ictxt, desc_a,& implicit none ! parameters - type(psb_c_sparse_mat) :: a_glob + type(psb_cspmat_type) :: a_glob complex(psb_spk_) :: b_glob(:) integer :: ictxt - type(psb_c_sparse_mat) :: a + type(psb_cspmat_type) :: a complex(psb_spk_), allocatable :: b(:) type(psb_desc_type) :: desc_a integer, intent(out) :: info @@ -1427,10 +1427,10 @@ subroutine zmatdist(a_glob, a, ictxt, desc_a,& implicit none ! parameters - type(psb_z_sparse_mat) :: a_glob + type(psb_zspmat_type) :: a_glob complex(psb_dpk_) :: b_glob(:) integer :: ictxt - type(psb_z_sparse_mat) :: a + type(psb_zspmat_type) :: a complex(psb_dpk_), allocatable :: b(:) type(psb_desc_type) :: desc_a integer, intent(out) :: info diff --git a/util/psb_mat_dist_mod.f90 b/util/psb_mat_dist_mod.f90 index 3b09b9ca..09929b47 100644 --- a/util/psb_mat_dist_mod.f90 +++ b/util/psb_mat_dist_mod.f90 @@ -90,14 +90,14 @@ module psb_mat_dist_mod ! on entry: specifies processor holding a_glob. default: 0 ! on exit : unchanged. ! - use psb_sparse_mod, only : psb_s_sparse_mat, psb_desc_type, psb_spk_ + use psb_sparse_mod, only : psb_sspmat_type, psb_desc_type, psb_spk_ implicit none ! parameters - type(psb_s_sparse_mat) :: a_glob + type(psb_sspmat_type) :: a_glob real(psb_spk_) :: b_glob(:) integer :: ictxt - type(psb_s_sparse_mat) :: a + type(psb_sspmat_type) :: a real(psb_spk_), allocatable :: b(:) type(psb_desc_type) :: desc_a integer, intent(out) :: info @@ -174,14 +174,14 @@ module psb_mat_dist_mod ! on entry: specifies processor holding a_glob. default: 0 ! on exit : unchanged. ! - use psb_sparse_mod, only : psb_d_sparse_mat, psb_dpk_, psb_desc_type + use psb_sparse_mod, only : psb_dspmat_type, psb_dpk_, psb_desc_type implicit none ! parameters - type(psb_d_sparse_mat) :: a_glob + type(psb_dspmat_type) :: a_glob real(psb_dpk_) :: b_glob(:) integer :: ictxt - type(psb_d_sparse_mat) :: a + type(psb_dspmat_type) :: a real(psb_dpk_), allocatable :: b(:) type(psb_desc_type) :: desc_a integer, intent(out) :: info @@ -259,14 +259,14 @@ module psb_mat_dist_mod ! on entry: specifies processor holding a_glob. default: 0 ! on exit : unchanged. ! - use psb_sparse_mod, only : psb_c_sparse_mat, psb_spk_, psb_desc_type + use psb_sparse_mod, only : psb_cspmat_type, psb_spk_, psb_desc_type implicit none ! parameters - type(psb_c_sparse_mat) :: a_glob + type(psb_cspmat_type) :: a_glob complex(psb_spk_) :: b_glob(:) integer :: ictxt - type(psb_c_sparse_mat) :: a + type(psb_cspmat_type) :: a complex(psb_spk_), allocatable :: b(:) type(psb_desc_type) :: desc_a integer, intent(out) :: info @@ -344,14 +344,14 @@ module psb_mat_dist_mod ! on entry: specifies processor holding a_glob. default: 0 ! on exit : unchanged. ! - use psb_sparse_mod, only : psb_z_sparse_mat, psb_dpk_, psb_desc_type + use psb_sparse_mod, only : psb_zspmat_type, psb_dpk_, psb_desc_type implicit none ! parameters - type(psb_z_sparse_mat) :: a_glob + type(psb_zspmat_type) :: a_glob complex(psb_dpk_) :: b_glob(:) integer :: ictxt - type(psb_z_sparse_mat) :: a + type(psb_zspmat_type) :: a complex(psb_dpk_), allocatable :: b(:) type(psb_desc_type) :: desc_a integer, intent(out) :: info diff --git a/util/psb_metispart_mod.F90 b/util/psb_metispart_mod.F90 index 6012da7e..e48264a0 100644 --- a/util/psb_metispart_mod.F90 +++ b/util/psb_metispart_mod.F90 @@ -136,7 +136,7 @@ contains subroutine d_mat_build_mtpart(a,nparts) use psb_sparse_mod - type(psb_d_sparse_mat), intent(in) :: a + type(psb_dspmat_type), intent(in) :: a integer :: nparts @@ -153,7 +153,7 @@ contains subroutine s_mat_build_mtpart(a,nparts) use psb_sparse_mod - type(psb_s_sparse_mat), intent(in) :: a + type(psb_sspmat_type), intent(in) :: a integer :: nparts @@ -170,7 +170,7 @@ contains subroutine z_mat_build_mtpart(a,nparts) use psb_sparse_mod - type(psb_z_sparse_mat), intent(in) :: a + type(psb_zspmat_type), intent(in) :: a integer :: nparts @@ -187,7 +187,7 @@ contains subroutine c_mat_build_mtpart(a,nparts) use psb_sparse_mod - type(psb_c_sparse_mat), intent(in) :: a + type(psb_cspmat_type), intent(in) :: a integer :: nparts diff --git a/util/psb_mmio_impl.f90 b/util/psb_mmio_impl.f90 index 425f535b..58607c9e 100644 --- a/util/psb_mmio_impl.f90 +++ b/util/psb_mmio_impl.f90 @@ -779,7 +779,7 @@ end subroutine mm_zvet1_write subroutine smm_mat_read(a, info, iunit, filename) use psb_sparse_mod implicit none - type(psb_s_sparse_mat), intent(out) :: a + type(psb_sspmat_type), intent(out) :: a integer, intent(out) :: info integer, optional, intent(in) :: iunit character(len=*), optional, intent(in) :: filename @@ -884,7 +884,7 @@ end subroutine smm_mat_read subroutine smm_mat_write(a,mtitle,info,iunit,filename) use psb_sparse_mod implicit none - type(psb_s_sparse_mat), intent(in) :: a + type(psb_sspmat_type), intent(in) :: a integer, intent(out) :: info character(len=*), intent(in) :: mtitle integer, optional, intent(in) :: iunit @@ -929,7 +929,7 @@ end subroutine smm_mat_write subroutine dmm_mat_read(a, info, iunit, filename) use psb_sparse_mod implicit none - type(psb_d_sparse_mat), intent(out) :: a + type(psb_dspmat_type), intent(out) :: a integer, intent(out) :: info integer, optional, intent(in) :: iunit character(len=*), optional, intent(in) :: filename @@ -1032,7 +1032,7 @@ end subroutine dmm_mat_read subroutine dmm_mat_write(a,mtitle,info,iunit,filename) use psb_sparse_mod implicit none - type(psb_d_sparse_mat), intent(in) :: a + type(psb_dspmat_type), intent(in) :: a integer, intent(out) :: info character(len=*), intent(in) :: mtitle integer, optional, intent(in) :: iunit @@ -1077,7 +1077,7 @@ end subroutine dmm_mat_write subroutine cmm_mat_read(a, info, iunit, filename) use psb_sparse_mod implicit none - type(psb_c_sparse_mat), intent(out) :: a + type(psb_cspmat_type), intent(out) :: a integer, intent(out) :: info integer, optional, intent(in) :: iunit character(len=*), optional, intent(in) :: filename @@ -1205,7 +1205,7 @@ end subroutine cmm_mat_read subroutine cmm_mat_write(a,mtitle,info,iunit,filename) use psb_sparse_mod implicit none - type(psb_c_sparse_mat), intent(in) :: a + type(psb_cspmat_type), intent(in) :: a integer, intent(out) :: info character(len=*), intent(in) :: mtitle integer, optional, intent(in) :: iunit @@ -1250,7 +1250,7 @@ end subroutine cmm_mat_write subroutine zmm_mat_read(a, info, iunit, filename) use psb_sparse_mod implicit none - type(psb_z_sparse_mat), intent(out) :: a + type(psb_zspmat_type), intent(out) :: a integer, intent(out) :: info integer, optional, intent(in) :: iunit character(len=*), optional, intent(in) :: filename @@ -1378,7 +1378,7 @@ end subroutine zmm_mat_read subroutine zmm_mat_write(a,mtitle,info,iunit,filename) use psb_sparse_mod implicit none - type(psb_z_sparse_mat), intent(in) :: a + type(psb_zspmat_type), intent(in) :: a integer, intent(out) :: info character(len=*), intent(in) :: mtitle integer, optional, intent(in) :: iunit diff --git a/util/psb_mmio_mod.f90 b/util/psb_mmio_mod.f90 index 45e3b39e..bd44ca36 100644 --- a/util/psb_mmio_mod.f90 +++ b/util/psb_mmio_mod.f90 @@ -147,33 +147,33 @@ module psb_mmio_mod interface mm_mat_read subroutine smm_mat_read(a, info, iunit, filename) - use psb_sparse_mod, only : psb_s_sparse_mat + use psb_sparse_mod, only : psb_sspmat_type implicit none - type(psb_s_sparse_mat), intent(out) :: a + type(psb_sspmat_type), intent(out) :: a integer, intent(out) :: info integer, optional, intent(in) :: iunit character(len=*), optional, intent(in) :: filename end subroutine smm_mat_read subroutine dmm_mat_read(a, info, iunit, filename) - use psb_sparse_mod, only : psb_d_sparse_mat + use psb_sparse_mod, only : psb_dspmat_type implicit none - type(psb_d_sparse_mat), intent(out) :: a + type(psb_dspmat_type), intent(out) :: a integer, intent(out) :: info integer, optional, intent(in) :: iunit character(len=*), optional, intent(in) :: filename end subroutine dmm_mat_read subroutine cmm_mat_read(a, info, iunit, filename) - use psb_sparse_mod, only : psb_c_sparse_mat + use psb_sparse_mod, only : psb_cspmat_type implicit none - type(psb_c_sparse_mat), intent(out) :: a + type(psb_cspmat_type), intent(out) :: a integer, intent(out) :: info integer, optional, intent(in) :: iunit character(len=*), optional, intent(in) :: filename end subroutine cmm_mat_read subroutine zmm_mat_read(a, info, iunit, filename) - use psb_sparse_mod, only : psb_z_sparse_mat + use psb_sparse_mod, only : psb_zspmat_type implicit none - type(psb_z_sparse_mat), intent(out) :: a + type(psb_zspmat_type), intent(out) :: a integer, intent(out) :: info integer, optional, intent(in) :: iunit character(len=*), optional, intent(in) :: filename @@ -182,36 +182,36 @@ module psb_mmio_mod interface mm_mat_write subroutine smm_mat_write(a,mtitle,info,iunit,filename) - use psb_sparse_mod, only : psb_s_sparse_mat + use psb_sparse_mod, only : psb_sspmat_type implicit none - type(psb_s_sparse_mat), intent(in) :: a + type(psb_sspmat_type), intent(in) :: a integer, intent(out) :: info character(len=*), intent(in) :: mtitle integer, optional, intent(in) :: iunit character(len=*), optional, intent(in) :: filename end subroutine smm_mat_write subroutine dmm_mat_write(a,mtitle,info,iunit,filename) - use psb_sparse_mod, only : psb_d_sparse_mat + use psb_sparse_mod, only : psb_dspmat_type implicit none - type(psb_d_sparse_mat), intent(in) :: a + type(psb_dspmat_type), intent(in) :: a integer, intent(out) :: info character(len=*), intent(in) :: mtitle integer, optional, intent(in) :: iunit character(len=*), optional, intent(in) :: filename end subroutine dmm_mat_write subroutine cmm_mat_write(a,mtitle,info,iunit,filename) - use psb_sparse_mod, only : psb_c_sparse_mat + use psb_sparse_mod, only : psb_cspmat_type implicit none - type(psb_c_sparse_mat), intent(in) :: a + type(psb_cspmat_type), intent(in) :: a integer, intent(out) :: info character(len=*), intent(in) :: mtitle integer, optional, intent(in) :: iunit character(len=*), optional, intent(in) :: filename end subroutine cmm_mat_write subroutine zmm_mat_write(a,mtitle,info,iunit,filename) - use psb_sparse_mod, only : psb_z_sparse_mat + use psb_sparse_mod, only : psb_zspmat_type implicit none - type(psb_z_sparse_mat), intent(in) :: a + type(psb_zspmat_type), intent(in) :: a integer, intent(out) :: info character(len=*), intent(in) :: mtitle integer, optional, intent(in) :: iunit