From b376d226cb92b3b3ee2c753c43d41d0440675e15 Mon Sep 17 00:00:00 2001 From: Salvatore Filippone Date: Sat, 14 Nov 2020 16:42:15 +0100 Subject: [PATCH] Fixed declaration and use of CONTEXT with new type. --- base/comm/internals/psi_covrl_restr.f90 | 6 +- base/comm/internals/psi_covrl_restr_a.f90 | 6 +- base/comm/internals/psi_covrl_save.f90 | 8 +- base/comm/internals/psi_covrl_save_a.f90 | 6 +- base/comm/internals/psi_covrl_upd.f90 | 8 +- base/comm/internals/psi_covrl_upd_a.f90 | 7 +- base/comm/internals/psi_cswapdata.F90 | 30 ++-- base/comm/internals/psi_cswapdata_a.F90 | 34 ++-- base/comm/internals/psi_cswaptran.F90 | 28 +-- base/comm/internals/psi_cswaptran_a.F90 | 30 ++-- base/comm/internals/psi_dovrl_restr.f90 | 6 +- base/comm/internals/psi_dovrl_restr_a.f90 | 6 +- base/comm/internals/psi_dovrl_save.f90 | 8 +- base/comm/internals/psi_dovrl_save_a.f90 | 6 +- base/comm/internals/psi_dovrl_upd.f90 | 8 +- base/comm/internals/psi_dovrl_upd_a.f90 | 7 +- base/comm/internals/psi_dswapdata.F90 | 30 ++-- base/comm/internals/psi_dswapdata_a.F90 | 34 ++-- base/comm/internals/psi_dswaptran.F90 | 28 +-- base/comm/internals/psi_dswaptran_a.F90 | 30 ++-- base/comm/internals/psi_eovrl_restr_a.f90 | 6 +- base/comm/internals/psi_eovrl_save_a.f90 | 6 +- base/comm/internals/psi_eovrl_upd_a.f90 | 7 +- base/comm/internals/psi_eswapdata_a.F90 | 34 ++-- base/comm/internals/psi_eswaptran_a.F90 | 30 ++-- base/comm/internals/psi_i2ovrl_restr_a.f90 | 6 +- base/comm/internals/psi_i2ovrl_save_a.f90 | 6 +- base/comm/internals/psi_i2ovrl_upd_a.f90 | 7 +- base/comm/internals/psi_i2swapdata_a.F90 | 34 ++-- base/comm/internals/psi_i2swaptran_a.F90 | 30 ++-- base/comm/internals/psi_iovrl_restr.f90 | 6 +- base/comm/internals/psi_iovrl_save.f90 | 8 +- base/comm/internals/psi_iovrl_upd.f90 | 8 +- base/comm/internals/psi_iswapdata.F90 | 30 ++-- base/comm/internals/psi_iswaptran.F90 | 28 +-- base/comm/internals/psi_lovrl_restr.f90 | 6 +- base/comm/internals/psi_lovrl_save.f90 | 8 +- base/comm/internals/psi_lovrl_upd.f90 | 8 +- base/comm/internals/psi_lswapdata.F90 | 30 ++-- base/comm/internals/psi_lswaptran.F90 | 28 +-- base/comm/internals/psi_movrl_restr_a.f90 | 6 +- base/comm/internals/psi_movrl_save_a.f90 | 6 +- base/comm/internals/psi_movrl_upd_a.f90 | 7 +- base/comm/internals/psi_mswapdata_a.F90 | 34 ++-- base/comm/internals/psi_mswaptran_a.F90 | 30 ++-- base/comm/internals/psi_sovrl_restr.f90 | 6 +- base/comm/internals/psi_sovrl_restr_a.f90 | 6 +- base/comm/internals/psi_sovrl_save.f90 | 8 +- base/comm/internals/psi_sovrl_save_a.f90 | 6 +- base/comm/internals/psi_sovrl_upd.f90 | 8 +- base/comm/internals/psi_sovrl_upd_a.f90 | 7 +- base/comm/internals/psi_sswapdata.F90 | 30 ++-- base/comm/internals/psi_sswapdata_a.F90 | 34 ++-- base/comm/internals/psi_sswaptran.F90 | 28 +-- base/comm/internals/psi_sswaptran_a.F90 | 30 ++-- base/comm/internals/psi_zovrl_restr.f90 | 6 +- base/comm/internals/psi_zovrl_restr_a.f90 | 6 +- base/comm/internals/psi_zovrl_save.f90 | 8 +- base/comm/internals/psi_zovrl_save_a.f90 | 6 +- base/comm/internals/psi_zovrl_upd.f90 | 8 +- base/comm/internals/psi_zovrl_upd_a.f90 | 7 +- base/comm/internals/psi_zswapdata.F90 | 30 ++-- base/comm/internals/psi_zswapdata_a.F90 | 34 ++-- base/comm/internals/psi_zswaptran.F90 | 28 +-- base/comm/internals/psi_zswaptran_a.F90 | 30 ++-- base/comm/psb_cgather.f90 | 10 +- base/comm/psb_cgather_a.f90 | 13 +- base/comm/psb_chalo.f90 | 10 +- base/comm/psb_chalo_a.f90 | 10 +- base/comm/psb_covrl.f90 | 10 +- base/comm/psb_covrl_a.f90 | 10 +- base/comm/psb_cscatter.F90 | 5 +- base/comm/psb_cscatter_a.F90 | 10 +- base/comm/psb_cspgather.F90 | 15 +- base/comm/psb_dgather.f90 | 10 +- base/comm/psb_dgather_a.f90 | 13 +- base/comm/psb_dhalo.f90 | 10 +- base/comm/psb_dhalo_a.f90 | 10 +- base/comm/psb_dovrl.f90 | 10 +- base/comm/psb_dovrl_a.f90 | 10 +- base/comm/psb_dscatter.F90 | 5 +- base/comm/psb_dscatter_a.F90 | 10 +- base/comm/psb_dspgather.F90 | 15 +- base/comm/psb_egather_a.f90 | 13 +- base/comm/psb_ehalo_a.f90 | 10 +- base/comm/psb_eovrl_a.f90 | 10 +- base/comm/psb_escatter_a.F90 | 10 +- base/comm/psb_i2gather_a.f90 | 13 +- base/comm/psb_i2halo_a.f90 | 10 +- base/comm/psb_i2ovrl_a.f90 | 10 +- base/comm/psb_i2scatter_a.F90 | 10 +- base/comm/psb_igather.f90 | 10 +- base/comm/psb_ihalo.f90 | 10 +- base/comm/psb_iovrl.f90 | 10 +- base/comm/psb_iscatter.F90 | 5 +- base/comm/psb_ispgather.F90 | 15 +- base/comm/psb_lgather.f90 | 10 +- base/comm/psb_lhalo.f90 | 10 +- base/comm/psb_lovrl.f90 | 10 +- base/comm/psb_lscatter.F90 | 5 +- base/comm/psb_lspgather.F90 | 15 +- base/comm/psb_mgather_a.f90 | 13 +- base/comm/psb_mhalo_a.f90 | 10 +- base/comm/psb_movrl_a.f90 | 10 +- base/comm/psb_mscatter_a.F90 | 10 +- base/comm/psb_sgather.f90 | 10 +- base/comm/psb_sgather_a.f90 | 13 +- base/comm/psb_shalo.f90 | 10 +- base/comm/psb_shalo_a.f90 | 10 +- base/comm/psb_sovrl.f90 | 10 +- base/comm/psb_sovrl_a.f90 | 10 +- base/comm/psb_sscatter.F90 | 5 +- base/comm/psb_sscatter_a.F90 | 10 +- base/comm/psb_sspgather.F90 | 15 +- base/comm/psb_zgather.f90 | 10 +- base/comm/psb_zgather_a.f90 | 13 +- base/comm/psb_zhalo.f90 | 10 +- base/comm/psb_zhalo_a.f90 | 10 +- base/comm/psb_zovrl.f90 | 10 +- base/comm/psb_zovrl_a.f90 | 10 +- base/comm/psb_zscatter.F90 | 5 +- base/comm/psb_zscatter_a.F90 | 10 +- base/comm/psb_zspgather.F90 | 15 +- base/internals/Makefile | 4 +- base/internals/psi_a2a_fnd_owner.F90 | 14 +- base/internals/psi_adjcncy_fnd_owner.F90 | 7 +- base/internals/psi_bld_glb_dep_list.F90 | 186 ++++++++++---------- base/internals/psi_bld_tmphalo.f90 | 3 +- base/internals/psi_bld_tmpovrl.f90 | 4 +- base/internals/psi_compute_size.f90 | 3 +- base/internals/psi_crea_index.f90 | 11 +- base/internals/psi_crea_ovr_elem.f90 | 1 - base/internals/psi_desc_impl.f90 | 5 +- base/internals/psi_desc_index.F90 | 2 +- base/internals/psi_extrct_dl.F90 | 27 +-- base/internals/psi_fnd_owner.F90 | 3 +- base/internals/psi_graph_fnd_owner.F90 | 10 +- base/internals/psi_indx_map_fnd_owner.F90 | 6 +- base/internals/psi_sort_dl.f90 | 4 +- base/internals/psi_symm_dep_list.F90 | 17 +- base/internals/psi_xtr_loc_dl.F90 | 13 +- base/modules/Makefile | 86 ++++----- base/modules/comm/psb_c_comm_a_mod.f90 | 8 +- base/modules/comm/psb_d_comm_a_mod.f90 | 8 +- base/modules/comm/psb_e_comm_a_mod.f90 | 8 +- base/modules/comm/psb_i2_comm_a_mod.f90 | 8 +- base/modules/comm/psb_m_comm_a_mod.f90 | 8 +- base/modules/comm/psb_s_comm_a_mod.f90 | 8 +- base/modules/comm/psb_z_comm_a_mod.f90 | 8 +- base/modules/comm/psi_c_comm_a_mod.f90 | 47 +++-- base/modules/comm/psi_c_comm_v_mod.f90 | 33 ++-- base/modules/comm/psi_d_comm_a_mod.f90 | 47 +++-- base/modules/comm/psi_d_comm_v_mod.f90 | 33 ++-- base/modules/comm/psi_e_comm_a_mod.f90 | 47 +++-- base/modules/comm/psi_i2_comm_a_mod.f90 | 47 +++-- base/modules/comm/psi_i_comm_v_mod.f90 | 31 ++-- base/modules/comm/psi_l_comm_v_mod.f90 | 31 ++-- base/modules/comm/psi_m_comm_a_mod.f90 | 47 +++-- base/modules/comm/psi_s_comm_a_mod.f90 | 47 +++-- base/modules/comm/psi_s_comm_v_mod.f90 | 33 ++-- base/modules/comm/psi_z_comm_a_mod.f90 | 47 +++-- base/modules/comm/psi_z_comm_v_mod.f90 | 33 ++-- base/modules/desc/psb_desc_mod.F90 | 165 ++++++++--------- base/modules/desc/psb_gen_block_map_mod.F90 | 20 ++- base/modules/desc/psb_glist_map_mod.f90 | 9 +- base/modules/desc/psb_hash_map_mod.f90 | 41 +++-- base/modules/desc/psb_indx_map_mod.f90 | 36 ++-- base/modules/desc/psb_list_map_mod.f90 | 11 +- base/modules/desc/psb_repl_map_mod.f90 | 12 +- base/modules/error.f90 | 34 +--- base/modules/penv/psi_penv_mod.F90 | 18 -- base/modules/psb_cbind_const_mod.F90 | 2 +- base/modules/psb_const_mod.F90 | 19 ++ base/modules/psb_error_impl.F90 | 41 +++-- base/modules/psb_error_mod.F90 | 26 +-- base/modules/psb_timers_mod.f90 | 4 +- base/modules/psi_i_mod.F90 | 40 ++--- base/modules/tools/psb_cd_tools_mod.F90 | 5 +- base/psblas/psb_cabs_vect.f90 | 3 +- base/psblas/psb_camax.f90 | 15 +- base/psblas/psb_casum.f90 | 12 +- base/psblas/psb_caxpby.f90 | 18 +- base/psblas/psb_ccmp_vect.f90 | 9 +- base/psblas/psb_cdiv_vect.f90 | 12 +- base/psblas/psb_cdot.f90 | 15 +- base/psblas/psb_cgetmatinfo.f90 | 3 +- base/psblas/psb_cinv_vect.f90 | 6 +- base/psblas/psb_cmlt_vect.f90 | 6 +- base/psblas/psb_cnrm2.f90 | 18 +- base/psblas/psb_cnrmi.f90 | 3 +- base/psblas/psb_cspmm.f90 | 9 +- base/psblas/psb_cspnrm1.f90 | 3 +- base/psblas/psb_cspsm.f90 | 9 +- base/psblas/psb_dabs_vect.f90 | 3 +- base/psblas/psb_damax.f90 | 18 +- base/psblas/psb_dasum.f90 | 12 +- base/psblas/psb_daxpby.f90 | 18 +- base/psblas/psb_dcmp_vect.f90 | 12 +- base/psblas/psb_ddiv_vect.f90 | 15 +- base/psblas/psb_ddot.f90 | 15 +- base/psblas/psb_dgetmatinfo.f90 | 3 +- base/psblas/psb_dinv_vect.f90 | 6 +- base/psblas/psb_dmlt_vect.f90 | 6 +- base/psblas/psb_dnrm2.f90 | 18 +- base/psblas/psb_dnrmi.f90 | 3 +- base/psblas/psb_dspmm.f90 | 9 +- base/psblas/psb_dspnrm1.f90 | 3 +- base/psblas/psb_dspsm.f90 | 9 +- base/psblas/psb_sabs_vect.f90 | 3 +- base/psblas/psb_samax.f90 | 18 +- base/psblas/psb_sasum.f90 | 12 +- base/psblas/psb_saxpby.f90 | 18 +- base/psblas/psb_scmp_vect.f90 | 12 +- base/psblas/psb_sdiv_vect.f90 | 15 +- base/psblas/psb_sdot.f90 | 15 +- base/psblas/psb_sgetmatinfo.f90 | 3 +- base/psblas/psb_sinv_vect.f90 | 6 +- base/psblas/psb_smlt_vect.f90 | 6 +- base/psblas/psb_snrm2.f90 | 18 +- base/psblas/psb_snrmi.f90 | 3 +- base/psblas/psb_sspmm.f90 | 9 +- base/psblas/psb_sspnrm1.f90 | 3 +- base/psblas/psb_sspsm.f90 | 9 +- base/psblas/psb_zabs_vect.f90 | 3 +- base/psblas/psb_zamax.f90 | 15 +- base/psblas/psb_zasum.f90 | 12 +- base/psblas/psb_zaxpby.f90 | 18 +- base/psblas/psb_zcmp_vect.f90 | 9 +- base/psblas/psb_zdiv_vect.f90 | 12 +- base/psblas/psb_zdot.f90 | 15 +- base/psblas/psb_zgetmatinfo.f90 | 3 +- base/psblas/psb_zinv_vect.f90 | 6 +- base/psblas/psb_zmlt_vect.f90 | 6 +- base/psblas/psb_znrm2.f90 | 18 +- base/psblas/psb_znrmi.f90 | 3 +- base/psblas/psb_zspmm.f90 | 9 +- base/psblas/psb_zspnrm1.f90 | 3 +- base/psblas/psb_zspsm.f90 | 9 +- base/tools/psb_c_glob_transpose.F90 | 18 +- base/tools/psb_c_map.f90 | 12 +- base/tools/psb_c_par_csr_spspmm.f90 | 6 +- base/tools/psb_callc.f90 | 8 +- base/tools/psb_callc_a.f90 | 6 +- base/tools/psb_casb.f90 | 9 +- base/tools/psb_casb_a.f90 | 6 +- base/tools/psb_ccdbldext.F90 | 6 +- base/tools/psb_cd_inloc.f90 | 10 +- base/tools/psb_cd_lstext.f90 | 11 +- base/tools/psb_cd_reinit.f90 | 9 +- base/tools/psb_cd_renum_block.F90 | 9 +- base/tools/psb_cd_set_bld.f90 | 5 +- base/tools/psb_cd_switch_ovl_indxmap.f90 | 7 +- base/tools/psb_cdall.f90 | 29 +-- base/tools/psb_cdals.f90 | 10 +- base/tools/psb_cdalv.f90 | 7 +- base/tools/psb_cdcpy.F90 | 19 +- base/tools/psb_cdins.F90 | 19 +- base/tools/psb_cdprt.f90 | 14 +- base/tools/psb_cdren.f90 | 11 +- base/tools/psb_cdrep.f90 | 152 ++++++++-------- base/tools/psb_cfree.f90 | 9 +- base/tools/psb_cfree_a.f90 | 6 +- base/tools/psb_cgetelem.f90 | 3 +- base/tools/psb_cins.f90 | 12 +- base/tools/psb_cins_a.f90 | 6 +- base/tools/psb_cspalloc.f90 | 3 +- base/tools/psb_cspasb.f90 | 3 +- base/tools/psb_cspfree.f90 | 3 +- base/tools/psb_csphalo.F90 | 12 +- base/tools/psb_cspins.F90 | 15 +- base/tools/psb_csprn.f90 | 3 +- base/tools/psb_d_glob_transpose.F90 | 18 +- base/tools/psb_d_map.f90 | 12 +- base/tools/psb_d_par_csr_spspmm.f90 | 6 +- base/tools/psb_dallc.f90 | 8 +- base/tools/psb_dallc_a.f90 | 6 +- base/tools/psb_dasb.f90 | 9 +- base/tools/psb_dasb_a.f90 | 6 +- base/tools/psb_dcdbldext.F90 | 6 +- base/tools/psb_dfree.f90 | 9 +- base/tools/psb_dfree_a.f90 | 6 +- base/tools/psb_dgetelem.f90 | 3 +- base/tools/psb_dins.f90 | 12 +- base/tools/psb_dins_a.f90 | 6 +- base/tools/psb_dspalloc.f90 | 3 +- base/tools/psb_dspasb.f90 | 3 +- base/tools/psb_dspfree.f90 | 3 +- base/tools/psb_dsphalo.F90 | 12 +- base/tools/psb_dspins.F90 | 15 +- base/tools/psb_dsprn.f90 | 3 +- base/tools/psb_eallc_a.f90 | 6 +- base/tools/psb_easb_a.f90 | 6 +- base/tools/psb_efree_a.f90 | 6 +- base/tools/psb_eins_a.f90 | 6 +- base/tools/psb_get_overlap.f90 | 4 +- base/tools/psb_glob_to_loc.f90 | 6 +- base/tools/psb_i2allc_a.f90 | 6 +- base/tools/psb_i2asb_a.f90 | 6 +- base/tools/psb_i2free_a.f90 | 6 +- base/tools/psb_i2ins_a.f90 | 6 +- base/tools/psb_iallc.f90 | 8 +- base/tools/psb_iasb.f90 | 9 +- base/tools/psb_icdasb.F90 | 6 +- base/tools/psb_ifree.f90 | 9 +- base/tools/psb_iins.f90 | 12 +- base/tools/psb_lallc.f90 | 8 +- base/tools/psb_lasb.f90 | 9 +- base/tools/psb_lfree.f90 | 9 +- base/tools/psb_lins.f90 | 12 +- base/tools/psb_mallc_a.f90 | 6 +- base/tools/psb_masb_a.f90 | 6 +- base/tools/psb_mfree_a.f90 | 6 +- base/tools/psb_mins_a.f90 | 6 +- base/tools/psb_s_glob_transpose.F90 | 18 +- base/tools/psb_s_map.f90 | 12 +- base/tools/psb_s_par_csr_spspmm.f90 | 6 +- base/tools/psb_sallc.f90 | 8 +- base/tools/psb_sallc_a.f90 | 6 +- base/tools/psb_sasb.f90 | 9 +- base/tools/psb_sasb_a.f90 | 6 +- base/tools/psb_scdbldext.F90 | 6 +- base/tools/psb_sfree.f90 | 9 +- base/tools/psb_sfree_a.f90 | 6 +- base/tools/psb_sgetelem.f90 | 3 +- base/tools/psb_sins.f90 | 12 +- base/tools/psb_sins_a.f90 | 6 +- base/tools/psb_sspalloc.f90 | 3 +- base/tools/psb_sspasb.f90 | 3 +- base/tools/psb_sspfree.f90 | 3 +- base/tools/psb_ssphalo.F90 | 12 +- base/tools/psb_sspins.F90 | 15 +- base/tools/psb_ssprn.f90 | 3 +- base/tools/psb_z_glob_transpose.F90 | 18 +- base/tools/psb_z_map.f90 | 12 +- base/tools/psb_z_par_csr_spspmm.f90 | 6 +- base/tools/psb_zallc.f90 | 8 +- base/tools/psb_zallc_a.f90 | 6 +- base/tools/psb_zasb.f90 | 9 +- base/tools/psb_zasb_a.f90 | 6 +- base/tools/psb_zcdbldext.F90 | 6 +- base/tools/psb_zfree.f90 | 9 +- base/tools/psb_zfree_a.f90 | 6 +- base/tools/psb_zgetelem.f90 | 3 +- base/tools/psb_zins.f90 | 12 +- base/tools/psb_zins_a.f90 | 6 +- base/tools/psb_zspalloc.f90 | 3 +- base/tools/psb_zspasb.f90 | 3 +- base/tools/psb_zspfree.f90 | 3 +- base/tools/psb_zsphalo.F90 | 12 +- base/tools/psb_zspins.F90 | 15 +- base/tools/psb_zsprn.f90 | 3 +- cbind/base/psb_base_tools_cbind_mod.F90 | 21 ++- cbind/base/psb_cpenv_mod.f90 | 111 +++++++----- cbind/prec/psb_cprec_cbind_mod.f90 | 4 +- cbind/prec/psb_dprec_cbind_mod.f90 | 4 +- cbind/prec/psb_sprec_cbind_mod.f90 | 4 +- cbind/prec/psb_zprec_cbind_mod.f90 | 4 +- krylov/psb_base_krylov_conv_mod.f90 | 3 +- krylov/psb_c_krylov_conv_mod.f90 | 12 +- krylov/psb_cbicg.f90 | 3 +- krylov/psb_ccg.F90 | 3 +- krylov/psb_ccgs.f90 | 3 +- krylov/psb_ccgstab.f90 | 3 +- krylov/psb_ccgstabl.f90 | 3 +- krylov/psb_cfcg.F90 | 3 +- krylov/psb_cgcr.f90 | 3 +- krylov/psb_ckrylov.f90 | 3 +- krylov/psb_crgmres.f90 | 3 +- krylov/psb_d_krylov_conv_mod.f90 | 12 +- krylov/psb_dbicg.f90 | 3 +- krylov/psb_dcg.F90 | 3 +- krylov/psb_dcgs.f90 | 3 +- krylov/psb_dcgstab.f90 | 3 +- krylov/psb_dcgstabl.f90 | 3 +- krylov/psb_dfcg.F90 | 3 +- krylov/psb_dgcr.f90 | 3 +- krylov/psb_dkrylov.f90 | 3 +- krylov/psb_drgmres.f90 | 3 +- krylov/psb_s_krylov_conv_mod.f90 | 12 +- krylov/psb_sbicg.f90 | 3 +- krylov/psb_scg.F90 | 3 +- krylov/psb_scgs.f90 | 3 +- krylov/psb_scgstab.f90 | 3 +- krylov/psb_scgstabl.f90 | 3 +- krylov/psb_sfcg.F90 | 3 +- krylov/psb_sgcr.f90 | 3 +- krylov/psb_skrylov.f90 | 3 +- krylov/psb_srgmres.f90 | 3 +- krylov/psb_z_krylov_conv_mod.f90 | 12 +- krylov/psb_zbicg.f90 | 3 +- krylov/psb_zcg.F90 | 3 +- krylov/psb_zcgs.f90 | 3 +- krylov/psb_zcgstab.f90 | 3 +- krylov/psb_zcgstabl.f90 | 3 +- krylov/psb_zfcg.F90 | 3 +- krylov/psb_zgcr.f90 | 3 +- krylov/psb_zkrylov.f90 | 3 +- krylov/psb_zrgmres.f90 | 3 +- prec/impl/psb_c_bjacprec_impl.f90 | 12 +- prec/impl/psb_c_diagprec_impl.f90 | 3 +- prec/impl/psb_c_prec_type_impl.f90 | 14 +- prec/impl/psb_cprecbld.f90 | 3 +- prec/impl/psb_cprecinit.f90 | 2 +- prec/impl/psb_d_bjacprec_impl.f90 | 12 +- prec/impl/psb_d_diagprec_impl.f90 | 3 +- prec/impl/psb_d_prec_type_impl.f90 | 14 +- prec/impl/psb_dprecbld.f90 | 3 +- prec/impl/psb_dprecinit.f90 | 2 +- prec/impl/psb_s_bjacprec_impl.f90 | 12 +- prec/impl/psb_s_diagprec_impl.f90 | 3 +- prec/impl/psb_s_prec_type_impl.f90 | 14 +- prec/impl/psb_sprecbld.f90 | 3 +- prec/impl/psb_sprecinit.f90 | 2 +- prec/impl/psb_z_bjacprec_impl.f90 | 12 +- prec/impl/psb_z_diagprec_impl.f90 | 3 +- prec/impl/psb_z_prec_type_impl.f90 | 14 +- prec/impl/psb_zprecbld.f90 | 3 +- prec/impl/psb_zprecinit.f90 | 2 +- prec/psb_c_base_prec_mod.f90 | 14 +- prec/psb_c_bjacprec.f90 | 3 +- prec/psb_c_diagprec.f90 | 3 +- prec/psb_c_nullprec.f90 | 6 +- prec/psb_c_prec_type.f90 | 6 +- prec/psb_d_base_prec_mod.f90 | 14 +- prec/psb_d_bjacprec.f90 | 3 +- prec/psb_d_diagprec.f90 | 3 +- prec/psb_d_nullprec.f90 | 6 +- prec/psb_d_prec_type.f90 | 6 +- prec/psb_s_base_prec_mod.f90 | 14 +- prec/psb_s_bjacprec.f90 | 3 +- prec/psb_s_diagprec.f90 | 3 +- prec/psb_s_nullprec.f90 | 6 +- prec/psb_s_prec_type.f90 | 6 +- prec/psb_z_base_prec_mod.f90 | 14 +- prec/psb_z_bjacprec.f90 | 3 +- prec/psb_z_diagprec.f90 | 3 +- prec/psb_z_nullprec.f90 | 6 +- prec/psb_z_prec_type.f90 | 6 +- test/cdasb/psb_d_pde3d.f90 | 8 +- test/fileread/getp.f90 | 4 +- test/fileread/psb_cf_sample.f90 | 3 +- test/fileread/psb_df_sample.f90 | 3 +- test/fileread/psb_sf_sample.f90 | 3 +- test/fileread/psb_zf_sample.f90 | 3 +- test/hello/hello.f90 | 3 +- test/hello/pingpong.f90 | 3 +- test/kernel/d_file_spmv.f90 | 3 +- test/kernel/pdgenspmv.f90 | 8 +- test/kernel/s_file_spmv.f90 | 3 +- test/kernel/vecoperation.f90 | 10 +- test/pargen/psb_d_pde2d.f90 | 8 +- test/pargen/psb_d_pde3d.f90 | 8 +- test/pargen/psb_s_pde2d.f90 | 8 +- test/pargen/psb_s_pde3d.f90 | 8 +- test/serial/d_matgen.F90 | 8 +- test/torture/psb_c_mvsv_tester.f90 | 108 ++++++++---- test/torture/psb_d_mvsv_tester.f90 | 108 ++++++++---- test/torture/psb_s_mvsv_tester.f90 | 108 ++++++++---- test/torture/psb_z_mvsv_tester.f90 | 108 ++++++++---- util/psb_c_mat_dist_impl.f90 | 4 +- util/psb_c_mat_dist_mod.f90 | 13 +- util/psb_d_mat_dist_impl.f90 | 4 +- util/psb_d_mat_dist_mod.f90 | 13 +- util/psb_metispart_mod.F90 | 5 +- util/psb_s_mat_dist_impl.f90 | 4 +- util/psb_s_mat_dist_mod.f90 | 13 +- util/psb_z_mat_dist_impl.f90 | 4 +- util/psb_z_mat_dist_mod.f90 | 13 +- 468 files changed, 3617 insertions(+), 2325 deletions(-) diff --git a/base/comm/internals/psi_covrl_restr.f90 b/base/comm/internals/psi_covrl_restr.f90 index 996e85ad..a409dfd9 100644 --- a/base/comm/internals/psi_covrl_restr.f90 +++ b/base/comm/internals/psi_covrl_restr.f90 @@ -47,7 +47,8 @@ subroutine psi_covrl_restr_vect(x,xs,desc_a,info) integer(psb_ipk_), intent(out) :: info ! locals - integer(psb_ipk_) :: ictxt, np, me, err_act, i, idx, isz + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me, err_act, i, idx, isz character(len=20) :: name, ch_err name='psi_covrl_restr_vect' @@ -89,7 +90,8 @@ subroutine psi_covrl_restr_multivect(x,xs,desc_a,info) integer(psb_ipk_), intent(out) :: info ! locals - integer(psb_ipk_) :: ictxt, np, me, err_act, i, idx, isz, nc + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me, err_act, i, idx, isz, nc character(len=20) :: name, ch_err name='psi_covrl_restr_mv' diff --git a/base/comm/internals/psi_covrl_restr_a.f90 b/base/comm/internals/psi_covrl_restr_a.f90 index 3c814a81..801e59cc 100644 --- a/base/comm/internals/psi_covrl_restr_a.f90 +++ b/base/comm/internals/psi_covrl_restr_a.f90 @@ -45,7 +45,8 @@ subroutine psi_covrl_restrr1(x,xs,desc_a,info) integer(psb_ipk_), intent(out) :: info ! locals - integer(psb_ipk_) :: ictxt, np, me, err_act, i, idx, isz + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me, err_act, i, idx, isz character(len=20) :: name, ch_err name='psi_covrl_restrr1' @@ -88,7 +89,8 @@ subroutine psi_covrl_restrr2(x,xs,desc_a,info) integer(psb_ipk_), intent(out) :: info ! locals - integer(psb_ipk_) :: ictxt, np, me, err_act, i, idx, isz + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me, err_act, i, idx, isz character(len=20) :: name, ch_err name='psi_covrl_restrr2' diff --git a/base/comm/internals/psi_covrl_save.f90 b/base/comm/internals/psi_covrl_save.f90 index c48d2ade..9dd60edd 100644 --- a/base/comm/internals/psi_covrl_save.f90 +++ b/base/comm/internals/psi_covrl_save.f90 @@ -47,7 +47,8 @@ subroutine psi_covrl_save_vect(x,xs,desc_a,info) integer(psb_ipk_), intent(out) :: info ! locals - integer(psb_ipk_) :: ictxt, np, me, err_act, i, idx, isz + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me, err_act, i, idx, isz character(len=20) :: name, ch_err name='psi_dovrl_saver1' @@ -82,8 +83,6 @@ subroutine psi_covrl_save_vect(x,xs,desc_a,info) return end subroutine psi_covrl_save_vect - - subroutine psi_covrl_save_multivect(x,xs,desc_a,info) use psi_mod, psi_protect_name => psi_covrl_save_multivect use psb_realloc_mod @@ -97,7 +96,8 @@ subroutine psi_covrl_save_multivect(x,xs,desc_a,info) integer(psb_ipk_), intent(out) :: info ! locals - integer(psb_ipk_) :: ictxt, np, me, err_act, i, idx, isz, nc + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me, err_act, i, idx, isz, nc character(len=20) :: name, ch_err name='psi_dovrl_saver1' diff --git a/base/comm/internals/psi_covrl_save_a.f90 b/base/comm/internals/psi_covrl_save_a.f90 index d017d921..8607df7a 100644 --- a/base/comm/internals/psi_covrl_save_a.f90 +++ b/base/comm/internals/psi_covrl_save_a.f90 @@ -47,7 +47,8 @@ subroutine psi_covrl_saver1(x,xs,desc_a,info) integer(psb_ipk_), intent(out) :: info ! locals - integer(psb_ipk_) :: ictxt, np, me, err_act, i, idx, isz + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me, err_act, i, idx, isz character(len=20) :: name, ch_err name='psi_covrl_saver1' @@ -99,7 +100,8 @@ subroutine psi_covrl_saver2(x,xs,desc_a,info) integer(psb_ipk_), intent(out) :: info ! locals - integer(psb_ipk_) :: ictxt, np, me, err_act, i, idx, isz, nc + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me, err_act, i, idx, isz, nc character(len=20) :: name, ch_err name='psi_covrl_saver2' diff --git a/base/comm/internals/psi_covrl_upd.f90 b/base/comm/internals/psi_covrl_upd.f90 index ce33845e..d3c8a5c0 100644 --- a/base/comm/internals/psi_covrl_upd.f90 +++ b/base/comm/internals/psi_covrl_upd.f90 @@ -32,7 +32,7 @@ ! Subroutine: psi_covrl_update ! These subroutines update the overlap region of a vector; they are used ! for the transpose matrix-vector product when there is a nonempty overlap, -! or for the application of Additive Schwarz preconditioners. +! or for the application of Additive Schwarz preconditioners. ! ! ! @@ -50,7 +50,8 @@ subroutine psi_covrl_upd_vect(x,desc_a,update,info) ! locals complex(psb_spk_), allocatable :: xs(:) - integer(psb_ipk_) :: ictxt, np, me, err_act, i, idx, ndm, nx + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me, err_act, i, idx, ndm, nx integer(psb_ipk_) :: ierr(5) character(len=20) :: name, ch_err @@ -131,7 +132,8 @@ subroutine psi_covrl_upd_multivect(x,desc_a,update,info) ! locals complex(psb_spk_), allocatable :: xs(:,:) - integer(psb_ipk_) :: ictxt, np, me, err_act, i, idx, ndm, nx, nc + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me, err_act, i, idx, ndm, nx, nc integer(psb_ipk_) :: ierr(5) character(len=20) :: name, ch_err diff --git a/base/comm/internals/psi_covrl_upd_a.f90 b/base/comm/internals/psi_covrl_upd_a.f90 index 33297731..7483a4fd 100644 --- a/base/comm/internals/psi_covrl_upd_a.f90 +++ b/base/comm/internals/psi_covrl_upd_a.f90 @@ -46,7 +46,8 @@ subroutine psi_covrl_updr1(x,desc_a,update,info) integer(psb_ipk_), intent(out) :: info ! locals - integer(psb_ipk_) :: ictxt, np, me, err_act, i, idx, ndm + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me, err_act, i, idx, ndm integer(psb_ipk_) :: ierr(5) character(len=20) :: name, ch_err @@ -103,7 +104,6 @@ subroutine psi_covrl_updr1(x,desc_a,update,info) return end subroutine psi_covrl_updr1 - subroutine psi_covrl_updr2(x,desc_a,update,info) use psi_mod, psi_protect_name => psi_covrl_updr2 @@ -115,7 +115,8 @@ subroutine psi_covrl_updr2(x,desc_a,update,info) integer(psb_ipk_), intent(out) :: info ! locals - integer(psb_ipk_) :: ictxt, np, me, err_act, i, idx, ndm + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me, err_act, i, idx, ndm integer(psb_ipk_) :: ierr(5) character(len=20) :: name, ch_err diff --git a/base/comm/internals/psi_cswapdata.F90 b/base/comm/internals/psi_cswapdata.F90 index fed8afbf..d416a6ff 100644 --- a/base/comm/internals/psi_cswapdata.F90 +++ b/base/comm/internals/psi_cswapdata.F90 @@ -113,7 +113,9 @@ subroutine psi_cswapdata_vect(flag,beta,y,desc_a,work,info,data) integer(psb_ipk_), optional :: data ! locals - integer(psb_ipk_) :: ictxt, np, me, icomm, idxs, idxr, totxch, data_, err_act + type(psb_ctxt_type) :: ictxt + integer(psb_mpk_) :: icomm + integer(psb_ipk_) :: np, me, idxs, idxr, totxch, data_, err_act class(psb_i_base_vect_type), pointer :: d_vidx character(len=20) :: name @@ -190,8 +192,10 @@ subroutine psi_cswap_vidx_vect(iictxt,iicomm,flag,beta,y,idx, & include 'mpif.h' #endif - integer(psb_ipk_), intent(in) :: iictxt,iicomm,flag - integer(psb_ipk_), intent(out) :: info + type(psb_ctxt_type), intent(in) :: iictxt + integer(psb_mpk_), intent(in) :: iicomm + integer(psb_ipk_), intent(in) :: flag + integer(psb_ipk_), intent(out) :: info class(psb_c_base_vect_type) :: y complex(psb_spk_) :: beta complex(psb_spk_), target :: work(:) @@ -199,7 +203,8 @@ subroutine psi_cswap_vidx_vect(iictxt,iicomm,flag,beta,y,idx, & integer(psb_ipk_), intent(in) :: totxch,totsnd, totrcv ! locals - integer(psb_mpk_) :: ictxt, icomm, np, me,& + type(psb_ctxt_type) :: ictxt + integer(psb_mpk_) :: icomm, np, me,& & proc_to_comm, p2ptag, p2pstat(mpi_status_size), iret integer(psb_mpk_), allocatable :: prcid(:) integer(psb_ipk_) :: nesd, nerv,& @@ -413,7 +418,7 @@ subroutine psi_cswap_vidx_vect(iictxt,iicomm,flag,beta,y,idx, & call psb_erractionrestore(err_act) return -9999 call psb_error_handler(iictxt,err_act) +9999 call psb_error_handler(ictxt,err_act) return end subroutine psi_cswap_vidx_vect @@ -450,7 +455,9 @@ subroutine psi_cswapdata_multivect(flag,beta,y,desc_a,work,info,data) integer(psb_ipk_), optional :: data ! locals - integer(psb_ipk_) :: ictxt, np, me, icomm, idxs, idxr, totxch, data_, err_act + type(psb_ctxt_type) :: ictxt + integer(psb_mpk_) :: icomm + integer(psb_ipk_) :: np, me, idxs, idxr, totxch, data_, err_act class(psb_i_base_vect_type), pointer :: d_vidx character(len=20) :: name @@ -527,8 +534,10 @@ subroutine psi_cswap_vidx_multivect(iictxt,iicomm,flag,beta,y,idx, & include 'mpif.h' #endif - integer(psb_ipk_), intent(in) :: iictxt,iicomm,flag - integer(psb_ipk_), intent(out) :: info + type(psb_ctxt_type), intent(in) :: iictxt + integer(psb_mpk_), intent(in) :: iicomm + integer(psb_ipk_), intent(in) :: flag + integer(psb_ipk_), intent(out) :: info class(psb_c_base_multivect_type) :: y complex(psb_spk_) :: beta complex(psb_spk_), target :: work(:) @@ -536,7 +545,8 @@ subroutine psi_cswap_vidx_multivect(iictxt,iicomm,flag,beta,y,idx, & integer(psb_ipk_), intent(in) :: totxch,totsnd, totrcv ! locals - integer(psb_mpk_) :: ictxt, icomm, np, me,& + type(psb_ctxt_type) :: ictxt + integer(psb_mpk_) :: icomm, np, me,& & proc_to_comm, p2ptag, p2pstat(mpi_status_size), iret integer(psb_mpk_), allocatable :: prcid(:) integer(psb_ipk_) :: nesd, nerv,& @@ -756,7 +766,7 @@ subroutine psi_cswap_vidx_multivect(iictxt,iicomm,flag,beta,y,idx, & call psb_erractionrestore(err_act) return -9999 call psb_error_handler(iictxt,err_act) +9999 call psb_error_handler(ictxt,err_act) return end subroutine psi_cswap_vidx_multivect diff --git a/base/comm/internals/psi_cswapdata_a.F90 b/base/comm/internals/psi_cswapdata_a.F90 index 37d019d6..e627a4b0 100644 --- a/base/comm/internals/psi_cswapdata_a.F90 +++ b/base/comm/internals/psi_cswapdata_a.F90 @@ -106,7 +106,9 @@ subroutine psi_cswapdatam(flag,n,beta,y,desc_a,work,info,data) integer(psb_ipk_), optional :: data ! locals - integer(psb_ipk_) :: ictxt, np, me, icomm, idxs, idxr, totxch, data_, err_act + type(psb_ctxt_type) :: ictxt + integer(psb_mpk_) :: icomm + integer(psb_ipk_) :: np, me, idxs, idxr, totxch, data_, err_act integer(psb_ipk_), pointer :: d_idx(:) character(len=20) :: name @@ -152,7 +154,7 @@ subroutine psi_cswapdatam(flag,n,beta,y,desc_a,work,info,data) return end subroutine psi_cswapdatam -subroutine psi_cswapidxm(iictxt,iicomm,flag,n,beta,y,idx, & +subroutine psi_cswapidxm(ictxt,icomm,flag,n,beta,y,idx, & & totxch,totsnd,totrcv,work,info) use psi_mod, psb_protect_name => psi_cswapidxm @@ -167,14 +169,17 @@ subroutine psi_cswapidxm(iictxt,iicomm,flag,n,beta,y,idx, & include 'mpif.h' #endif - integer(psb_ipk_), intent(in) :: iictxt,iicomm,flag,n - integer(psb_ipk_), intent(out) :: info + type(psb_ctxt_type), intent(in) :: ictxt + integer(psb_mpk_), intent(in) :: icomm + integer(psb_ipk_), intent(in) :: flag,n + integer(psb_ipk_), intent(out) :: info complex(psb_spk_) :: y(:,:), beta complex(psb_spk_), target :: work(:) integer(psb_ipk_), intent(in) :: idx(:),totxch,totsnd, totrcv ! locals - integer(psb_mpk_) :: ictxt, icomm, np, me,& + + integer(psb_mpk_) :: np, me,& & proc_to_comm, p2ptag, p2pstat(mpi_status_size), iret integer(psb_mpk_), allocatable, dimension(:) :: bsdidx, brvidx,& & sdsz, rvsz, prcid, rvhd, sdhd @@ -192,8 +197,6 @@ subroutine psi_cswapidxm(iictxt,iicomm,flag,n,beta,y,idx, & info=psb_success_ name='psi_swap_data' call psb_erractionsave(err_act) - ictxt = iictxt - icomm = iicomm call psb_info(ictxt,me,np) if (np == -1) then @@ -498,7 +501,7 @@ subroutine psi_cswapidxm(iictxt,iicomm,flag,n,beta,y,idx, & call psb_erractionrestore(err_act) return -9999 call psb_error_handler(iictxt,err_act) +9999 call psb_error_handler(ictxt,err_act) return end subroutine psi_cswapidxm @@ -579,7 +582,9 @@ subroutine psi_cswapdatav(flag,beta,y,desc_a,work,info,data) integer(psb_ipk_), optional :: data ! locals - integer(psb_ipk_) :: ictxt, np, me, icomm, idxs, idxr, totxch, data_, err_act + type(psb_ctxt_type) :: ictxt + integer(psb_mpk_) :: icomm + integer(psb_ipk_) :: np, me, idxs, idxr, totxch, data_, err_act integer(psb_ipk_), pointer :: d_idx(:) character(len=20) :: name @@ -651,14 +656,17 @@ subroutine psi_cswapidxv(iictxt,iicomm,flag,beta,y,idx, & include 'mpif.h' #endif - integer(psb_ipk_), intent(in) :: iictxt,iicomm,flag - integer(psb_ipk_), intent(out) :: info + type(psb_ctxt_type), intent(in) :: iictxt + integer(psb_mpk_), intent(in) :: iicomm + integer(psb_ipk_), intent(in) :: flag + integer(psb_ipk_), intent(out) :: info complex(psb_spk_) :: y(:), beta complex(psb_spk_), target :: work(:) integer(psb_ipk_), intent(in) :: idx(:),totxch,totsnd, totrcv ! locals - integer(psb_mpk_) :: ictxt, icomm, np, me,& + type(psb_ctxt_type) :: ictxt + integer(psb_mpk_) :: icomm, np, me,& & proc_to_comm, p2ptag, p2pstat(mpi_status_size), iret integer(psb_mpk_), allocatable, dimension(:) :: bsdidx, brvidx,& & sdsz, rvsz, prcid, rvhd, sdhd @@ -980,7 +988,7 @@ subroutine psi_cswapidxv(iictxt,iicomm,flag,beta,y,idx, & call psb_erractionrestore(err_act) return -9999 call psb_error_handler(iictxt,err_act) +9999 call psb_error_handler(ictxt,err_act) return end subroutine psi_cswapidxv diff --git a/base/comm/internals/psi_cswaptran.F90 b/base/comm/internals/psi_cswaptran.F90 index 152cb045..9d87156f 100644 --- a/base/comm/internals/psi_cswaptran.F90 +++ b/base/comm/internals/psi_cswaptran.F90 @@ -115,7 +115,9 @@ subroutine psi_cswaptran_vect(flag,beta,y,desc_a,work,info,data) integer(psb_ipk_), optional :: data ! locals - integer(psb_ipk_) :: ictxt, np, me, icomm, idxs, idxr, totxch, err_act, data_ + type(psb_ctxt_type) :: ictxt + integer(psb_mpk_) :: icomm + integer(psb_ipk_) :: np, me, idxs, idxr, totxch, err_act, data_ class(psb_i_base_vect_type), pointer :: d_vidx character(len=20) :: name @@ -161,8 +163,6 @@ subroutine psi_cswaptran_vect(flag,beta,y,desc_a,work,info,data) return end subroutine psi_cswaptran_vect - - ! ! ! Subroutine: psi_ctran_vidx_vect @@ -193,7 +193,9 @@ subroutine psi_ctran_vidx_vect(iictxt,iicomm,flag,beta,y,idx,& include 'mpif.h' #endif - integer(psb_ipk_), intent(in) :: iictxt,iicomm,flag + type(psb_ctxt_type), intent(in) :: iictxt + integer(psb_mpk_), intent(in) :: iicomm + integer(psb_ipk_), intent(in) :: flag integer(psb_ipk_), intent(out) :: info class(psb_c_base_vect_type) :: y complex(psb_spk_) :: beta @@ -202,7 +204,8 @@ subroutine psi_ctran_vidx_vect(iictxt,iicomm,flag,beta,y,idx,& integer(psb_ipk_), intent(in) :: totxch,totsnd, totrcv ! locals - integer(psb_mpk_) :: ictxt, icomm, np, me,& + type(psb_ctxt_type) :: ictxt + integer(psb_mpk_) :: icomm, np, me,& & proc_to_comm, p2ptag, p2pstat(mpi_status_size), iret integer(psb_mpk_), allocatable :: prcid(:) integer(psb_ipk_) :: nesd, nerv,& @@ -422,7 +425,7 @@ subroutine psi_ctran_vidx_vect(iictxt,iicomm,flag,beta,y,idx,& call psb_erractionrestore(err_act) return -9999 call psb_error_handler(iictxt,err_act) +9999 call psb_error_handler(ictxt,err_act) return @@ -463,7 +466,9 @@ subroutine psi_cswaptran_multivect(flag,beta,y,desc_a,work,info,data) integer(psb_ipk_), optional :: data ! locals - integer(psb_ipk_) :: ictxt, np, me, icomm, idxs, idxr, totxch, err_act, data_ + type(psb_ctxt_type) :: ictxt + integer(psb_mpk_) :: icomm + integer(psb_ipk_) :: np, me, idxs, idxr, totxch, err_act, data_ class(psb_i_base_vect_type), pointer :: d_vidx character(len=20) :: name @@ -540,7 +545,9 @@ subroutine psi_ctran_vidx_multivect(iictxt,iicomm,flag,beta,y,idx,& include 'mpif.h' #endif - integer(psb_ipk_), intent(in) :: iictxt,iicomm,flag + type(psb_ctxt_type), intent(in) :: iictxt + integer(psb_mpk_), intent(in) :: iicomm + integer(psb_ipk_), intent(in) :: flag integer(psb_ipk_), intent(out) :: info class(psb_c_base_multivect_type) :: y complex(psb_spk_) :: beta @@ -549,7 +556,8 @@ subroutine psi_ctran_vidx_multivect(iictxt,iicomm,flag,beta,y,idx,& integer(psb_ipk_), intent(in) :: totxch,totsnd, totrcv ! locals - integer(psb_mpk_) :: ictxt, icomm, np, me,& + type(psb_ctxt_type) :: ictxt + integer(psb_mpk_) :: icomm, np, me,& & proc_to_comm, p2ptag, p2pstat(mpi_status_size), iret integer(psb_mpk_), allocatable :: prcid(:) integer(psb_ipk_) :: nesd, nerv,& @@ -773,7 +781,7 @@ subroutine psi_ctran_vidx_multivect(iictxt,iicomm,flag,beta,y,idx,& call psb_erractionrestore(err_act) return -9999 call psb_error_handler(iictxt,err_act) +9999 call psb_error_handler(ictxt,err_act) return diff --git a/base/comm/internals/psi_cswaptran_a.F90 b/base/comm/internals/psi_cswaptran_a.F90 index f43e3be3..6792be29 100644 --- a/base/comm/internals/psi_cswaptran_a.F90 +++ b/base/comm/internals/psi_cswaptran_a.F90 @@ -110,7 +110,9 @@ subroutine psi_cswaptranm(flag,n,beta,y,desc_a,work,info,data) integer(psb_ipk_), optional :: data ! locals - integer(psb_ipk_) :: ictxt, np, me, icomm, idxs, idxr, err_act, totxch, data_ + type(psb_ctxt_type) :: ictxt + integer(psb_mpk_) :: icomm + integer(psb_ipk_) :: np, me, idxs, idxr, err_act, totxch, data_ integer(psb_ipk_), pointer :: d_idx(:) character(len=20) :: name @@ -172,14 +174,17 @@ subroutine psi_ctranidxm(iictxt,iicomm,flag,n,beta,y,idx,& include 'mpif.h' #endif - integer(psb_ipk_), intent(in) :: iictxt,iicomm,flag,n - integer(psb_ipk_), intent(out) :: info + type(psb_ctxt_type), intent(in) :: iictxt + integer(psb_mpk_), intent(in) :: iicomm + integer(psb_ipk_), intent(in) :: flag,n + integer(psb_ipk_), intent(out) :: info complex(psb_spk_) :: y(:,:), beta complex(psb_spk_), target :: work(:) integer(psb_ipk_), intent(in) :: idx(:),totxch,totsnd, totrcv ! locals - integer(psb_mpk_) :: ictxt, icomm, np, me,& + type(psb_ctxt_type) :: ictxt + integer(psb_mpk_) :: icomm, np, me,& & proc_to_comm, p2ptag, p2pstat(mpi_status_size), iret integer(psb_mpk_), allocatable, dimension(:) :: bsdidx, brvidx,& & sdsz, rvsz, prcid, rvhd, sdhd @@ -508,7 +513,7 @@ subroutine psi_ctranidxm(iictxt,iicomm,flag,n,beta,y,idx,& call psb_erractionrestore(err_act) return -9999 call psb_error_handler(iictxt,err_act) +9999 call psb_error_handler(ictxt,err_act) return end subroutine psi_ctranidxm @@ -592,7 +597,9 @@ subroutine psi_cswaptranv(flag,beta,y,desc_a,work,info,data) integer(psb_ipk_), optional :: data ! locals - integer(psb_ipk_) :: ictxt, np, me, icomm, idxs, idxr, totxch, err_act, data_ + type(psb_ctxt_type) :: ictxt + integer(psb_mpk_) :: icomm + integer(psb_ipk_) :: np, me, idxs, idxr, totxch, err_act, data_ integer(psb_ipk_), pointer :: d_idx(:) character(len=20) :: name @@ -664,14 +671,17 @@ subroutine psi_ctranidxv(iictxt,iicomm,flag,beta,y,idx,& include 'mpif.h' #endif - integer(psb_ipk_), intent(in) :: iictxt,iicomm,flag - integer(psb_ipk_), intent(out) :: info + type(psb_ctxt_type), intent(in) :: iictxt + integer(psb_mpk_), intent(in) :: iicomm + integer(psb_ipk_), intent(in) :: flag + integer(psb_ipk_), intent(out) :: info complex(psb_spk_) :: y(:), beta complex(psb_spk_), target :: work(:) integer(psb_ipk_), intent(in) :: idx(:),totxch,totsnd, totrcv ! locals - integer(psb_mpk_) :: ictxt, icomm, np, me,& + type(psb_ctxt_type) :: ictxt + integer(psb_mpk_) :: icomm, np, me,& & proc_to_comm, p2ptag, p2pstat(mpi_status_size), iret integer(psb_mpk_), allocatable, dimension(:) :: bsdidx, brvidx,& & sdsz, rvsz, prcid, rvhd, sdhd @@ -996,7 +1006,7 @@ subroutine psi_ctranidxv(iictxt,iicomm,flag,beta,y,idx,& call psb_erractionrestore(err_act) return -9999 call psb_error_handler(iictxt,err_act) +9999 call psb_error_handler(ictxt,err_act) return end subroutine psi_ctranidxv diff --git a/base/comm/internals/psi_dovrl_restr.f90 b/base/comm/internals/psi_dovrl_restr.f90 index 1d6695cc..5ed758ed 100644 --- a/base/comm/internals/psi_dovrl_restr.f90 +++ b/base/comm/internals/psi_dovrl_restr.f90 @@ -47,7 +47,8 @@ subroutine psi_dovrl_restr_vect(x,xs,desc_a,info) integer(psb_ipk_), intent(out) :: info ! locals - integer(psb_ipk_) :: ictxt, np, me, err_act, i, idx, isz + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me, err_act, i, idx, isz character(len=20) :: name, ch_err name='psi_dovrl_restr_vect' @@ -89,7 +90,8 @@ subroutine psi_dovrl_restr_multivect(x,xs,desc_a,info) integer(psb_ipk_), intent(out) :: info ! locals - integer(psb_ipk_) :: ictxt, np, me, err_act, i, idx, isz, nc + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me, err_act, i, idx, isz, nc character(len=20) :: name, ch_err name='psi_dovrl_restr_mv' diff --git a/base/comm/internals/psi_dovrl_restr_a.f90 b/base/comm/internals/psi_dovrl_restr_a.f90 index df47403b..7cd9e32b 100644 --- a/base/comm/internals/psi_dovrl_restr_a.f90 +++ b/base/comm/internals/psi_dovrl_restr_a.f90 @@ -45,7 +45,8 @@ subroutine psi_dovrl_restrr1(x,xs,desc_a,info) integer(psb_ipk_), intent(out) :: info ! locals - integer(psb_ipk_) :: ictxt, np, me, err_act, i, idx, isz + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me, err_act, i, idx, isz character(len=20) :: name, ch_err name='psi_dovrl_restrr1' @@ -88,7 +89,8 @@ subroutine psi_dovrl_restrr2(x,xs,desc_a,info) integer(psb_ipk_), intent(out) :: info ! locals - integer(psb_ipk_) :: ictxt, np, me, err_act, i, idx, isz + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me, err_act, i, idx, isz character(len=20) :: name, ch_err name='psi_dovrl_restrr2' diff --git a/base/comm/internals/psi_dovrl_save.f90 b/base/comm/internals/psi_dovrl_save.f90 index 0689ee1b..a701a239 100644 --- a/base/comm/internals/psi_dovrl_save.f90 +++ b/base/comm/internals/psi_dovrl_save.f90 @@ -47,7 +47,8 @@ subroutine psi_dovrl_save_vect(x,xs,desc_a,info) integer(psb_ipk_), intent(out) :: info ! locals - integer(psb_ipk_) :: ictxt, np, me, err_act, i, idx, isz + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me, err_act, i, idx, isz character(len=20) :: name, ch_err name='psi_dovrl_saver1' @@ -82,8 +83,6 @@ subroutine psi_dovrl_save_vect(x,xs,desc_a,info) return end subroutine psi_dovrl_save_vect - - subroutine psi_dovrl_save_multivect(x,xs,desc_a,info) use psi_mod, psi_protect_name => psi_dovrl_save_multivect use psb_realloc_mod @@ -97,7 +96,8 @@ subroutine psi_dovrl_save_multivect(x,xs,desc_a,info) integer(psb_ipk_), intent(out) :: info ! locals - integer(psb_ipk_) :: ictxt, np, me, err_act, i, idx, isz, nc + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me, err_act, i, idx, isz, nc character(len=20) :: name, ch_err name='psi_dovrl_saver1' diff --git a/base/comm/internals/psi_dovrl_save_a.f90 b/base/comm/internals/psi_dovrl_save_a.f90 index fcc19e08..b214c9a6 100644 --- a/base/comm/internals/psi_dovrl_save_a.f90 +++ b/base/comm/internals/psi_dovrl_save_a.f90 @@ -47,7 +47,8 @@ subroutine psi_dovrl_saver1(x,xs,desc_a,info) integer(psb_ipk_), intent(out) :: info ! locals - integer(psb_ipk_) :: ictxt, np, me, err_act, i, idx, isz + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me, err_act, i, idx, isz character(len=20) :: name, ch_err name='psi_dovrl_saver1' @@ -99,7 +100,8 @@ subroutine psi_dovrl_saver2(x,xs,desc_a,info) integer(psb_ipk_), intent(out) :: info ! locals - integer(psb_ipk_) :: ictxt, np, me, err_act, i, idx, isz, nc + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me, err_act, i, idx, isz, nc character(len=20) :: name, ch_err name='psi_dovrl_saver2' diff --git a/base/comm/internals/psi_dovrl_upd.f90 b/base/comm/internals/psi_dovrl_upd.f90 index efbb2495..20fb80f1 100644 --- a/base/comm/internals/psi_dovrl_upd.f90 +++ b/base/comm/internals/psi_dovrl_upd.f90 @@ -32,7 +32,7 @@ ! Subroutine: psi_dovrl_update ! These subroutines update the overlap region of a vector; they are used ! for the transpose matrix-vector product when there is a nonempty overlap, -! or for the application of Additive Schwarz preconditioners. +! or for the application of Additive Schwarz preconditioners. ! ! ! @@ -50,7 +50,8 @@ subroutine psi_dovrl_upd_vect(x,desc_a,update,info) ! locals real(psb_dpk_), allocatable :: xs(:) - integer(psb_ipk_) :: ictxt, np, me, err_act, i, idx, ndm, nx + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me, err_act, i, idx, ndm, nx integer(psb_ipk_) :: ierr(5) character(len=20) :: name, ch_err @@ -131,7 +132,8 @@ subroutine psi_dovrl_upd_multivect(x,desc_a,update,info) ! locals real(psb_dpk_), allocatable :: xs(:,:) - integer(psb_ipk_) :: ictxt, np, me, err_act, i, idx, ndm, nx, nc + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me, err_act, i, idx, ndm, nx, nc integer(psb_ipk_) :: ierr(5) character(len=20) :: name, ch_err diff --git a/base/comm/internals/psi_dovrl_upd_a.f90 b/base/comm/internals/psi_dovrl_upd_a.f90 index 8ad3db6b..f3fb3da9 100644 --- a/base/comm/internals/psi_dovrl_upd_a.f90 +++ b/base/comm/internals/psi_dovrl_upd_a.f90 @@ -46,7 +46,8 @@ subroutine psi_dovrl_updr1(x,desc_a,update,info) integer(psb_ipk_), intent(out) :: info ! locals - integer(psb_ipk_) :: ictxt, np, me, err_act, i, idx, ndm + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me, err_act, i, idx, ndm integer(psb_ipk_) :: ierr(5) character(len=20) :: name, ch_err @@ -103,7 +104,6 @@ subroutine psi_dovrl_updr1(x,desc_a,update,info) return end subroutine psi_dovrl_updr1 - subroutine psi_dovrl_updr2(x,desc_a,update,info) use psi_mod, psi_protect_name => psi_dovrl_updr2 @@ -115,7 +115,8 @@ subroutine psi_dovrl_updr2(x,desc_a,update,info) integer(psb_ipk_), intent(out) :: info ! locals - integer(psb_ipk_) :: ictxt, np, me, err_act, i, idx, ndm + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me, err_act, i, idx, ndm integer(psb_ipk_) :: ierr(5) character(len=20) :: name, ch_err diff --git a/base/comm/internals/psi_dswapdata.F90 b/base/comm/internals/psi_dswapdata.F90 index a59b9b79..0f28408b 100644 --- a/base/comm/internals/psi_dswapdata.F90 +++ b/base/comm/internals/psi_dswapdata.F90 @@ -113,7 +113,9 @@ subroutine psi_dswapdata_vect(flag,beta,y,desc_a,work,info,data) integer(psb_ipk_), optional :: data ! locals - integer(psb_ipk_) :: ictxt, np, me, icomm, idxs, idxr, totxch, data_, err_act + type(psb_ctxt_type) :: ictxt + integer(psb_mpk_) :: icomm + integer(psb_ipk_) :: np, me, idxs, idxr, totxch, data_, err_act class(psb_i_base_vect_type), pointer :: d_vidx character(len=20) :: name @@ -190,8 +192,10 @@ subroutine psi_dswap_vidx_vect(iictxt,iicomm,flag,beta,y,idx, & include 'mpif.h' #endif - integer(psb_ipk_), intent(in) :: iictxt,iicomm,flag - integer(psb_ipk_), intent(out) :: info + type(psb_ctxt_type), intent(in) :: iictxt + integer(psb_mpk_), intent(in) :: iicomm + integer(psb_ipk_), intent(in) :: flag + integer(psb_ipk_), intent(out) :: info class(psb_d_base_vect_type) :: y real(psb_dpk_) :: beta real(psb_dpk_), target :: work(:) @@ -199,7 +203,8 @@ subroutine psi_dswap_vidx_vect(iictxt,iicomm,flag,beta,y,idx, & integer(psb_ipk_), intent(in) :: totxch,totsnd, totrcv ! locals - integer(psb_mpk_) :: ictxt, icomm, np, me,& + type(psb_ctxt_type) :: ictxt + integer(psb_mpk_) :: icomm, np, me,& & proc_to_comm, p2ptag, p2pstat(mpi_status_size), iret integer(psb_mpk_), allocatable :: prcid(:) integer(psb_ipk_) :: nesd, nerv,& @@ -413,7 +418,7 @@ subroutine psi_dswap_vidx_vect(iictxt,iicomm,flag,beta,y,idx, & call psb_erractionrestore(err_act) return -9999 call psb_error_handler(iictxt,err_act) +9999 call psb_error_handler(ictxt,err_act) return end subroutine psi_dswap_vidx_vect @@ -450,7 +455,9 @@ subroutine psi_dswapdata_multivect(flag,beta,y,desc_a,work,info,data) integer(psb_ipk_), optional :: data ! locals - integer(psb_ipk_) :: ictxt, np, me, icomm, idxs, idxr, totxch, data_, err_act + type(psb_ctxt_type) :: ictxt + integer(psb_mpk_) :: icomm + integer(psb_ipk_) :: np, me, idxs, idxr, totxch, data_, err_act class(psb_i_base_vect_type), pointer :: d_vidx character(len=20) :: name @@ -527,8 +534,10 @@ subroutine psi_dswap_vidx_multivect(iictxt,iicomm,flag,beta,y,idx, & include 'mpif.h' #endif - integer(psb_ipk_), intent(in) :: iictxt,iicomm,flag - integer(psb_ipk_), intent(out) :: info + type(psb_ctxt_type), intent(in) :: iictxt + integer(psb_mpk_), intent(in) :: iicomm + integer(psb_ipk_), intent(in) :: flag + integer(psb_ipk_), intent(out) :: info class(psb_d_base_multivect_type) :: y real(psb_dpk_) :: beta real(psb_dpk_), target :: work(:) @@ -536,7 +545,8 @@ subroutine psi_dswap_vidx_multivect(iictxt,iicomm,flag,beta,y,idx, & integer(psb_ipk_), intent(in) :: totxch,totsnd, totrcv ! locals - integer(psb_mpk_) :: ictxt, icomm, np, me,& + type(psb_ctxt_type) :: ictxt + integer(psb_mpk_) :: icomm, np, me,& & proc_to_comm, p2ptag, p2pstat(mpi_status_size), iret integer(psb_mpk_), allocatable :: prcid(:) integer(psb_ipk_) :: nesd, nerv,& @@ -756,7 +766,7 @@ subroutine psi_dswap_vidx_multivect(iictxt,iicomm,flag,beta,y,idx, & call psb_erractionrestore(err_act) return -9999 call psb_error_handler(iictxt,err_act) +9999 call psb_error_handler(ictxt,err_act) return end subroutine psi_dswap_vidx_multivect diff --git a/base/comm/internals/psi_dswapdata_a.F90 b/base/comm/internals/psi_dswapdata_a.F90 index 7400548a..65090ee7 100644 --- a/base/comm/internals/psi_dswapdata_a.F90 +++ b/base/comm/internals/psi_dswapdata_a.F90 @@ -106,7 +106,9 @@ subroutine psi_dswapdatam(flag,n,beta,y,desc_a,work,info,data) integer(psb_ipk_), optional :: data ! locals - integer(psb_ipk_) :: ictxt, np, me, icomm, idxs, idxr, totxch, data_, err_act + type(psb_ctxt_type) :: ictxt + integer(psb_mpk_) :: icomm + integer(psb_ipk_) :: np, me, idxs, idxr, totxch, data_, err_act integer(psb_ipk_), pointer :: d_idx(:) character(len=20) :: name @@ -152,7 +154,7 @@ subroutine psi_dswapdatam(flag,n,beta,y,desc_a,work,info,data) return end subroutine psi_dswapdatam -subroutine psi_dswapidxm(iictxt,iicomm,flag,n,beta,y,idx, & +subroutine psi_dswapidxm(ictxt,icomm,flag,n,beta,y,idx, & & totxch,totsnd,totrcv,work,info) use psi_mod, psb_protect_name => psi_dswapidxm @@ -167,14 +169,17 @@ subroutine psi_dswapidxm(iictxt,iicomm,flag,n,beta,y,idx, & include 'mpif.h' #endif - integer(psb_ipk_), intent(in) :: iictxt,iicomm,flag,n - integer(psb_ipk_), intent(out) :: info + type(psb_ctxt_type), intent(in) :: ictxt + integer(psb_mpk_), intent(in) :: icomm + integer(psb_ipk_), intent(in) :: flag,n + integer(psb_ipk_), intent(out) :: info real(psb_dpk_) :: y(:,:), beta real(psb_dpk_), target :: work(:) integer(psb_ipk_), intent(in) :: idx(:),totxch,totsnd, totrcv ! locals - integer(psb_mpk_) :: ictxt, icomm, np, me,& + + integer(psb_mpk_) :: np, me,& & proc_to_comm, p2ptag, p2pstat(mpi_status_size), iret integer(psb_mpk_), allocatable, dimension(:) :: bsdidx, brvidx,& & sdsz, rvsz, prcid, rvhd, sdhd @@ -192,8 +197,6 @@ subroutine psi_dswapidxm(iictxt,iicomm,flag,n,beta,y,idx, & info=psb_success_ name='psi_swap_data' call psb_erractionsave(err_act) - ictxt = iictxt - icomm = iicomm call psb_info(ictxt,me,np) if (np == -1) then @@ -498,7 +501,7 @@ subroutine psi_dswapidxm(iictxt,iicomm,flag,n,beta,y,idx, & call psb_erractionrestore(err_act) return -9999 call psb_error_handler(iictxt,err_act) +9999 call psb_error_handler(ictxt,err_act) return end subroutine psi_dswapidxm @@ -579,7 +582,9 @@ subroutine psi_dswapdatav(flag,beta,y,desc_a,work,info,data) integer(psb_ipk_), optional :: data ! locals - integer(psb_ipk_) :: ictxt, np, me, icomm, idxs, idxr, totxch, data_, err_act + type(psb_ctxt_type) :: ictxt + integer(psb_mpk_) :: icomm + integer(psb_ipk_) :: np, me, idxs, idxr, totxch, data_, err_act integer(psb_ipk_), pointer :: d_idx(:) character(len=20) :: name @@ -651,14 +656,17 @@ subroutine psi_dswapidxv(iictxt,iicomm,flag,beta,y,idx, & include 'mpif.h' #endif - integer(psb_ipk_), intent(in) :: iictxt,iicomm,flag - integer(psb_ipk_), intent(out) :: info + type(psb_ctxt_type), intent(in) :: iictxt + integer(psb_mpk_), intent(in) :: iicomm + integer(psb_ipk_), intent(in) :: flag + integer(psb_ipk_), intent(out) :: info real(psb_dpk_) :: y(:), beta real(psb_dpk_), target :: work(:) integer(psb_ipk_), intent(in) :: idx(:),totxch,totsnd, totrcv ! locals - integer(psb_mpk_) :: ictxt, icomm, np, me,& + type(psb_ctxt_type) :: ictxt + integer(psb_mpk_) :: icomm, np, me,& & proc_to_comm, p2ptag, p2pstat(mpi_status_size), iret integer(psb_mpk_), allocatable, dimension(:) :: bsdidx, brvidx,& & sdsz, rvsz, prcid, rvhd, sdhd @@ -980,7 +988,7 @@ subroutine psi_dswapidxv(iictxt,iicomm,flag,beta,y,idx, & call psb_erractionrestore(err_act) return -9999 call psb_error_handler(iictxt,err_act) +9999 call psb_error_handler(ictxt,err_act) return end subroutine psi_dswapidxv diff --git a/base/comm/internals/psi_dswaptran.F90 b/base/comm/internals/psi_dswaptran.F90 index 1feee33c..e3a784f4 100644 --- a/base/comm/internals/psi_dswaptran.F90 +++ b/base/comm/internals/psi_dswaptran.F90 @@ -115,7 +115,9 @@ subroutine psi_dswaptran_vect(flag,beta,y,desc_a,work,info,data) integer(psb_ipk_), optional :: data ! locals - integer(psb_ipk_) :: ictxt, np, me, icomm, idxs, idxr, totxch, err_act, data_ + type(psb_ctxt_type) :: ictxt + integer(psb_mpk_) :: icomm + integer(psb_ipk_) :: np, me, idxs, idxr, totxch, err_act, data_ class(psb_i_base_vect_type), pointer :: d_vidx character(len=20) :: name @@ -161,8 +163,6 @@ subroutine psi_dswaptran_vect(flag,beta,y,desc_a,work,info,data) return end subroutine psi_dswaptran_vect - - ! ! ! Subroutine: psi_dtran_vidx_vect @@ -193,7 +193,9 @@ subroutine psi_dtran_vidx_vect(iictxt,iicomm,flag,beta,y,idx,& include 'mpif.h' #endif - integer(psb_ipk_), intent(in) :: iictxt,iicomm,flag + type(psb_ctxt_type), intent(in) :: iictxt + integer(psb_mpk_), intent(in) :: iicomm + integer(psb_ipk_), intent(in) :: flag integer(psb_ipk_), intent(out) :: info class(psb_d_base_vect_type) :: y real(psb_dpk_) :: beta @@ -202,7 +204,8 @@ subroutine psi_dtran_vidx_vect(iictxt,iicomm,flag,beta,y,idx,& integer(psb_ipk_), intent(in) :: totxch,totsnd, totrcv ! locals - integer(psb_mpk_) :: ictxt, icomm, np, me,& + type(psb_ctxt_type) :: ictxt + integer(psb_mpk_) :: icomm, np, me,& & proc_to_comm, p2ptag, p2pstat(mpi_status_size), iret integer(psb_mpk_), allocatable :: prcid(:) integer(psb_ipk_) :: nesd, nerv,& @@ -422,7 +425,7 @@ subroutine psi_dtran_vidx_vect(iictxt,iicomm,flag,beta,y,idx,& call psb_erractionrestore(err_act) return -9999 call psb_error_handler(iictxt,err_act) +9999 call psb_error_handler(ictxt,err_act) return @@ -463,7 +466,9 @@ subroutine psi_dswaptran_multivect(flag,beta,y,desc_a,work,info,data) integer(psb_ipk_), optional :: data ! locals - integer(psb_ipk_) :: ictxt, np, me, icomm, idxs, idxr, totxch, err_act, data_ + type(psb_ctxt_type) :: ictxt + integer(psb_mpk_) :: icomm + integer(psb_ipk_) :: np, me, idxs, idxr, totxch, err_act, data_ class(psb_i_base_vect_type), pointer :: d_vidx character(len=20) :: name @@ -540,7 +545,9 @@ subroutine psi_dtran_vidx_multivect(iictxt,iicomm,flag,beta,y,idx,& include 'mpif.h' #endif - integer(psb_ipk_), intent(in) :: iictxt,iicomm,flag + type(psb_ctxt_type), intent(in) :: iictxt + integer(psb_mpk_), intent(in) :: iicomm + integer(psb_ipk_), intent(in) :: flag integer(psb_ipk_), intent(out) :: info class(psb_d_base_multivect_type) :: y real(psb_dpk_) :: beta @@ -549,7 +556,8 @@ subroutine psi_dtran_vidx_multivect(iictxt,iicomm,flag,beta,y,idx,& integer(psb_ipk_), intent(in) :: totxch,totsnd, totrcv ! locals - integer(psb_mpk_) :: ictxt, icomm, np, me,& + type(psb_ctxt_type) :: ictxt + integer(psb_mpk_) :: icomm, np, me,& & proc_to_comm, p2ptag, p2pstat(mpi_status_size), iret integer(psb_mpk_), allocatable :: prcid(:) integer(psb_ipk_) :: nesd, nerv,& @@ -773,7 +781,7 @@ subroutine psi_dtran_vidx_multivect(iictxt,iicomm,flag,beta,y,idx,& call psb_erractionrestore(err_act) return -9999 call psb_error_handler(iictxt,err_act) +9999 call psb_error_handler(ictxt,err_act) return diff --git a/base/comm/internals/psi_dswaptran_a.F90 b/base/comm/internals/psi_dswaptran_a.F90 index cce55b4d..56691df5 100644 --- a/base/comm/internals/psi_dswaptran_a.F90 +++ b/base/comm/internals/psi_dswaptran_a.F90 @@ -110,7 +110,9 @@ subroutine psi_dswaptranm(flag,n,beta,y,desc_a,work,info,data) integer(psb_ipk_), optional :: data ! locals - integer(psb_ipk_) :: ictxt, np, me, icomm, idxs, idxr, err_act, totxch, data_ + type(psb_ctxt_type) :: ictxt + integer(psb_mpk_) :: icomm + integer(psb_ipk_) :: np, me, idxs, idxr, err_act, totxch, data_ integer(psb_ipk_), pointer :: d_idx(:) character(len=20) :: name @@ -172,14 +174,17 @@ subroutine psi_dtranidxm(iictxt,iicomm,flag,n,beta,y,idx,& include 'mpif.h' #endif - integer(psb_ipk_), intent(in) :: iictxt,iicomm,flag,n - integer(psb_ipk_), intent(out) :: info + type(psb_ctxt_type), intent(in) :: iictxt + integer(psb_mpk_), intent(in) :: iicomm + integer(psb_ipk_), intent(in) :: flag,n + integer(psb_ipk_), intent(out) :: info real(psb_dpk_) :: y(:,:), beta real(psb_dpk_), target :: work(:) integer(psb_ipk_), intent(in) :: idx(:),totxch,totsnd, totrcv ! locals - integer(psb_mpk_) :: ictxt, icomm, np, me,& + type(psb_ctxt_type) :: ictxt + integer(psb_mpk_) :: icomm, np, me,& & proc_to_comm, p2ptag, p2pstat(mpi_status_size), iret integer(psb_mpk_), allocatable, dimension(:) :: bsdidx, brvidx,& & sdsz, rvsz, prcid, rvhd, sdhd @@ -508,7 +513,7 @@ subroutine psi_dtranidxm(iictxt,iicomm,flag,n,beta,y,idx,& call psb_erractionrestore(err_act) return -9999 call psb_error_handler(iictxt,err_act) +9999 call psb_error_handler(ictxt,err_act) return end subroutine psi_dtranidxm @@ -592,7 +597,9 @@ subroutine psi_dswaptranv(flag,beta,y,desc_a,work,info,data) integer(psb_ipk_), optional :: data ! locals - integer(psb_ipk_) :: ictxt, np, me, icomm, idxs, idxr, totxch, err_act, data_ + type(psb_ctxt_type) :: ictxt + integer(psb_mpk_) :: icomm + integer(psb_ipk_) :: np, me, idxs, idxr, totxch, err_act, data_ integer(psb_ipk_), pointer :: d_idx(:) character(len=20) :: name @@ -664,14 +671,17 @@ subroutine psi_dtranidxv(iictxt,iicomm,flag,beta,y,idx,& include 'mpif.h' #endif - integer(psb_ipk_), intent(in) :: iictxt,iicomm,flag - integer(psb_ipk_), intent(out) :: info + type(psb_ctxt_type), intent(in) :: iictxt + integer(psb_mpk_), intent(in) :: iicomm + integer(psb_ipk_), intent(in) :: flag + integer(psb_ipk_), intent(out) :: info real(psb_dpk_) :: y(:), beta real(psb_dpk_), target :: work(:) integer(psb_ipk_), intent(in) :: idx(:),totxch,totsnd, totrcv ! locals - integer(psb_mpk_) :: ictxt, icomm, np, me,& + type(psb_ctxt_type) :: ictxt + integer(psb_mpk_) :: icomm, np, me,& & proc_to_comm, p2ptag, p2pstat(mpi_status_size), iret integer(psb_mpk_), allocatable, dimension(:) :: bsdidx, brvidx,& & sdsz, rvsz, prcid, rvhd, sdhd @@ -996,7 +1006,7 @@ subroutine psi_dtranidxv(iictxt,iicomm,flag,beta,y,idx,& call psb_erractionrestore(err_act) return -9999 call psb_error_handler(iictxt,err_act) +9999 call psb_error_handler(ictxt,err_act) return end subroutine psi_dtranidxv diff --git a/base/comm/internals/psi_eovrl_restr_a.f90 b/base/comm/internals/psi_eovrl_restr_a.f90 index 3dbb2ac4..032844d9 100644 --- a/base/comm/internals/psi_eovrl_restr_a.f90 +++ b/base/comm/internals/psi_eovrl_restr_a.f90 @@ -45,7 +45,8 @@ subroutine psi_eovrl_restrr1(x,xs,desc_a,info) integer(psb_ipk_), intent(out) :: info ! locals - integer(psb_ipk_) :: ictxt, np, me, err_act, i, idx, isz + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me, err_act, i, idx, isz character(len=20) :: name, ch_err name='psi_eovrl_restrr1' @@ -88,7 +89,8 @@ subroutine psi_eovrl_restrr2(x,xs,desc_a,info) integer(psb_ipk_), intent(out) :: info ! locals - integer(psb_ipk_) :: ictxt, np, me, err_act, i, idx, isz + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me, err_act, i, idx, isz character(len=20) :: name, ch_err name='psi_eovrl_restrr2' diff --git a/base/comm/internals/psi_eovrl_save_a.f90 b/base/comm/internals/psi_eovrl_save_a.f90 index 4f0b7d30..43bd5c9f 100644 --- a/base/comm/internals/psi_eovrl_save_a.f90 +++ b/base/comm/internals/psi_eovrl_save_a.f90 @@ -47,7 +47,8 @@ subroutine psi_eovrl_saver1(x,xs,desc_a,info) integer(psb_ipk_), intent(out) :: info ! locals - integer(psb_ipk_) :: ictxt, np, me, err_act, i, idx, isz + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me, err_act, i, idx, isz character(len=20) :: name, ch_err name='psi_eovrl_saver1' @@ -99,7 +100,8 @@ subroutine psi_eovrl_saver2(x,xs,desc_a,info) integer(psb_ipk_), intent(out) :: info ! locals - integer(psb_ipk_) :: ictxt, np, me, err_act, i, idx, isz, nc + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me, err_act, i, idx, isz, nc character(len=20) :: name, ch_err name='psi_eovrl_saver2' diff --git a/base/comm/internals/psi_eovrl_upd_a.f90 b/base/comm/internals/psi_eovrl_upd_a.f90 index e8e40738..2790f57c 100644 --- a/base/comm/internals/psi_eovrl_upd_a.f90 +++ b/base/comm/internals/psi_eovrl_upd_a.f90 @@ -46,7 +46,8 @@ subroutine psi_eovrl_updr1(x,desc_a,update,info) integer(psb_ipk_), intent(out) :: info ! locals - integer(psb_ipk_) :: ictxt, np, me, err_act, i, idx, ndm + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me, err_act, i, idx, ndm integer(psb_ipk_) :: ierr(5) character(len=20) :: name, ch_err @@ -103,7 +104,6 @@ subroutine psi_eovrl_updr1(x,desc_a,update,info) return end subroutine psi_eovrl_updr1 - subroutine psi_eovrl_updr2(x,desc_a,update,info) use psi_mod, psi_protect_name => psi_eovrl_updr2 @@ -115,7 +115,8 @@ subroutine psi_eovrl_updr2(x,desc_a,update,info) integer(psb_ipk_), intent(out) :: info ! locals - integer(psb_ipk_) :: ictxt, np, me, err_act, i, idx, ndm + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me, err_act, i, idx, ndm integer(psb_ipk_) :: ierr(5) character(len=20) :: name, ch_err diff --git a/base/comm/internals/psi_eswapdata_a.F90 b/base/comm/internals/psi_eswapdata_a.F90 index aa0cda65..11f90f84 100644 --- a/base/comm/internals/psi_eswapdata_a.F90 +++ b/base/comm/internals/psi_eswapdata_a.F90 @@ -106,7 +106,9 @@ subroutine psi_eswapdatam(flag,n,beta,y,desc_a,work,info,data) integer(psb_ipk_), optional :: data ! locals - integer(psb_ipk_) :: ictxt, np, me, icomm, idxs, idxr, totxch, data_, err_act + type(psb_ctxt_type) :: ictxt + integer(psb_mpk_) :: icomm + integer(psb_ipk_) :: np, me, idxs, idxr, totxch, data_, err_act integer(psb_ipk_), pointer :: d_idx(:) character(len=20) :: name @@ -152,7 +154,7 @@ subroutine psi_eswapdatam(flag,n,beta,y,desc_a,work,info,data) return end subroutine psi_eswapdatam -subroutine psi_eswapidxm(iictxt,iicomm,flag,n,beta,y,idx, & +subroutine psi_eswapidxm(ictxt,icomm,flag,n,beta,y,idx, & & totxch,totsnd,totrcv,work,info) use psi_mod, psb_protect_name => psi_eswapidxm @@ -167,14 +169,17 @@ subroutine psi_eswapidxm(iictxt,iicomm,flag,n,beta,y,idx, & include 'mpif.h' #endif - integer(psb_ipk_), intent(in) :: iictxt,iicomm,flag,n - integer(psb_ipk_), intent(out) :: info + type(psb_ctxt_type), intent(in) :: ictxt + integer(psb_mpk_), intent(in) :: icomm + integer(psb_ipk_), intent(in) :: flag,n + integer(psb_ipk_), intent(out) :: info integer(psb_epk_) :: y(:,:), beta integer(psb_epk_), target :: work(:) integer(psb_ipk_), intent(in) :: idx(:),totxch,totsnd, totrcv ! locals - integer(psb_mpk_) :: ictxt, icomm, np, me,& + + integer(psb_mpk_) :: np, me,& & proc_to_comm, p2ptag, p2pstat(mpi_status_size), iret integer(psb_mpk_), allocatable, dimension(:) :: bsdidx, brvidx,& & sdsz, rvsz, prcid, rvhd, sdhd @@ -192,8 +197,6 @@ subroutine psi_eswapidxm(iictxt,iicomm,flag,n,beta,y,idx, & info=psb_success_ name='psi_swap_data' call psb_erractionsave(err_act) - ictxt = iictxt - icomm = iicomm call psb_info(ictxt,me,np) if (np == -1) then @@ -498,7 +501,7 @@ subroutine psi_eswapidxm(iictxt,iicomm,flag,n,beta,y,idx, & call psb_erractionrestore(err_act) return -9999 call psb_error_handler(iictxt,err_act) +9999 call psb_error_handler(ictxt,err_act) return end subroutine psi_eswapidxm @@ -579,7 +582,9 @@ subroutine psi_eswapdatav(flag,beta,y,desc_a,work,info,data) integer(psb_ipk_), optional :: data ! locals - integer(psb_ipk_) :: ictxt, np, me, icomm, idxs, idxr, totxch, data_, err_act + type(psb_ctxt_type) :: ictxt + integer(psb_mpk_) :: icomm + integer(psb_ipk_) :: np, me, idxs, idxr, totxch, data_, err_act integer(psb_ipk_), pointer :: d_idx(:) character(len=20) :: name @@ -651,14 +656,17 @@ subroutine psi_eswapidxv(iictxt,iicomm,flag,beta,y,idx, & include 'mpif.h' #endif - integer(psb_ipk_), intent(in) :: iictxt,iicomm,flag - integer(psb_ipk_), intent(out) :: info + type(psb_ctxt_type), intent(in) :: iictxt + integer(psb_mpk_), intent(in) :: iicomm + integer(psb_ipk_), intent(in) :: flag + integer(psb_ipk_), intent(out) :: info integer(psb_epk_) :: y(:), beta integer(psb_epk_), target :: work(:) integer(psb_ipk_), intent(in) :: idx(:),totxch,totsnd, totrcv ! locals - integer(psb_mpk_) :: ictxt, icomm, np, me,& + type(psb_ctxt_type) :: ictxt + integer(psb_mpk_) :: icomm, np, me,& & proc_to_comm, p2ptag, p2pstat(mpi_status_size), iret integer(psb_mpk_), allocatable, dimension(:) :: bsdidx, brvidx,& & sdsz, rvsz, prcid, rvhd, sdhd @@ -980,7 +988,7 @@ subroutine psi_eswapidxv(iictxt,iicomm,flag,beta,y,idx, & call psb_erractionrestore(err_act) return -9999 call psb_error_handler(iictxt,err_act) +9999 call psb_error_handler(ictxt,err_act) return end subroutine psi_eswapidxv diff --git a/base/comm/internals/psi_eswaptran_a.F90 b/base/comm/internals/psi_eswaptran_a.F90 index 0df27a5d..01251a4b 100644 --- a/base/comm/internals/psi_eswaptran_a.F90 +++ b/base/comm/internals/psi_eswaptran_a.F90 @@ -110,7 +110,9 @@ subroutine psi_eswaptranm(flag,n,beta,y,desc_a,work,info,data) integer(psb_ipk_), optional :: data ! locals - integer(psb_ipk_) :: ictxt, np, me, icomm, idxs, idxr, err_act, totxch, data_ + type(psb_ctxt_type) :: ictxt + integer(psb_mpk_) :: icomm + integer(psb_ipk_) :: np, me, idxs, idxr, err_act, totxch, data_ integer(psb_ipk_), pointer :: d_idx(:) character(len=20) :: name @@ -172,14 +174,17 @@ subroutine psi_etranidxm(iictxt,iicomm,flag,n,beta,y,idx,& include 'mpif.h' #endif - integer(psb_ipk_), intent(in) :: iictxt,iicomm,flag,n - integer(psb_ipk_), intent(out) :: info + type(psb_ctxt_type), intent(in) :: iictxt + integer(psb_mpk_), intent(in) :: iicomm + integer(psb_ipk_), intent(in) :: flag,n + integer(psb_ipk_), intent(out) :: info integer(psb_epk_) :: y(:,:), beta integer(psb_epk_), target :: work(:) integer(psb_ipk_), intent(in) :: idx(:),totxch,totsnd, totrcv ! locals - integer(psb_mpk_) :: ictxt, icomm, np, me,& + type(psb_ctxt_type) :: ictxt + integer(psb_mpk_) :: icomm, np, me,& & proc_to_comm, p2ptag, p2pstat(mpi_status_size), iret integer(psb_mpk_), allocatable, dimension(:) :: bsdidx, brvidx,& & sdsz, rvsz, prcid, rvhd, sdhd @@ -508,7 +513,7 @@ subroutine psi_etranidxm(iictxt,iicomm,flag,n,beta,y,idx,& call psb_erractionrestore(err_act) return -9999 call psb_error_handler(iictxt,err_act) +9999 call psb_error_handler(ictxt,err_act) return end subroutine psi_etranidxm @@ -592,7 +597,9 @@ subroutine psi_eswaptranv(flag,beta,y,desc_a,work,info,data) integer(psb_ipk_), optional :: data ! locals - integer(psb_ipk_) :: ictxt, np, me, icomm, idxs, idxr, totxch, err_act, data_ + type(psb_ctxt_type) :: ictxt + integer(psb_mpk_) :: icomm + integer(psb_ipk_) :: np, me, idxs, idxr, totxch, err_act, data_ integer(psb_ipk_), pointer :: d_idx(:) character(len=20) :: name @@ -664,14 +671,17 @@ subroutine psi_etranidxv(iictxt,iicomm,flag,beta,y,idx,& include 'mpif.h' #endif - integer(psb_ipk_), intent(in) :: iictxt,iicomm,flag - integer(psb_ipk_), intent(out) :: info + type(psb_ctxt_type), intent(in) :: iictxt + integer(psb_mpk_), intent(in) :: iicomm + integer(psb_ipk_), intent(in) :: flag + integer(psb_ipk_), intent(out) :: info integer(psb_epk_) :: y(:), beta integer(psb_epk_), target :: work(:) integer(psb_ipk_), intent(in) :: idx(:),totxch,totsnd, totrcv ! locals - integer(psb_mpk_) :: ictxt, icomm, np, me,& + type(psb_ctxt_type) :: ictxt + integer(psb_mpk_) :: icomm, np, me,& & proc_to_comm, p2ptag, p2pstat(mpi_status_size), iret integer(psb_mpk_), allocatable, dimension(:) :: bsdidx, brvidx,& & sdsz, rvsz, prcid, rvhd, sdhd @@ -996,7 +1006,7 @@ subroutine psi_etranidxv(iictxt,iicomm,flag,beta,y,idx,& call psb_erractionrestore(err_act) return -9999 call psb_error_handler(iictxt,err_act) +9999 call psb_error_handler(ictxt,err_act) return end subroutine psi_etranidxv diff --git a/base/comm/internals/psi_i2ovrl_restr_a.f90 b/base/comm/internals/psi_i2ovrl_restr_a.f90 index 36bc2566..dbed16ab 100644 --- a/base/comm/internals/psi_i2ovrl_restr_a.f90 +++ b/base/comm/internals/psi_i2ovrl_restr_a.f90 @@ -45,7 +45,8 @@ subroutine psi_i2ovrl_restrr1(x,xs,desc_a,info) integer(psb_ipk_), intent(out) :: info ! locals - integer(psb_ipk_) :: ictxt, np, me, err_act, i, idx, isz + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me, err_act, i, idx, isz character(len=20) :: name, ch_err name='psi_i2ovrl_restrr1' @@ -88,7 +89,8 @@ subroutine psi_i2ovrl_restrr2(x,xs,desc_a,info) integer(psb_ipk_), intent(out) :: info ! locals - integer(psb_ipk_) :: ictxt, np, me, err_act, i, idx, isz + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me, err_act, i, idx, isz character(len=20) :: name, ch_err name='psi_i2ovrl_restrr2' diff --git a/base/comm/internals/psi_i2ovrl_save_a.f90 b/base/comm/internals/psi_i2ovrl_save_a.f90 index 55e9ae89..fe30ab1f 100644 --- a/base/comm/internals/psi_i2ovrl_save_a.f90 +++ b/base/comm/internals/psi_i2ovrl_save_a.f90 @@ -47,7 +47,8 @@ subroutine psi_i2ovrl_saver1(x,xs,desc_a,info) integer(psb_ipk_), intent(out) :: info ! locals - integer(psb_ipk_) :: ictxt, np, me, err_act, i, idx, isz + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me, err_act, i, idx, isz character(len=20) :: name, ch_err name='psi_i2ovrl_saver1' @@ -99,7 +100,8 @@ subroutine psi_i2ovrl_saver2(x,xs,desc_a,info) integer(psb_ipk_), intent(out) :: info ! locals - integer(psb_ipk_) :: ictxt, np, me, err_act, i, idx, isz, nc + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me, err_act, i, idx, isz, nc character(len=20) :: name, ch_err name='psi_i2ovrl_saver2' diff --git a/base/comm/internals/psi_i2ovrl_upd_a.f90 b/base/comm/internals/psi_i2ovrl_upd_a.f90 index c41803ef..ba6f900d 100644 --- a/base/comm/internals/psi_i2ovrl_upd_a.f90 +++ b/base/comm/internals/psi_i2ovrl_upd_a.f90 @@ -46,7 +46,8 @@ subroutine psi_i2ovrl_updr1(x,desc_a,update,info) integer(psb_ipk_), intent(out) :: info ! locals - integer(psb_ipk_) :: ictxt, np, me, err_act, i, idx, ndm + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me, err_act, i, idx, ndm integer(psb_ipk_) :: ierr(5) character(len=20) :: name, ch_err @@ -103,7 +104,6 @@ subroutine psi_i2ovrl_updr1(x,desc_a,update,info) return end subroutine psi_i2ovrl_updr1 - subroutine psi_i2ovrl_updr2(x,desc_a,update,info) use psi_mod, psi_protect_name => psi_i2ovrl_updr2 @@ -115,7 +115,8 @@ subroutine psi_i2ovrl_updr2(x,desc_a,update,info) integer(psb_ipk_), intent(out) :: info ! locals - integer(psb_ipk_) :: ictxt, np, me, err_act, i, idx, ndm + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me, err_act, i, idx, ndm integer(psb_ipk_) :: ierr(5) character(len=20) :: name, ch_err diff --git a/base/comm/internals/psi_i2swapdata_a.F90 b/base/comm/internals/psi_i2swapdata_a.F90 index 0140504d..82e15591 100644 --- a/base/comm/internals/psi_i2swapdata_a.F90 +++ b/base/comm/internals/psi_i2swapdata_a.F90 @@ -106,7 +106,9 @@ subroutine psi_i2swapdatam(flag,n,beta,y,desc_a,work,info,data) integer(psb_ipk_), optional :: data ! locals - integer(psb_ipk_) :: ictxt, np, me, icomm, idxs, idxr, totxch, data_, err_act + type(psb_ctxt_type) :: ictxt + integer(psb_mpk_) :: icomm + integer(psb_ipk_) :: np, me, idxs, idxr, totxch, data_, err_act integer(psb_ipk_), pointer :: d_idx(:) character(len=20) :: name @@ -152,7 +154,7 @@ subroutine psi_i2swapdatam(flag,n,beta,y,desc_a,work,info,data) return end subroutine psi_i2swapdatam -subroutine psi_i2swapidxm(iictxt,iicomm,flag,n,beta,y,idx, & +subroutine psi_i2swapidxm(ictxt,icomm,flag,n,beta,y,idx, & & totxch,totsnd,totrcv,work,info) use psi_mod, psb_protect_name => psi_i2swapidxm @@ -167,14 +169,17 @@ subroutine psi_i2swapidxm(iictxt,iicomm,flag,n,beta,y,idx, & include 'mpif.h' #endif - integer(psb_ipk_), intent(in) :: iictxt,iicomm,flag,n - integer(psb_ipk_), intent(out) :: info + type(psb_ctxt_type), intent(in) :: ictxt + integer(psb_mpk_), intent(in) :: icomm + integer(psb_ipk_), intent(in) :: flag,n + integer(psb_ipk_), intent(out) :: info integer(psb_i2pk_) :: y(:,:), beta integer(psb_i2pk_), target :: work(:) integer(psb_ipk_), intent(in) :: idx(:),totxch,totsnd, totrcv ! locals - integer(psb_mpk_) :: ictxt, icomm, np, me,& + + integer(psb_mpk_) :: np, me,& & proc_to_comm, p2ptag, p2pstat(mpi_status_size), iret integer(psb_mpk_), allocatable, dimension(:) :: bsdidx, brvidx,& & sdsz, rvsz, prcid, rvhd, sdhd @@ -192,8 +197,6 @@ subroutine psi_i2swapidxm(iictxt,iicomm,flag,n,beta,y,idx, & info=psb_success_ name='psi_swap_data' call psb_erractionsave(err_act) - ictxt = iictxt - icomm = iicomm call psb_info(ictxt,me,np) if (np == -1) then @@ -498,7 +501,7 @@ subroutine psi_i2swapidxm(iictxt,iicomm,flag,n,beta,y,idx, & call psb_erractionrestore(err_act) return -9999 call psb_error_handler(iictxt,err_act) +9999 call psb_error_handler(ictxt,err_act) return end subroutine psi_i2swapidxm @@ -579,7 +582,9 @@ subroutine psi_i2swapdatav(flag,beta,y,desc_a,work,info,data) integer(psb_ipk_), optional :: data ! locals - integer(psb_ipk_) :: ictxt, np, me, icomm, idxs, idxr, totxch, data_, err_act + type(psb_ctxt_type) :: ictxt + integer(psb_mpk_) :: icomm + integer(psb_ipk_) :: np, me, idxs, idxr, totxch, data_, err_act integer(psb_ipk_), pointer :: d_idx(:) character(len=20) :: name @@ -651,14 +656,17 @@ subroutine psi_i2swapidxv(iictxt,iicomm,flag,beta,y,idx, & include 'mpif.h' #endif - integer(psb_ipk_), intent(in) :: iictxt,iicomm,flag - integer(psb_ipk_), intent(out) :: info + type(psb_ctxt_type), intent(in) :: iictxt + integer(psb_mpk_), intent(in) :: iicomm + integer(psb_ipk_), intent(in) :: flag + integer(psb_ipk_), intent(out) :: info integer(psb_i2pk_) :: y(:), beta integer(psb_i2pk_), target :: work(:) integer(psb_ipk_), intent(in) :: idx(:),totxch,totsnd, totrcv ! locals - integer(psb_mpk_) :: ictxt, icomm, np, me,& + type(psb_ctxt_type) :: ictxt + integer(psb_mpk_) :: icomm, np, me,& & proc_to_comm, p2ptag, p2pstat(mpi_status_size), iret integer(psb_mpk_), allocatable, dimension(:) :: bsdidx, brvidx,& & sdsz, rvsz, prcid, rvhd, sdhd @@ -980,7 +988,7 @@ subroutine psi_i2swapidxv(iictxt,iicomm,flag,beta,y,idx, & call psb_erractionrestore(err_act) return -9999 call psb_error_handler(iictxt,err_act) +9999 call psb_error_handler(ictxt,err_act) return end subroutine psi_i2swapidxv diff --git a/base/comm/internals/psi_i2swaptran_a.F90 b/base/comm/internals/psi_i2swaptran_a.F90 index 10531927..06f08cab 100644 --- a/base/comm/internals/psi_i2swaptran_a.F90 +++ b/base/comm/internals/psi_i2swaptran_a.F90 @@ -110,7 +110,9 @@ subroutine psi_i2swaptranm(flag,n,beta,y,desc_a,work,info,data) integer(psb_ipk_), optional :: data ! locals - integer(psb_ipk_) :: ictxt, np, me, icomm, idxs, idxr, err_act, totxch, data_ + type(psb_ctxt_type) :: ictxt + integer(psb_mpk_) :: icomm + integer(psb_ipk_) :: np, me, idxs, idxr, err_act, totxch, data_ integer(psb_ipk_), pointer :: d_idx(:) character(len=20) :: name @@ -172,14 +174,17 @@ subroutine psi_i2tranidxm(iictxt,iicomm,flag,n,beta,y,idx,& include 'mpif.h' #endif - integer(psb_ipk_), intent(in) :: iictxt,iicomm,flag,n - integer(psb_ipk_), intent(out) :: info + type(psb_ctxt_type), intent(in) :: iictxt + integer(psb_mpk_), intent(in) :: iicomm + integer(psb_ipk_), intent(in) :: flag,n + integer(psb_ipk_), intent(out) :: info integer(psb_i2pk_) :: y(:,:), beta integer(psb_i2pk_), target :: work(:) integer(psb_ipk_), intent(in) :: idx(:),totxch,totsnd, totrcv ! locals - integer(psb_mpk_) :: ictxt, icomm, np, me,& + type(psb_ctxt_type) :: ictxt + integer(psb_mpk_) :: icomm, np, me,& & proc_to_comm, p2ptag, p2pstat(mpi_status_size), iret integer(psb_mpk_), allocatable, dimension(:) :: bsdidx, brvidx,& & sdsz, rvsz, prcid, rvhd, sdhd @@ -508,7 +513,7 @@ subroutine psi_i2tranidxm(iictxt,iicomm,flag,n,beta,y,idx,& call psb_erractionrestore(err_act) return -9999 call psb_error_handler(iictxt,err_act) +9999 call psb_error_handler(ictxt,err_act) return end subroutine psi_i2tranidxm @@ -592,7 +597,9 @@ subroutine psi_i2swaptranv(flag,beta,y,desc_a,work,info,data) integer(psb_ipk_), optional :: data ! locals - integer(psb_ipk_) :: ictxt, np, me, icomm, idxs, idxr, totxch, err_act, data_ + type(psb_ctxt_type) :: ictxt + integer(psb_mpk_) :: icomm + integer(psb_ipk_) :: np, me, idxs, idxr, totxch, err_act, data_ integer(psb_ipk_), pointer :: d_idx(:) character(len=20) :: name @@ -664,14 +671,17 @@ subroutine psi_i2tranidxv(iictxt,iicomm,flag,beta,y,idx,& include 'mpif.h' #endif - integer(psb_ipk_), intent(in) :: iictxt,iicomm,flag - integer(psb_ipk_), intent(out) :: info + type(psb_ctxt_type), intent(in) :: iictxt + integer(psb_mpk_), intent(in) :: iicomm + integer(psb_ipk_), intent(in) :: flag + integer(psb_ipk_), intent(out) :: info integer(psb_i2pk_) :: y(:), beta integer(psb_i2pk_), target :: work(:) integer(psb_ipk_), intent(in) :: idx(:),totxch,totsnd, totrcv ! locals - integer(psb_mpk_) :: ictxt, icomm, np, me,& + type(psb_ctxt_type) :: ictxt + integer(psb_mpk_) :: icomm, np, me,& & proc_to_comm, p2ptag, p2pstat(mpi_status_size), iret integer(psb_mpk_), allocatable, dimension(:) :: bsdidx, brvidx,& & sdsz, rvsz, prcid, rvhd, sdhd @@ -996,7 +1006,7 @@ subroutine psi_i2tranidxv(iictxt,iicomm,flag,beta,y,idx,& call psb_erractionrestore(err_act) return -9999 call psb_error_handler(iictxt,err_act) +9999 call psb_error_handler(ictxt,err_act) return end subroutine psi_i2tranidxv diff --git a/base/comm/internals/psi_iovrl_restr.f90 b/base/comm/internals/psi_iovrl_restr.f90 index b0efa2ee..f407c91d 100644 --- a/base/comm/internals/psi_iovrl_restr.f90 +++ b/base/comm/internals/psi_iovrl_restr.f90 @@ -47,7 +47,8 @@ subroutine psi_iovrl_restr_vect(x,xs,desc_a,info) integer(psb_ipk_), intent(out) :: info ! locals - integer(psb_ipk_) :: ictxt, np, me, err_act, i, idx, isz + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me, err_act, i, idx, isz character(len=20) :: name, ch_err name='psi_iovrl_restr_vect' @@ -89,7 +90,8 @@ subroutine psi_iovrl_restr_multivect(x,xs,desc_a,info) integer(psb_ipk_), intent(out) :: info ! locals - integer(psb_ipk_) :: ictxt, np, me, err_act, i, idx, isz, nc + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me, err_act, i, idx, isz, nc character(len=20) :: name, ch_err name='psi_iovrl_restr_mv' diff --git a/base/comm/internals/psi_iovrl_save.f90 b/base/comm/internals/psi_iovrl_save.f90 index cc7619f9..7ec0a0bc 100644 --- a/base/comm/internals/psi_iovrl_save.f90 +++ b/base/comm/internals/psi_iovrl_save.f90 @@ -47,7 +47,8 @@ subroutine psi_iovrl_save_vect(x,xs,desc_a,info) integer(psb_ipk_), intent(out) :: info ! locals - integer(psb_ipk_) :: ictxt, np, me, err_act, i, idx, isz + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me, err_act, i, idx, isz character(len=20) :: name, ch_err name='psi_dovrl_saver1' @@ -82,8 +83,6 @@ subroutine psi_iovrl_save_vect(x,xs,desc_a,info) return end subroutine psi_iovrl_save_vect - - subroutine psi_iovrl_save_multivect(x,xs,desc_a,info) use psi_mod, psi_protect_name => psi_iovrl_save_multivect use psb_realloc_mod @@ -97,7 +96,8 @@ subroutine psi_iovrl_save_multivect(x,xs,desc_a,info) integer(psb_ipk_), intent(out) :: info ! locals - integer(psb_ipk_) :: ictxt, np, me, err_act, i, idx, isz, nc + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me, err_act, i, idx, isz, nc character(len=20) :: name, ch_err name='psi_dovrl_saver1' diff --git a/base/comm/internals/psi_iovrl_upd.f90 b/base/comm/internals/psi_iovrl_upd.f90 index 988bf006..1a26c87c 100644 --- a/base/comm/internals/psi_iovrl_upd.f90 +++ b/base/comm/internals/psi_iovrl_upd.f90 @@ -32,7 +32,7 @@ ! Subroutine: psi_iovrl_update ! These subroutines update the overlap region of a vector; they are used ! for the transpose matrix-vector product when there is a nonempty overlap, -! or for the application of Additive Schwarz preconditioners. +! or for the application of Additive Schwarz preconditioners. ! ! ! @@ -50,7 +50,8 @@ subroutine psi_iovrl_upd_vect(x,desc_a,update,info) ! locals integer(psb_ipk_), allocatable :: xs(:) - integer(psb_ipk_) :: ictxt, np, me, err_act, i, idx, ndm, nx + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me, err_act, i, idx, ndm, nx integer(psb_ipk_) :: ierr(5) character(len=20) :: name, ch_err @@ -131,7 +132,8 @@ subroutine psi_iovrl_upd_multivect(x,desc_a,update,info) ! locals integer(psb_ipk_), allocatable :: xs(:,:) - integer(psb_ipk_) :: ictxt, np, me, err_act, i, idx, ndm, nx, nc + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me, err_act, i, idx, ndm, nx, nc integer(psb_ipk_) :: ierr(5) character(len=20) :: name, ch_err diff --git a/base/comm/internals/psi_iswapdata.F90 b/base/comm/internals/psi_iswapdata.F90 index d05ab8ac..e9b8fa3d 100644 --- a/base/comm/internals/psi_iswapdata.F90 +++ b/base/comm/internals/psi_iswapdata.F90 @@ -113,7 +113,9 @@ subroutine psi_iswapdata_vect(flag,beta,y,desc_a,work,info,data) integer(psb_ipk_), optional :: data ! locals - integer(psb_ipk_) :: ictxt, np, me, icomm, idxs, idxr, totxch, data_, err_act + type(psb_ctxt_type) :: ictxt + integer(psb_mpk_) :: icomm + integer(psb_ipk_) :: np, me, idxs, idxr, totxch, data_, err_act class(psb_i_base_vect_type), pointer :: d_vidx character(len=20) :: name @@ -190,8 +192,10 @@ subroutine psi_iswap_vidx_vect(iictxt,iicomm,flag,beta,y,idx, & include 'mpif.h' #endif - integer(psb_ipk_), intent(in) :: iictxt,iicomm,flag - integer(psb_ipk_), intent(out) :: info + type(psb_ctxt_type), intent(in) :: iictxt + integer(psb_mpk_), intent(in) :: iicomm + integer(psb_ipk_), intent(in) :: flag + integer(psb_ipk_), intent(out) :: info class(psb_i_base_vect_type) :: y integer(psb_ipk_) :: beta integer(psb_ipk_), target :: work(:) @@ -199,7 +203,8 @@ subroutine psi_iswap_vidx_vect(iictxt,iicomm,flag,beta,y,idx, & integer(psb_ipk_), intent(in) :: totxch,totsnd, totrcv ! locals - integer(psb_mpk_) :: ictxt, icomm, np, me,& + type(psb_ctxt_type) :: ictxt + integer(psb_mpk_) :: icomm, np, me,& & proc_to_comm, p2ptag, p2pstat(mpi_status_size), iret integer(psb_mpk_), allocatable :: prcid(:) integer(psb_ipk_) :: nesd, nerv,& @@ -413,7 +418,7 @@ subroutine psi_iswap_vidx_vect(iictxt,iicomm,flag,beta,y,idx, & call psb_erractionrestore(err_act) return -9999 call psb_error_handler(iictxt,err_act) +9999 call psb_error_handler(ictxt,err_act) return end subroutine psi_iswap_vidx_vect @@ -450,7 +455,9 @@ subroutine psi_iswapdata_multivect(flag,beta,y,desc_a,work,info,data) integer(psb_ipk_), optional :: data ! locals - integer(psb_ipk_) :: ictxt, np, me, icomm, idxs, idxr, totxch, data_, err_act + type(psb_ctxt_type) :: ictxt + integer(psb_mpk_) :: icomm + integer(psb_ipk_) :: np, me, idxs, idxr, totxch, data_, err_act class(psb_i_base_vect_type), pointer :: d_vidx character(len=20) :: name @@ -527,8 +534,10 @@ subroutine psi_iswap_vidx_multivect(iictxt,iicomm,flag,beta,y,idx, & include 'mpif.h' #endif - integer(psb_ipk_), intent(in) :: iictxt,iicomm,flag - integer(psb_ipk_), intent(out) :: info + type(psb_ctxt_type), intent(in) :: iictxt + integer(psb_mpk_), intent(in) :: iicomm + integer(psb_ipk_), intent(in) :: flag + integer(psb_ipk_), intent(out) :: info class(psb_i_base_multivect_type) :: y integer(psb_ipk_) :: beta integer(psb_ipk_), target :: work(:) @@ -536,7 +545,8 @@ subroutine psi_iswap_vidx_multivect(iictxt,iicomm,flag,beta,y,idx, & integer(psb_ipk_), intent(in) :: totxch,totsnd, totrcv ! locals - integer(psb_mpk_) :: ictxt, icomm, np, me,& + type(psb_ctxt_type) :: ictxt + integer(psb_mpk_) :: icomm, np, me,& & proc_to_comm, p2ptag, p2pstat(mpi_status_size), iret integer(psb_mpk_), allocatable :: prcid(:) integer(psb_ipk_) :: nesd, nerv,& @@ -756,7 +766,7 @@ subroutine psi_iswap_vidx_multivect(iictxt,iicomm,flag,beta,y,idx, & call psb_erractionrestore(err_act) return -9999 call psb_error_handler(iictxt,err_act) +9999 call psb_error_handler(ictxt,err_act) return end subroutine psi_iswap_vidx_multivect diff --git a/base/comm/internals/psi_iswaptran.F90 b/base/comm/internals/psi_iswaptran.F90 index e5719735..21c37e5c 100644 --- a/base/comm/internals/psi_iswaptran.F90 +++ b/base/comm/internals/psi_iswaptran.F90 @@ -115,7 +115,9 @@ subroutine psi_iswaptran_vect(flag,beta,y,desc_a,work,info,data) integer(psb_ipk_), optional :: data ! locals - integer(psb_ipk_) :: ictxt, np, me, icomm, idxs, idxr, totxch, err_act, data_ + type(psb_ctxt_type) :: ictxt + integer(psb_mpk_) :: icomm + integer(psb_ipk_) :: np, me, idxs, idxr, totxch, err_act, data_ class(psb_i_base_vect_type), pointer :: d_vidx character(len=20) :: name @@ -161,8 +163,6 @@ subroutine psi_iswaptran_vect(flag,beta,y,desc_a,work,info,data) return end subroutine psi_iswaptran_vect - - ! ! ! Subroutine: psi_itran_vidx_vect @@ -193,7 +193,9 @@ subroutine psi_itran_vidx_vect(iictxt,iicomm,flag,beta,y,idx,& include 'mpif.h' #endif - integer(psb_ipk_), intent(in) :: iictxt,iicomm,flag + type(psb_ctxt_type), intent(in) :: iictxt + integer(psb_mpk_), intent(in) :: iicomm + integer(psb_ipk_), intent(in) :: flag integer(psb_ipk_), intent(out) :: info class(psb_i_base_vect_type) :: y integer(psb_ipk_) :: beta @@ -202,7 +204,8 @@ subroutine psi_itran_vidx_vect(iictxt,iicomm,flag,beta,y,idx,& integer(psb_ipk_), intent(in) :: totxch,totsnd, totrcv ! locals - integer(psb_mpk_) :: ictxt, icomm, np, me,& + type(psb_ctxt_type) :: ictxt + integer(psb_mpk_) :: icomm, np, me,& & proc_to_comm, p2ptag, p2pstat(mpi_status_size), iret integer(psb_mpk_), allocatable :: prcid(:) integer(psb_ipk_) :: nesd, nerv,& @@ -422,7 +425,7 @@ subroutine psi_itran_vidx_vect(iictxt,iicomm,flag,beta,y,idx,& call psb_erractionrestore(err_act) return -9999 call psb_error_handler(iictxt,err_act) +9999 call psb_error_handler(ictxt,err_act) return @@ -463,7 +466,9 @@ subroutine psi_iswaptran_multivect(flag,beta,y,desc_a,work,info,data) integer(psb_ipk_), optional :: data ! locals - integer(psb_ipk_) :: ictxt, np, me, icomm, idxs, idxr, totxch, err_act, data_ + type(psb_ctxt_type) :: ictxt + integer(psb_mpk_) :: icomm + integer(psb_ipk_) :: np, me, idxs, idxr, totxch, err_act, data_ class(psb_i_base_vect_type), pointer :: d_vidx character(len=20) :: name @@ -540,7 +545,9 @@ subroutine psi_itran_vidx_multivect(iictxt,iicomm,flag,beta,y,idx,& include 'mpif.h' #endif - integer(psb_ipk_), intent(in) :: iictxt,iicomm,flag + type(psb_ctxt_type), intent(in) :: iictxt + integer(psb_mpk_), intent(in) :: iicomm + integer(psb_ipk_), intent(in) :: flag integer(psb_ipk_), intent(out) :: info class(psb_i_base_multivect_type) :: y integer(psb_ipk_) :: beta @@ -549,7 +556,8 @@ subroutine psi_itran_vidx_multivect(iictxt,iicomm,flag,beta,y,idx,& integer(psb_ipk_), intent(in) :: totxch,totsnd, totrcv ! locals - integer(psb_mpk_) :: ictxt, icomm, np, me,& + type(psb_ctxt_type) :: ictxt + integer(psb_mpk_) :: icomm, np, me,& & proc_to_comm, p2ptag, p2pstat(mpi_status_size), iret integer(psb_mpk_), allocatable :: prcid(:) integer(psb_ipk_) :: nesd, nerv,& @@ -773,7 +781,7 @@ subroutine psi_itran_vidx_multivect(iictxt,iicomm,flag,beta,y,idx,& call psb_erractionrestore(err_act) return -9999 call psb_error_handler(iictxt,err_act) +9999 call psb_error_handler(ictxt,err_act) return diff --git a/base/comm/internals/psi_lovrl_restr.f90 b/base/comm/internals/psi_lovrl_restr.f90 index dc33bbb1..2bb78d63 100644 --- a/base/comm/internals/psi_lovrl_restr.f90 +++ b/base/comm/internals/psi_lovrl_restr.f90 @@ -47,7 +47,8 @@ subroutine psi_lovrl_restr_vect(x,xs,desc_a,info) integer(psb_ipk_), intent(out) :: info ! locals - integer(psb_ipk_) :: ictxt, np, me, err_act, i, idx, isz + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me, err_act, i, idx, isz character(len=20) :: name, ch_err name='psi_lovrl_restr_vect' @@ -89,7 +90,8 @@ subroutine psi_lovrl_restr_multivect(x,xs,desc_a,info) integer(psb_ipk_), intent(out) :: info ! locals - integer(psb_ipk_) :: ictxt, np, me, err_act, i, idx, isz, nc + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me, err_act, i, idx, isz, nc character(len=20) :: name, ch_err name='psi_lovrl_restr_mv' diff --git a/base/comm/internals/psi_lovrl_save.f90 b/base/comm/internals/psi_lovrl_save.f90 index 496eec90..3fceef89 100644 --- a/base/comm/internals/psi_lovrl_save.f90 +++ b/base/comm/internals/psi_lovrl_save.f90 @@ -47,7 +47,8 @@ subroutine psi_lovrl_save_vect(x,xs,desc_a,info) integer(psb_ipk_), intent(out) :: info ! locals - integer(psb_ipk_) :: ictxt, np, me, err_act, i, idx, isz + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me, err_act, i, idx, isz character(len=20) :: name, ch_err name='psi_dovrl_saver1' @@ -82,8 +83,6 @@ subroutine psi_lovrl_save_vect(x,xs,desc_a,info) return end subroutine psi_lovrl_save_vect - - subroutine psi_lovrl_save_multivect(x,xs,desc_a,info) use psi_mod, psi_protect_name => psi_lovrl_save_multivect use psb_realloc_mod @@ -97,7 +96,8 @@ subroutine psi_lovrl_save_multivect(x,xs,desc_a,info) integer(psb_ipk_), intent(out) :: info ! locals - integer(psb_ipk_) :: ictxt, np, me, err_act, i, idx, isz, nc + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me, err_act, i, idx, isz, nc character(len=20) :: name, ch_err name='psi_dovrl_saver1' diff --git a/base/comm/internals/psi_lovrl_upd.f90 b/base/comm/internals/psi_lovrl_upd.f90 index d20d80cc..22837b89 100644 --- a/base/comm/internals/psi_lovrl_upd.f90 +++ b/base/comm/internals/psi_lovrl_upd.f90 @@ -32,7 +32,7 @@ ! Subroutine: psi_lovrl_update ! These subroutines update the overlap region of a vector; they are used ! for the transpose matrix-vector product when there is a nonempty overlap, -! or for the application of Additive Schwarz preconditioners. +! or for the application of Additive Schwarz preconditioners. ! ! ! @@ -50,7 +50,8 @@ subroutine psi_lovrl_upd_vect(x,desc_a,update,info) ! locals integer(psb_lpk_), allocatable :: xs(:) - integer(psb_ipk_) :: ictxt, np, me, err_act, i, idx, ndm, nx + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me, err_act, i, idx, ndm, nx integer(psb_ipk_) :: ierr(5) character(len=20) :: name, ch_err @@ -131,7 +132,8 @@ subroutine psi_lovrl_upd_multivect(x,desc_a,update,info) ! locals integer(psb_lpk_), allocatable :: xs(:,:) - integer(psb_ipk_) :: ictxt, np, me, err_act, i, idx, ndm, nx, nc + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me, err_act, i, idx, ndm, nx, nc integer(psb_ipk_) :: ierr(5) character(len=20) :: name, ch_err diff --git a/base/comm/internals/psi_lswapdata.F90 b/base/comm/internals/psi_lswapdata.F90 index 939f9596..6106659a 100644 --- a/base/comm/internals/psi_lswapdata.F90 +++ b/base/comm/internals/psi_lswapdata.F90 @@ -113,7 +113,9 @@ subroutine psi_lswapdata_vect(flag,beta,y,desc_a,work,info,data) integer(psb_ipk_), optional :: data ! locals - integer(psb_ipk_) :: ictxt, np, me, icomm, idxs, idxr, totxch, data_, err_act + type(psb_ctxt_type) :: ictxt + integer(psb_mpk_) :: icomm + integer(psb_ipk_) :: np, me, idxs, idxr, totxch, data_, err_act class(psb_i_base_vect_type), pointer :: d_vidx character(len=20) :: name @@ -190,8 +192,10 @@ subroutine psi_lswap_vidx_vect(iictxt,iicomm,flag,beta,y,idx, & include 'mpif.h' #endif - integer(psb_ipk_), intent(in) :: iictxt,iicomm,flag - integer(psb_ipk_), intent(out) :: info + type(psb_ctxt_type), intent(in) :: iictxt + integer(psb_mpk_), intent(in) :: iicomm + integer(psb_ipk_), intent(in) :: flag + integer(psb_ipk_), intent(out) :: info class(psb_l_base_vect_type) :: y integer(psb_lpk_) :: beta integer(psb_lpk_), target :: work(:) @@ -199,7 +203,8 @@ subroutine psi_lswap_vidx_vect(iictxt,iicomm,flag,beta,y,idx, & integer(psb_ipk_), intent(in) :: totxch,totsnd, totrcv ! locals - integer(psb_mpk_) :: ictxt, icomm, np, me,& + type(psb_ctxt_type) :: ictxt + integer(psb_mpk_) :: icomm, np, me,& & proc_to_comm, p2ptag, p2pstat(mpi_status_size), iret integer(psb_mpk_), allocatable :: prcid(:) integer(psb_ipk_) :: nesd, nerv,& @@ -413,7 +418,7 @@ subroutine psi_lswap_vidx_vect(iictxt,iicomm,flag,beta,y,idx, & call psb_erractionrestore(err_act) return -9999 call psb_error_handler(iictxt,err_act) +9999 call psb_error_handler(ictxt,err_act) return end subroutine psi_lswap_vidx_vect @@ -450,7 +455,9 @@ subroutine psi_lswapdata_multivect(flag,beta,y,desc_a,work,info,data) integer(psb_ipk_), optional :: data ! locals - integer(psb_ipk_) :: ictxt, np, me, icomm, idxs, idxr, totxch, data_, err_act + type(psb_ctxt_type) :: ictxt + integer(psb_mpk_) :: icomm + integer(psb_ipk_) :: np, me, idxs, idxr, totxch, data_, err_act class(psb_i_base_vect_type), pointer :: d_vidx character(len=20) :: name @@ -527,8 +534,10 @@ subroutine psi_lswap_vidx_multivect(iictxt,iicomm,flag,beta,y,idx, & include 'mpif.h' #endif - integer(psb_ipk_), intent(in) :: iictxt,iicomm,flag - integer(psb_ipk_), intent(out) :: info + type(psb_ctxt_type), intent(in) :: iictxt + integer(psb_mpk_), intent(in) :: iicomm + integer(psb_ipk_), intent(in) :: flag + integer(psb_ipk_), intent(out) :: info class(psb_l_base_multivect_type) :: y integer(psb_lpk_) :: beta integer(psb_lpk_), target :: work(:) @@ -536,7 +545,8 @@ subroutine psi_lswap_vidx_multivect(iictxt,iicomm,flag,beta,y,idx, & integer(psb_ipk_), intent(in) :: totxch,totsnd, totrcv ! locals - integer(psb_mpk_) :: ictxt, icomm, np, me,& + type(psb_ctxt_type) :: ictxt + integer(psb_mpk_) :: icomm, np, me,& & proc_to_comm, p2ptag, p2pstat(mpi_status_size), iret integer(psb_mpk_), allocatable :: prcid(:) integer(psb_ipk_) :: nesd, nerv,& @@ -756,7 +766,7 @@ subroutine psi_lswap_vidx_multivect(iictxt,iicomm,flag,beta,y,idx, & call psb_erractionrestore(err_act) return -9999 call psb_error_handler(iictxt,err_act) +9999 call psb_error_handler(ictxt,err_act) return end subroutine psi_lswap_vidx_multivect diff --git a/base/comm/internals/psi_lswaptran.F90 b/base/comm/internals/psi_lswaptran.F90 index ccc1b6e3..e0bf6c00 100644 --- a/base/comm/internals/psi_lswaptran.F90 +++ b/base/comm/internals/psi_lswaptran.F90 @@ -115,7 +115,9 @@ subroutine psi_lswaptran_vect(flag,beta,y,desc_a,work,info,data) integer(psb_ipk_), optional :: data ! locals - integer(psb_ipk_) :: ictxt, np, me, icomm, idxs, idxr, totxch, err_act, data_ + type(psb_ctxt_type) :: ictxt + integer(psb_mpk_) :: icomm + integer(psb_ipk_) :: np, me, idxs, idxr, totxch, err_act, data_ class(psb_i_base_vect_type), pointer :: d_vidx character(len=20) :: name @@ -161,8 +163,6 @@ subroutine psi_lswaptran_vect(flag,beta,y,desc_a,work,info,data) return end subroutine psi_lswaptran_vect - - ! ! ! Subroutine: psi_ltran_vidx_vect @@ -193,7 +193,9 @@ subroutine psi_ltran_vidx_vect(iictxt,iicomm,flag,beta,y,idx,& include 'mpif.h' #endif - integer(psb_ipk_), intent(in) :: iictxt,iicomm,flag + type(psb_ctxt_type), intent(in) :: iictxt + integer(psb_mpk_), intent(in) :: iicomm + integer(psb_ipk_), intent(in) :: flag integer(psb_ipk_), intent(out) :: info class(psb_l_base_vect_type) :: y integer(psb_lpk_) :: beta @@ -202,7 +204,8 @@ subroutine psi_ltran_vidx_vect(iictxt,iicomm,flag,beta,y,idx,& integer(psb_ipk_), intent(in) :: totxch,totsnd, totrcv ! locals - integer(psb_mpk_) :: ictxt, icomm, np, me,& + type(psb_ctxt_type) :: ictxt + integer(psb_mpk_) :: icomm, np, me,& & proc_to_comm, p2ptag, p2pstat(mpi_status_size), iret integer(psb_mpk_), allocatable :: prcid(:) integer(psb_ipk_) :: nesd, nerv,& @@ -422,7 +425,7 @@ subroutine psi_ltran_vidx_vect(iictxt,iicomm,flag,beta,y,idx,& call psb_erractionrestore(err_act) return -9999 call psb_error_handler(iictxt,err_act) +9999 call psb_error_handler(ictxt,err_act) return @@ -463,7 +466,9 @@ subroutine psi_lswaptran_multivect(flag,beta,y,desc_a,work,info,data) integer(psb_ipk_), optional :: data ! locals - integer(psb_ipk_) :: ictxt, np, me, icomm, idxs, idxr, totxch, err_act, data_ + type(psb_ctxt_type) :: ictxt + integer(psb_mpk_) :: icomm + integer(psb_ipk_) :: np, me, idxs, idxr, totxch, err_act, data_ class(psb_i_base_vect_type), pointer :: d_vidx character(len=20) :: name @@ -540,7 +545,9 @@ subroutine psi_ltran_vidx_multivect(iictxt,iicomm,flag,beta,y,idx,& include 'mpif.h' #endif - integer(psb_ipk_), intent(in) :: iictxt,iicomm,flag + type(psb_ctxt_type), intent(in) :: iictxt + integer(psb_mpk_), intent(in) :: iicomm + integer(psb_ipk_), intent(in) :: flag integer(psb_ipk_), intent(out) :: info class(psb_l_base_multivect_type) :: y integer(psb_lpk_) :: beta @@ -549,7 +556,8 @@ subroutine psi_ltran_vidx_multivect(iictxt,iicomm,flag,beta,y,idx,& integer(psb_ipk_), intent(in) :: totxch,totsnd, totrcv ! locals - integer(psb_mpk_) :: ictxt, icomm, np, me,& + type(psb_ctxt_type) :: ictxt + integer(psb_mpk_) :: icomm, np, me,& & proc_to_comm, p2ptag, p2pstat(mpi_status_size), iret integer(psb_mpk_), allocatable :: prcid(:) integer(psb_ipk_) :: nesd, nerv,& @@ -773,7 +781,7 @@ subroutine psi_ltran_vidx_multivect(iictxt,iicomm,flag,beta,y,idx,& call psb_erractionrestore(err_act) return -9999 call psb_error_handler(iictxt,err_act) +9999 call psb_error_handler(ictxt,err_act) return diff --git a/base/comm/internals/psi_movrl_restr_a.f90 b/base/comm/internals/psi_movrl_restr_a.f90 index 92e06793..92717599 100644 --- a/base/comm/internals/psi_movrl_restr_a.f90 +++ b/base/comm/internals/psi_movrl_restr_a.f90 @@ -45,7 +45,8 @@ subroutine psi_movrl_restrr1(x,xs,desc_a,info) integer(psb_ipk_), intent(out) :: info ! locals - integer(psb_ipk_) :: ictxt, np, me, err_act, i, idx, isz + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me, err_act, i, idx, isz character(len=20) :: name, ch_err name='psi_movrl_restrr1' @@ -88,7 +89,8 @@ subroutine psi_movrl_restrr2(x,xs,desc_a,info) integer(psb_ipk_), intent(out) :: info ! locals - integer(psb_ipk_) :: ictxt, np, me, err_act, i, idx, isz + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me, err_act, i, idx, isz character(len=20) :: name, ch_err name='psi_movrl_restrr2' diff --git a/base/comm/internals/psi_movrl_save_a.f90 b/base/comm/internals/psi_movrl_save_a.f90 index fbc021cf..20c1d0e7 100644 --- a/base/comm/internals/psi_movrl_save_a.f90 +++ b/base/comm/internals/psi_movrl_save_a.f90 @@ -47,7 +47,8 @@ subroutine psi_movrl_saver1(x,xs,desc_a,info) integer(psb_ipk_), intent(out) :: info ! locals - integer(psb_ipk_) :: ictxt, np, me, err_act, i, idx, isz + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me, err_act, i, idx, isz character(len=20) :: name, ch_err name='psi_movrl_saver1' @@ -99,7 +100,8 @@ subroutine psi_movrl_saver2(x,xs,desc_a,info) integer(psb_ipk_), intent(out) :: info ! locals - integer(psb_ipk_) :: ictxt, np, me, err_act, i, idx, isz, nc + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me, err_act, i, idx, isz, nc character(len=20) :: name, ch_err name='psi_movrl_saver2' diff --git a/base/comm/internals/psi_movrl_upd_a.f90 b/base/comm/internals/psi_movrl_upd_a.f90 index 03670659..a935452e 100644 --- a/base/comm/internals/psi_movrl_upd_a.f90 +++ b/base/comm/internals/psi_movrl_upd_a.f90 @@ -46,7 +46,8 @@ subroutine psi_movrl_updr1(x,desc_a,update,info) integer(psb_ipk_), intent(out) :: info ! locals - integer(psb_ipk_) :: ictxt, np, me, err_act, i, idx, ndm + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me, err_act, i, idx, ndm integer(psb_ipk_) :: ierr(5) character(len=20) :: name, ch_err @@ -103,7 +104,6 @@ subroutine psi_movrl_updr1(x,desc_a,update,info) return end subroutine psi_movrl_updr1 - subroutine psi_movrl_updr2(x,desc_a,update,info) use psi_mod, psi_protect_name => psi_movrl_updr2 @@ -115,7 +115,8 @@ subroutine psi_movrl_updr2(x,desc_a,update,info) integer(psb_ipk_), intent(out) :: info ! locals - integer(psb_ipk_) :: ictxt, np, me, err_act, i, idx, ndm + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me, err_act, i, idx, ndm integer(psb_ipk_) :: ierr(5) character(len=20) :: name, ch_err diff --git a/base/comm/internals/psi_mswapdata_a.F90 b/base/comm/internals/psi_mswapdata_a.F90 index 32b8a64e..bf2908d5 100644 --- a/base/comm/internals/psi_mswapdata_a.F90 +++ b/base/comm/internals/psi_mswapdata_a.F90 @@ -106,7 +106,9 @@ subroutine psi_mswapdatam(flag,n,beta,y,desc_a,work,info,data) integer(psb_ipk_), optional :: data ! locals - integer(psb_ipk_) :: ictxt, np, me, icomm, idxs, idxr, totxch, data_, err_act + type(psb_ctxt_type) :: ictxt + integer(psb_mpk_) :: icomm + integer(psb_ipk_) :: np, me, idxs, idxr, totxch, data_, err_act integer(psb_ipk_), pointer :: d_idx(:) character(len=20) :: name @@ -152,7 +154,7 @@ subroutine psi_mswapdatam(flag,n,beta,y,desc_a,work,info,data) return end subroutine psi_mswapdatam -subroutine psi_mswapidxm(iictxt,iicomm,flag,n,beta,y,idx, & +subroutine psi_mswapidxm(ictxt,icomm,flag,n,beta,y,idx, & & totxch,totsnd,totrcv,work,info) use psi_mod, psb_protect_name => psi_mswapidxm @@ -167,14 +169,17 @@ subroutine psi_mswapidxm(iictxt,iicomm,flag,n,beta,y,idx, & include 'mpif.h' #endif - integer(psb_ipk_), intent(in) :: iictxt,iicomm,flag,n - integer(psb_ipk_), intent(out) :: info + type(psb_ctxt_type), intent(in) :: ictxt + integer(psb_mpk_), intent(in) :: icomm + integer(psb_ipk_), intent(in) :: flag,n + integer(psb_ipk_), intent(out) :: info integer(psb_mpk_) :: y(:,:), beta integer(psb_mpk_), target :: work(:) integer(psb_ipk_), intent(in) :: idx(:),totxch,totsnd, totrcv ! locals - integer(psb_mpk_) :: ictxt, icomm, np, me,& + + integer(psb_mpk_) :: np, me,& & proc_to_comm, p2ptag, p2pstat(mpi_status_size), iret integer(psb_mpk_), allocatable, dimension(:) :: bsdidx, brvidx,& & sdsz, rvsz, prcid, rvhd, sdhd @@ -192,8 +197,6 @@ subroutine psi_mswapidxm(iictxt,iicomm,flag,n,beta,y,idx, & info=psb_success_ name='psi_swap_data' call psb_erractionsave(err_act) - ictxt = iictxt - icomm = iicomm call psb_info(ictxt,me,np) if (np == -1) then @@ -498,7 +501,7 @@ subroutine psi_mswapidxm(iictxt,iicomm,flag,n,beta,y,idx, & call psb_erractionrestore(err_act) return -9999 call psb_error_handler(iictxt,err_act) +9999 call psb_error_handler(ictxt,err_act) return end subroutine psi_mswapidxm @@ -579,7 +582,9 @@ subroutine psi_mswapdatav(flag,beta,y,desc_a,work,info,data) integer(psb_ipk_), optional :: data ! locals - integer(psb_ipk_) :: ictxt, np, me, icomm, idxs, idxr, totxch, data_, err_act + type(psb_ctxt_type) :: ictxt + integer(psb_mpk_) :: icomm + integer(psb_ipk_) :: np, me, idxs, idxr, totxch, data_, err_act integer(psb_ipk_), pointer :: d_idx(:) character(len=20) :: name @@ -651,14 +656,17 @@ subroutine psi_mswapidxv(iictxt,iicomm,flag,beta,y,idx, & include 'mpif.h' #endif - integer(psb_ipk_), intent(in) :: iictxt,iicomm,flag - integer(psb_ipk_), intent(out) :: info + type(psb_ctxt_type), intent(in) :: iictxt + integer(psb_mpk_), intent(in) :: iicomm + integer(psb_ipk_), intent(in) :: flag + integer(psb_ipk_), intent(out) :: info integer(psb_mpk_) :: y(:), beta integer(psb_mpk_), target :: work(:) integer(psb_ipk_), intent(in) :: idx(:),totxch,totsnd, totrcv ! locals - integer(psb_mpk_) :: ictxt, icomm, np, me,& + type(psb_ctxt_type) :: ictxt + integer(psb_mpk_) :: icomm, np, me,& & proc_to_comm, p2ptag, p2pstat(mpi_status_size), iret integer(psb_mpk_), allocatable, dimension(:) :: bsdidx, brvidx,& & sdsz, rvsz, prcid, rvhd, sdhd @@ -980,7 +988,7 @@ subroutine psi_mswapidxv(iictxt,iicomm,flag,beta,y,idx, & call psb_erractionrestore(err_act) return -9999 call psb_error_handler(iictxt,err_act) +9999 call psb_error_handler(ictxt,err_act) return end subroutine psi_mswapidxv diff --git a/base/comm/internals/psi_mswaptran_a.F90 b/base/comm/internals/psi_mswaptran_a.F90 index 7b94d480..e04b5307 100644 --- a/base/comm/internals/psi_mswaptran_a.F90 +++ b/base/comm/internals/psi_mswaptran_a.F90 @@ -110,7 +110,9 @@ subroutine psi_mswaptranm(flag,n,beta,y,desc_a,work,info,data) integer(psb_ipk_), optional :: data ! locals - integer(psb_ipk_) :: ictxt, np, me, icomm, idxs, idxr, err_act, totxch, data_ + type(psb_ctxt_type) :: ictxt + integer(psb_mpk_) :: icomm + integer(psb_ipk_) :: np, me, idxs, idxr, err_act, totxch, data_ integer(psb_ipk_), pointer :: d_idx(:) character(len=20) :: name @@ -172,14 +174,17 @@ subroutine psi_mtranidxm(iictxt,iicomm,flag,n,beta,y,idx,& include 'mpif.h' #endif - integer(psb_ipk_), intent(in) :: iictxt,iicomm,flag,n - integer(psb_ipk_), intent(out) :: info + type(psb_ctxt_type), intent(in) :: iictxt + integer(psb_mpk_), intent(in) :: iicomm + integer(psb_ipk_), intent(in) :: flag,n + integer(psb_ipk_), intent(out) :: info integer(psb_mpk_) :: y(:,:), beta integer(psb_mpk_), target :: work(:) integer(psb_ipk_), intent(in) :: idx(:),totxch,totsnd, totrcv ! locals - integer(psb_mpk_) :: ictxt, icomm, np, me,& + type(psb_ctxt_type) :: ictxt + integer(psb_mpk_) :: icomm, np, me,& & proc_to_comm, p2ptag, p2pstat(mpi_status_size), iret integer(psb_mpk_), allocatable, dimension(:) :: bsdidx, brvidx,& & sdsz, rvsz, prcid, rvhd, sdhd @@ -508,7 +513,7 @@ subroutine psi_mtranidxm(iictxt,iicomm,flag,n,beta,y,idx,& call psb_erractionrestore(err_act) return -9999 call psb_error_handler(iictxt,err_act) +9999 call psb_error_handler(ictxt,err_act) return end subroutine psi_mtranidxm @@ -592,7 +597,9 @@ subroutine psi_mswaptranv(flag,beta,y,desc_a,work,info,data) integer(psb_ipk_), optional :: data ! locals - integer(psb_ipk_) :: ictxt, np, me, icomm, idxs, idxr, totxch, err_act, data_ + type(psb_ctxt_type) :: ictxt + integer(psb_mpk_) :: icomm + integer(psb_ipk_) :: np, me, idxs, idxr, totxch, err_act, data_ integer(psb_ipk_), pointer :: d_idx(:) character(len=20) :: name @@ -664,14 +671,17 @@ subroutine psi_mtranidxv(iictxt,iicomm,flag,beta,y,idx,& include 'mpif.h' #endif - integer(psb_ipk_), intent(in) :: iictxt,iicomm,flag - integer(psb_ipk_), intent(out) :: info + type(psb_ctxt_type), intent(in) :: iictxt + integer(psb_mpk_), intent(in) :: iicomm + integer(psb_ipk_), intent(in) :: flag + integer(psb_ipk_), intent(out) :: info integer(psb_mpk_) :: y(:), beta integer(psb_mpk_), target :: work(:) integer(psb_ipk_), intent(in) :: idx(:),totxch,totsnd, totrcv ! locals - integer(psb_mpk_) :: ictxt, icomm, np, me,& + type(psb_ctxt_type) :: ictxt + integer(psb_mpk_) :: icomm, np, me,& & proc_to_comm, p2ptag, p2pstat(mpi_status_size), iret integer(psb_mpk_), allocatable, dimension(:) :: bsdidx, brvidx,& & sdsz, rvsz, prcid, rvhd, sdhd @@ -996,7 +1006,7 @@ subroutine psi_mtranidxv(iictxt,iicomm,flag,beta,y,idx,& call psb_erractionrestore(err_act) return -9999 call psb_error_handler(iictxt,err_act) +9999 call psb_error_handler(ictxt,err_act) return end subroutine psi_mtranidxv diff --git a/base/comm/internals/psi_sovrl_restr.f90 b/base/comm/internals/psi_sovrl_restr.f90 index 3854040c..d577da9c 100644 --- a/base/comm/internals/psi_sovrl_restr.f90 +++ b/base/comm/internals/psi_sovrl_restr.f90 @@ -47,7 +47,8 @@ subroutine psi_sovrl_restr_vect(x,xs,desc_a,info) integer(psb_ipk_), intent(out) :: info ! locals - integer(psb_ipk_) :: ictxt, np, me, err_act, i, idx, isz + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me, err_act, i, idx, isz character(len=20) :: name, ch_err name='psi_sovrl_restr_vect' @@ -89,7 +90,8 @@ subroutine psi_sovrl_restr_multivect(x,xs,desc_a,info) integer(psb_ipk_), intent(out) :: info ! locals - integer(psb_ipk_) :: ictxt, np, me, err_act, i, idx, isz, nc + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me, err_act, i, idx, isz, nc character(len=20) :: name, ch_err name='psi_sovrl_restr_mv' diff --git a/base/comm/internals/psi_sovrl_restr_a.f90 b/base/comm/internals/psi_sovrl_restr_a.f90 index e66297d5..5cf91e35 100644 --- a/base/comm/internals/psi_sovrl_restr_a.f90 +++ b/base/comm/internals/psi_sovrl_restr_a.f90 @@ -45,7 +45,8 @@ subroutine psi_sovrl_restrr1(x,xs,desc_a,info) integer(psb_ipk_), intent(out) :: info ! locals - integer(psb_ipk_) :: ictxt, np, me, err_act, i, idx, isz + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me, err_act, i, idx, isz character(len=20) :: name, ch_err name='psi_sovrl_restrr1' @@ -88,7 +89,8 @@ subroutine psi_sovrl_restrr2(x,xs,desc_a,info) integer(psb_ipk_), intent(out) :: info ! locals - integer(psb_ipk_) :: ictxt, np, me, err_act, i, idx, isz + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me, err_act, i, idx, isz character(len=20) :: name, ch_err name='psi_sovrl_restrr2' diff --git a/base/comm/internals/psi_sovrl_save.f90 b/base/comm/internals/psi_sovrl_save.f90 index 9b06fef7..39344e08 100644 --- a/base/comm/internals/psi_sovrl_save.f90 +++ b/base/comm/internals/psi_sovrl_save.f90 @@ -47,7 +47,8 @@ subroutine psi_sovrl_save_vect(x,xs,desc_a,info) integer(psb_ipk_), intent(out) :: info ! locals - integer(psb_ipk_) :: ictxt, np, me, err_act, i, idx, isz + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me, err_act, i, idx, isz character(len=20) :: name, ch_err name='psi_dovrl_saver1' @@ -82,8 +83,6 @@ subroutine psi_sovrl_save_vect(x,xs,desc_a,info) return end subroutine psi_sovrl_save_vect - - subroutine psi_sovrl_save_multivect(x,xs,desc_a,info) use psi_mod, psi_protect_name => psi_sovrl_save_multivect use psb_realloc_mod @@ -97,7 +96,8 @@ subroutine psi_sovrl_save_multivect(x,xs,desc_a,info) integer(psb_ipk_), intent(out) :: info ! locals - integer(psb_ipk_) :: ictxt, np, me, err_act, i, idx, isz, nc + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me, err_act, i, idx, isz, nc character(len=20) :: name, ch_err name='psi_dovrl_saver1' diff --git a/base/comm/internals/psi_sovrl_save_a.f90 b/base/comm/internals/psi_sovrl_save_a.f90 index cf400127..4b78186f 100644 --- a/base/comm/internals/psi_sovrl_save_a.f90 +++ b/base/comm/internals/psi_sovrl_save_a.f90 @@ -47,7 +47,8 @@ subroutine psi_sovrl_saver1(x,xs,desc_a,info) integer(psb_ipk_), intent(out) :: info ! locals - integer(psb_ipk_) :: ictxt, np, me, err_act, i, idx, isz + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me, err_act, i, idx, isz character(len=20) :: name, ch_err name='psi_sovrl_saver1' @@ -99,7 +100,8 @@ subroutine psi_sovrl_saver2(x,xs,desc_a,info) integer(psb_ipk_), intent(out) :: info ! locals - integer(psb_ipk_) :: ictxt, np, me, err_act, i, idx, isz, nc + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me, err_act, i, idx, isz, nc character(len=20) :: name, ch_err name='psi_sovrl_saver2' diff --git a/base/comm/internals/psi_sovrl_upd.f90 b/base/comm/internals/psi_sovrl_upd.f90 index 636261b1..fa08e0aa 100644 --- a/base/comm/internals/psi_sovrl_upd.f90 +++ b/base/comm/internals/psi_sovrl_upd.f90 @@ -32,7 +32,7 @@ ! Subroutine: psi_sovrl_update ! These subroutines update the overlap region of a vector; they are used ! for the transpose matrix-vector product when there is a nonempty overlap, -! or for the application of Additive Schwarz preconditioners. +! or for the application of Additive Schwarz preconditioners. ! ! ! @@ -50,7 +50,8 @@ subroutine psi_sovrl_upd_vect(x,desc_a,update,info) ! locals real(psb_spk_), allocatable :: xs(:) - integer(psb_ipk_) :: ictxt, np, me, err_act, i, idx, ndm, nx + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me, err_act, i, idx, ndm, nx integer(psb_ipk_) :: ierr(5) character(len=20) :: name, ch_err @@ -131,7 +132,8 @@ subroutine psi_sovrl_upd_multivect(x,desc_a,update,info) ! locals real(psb_spk_), allocatable :: xs(:,:) - integer(psb_ipk_) :: ictxt, np, me, err_act, i, idx, ndm, nx, nc + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me, err_act, i, idx, ndm, nx, nc integer(psb_ipk_) :: ierr(5) character(len=20) :: name, ch_err diff --git a/base/comm/internals/psi_sovrl_upd_a.f90 b/base/comm/internals/psi_sovrl_upd_a.f90 index 82211657..d8d91670 100644 --- a/base/comm/internals/psi_sovrl_upd_a.f90 +++ b/base/comm/internals/psi_sovrl_upd_a.f90 @@ -46,7 +46,8 @@ subroutine psi_sovrl_updr1(x,desc_a,update,info) integer(psb_ipk_), intent(out) :: info ! locals - integer(psb_ipk_) :: ictxt, np, me, err_act, i, idx, ndm + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me, err_act, i, idx, ndm integer(psb_ipk_) :: ierr(5) character(len=20) :: name, ch_err @@ -103,7 +104,6 @@ subroutine psi_sovrl_updr1(x,desc_a,update,info) return end subroutine psi_sovrl_updr1 - subroutine psi_sovrl_updr2(x,desc_a,update,info) use psi_mod, psi_protect_name => psi_sovrl_updr2 @@ -115,7 +115,8 @@ subroutine psi_sovrl_updr2(x,desc_a,update,info) integer(psb_ipk_), intent(out) :: info ! locals - integer(psb_ipk_) :: ictxt, np, me, err_act, i, idx, ndm + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me, err_act, i, idx, ndm integer(psb_ipk_) :: ierr(5) character(len=20) :: name, ch_err diff --git a/base/comm/internals/psi_sswapdata.F90 b/base/comm/internals/psi_sswapdata.F90 index b5185198..0f27d260 100644 --- a/base/comm/internals/psi_sswapdata.F90 +++ b/base/comm/internals/psi_sswapdata.F90 @@ -113,7 +113,9 @@ subroutine psi_sswapdata_vect(flag,beta,y,desc_a,work,info,data) integer(psb_ipk_), optional :: data ! locals - integer(psb_ipk_) :: ictxt, np, me, icomm, idxs, idxr, totxch, data_, err_act + type(psb_ctxt_type) :: ictxt + integer(psb_mpk_) :: icomm + integer(psb_ipk_) :: np, me, idxs, idxr, totxch, data_, err_act class(psb_i_base_vect_type), pointer :: d_vidx character(len=20) :: name @@ -190,8 +192,10 @@ subroutine psi_sswap_vidx_vect(iictxt,iicomm,flag,beta,y,idx, & include 'mpif.h' #endif - integer(psb_ipk_), intent(in) :: iictxt,iicomm,flag - integer(psb_ipk_), intent(out) :: info + type(psb_ctxt_type), intent(in) :: iictxt + integer(psb_mpk_), intent(in) :: iicomm + integer(psb_ipk_), intent(in) :: flag + integer(psb_ipk_), intent(out) :: info class(psb_s_base_vect_type) :: y real(psb_spk_) :: beta real(psb_spk_), target :: work(:) @@ -199,7 +203,8 @@ subroutine psi_sswap_vidx_vect(iictxt,iicomm,flag,beta,y,idx, & integer(psb_ipk_), intent(in) :: totxch,totsnd, totrcv ! locals - integer(psb_mpk_) :: ictxt, icomm, np, me,& + type(psb_ctxt_type) :: ictxt + integer(psb_mpk_) :: icomm, np, me,& & proc_to_comm, p2ptag, p2pstat(mpi_status_size), iret integer(psb_mpk_), allocatable :: prcid(:) integer(psb_ipk_) :: nesd, nerv,& @@ -413,7 +418,7 @@ subroutine psi_sswap_vidx_vect(iictxt,iicomm,flag,beta,y,idx, & call psb_erractionrestore(err_act) return -9999 call psb_error_handler(iictxt,err_act) +9999 call psb_error_handler(ictxt,err_act) return end subroutine psi_sswap_vidx_vect @@ -450,7 +455,9 @@ subroutine psi_sswapdata_multivect(flag,beta,y,desc_a,work,info,data) integer(psb_ipk_), optional :: data ! locals - integer(psb_ipk_) :: ictxt, np, me, icomm, idxs, idxr, totxch, data_, err_act + type(psb_ctxt_type) :: ictxt + integer(psb_mpk_) :: icomm + integer(psb_ipk_) :: np, me, idxs, idxr, totxch, data_, err_act class(psb_i_base_vect_type), pointer :: d_vidx character(len=20) :: name @@ -527,8 +534,10 @@ subroutine psi_sswap_vidx_multivect(iictxt,iicomm,flag,beta,y,idx, & include 'mpif.h' #endif - integer(psb_ipk_), intent(in) :: iictxt,iicomm,flag - integer(psb_ipk_), intent(out) :: info + type(psb_ctxt_type), intent(in) :: iictxt + integer(psb_mpk_), intent(in) :: iicomm + integer(psb_ipk_), intent(in) :: flag + integer(psb_ipk_), intent(out) :: info class(psb_s_base_multivect_type) :: y real(psb_spk_) :: beta real(psb_spk_), target :: work(:) @@ -536,7 +545,8 @@ subroutine psi_sswap_vidx_multivect(iictxt,iicomm,flag,beta,y,idx, & integer(psb_ipk_), intent(in) :: totxch,totsnd, totrcv ! locals - integer(psb_mpk_) :: ictxt, icomm, np, me,& + type(psb_ctxt_type) :: ictxt + integer(psb_mpk_) :: icomm, np, me,& & proc_to_comm, p2ptag, p2pstat(mpi_status_size), iret integer(psb_mpk_), allocatable :: prcid(:) integer(psb_ipk_) :: nesd, nerv,& @@ -756,7 +766,7 @@ subroutine psi_sswap_vidx_multivect(iictxt,iicomm,flag,beta,y,idx, & call psb_erractionrestore(err_act) return -9999 call psb_error_handler(iictxt,err_act) +9999 call psb_error_handler(ictxt,err_act) return end subroutine psi_sswap_vidx_multivect diff --git a/base/comm/internals/psi_sswapdata_a.F90 b/base/comm/internals/psi_sswapdata_a.F90 index 5b591bf3..ce9bbbe8 100644 --- a/base/comm/internals/psi_sswapdata_a.F90 +++ b/base/comm/internals/psi_sswapdata_a.F90 @@ -106,7 +106,9 @@ subroutine psi_sswapdatam(flag,n,beta,y,desc_a,work,info,data) integer(psb_ipk_), optional :: data ! locals - integer(psb_ipk_) :: ictxt, np, me, icomm, idxs, idxr, totxch, data_, err_act + type(psb_ctxt_type) :: ictxt + integer(psb_mpk_) :: icomm + integer(psb_ipk_) :: np, me, idxs, idxr, totxch, data_, err_act integer(psb_ipk_), pointer :: d_idx(:) character(len=20) :: name @@ -152,7 +154,7 @@ subroutine psi_sswapdatam(flag,n,beta,y,desc_a,work,info,data) return end subroutine psi_sswapdatam -subroutine psi_sswapidxm(iictxt,iicomm,flag,n,beta,y,idx, & +subroutine psi_sswapidxm(ictxt,icomm,flag,n,beta,y,idx, & & totxch,totsnd,totrcv,work,info) use psi_mod, psb_protect_name => psi_sswapidxm @@ -167,14 +169,17 @@ subroutine psi_sswapidxm(iictxt,iicomm,flag,n,beta,y,idx, & include 'mpif.h' #endif - integer(psb_ipk_), intent(in) :: iictxt,iicomm,flag,n - integer(psb_ipk_), intent(out) :: info + type(psb_ctxt_type), intent(in) :: ictxt + integer(psb_mpk_), intent(in) :: icomm + integer(psb_ipk_), intent(in) :: flag,n + integer(psb_ipk_), intent(out) :: info real(psb_spk_) :: y(:,:), beta real(psb_spk_), target :: work(:) integer(psb_ipk_), intent(in) :: idx(:),totxch,totsnd, totrcv ! locals - integer(psb_mpk_) :: ictxt, icomm, np, me,& + + integer(psb_mpk_) :: np, me,& & proc_to_comm, p2ptag, p2pstat(mpi_status_size), iret integer(psb_mpk_), allocatable, dimension(:) :: bsdidx, brvidx,& & sdsz, rvsz, prcid, rvhd, sdhd @@ -192,8 +197,6 @@ subroutine psi_sswapidxm(iictxt,iicomm,flag,n,beta,y,idx, & info=psb_success_ name='psi_swap_data' call psb_erractionsave(err_act) - ictxt = iictxt - icomm = iicomm call psb_info(ictxt,me,np) if (np == -1) then @@ -498,7 +501,7 @@ subroutine psi_sswapidxm(iictxt,iicomm,flag,n,beta,y,idx, & call psb_erractionrestore(err_act) return -9999 call psb_error_handler(iictxt,err_act) +9999 call psb_error_handler(ictxt,err_act) return end subroutine psi_sswapidxm @@ -579,7 +582,9 @@ subroutine psi_sswapdatav(flag,beta,y,desc_a,work,info,data) integer(psb_ipk_), optional :: data ! locals - integer(psb_ipk_) :: ictxt, np, me, icomm, idxs, idxr, totxch, data_, err_act + type(psb_ctxt_type) :: ictxt + integer(psb_mpk_) :: icomm + integer(psb_ipk_) :: np, me, idxs, idxr, totxch, data_, err_act integer(psb_ipk_), pointer :: d_idx(:) character(len=20) :: name @@ -651,14 +656,17 @@ subroutine psi_sswapidxv(iictxt,iicomm,flag,beta,y,idx, & include 'mpif.h' #endif - integer(psb_ipk_), intent(in) :: iictxt,iicomm,flag - integer(psb_ipk_), intent(out) :: info + type(psb_ctxt_type), intent(in) :: iictxt + integer(psb_mpk_), intent(in) :: iicomm + integer(psb_ipk_), intent(in) :: flag + integer(psb_ipk_), intent(out) :: info real(psb_spk_) :: y(:), beta real(psb_spk_), target :: work(:) integer(psb_ipk_), intent(in) :: idx(:),totxch,totsnd, totrcv ! locals - integer(psb_mpk_) :: ictxt, icomm, np, me,& + type(psb_ctxt_type) :: ictxt + integer(psb_mpk_) :: icomm, np, me,& & proc_to_comm, p2ptag, p2pstat(mpi_status_size), iret integer(psb_mpk_), allocatable, dimension(:) :: bsdidx, brvidx,& & sdsz, rvsz, prcid, rvhd, sdhd @@ -980,7 +988,7 @@ subroutine psi_sswapidxv(iictxt,iicomm,flag,beta,y,idx, & call psb_erractionrestore(err_act) return -9999 call psb_error_handler(iictxt,err_act) +9999 call psb_error_handler(ictxt,err_act) return end subroutine psi_sswapidxv diff --git a/base/comm/internals/psi_sswaptran.F90 b/base/comm/internals/psi_sswaptran.F90 index cb3ccc75..69f6b95d 100644 --- a/base/comm/internals/psi_sswaptran.F90 +++ b/base/comm/internals/psi_sswaptran.F90 @@ -115,7 +115,9 @@ subroutine psi_sswaptran_vect(flag,beta,y,desc_a,work,info,data) integer(psb_ipk_), optional :: data ! locals - integer(psb_ipk_) :: ictxt, np, me, icomm, idxs, idxr, totxch, err_act, data_ + type(psb_ctxt_type) :: ictxt + integer(psb_mpk_) :: icomm + integer(psb_ipk_) :: np, me, idxs, idxr, totxch, err_act, data_ class(psb_i_base_vect_type), pointer :: d_vidx character(len=20) :: name @@ -161,8 +163,6 @@ subroutine psi_sswaptran_vect(flag,beta,y,desc_a,work,info,data) return end subroutine psi_sswaptran_vect - - ! ! ! Subroutine: psi_stran_vidx_vect @@ -193,7 +193,9 @@ subroutine psi_stran_vidx_vect(iictxt,iicomm,flag,beta,y,idx,& include 'mpif.h' #endif - integer(psb_ipk_), intent(in) :: iictxt,iicomm,flag + type(psb_ctxt_type), intent(in) :: iictxt + integer(psb_mpk_), intent(in) :: iicomm + integer(psb_ipk_), intent(in) :: flag integer(psb_ipk_), intent(out) :: info class(psb_s_base_vect_type) :: y real(psb_spk_) :: beta @@ -202,7 +204,8 @@ subroutine psi_stran_vidx_vect(iictxt,iicomm,flag,beta,y,idx,& integer(psb_ipk_), intent(in) :: totxch,totsnd, totrcv ! locals - integer(psb_mpk_) :: ictxt, icomm, np, me,& + type(psb_ctxt_type) :: ictxt + integer(psb_mpk_) :: icomm, np, me,& & proc_to_comm, p2ptag, p2pstat(mpi_status_size), iret integer(psb_mpk_), allocatable :: prcid(:) integer(psb_ipk_) :: nesd, nerv,& @@ -422,7 +425,7 @@ subroutine psi_stran_vidx_vect(iictxt,iicomm,flag,beta,y,idx,& call psb_erractionrestore(err_act) return -9999 call psb_error_handler(iictxt,err_act) +9999 call psb_error_handler(ictxt,err_act) return @@ -463,7 +466,9 @@ subroutine psi_sswaptran_multivect(flag,beta,y,desc_a,work,info,data) integer(psb_ipk_), optional :: data ! locals - integer(psb_ipk_) :: ictxt, np, me, icomm, idxs, idxr, totxch, err_act, data_ + type(psb_ctxt_type) :: ictxt + integer(psb_mpk_) :: icomm + integer(psb_ipk_) :: np, me, idxs, idxr, totxch, err_act, data_ class(psb_i_base_vect_type), pointer :: d_vidx character(len=20) :: name @@ -540,7 +545,9 @@ subroutine psi_stran_vidx_multivect(iictxt,iicomm,flag,beta,y,idx,& include 'mpif.h' #endif - integer(psb_ipk_), intent(in) :: iictxt,iicomm,flag + type(psb_ctxt_type), intent(in) :: iictxt + integer(psb_mpk_), intent(in) :: iicomm + integer(psb_ipk_), intent(in) :: flag integer(psb_ipk_), intent(out) :: info class(psb_s_base_multivect_type) :: y real(psb_spk_) :: beta @@ -549,7 +556,8 @@ subroutine psi_stran_vidx_multivect(iictxt,iicomm,flag,beta,y,idx,& integer(psb_ipk_), intent(in) :: totxch,totsnd, totrcv ! locals - integer(psb_mpk_) :: ictxt, icomm, np, me,& + type(psb_ctxt_type) :: ictxt + integer(psb_mpk_) :: icomm, np, me,& & proc_to_comm, p2ptag, p2pstat(mpi_status_size), iret integer(psb_mpk_), allocatable :: prcid(:) integer(psb_ipk_) :: nesd, nerv,& @@ -773,7 +781,7 @@ subroutine psi_stran_vidx_multivect(iictxt,iicomm,flag,beta,y,idx,& call psb_erractionrestore(err_act) return -9999 call psb_error_handler(iictxt,err_act) +9999 call psb_error_handler(ictxt,err_act) return diff --git a/base/comm/internals/psi_sswaptran_a.F90 b/base/comm/internals/psi_sswaptran_a.F90 index 890a7a58..18142908 100644 --- a/base/comm/internals/psi_sswaptran_a.F90 +++ b/base/comm/internals/psi_sswaptran_a.F90 @@ -110,7 +110,9 @@ subroutine psi_sswaptranm(flag,n,beta,y,desc_a,work,info,data) integer(psb_ipk_), optional :: data ! locals - integer(psb_ipk_) :: ictxt, np, me, icomm, idxs, idxr, err_act, totxch, data_ + type(psb_ctxt_type) :: ictxt + integer(psb_mpk_) :: icomm + integer(psb_ipk_) :: np, me, idxs, idxr, err_act, totxch, data_ integer(psb_ipk_), pointer :: d_idx(:) character(len=20) :: name @@ -172,14 +174,17 @@ subroutine psi_stranidxm(iictxt,iicomm,flag,n,beta,y,idx,& include 'mpif.h' #endif - integer(psb_ipk_), intent(in) :: iictxt,iicomm,flag,n - integer(psb_ipk_), intent(out) :: info + type(psb_ctxt_type), intent(in) :: iictxt + integer(psb_mpk_), intent(in) :: iicomm + integer(psb_ipk_), intent(in) :: flag,n + integer(psb_ipk_), intent(out) :: info real(psb_spk_) :: y(:,:), beta real(psb_spk_), target :: work(:) integer(psb_ipk_), intent(in) :: idx(:),totxch,totsnd, totrcv ! locals - integer(psb_mpk_) :: ictxt, icomm, np, me,& + type(psb_ctxt_type) :: ictxt + integer(psb_mpk_) :: icomm, np, me,& & proc_to_comm, p2ptag, p2pstat(mpi_status_size), iret integer(psb_mpk_), allocatable, dimension(:) :: bsdidx, brvidx,& & sdsz, rvsz, prcid, rvhd, sdhd @@ -508,7 +513,7 @@ subroutine psi_stranidxm(iictxt,iicomm,flag,n,beta,y,idx,& call psb_erractionrestore(err_act) return -9999 call psb_error_handler(iictxt,err_act) +9999 call psb_error_handler(ictxt,err_act) return end subroutine psi_stranidxm @@ -592,7 +597,9 @@ subroutine psi_sswaptranv(flag,beta,y,desc_a,work,info,data) integer(psb_ipk_), optional :: data ! locals - integer(psb_ipk_) :: ictxt, np, me, icomm, idxs, idxr, totxch, err_act, data_ + type(psb_ctxt_type) :: ictxt + integer(psb_mpk_) :: icomm + integer(psb_ipk_) :: np, me, idxs, idxr, totxch, err_act, data_ integer(psb_ipk_), pointer :: d_idx(:) character(len=20) :: name @@ -664,14 +671,17 @@ subroutine psi_stranidxv(iictxt,iicomm,flag,beta,y,idx,& include 'mpif.h' #endif - integer(psb_ipk_), intent(in) :: iictxt,iicomm,flag - integer(psb_ipk_), intent(out) :: info + type(psb_ctxt_type), intent(in) :: iictxt + integer(psb_mpk_), intent(in) :: iicomm + integer(psb_ipk_), intent(in) :: flag + integer(psb_ipk_), intent(out) :: info real(psb_spk_) :: y(:), beta real(psb_spk_), target :: work(:) integer(psb_ipk_), intent(in) :: idx(:),totxch,totsnd, totrcv ! locals - integer(psb_mpk_) :: ictxt, icomm, np, me,& + type(psb_ctxt_type) :: ictxt + integer(psb_mpk_) :: icomm, np, me,& & proc_to_comm, p2ptag, p2pstat(mpi_status_size), iret integer(psb_mpk_), allocatable, dimension(:) :: bsdidx, brvidx,& & sdsz, rvsz, prcid, rvhd, sdhd @@ -996,7 +1006,7 @@ subroutine psi_stranidxv(iictxt,iicomm,flag,beta,y,idx,& call psb_erractionrestore(err_act) return -9999 call psb_error_handler(iictxt,err_act) +9999 call psb_error_handler(ictxt,err_act) return end subroutine psi_stranidxv diff --git a/base/comm/internals/psi_zovrl_restr.f90 b/base/comm/internals/psi_zovrl_restr.f90 index e52232e7..b9cb1a8a 100644 --- a/base/comm/internals/psi_zovrl_restr.f90 +++ b/base/comm/internals/psi_zovrl_restr.f90 @@ -47,7 +47,8 @@ subroutine psi_zovrl_restr_vect(x,xs,desc_a,info) integer(psb_ipk_), intent(out) :: info ! locals - integer(psb_ipk_) :: ictxt, np, me, err_act, i, idx, isz + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me, err_act, i, idx, isz character(len=20) :: name, ch_err name='psi_zovrl_restr_vect' @@ -89,7 +90,8 @@ subroutine psi_zovrl_restr_multivect(x,xs,desc_a,info) integer(psb_ipk_), intent(out) :: info ! locals - integer(psb_ipk_) :: ictxt, np, me, err_act, i, idx, isz, nc + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me, err_act, i, idx, isz, nc character(len=20) :: name, ch_err name='psi_zovrl_restr_mv' diff --git a/base/comm/internals/psi_zovrl_restr_a.f90 b/base/comm/internals/psi_zovrl_restr_a.f90 index 379efdcb..34409387 100644 --- a/base/comm/internals/psi_zovrl_restr_a.f90 +++ b/base/comm/internals/psi_zovrl_restr_a.f90 @@ -45,7 +45,8 @@ subroutine psi_zovrl_restrr1(x,xs,desc_a,info) integer(psb_ipk_), intent(out) :: info ! locals - integer(psb_ipk_) :: ictxt, np, me, err_act, i, idx, isz + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me, err_act, i, idx, isz character(len=20) :: name, ch_err name='psi_zovrl_restrr1' @@ -88,7 +89,8 @@ subroutine psi_zovrl_restrr2(x,xs,desc_a,info) integer(psb_ipk_), intent(out) :: info ! locals - integer(psb_ipk_) :: ictxt, np, me, err_act, i, idx, isz + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me, err_act, i, idx, isz character(len=20) :: name, ch_err name='psi_zovrl_restrr2' diff --git a/base/comm/internals/psi_zovrl_save.f90 b/base/comm/internals/psi_zovrl_save.f90 index acf65181..e8f88f5a 100644 --- a/base/comm/internals/psi_zovrl_save.f90 +++ b/base/comm/internals/psi_zovrl_save.f90 @@ -47,7 +47,8 @@ subroutine psi_zovrl_save_vect(x,xs,desc_a,info) integer(psb_ipk_), intent(out) :: info ! locals - integer(psb_ipk_) :: ictxt, np, me, err_act, i, idx, isz + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me, err_act, i, idx, isz character(len=20) :: name, ch_err name='psi_dovrl_saver1' @@ -82,8 +83,6 @@ subroutine psi_zovrl_save_vect(x,xs,desc_a,info) return end subroutine psi_zovrl_save_vect - - subroutine psi_zovrl_save_multivect(x,xs,desc_a,info) use psi_mod, psi_protect_name => psi_zovrl_save_multivect use psb_realloc_mod @@ -97,7 +96,8 @@ subroutine psi_zovrl_save_multivect(x,xs,desc_a,info) integer(psb_ipk_), intent(out) :: info ! locals - integer(psb_ipk_) :: ictxt, np, me, err_act, i, idx, isz, nc + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me, err_act, i, idx, isz, nc character(len=20) :: name, ch_err name='psi_dovrl_saver1' diff --git a/base/comm/internals/psi_zovrl_save_a.f90 b/base/comm/internals/psi_zovrl_save_a.f90 index 1e8fdb89..fbb108a9 100644 --- a/base/comm/internals/psi_zovrl_save_a.f90 +++ b/base/comm/internals/psi_zovrl_save_a.f90 @@ -47,7 +47,8 @@ subroutine psi_zovrl_saver1(x,xs,desc_a,info) integer(psb_ipk_), intent(out) :: info ! locals - integer(psb_ipk_) :: ictxt, np, me, err_act, i, idx, isz + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me, err_act, i, idx, isz character(len=20) :: name, ch_err name='psi_zovrl_saver1' @@ -99,7 +100,8 @@ subroutine psi_zovrl_saver2(x,xs,desc_a,info) integer(psb_ipk_), intent(out) :: info ! locals - integer(psb_ipk_) :: ictxt, np, me, err_act, i, idx, isz, nc + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me, err_act, i, idx, isz, nc character(len=20) :: name, ch_err name='psi_zovrl_saver2' diff --git a/base/comm/internals/psi_zovrl_upd.f90 b/base/comm/internals/psi_zovrl_upd.f90 index cd7ea0de..f18e914d 100644 --- a/base/comm/internals/psi_zovrl_upd.f90 +++ b/base/comm/internals/psi_zovrl_upd.f90 @@ -32,7 +32,7 @@ ! Subroutine: psi_zovrl_update ! These subroutines update the overlap region of a vector; they are used ! for the transpose matrix-vector product when there is a nonempty overlap, -! or for the application of Additive Schwarz preconditioners. +! or for the application of Additive Schwarz preconditioners. ! ! ! @@ -50,7 +50,8 @@ subroutine psi_zovrl_upd_vect(x,desc_a,update,info) ! locals complex(psb_dpk_), allocatable :: xs(:) - integer(psb_ipk_) :: ictxt, np, me, err_act, i, idx, ndm, nx + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me, err_act, i, idx, ndm, nx integer(psb_ipk_) :: ierr(5) character(len=20) :: name, ch_err @@ -131,7 +132,8 @@ subroutine psi_zovrl_upd_multivect(x,desc_a,update,info) ! locals complex(psb_dpk_), allocatable :: xs(:,:) - integer(psb_ipk_) :: ictxt, np, me, err_act, i, idx, ndm, nx, nc + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me, err_act, i, idx, ndm, nx, nc integer(psb_ipk_) :: ierr(5) character(len=20) :: name, ch_err diff --git a/base/comm/internals/psi_zovrl_upd_a.f90 b/base/comm/internals/psi_zovrl_upd_a.f90 index 9ea2fbae..ed775e4c 100644 --- a/base/comm/internals/psi_zovrl_upd_a.f90 +++ b/base/comm/internals/psi_zovrl_upd_a.f90 @@ -46,7 +46,8 @@ subroutine psi_zovrl_updr1(x,desc_a,update,info) integer(psb_ipk_), intent(out) :: info ! locals - integer(psb_ipk_) :: ictxt, np, me, err_act, i, idx, ndm + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me, err_act, i, idx, ndm integer(psb_ipk_) :: ierr(5) character(len=20) :: name, ch_err @@ -103,7 +104,6 @@ subroutine psi_zovrl_updr1(x,desc_a,update,info) return end subroutine psi_zovrl_updr1 - subroutine psi_zovrl_updr2(x,desc_a,update,info) use psi_mod, psi_protect_name => psi_zovrl_updr2 @@ -115,7 +115,8 @@ subroutine psi_zovrl_updr2(x,desc_a,update,info) integer(psb_ipk_), intent(out) :: info ! locals - integer(psb_ipk_) :: ictxt, np, me, err_act, i, idx, ndm + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me, err_act, i, idx, ndm integer(psb_ipk_) :: ierr(5) character(len=20) :: name, ch_err diff --git a/base/comm/internals/psi_zswapdata.F90 b/base/comm/internals/psi_zswapdata.F90 index 7d34012e..fbf17803 100644 --- a/base/comm/internals/psi_zswapdata.F90 +++ b/base/comm/internals/psi_zswapdata.F90 @@ -113,7 +113,9 @@ subroutine psi_zswapdata_vect(flag,beta,y,desc_a,work,info,data) integer(psb_ipk_), optional :: data ! locals - integer(psb_ipk_) :: ictxt, np, me, icomm, idxs, idxr, totxch, data_, err_act + type(psb_ctxt_type) :: ictxt + integer(psb_mpk_) :: icomm + integer(psb_ipk_) :: np, me, idxs, idxr, totxch, data_, err_act class(psb_i_base_vect_type), pointer :: d_vidx character(len=20) :: name @@ -190,8 +192,10 @@ subroutine psi_zswap_vidx_vect(iictxt,iicomm,flag,beta,y,idx, & include 'mpif.h' #endif - integer(psb_ipk_), intent(in) :: iictxt,iicomm,flag - integer(psb_ipk_), intent(out) :: info + type(psb_ctxt_type), intent(in) :: iictxt + integer(psb_mpk_), intent(in) :: iicomm + integer(psb_ipk_), intent(in) :: flag + integer(psb_ipk_), intent(out) :: info class(psb_z_base_vect_type) :: y complex(psb_dpk_) :: beta complex(psb_dpk_), target :: work(:) @@ -199,7 +203,8 @@ subroutine psi_zswap_vidx_vect(iictxt,iicomm,flag,beta,y,idx, & integer(psb_ipk_), intent(in) :: totxch,totsnd, totrcv ! locals - integer(psb_mpk_) :: ictxt, icomm, np, me,& + type(psb_ctxt_type) :: ictxt + integer(psb_mpk_) :: icomm, np, me,& & proc_to_comm, p2ptag, p2pstat(mpi_status_size), iret integer(psb_mpk_), allocatable :: prcid(:) integer(psb_ipk_) :: nesd, nerv,& @@ -413,7 +418,7 @@ subroutine psi_zswap_vidx_vect(iictxt,iicomm,flag,beta,y,idx, & call psb_erractionrestore(err_act) return -9999 call psb_error_handler(iictxt,err_act) +9999 call psb_error_handler(ictxt,err_act) return end subroutine psi_zswap_vidx_vect @@ -450,7 +455,9 @@ subroutine psi_zswapdata_multivect(flag,beta,y,desc_a,work,info,data) integer(psb_ipk_), optional :: data ! locals - integer(psb_ipk_) :: ictxt, np, me, icomm, idxs, idxr, totxch, data_, err_act + type(psb_ctxt_type) :: ictxt + integer(psb_mpk_) :: icomm + integer(psb_ipk_) :: np, me, idxs, idxr, totxch, data_, err_act class(psb_i_base_vect_type), pointer :: d_vidx character(len=20) :: name @@ -527,8 +534,10 @@ subroutine psi_zswap_vidx_multivect(iictxt,iicomm,flag,beta,y,idx, & include 'mpif.h' #endif - integer(psb_ipk_), intent(in) :: iictxt,iicomm,flag - integer(psb_ipk_), intent(out) :: info + type(psb_ctxt_type), intent(in) :: iictxt + integer(psb_mpk_), intent(in) :: iicomm + integer(psb_ipk_), intent(in) :: flag + integer(psb_ipk_), intent(out) :: info class(psb_z_base_multivect_type) :: y complex(psb_dpk_) :: beta complex(psb_dpk_), target :: work(:) @@ -536,7 +545,8 @@ subroutine psi_zswap_vidx_multivect(iictxt,iicomm,flag,beta,y,idx, & integer(psb_ipk_), intent(in) :: totxch,totsnd, totrcv ! locals - integer(psb_mpk_) :: ictxt, icomm, np, me,& + type(psb_ctxt_type) :: ictxt + integer(psb_mpk_) :: icomm, np, me,& & proc_to_comm, p2ptag, p2pstat(mpi_status_size), iret integer(psb_mpk_), allocatable :: prcid(:) integer(psb_ipk_) :: nesd, nerv,& @@ -756,7 +766,7 @@ subroutine psi_zswap_vidx_multivect(iictxt,iicomm,flag,beta,y,idx, & call psb_erractionrestore(err_act) return -9999 call psb_error_handler(iictxt,err_act) +9999 call psb_error_handler(ictxt,err_act) return end subroutine psi_zswap_vidx_multivect diff --git a/base/comm/internals/psi_zswapdata_a.F90 b/base/comm/internals/psi_zswapdata_a.F90 index 19026b97..ea2e69ab 100644 --- a/base/comm/internals/psi_zswapdata_a.F90 +++ b/base/comm/internals/psi_zswapdata_a.F90 @@ -106,7 +106,9 @@ subroutine psi_zswapdatam(flag,n,beta,y,desc_a,work,info,data) integer(psb_ipk_), optional :: data ! locals - integer(psb_ipk_) :: ictxt, np, me, icomm, idxs, idxr, totxch, data_, err_act + type(psb_ctxt_type) :: ictxt + integer(psb_mpk_) :: icomm + integer(psb_ipk_) :: np, me, idxs, idxr, totxch, data_, err_act integer(psb_ipk_), pointer :: d_idx(:) character(len=20) :: name @@ -152,7 +154,7 @@ subroutine psi_zswapdatam(flag,n,beta,y,desc_a,work,info,data) return end subroutine psi_zswapdatam -subroutine psi_zswapidxm(iictxt,iicomm,flag,n,beta,y,idx, & +subroutine psi_zswapidxm(ictxt,icomm,flag,n,beta,y,idx, & & totxch,totsnd,totrcv,work,info) use psi_mod, psb_protect_name => psi_zswapidxm @@ -167,14 +169,17 @@ subroutine psi_zswapidxm(iictxt,iicomm,flag,n,beta,y,idx, & include 'mpif.h' #endif - integer(psb_ipk_), intent(in) :: iictxt,iicomm,flag,n - integer(psb_ipk_), intent(out) :: info + type(psb_ctxt_type), intent(in) :: ictxt + integer(psb_mpk_), intent(in) :: icomm + integer(psb_ipk_), intent(in) :: flag,n + integer(psb_ipk_), intent(out) :: info complex(psb_dpk_) :: y(:,:), beta complex(psb_dpk_), target :: work(:) integer(psb_ipk_), intent(in) :: idx(:),totxch,totsnd, totrcv ! locals - integer(psb_mpk_) :: ictxt, icomm, np, me,& + + integer(psb_mpk_) :: np, me,& & proc_to_comm, p2ptag, p2pstat(mpi_status_size), iret integer(psb_mpk_), allocatable, dimension(:) :: bsdidx, brvidx,& & sdsz, rvsz, prcid, rvhd, sdhd @@ -192,8 +197,6 @@ subroutine psi_zswapidxm(iictxt,iicomm,flag,n,beta,y,idx, & info=psb_success_ name='psi_swap_data' call psb_erractionsave(err_act) - ictxt = iictxt - icomm = iicomm call psb_info(ictxt,me,np) if (np == -1) then @@ -498,7 +501,7 @@ subroutine psi_zswapidxm(iictxt,iicomm,flag,n,beta,y,idx, & call psb_erractionrestore(err_act) return -9999 call psb_error_handler(iictxt,err_act) +9999 call psb_error_handler(ictxt,err_act) return end subroutine psi_zswapidxm @@ -579,7 +582,9 @@ subroutine psi_zswapdatav(flag,beta,y,desc_a,work,info,data) integer(psb_ipk_), optional :: data ! locals - integer(psb_ipk_) :: ictxt, np, me, icomm, idxs, idxr, totxch, data_, err_act + type(psb_ctxt_type) :: ictxt + integer(psb_mpk_) :: icomm + integer(psb_ipk_) :: np, me, idxs, idxr, totxch, data_, err_act integer(psb_ipk_), pointer :: d_idx(:) character(len=20) :: name @@ -651,14 +656,17 @@ subroutine psi_zswapidxv(iictxt,iicomm,flag,beta,y,idx, & include 'mpif.h' #endif - integer(psb_ipk_), intent(in) :: iictxt,iicomm,flag - integer(psb_ipk_), intent(out) :: info + type(psb_ctxt_type), intent(in) :: iictxt + integer(psb_mpk_), intent(in) :: iicomm + integer(psb_ipk_), intent(in) :: flag + integer(psb_ipk_), intent(out) :: info complex(psb_dpk_) :: y(:), beta complex(psb_dpk_), target :: work(:) integer(psb_ipk_), intent(in) :: idx(:),totxch,totsnd, totrcv ! locals - integer(psb_mpk_) :: ictxt, icomm, np, me,& + type(psb_ctxt_type) :: ictxt + integer(psb_mpk_) :: icomm, np, me,& & proc_to_comm, p2ptag, p2pstat(mpi_status_size), iret integer(psb_mpk_), allocatable, dimension(:) :: bsdidx, brvidx,& & sdsz, rvsz, prcid, rvhd, sdhd @@ -980,7 +988,7 @@ subroutine psi_zswapidxv(iictxt,iicomm,flag,beta,y,idx, & call psb_erractionrestore(err_act) return -9999 call psb_error_handler(iictxt,err_act) +9999 call psb_error_handler(ictxt,err_act) return end subroutine psi_zswapidxv diff --git a/base/comm/internals/psi_zswaptran.F90 b/base/comm/internals/psi_zswaptran.F90 index c78a5e1a..ab1889f0 100644 --- a/base/comm/internals/psi_zswaptran.F90 +++ b/base/comm/internals/psi_zswaptran.F90 @@ -115,7 +115,9 @@ subroutine psi_zswaptran_vect(flag,beta,y,desc_a,work,info,data) integer(psb_ipk_), optional :: data ! locals - integer(psb_ipk_) :: ictxt, np, me, icomm, idxs, idxr, totxch, err_act, data_ + type(psb_ctxt_type) :: ictxt + integer(psb_mpk_) :: icomm + integer(psb_ipk_) :: np, me, idxs, idxr, totxch, err_act, data_ class(psb_i_base_vect_type), pointer :: d_vidx character(len=20) :: name @@ -161,8 +163,6 @@ subroutine psi_zswaptran_vect(flag,beta,y,desc_a,work,info,data) return end subroutine psi_zswaptran_vect - - ! ! ! Subroutine: psi_ztran_vidx_vect @@ -193,7 +193,9 @@ subroutine psi_ztran_vidx_vect(iictxt,iicomm,flag,beta,y,idx,& include 'mpif.h' #endif - integer(psb_ipk_), intent(in) :: iictxt,iicomm,flag + type(psb_ctxt_type), intent(in) :: iictxt + integer(psb_mpk_), intent(in) :: iicomm + integer(psb_ipk_), intent(in) :: flag integer(psb_ipk_), intent(out) :: info class(psb_z_base_vect_type) :: y complex(psb_dpk_) :: beta @@ -202,7 +204,8 @@ subroutine psi_ztran_vidx_vect(iictxt,iicomm,flag,beta,y,idx,& integer(psb_ipk_), intent(in) :: totxch,totsnd, totrcv ! locals - integer(psb_mpk_) :: ictxt, icomm, np, me,& + type(psb_ctxt_type) :: ictxt + integer(psb_mpk_) :: icomm, np, me,& & proc_to_comm, p2ptag, p2pstat(mpi_status_size), iret integer(psb_mpk_), allocatable :: prcid(:) integer(psb_ipk_) :: nesd, nerv,& @@ -422,7 +425,7 @@ subroutine psi_ztran_vidx_vect(iictxt,iicomm,flag,beta,y,idx,& call psb_erractionrestore(err_act) return -9999 call psb_error_handler(iictxt,err_act) +9999 call psb_error_handler(ictxt,err_act) return @@ -463,7 +466,9 @@ subroutine psi_zswaptran_multivect(flag,beta,y,desc_a,work,info,data) integer(psb_ipk_), optional :: data ! locals - integer(psb_ipk_) :: ictxt, np, me, icomm, idxs, idxr, totxch, err_act, data_ + type(psb_ctxt_type) :: ictxt + integer(psb_mpk_) :: icomm + integer(psb_ipk_) :: np, me, idxs, idxr, totxch, err_act, data_ class(psb_i_base_vect_type), pointer :: d_vidx character(len=20) :: name @@ -540,7 +545,9 @@ subroutine psi_ztran_vidx_multivect(iictxt,iicomm,flag,beta,y,idx,& include 'mpif.h' #endif - integer(psb_ipk_), intent(in) :: iictxt,iicomm,flag + type(psb_ctxt_type), intent(in) :: iictxt + integer(psb_mpk_), intent(in) :: iicomm + integer(psb_ipk_), intent(in) :: flag integer(psb_ipk_), intent(out) :: info class(psb_z_base_multivect_type) :: y complex(psb_dpk_) :: beta @@ -549,7 +556,8 @@ subroutine psi_ztran_vidx_multivect(iictxt,iicomm,flag,beta,y,idx,& integer(psb_ipk_), intent(in) :: totxch,totsnd, totrcv ! locals - integer(psb_mpk_) :: ictxt, icomm, np, me,& + type(psb_ctxt_type) :: ictxt + integer(psb_mpk_) :: icomm, np, me,& & proc_to_comm, p2ptag, p2pstat(mpi_status_size), iret integer(psb_mpk_), allocatable :: prcid(:) integer(psb_ipk_) :: nesd, nerv,& @@ -773,7 +781,7 @@ subroutine psi_ztran_vidx_multivect(iictxt,iicomm,flag,beta,y,idx,& call psb_erractionrestore(err_act) return -9999 call psb_error_handler(iictxt,err_act) +9999 call psb_error_handler(ictxt,err_act) return diff --git a/base/comm/internals/psi_zswaptran_a.F90 b/base/comm/internals/psi_zswaptran_a.F90 index 46e4a898..8625ea71 100644 --- a/base/comm/internals/psi_zswaptran_a.F90 +++ b/base/comm/internals/psi_zswaptran_a.F90 @@ -110,7 +110,9 @@ subroutine psi_zswaptranm(flag,n,beta,y,desc_a,work,info,data) integer(psb_ipk_), optional :: data ! locals - integer(psb_ipk_) :: ictxt, np, me, icomm, idxs, idxr, err_act, totxch, data_ + type(psb_ctxt_type) :: ictxt + integer(psb_mpk_) :: icomm + integer(psb_ipk_) :: np, me, idxs, idxr, err_act, totxch, data_ integer(psb_ipk_), pointer :: d_idx(:) character(len=20) :: name @@ -172,14 +174,17 @@ subroutine psi_ztranidxm(iictxt,iicomm,flag,n,beta,y,idx,& include 'mpif.h' #endif - integer(psb_ipk_), intent(in) :: iictxt,iicomm,flag,n - integer(psb_ipk_), intent(out) :: info + type(psb_ctxt_type), intent(in) :: iictxt + integer(psb_mpk_), intent(in) :: iicomm + integer(psb_ipk_), intent(in) :: flag,n + integer(psb_ipk_), intent(out) :: info complex(psb_dpk_) :: y(:,:), beta complex(psb_dpk_), target :: work(:) integer(psb_ipk_), intent(in) :: idx(:),totxch,totsnd, totrcv ! locals - integer(psb_mpk_) :: ictxt, icomm, np, me,& + type(psb_ctxt_type) :: ictxt + integer(psb_mpk_) :: icomm, np, me,& & proc_to_comm, p2ptag, p2pstat(mpi_status_size), iret integer(psb_mpk_), allocatable, dimension(:) :: bsdidx, brvidx,& & sdsz, rvsz, prcid, rvhd, sdhd @@ -508,7 +513,7 @@ subroutine psi_ztranidxm(iictxt,iicomm,flag,n,beta,y,idx,& call psb_erractionrestore(err_act) return -9999 call psb_error_handler(iictxt,err_act) +9999 call psb_error_handler(ictxt,err_act) return end subroutine psi_ztranidxm @@ -592,7 +597,9 @@ subroutine psi_zswaptranv(flag,beta,y,desc_a,work,info,data) integer(psb_ipk_), optional :: data ! locals - integer(psb_ipk_) :: ictxt, np, me, icomm, idxs, idxr, totxch, err_act, data_ + type(psb_ctxt_type) :: ictxt + integer(psb_mpk_) :: icomm + integer(psb_ipk_) :: np, me, idxs, idxr, totxch, err_act, data_ integer(psb_ipk_), pointer :: d_idx(:) character(len=20) :: name @@ -664,14 +671,17 @@ subroutine psi_ztranidxv(iictxt,iicomm,flag,beta,y,idx,& include 'mpif.h' #endif - integer(psb_ipk_), intent(in) :: iictxt,iicomm,flag - integer(psb_ipk_), intent(out) :: info + type(psb_ctxt_type), intent(in) :: iictxt + integer(psb_mpk_), intent(in) :: iicomm + integer(psb_ipk_), intent(in) :: flag + integer(psb_ipk_), intent(out) :: info complex(psb_dpk_) :: y(:), beta complex(psb_dpk_), target :: work(:) integer(psb_ipk_), intent(in) :: idx(:),totxch,totsnd, totrcv ! locals - integer(psb_mpk_) :: ictxt, icomm, np, me,& + type(psb_ctxt_type) :: ictxt + integer(psb_mpk_) :: icomm, np, me,& & proc_to_comm, p2ptag, p2pstat(mpi_status_size), iret integer(psb_mpk_), allocatable, dimension(:) :: bsdidx, brvidx,& & sdsz, rvsz, prcid, rvhd, sdhd @@ -996,7 +1006,7 @@ subroutine psi_ztranidxv(iictxt,iicomm,flag,beta,y,idx,& call psb_erractionrestore(err_act) return -9999 call psb_error_handler(iictxt,err_act) +9999 call psb_error_handler(ictxt,err_act) return end subroutine psi_ztranidxv diff --git a/base/comm/psb_cgather.f90 b/base/comm/psb_cgather.f90 index f4ed3f4a..0980d128 100644 --- a/base/comm/psb_cgather.f90 +++ b/base/comm/psb_cgather.f90 @@ -57,7 +57,8 @@ subroutine psb_cgather_vect(globx, locx, desc_a, info, iroot) ! locals - integer(psb_mpk_) :: ictxt, np, me, root, iiroot, icomm, myrank, rootrank + type(psb_ctxt_type) :: ictxt + integer(psb_mpk_) :: np, me, root, iiroot, icomm, myrank, rootrank integer(psb_ipk_) :: ierr(5), err_act, jlx, ilx, lda_locx, lda_globx, i integer(psb_lpk_) :: m, n, k, ilocx, jlocx, idx, iglobx, jglobx complex(psb_spk_), allocatable :: llocx(:) @@ -153,7 +154,7 @@ subroutine psb_cgather_vect(globx, locx, desc_a, info, iroot) call psb_erractionrestore(err_act) return -9999 call psb_error_handler(ione*ictxt,err_act) +9999 call psb_error_handler(ictxt,err_act) return @@ -174,7 +175,8 @@ subroutine psb_cgather_multivect(globx, locx, desc_a, info, iroot) ! locals - integer(psb_mpk_) :: ictxt, np, me, root, iiroot, icomm, myrank, rootrank + type(psb_ctxt_type) :: ictxt + integer(psb_mpk_) :: np, me, root, iiroot, icomm, myrank, rootrank integer(psb_ipk_) :: ierr(5), err_act, jlx, ilx, lda_locx, lda_globx, i integer(psb_lpk_) :: m, n, k, ilocx, jlocx, idx, iglobx, jglobx complex(psb_spk_), allocatable :: llocx(:,:) @@ -269,7 +271,7 @@ subroutine psb_cgather_multivect(globx, locx, desc_a, info, iroot) call psb_erractionrestore(err_act) return -9999 call psb_error_handler(ione*ictxt,err_act) +9999 call psb_error_handler(ictxt,err_act) return diff --git a/base/comm/psb_cgather_a.f90 b/base/comm/psb_cgather_a.f90 index 5f75abd6..ed32bf8c 100644 --- a/base/comm/psb_cgather_a.f90 +++ b/base/comm/psb_cgather_a.f90 @@ -57,12 +57,12 @@ subroutine psb_cgatherm(globx, locx, desc_a, info, iroot) ! locals - integer(psb_mpk_) :: ictxt, np, me, root, iiroot, icomm, myrank, rootrank + type(psb_ctxt_type) :: ictxt + integer(psb_mpk_) :: np, me, root, iiroot, icomm, myrank, rootrank integer(psb_ipk_) :: ierr(5), err_act, lda_locx, lda_globx, lock, globk,& & maxk, k, jlx, ilx, i, j integer(psb_lpk_) :: m, n, ilocx, jlocx, idx, iglobx, jglobx - - character(len=20) :: name, ch_err + character(len=20) :: name, ch_err name='psb_cgatherm' info=psb_success_ @@ -162,7 +162,7 @@ subroutine psb_cgatherm(globx, locx, desc_a, info, iroot) call psb_erractionrestore(err_act) return -9999 call psb_error_handler(ione*ictxt,err_act) +9999 call psb_error_handler(ictxt,err_act) return @@ -231,7 +231,8 @@ subroutine psb_cgatherv(globx, locx, desc_a, info, iroot) ! locals - integer(psb_mpk_) :: ictxt, np, me, root, iiroot, icomm, myrank, rootrank + type(psb_ctxt_type) :: ictxt + integer(psb_mpk_) :: np, me, root, iiroot, icomm, myrank, rootrank integer(psb_ipk_) :: ierr(5), err_act, lda_locx, lda_globx, lock, globk,& & maxk, k, jlx, ilx, i, j integer(psb_lpk_) :: m, n, ilocx, jlocx, idx, iglobx, jglobx @@ -327,7 +328,7 @@ subroutine psb_cgatherv(globx, locx, desc_a, info, iroot) call psb_erractionrestore(err_act) return -9999 call psb_error_handler(ione*ictxt,err_act) +9999 call psb_error_handler(ictxt,err_act) return diff --git a/base/comm/psb_chalo.f90 b/base/comm/psb_chalo.f90 index ad483a51..675c42ef 100644 --- a/base/comm/psb_chalo.f90 +++ b/base/comm/psb_chalo.f90 @@ -65,7 +65,8 @@ subroutine psb_chalo_vect(x,desc_a,info,work,tran,mode,data) character, intent(in), optional :: tran ! locals - integer(psb_ipk_) :: ictxt, np, me, err_act, iix, jjx, & + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me, err_act, iix, jjx, & & nrow, ncol, lldx, imode, liwork,data_ integer(psb_lpk_) :: m, n, ix, ijx complex(psb_spk_),pointer :: iwork(:) @@ -179,7 +180,7 @@ subroutine psb_chalo_vect(x,desc_a,info,work,tran,mode,data) call psb_erractionrestore(err_act) return -9999 call psb_error_handler(ione*ictxt,err_act) +9999 call psb_error_handler(ictxt,err_act) return end subroutine psb_chalo_vect @@ -219,7 +220,8 @@ subroutine psb_chalo_multivect(x,desc_a,info,work,tran,mode,data) character, intent(in), optional :: tran ! locals - integer(psb_ipk_) :: ictxt, np, me, err_act, iix, jjx, & + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me, err_act, iix, jjx, & & nrow, ncol, lldx, imode, liwork,data_ integer(psb_lpk_) :: m, n, ix, ijx complex(psb_spk_),pointer :: iwork(:) @@ -334,7 +336,7 @@ subroutine psb_chalo_multivect(x,desc_a,info,work,tran,mode,data) call psb_erractionrestore(err_act) return -9999 call psb_error_handler(ione*ictxt,err_act) +9999 call psb_error_handler(ictxt,err_act) return end subroutine psb_chalo_multivect diff --git a/base/comm/psb_chalo_a.f90 b/base/comm/psb_chalo_a.f90 index 5f18ebb6..010e152a 100644 --- a/base/comm/psb_chalo_a.f90 +++ b/base/comm/psb_chalo_a.f90 @@ -65,7 +65,8 @@ subroutine psb_chalom(x,desc_a,info,jx,ik,work,tran,mode,data) character, intent(in), optional :: tran ! locals - integer(psb_mpk_) :: ictxt, np, me + type(psb_ctxt_type) :: ictxt + integer(psb_mpk_) :: np, me integer(psb_ipk_) :: err_act, iix, jjx, k, maxk, nrow, imode, i,& & liwork,data_, ldx integer(psb_lpk_) :: m, n, ix, ijx @@ -192,7 +193,7 @@ subroutine psb_chalom(x,desc_a,info,jx,ik,work,tran,mode,data) call psb_erractionrestore(err_act) return -9999 call psb_error_handler(ione*ictxt,err_act) +9999 call psb_error_handler(ictxt,err_act) return end subroutine psb_chalom @@ -266,7 +267,8 @@ subroutine psb_chalov(x,desc_a,info,work,tran,mode,data) character, intent(in), optional :: tran ! locals - integer(psb_mpk_) :: ictxt, np, me + type(psb_ctxt_type) :: ictxt + integer(psb_mpk_) :: np, me integer(psb_ipk_) :: err_act, ldx, iix, jjx, nrow, imode, liwork,data_ integer(psb_lpk_) :: m, n, ix, ijx complex(psb_spk_),pointer :: iwork(:) @@ -373,7 +375,7 @@ subroutine psb_chalov(x,desc_a,info,work,tran,mode,data) call psb_erractionrestore(err_act) return -9999 call psb_error_handler(ione*ictxt,err_act) +9999 call psb_error_handler(ictxt,err_act) return end subroutine psb_chalov diff --git a/base/comm/psb_covrl.f90 b/base/comm/psb_covrl.f90 index 7ac851b6..ba8de110 100644 --- a/base/comm/psb_covrl.f90 +++ b/base/comm/psb_covrl.f90 @@ -75,7 +75,8 @@ subroutine psb_covrl_vect(x,desc_a,info,work,update,mode) integer(psb_ipk_), intent(in), optional :: update,mode ! locals - integer(psb_ipk_) :: ictxt, np, me, err_act, k, iix, jjx, & + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me, err_act, k, iix, jjx, & & nrow, ncol, ldx, liwork, data_, update_, mode_ integer(psb_lpk_) :: m, n, ix, ijx complex(psb_spk_),pointer :: iwork(:) @@ -175,7 +176,7 @@ subroutine psb_covrl_vect(x,desc_a,info,work,update,mode) call psb_erractionrestore(err_act) return -9999 call psb_error_handler(ione*ictxt,err_act) +9999 call psb_error_handler(ictxt,err_act) return end subroutine psb_covrl_vect @@ -224,7 +225,8 @@ subroutine psb_covrl_multivect(x,desc_a,info,work,update,mode) integer(psb_ipk_), intent(in), optional :: update,mode ! locals - integer(psb_ipk_) :: ictxt, np, me, err_act, k, iix, jjx, & + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me, err_act, k, iix, jjx, & & nrow, ncol, ldx, liwork, data_, update_, mode_ integer(psb_lpk_) :: m, n, ix, ijx complex(psb_spk_),pointer :: iwork(:) @@ -326,7 +328,7 @@ subroutine psb_covrl_multivect(x,desc_a,info,work,update,mode) call psb_erractionrestore(err_act) return -9999 call psb_error_handler(ione*ictxt,err_act) +9999 call psb_error_handler(ictxt,err_act) return end subroutine psb_covrl_multivect diff --git a/base/comm/psb_covrl_a.f90 b/base/comm/psb_covrl_a.f90 index 8949b7ed..b661c01e 100644 --- a/base/comm/psb_covrl_a.f90 +++ b/base/comm/psb_covrl_a.f90 @@ -76,7 +76,8 @@ subroutine psb_covrlm(x,desc_a,info,jx,ik,work,update,mode) integer(psb_ipk_), intent(in), optional :: update,jx,ik,mode ! locals - integer(psb_mpk_) :: ictxt, np, me + type(psb_ctxt_type) :: ictxt + integer(psb_mpk_) :: np, me integer(psb_ipk_) :: err_act, iix, jjx, nrow, ncol, k, maxk, update_,& & mode_, liwork, ldx integer(psb_lpk_) :: m, n, ix, ijx @@ -187,7 +188,7 @@ subroutine psb_covrlm(x,desc_a,info,jx,ik,work,update,mode) call psb_erractionrestore(err_act) return -9999 call psb_error_handler(ione*ictxt,err_act) +9999 call psb_error_handler(ictxt,err_act) return end subroutine psb_covrlm @@ -265,7 +266,8 @@ subroutine psb_covrlv(x,desc_a,info,work,update,mode) integer(psb_ipk_), intent(in), optional :: update,mode ! locals - integer(psb_ipk_) :: ictxt, np, me, err_act, iix, jjx, nrow, ncol, & + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me, err_act, iix, jjx, nrow, ncol, & & k, update_, mode_, liwork, ldx integer(psb_lpk_) :: m, n, ix, ijx complex(psb_spk_),pointer :: iwork(:) @@ -368,7 +370,7 @@ subroutine psb_covrlv(x,desc_a,info,work,update,mode) call psb_erractionrestore(err_act) return -9999 call psb_error_handler(ione*ictxt,err_act) +9999 call psb_error_handler(ictxt,err_act) return end subroutine psb_covrlv diff --git a/base/comm/psb_cscatter.F90 b/base/comm/psb_cscatter.F90 index 7ac22a68..288becd1 100644 --- a/base/comm/psb_cscatter.F90 +++ b/base/comm/psb_cscatter.F90 @@ -54,7 +54,8 @@ subroutine psb_cscatter_vect(globx, locx, desc_a, info, root, mold) class(psb_c_base_vect_type), intent(in), optional :: mold ! locals - integer(psb_mpk_) :: ictxt, np, me, icomm, myrank, rootrank + type(psb_ctxt_type) :: ictxt + integer(psb_mpk_) :: np, me, icomm, myrank, rootrank integer(psb_ipk_) :: ierr(5), err_act, m, n, i, j, idx, nrow, iglobx, jglobx,& & ilocx, jlocx, lda_locx, lda_globx, k, pos, ilx, jlx complex(psb_spk_), allocatable :: vlocx(:) @@ -92,7 +93,7 @@ subroutine psb_cscatter_vect(globx, locx, desc_a, info, root, mold) call psb_erractionrestore(err_act) return -9999 call psb_error_handler(ione*ictxt,err_act) +9999 call psb_error_handler(ictxt,err_act) return diff --git a/base/comm/psb_cscatter_a.F90 b/base/comm/psb_cscatter_a.F90 index d16ae980..11f6ad5e 100644 --- a/base/comm/psb_cscatter_a.F90 +++ b/base/comm/psb_cscatter_a.F90 @@ -62,7 +62,8 @@ subroutine psb_cscatterm(globx, locx, desc_a, info, root) ! locals - integer(psb_mpk_) :: ictxt, np, me, iroot, icomm, myrank, rootrank, iam, nlr + type(psb_ctxt_type) :: ictxt + integer(psb_mpk_) :: np, me, iroot, icomm, myrank, rootrank, iam, nlr integer(psb_ipk_) :: ierr(5), err_act, nrow,& & ilocx, jlocx, lda_locx, lda_globx, lock, globk, k, maxk, & & col,pos @@ -235,7 +236,7 @@ subroutine psb_cscatterm(globx, locx, desc_a, info, root) call psb_erractionrestore(err_act) return -9999 call psb_error_handler(ione*ictxt,err_act) +9999 call psb_error_handler(ictxt,err_act) return @@ -306,7 +307,8 @@ subroutine psb_cscatterv(globx, locx, desc_a, info, root) ! locals - integer(psb_mpk_) :: ictxt, np, iam, iroot, iiroot, icomm, myrank, rootrank, nlr + type(psb_ctxt_type) :: ictxt + integer(psb_mpk_) :: np, iam, iroot, iiroot, icomm, myrank, rootrank, nlr integer(psb_ipk_) :: ierr(5), err_act, nrow,& & ilocx, jlocx, lda_locx, lda_globx, k, pos, ilx, jlx integer(psb_lpk_) :: m, n, i, j, idx, iglobx, jglobx @@ -472,7 +474,7 @@ subroutine psb_cscatterv(globx, locx, desc_a, info, root) call psb_erractionrestore(err_act) return -9999 call psb_error_handler(ione*ictxt,err_act) +9999 call psb_error_handler(ictxt,err_act) return diff --git a/base/comm/psb_cspgather.F90 b/base/comm/psb_cspgather.F90 index 72bfa774..e46706d8 100644 --- a/base/comm/psb_cspgather.F90 +++ b/base/comm/psb_cspgather.F90 @@ -67,7 +67,8 @@ subroutine psb_csp_allgather(globa, loca, desc_a, info, root, dupl,keepnum,keep integer(psb_ipk_) :: err_act, dupl_ integer(psb_ipk_) :: ip,naggrm1,naggrp1, i, j, k logical :: keepnum_, keeploc_ - integer(psb_mpk_) :: ictxt,np,me + type(psb_ctxt_type) :: ictxt + integer(psb_mpk_) :: np, me integer(psb_mpk_) :: icomm, minfo, ndx, root_ integer(psb_mpk_), allocatable :: nzbr(:), idisp(:) integer(psb_lpk_), allocatable :: locia(:), locja(:), glbia(:), glbja(:) @@ -216,7 +217,7 @@ subroutine psb_csp_allgather(globa, loca, desc_a, info, root, dupl,keepnum,keep 9999 continue call psb_errpush(info,name) - call psb_error_handler(ione*ictxt,err_act) + call psb_error_handler(ictxt,err_act) return @@ -249,7 +250,8 @@ subroutine psb_lcsp_allgather(globa, loca, desc_a, info, root, dupl,keepnum,kee integer(psb_ipk_) :: err_act, dupl_ integer(psb_ipk_) :: ip,naggrm1,naggrp1, i, j, k, nzl logical :: keepnum_, keeploc_ - integer(psb_mpk_) :: ictxt,np,me + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me integer(psb_mpk_) :: icomm, minfo, ndx, root_ integer(psb_mpk_), allocatable :: nzbr(:), idisp(:) integer(psb_lpk_), allocatable :: lnzbr(:) @@ -388,7 +390,7 @@ subroutine psb_lcsp_allgather(globa, loca, desc_a, info, root, dupl,keepnum,kee 9999 continue call psb_errpush(info,name) - call psb_error_handler(ione*ictxt,err_act) + call psb_error_handler(ictxt,err_act) return @@ -420,7 +422,8 @@ subroutine psb_lclcsp_allgather(globa, loca, desc_a, info, root, dupl,keepnum,k integer(psb_ipk_) :: err_act, dupl_ integer(psb_lpk_) :: ip,naggrm1,naggrp1, i, j, k, nzl logical :: keepnum_, keeploc_ - integer(psb_mpk_) :: ictxt,np,me + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me integer(psb_mpk_) :: icomm, minfo, ndx, root_ integer(psb_mpk_), allocatable :: nzbr(:), idisp(:) integer(psb_lpk_), allocatable :: lnzbr(:) @@ -554,7 +557,7 @@ subroutine psb_lclcsp_allgather(globa, loca, desc_a, info, root, dupl,keepnum,k 9999 continue call psb_errpush(info,name) - call psb_error_handler(ione*ictxt,err_act) + call psb_error_handler(ictxt,err_act) return diff --git a/base/comm/psb_dgather.f90 b/base/comm/psb_dgather.f90 index c767c8ec..d1dc27c1 100644 --- a/base/comm/psb_dgather.f90 +++ b/base/comm/psb_dgather.f90 @@ -57,7 +57,8 @@ subroutine psb_dgather_vect(globx, locx, desc_a, info, iroot) ! locals - integer(psb_mpk_) :: ictxt, np, me, root, iiroot, icomm, myrank, rootrank + type(psb_ctxt_type) :: ictxt + integer(psb_mpk_) :: np, me, root, iiroot, icomm, myrank, rootrank integer(psb_ipk_) :: ierr(5), err_act, jlx, ilx, lda_locx, lda_globx, i integer(psb_lpk_) :: m, n, k, ilocx, jlocx, idx, iglobx, jglobx real(psb_dpk_), allocatable :: llocx(:) @@ -153,7 +154,7 @@ subroutine psb_dgather_vect(globx, locx, desc_a, info, iroot) call psb_erractionrestore(err_act) return -9999 call psb_error_handler(ione*ictxt,err_act) +9999 call psb_error_handler(ictxt,err_act) return @@ -174,7 +175,8 @@ subroutine psb_dgather_multivect(globx, locx, desc_a, info, iroot) ! locals - integer(psb_mpk_) :: ictxt, np, me, root, iiroot, icomm, myrank, rootrank + type(psb_ctxt_type) :: ictxt + integer(psb_mpk_) :: np, me, root, iiroot, icomm, myrank, rootrank integer(psb_ipk_) :: ierr(5), err_act, jlx, ilx, lda_locx, lda_globx, i integer(psb_lpk_) :: m, n, k, ilocx, jlocx, idx, iglobx, jglobx real(psb_dpk_), allocatable :: llocx(:,:) @@ -269,7 +271,7 @@ subroutine psb_dgather_multivect(globx, locx, desc_a, info, iroot) call psb_erractionrestore(err_act) return -9999 call psb_error_handler(ione*ictxt,err_act) +9999 call psb_error_handler(ictxt,err_act) return diff --git a/base/comm/psb_dgather_a.f90 b/base/comm/psb_dgather_a.f90 index 5ae9ed50..5ff78165 100644 --- a/base/comm/psb_dgather_a.f90 +++ b/base/comm/psb_dgather_a.f90 @@ -57,12 +57,12 @@ subroutine psb_dgatherm(globx, locx, desc_a, info, iroot) ! locals - integer(psb_mpk_) :: ictxt, np, me, root, iiroot, icomm, myrank, rootrank + type(psb_ctxt_type) :: ictxt + integer(psb_mpk_) :: np, me, root, iiroot, icomm, myrank, rootrank integer(psb_ipk_) :: ierr(5), err_act, lda_locx, lda_globx, lock, globk,& & maxk, k, jlx, ilx, i, j integer(psb_lpk_) :: m, n, ilocx, jlocx, idx, iglobx, jglobx - - character(len=20) :: name, ch_err + character(len=20) :: name, ch_err name='psb_dgatherm' info=psb_success_ @@ -162,7 +162,7 @@ subroutine psb_dgatherm(globx, locx, desc_a, info, iroot) call psb_erractionrestore(err_act) return -9999 call psb_error_handler(ione*ictxt,err_act) +9999 call psb_error_handler(ictxt,err_act) return @@ -231,7 +231,8 @@ subroutine psb_dgatherv(globx, locx, desc_a, info, iroot) ! locals - integer(psb_mpk_) :: ictxt, np, me, root, iiroot, icomm, myrank, rootrank + type(psb_ctxt_type) :: ictxt + integer(psb_mpk_) :: np, me, root, iiroot, icomm, myrank, rootrank integer(psb_ipk_) :: ierr(5), err_act, lda_locx, lda_globx, lock, globk,& & maxk, k, jlx, ilx, i, j integer(psb_lpk_) :: m, n, ilocx, jlocx, idx, iglobx, jglobx @@ -327,7 +328,7 @@ subroutine psb_dgatherv(globx, locx, desc_a, info, iroot) call psb_erractionrestore(err_act) return -9999 call psb_error_handler(ione*ictxt,err_act) +9999 call psb_error_handler(ictxt,err_act) return diff --git a/base/comm/psb_dhalo.f90 b/base/comm/psb_dhalo.f90 index b5f584dc..65d92dd5 100644 --- a/base/comm/psb_dhalo.f90 +++ b/base/comm/psb_dhalo.f90 @@ -65,7 +65,8 @@ subroutine psb_dhalo_vect(x,desc_a,info,work,tran,mode,data) character, intent(in), optional :: tran ! locals - integer(psb_ipk_) :: ictxt, np, me, err_act, iix, jjx, & + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me, err_act, iix, jjx, & & nrow, ncol, lldx, imode, liwork,data_ integer(psb_lpk_) :: m, n, ix, ijx real(psb_dpk_),pointer :: iwork(:) @@ -179,7 +180,7 @@ subroutine psb_dhalo_vect(x,desc_a,info,work,tran,mode,data) call psb_erractionrestore(err_act) return -9999 call psb_error_handler(ione*ictxt,err_act) +9999 call psb_error_handler(ictxt,err_act) return end subroutine psb_dhalo_vect @@ -219,7 +220,8 @@ subroutine psb_dhalo_multivect(x,desc_a,info,work,tran,mode,data) character, intent(in), optional :: tran ! locals - integer(psb_ipk_) :: ictxt, np, me, err_act, iix, jjx, & + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me, err_act, iix, jjx, & & nrow, ncol, lldx, imode, liwork,data_ integer(psb_lpk_) :: m, n, ix, ijx real(psb_dpk_),pointer :: iwork(:) @@ -334,7 +336,7 @@ subroutine psb_dhalo_multivect(x,desc_a,info,work,tran,mode,data) call psb_erractionrestore(err_act) return -9999 call psb_error_handler(ione*ictxt,err_act) +9999 call psb_error_handler(ictxt,err_act) return end subroutine psb_dhalo_multivect diff --git a/base/comm/psb_dhalo_a.f90 b/base/comm/psb_dhalo_a.f90 index bee4cd18..d1963f09 100644 --- a/base/comm/psb_dhalo_a.f90 +++ b/base/comm/psb_dhalo_a.f90 @@ -65,7 +65,8 @@ subroutine psb_dhalom(x,desc_a,info,jx,ik,work,tran,mode,data) character, intent(in), optional :: tran ! locals - integer(psb_mpk_) :: ictxt, np, me + type(psb_ctxt_type) :: ictxt + integer(psb_mpk_) :: np, me integer(psb_ipk_) :: err_act, iix, jjx, k, maxk, nrow, imode, i,& & liwork,data_, ldx integer(psb_lpk_) :: m, n, ix, ijx @@ -192,7 +193,7 @@ subroutine psb_dhalom(x,desc_a,info,jx,ik,work,tran,mode,data) call psb_erractionrestore(err_act) return -9999 call psb_error_handler(ione*ictxt,err_act) +9999 call psb_error_handler(ictxt,err_act) return end subroutine psb_dhalom @@ -266,7 +267,8 @@ subroutine psb_dhalov(x,desc_a,info,work,tran,mode,data) character, intent(in), optional :: tran ! locals - integer(psb_mpk_) :: ictxt, np, me + type(psb_ctxt_type) :: ictxt + integer(psb_mpk_) :: np, me integer(psb_ipk_) :: err_act, ldx, iix, jjx, nrow, imode, liwork,data_ integer(psb_lpk_) :: m, n, ix, ijx real(psb_dpk_),pointer :: iwork(:) @@ -373,7 +375,7 @@ subroutine psb_dhalov(x,desc_a,info,work,tran,mode,data) call psb_erractionrestore(err_act) return -9999 call psb_error_handler(ione*ictxt,err_act) +9999 call psb_error_handler(ictxt,err_act) return end subroutine psb_dhalov diff --git a/base/comm/psb_dovrl.f90 b/base/comm/psb_dovrl.f90 index 1177be29..2a6dbefe 100644 --- a/base/comm/psb_dovrl.f90 +++ b/base/comm/psb_dovrl.f90 @@ -75,7 +75,8 @@ subroutine psb_dovrl_vect(x,desc_a,info,work,update,mode) integer(psb_ipk_), intent(in), optional :: update,mode ! locals - integer(psb_ipk_) :: ictxt, np, me, err_act, k, iix, jjx, & + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me, err_act, k, iix, jjx, & & nrow, ncol, ldx, liwork, data_, update_, mode_ integer(psb_lpk_) :: m, n, ix, ijx real(psb_dpk_),pointer :: iwork(:) @@ -175,7 +176,7 @@ subroutine psb_dovrl_vect(x,desc_a,info,work,update,mode) call psb_erractionrestore(err_act) return -9999 call psb_error_handler(ione*ictxt,err_act) +9999 call psb_error_handler(ictxt,err_act) return end subroutine psb_dovrl_vect @@ -224,7 +225,8 @@ subroutine psb_dovrl_multivect(x,desc_a,info,work,update,mode) integer(psb_ipk_), intent(in), optional :: update,mode ! locals - integer(psb_ipk_) :: ictxt, np, me, err_act, k, iix, jjx, & + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me, err_act, k, iix, jjx, & & nrow, ncol, ldx, liwork, data_, update_, mode_ integer(psb_lpk_) :: m, n, ix, ijx real(psb_dpk_),pointer :: iwork(:) @@ -326,7 +328,7 @@ subroutine psb_dovrl_multivect(x,desc_a,info,work,update,mode) call psb_erractionrestore(err_act) return -9999 call psb_error_handler(ione*ictxt,err_act) +9999 call psb_error_handler(ictxt,err_act) return end subroutine psb_dovrl_multivect diff --git a/base/comm/psb_dovrl_a.f90 b/base/comm/psb_dovrl_a.f90 index 5ef1738d..7d2821a9 100644 --- a/base/comm/psb_dovrl_a.f90 +++ b/base/comm/psb_dovrl_a.f90 @@ -76,7 +76,8 @@ subroutine psb_dovrlm(x,desc_a,info,jx,ik,work,update,mode) integer(psb_ipk_), intent(in), optional :: update,jx,ik,mode ! locals - integer(psb_mpk_) :: ictxt, np, me + type(psb_ctxt_type) :: ictxt + integer(psb_mpk_) :: np, me integer(psb_ipk_) :: err_act, iix, jjx, nrow, ncol, k, maxk, update_,& & mode_, liwork, ldx integer(psb_lpk_) :: m, n, ix, ijx @@ -187,7 +188,7 @@ subroutine psb_dovrlm(x,desc_a,info,jx,ik,work,update,mode) call psb_erractionrestore(err_act) return -9999 call psb_error_handler(ione*ictxt,err_act) +9999 call psb_error_handler(ictxt,err_act) return end subroutine psb_dovrlm @@ -265,7 +266,8 @@ subroutine psb_dovrlv(x,desc_a,info,work,update,mode) integer(psb_ipk_), intent(in), optional :: update,mode ! locals - integer(psb_ipk_) :: ictxt, np, me, err_act, iix, jjx, nrow, ncol, & + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me, err_act, iix, jjx, nrow, ncol, & & k, update_, mode_, liwork, ldx integer(psb_lpk_) :: m, n, ix, ijx real(psb_dpk_),pointer :: iwork(:) @@ -368,7 +370,7 @@ subroutine psb_dovrlv(x,desc_a,info,work,update,mode) call psb_erractionrestore(err_act) return -9999 call psb_error_handler(ione*ictxt,err_act) +9999 call psb_error_handler(ictxt,err_act) return end subroutine psb_dovrlv diff --git a/base/comm/psb_dscatter.F90 b/base/comm/psb_dscatter.F90 index 157af3c6..5ca8ebaa 100644 --- a/base/comm/psb_dscatter.F90 +++ b/base/comm/psb_dscatter.F90 @@ -54,7 +54,8 @@ subroutine psb_dscatter_vect(globx, locx, desc_a, info, root, mold) class(psb_d_base_vect_type), intent(in), optional :: mold ! locals - integer(psb_mpk_) :: ictxt, np, me, icomm, myrank, rootrank + type(psb_ctxt_type) :: ictxt + integer(psb_mpk_) :: np, me, icomm, myrank, rootrank integer(psb_ipk_) :: ierr(5), err_act, m, n, i, j, idx, nrow, iglobx, jglobx,& & ilocx, jlocx, lda_locx, lda_globx, k, pos, ilx, jlx real(psb_dpk_), allocatable :: vlocx(:) @@ -92,7 +93,7 @@ subroutine psb_dscatter_vect(globx, locx, desc_a, info, root, mold) call psb_erractionrestore(err_act) return -9999 call psb_error_handler(ione*ictxt,err_act) +9999 call psb_error_handler(ictxt,err_act) return diff --git a/base/comm/psb_dscatter_a.F90 b/base/comm/psb_dscatter_a.F90 index e0b39f57..6f09e5e3 100644 --- a/base/comm/psb_dscatter_a.F90 +++ b/base/comm/psb_dscatter_a.F90 @@ -62,7 +62,8 @@ subroutine psb_dscatterm(globx, locx, desc_a, info, root) ! locals - integer(psb_mpk_) :: ictxt, np, me, iroot, icomm, myrank, rootrank, iam, nlr + type(psb_ctxt_type) :: ictxt + integer(psb_mpk_) :: np, me, iroot, icomm, myrank, rootrank, iam, nlr integer(psb_ipk_) :: ierr(5), err_act, nrow,& & ilocx, jlocx, lda_locx, lda_globx, lock, globk, k, maxk, & & col,pos @@ -235,7 +236,7 @@ subroutine psb_dscatterm(globx, locx, desc_a, info, root) call psb_erractionrestore(err_act) return -9999 call psb_error_handler(ione*ictxt,err_act) +9999 call psb_error_handler(ictxt,err_act) return @@ -306,7 +307,8 @@ subroutine psb_dscatterv(globx, locx, desc_a, info, root) ! locals - integer(psb_mpk_) :: ictxt, np, iam, iroot, iiroot, icomm, myrank, rootrank, nlr + type(psb_ctxt_type) :: ictxt + integer(psb_mpk_) :: np, iam, iroot, iiroot, icomm, myrank, rootrank, nlr integer(psb_ipk_) :: ierr(5), err_act, nrow,& & ilocx, jlocx, lda_locx, lda_globx, k, pos, ilx, jlx integer(psb_lpk_) :: m, n, i, j, idx, iglobx, jglobx @@ -472,7 +474,7 @@ subroutine psb_dscatterv(globx, locx, desc_a, info, root) call psb_erractionrestore(err_act) return -9999 call psb_error_handler(ione*ictxt,err_act) +9999 call psb_error_handler(ictxt,err_act) return diff --git a/base/comm/psb_dspgather.F90 b/base/comm/psb_dspgather.F90 index a29ac002..bacf07ab 100644 --- a/base/comm/psb_dspgather.F90 +++ b/base/comm/psb_dspgather.F90 @@ -67,7 +67,8 @@ subroutine psb_dsp_allgather(globa, loca, desc_a, info, root, dupl,keepnum,keep integer(psb_ipk_) :: err_act, dupl_ integer(psb_ipk_) :: ip,naggrm1,naggrp1, i, j, k logical :: keepnum_, keeploc_ - integer(psb_mpk_) :: ictxt,np,me + type(psb_ctxt_type) :: ictxt + integer(psb_mpk_) :: np, me integer(psb_mpk_) :: icomm, minfo, ndx, root_ integer(psb_mpk_), allocatable :: nzbr(:), idisp(:) integer(psb_lpk_), allocatable :: locia(:), locja(:), glbia(:), glbja(:) @@ -216,7 +217,7 @@ subroutine psb_dsp_allgather(globa, loca, desc_a, info, root, dupl,keepnum,keep 9999 continue call psb_errpush(info,name) - call psb_error_handler(ione*ictxt,err_act) + call psb_error_handler(ictxt,err_act) return @@ -249,7 +250,8 @@ subroutine psb_ldsp_allgather(globa, loca, desc_a, info, root, dupl,keepnum,kee integer(psb_ipk_) :: err_act, dupl_ integer(psb_ipk_) :: ip,naggrm1,naggrp1, i, j, k, nzl logical :: keepnum_, keeploc_ - integer(psb_mpk_) :: ictxt,np,me + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me integer(psb_mpk_) :: icomm, minfo, ndx, root_ integer(psb_mpk_), allocatable :: nzbr(:), idisp(:) integer(psb_lpk_), allocatable :: lnzbr(:) @@ -388,7 +390,7 @@ subroutine psb_ldsp_allgather(globa, loca, desc_a, info, root, dupl,keepnum,kee 9999 continue call psb_errpush(info,name) - call psb_error_handler(ione*ictxt,err_act) + call psb_error_handler(ictxt,err_act) return @@ -420,7 +422,8 @@ subroutine psb_ldldsp_allgather(globa, loca, desc_a, info, root, dupl,keepnum,k integer(psb_ipk_) :: err_act, dupl_ integer(psb_lpk_) :: ip,naggrm1,naggrp1, i, j, k, nzl logical :: keepnum_, keeploc_ - integer(psb_mpk_) :: ictxt,np,me + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me integer(psb_mpk_) :: icomm, minfo, ndx, root_ integer(psb_mpk_), allocatable :: nzbr(:), idisp(:) integer(psb_lpk_), allocatable :: lnzbr(:) @@ -554,7 +557,7 @@ subroutine psb_ldldsp_allgather(globa, loca, desc_a, info, root, dupl,keepnum,k 9999 continue call psb_errpush(info,name) - call psb_error_handler(ione*ictxt,err_act) + call psb_error_handler(ictxt,err_act) return diff --git a/base/comm/psb_egather_a.f90 b/base/comm/psb_egather_a.f90 index b910a4f7..4e3e3fe5 100644 --- a/base/comm/psb_egather_a.f90 +++ b/base/comm/psb_egather_a.f90 @@ -57,12 +57,12 @@ subroutine psb_egatherm(globx, locx, desc_a, info, iroot) ! locals - integer(psb_mpk_) :: ictxt, np, me, root, iiroot, icomm, myrank, rootrank + type(psb_ctxt_type) :: ictxt + integer(psb_mpk_) :: np, me, root, iiroot, icomm, myrank, rootrank integer(psb_ipk_) :: ierr(5), err_act, lda_locx, lda_globx, lock, globk,& & maxk, k, jlx, ilx, i, j integer(psb_lpk_) :: m, n, ilocx, jlocx, idx, iglobx, jglobx - - character(len=20) :: name, ch_err + character(len=20) :: name, ch_err name='psb_egatherm' info=psb_success_ @@ -162,7 +162,7 @@ subroutine psb_egatherm(globx, locx, desc_a, info, iroot) call psb_erractionrestore(err_act) return -9999 call psb_error_handler(ione*ictxt,err_act) +9999 call psb_error_handler(ictxt,err_act) return @@ -231,7 +231,8 @@ subroutine psb_egatherv(globx, locx, desc_a, info, iroot) ! locals - integer(psb_mpk_) :: ictxt, np, me, root, iiroot, icomm, myrank, rootrank + type(psb_ctxt_type) :: ictxt + integer(psb_mpk_) :: np, me, root, iiroot, icomm, myrank, rootrank integer(psb_ipk_) :: ierr(5), err_act, lda_locx, lda_globx, lock, globk,& & maxk, k, jlx, ilx, i, j integer(psb_lpk_) :: m, n, ilocx, jlocx, idx, iglobx, jglobx @@ -327,7 +328,7 @@ subroutine psb_egatherv(globx, locx, desc_a, info, iroot) call psb_erractionrestore(err_act) return -9999 call psb_error_handler(ione*ictxt,err_act) +9999 call psb_error_handler(ictxt,err_act) return diff --git a/base/comm/psb_ehalo_a.f90 b/base/comm/psb_ehalo_a.f90 index 42a47a16..b52a2316 100644 --- a/base/comm/psb_ehalo_a.f90 +++ b/base/comm/psb_ehalo_a.f90 @@ -65,7 +65,8 @@ subroutine psb_ehalom(x,desc_a,info,jx,ik,work,tran,mode,data) character, intent(in), optional :: tran ! locals - integer(psb_mpk_) :: ictxt, np, me + type(psb_ctxt_type) :: ictxt + integer(psb_mpk_) :: np, me integer(psb_ipk_) :: err_act, iix, jjx, k, maxk, nrow, imode, i,& & liwork,data_, ldx integer(psb_lpk_) :: m, n, ix, ijx @@ -192,7 +193,7 @@ subroutine psb_ehalom(x,desc_a,info,jx,ik,work,tran,mode,data) call psb_erractionrestore(err_act) return -9999 call psb_error_handler(ione*ictxt,err_act) +9999 call psb_error_handler(ictxt,err_act) return end subroutine psb_ehalom @@ -266,7 +267,8 @@ subroutine psb_ehalov(x,desc_a,info,work,tran,mode,data) character, intent(in), optional :: tran ! locals - integer(psb_mpk_) :: ictxt, np, me + type(psb_ctxt_type) :: ictxt + integer(psb_mpk_) :: np, me integer(psb_ipk_) :: err_act, ldx, iix, jjx, nrow, imode, liwork,data_ integer(psb_lpk_) :: m, n, ix, ijx integer(psb_epk_),pointer :: iwork(:) @@ -373,7 +375,7 @@ subroutine psb_ehalov(x,desc_a,info,work,tran,mode,data) call psb_erractionrestore(err_act) return -9999 call psb_error_handler(ione*ictxt,err_act) +9999 call psb_error_handler(ictxt,err_act) return end subroutine psb_ehalov diff --git a/base/comm/psb_eovrl_a.f90 b/base/comm/psb_eovrl_a.f90 index 4b9372d4..45cac36c 100644 --- a/base/comm/psb_eovrl_a.f90 +++ b/base/comm/psb_eovrl_a.f90 @@ -76,7 +76,8 @@ subroutine psb_eovrlm(x,desc_a,info,jx,ik,work,update,mode) integer(psb_ipk_), intent(in), optional :: update,jx,ik,mode ! locals - integer(psb_mpk_) :: ictxt, np, me + type(psb_ctxt_type) :: ictxt + integer(psb_mpk_) :: np, me integer(psb_ipk_) :: err_act, iix, jjx, nrow, ncol, k, maxk, update_,& & mode_, liwork, ldx integer(psb_lpk_) :: m, n, ix, ijx @@ -187,7 +188,7 @@ subroutine psb_eovrlm(x,desc_a,info,jx,ik,work,update,mode) call psb_erractionrestore(err_act) return -9999 call psb_error_handler(ione*ictxt,err_act) +9999 call psb_error_handler(ictxt,err_act) return end subroutine psb_eovrlm @@ -265,7 +266,8 @@ subroutine psb_eovrlv(x,desc_a,info,work,update,mode) integer(psb_ipk_), intent(in), optional :: update,mode ! locals - integer(psb_ipk_) :: ictxt, np, me, err_act, iix, jjx, nrow, ncol, & + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me, err_act, iix, jjx, nrow, ncol, & & k, update_, mode_, liwork, ldx integer(psb_lpk_) :: m, n, ix, ijx integer(psb_epk_),pointer :: iwork(:) @@ -368,7 +370,7 @@ subroutine psb_eovrlv(x,desc_a,info,work,update,mode) call psb_erractionrestore(err_act) return -9999 call psb_error_handler(ione*ictxt,err_act) +9999 call psb_error_handler(ictxt,err_act) return end subroutine psb_eovrlv diff --git a/base/comm/psb_escatter_a.F90 b/base/comm/psb_escatter_a.F90 index dbb2026f..d07f63ad 100644 --- a/base/comm/psb_escatter_a.F90 +++ b/base/comm/psb_escatter_a.F90 @@ -62,7 +62,8 @@ subroutine psb_escatterm(globx, locx, desc_a, info, root) ! locals - integer(psb_mpk_) :: ictxt, np, me, iroot, icomm, myrank, rootrank, iam, nlr + type(psb_ctxt_type) :: ictxt + integer(psb_mpk_) :: np, me, iroot, icomm, myrank, rootrank, iam, nlr integer(psb_ipk_) :: ierr(5), err_act, nrow,& & ilocx, jlocx, lda_locx, lda_globx, lock, globk, k, maxk, & & col,pos @@ -235,7 +236,7 @@ subroutine psb_escatterm(globx, locx, desc_a, info, root) call psb_erractionrestore(err_act) return -9999 call psb_error_handler(ione*ictxt,err_act) +9999 call psb_error_handler(ictxt,err_act) return @@ -306,7 +307,8 @@ subroutine psb_escatterv(globx, locx, desc_a, info, root) ! locals - integer(psb_mpk_) :: ictxt, np, iam, iroot, iiroot, icomm, myrank, rootrank, nlr + type(psb_ctxt_type) :: ictxt + integer(psb_mpk_) :: np, iam, iroot, iiroot, icomm, myrank, rootrank, nlr integer(psb_ipk_) :: ierr(5), err_act, nrow,& & ilocx, jlocx, lda_locx, lda_globx, k, pos, ilx, jlx integer(psb_lpk_) :: m, n, i, j, idx, iglobx, jglobx @@ -472,7 +474,7 @@ subroutine psb_escatterv(globx, locx, desc_a, info, root) call psb_erractionrestore(err_act) return -9999 call psb_error_handler(ione*ictxt,err_act) +9999 call psb_error_handler(ictxt,err_act) return diff --git a/base/comm/psb_i2gather_a.f90 b/base/comm/psb_i2gather_a.f90 index 9a671ef6..38053808 100644 --- a/base/comm/psb_i2gather_a.f90 +++ b/base/comm/psb_i2gather_a.f90 @@ -57,12 +57,12 @@ subroutine psb_i2gatherm(globx, locx, desc_a, info, iroot) ! locals - integer(psb_mpk_) :: ictxt, np, me, root, iiroot, icomm, myrank, rootrank + type(psb_ctxt_type) :: ictxt + integer(psb_mpk_) :: np, me, root, iiroot, icomm, myrank, rootrank integer(psb_ipk_) :: ierr(5), err_act, lda_locx, lda_globx, lock, globk,& & maxk, k, jlx, ilx, i, j integer(psb_lpk_) :: m, n, ilocx, jlocx, idx, iglobx, jglobx - - character(len=20) :: name, ch_err + character(len=20) :: name, ch_err name='psb_i2gatherm' info=psb_success_ @@ -162,7 +162,7 @@ subroutine psb_i2gatherm(globx, locx, desc_a, info, iroot) call psb_erractionrestore(err_act) return -9999 call psb_error_handler(ione*ictxt,err_act) +9999 call psb_error_handler(ictxt,err_act) return @@ -231,7 +231,8 @@ subroutine psb_i2gatherv(globx, locx, desc_a, info, iroot) ! locals - integer(psb_mpk_) :: ictxt, np, me, root, iiroot, icomm, myrank, rootrank + type(psb_ctxt_type) :: ictxt + integer(psb_mpk_) :: np, me, root, iiroot, icomm, myrank, rootrank integer(psb_ipk_) :: ierr(5), err_act, lda_locx, lda_globx, lock, globk,& & maxk, k, jlx, ilx, i, j integer(psb_lpk_) :: m, n, ilocx, jlocx, idx, iglobx, jglobx @@ -327,7 +328,7 @@ subroutine psb_i2gatherv(globx, locx, desc_a, info, iroot) call psb_erractionrestore(err_act) return -9999 call psb_error_handler(ione*ictxt,err_act) +9999 call psb_error_handler(ictxt,err_act) return diff --git a/base/comm/psb_i2halo_a.f90 b/base/comm/psb_i2halo_a.f90 index f9c17fa5..6e0fefe0 100644 --- a/base/comm/psb_i2halo_a.f90 +++ b/base/comm/psb_i2halo_a.f90 @@ -65,7 +65,8 @@ subroutine psb_i2halom(x,desc_a,info,jx,ik,work,tran,mode,data) character, intent(in), optional :: tran ! locals - integer(psb_mpk_) :: ictxt, np, me + type(psb_ctxt_type) :: ictxt + integer(psb_mpk_) :: np, me integer(psb_ipk_) :: err_act, iix, jjx, k, maxk, nrow, imode, i,& & liwork,data_, ldx integer(psb_lpk_) :: m, n, ix, ijx @@ -192,7 +193,7 @@ subroutine psb_i2halom(x,desc_a,info,jx,ik,work,tran,mode,data) call psb_erractionrestore(err_act) return -9999 call psb_error_handler(ione*ictxt,err_act) +9999 call psb_error_handler(ictxt,err_act) return end subroutine psb_i2halom @@ -266,7 +267,8 @@ subroutine psb_i2halov(x,desc_a,info,work,tran,mode,data) character, intent(in), optional :: tran ! locals - integer(psb_mpk_) :: ictxt, np, me + type(psb_ctxt_type) :: ictxt + integer(psb_mpk_) :: np, me integer(psb_ipk_) :: err_act, ldx, iix, jjx, nrow, imode, liwork,data_ integer(psb_lpk_) :: m, n, ix, ijx integer(psb_i2pk_),pointer :: iwork(:) @@ -373,7 +375,7 @@ subroutine psb_i2halov(x,desc_a,info,work,tran,mode,data) call psb_erractionrestore(err_act) return -9999 call psb_error_handler(ione*ictxt,err_act) +9999 call psb_error_handler(ictxt,err_act) return end subroutine psb_i2halov diff --git a/base/comm/psb_i2ovrl_a.f90 b/base/comm/psb_i2ovrl_a.f90 index 8d056e39..1cd189c8 100644 --- a/base/comm/psb_i2ovrl_a.f90 +++ b/base/comm/psb_i2ovrl_a.f90 @@ -76,7 +76,8 @@ subroutine psb_i2ovrlm(x,desc_a,info,jx,ik,work,update,mode) integer(psb_ipk_), intent(in), optional :: update,jx,ik,mode ! locals - integer(psb_mpk_) :: ictxt, np, me + type(psb_ctxt_type) :: ictxt + integer(psb_mpk_) :: np, me integer(psb_ipk_) :: err_act, iix, jjx, nrow, ncol, k, maxk, update_,& & mode_, liwork, ldx integer(psb_lpk_) :: m, n, ix, ijx @@ -187,7 +188,7 @@ subroutine psb_i2ovrlm(x,desc_a,info,jx,ik,work,update,mode) call psb_erractionrestore(err_act) return -9999 call psb_error_handler(ione*ictxt,err_act) +9999 call psb_error_handler(ictxt,err_act) return end subroutine psb_i2ovrlm @@ -265,7 +266,8 @@ subroutine psb_i2ovrlv(x,desc_a,info,work,update,mode) integer(psb_ipk_), intent(in), optional :: update,mode ! locals - integer(psb_ipk_) :: ictxt, np, me, err_act, iix, jjx, nrow, ncol, & + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me, err_act, iix, jjx, nrow, ncol, & & k, update_, mode_, liwork, ldx integer(psb_lpk_) :: m, n, ix, ijx integer(psb_i2pk_),pointer :: iwork(:) @@ -368,7 +370,7 @@ subroutine psb_i2ovrlv(x,desc_a,info,work,update,mode) call psb_erractionrestore(err_act) return -9999 call psb_error_handler(ione*ictxt,err_act) +9999 call psb_error_handler(ictxt,err_act) return end subroutine psb_i2ovrlv diff --git a/base/comm/psb_i2scatter_a.F90 b/base/comm/psb_i2scatter_a.F90 index 4a72458e..3a6ba142 100644 --- a/base/comm/psb_i2scatter_a.F90 +++ b/base/comm/psb_i2scatter_a.F90 @@ -62,7 +62,8 @@ subroutine psb_i2scatterm(globx, locx, desc_a, info, root) ! locals - integer(psb_mpk_) :: ictxt, np, me, iroot, icomm, myrank, rootrank, iam, nlr + type(psb_ctxt_type) :: ictxt + integer(psb_mpk_) :: np, me, iroot, icomm, myrank, rootrank, iam, nlr integer(psb_ipk_) :: ierr(5), err_act, nrow,& & ilocx, jlocx, lda_locx, lda_globx, lock, globk, k, maxk, & & col,pos @@ -235,7 +236,7 @@ subroutine psb_i2scatterm(globx, locx, desc_a, info, root) call psb_erractionrestore(err_act) return -9999 call psb_error_handler(ione*ictxt,err_act) +9999 call psb_error_handler(ictxt,err_act) return @@ -306,7 +307,8 @@ subroutine psb_i2scatterv(globx, locx, desc_a, info, root) ! locals - integer(psb_mpk_) :: ictxt, np, iam, iroot, iiroot, icomm, myrank, rootrank, nlr + type(psb_ctxt_type) :: ictxt + integer(psb_mpk_) :: np, iam, iroot, iiroot, icomm, myrank, rootrank, nlr integer(psb_ipk_) :: ierr(5), err_act, nrow,& & ilocx, jlocx, lda_locx, lda_globx, k, pos, ilx, jlx integer(psb_lpk_) :: m, n, i, j, idx, iglobx, jglobx @@ -472,7 +474,7 @@ subroutine psb_i2scatterv(globx, locx, desc_a, info, root) call psb_erractionrestore(err_act) return -9999 call psb_error_handler(ione*ictxt,err_act) +9999 call psb_error_handler(ictxt,err_act) return diff --git a/base/comm/psb_igather.f90 b/base/comm/psb_igather.f90 index 48a4f2fe..ec815de4 100644 --- a/base/comm/psb_igather.f90 +++ b/base/comm/psb_igather.f90 @@ -57,7 +57,8 @@ subroutine psb_igather_vect(globx, locx, desc_a, info, iroot) ! locals - integer(psb_mpk_) :: ictxt, np, me, root, iiroot, icomm, myrank, rootrank + type(psb_ctxt_type) :: ictxt + integer(psb_mpk_) :: np, me, root, iiroot, icomm, myrank, rootrank integer(psb_ipk_) :: ierr(5), err_act, jlx, ilx, lda_locx, lda_globx, i integer(psb_lpk_) :: m, n, k, ilocx, jlocx, idx, iglobx, jglobx integer(psb_ipk_), allocatable :: llocx(:) @@ -153,7 +154,7 @@ subroutine psb_igather_vect(globx, locx, desc_a, info, iroot) call psb_erractionrestore(err_act) return -9999 call psb_error_handler(ione*ictxt,err_act) +9999 call psb_error_handler(ictxt,err_act) return @@ -174,7 +175,8 @@ subroutine psb_igather_multivect(globx, locx, desc_a, info, iroot) ! locals - integer(psb_mpk_) :: ictxt, np, me, root, iiroot, icomm, myrank, rootrank + type(psb_ctxt_type) :: ictxt + integer(psb_mpk_) :: np, me, root, iiroot, icomm, myrank, rootrank integer(psb_ipk_) :: ierr(5), err_act, jlx, ilx, lda_locx, lda_globx, i integer(psb_lpk_) :: m, n, k, ilocx, jlocx, idx, iglobx, jglobx integer(psb_ipk_), allocatable :: llocx(:,:) @@ -269,7 +271,7 @@ subroutine psb_igather_multivect(globx, locx, desc_a, info, iroot) call psb_erractionrestore(err_act) return -9999 call psb_error_handler(ione*ictxt,err_act) +9999 call psb_error_handler(ictxt,err_act) return diff --git a/base/comm/psb_ihalo.f90 b/base/comm/psb_ihalo.f90 index 4bccfc10..61132bc5 100644 --- a/base/comm/psb_ihalo.f90 +++ b/base/comm/psb_ihalo.f90 @@ -65,7 +65,8 @@ subroutine psb_ihalo_vect(x,desc_a,info,work,tran,mode,data) character, intent(in), optional :: tran ! locals - integer(psb_ipk_) :: ictxt, np, me, err_act, iix, jjx, & + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me, err_act, iix, jjx, & & nrow, ncol, lldx, imode, liwork,data_ integer(psb_lpk_) :: m, n, ix, ijx integer(psb_ipk_),pointer :: iwork(:) @@ -179,7 +180,7 @@ subroutine psb_ihalo_vect(x,desc_a,info,work,tran,mode,data) call psb_erractionrestore(err_act) return -9999 call psb_error_handler(ione*ictxt,err_act) +9999 call psb_error_handler(ictxt,err_act) return end subroutine psb_ihalo_vect @@ -219,7 +220,8 @@ subroutine psb_ihalo_multivect(x,desc_a,info,work,tran,mode,data) character, intent(in), optional :: tran ! locals - integer(psb_ipk_) :: ictxt, np, me, err_act, iix, jjx, & + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me, err_act, iix, jjx, & & nrow, ncol, lldx, imode, liwork,data_ integer(psb_lpk_) :: m, n, ix, ijx integer(psb_ipk_),pointer :: iwork(:) @@ -334,7 +336,7 @@ subroutine psb_ihalo_multivect(x,desc_a,info,work,tran,mode,data) call psb_erractionrestore(err_act) return -9999 call psb_error_handler(ione*ictxt,err_act) +9999 call psb_error_handler(ictxt,err_act) return end subroutine psb_ihalo_multivect diff --git a/base/comm/psb_iovrl.f90 b/base/comm/psb_iovrl.f90 index 06f720b0..7ca6068e 100644 --- a/base/comm/psb_iovrl.f90 +++ b/base/comm/psb_iovrl.f90 @@ -75,7 +75,8 @@ subroutine psb_iovrl_vect(x,desc_a,info,work,update,mode) integer(psb_ipk_), intent(in), optional :: update,mode ! locals - integer(psb_ipk_) :: ictxt, np, me, err_act, k, iix, jjx, & + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me, err_act, k, iix, jjx, & & nrow, ncol, ldx, liwork, data_, update_, mode_ integer(psb_lpk_) :: m, n, ix, ijx integer(psb_ipk_),pointer :: iwork(:) @@ -175,7 +176,7 @@ subroutine psb_iovrl_vect(x,desc_a,info,work,update,mode) call psb_erractionrestore(err_act) return -9999 call psb_error_handler(ione*ictxt,err_act) +9999 call psb_error_handler(ictxt,err_act) return end subroutine psb_iovrl_vect @@ -224,7 +225,8 @@ subroutine psb_iovrl_multivect(x,desc_a,info,work,update,mode) integer(psb_ipk_), intent(in), optional :: update,mode ! locals - integer(psb_ipk_) :: ictxt, np, me, err_act, k, iix, jjx, & + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me, err_act, k, iix, jjx, & & nrow, ncol, ldx, liwork, data_, update_, mode_ integer(psb_lpk_) :: m, n, ix, ijx integer(psb_ipk_),pointer :: iwork(:) @@ -326,7 +328,7 @@ subroutine psb_iovrl_multivect(x,desc_a,info,work,update,mode) call psb_erractionrestore(err_act) return -9999 call psb_error_handler(ione*ictxt,err_act) +9999 call psb_error_handler(ictxt,err_act) return end subroutine psb_iovrl_multivect diff --git a/base/comm/psb_iscatter.F90 b/base/comm/psb_iscatter.F90 index f159d5b4..94dec0b0 100644 --- a/base/comm/psb_iscatter.F90 +++ b/base/comm/psb_iscatter.F90 @@ -54,7 +54,8 @@ subroutine psb_iscatter_vect(globx, locx, desc_a, info, root, mold) class(psb_i_base_vect_type), intent(in), optional :: mold ! locals - integer(psb_mpk_) :: ictxt, np, me, icomm, myrank, rootrank + type(psb_ctxt_type) :: ictxt + integer(psb_mpk_) :: np, me, icomm, myrank, rootrank integer(psb_ipk_) :: ierr(5), err_act, m, n, i, j, idx, nrow, iglobx, jglobx,& & ilocx, jlocx, lda_locx, lda_globx, k, pos, ilx, jlx integer(psb_ipk_), allocatable :: vlocx(:) @@ -92,7 +93,7 @@ subroutine psb_iscatter_vect(globx, locx, desc_a, info, root, mold) call psb_erractionrestore(err_act) return -9999 call psb_error_handler(ione*ictxt,err_act) +9999 call psb_error_handler(ictxt,err_act) return diff --git a/base/comm/psb_ispgather.F90 b/base/comm/psb_ispgather.F90 index ed723289..51d4a0de 100644 --- a/base/comm/psb_ispgather.F90 +++ b/base/comm/psb_ispgather.F90 @@ -67,7 +67,8 @@ subroutine psb_isp_allgather(globa, loca, desc_a, info, root, dupl,keepnum,keep integer(psb_ipk_) :: err_act, dupl_ integer(psb_ipk_) :: ip,naggrm1,naggrp1, i, j, k logical :: keepnum_, keeploc_ - integer(psb_mpk_) :: ictxt,np,me + type(psb_ctxt_type) :: ictxt + integer(psb_mpk_) :: np, me integer(psb_mpk_) :: icomm, minfo, ndx, root_ integer(psb_mpk_), allocatable :: nzbr(:), idisp(:) integer(psb_lpk_), allocatable :: locia(:), locja(:), glbia(:), glbja(:) @@ -216,7 +217,7 @@ subroutine psb_isp_allgather(globa, loca, desc_a, info, root, dupl,keepnum,keep 9999 continue call psb_errpush(info,name) - call psb_error_handler(ione*ictxt,err_act) + call psb_error_handler(ictxt,err_act) return @@ -249,7 +250,8 @@ subroutine psb_@LX@sp_allgather(globa, loca, desc_a, info, root, dupl,keepnum,k integer(psb_ipk_) :: err_act, dupl_ integer(psb_ipk_) :: ip,naggrm1,naggrp1, i, j, k, nzl logical :: keepnum_, keeploc_ - integer(psb_mpk_) :: ictxt,np,me + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me integer(psb_mpk_) :: icomm, minfo, ndx, root_ integer(psb_mpk_), allocatable :: nzbr(:), idisp(:) integer(psb_lpk_), allocatable :: lnzbr(:) @@ -388,7 +390,7 @@ subroutine psb_@LX@sp_allgather(globa, loca, desc_a, info, root, dupl,keepnum,k 9999 continue call psb_errpush(info,name) - call psb_error_handler(ione*ictxt,err_act) + call psb_error_handler(ictxt,err_act) return @@ -420,7 +422,8 @@ subroutine psb_@LX@@LX@sp_allgather(globa, loca, desc_a, info, root, dupl,keepn integer(psb_ipk_) :: err_act, dupl_ integer(psb_lpk_) :: ip,naggrm1,naggrp1, i, j, k, nzl logical :: keepnum_, keeploc_ - integer(psb_mpk_) :: ictxt,np,me + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me integer(psb_mpk_) :: icomm, minfo, ndx, root_ integer(psb_mpk_), allocatable :: nzbr(:), idisp(:) integer(psb_lpk_), allocatable :: lnzbr(:) @@ -554,7 +557,7 @@ subroutine psb_@LX@@LX@sp_allgather(globa, loca, desc_a, info, root, dupl,keepn 9999 continue call psb_errpush(info,name) - call psb_error_handler(ione*ictxt,err_act) + call psb_error_handler(ictxt,err_act) return diff --git a/base/comm/psb_lgather.f90 b/base/comm/psb_lgather.f90 index 1f6f448f..4f7555b0 100644 --- a/base/comm/psb_lgather.f90 +++ b/base/comm/psb_lgather.f90 @@ -57,7 +57,8 @@ subroutine psb_lgather_vect(globx, locx, desc_a, info, iroot) ! locals - integer(psb_mpk_) :: ictxt, np, me, root, iiroot, icomm, myrank, rootrank + type(psb_ctxt_type) :: ictxt + integer(psb_mpk_) :: np, me, root, iiroot, icomm, myrank, rootrank integer(psb_ipk_) :: ierr(5), err_act, jlx, ilx, lda_locx, lda_globx, i integer(psb_lpk_) :: m, n, k, ilocx, jlocx, idx, iglobx, jglobx integer(psb_lpk_), allocatable :: llocx(:) @@ -153,7 +154,7 @@ subroutine psb_lgather_vect(globx, locx, desc_a, info, iroot) call psb_erractionrestore(err_act) return -9999 call psb_error_handler(ione*ictxt,err_act) +9999 call psb_error_handler(ictxt,err_act) return @@ -174,7 +175,8 @@ subroutine psb_lgather_multivect(globx, locx, desc_a, info, iroot) ! locals - integer(psb_mpk_) :: ictxt, np, me, root, iiroot, icomm, myrank, rootrank + type(psb_ctxt_type) :: ictxt + integer(psb_mpk_) :: np, me, root, iiroot, icomm, myrank, rootrank integer(psb_ipk_) :: ierr(5), err_act, jlx, ilx, lda_locx, lda_globx, i integer(psb_lpk_) :: m, n, k, ilocx, jlocx, idx, iglobx, jglobx integer(psb_lpk_), allocatable :: llocx(:,:) @@ -269,7 +271,7 @@ subroutine psb_lgather_multivect(globx, locx, desc_a, info, iroot) call psb_erractionrestore(err_act) return -9999 call psb_error_handler(ione*ictxt,err_act) +9999 call psb_error_handler(ictxt,err_act) return diff --git a/base/comm/psb_lhalo.f90 b/base/comm/psb_lhalo.f90 index b35613a1..ae2235e7 100644 --- a/base/comm/psb_lhalo.f90 +++ b/base/comm/psb_lhalo.f90 @@ -65,7 +65,8 @@ subroutine psb_lhalo_vect(x,desc_a,info,work,tran,mode,data) character, intent(in), optional :: tran ! locals - integer(psb_ipk_) :: ictxt, np, me, err_act, iix, jjx, & + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me, err_act, iix, jjx, & & nrow, ncol, lldx, imode, liwork,data_ integer(psb_lpk_) :: m, n, ix, ijx integer(psb_lpk_),pointer :: iwork(:) @@ -179,7 +180,7 @@ subroutine psb_lhalo_vect(x,desc_a,info,work,tran,mode,data) call psb_erractionrestore(err_act) return -9999 call psb_error_handler(ione*ictxt,err_act) +9999 call psb_error_handler(ictxt,err_act) return end subroutine psb_lhalo_vect @@ -219,7 +220,8 @@ subroutine psb_lhalo_multivect(x,desc_a,info,work,tran,mode,data) character, intent(in), optional :: tran ! locals - integer(psb_ipk_) :: ictxt, np, me, err_act, iix, jjx, & + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me, err_act, iix, jjx, & & nrow, ncol, lldx, imode, liwork,data_ integer(psb_lpk_) :: m, n, ix, ijx integer(psb_lpk_),pointer :: iwork(:) @@ -334,7 +336,7 @@ subroutine psb_lhalo_multivect(x,desc_a,info,work,tran,mode,data) call psb_erractionrestore(err_act) return -9999 call psb_error_handler(ione*ictxt,err_act) +9999 call psb_error_handler(ictxt,err_act) return end subroutine psb_lhalo_multivect diff --git a/base/comm/psb_lovrl.f90 b/base/comm/psb_lovrl.f90 index bb3ece65..38572d33 100644 --- a/base/comm/psb_lovrl.f90 +++ b/base/comm/psb_lovrl.f90 @@ -75,7 +75,8 @@ subroutine psb_lovrl_vect(x,desc_a,info,work,update,mode) integer(psb_ipk_), intent(in), optional :: update,mode ! locals - integer(psb_ipk_) :: ictxt, np, me, err_act, k, iix, jjx, & + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me, err_act, k, iix, jjx, & & nrow, ncol, ldx, liwork, data_, update_, mode_ integer(psb_lpk_) :: m, n, ix, ijx integer(psb_lpk_),pointer :: iwork(:) @@ -175,7 +176,7 @@ subroutine psb_lovrl_vect(x,desc_a,info,work,update,mode) call psb_erractionrestore(err_act) return -9999 call psb_error_handler(ione*ictxt,err_act) +9999 call psb_error_handler(ictxt,err_act) return end subroutine psb_lovrl_vect @@ -224,7 +225,8 @@ subroutine psb_lovrl_multivect(x,desc_a,info,work,update,mode) integer(psb_ipk_), intent(in), optional :: update,mode ! locals - integer(psb_ipk_) :: ictxt, np, me, err_act, k, iix, jjx, & + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me, err_act, k, iix, jjx, & & nrow, ncol, ldx, liwork, data_, update_, mode_ integer(psb_lpk_) :: m, n, ix, ijx integer(psb_lpk_),pointer :: iwork(:) @@ -326,7 +328,7 @@ subroutine psb_lovrl_multivect(x,desc_a,info,work,update,mode) call psb_erractionrestore(err_act) return -9999 call psb_error_handler(ione*ictxt,err_act) +9999 call psb_error_handler(ictxt,err_act) return end subroutine psb_lovrl_multivect diff --git a/base/comm/psb_lscatter.F90 b/base/comm/psb_lscatter.F90 index ceb60e4f..d161967a 100644 --- a/base/comm/psb_lscatter.F90 +++ b/base/comm/psb_lscatter.F90 @@ -54,7 +54,8 @@ subroutine psb_lscatter_vect(globx, locx, desc_a, info, root, mold) class(psb_l_base_vect_type), intent(in), optional :: mold ! locals - integer(psb_mpk_) :: ictxt, np, me, icomm, myrank, rootrank + type(psb_ctxt_type) :: ictxt + integer(psb_mpk_) :: np, me, icomm, myrank, rootrank integer(psb_ipk_) :: ierr(5), err_act, m, n, i, j, idx, nrow, iglobx, jglobx,& & ilocx, jlocx, lda_locx, lda_globx, k, pos, ilx, jlx integer(psb_lpk_), allocatable :: vlocx(:) @@ -92,7 +93,7 @@ subroutine psb_lscatter_vect(globx, locx, desc_a, info, root, mold) call psb_erractionrestore(err_act) return -9999 call psb_error_handler(ione*ictxt,err_act) +9999 call psb_error_handler(ictxt,err_act) return diff --git a/base/comm/psb_lspgather.F90 b/base/comm/psb_lspgather.F90 index 5d2d33e9..6d5e6182 100644 --- a/base/comm/psb_lspgather.F90 +++ b/base/comm/psb_lspgather.F90 @@ -67,7 +67,8 @@ subroutine psb_lsp_allgather(globa, loca, desc_a, info, root, dupl,keepnum,keep integer(psb_ipk_) :: err_act, dupl_ integer(psb_ipk_) :: ip,naggrm1,naggrp1, i, j, k logical :: keepnum_, keeploc_ - integer(psb_mpk_) :: ictxt,np,me + type(psb_ctxt_type) :: ictxt + integer(psb_mpk_) :: np, me integer(psb_mpk_) :: icomm, minfo, ndx, root_ integer(psb_mpk_), allocatable :: nzbr(:), idisp(:) integer(psb_lpk_), allocatable :: locia(:), locja(:), glbia(:), glbja(:) @@ -216,7 +217,7 @@ subroutine psb_lsp_allgather(globa, loca, desc_a, info, root, dupl,keepnum,keep 9999 continue call psb_errpush(info,name) - call psb_error_handler(ione*ictxt,err_act) + call psb_error_handler(ictxt,err_act) return @@ -249,7 +250,8 @@ subroutine psb_@LX@sp_allgather(globa, loca, desc_a, info, root, dupl,keepnum,k integer(psb_ipk_) :: err_act, dupl_ integer(psb_ipk_) :: ip,naggrm1,naggrp1, i, j, k, nzl logical :: keepnum_, keeploc_ - integer(psb_mpk_) :: ictxt,np,me + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me integer(psb_mpk_) :: icomm, minfo, ndx, root_ integer(psb_mpk_), allocatable :: nzbr(:), idisp(:) integer(psb_lpk_), allocatable :: lnzbr(:) @@ -388,7 +390,7 @@ subroutine psb_@LX@sp_allgather(globa, loca, desc_a, info, root, dupl,keepnum,k 9999 continue call psb_errpush(info,name) - call psb_error_handler(ione*ictxt,err_act) + call psb_error_handler(ictxt,err_act) return @@ -420,7 +422,8 @@ subroutine psb_@LX@@LX@sp_allgather(globa, loca, desc_a, info, root, dupl,keepn integer(psb_ipk_) :: err_act, dupl_ integer(psb_lpk_) :: ip,naggrm1,naggrp1, i, j, k, nzl logical :: keepnum_, keeploc_ - integer(psb_mpk_) :: ictxt,np,me + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me integer(psb_mpk_) :: icomm, minfo, ndx, root_ integer(psb_mpk_), allocatable :: nzbr(:), idisp(:) integer(psb_lpk_), allocatable :: lnzbr(:) @@ -554,7 +557,7 @@ subroutine psb_@LX@@LX@sp_allgather(globa, loca, desc_a, info, root, dupl,keepn 9999 continue call psb_errpush(info,name) - call psb_error_handler(ione*ictxt,err_act) + call psb_error_handler(ictxt,err_act) return diff --git a/base/comm/psb_mgather_a.f90 b/base/comm/psb_mgather_a.f90 index 251e06c9..af3136ca 100644 --- a/base/comm/psb_mgather_a.f90 +++ b/base/comm/psb_mgather_a.f90 @@ -57,12 +57,12 @@ subroutine psb_mgatherm(globx, locx, desc_a, info, iroot) ! locals - integer(psb_mpk_) :: ictxt, np, me, root, iiroot, icomm, myrank, rootrank + type(psb_ctxt_type) :: ictxt + integer(psb_mpk_) :: np, me, root, iiroot, icomm, myrank, rootrank integer(psb_ipk_) :: ierr(5), err_act, lda_locx, lda_globx, lock, globk,& & maxk, k, jlx, ilx, i, j integer(psb_lpk_) :: m, n, ilocx, jlocx, idx, iglobx, jglobx - - character(len=20) :: name, ch_err + character(len=20) :: name, ch_err name='psb_mgatherm' info=psb_success_ @@ -162,7 +162,7 @@ subroutine psb_mgatherm(globx, locx, desc_a, info, iroot) call psb_erractionrestore(err_act) return -9999 call psb_error_handler(ione*ictxt,err_act) +9999 call psb_error_handler(ictxt,err_act) return @@ -231,7 +231,8 @@ subroutine psb_mgatherv(globx, locx, desc_a, info, iroot) ! locals - integer(psb_mpk_) :: ictxt, np, me, root, iiroot, icomm, myrank, rootrank + type(psb_ctxt_type) :: ictxt + integer(psb_mpk_) :: np, me, root, iiroot, icomm, myrank, rootrank integer(psb_ipk_) :: ierr(5), err_act, lda_locx, lda_globx, lock, globk,& & maxk, k, jlx, ilx, i, j integer(psb_lpk_) :: m, n, ilocx, jlocx, idx, iglobx, jglobx @@ -327,7 +328,7 @@ subroutine psb_mgatherv(globx, locx, desc_a, info, iroot) call psb_erractionrestore(err_act) return -9999 call psb_error_handler(ione*ictxt,err_act) +9999 call psb_error_handler(ictxt,err_act) return diff --git a/base/comm/psb_mhalo_a.f90 b/base/comm/psb_mhalo_a.f90 index f6745cd4..8b9502df 100644 --- a/base/comm/psb_mhalo_a.f90 +++ b/base/comm/psb_mhalo_a.f90 @@ -65,7 +65,8 @@ subroutine psb_mhalom(x,desc_a,info,jx,ik,work,tran,mode,data) character, intent(in), optional :: tran ! locals - integer(psb_mpk_) :: ictxt, np, me + type(psb_ctxt_type) :: ictxt + integer(psb_mpk_) :: np, me integer(psb_ipk_) :: err_act, iix, jjx, k, maxk, nrow, imode, i,& & liwork,data_, ldx integer(psb_lpk_) :: m, n, ix, ijx @@ -192,7 +193,7 @@ subroutine psb_mhalom(x,desc_a,info,jx,ik,work,tran,mode,data) call psb_erractionrestore(err_act) return -9999 call psb_error_handler(ione*ictxt,err_act) +9999 call psb_error_handler(ictxt,err_act) return end subroutine psb_mhalom @@ -266,7 +267,8 @@ subroutine psb_mhalov(x,desc_a,info,work,tran,mode,data) character, intent(in), optional :: tran ! locals - integer(psb_mpk_) :: ictxt, np, me + type(psb_ctxt_type) :: ictxt + integer(psb_mpk_) :: np, me integer(psb_ipk_) :: err_act, ldx, iix, jjx, nrow, imode, liwork,data_ integer(psb_lpk_) :: m, n, ix, ijx integer(psb_mpk_),pointer :: iwork(:) @@ -373,7 +375,7 @@ subroutine psb_mhalov(x,desc_a,info,work,tran,mode,data) call psb_erractionrestore(err_act) return -9999 call psb_error_handler(ione*ictxt,err_act) +9999 call psb_error_handler(ictxt,err_act) return end subroutine psb_mhalov diff --git a/base/comm/psb_movrl_a.f90 b/base/comm/psb_movrl_a.f90 index 9d8beae9..39d4d6bd 100644 --- a/base/comm/psb_movrl_a.f90 +++ b/base/comm/psb_movrl_a.f90 @@ -76,7 +76,8 @@ subroutine psb_movrlm(x,desc_a,info,jx,ik,work,update,mode) integer(psb_ipk_), intent(in), optional :: update,jx,ik,mode ! locals - integer(psb_mpk_) :: ictxt, np, me + type(psb_ctxt_type) :: ictxt + integer(psb_mpk_) :: np, me integer(psb_ipk_) :: err_act, iix, jjx, nrow, ncol, k, maxk, update_,& & mode_, liwork, ldx integer(psb_lpk_) :: m, n, ix, ijx @@ -187,7 +188,7 @@ subroutine psb_movrlm(x,desc_a,info,jx,ik,work,update,mode) call psb_erractionrestore(err_act) return -9999 call psb_error_handler(ione*ictxt,err_act) +9999 call psb_error_handler(ictxt,err_act) return end subroutine psb_movrlm @@ -265,7 +266,8 @@ subroutine psb_movrlv(x,desc_a,info,work,update,mode) integer(psb_ipk_), intent(in), optional :: update,mode ! locals - integer(psb_ipk_) :: ictxt, np, me, err_act, iix, jjx, nrow, ncol, & + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me, err_act, iix, jjx, nrow, ncol, & & k, update_, mode_, liwork, ldx integer(psb_lpk_) :: m, n, ix, ijx integer(psb_mpk_),pointer :: iwork(:) @@ -368,7 +370,7 @@ subroutine psb_movrlv(x,desc_a,info,work,update,mode) call psb_erractionrestore(err_act) return -9999 call psb_error_handler(ione*ictxt,err_act) +9999 call psb_error_handler(ictxt,err_act) return end subroutine psb_movrlv diff --git a/base/comm/psb_mscatter_a.F90 b/base/comm/psb_mscatter_a.F90 index f85a3849..b907a015 100644 --- a/base/comm/psb_mscatter_a.F90 +++ b/base/comm/psb_mscatter_a.F90 @@ -62,7 +62,8 @@ subroutine psb_mscatterm(globx, locx, desc_a, info, root) ! locals - integer(psb_mpk_) :: ictxt, np, me, iroot, icomm, myrank, rootrank, iam, nlr + type(psb_ctxt_type) :: ictxt + integer(psb_mpk_) :: np, me, iroot, icomm, myrank, rootrank, iam, nlr integer(psb_ipk_) :: ierr(5), err_act, nrow,& & ilocx, jlocx, lda_locx, lda_globx, lock, globk, k, maxk, & & col,pos @@ -235,7 +236,7 @@ subroutine psb_mscatterm(globx, locx, desc_a, info, root) call psb_erractionrestore(err_act) return -9999 call psb_error_handler(ione*ictxt,err_act) +9999 call psb_error_handler(ictxt,err_act) return @@ -306,7 +307,8 @@ subroutine psb_mscatterv(globx, locx, desc_a, info, root) ! locals - integer(psb_mpk_) :: ictxt, np, iam, iroot, iiroot, icomm, myrank, rootrank, nlr + type(psb_ctxt_type) :: ictxt + integer(psb_mpk_) :: np, iam, iroot, iiroot, icomm, myrank, rootrank, nlr integer(psb_ipk_) :: ierr(5), err_act, nrow,& & ilocx, jlocx, lda_locx, lda_globx, k, pos, ilx, jlx integer(psb_lpk_) :: m, n, i, j, idx, iglobx, jglobx @@ -472,7 +474,7 @@ subroutine psb_mscatterv(globx, locx, desc_a, info, root) call psb_erractionrestore(err_act) return -9999 call psb_error_handler(ione*ictxt,err_act) +9999 call psb_error_handler(ictxt,err_act) return diff --git a/base/comm/psb_sgather.f90 b/base/comm/psb_sgather.f90 index 538d1c43..d1c43f29 100644 --- a/base/comm/psb_sgather.f90 +++ b/base/comm/psb_sgather.f90 @@ -57,7 +57,8 @@ subroutine psb_sgather_vect(globx, locx, desc_a, info, iroot) ! locals - integer(psb_mpk_) :: ictxt, np, me, root, iiroot, icomm, myrank, rootrank + type(psb_ctxt_type) :: ictxt + integer(psb_mpk_) :: np, me, root, iiroot, icomm, myrank, rootrank integer(psb_ipk_) :: ierr(5), err_act, jlx, ilx, lda_locx, lda_globx, i integer(psb_lpk_) :: m, n, k, ilocx, jlocx, idx, iglobx, jglobx real(psb_spk_), allocatable :: llocx(:) @@ -153,7 +154,7 @@ subroutine psb_sgather_vect(globx, locx, desc_a, info, iroot) call psb_erractionrestore(err_act) return -9999 call psb_error_handler(ione*ictxt,err_act) +9999 call psb_error_handler(ictxt,err_act) return @@ -174,7 +175,8 @@ subroutine psb_sgather_multivect(globx, locx, desc_a, info, iroot) ! locals - integer(psb_mpk_) :: ictxt, np, me, root, iiroot, icomm, myrank, rootrank + type(psb_ctxt_type) :: ictxt + integer(psb_mpk_) :: np, me, root, iiroot, icomm, myrank, rootrank integer(psb_ipk_) :: ierr(5), err_act, jlx, ilx, lda_locx, lda_globx, i integer(psb_lpk_) :: m, n, k, ilocx, jlocx, idx, iglobx, jglobx real(psb_spk_), allocatable :: llocx(:,:) @@ -269,7 +271,7 @@ subroutine psb_sgather_multivect(globx, locx, desc_a, info, iroot) call psb_erractionrestore(err_act) return -9999 call psb_error_handler(ione*ictxt,err_act) +9999 call psb_error_handler(ictxt,err_act) return diff --git a/base/comm/psb_sgather_a.f90 b/base/comm/psb_sgather_a.f90 index 47a8c79a..7774a11c 100644 --- a/base/comm/psb_sgather_a.f90 +++ b/base/comm/psb_sgather_a.f90 @@ -57,12 +57,12 @@ subroutine psb_sgatherm(globx, locx, desc_a, info, iroot) ! locals - integer(psb_mpk_) :: ictxt, np, me, root, iiroot, icomm, myrank, rootrank + type(psb_ctxt_type) :: ictxt + integer(psb_mpk_) :: np, me, root, iiroot, icomm, myrank, rootrank integer(psb_ipk_) :: ierr(5), err_act, lda_locx, lda_globx, lock, globk,& & maxk, k, jlx, ilx, i, j integer(psb_lpk_) :: m, n, ilocx, jlocx, idx, iglobx, jglobx - - character(len=20) :: name, ch_err + character(len=20) :: name, ch_err name='psb_sgatherm' info=psb_success_ @@ -162,7 +162,7 @@ subroutine psb_sgatherm(globx, locx, desc_a, info, iroot) call psb_erractionrestore(err_act) return -9999 call psb_error_handler(ione*ictxt,err_act) +9999 call psb_error_handler(ictxt,err_act) return @@ -231,7 +231,8 @@ subroutine psb_sgatherv(globx, locx, desc_a, info, iroot) ! locals - integer(psb_mpk_) :: ictxt, np, me, root, iiroot, icomm, myrank, rootrank + type(psb_ctxt_type) :: ictxt + integer(psb_mpk_) :: np, me, root, iiroot, icomm, myrank, rootrank integer(psb_ipk_) :: ierr(5), err_act, lda_locx, lda_globx, lock, globk,& & maxk, k, jlx, ilx, i, j integer(psb_lpk_) :: m, n, ilocx, jlocx, idx, iglobx, jglobx @@ -327,7 +328,7 @@ subroutine psb_sgatherv(globx, locx, desc_a, info, iroot) call psb_erractionrestore(err_act) return -9999 call psb_error_handler(ione*ictxt,err_act) +9999 call psb_error_handler(ictxt,err_act) return diff --git a/base/comm/psb_shalo.f90 b/base/comm/psb_shalo.f90 index 78ab39e3..18548183 100644 --- a/base/comm/psb_shalo.f90 +++ b/base/comm/psb_shalo.f90 @@ -65,7 +65,8 @@ subroutine psb_shalo_vect(x,desc_a,info,work,tran,mode,data) character, intent(in), optional :: tran ! locals - integer(psb_ipk_) :: ictxt, np, me, err_act, iix, jjx, & + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me, err_act, iix, jjx, & & nrow, ncol, lldx, imode, liwork,data_ integer(psb_lpk_) :: m, n, ix, ijx real(psb_spk_),pointer :: iwork(:) @@ -179,7 +180,7 @@ subroutine psb_shalo_vect(x,desc_a,info,work,tran,mode,data) call psb_erractionrestore(err_act) return -9999 call psb_error_handler(ione*ictxt,err_act) +9999 call psb_error_handler(ictxt,err_act) return end subroutine psb_shalo_vect @@ -219,7 +220,8 @@ subroutine psb_shalo_multivect(x,desc_a,info,work,tran,mode,data) character, intent(in), optional :: tran ! locals - integer(psb_ipk_) :: ictxt, np, me, err_act, iix, jjx, & + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me, err_act, iix, jjx, & & nrow, ncol, lldx, imode, liwork,data_ integer(psb_lpk_) :: m, n, ix, ijx real(psb_spk_),pointer :: iwork(:) @@ -334,7 +336,7 @@ subroutine psb_shalo_multivect(x,desc_a,info,work,tran,mode,data) call psb_erractionrestore(err_act) return -9999 call psb_error_handler(ione*ictxt,err_act) +9999 call psb_error_handler(ictxt,err_act) return end subroutine psb_shalo_multivect diff --git a/base/comm/psb_shalo_a.f90 b/base/comm/psb_shalo_a.f90 index 9d1a5717..63d88874 100644 --- a/base/comm/psb_shalo_a.f90 +++ b/base/comm/psb_shalo_a.f90 @@ -65,7 +65,8 @@ subroutine psb_shalom(x,desc_a,info,jx,ik,work,tran,mode,data) character, intent(in), optional :: tran ! locals - integer(psb_mpk_) :: ictxt, np, me + type(psb_ctxt_type) :: ictxt + integer(psb_mpk_) :: np, me integer(psb_ipk_) :: err_act, iix, jjx, k, maxk, nrow, imode, i,& & liwork,data_, ldx integer(psb_lpk_) :: m, n, ix, ijx @@ -192,7 +193,7 @@ subroutine psb_shalom(x,desc_a,info,jx,ik,work,tran,mode,data) call psb_erractionrestore(err_act) return -9999 call psb_error_handler(ione*ictxt,err_act) +9999 call psb_error_handler(ictxt,err_act) return end subroutine psb_shalom @@ -266,7 +267,8 @@ subroutine psb_shalov(x,desc_a,info,work,tran,mode,data) character, intent(in), optional :: tran ! locals - integer(psb_mpk_) :: ictxt, np, me + type(psb_ctxt_type) :: ictxt + integer(psb_mpk_) :: np, me integer(psb_ipk_) :: err_act, ldx, iix, jjx, nrow, imode, liwork,data_ integer(psb_lpk_) :: m, n, ix, ijx real(psb_spk_),pointer :: iwork(:) @@ -373,7 +375,7 @@ subroutine psb_shalov(x,desc_a,info,work,tran,mode,data) call psb_erractionrestore(err_act) return -9999 call psb_error_handler(ione*ictxt,err_act) +9999 call psb_error_handler(ictxt,err_act) return end subroutine psb_shalov diff --git a/base/comm/psb_sovrl.f90 b/base/comm/psb_sovrl.f90 index 3930645a..c61161c0 100644 --- a/base/comm/psb_sovrl.f90 +++ b/base/comm/psb_sovrl.f90 @@ -75,7 +75,8 @@ subroutine psb_sovrl_vect(x,desc_a,info,work,update,mode) integer(psb_ipk_), intent(in), optional :: update,mode ! locals - integer(psb_ipk_) :: ictxt, np, me, err_act, k, iix, jjx, & + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me, err_act, k, iix, jjx, & & nrow, ncol, ldx, liwork, data_, update_, mode_ integer(psb_lpk_) :: m, n, ix, ijx real(psb_spk_),pointer :: iwork(:) @@ -175,7 +176,7 @@ subroutine psb_sovrl_vect(x,desc_a,info,work,update,mode) call psb_erractionrestore(err_act) return -9999 call psb_error_handler(ione*ictxt,err_act) +9999 call psb_error_handler(ictxt,err_act) return end subroutine psb_sovrl_vect @@ -224,7 +225,8 @@ subroutine psb_sovrl_multivect(x,desc_a,info,work,update,mode) integer(psb_ipk_), intent(in), optional :: update,mode ! locals - integer(psb_ipk_) :: ictxt, np, me, err_act, k, iix, jjx, & + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me, err_act, k, iix, jjx, & & nrow, ncol, ldx, liwork, data_, update_, mode_ integer(psb_lpk_) :: m, n, ix, ijx real(psb_spk_),pointer :: iwork(:) @@ -326,7 +328,7 @@ subroutine psb_sovrl_multivect(x,desc_a,info,work,update,mode) call psb_erractionrestore(err_act) return -9999 call psb_error_handler(ione*ictxt,err_act) +9999 call psb_error_handler(ictxt,err_act) return end subroutine psb_sovrl_multivect diff --git a/base/comm/psb_sovrl_a.f90 b/base/comm/psb_sovrl_a.f90 index b2f19fdd..23380de5 100644 --- a/base/comm/psb_sovrl_a.f90 +++ b/base/comm/psb_sovrl_a.f90 @@ -76,7 +76,8 @@ subroutine psb_sovrlm(x,desc_a,info,jx,ik,work,update,mode) integer(psb_ipk_), intent(in), optional :: update,jx,ik,mode ! locals - integer(psb_mpk_) :: ictxt, np, me + type(psb_ctxt_type) :: ictxt + integer(psb_mpk_) :: np, me integer(psb_ipk_) :: err_act, iix, jjx, nrow, ncol, k, maxk, update_,& & mode_, liwork, ldx integer(psb_lpk_) :: m, n, ix, ijx @@ -187,7 +188,7 @@ subroutine psb_sovrlm(x,desc_a,info,jx,ik,work,update,mode) call psb_erractionrestore(err_act) return -9999 call psb_error_handler(ione*ictxt,err_act) +9999 call psb_error_handler(ictxt,err_act) return end subroutine psb_sovrlm @@ -265,7 +266,8 @@ subroutine psb_sovrlv(x,desc_a,info,work,update,mode) integer(psb_ipk_), intent(in), optional :: update,mode ! locals - integer(psb_ipk_) :: ictxt, np, me, err_act, iix, jjx, nrow, ncol, & + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me, err_act, iix, jjx, nrow, ncol, & & k, update_, mode_, liwork, ldx integer(psb_lpk_) :: m, n, ix, ijx real(psb_spk_),pointer :: iwork(:) @@ -368,7 +370,7 @@ subroutine psb_sovrlv(x,desc_a,info,work,update,mode) call psb_erractionrestore(err_act) return -9999 call psb_error_handler(ione*ictxt,err_act) +9999 call psb_error_handler(ictxt,err_act) return end subroutine psb_sovrlv diff --git a/base/comm/psb_sscatter.F90 b/base/comm/psb_sscatter.F90 index 960c5bac..56761278 100644 --- a/base/comm/psb_sscatter.F90 +++ b/base/comm/psb_sscatter.F90 @@ -54,7 +54,8 @@ subroutine psb_sscatter_vect(globx, locx, desc_a, info, root, mold) class(psb_s_base_vect_type), intent(in), optional :: mold ! locals - integer(psb_mpk_) :: ictxt, np, me, icomm, myrank, rootrank + type(psb_ctxt_type) :: ictxt + integer(psb_mpk_) :: np, me, icomm, myrank, rootrank integer(psb_ipk_) :: ierr(5), err_act, m, n, i, j, idx, nrow, iglobx, jglobx,& & ilocx, jlocx, lda_locx, lda_globx, k, pos, ilx, jlx real(psb_spk_), allocatable :: vlocx(:) @@ -92,7 +93,7 @@ subroutine psb_sscatter_vect(globx, locx, desc_a, info, root, mold) call psb_erractionrestore(err_act) return -9999 call psb_error_handler(ione*ictxt,err_act) +9999 call psb_error_handler(ictxt,err_act) return diff --git a/base/comm/psb_sscatter_a.F90 b/base/comm/psb_sscatter_a.F90 index d756b712..783d3576 100644 --- a/base/comm/psb_sscatter_a.F90 +++ b/base/comm/psb_sscatter_a.F90 @@ -62,7 +62,8 @@ subroutine psb_sscatterm(globx, locx, desc_a, info, root) ! locals - integer(psb_mpk_) :: ictxt, np, me, iroot, icomm, myrank, rootrank, iam, nlr + type(psb_ctxt_type) :: ictxt + integer(psb_mpk_) :: np, me, iroot, icomm, myrank, rootrank, iam, nlr integer(psb_ipk_) :: ierr(5), err_act, nrow,& & ilocx, jlocx, lda_locx, lda_globx, lock, globk, k, maxk, & & col,pos @@ -235,7 +236,7 @@ subroutine psb_sscatterm(globx, locx, desc_a, info, root) call psb_erractionrestore(err_act) return -9999 call psb_error_handler(ione*ictxt,err_act) +9999 call psb_error_handler(ictxt,err_act) return @@ -306,7 +307,8 @@ subroutine psb_sscatterv(globx, locx, desc_a, info, root) ! locals - integer(psb_mpk_) :: ictxt, np, iam, iroot, iiroot, icomm, myrank, rootrank, nlr + type(psb_ctxt_type) :: ictxt + integer(psb_mpk_) :: np, iam, iroot, iiroot, icomm, myrank, rootrank, nlr integer(psb_ipk_) :: ierr(5), err_act, nrow,& & ilocx, jlocx, lda_locx, lda_globx, k, pos, ilx, jlx integer(psb_lpk_) :: m, n, i, j, idx, iglobx, jglobx @@ -472,7 +474,7 @@ subroutine psb_sscatterv(globx, locx, desc_a, info, root) call psb_erractionrestore(err_act) return -9999 call psb_error_handler(ione*ictxt,err_act) +9999 call psb_error_handler(ictxt,err_act) return diff --git a/base/comm/psb_sspgather.F90 b/base/comm/psb_sspgather.F90 index 83db9c08..9d0cc681 100644 --- a/base/comm/psb_sspgather.F90 +++ b/base/comm/psb_sspgather.F90 @@ -67,7 +67,8 @@ subroutine psb_ssp_allgather(globa, loca, desc_a, info, root, dupl,keepnum,keep integer(psb_ipk_) :: err_act, dupl_ integer(psb_ipk_) :: ip,naggrm1,naggrp1, i, j, k logical :: keepnum_, keeploc_ - integer(psb_mpk_) :: ictxt,np,me + type(psb_ctxt_type) :: ictxt + integer(psb_mpk_) :: np, me integer(psb_mpk_) :: icomm, minfo, ndx, root_ integer(psb_mpk_), allocatable :: nzbr(:), idisp(:) integer(psb_lpk_), allocatable :: locia(:), locja(:), glbia(:), glbja(:) @@ -216,7 +217,7 @@ subroutine psb_ssp_allgather(globa, loca, desc_a, info, root, dupl,keepnum,keep 9999 continue call psb_errpush(info,name) - call psb_error_handler(ione*ictxt,err_act) + call psb_error_handler(ictxt,err_act) return @@ -249,7 +250,8 @@ subroutine psb_lssp_allgather(globa, loca, desc_a, info, root, dupl,keepnum,kee integer(psb_ipk_) :: err_act, dupl_ integer(psb_ipk_) :: ip,naggrm1,naggrp1, i, j, k, nzl logical :: keepnum_, keeploc_ - integer(psb_mpk_) :: ictxt,np,me + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me integer(psb_mpk_) :: icomm, minfo, ndx, root_ integer(psb_mpk_), allocatable :: nzbr(:), idisp(:) integer(psb_lpk_), allocatable :: lnzbr(:) @@ -388,7 +390,7 @@ subroutine psb_lssp_allgather(globa, loca, desc_a, info, root, dupl,keepnum,kee 9999 continue call psb_errpush(info,name) - call psb_error_handler(ione*ictxt,err_act) + call psb_error_handler(ictxt,err_act) return @@ -420,7 +422,8 @@ subroutine psb_lslssp_allgather(globa, loca, desc_a, info, root, dupl,keepnum,k integer(psb_ipk_) :: err_act, dupl_ integer(psb_lpk_) :: ip,naggrm1,naggrp1, i, j, k, nzl logical :: keepnum_, keeploc_ - integer(psb_mpk_) :: ictxt,np,me + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me integer(psb_mpk_) :: icomm, minfo, ndx, root_ integer(psb_mpk_), allocatable :: nzbr(:), idisp(:) integer(psb_lpk_), allocatable :: lnzbr(:) @@ -554,7 +557,7 @@ subroutine psb_lslssp_allgather(globa, loca, desc_a, info, root, dupl,keepnum,k 9999 continue call psb_errpush(info,name) - call psb_error_handler(ione*ictxt,err_act) + call psb_error_handler(ictxt,err_act) return diff --git a/base/comm/psb_zgather.f90 b/base/comm/psb_zgather.f90 index b8b9a6c8..d7617334 100644 --- a/base/comm/psb_zgather.f90 +++ b/base/comm/psb_zgather.f90 @@ -57,7 +57,8 @@ subroutine psb_zgather_vect(globx, locx, desc_a, info, iroot) ! locals - integer(psb_mpk_) :: ictxt, np, me, root, iiroot, icomm, myrank, rootrank + type(psb_ctxt_type) :: ictxt + integer(psb_mpk_) :: np, me, root, iiroot, icomm, myrank, rootrank integer(psb_ipk_) :: ierr(5), err_act, jlx, ilx, lda_locx, lda_globx, i integer(psb_lpk_) :: m, n, k, ilocx, jlocx, idx, iglobx, jglobx complex(psb_dpk_), allocatable :: llocx(:) @@ -153,7 +154,7 @@ subroutine psb_zgather_vect(globx, locx, desc_a, info, iroot) call psb_erractionrestore(err_act) return -9999 call psb_error_handler(ione*ictxt,err_act) +9999 call psb_error_handler(ictxt,err_act) return @@ -174,7 +175,8 @@ subroutine psb_zgather_multivect(globx, locx, desc_a, info, iroot) ! locals - integer(psb_mpk_) :: ictxt, np, me, root, iiroot, icomm, myrank, rootrank + type(psb_ctxt_type) :: ictxt + integer(psb_mpk_) :: np, me, root, iiroot, icomm, myrank, rootrank integer(psb_ipk_) :: ierr(5), err_act, jlx, ilx, lda_locx, lda_globx, i integer(psb_lpk_) :: m, n, k, ilocx, jlocx, idx, iglobx, jglobx complex(psb_dpk_), allocatable :: llocx(:,:) @@ -269,7 +271,7 @@ subroutine psb_zgather_multivect(globx, locx, desc_a, info, iroot) call psb_erractionrestore(err_act) return -9999 call psb_error_handler(ione*ictxt,err_act) +9999 call psb_error_handler(ictxt,err_act) return diff --git a/base/comm/psb_zgather_a.f90 b/base/comm/psb_zgather_a.f90 index 1c3838cb..ed5b3553 100644 --- a/base/comm/psb_zgather_a.f90 +++ b/base/comm/psb_zgather_a.f90 @@ -57,12 +57,12 @@ subroutine psb_zgatherm(globx, locx, desc_a, info, iroot) ! locals - integer(psb_mpk_) :: ictxt, np, me, root, iiroot, icomm, myrank, rootrank + type(psb_ctxt_type) :: ictxt + integer(psb_mpk_) :: np, me, root, iiroot, icomm, myrank, rootrank integer(psb_ipk_) :: ierr(5), err_act, lda_locx, lda_globx, lock, globk,& & maxk, k, jlx, ilx, i, j integer(psb_lpk_) :: m, n, ilocx, jlocx, idx, iglobx, jglobx - - character(len=20) :: name, ch_err + character(len=20) :: name, ch_err name='psb_zgatherm' info=psb_success_ @@ -162,7 +162,7 @@ subroutine psb_zgatherm(globx, locx, desc_a, info, iroot) call psb_erractionrestore(err_act) return -9999 call psb_error_handler(ione*ictxt,err_act) +9999 call psb_error_handler(ictxt,err_act) return @@ -231,7 +231,8 @@ subroutine psb_zgatherv(globx, locx, desc_a, info, iroot) ! locals - integer(psb_mpk_) :: ictxt, np, me, root, iiroot, icomm, myrank, rootrank + type(psb_ctxt_type) :: ictxt + integer(psb_mpk_) :: np, me, root, iiroot, icomm, myrank, rootrank integer(psb_ipk_) :: ierr(5), err_act, lda_locx, lda_globx, lock, globk,& & maxk, k, jlx, ilx, i, j integer(psb_lpk_) :: m, n, ilocx, jlocx, idx, iglobx, jglobx @@ -327,7 +328,7 @@ subroutine psb_zgatherv(globx, locx, desc_a, info, iroot) call psb_erractionrestore(err_act) return -9999 call psb_error_handler(ione*ictxt,err_act) +9999 call psb_error_handler(ictxt,err_act) return diff --git a/base/comm/psb_zhalo.f90 b/base/comm/psb_zhalo.f90 index 595cbc03..64cd9b2d 100644 --- a/base/comm/psb_zhalo.f90 +++ b/base/comm/psb_zhalo.f90 @@ -65,7 +65,8 @@ subroutine psb_zhalo_vect(x,desc_a,info,work,tran,mode,data) character, intent(in), optional :: tran ! locals - integer(psb_ipk_) :: ictxt, np, me, err_act, iix, jjx, & + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me, err_act, iix, jjx, & & nrow, ncol, lldx, imode, liwork,data_ integer(psb_lpk_) :: m, n, ix, ijx complex(psb_dpk_),pointer :: iwork(:) @@ -179,7 +180,7 @@ subroutine psb_zhalo_vect(x,desc_a,info,work,tran,mode,data) call psb_erractionrestore(err_act) return -9999 call psb_error_handler(ione*ictxt,err_act) +9999 call psb_error_handler(ictxt,err_act) return end subroutine psb_zhalo_vect @@ -219,7 +220,8 @@ subroutine psb_zhalo_multivect(x,desc_a,info,work,tran,mode,data) character, intent(in), optional :: tran ! locals - integer(psb_ipk_) :: ictxt, np, me, err_act, iix, jjx, & + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me, err_act, iix, jjx, & & nrow, ncol, lldx, imode, liwork,data_ integer(psb_lpk_) :: m, n, ix, ijx complex(psb_dpk_),pointer :: iwork(:) @@ -334,7 +336,7 @@ subroutine psb_zhalo_multivect(x,desc_a,info,work,tran,mode,data) call psb_erractionrestore(err_act) return -9999 call psb_error_handler(ione*ictxt,err_act) +9999 call psb_error_handler(ictxt,err_act) return end subroutine psb_zhalo_multivect diff --git a/base/comm/psb_zhalo_a.f90 b/base/comm/psb_zhalo_a.f90 index c9a6b8a7..ede690d3 100644 --- a/base/comm/psb_zhalo_a.f90 +++ b/base/comm/psb_zhalo_a.f90 @@ -65,7 +65,8 @@ subroutine psb_zhalom(x,desc_a,info,jx,ik,work,tran,mode,data) character, intent(in), optional :: tran ! locals - integer(psb_mpk_) :: ictxt, np, me + type(psb_ctxt_type) :: ictxt + integer(psb_mpk_) :: np, me integer(psb_ipk_) :: err_act, iix, jjx, k, maxk, nrow, imode, i,& & liwork,data_, ldx integer(psb_lpk_) :: m, n, ix, ijx @@ -192,7 +193,7 @@ subroutine psb_zhalom(x,desc_a,info,jx,ik,work,tran,mode,data) call psb_erractionrestore(err_act) return -9999 call psb_error_handler(ione*ictxt,err_act) +9999 call psb_error_handler(ictxt,err_act) return end subroutine psb_zhalom @@ -266,7 +267,8 @@ subroutine psb_zhalov(x,desc_a,info,work,tran,mode,data) character, intent(in), optional :: tran ! locals - integer(psb_mpk_) :: ictxt, np, me + type(psb_ctxt_type) :: ictxt + integer(psb_mpk_) :: np, me integer(psb_ipk_) :: err_act, ldx, iix, jjx, nrow, imode, liwork,data_ integer(psb_lpk_) :: m, n, ix, ijx complex(psb_dpk_),pointer :: iwork(:) @@ -373,7 +375,7 @@ subroutine psb_zhalov(x,desc_a,info,work,tran,mode,data) call psb_erractionrestore(err_act) return -9999 call psb_error_handler(ione*ictxt,err_act) +9999 call psb_error_handler(ictxt,err_act) return end subroutine psb_zhalov diff --git a/base/comm/psb_zovrl.f90 b/base/comm/psb_zovrl.f90 index c7463e19..13aed091 100644 --- a/base/comm/psb_zovrl.f90 +++ b/base/comm/psb_zovrl.f90 @@ -75,7 +75,8 @@ subroutine psb_zovrl_vect(x,desc_a,info,work,update,mode) integer(psb_ipk_), intent(in), optional :: update,mode ! locals - integer(psb_ipk_) :: ictxt, np, me, err_act, k, iix, jjx, & + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me, err_act, k, iix, jjx, & & nrow, ncol, ldx, liwork, data_, update_, mode_ integer(psb_lpk_) :: m, n, ix, ijx complex(psb_dpk_),pointer :: iwork(:) @@ -175,7 +176,7 @@ subroutine psb_zovrl_vect(x,desc_a,info,work,update,mode) call psb_erractionrestore(err_act) return -9999 call psb_error_handler(ione*ictxt,err_act) +9999 call psb_error_handler(ictxt,err_act) return end subroutine psb_zovrl_vect @@ -224,7 +225,8 @@ subroutine psb_zovrl_multivect(x,desc_a,info,work,update,mode) integer(psb_ipk_), intent(in), optional :: update,mode ! locals - integer(psb_ipk_) :: ictxt, np, me, err_act, k, iix, jjx, & + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me, err_act, k, iix, jjx, & & nrow, ncol, ldx, liwork, data_, update_, mode_ integer(psb_lpk_) :: m, n, ix, ijx complex(psb_dpk_),pointer :: iwork(:) @@ -326,7 +328,7 @@ subroutine psb_zovrl_multivect(x,desc_a,info,work,update,mode) call psb_erractionrestore(err_act) return -9999 call psb_error_handler(ione*ictxt,err_act) +9999 call psb_error_handler(ictxt,err_act) return end subroutine psb_zovrl_multivect diff --git a/base/comm/psb_zovrl_a.f90 b/base/comm/psb_zovrl_a.f90 index 49a60740..362f98ab 100644 --- a/base/comm/psb_zovrl_a.f90 +++ b/base/comm/psb_zovrl_a.f90 @@ -76,7 +76,8 @@ subroutine psb_zovrlm(x,desc_a,info,jx,ik,work,update,mode) integer(psb_ipk_), intent(in), optional :: update,jx,ik,mode ! locals - integer(psb_mpk_) :: ictxt, np, me + type(psb_ctxt_type) :: ictxt + integer(psb_mpk_) :: np, me integer(psb_ipk_) :: err_act, iix, jjx, nrow, ncol, k, maxk, update_,& & mode_, liwork, ldx integer(psb_lpk_) :: m, n, ix, ijx @@ -187,7 +188,7 @@ subroutine psb_zovrlm(x,desc_a,info,jx,ik,work,update,mode) call psb_erractionrestore(err_act) return -9999 call psb_error_handler(ione*ictxt,err_act) +9999 call psb_error_handler(ictxt,err_act) return end subroutine psb_zovrlm @@ -265,7 +266,8 @@ subroutine psb_zovrlv(x,desc_a,info,work,update,mode) integer(psb_ipk_), intent(in), optional :: update,mode ! locals - integer(psb_ipk_) :: ictxt, np, me, err_act, iix, jjx, nrow, ncol, & + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me, err_act, iix, jjx, nrow, ncol, & & k, update_, mode_, liwork, ldx integer(psb_lpk_) :: m, n, ix, ijx complex(psb_dpk_),pointer :: iwork(:) @@ -368,7 +370,7 @@ subroutine psb_zovrlv(x,desc_a,info,work,update,mode) call psb_erractionrestore(err_act) return -9999 call psb_error_handler(ione*ictxt,err_act) +9999 call psb_error_handler(ictxt,err_act) return end subroutine psb_zovrlv diff --git a/base/comm/psb_zscatter.F90 b/base/comm/psb_zscatter.F90 index 10c2c78d..753a468b 100644 --- a/base/comm/psb_zscatter.F90 +++ b/base/comm/psb_zscatter.F90 @@ -54,7 +54,8 @@ subroutine psb_zscatter_vect(globx, locx, desc_a, info, root, mold) class(psb_z_base_vect_type), intent(in), optional :: mold ! locals - integer(psb_mpk_) :: ictxt, np, me, icomm, myrank, rootrank + type(psb_ctxt_type) :: ictxt + integer(psb_mpk_) :: np, me, icomm, myrank, rootrank integer(psb_ipk_) :: ierr(5), err_act, m, n, i, j, idx, nrow, iglobx, jglobx,& & ilocx, jlocx, lda_locx, lda_globx, k, pos, ilx, jlx complex(psb_dpk_), allocatable :: vlocx(:) @@ -92,7 +93,7 @@ subroutine psb_zscatter_vect(globx, locx, desc_a, info, root, mold) call psb_erractionrestore(err_act) return -9999 call psb_error_handler(ione*ictxt,err_act) +9999 call psb_error_handler(ictxt,err_act) return diff --git a/base/comm/psb_zscatter_a.F90 b/base/comm/psb_zscatter_a.F90 index b206d8d3..59a98f9b 100644 --- a/base/comm/psb_zscatter_a.F90 +++ b/base/comm/psb_zscatter_a.F90 @@ -62,7 +62,8 @@ subroutine psb_zscatterm(globx, locx, desc_a, info, root) ! locals - integer(psb_mpk_) :: ictxt, np, me, iroot, icomm, myrank, rootrank, iam, nlr + type(psb_ctxt_type) :: ictxt + integer(psb_mpk_) :: np, me, iroot, icomm, myrank, rootrank, iam, nlr integer(psb_ipk_) :: ierr(5), err_act, nrow,& & ilocx, jlocx, lda_locx, lda_globx, lock, globk, k, maxk, & & col,pos @@ -235,7 +236,7 @@ subroutine psb_zscatterm(globx, locx, desc_a, info, root) call psb_erractionrestore(err_act) return -9999 call psb_error_handler(ione*ictxt,err_act) +9999 call psb_error_handler(ictxt,err_act) return @@ -306,7 +307,8 @@ subroutine psb_zscatterv(globx, locx, desc_a, info, root) ! locals - integer(psb_mpk_) :: ictxt, np, iam, iroot, iiroot, icomm, myrank, rootrank, nlr + type(psb_ctxt_type) :: ictxt + integer(psb_mpk_) :: np, iam, iroot, iiroot, icomm, myrank, rootrank, nlr integer(psb_ipk_) :: ierr(5), err_act, nrow,& & ilocx, jlocx, lda_locx, lda_globx, k, pos, ilx, jlx integer(psb_lpk_) :: m, n, i, j, idx, iglobx, jglobx @@ -472,7 +474,7 @@ subroutine psb_zscatterv(globx, locx, desc_a, info, root) call psb_erractionrestore(err_act) return -9999 call psb_error_handler(ione*ictxt,err_act) +9999 call psb_error_handler(ictxt,err_act) return diff --git a/base/comm/psb_zspgather.F90 b/base/comm/psb_zspgather.F90 index 98b7d215..87745fa4 100644 --- a/base/comm/psb_zspgather.F90 +++ b/base/comm/psb_zspgather.F90 @@ -67,7 +67,8 @@ subroutine psb_zsp_allgather(globa, loca, desc_a, info, root, dupl,keepnum,keep integer(psb_ipk_) :: err_act, dupl_ integer(psb_ipk_) :: ip,naggrm1,naggrp1, i, j, k logical :: keepnum_, keeploc_ - integer(psb_mpk_) :: ictxt,np,me + type(psb_ctxt_type) :: ictxt + integer(psb_mpk_) :: np, me integer(psb_mpk_) :: icomm, minfo, ndx, root_ integer(psb_mpk_), allocatable :: nzbr(:), idisp(:) integer(psb_lpk_), allocatable :: locia(:), locja(:), glbia(:), glbja(:) @@ -216,7 +217,7 @@ subroutine psb_zsp_allgather(globa, loca, desc_a, info, root, dupl,keepnum,keep 9999 continue call psb_errpush(info,name) - call psb_error_handler(ione*ictxt,err_act) + call psb_error_handler(ictxt,err_act) return @@ -249,7 +250,8 @@ subroutine psb_lzsp_allgather(globa, loca, desc_a, info, root, dupl,keepnum,kee integer(psb_ipk_) :: err_act, dupl_ integer(psb_ipk_) :: ip,naggrm1,naggrp1, i, j, k, nzl logical :: keepnum_, keeploc_ - integer(psb_mpk_) :: ictxt,np,me + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me integer(psb_mpk_) :: icomm, minfo, ndx, root_ integer(psb_mpk_), allocatable :: nzbr(:), idisp(:) integer(psb_lpk_), allocatable :: lnzbr(:) @@ -388,7 +390,7 @@ subroutine psb_lzsp_allgather(globa, loca, desc_a, info, root, dupl,keepnum,kee 9999 continue call psb_errpush(info,name) - call psb_error_handler(ione*ictxt,err_act) + call psb_error_handler(ictxt,err_act) return @@ -420,7 +422,8 @@ subroutine psb_lzlzsp_allgather(globa, loca, desc_a, info, root, dupl,keepnum,k integer(psb_ipk_) :: err_act, dupl_ integer(psb_lpk_) :: ip,naggrm1,naggrp1, i, j, k, nzl logical :: keepnum_, keeploc_ - integer(psb_mpk_) :: ictxt,np,me + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me integer(psb_mpk_) :: icomm, minfo, ndx, root_ integer(psb_mpk_), allocatable :: nzbr(:), idisp(:) integer(psb_lpk_), allocatable :: lnzbr(:) @@ -554,7 +557,7 @@ subroutine psb_lzlzsp_allgather(globa, loca, desc_a, info, root, dupl,keepnum,k 9999 continue call psb_errpush(info,name) - call psb_error_handler(ione*ictxt,err_act) + call psb_error_handler(ictxt,err_act) return diff --git a/base/internals/Makefile b/base/internals/Makefile index cbb282a9..b3a1a995 100644 --- a/base/internals/Makefile +++ b/base/internals/Makefile @@ -1,12 +1,12 @@ include ../../Make.inc -FOBJS = psi_compute_size.o psi_crea_bnd_elem.o psi_crea_index.o \ +FOBJS = psi_crea_bnd_elem.o psi_crea_index.o \ psi_crea_ovr_elem.o psi_bld_tmpovrl.o \ psi_bld_tmphalo.o psi_sort_dl.o \ psi_indx_map_fnd_owner.o \ psi_desc_impl.o psi_hash_impl.o psi_srtlist.o \ psi_bld_glb_dep_list.o psi_xtr_loc_dl.o -#psi_list_search.o psi_dl_check.o +#psi_list_search.o psi_dl_check.o psi_compute_size.o MPFOBJS = psi_desc_index.o psi_extrct_dl.o psi_fnd_owner.o psi_a2a_fnd_owner.o \ psi_graph_fnd_owner.o psi_adjcncy_fnd_owner.o psi_symm_dep_list.o diff --git a/base/internals/psi_a2a_fnd_owner.F90 b/base/internals/psi_a2a_fnd_owner.F90 index b9cd9bb2..b0912078 100644 --- a/base/internals/psi_a2a_fnd_owner.F90 +++ b/base/internals/psi_a2a_fnd_owner.F90 @@ -74,14 +74,15 @@ subroutine psi_a2a_fnd_owner(idx,iprc,idxmap,info,samesize) integer(psb_ipk_), allocatable :: tproc(:), lclidx(:) integer(psb_mpk_), allocatable :: hsz(:),hidx(:), sdidx(:), rvidx(:),& & sdsz(:), rvsz(:), sdhd(:), rvhd(:), p2pstat(:,:) - integer(psb_mpk_) :: icomm, minfo, iictxt,nv + integer(psb_mpk_) :: icomm, minfo, nv integer(psb_ipk_) :: i,n_row,n_col,err_act,gsz integer(psb_lpk_) :: mglob, ih - integer(psb_ipk_) :: ictxt,np,me, nresp - logical, parameter :: use_psi_adj=.true. - real(psb_dpk_) :: t0, t1, t2, t3, t4, tamx, tidx - character(len=20) :: name - logical :: samesize_ + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np,me, nresp + logical, parameter :: use_psi_adj=.true. + real(psb_dpk_) :: t0, t1, t2, t3, t4, tamx, tidx + character(len=20) :: name + logical :: samesize_ info = psb_success_ name = 'psi_a2a_fnd_owner' @@ -92,7 +93,6 @@ subroutine psi_a2a_fnd_owner(idx,iprc,idxmap,info,samesize) mglob = idxmap%get_gr() n_row = idxmap%get_lr() n_col = idxmap%get_lc() - iictxt = ictxt call psb_info(ictxt, me, np) diff --git a/base/internals/psi_adjcncy_fnd_owner.F90 b/base/internals/psi_adjcncy_fnd_owner.F90 index f26bb38f..40ee26dc 100644 --- a/base/internals/psi_adjcncy_fnd_owner.F90 +++ b/base/internals/psi_adjcncy_fnd_owner.F90 @@ -81,11 +81,12 @@ subroutine psi_adjcncy_fnd_owner(idx,iprc,adj,idxmap,info) integer(psb_mpk_), allocatable :: hsz(:),hidx(:), sdidx(:), rvidx(:),& & sdsz(:), rvsz(:), sdhd(:), rvhd(:), p2pstat(:,:) integer(psb_mpk_) :: prc, p2ptag, iret - integer(psb_mpk_) :: icomm, minfo, iictxt + integer(psb_mpk_) :: icomm, minfo integer(psb_ipk_) :: i,n_row,n_col,err_act,hsize,ip,isz,j, k,& & last_ih, last_j, nidx, nrecv, nadj integer(psb_lpk_) :: mglob, ih - integer(psb_ipk_) :: ictxt,np,me + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np,me logical, parameter :: gettime=.true., debug=.false. integer(psb_mpk_) :: xchg_alg logical, parameter :: do_timings=.false. @@ -103,7 +104,7 @@ subroutine psi_adjcncy_fnd_owner(idx,iprc,adj,idxmap,info) mglob = idxmap%get_gr() n_row = idxmap%get_lr() n_col = idxmap%get_lc() - iictxt = ictxt + if ((do_timings).and.(idx_phase1==-1)) & & idx_phase1 = psb_get_timer_idx("ADJ_FND_OWN: phase1 ") if ((do_timings).and.(idx_phase2==-1)) & diff --git a/base/internals/psi_bld_glb_dep_list.F90 b/base/internals/psi_bld_glb_dep_list.F90 index bf28e49b..94a31039 100644 --- a/base/internals/psi_bld_glb_dep_list.F90 +++ b/base/internals/psi_bld_glb_dep_list.F90 @@ -29,94 +29,94 @@ ! POSSIBILITY OF SUCH DAMAGE. ! ! -subroutine psi_i_bld_glb_dep_list(ictxt,loc_dl,length_dl,dep_list,dl_lda,info) - use psi_mod, psb_protect_name => psi_i_bld_glb_dep_list -#ifdef MPI_MOD - use mpi -#endif - use psb_penv_mod - use psb_const_mod - use psb_error_mod - use psb_desc_mod - use psb_sort_mod - implicit none -#ifdef MPI_H - include 'mpif.h' -#endif - ! ....scalar parameters... - integer(psb_ipk_), intent(in) :: ictxt - integer(psb_ipk_), intent(out) :: dl_lda - integer(psb_ipk_), intent(in) :: loc_dl(:), length_dl(0:) - integer(psb_ipk_), allocatable, intent(out) :: dep_list(:,:) - integer(psb_ipk_), intent(out) :: info - - - ! .....local arrays.... - integer(psb_ipk_) :: int_err(5) - - ! .....local scalars... - integer(psb_ipk_) :: i, proc,j,err_act - integer(psb_ipk_) :: err - integer(psb_ipk_) :: debug_level, debug_unit - integer(psb_mpk_) :: iictxt, icomm, me, np, minfo - logical, parameter :: dist_symm_list=.false., print_dl=.false. - character name*20 - name='psi_bld_glb_dep_list' - - call psb_erractionsave(err_act) - debug_unit = psb_get_debug_unit() - debug_level = psb_get_debug_level() - - iictxt = ictxt - info = psb_success_ - - call psb_info(iictxt,me,np) - - - dl_lda = length_dl(me) - call psb_max(iictxt, dl_lda) - - if (debug_level >= psb_debug_inner_) & - & write(debug_unit,*) me,' ',trim(name),': Dep_list length ',length_dl(me),dl_lda - dl_lda = max(dl_lda,1) - allocate(dep_list(dl_lda,0:np),stat=info) - if (info /= psb_success_) then - call psb_errpush(psb_err_from_subroutine_,name,a_err='Allocate') - goto 9999 - end if - icomm = psb_get_mpi_comm(iictxt) - call mpi_allgather(loc_dl,dl_lda,psb_mpi_ipk_,& - & dep_list,dl_lda,psb_mpi_ipk_,icomm,minfo) - - info = minfo - if (info /= psb_success_) then - info=psb_err_internal_error_ - goto 9999 - endif - if (print_dl) then - if (me == 0) then - write(0,*) ' Dep_list ' - do i=0,np-1 - j = length_dl(i) - write(0,*) 'Proc ',i,':',dep_list(1:j,i) - end do - flush(0) - end if - call psb_barrier(ictxt) - end if - - call psb_erractionrestore(err_act) - return - - -9999 continue - - call psb_errpush(info,name,i_err=int_err) - call psb_error_handler(err_act) - - return - -end subroutine psi_i_bld_glb_dep_list +!!$subroutine psi_i_bld_glb_dep_list(ictxt,loc_dl,length_dl,dep_list,dl_lda,info) +!!$ use psi_mod, psb_protect_name => psi_i_bld_glb_dep_list +!!$#ifdef MPI_MOD +!!$ use mpi +!!$#endif +!!$ use psb_penv_mod +!!$ use psb_const_mod +!!$ use psb_error_mod +!!$ use psb_desc_mod +!!$ use psb_sort_mod +!!$ implicit none +!!$#ifdef MPI_H +!!$ include 'mpif.h' +!!$#endif +!!$ ! ....scalar parameters... +!!$ type(psb_ctxt_type), intent(in) :: ictxt +!!$ integer(psb_ipk_), intent(out) :: dl_lda +!!$ integer(psb_ipk_), intent(in) :: loc_dl(:), length_dl(0:) +!!$ integer(psb_ipk_), allocatable, intent(out) :: dep_list(:,:) +!!$ integer(psb_ipk_), intent(out) :: info +!!$ +!!$ +!!$ ! .....local arrays.... +!!$ integer(psb_ipk_) :: int_err(5) +!!$ +!!$ ! .....local scalars... +!!$ integer(psb_ipk_) :: i, proc,j,err_act +!!$ integer(psb_ipk_) :: err +!!$ integer(psb_ipk_) :: debug_level, debug_unit +!!$ integer(psb_ipk_) :: me, np +!!$ integer(psb_mpk_) :: icomm, minfo +!!$ logical, parameter :: dist_symm_list=.false., print_dl=.false. +!!$ character name*20 +!!$ name='psi_bld_glb_dep_list' +!!$ +!!$ call psb_erractionsave(err_act) +!!$ debug_unit = psb_get_debug_unit() +!!$ debug_level = psb_get_debug_level() +!!$ +!!$ info = psb_success_ +!!$ +!!$ call psb_info(ictxt,me,np) +!!$ +!!$ +!!$ dl_lda = length_dl(me) +!!$ call psb_max(ictxt, dl_lda) +!!$ +!!$ if (debug_level >= psb_debug_inner_) & +!!$ & write(debug_unit,*) me,' ',trim(name),': Dep_list length ',length_dl(me),dl_lda +!!$ dl_lda = max(dl_lda,1) +!!$ allocate(dep_list(dl_lda,0:np),stat=info) +!!$ if (info /= psb_success_) then +!!$ call psb_errpush(psb_err_from_subroutine_,name,a_err='Allocate') +!!$ goto 9999 +!!$ end if +!!$ icomm = psb_get_mpi_comm(ictxt) +!!$ call mpi_allgather(loc_dl,dl_lda,psb_mpi_ipk_,& +!!$ & dep_list,dl_lda,psb_mpi_ipk_,icomm,minfo) +!!$ +!!$ info = minfo +!!$ if (info /= psb_success_) then +!!$ info=psb_err_internal_error_ +!!$ goto 9999 +!!$ endif +!!$ if (print_dl) then +!!$ if (me == 0) then +!!$ write(0,*) ' Dep_list ' +!!$ do i=0,np-1 +!!$ j = length_dl(i) +!!$ write(0,*) 'Proc ',i,':',dep_list(1:j,i) +!!$ end do +!!$ flush(0) +!!$ end if +!!$ call psb_barrier(ictxt) +!!$ end if +!!$ +!!$ call psb_erractionrestore(err_act) +!!$ return +!!$ +!!$ +!!$9999 continue +!!$ +!!$ call psb_errpush(info,name,i_err=int_err) +!!$ call psb_error_handler(err_act) +!!$ +!!$ return +!!$ +!!$end subroutine psi_i_bld_glb_dep_list subroutine psi_i_bld_glb_csr_dep_list(ictxt,loc_dl,length_dl,c_dep_list,dl_ptr,info) use psi_mod, psb_protect_name => psi_i_bld_glb_csr_dep_list @@ -133,7 +133,7 @@ subroutine psi_i_bld_glb_csr_dep_list(ictxt,loc_dl,length_dl,c_dep_list,dl_ptr,i include 'mpif.h' #endif ! ....scalar parameters... - integer(psb_ipk_), intent(in) :: ictxt + type(psb_ctxt_type), intent(in) :: ictxt integer(psb_ipk_), intent(in) :: loc_dl(:), length_dl(0:) integer(psb_ipk_), allocatable, intent(out) :: c_dep_list(:), dl_ptr(:) integer(psb_ipk_), intent(out) :: info @@ -146,7 +146,8 @@ subroutine psi_i_bld_glb_csr_dep_list(ictxt,loc_dl,length_dl,c_dep_list,dl_ptr,i integer(psb_ipk_) :: i, proc,j,err_act, length, myld integer(psb_ipk_) :: err integer(psb_ipk_) :: debug_level, debug_unit - integer(psb_mpk_) :: iictxt, icomm, me, np, minfo + integer(psb_ipk_) :: me, np + integer(psb_mpk_) :: icomm, minfo logical, parameter :: dist_symm_list=.false., print_dl=.false. character name*20 name='psi_bld_glb_csr_dep_list' @@ -155,10 +156,9 @@ subroutine psi_i_bld_glb_csr_dep_list(ictxt,loc_dl,length_dl,c_dep_list,dl_ptr,i debug_unit = psb_get_debug_unit() debug_level = psb_get_debug_level() - iictxt = ictxt info = psb_success_ - call psb_info(iictxt,me,np) + call psb_info(ictxt,me,np) myld = length_dl(me) length = sum(length_dl(0:np-1)) @@ -180,7 +180,7 @@ subroutine psi_i_bld_glb_csr_dep_list(ictxt,loc_dl,length_dl,c_dep_list,dl_ptr,i call psb_errpush(psb_err_from_subroutine_,name,a_err='Allocate') goto 9999 end if - icomm = psb_get_mpi_comm(iictxt) + icomm = psb_get_mpi_comm(ictxt) call mpi_allgatherv(loc_dl,myld,psb_mpi_ipk_,& & c_dep_list,length_dl,dl_ptr,psb_mpi_ipk_,icomm,minfo) diff --git a/base/internals/psi_bld_tmphalo.f90 b/base/internals/psi_bld_tmphalo.f90 index dc13b7c2..4547d2cb 100644 --- a/base/internals/psi_bld_tmphalo.f90 +++ b/base/internals/psi_bld_tmphalo.f90 @@ -62,7 +62,8 @@ subroutine psi_bld_tmphalo(desc,info) integer(psb_ipk_) :: i,j,np,me,lhalo,nhalo,& & n_col, err_act, key, ih, nh, idx, nk,icomm - integer(psb_ipk_) :: ictxt,n_row + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: n_row character(len=20) :: name,ch_err info = psb_success_ diff --git a/base/internals/psi_bld_tmpovrl.f90 b/base/internals/psi_bld_tmpovrl.f90 index 671a20d3..68c137d2 100644 --- a/base/internals/psi_bld_tmpovrl.f90 +++ b/base/internals/psi_bld_tmpovrl.f90 @@ -68,8 +68,8 @@ subroutine psi_i_bld_tmpovrl(iv,desc,info) & l_ov_ix,l_ov_el, err_act, itmpov, k, glx, icomm integer(psb_ipk_) :: idx integer(psb_ipk_), allocatable :: ov_idx(:),ov_el(:,:) - - integer(psb_ipk_) :: ictxt,n_row, debug_unit, debug_level + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: n_row, debug_unit, debug_level character(len=20) :: name,ch_err info = psb_success_ diff --git a/base/internals/psi_compute_size.f90 b/base/internals/psi_compute_size.f90 index 36d52f43..699ceeac 100644 --- a/base/internals/psi_compute_size.f90 +++ b/base/internals/psi_compute_size.f90 @@ -47,7 +47,8 @@ subroutine psi_compute_size(desc_data, index_in, dl_lda, info) integer(psb_ipk_) :: desc_data(:), index_in(:) ! ....local scalars.... integer(psb_ipk_) :: i,np,me,proc, max_index - integer(psb_ipk_) :: ictxt, err_act + integer(psb_ipk_) :: err_act + type(psb_ctxt_type) :: ictxt ! ...local array... integer(psb_ipk_) :: int_err(5) integer(psb_ipk_), allocatable :: counter_recv(:), counter_dl(:) diff --git a/base/internals/psi_crea_index.f90 b/base/internals/psi_crea_index.f90 index 68bcbd20..8e8118f9 100644 --- a/base/internals/psi_crea_index.f90 +++ b/base/internals/psi_crea_index.f90 @@ -64,9 +64,11 @@ subroutine psi_i_crea_index(desc_a,index_in,index_out,nxch,nsnd,nrcv,info) integer(psb_ipk_), allocatable, intent(inout) :: index_out(:) ! ....local scalars... - integer(psb_ipk_) :: ictxt, me, np, mode, err_act, dl_lda, ldl + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: me, np, mode, err_act, dl_lda, ldl ! ...parameters... - integer(psb_ipk_), allocatable :: dep_list(:,:), length_dl(:), loc_dl(:), c_dep_list(:), dl_ptr(:) + integer(psb_ipk_), allocatable :: length_dl(:), loc_dl(:),& + & c_dep_list(:), dl_ptr(:) integer(psb_ipk_) :: dlmax, dlavg integer(psb_ipk_),parameter :: root=psb_root_,no_comm=-1 integer(psb_ipk_) :: debug_level, debug_unit @@ -124,7 +126,7 @@ subroutine psi_i_crea_index(desc_a,index_in,index_out,nxch,nsnd,nrcv,info) if (choose_sorting(dlmax,dlavg,np)) then if (do_timings) call psb_tic(idx_phase21) - call psi_bld_glb_dep_list(ictxt,& + call psi_bld_glb_dep_csr_list(ictxt,& & loc_dl,length_dl,c_dep_list,dl_ptr,info) if (info /= 0) then write(0,*) me,trim(name),' From bld_glb_list ',info @@ -189,8 +191,7 @@ subroutine psi_i_crea_index(desc_a,index_in,index_out,nxch,nsnd,nrcv,info) end if if (do_timings) call psb_toc(idx_phase3) - if (allocated(dep_list)) deallocate(dep_list,stat=info) - if ((info==0).and.allocated(length_dl)) deallocate(length_dl,stat=info) + if (allocated(length_dl)) deallocate(length_dl,stat=info) if (info /= 0) then info = psb_err_alloc_dealloc_ goto 9999 diff --git a/base/internals/psi_crea_ovr_elem.f90 b/base/internals/psi_crea_ovr_elem.f90 index 359c264c..bf9eeee4 100644 --- a/base/internals/psi_crea_ovr_elem.f90 +++ b/base/internals/psi_crea_ovr_elem.f90 @@ -63,7 +63,6 @@ subroutine psi_i_crea_ovr_elem(me,desc_overlap,ovr_elem,info) integer(psb_ipk_) :: nel, ip, ix, iel, insize, err_act, iproc integer(psb_ipk_), allocatable :: telem(:,:) - character(len=20) :: name diff --git a/base/internals/psi_desc_impl.f90 b/base/internals/psi_desc_impl.f90 index 43eae7bb..ce5d043e 100644 --- a/base/internals/psi_desc_impl.f90 +++ b/base/internals/psi_desc_impl.f90 @@ -74,8 +74,9 @@ subroutine psi_i_cnv_dsc(halo_in,ovrlap_in,ext_in,cdesc, info, mold) class(psb_i_base_vect_type), optional, intent(in) :: mold ! ....local scalars.... - integer(psb_ipk_) :: np,me - integer(psb_ipk_) :: ictxt, err_act,nxch,nsnd,nrcv,j,k + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np,me + integer(psb_ipk_) :: err_act,nxch,nsnd,nrcv,j,k ! ...local array... integer(psb_ipk_), allocatable :: idx_out(:), tmp_mst_idx(:) diff --git a/base/internals/psi_desc_index.F90 b/base/internals/psi_desc_index.F90 index ecf7f2f3..d2ed083b 100644 --- a/base/internals/psi_desc_index.F90 +++ b/base/internals/psi_desc_index.F90 @@ -121,7 +121,7 @@ subroutine psi_i_desc_index(desc,index_in,dep_list,& ! ....local scalars... integer(psb_ipk_) :: j,me,np,i,proc ! ...parameters... - integer(psb_ipk_) :: ictxt + type(psb_ctxt_type) :: ictxt integer(psb_ipk_), parameter :: no_comm=-1 ! ...local arrays.. integer(psb_lpk_),allocatable :: sndbuf(:), rcvbuf(:) diff --git a/base/internals/psi_extrct_dl.F90 b/base/internals/psi_extrct_dl.F90 index 1b5280f8..379bd99b 100644 --- a/base/internals/psi_extrct_dl.F90 +++ b/base/internals/psi_extrct_dl.F90 @@ -133,10 +133,11 @@ subroutine psi_i_extract_dep_list(ictxt,is_bld,is_upd,desc_str,dep_list,& include 'mpif.h' #endif ! ....scalar parameters... - logical, intent(in) :: is_bld, is_upd - integer(psb_ipk_), intent(in) :: ictxt,mode - integer(psb_ipk_), intent(out) :: dl_lda - integer(psb_ipk_), intent(in) :: desc_str(*) + logical, intent(in) :: is_bld, is_upd + type(psb_ctxt_type), intent(in) :: ictxt + integer(psb_ipk_), intent(in) :: mode + integer(psb_ipk_), intent(out) :: dl_lda + integer(psb_ipk_), intent(in) :: desc_str(*) integer(psb_ipk_), allocatable, intent(out) :: dep_list(:,:),length_dl(:) integer(psb_ipk_), intent(out) :: info ! .....local arrays.... @@ -147,7 +148,8 @@ subroutine psi_i_extract_dep_list(ictxt,is_bld,is_upd,desc_str,dep_list,& integer(psb_ipk_) :: i,pointer_dep_list,proc,j,err_act integer(psb_ipk_) :: err integer(psb_ipk_) :: debug_level, debug_unit - integer(psb_mpk_) :: iictxt, icomm, me, np, minfo + integer(psb_ipk_) :: me, np + integer(psb_mpk_) :: icomm, minfo logical, parameter :: dist_symm_list=.false., print_dl=.false., profile=.true. logical, parameter :: do_timings=.false. integer(psb_ipk_), save :: idx_phase1=-1, idx_phase2=-1, idx_phase3=-1 @@ -157,7 +159,6 @@ subroutine psi_i_extract_dep_list(ictxt,is_bld,is_upd,desc_str,dep_list,& call psb_erractionsave(err_act) debug_unit = psb_get_debug_unit() debug_level = psb_get_debug_level() - iictxt = ictxt info = psb_success_ if ((do_timings).and.(idx_phase1==-1)) & & idx_phase1 = psb_get_timer_idx("PSI_XTR_DL: phase1 ") @@ -166,7 +167,7 @@ subroutine psi_i_extract_dep_list(ictxt,is_bld,is_upd,desc_str,dep_list,& !!$ if ((do_timings).and.(idx_phase3==-1)) & !!$ & idx_phase3 = psb_get_timer_idx("PSI_XTR_DL: phase3") - call psb_info(iictxt,me,np) + call psb_info(ictxt,me,np) if (do_timings) call psb_tic(idx_phase1) allocate(itmp(2*np+1),length_dl(0:np),stat=info) @@ -270,7 +271,7 @@ subroutine psi_i_extract_dep_list(ictxt,is_bld,is_upd,desc_str,dep_list,& call psb_realloc(length_dl(me),itmp,info) call psi_symm_dep_list(itmp,ictxt,info) dl_lda = max(size(itmp),1) - call psb_max(iictxt, dl_lda) + call psb_max(ictxt, dl_lda) if (debug_level >= psb_debug_inner_) & & write(debug_unit,*) me,' ',trim(name),': Dep_list length ',length_dl(me),dl_lda @@ -282,8 +283,8 @@ subroutine psi_i_extract_dep_list(ictxt,is_bld,is_upd,desc_str,dep_list,& goto 9999 end if - call psb_sum(iictxt,length_dl(0:np)) - icomm = psb_get_mpi_comm(iictxt) + call psb_sum(ictxt,length_dl(0:np)) + icomm = psb_get_mpi_comm(ictxt) call mpi_allgather(itmp,dl_lda,psb_mpi_ipk_,& & dep_list,dl_lda,psb_mpi_ipk_,icomm,minfo) info = minfo @@ -298,7 +299,7 @@ subroutine psi_i_extract_dep_list(ictxt,is_bld,is_upd,desc_str,dep_list,& integer(psb_ipk_) :: i,j,ip,dlsym, ldu, mdl, l1, l2 dl_lda = max(length_dl(me),1) - call psb_max(iictxt, dl_lda) + call psb_max(ictxt, dl_lda) if (debug_level >= psb_debug_inner_) & & write(debug_unit,*) me,' ',trim(name),': Dep_list length ',length_dl(me),dl_lda allocate(dep_list(dl_lda,0:np),stat=info) @@ -306,8 +307,8 @@ subroutine psi_i_extract_dep_list(ictxt,is_bld,is_upd,desc_str,dep_list,& call psb_errpush(psb_err_from_subroutine_,name,a_err='Allocate') goto 9999 end if - call psb_sum(iictxt,length_dl(0:np)) - icomm = psb_get_mpi_comm(iictxt) + call psb_sum(ictxt,length_dl(0:np)) + icomm = psb_get_mpi_comm(ictxt) call mpi_allgather(itmp,dl_lda,psb_mpi_ipk_,& & dep_list,dl_lda,psb_mpi_ipk_,icomm,minfo) info = minfo diff --git a/base/internals/psi_fnd_owner.F90 b/base/internals/psi_fnd_owner.F90 index f2a22e0e..06fb2494 100644 --- a/base/internals/psi_fnd_owner.F90 +++ b/base/internals/psi_fnd_owner.F90 @@ -74,7 +74,8 @@ subroutine psi_fnd_owner(nv,idx,iprc,desc,info) integer(psb_ipk_) :: i,n_row,n_col,err_act,ih,icomm,hsize,ip,isz,k,j,& & last_ih, last_j - integer(psb_ipk_) :: ictxt,np,me + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np,me logical, parameter :: gettime=.false. real(psb_dpk_) :: t0, t1, t2, t3, t4, tamx, tidx character(len=20) :: name diff --git a/base/internals/psi_graph_fnd_owner.F90 b/base/internals/psi_graph_fnd_owner.F90 index 485c4806..318adcdf 100644 --- a/base/internals/psi_graph_fnd_owner.F90 +++ b/base/internals/psi_graph_fnd_owner.F90 @@ -99,12 +99,13 @@ subroutine psi_graph_fnd_owner(idx,iprc,idxmap,info) integer(psb_lpk_), allocatable :: tidx(:) integer(psb_ipk_), allocatable :: tprc(:), tsmpl(:), ladj(:) - integer(psb_mpk_) :: icomm, minfo, iictxt + integer(psb_mpk_) :: icomm, minfo integer(psb_ipk_) :: i,n_row,n_col,err_act,ip,j,ipnt, nsampl_out,& & nv, n_answers, nqries, nsampl_in, locr_max, & & nqries_max, nadj, maxspace, mxnsin integer(psb_lpk_) :: mglob, ih - integer(psb_ipk_) :: ictxt,np,me, nresp + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np,me, nresp integer(psb_ipk_), parameter :: nt=4 integer(psb_ipk_) :: tmpv(4) logical, parameter :: do_timings=.false., trace=.false., debugsz=.false. @@ -121,7 +122,7 @@ subroutine psi_graph_fnd_owner(idx,iprc,idxmap,info) mglob = idxmap%get_gr() n_row = idxmap%get_lr() n_col = idxmap%get_lc() - iictxt = ictxt + if ((do_timings).and.(idx_sweep0==-1)) & & idx_sweep0 = psb_get_timer_idx("GRPH_FND_OWN: Outer sweep") if ((do_timings).and.(idx_loop_a2a==-1)) & @@ -360,7 +361,8 @@ contains integer(psb_ipk_), intent(in) :: adj(:) class(psb_indx_map), intent(inout) :: idxmap ! - integer(psb_ipk_) :: ipnt, ns_in, ns_out, n_rem, ictxt, me, np, isw + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: ipnt, ns_in, ns_out, n_rem, me, np, isw integer(psb_lpk_), allocatable :: tidx(:) integer(psb_ipk_), allocatable :: tsmpl(:) diff --git a/base/internals/psi_indx_map_fnd_owner.F90 b/base/internals/psi_indx_map_fnd_owner.F90 index 25f900f0..9641903e 100644 --- a/base/internals/psi_indx_map_fnd_owner.F90 +++ b/base/internals/psi_indx_map_fnd_owner.F90 @@ -73,11 +73,12 @@ subroutine psi_indx_map_fnd_owner(idx,iprc,idxmap,info) integer(psb_ipk_), allocatable :: hhidx(:) - integer(psb_mpk_) :: icomm, minfo, iictxt + integer(psb_mpk_) :: icomm, minfo integer(psb_ipk_) :: i, err_act, hsize integer(psb_lpk_) :: nv integer(psb_lpk_) :: mglob - integer(psb_ipk_) :: ictxt,np,me, nresp + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np,me, nresp logical, parameter :: gettime=.false. real(psb_dpk_) :: t0, t1, t2, t3, t4, tamx, tidx character(len=20) :: name @@ -89,7 +90,6 @@ subroutine psi_indx_map_fnd_owner(idx,iprc,idxmap,info) ictxt = idxmap%get_ctxt() icomm = idxmap%get_mpic() mglob = idxmap%get_gr() - iictxt = ictxt call psb_info(ictxt, me, np) diff --git a/base/internals/psi_sort_dl.f90 b/base/internals/psi_sort_dl.f90 index c4e3ea07..64306364 100644 --- a/base/internals/psi_sort_dl.f90 +++ b/base/internals/psi_sort_dl.f90 @@ -85,8 +85,8 @@ subroutine psi_i_csr_sort_dl(dl_ptr,c_dep_list,l_dep_list,ictxt,info) implicit none integer(psb_ipk_), intent(inout) :: c_dep_list(:), dl_ptr(0:), l_dep_list(0:) - integer(psb_ipk_), intent(in) :: ictxt - integer(psb_ipk_), intent(out) :: info + type(psb_ctxt_type), intent(in) :: ictxt + integer(psb_ipk_), intent(out) :: info ! Local variables integer(psb_ipk_), allocatable :: dg(:), dgp(:),& & idx(:), upd(:), edges(:,:), ich(:) diff --git a/base/internals/psi_symm_dep_list.F90 b/base/internals/psi_symm_dep_list.F90 index cd2894c1..fb7b8b0b 100644 --- a/base/internals/psi_symm_dep_list.F90 +++ b/base/internals/psi_symm_dep_list.F90 @@ -54,8 +54,8 @@ subroutine psi_symm_dep_list_inrv(rvsz,adj,ictxt,info) #endif integer(psb_mpk_), intent(inout) :: rvsz(0:) integer(psb_ipk_), allocatable, intent(inout) :: adj(:) - integer(psb_ipk_), intent(in) :: ictxt - integer(psb_ipk_), intent(out) :: info + type(psb_ctxt_type), intent(in) :: ictxt + integer(psb_ipk_), intent(out) :: info ! integer(psb_ipk_), allocatable :: ladj(:) @@ -70,15 +70,13 @@ subroutine psi_symm_dep_list_inrv(rvsz,adj,ictxt,info) name = 'psi_symm_dep_list' call psb_erractionsave(err_act) - icomm = psb_get_mpi_comm(ictxt) - call psb_info(ictxt, me, np) - if (np == -1) then info = psb_err_context_error_ call psb_errpush(info,name) goto 9999 endif + icomm = psb_get_mpi_comm(ictxt) nadj = size(adj) @@ -134,8 +132,8 @@ subroutine psi_symm_dep_list_norv(adj,ictxt,info) include 'mpif.h' #endif integer(psb_ipk_), allocatable, intent(inout) :: adj(:) - integer(psb_ipk_), intent(in) :: ictxt - integer(psb_ipk_), intent(out) :: info + type(psb_ctxt_type), intent(in) :: ictxt + integer(psb_ipk_), intent(out) :: info ! integer(psb_mpk_), allocatable :: rvsz(:), sdsz(:) @@ -144,22 +142,21 @@ subroutine psi_symm_dep_list_norv(adj,ictxt,info) integer(psb_ipk_) :: i,n_row,n_col,err_act,hsize,ip,& & last_ih, last_j, nidx, nrecv, nadj integer(psb_ipk_) :: mglob, ih - integer(psb_ipk_) :: np,me + integer(psb_ipk_) :: np, me character(len=20) :: name info = psb_success_ name = 'psi_symm_dep_list' call psb_erractionsave(err_act) - icomm = psb_get_mpi_comm(ictxt) call psb_info(ictxt, me, np) - if (np == -1) then info = psb_err_context_error_ call psb_errpush(info,name) goto 9999 endif + icomm = psb_get_mpi_comm(ictxt) nadj = size(adj) diff --git a/base/internals/psi_xtr_loc_dl.F90 b/base/internals/psi_xtr_loc_dl.F90 index c97cc7a5..5ae93cdb 100644 --- a/base/internals/psi_xtr_loc_dl.F90 +++ b/base/internals/psi_xtr_loc_dl.F90 @@ -122,11 +122,11 @@ subroutine psi_i_xtr_loc_dl(ictxt,is_bld,is_upd,desc_str,loc_dl,length_dl,info) include 'mpif.h' #endif ! ....scalar parameters... - logical, intent(in) :: is_bld, is_upd - integer(psb_ipk_), intent(in) :: ictxt - integer(psb_ipk_), intent(in) :: desc_str(:) + logical, intent(in) :: is_bld, is_upd + type(psb_ctxt_type), intent(in) :: ictxt + integer(psb_ipk_), intent(in) :: desc_str(:) integer(psb_ipk_), allocatable, intent(out) :: loc_dl(:), length_dl(:) - integer(psb_ipk_), intent(out) :: info + integer(psb_ipk_), intent(out) :: info ! .....local arrays.... integer(psb_ipk_) :: int_err(5) @@ -134,7 +134,7 @@ subroutine psi_i_xtr_loc_dl(ictxt,is_bld,is_upd,desc_str,loc_dl,length_dl,info) integer(psb_ipk_) :: i,pdl,proc,j,err_act, ldu integer(psb_ipk_) :: err integer(psb_ipk_) :: debug_level, debug_unit - integer(psb_mpk_) :: iictxt, icomm, me, np, minfo + integer(psb_ipk_) :: me, np logical, parameter :: dist_symm_list=.true., print_dl=.false., profile=.true. character name*20 name='psi_extrct_dl' @@ -142,10 +142,9 @@ subroutine psi_i_xtr_loc_dl(ictxt,is_bld,is_upd,desc_str,loc_dl,length_dl,info) call psb_erractionsave(err_act) debug_unit = psb_get_debug_unit() debug_level = psb_get_debug_level() - iictxt = ictxt info = psb_success_ - call psb_info(iictxt,me,np) + call psb_info(ictxt,me,np) pdl = size(desc_str) allocate(loc_dl(pdl+1),length_dl(0:np),stat=info) if (info /= psb_success_) then diff --git a/base/modules/Makefile b/base/modules/Makefile index 238ab9ca..4d01299f 100644 --- a/base/modules/Makefile +++ b/base/modules/Makefile @@ -1,6 +1,7 @@ include ../../Make.inc BASIC_MODS= psb_const_mod.o psb_cbind_const_mod.o psb_error_mod.o psb_realloc_mod.o \ + auxil/psb_string_mod.o \ auxil/psb_m_realloc_mod.o \ auxil/psb_e_realloc_mod.o \ auxil/psb_s_realloc_mod.o \ @@ -8,8 +9,8 @@ BASIC_MODS= psb_const_mod.o psb_cbind_const_mod.o psb_error_mod.o psb_realloc_mo auxil/psb_c_realloc_mod.o \ auxil/psb_z_realloc_mod.o -COMMINT=penv/psi_penv_mod.o \ - penv/psi_p2p_mod.o penv/psi_m_p2p_mod.o \ +COMMINT= penv/psi_penv_mod.o \ + penv/psi_p2p_mod.o penv/psi_m_p2p_mod.o \ penv/psi_e_p2p_mod.o \ penv/psi_s_p2p_mod.o \ penv/psi_d_p2p_mod.o \ @@ -23,38 +24,9 @@ COMMINT=penv/psi_penv_mod.o \ penv/psi_c_collective_mod.o \ penv/psi_z_collective_mod.o -UTIL_MODS = auxil/psb_string_mod.o desc/psb_desc_const_mod.o desc/psb_indx_map_mod.o\ - desc/psb_gen_block_map_mod.o desc/psb_list_map_mod.o desc/psb_repl_map_mod.o\ - desc/psb_glist_map_mod.o desc/psb_hash_map_mod.o desc/psb_hashval.o \ - desc/psb_desc_mod.o auxil/psb_sort_mod.o \ - serial/psb_s_serial_mod.o serial/psb_d_serial_mod.o \ +SERIAL_MODS=serial/psb_s_serial_mod.o serial/psb_d_serial_mod.o \ serial/psb_c_serial_mod.o serial/psb_z_serial_mod.o \ serial/psb_serial_mod.o \ - tools/psb_cd_tools_mod.o \ - tools/psb_i_tools_mod.o tools/psb_l_tools_mod.o \ - tools/psb_s_tools_mod.o tools/psb_d_tools_mod.o\ - tools/psb_c_tools_mod.o tools/psb_z_tools_mod.o \ - tools/psb_m_tools_a_mod.o tools/psb_e_tools_a_mod.o \ - tools/psb_s_tools_a_mod.o tools/psb_d_tools_a_mod.o\ - tools/psb_c_tools_a_mod.o tools/psb_z_tools_a_mod.o \ - tools/psb_tools_mod.o \ - psb_penv_mod.o $(COMMINT) psb_error_impl.o psb_timers_mod.o \ - comm/psb_base_linmap_mod.o comm/psb_linmap_mod.o \ - comm/psb_s_linmap_mod.o comm/psb_d_linmap_mod.o \ - comm/psb_c_linmap_mod.o comm/psb_z_linmap_mod.o \ - comm/psb_comm_mod.o \ - comm/psb_i_comm_mod.o comm/psb_l_comm_mod.o \ - comm/psb_s_comm_mod.o comm/psb_d_comm_mod.o\ - comm/psb_c_comm_mod.o comm/psb_z_comm_mod.o \ - comm/psb_m_comm_a_mod.o comm/psb_e_comm_a_mod.o \ - comm/psb_s_comm_a_mod.o comm/psb_d_comm_a_mod.o\ - comm/psb_c_comm_a_mod.o comm/psb_z_comm_a_mod.o \ - comm/psi_e_comm_a_mod.o comm/psi_m_comm_a_mod.o \ - comm/psi_s_comm_a_mod.o comm/psi_d_comm_a_mod.o \ - comm/psi_c_comm_a_mod.o comm/psi_z_comm_a_mod.o \ - comm/psi_i_comm_v_mod.o comm/psi_l_comm_v_mod.o \ - comm/psi_s_comm_v_mod.o comm/psi_d_comm_v_mod.o \ - comm/psi_c_comm_v_mod.o comm/psi_z_comm_v_mod.o \ serial/psb_i_base_vect_mod.o serial/psb_i_vect_mod.o\ serial/psb_l_base_vect_mod.o serial/psb_l_vect_mod.o\ serial/psb_d_base_vect_mod.o serial/psb_d_vect_mod.o\ @@ -62,9 +34,6 @@ UTIL_MODS = auxil/psb_string_mod.o desc/psb_desc_const_mod.o desc/psb_indx_map_m serial/psb_c_base_vect_mod.o serial/psb_c_vect_mod.o\ serial/psb_z_base_vect_mod.o serial/psb_z_vect_mod.o\ serial/psb_vect_mod.o\ - psblas/psb_s_psblas_mod.o psblas/psb_c_psblas_mod.o \ - psblas/psb_d_psblas_mod.o psblas/psb_z_psblas_mod.o \ - psblas/psb_psblas_mod.o \ auxil/psi_serial_mod.o auxil/psi_m_serial_mod.o auxil/psi_e_serial_mod.o \ auxil/psi_s_serial_mod.o auxil/psi_d_serial_mod.o \ auxil/psi_c_serial_mod.o auxil/psi_z_serial_mod.o \ @@ -91,7 +60,6 @@ UTIL_MODS = auxil/psb_string_mod.o desc/psb_desc_const_mod.o desc/psb_indx_map_m auxil/psb_d_hsort_x_mod.o \ auxil/psb_c_hsort_x_mod.o \ auxil/psb_z_hsort_x_mod.o \ - psb_check_mod.o desc/psb_hash_mod.o\ serial/psb_base_mat_mod.o serial/psb_mat_mod.o\ serial/psb_s_base_mat_mod.o serial/psb_s_csr_mat_mod.o serial/psb_s_csc_mat_mod.o serial/psb_s_mat_mod.o \ serial/psb_d_base_mat_mod.o serial/psb_d_csr_mat_mod.o serial/psb_d_csc_mat_mod.o serial/psb_d_mat_mod.o \ @@ -102,9 +70,43 @@ UTIL_MODS = auxil/psb_string_mod.o desc/psb_desc_const_mod.o desc/psb_indx_map_m #\ # serial/psb_ld_base_mat_mod.o serial/psb_lbase_mat_mod.o serial/psb_ld_csc_mat_mod.o serial/psb_ld_csr_mat_mod.o +UTIL_MODS = desc/psb_desc_const_mod.o desc/psb_indx_map_mod.o\ + desc/psb_gen_block_map_mod.o desc/psb_list_map_mod.o desc/psb_repl_map_mod.o\ + desc/psb_glist_map_mod.o desc/psb_hash_map_mod.o desc/psb_hashval.o \ + desc/psb_desc_mod.o auxil/psb_sort_mod.o \ + tools/psb_cd_tools_mod.o \ + tools/psb_i_tools_mod.o tools/psb_l_tools_mod.o \ + tools/psb_s_tools_mod.o tools/psb_d_tools_mod.o\ + tools/psb_c_tools_mod.o tools/psb_z_tools_mod.o \ + tools/psb_m_tools_a_mod.o tools/psb_e_tools_a_mod.o \ + tools/psb_s_tools_a_mod.o tools/psb_d_tools_a_mod.o\ + tools/psb_c_tools_a_mod.o tools/psb_z_tools_a_mod.o \ + tools/psb_tools_mod.o \ + psb_penv_mod.o $(COMMINT) psb_error_impl.o psb_timers_mod.o \ + comm/psb_base_linmap_mod.o comm/psb_linmap_mod.o \ + comm/psb_s_linmap_mod.o comm/psb_d_linmap_mod.o \ + comm/psb_c_linmap_mod.o comm/psb_z_linmap_mod.o \ + comm/psb_comm_mod.o \ + comm/psb_i_comm_mod.o comm/psb_l_comm_mod.o \ + comm/psb_s_comm_mod.o comm/psb_d_comm_mod.o\ + comm/psb_c_comm_mod.o comm/psb_z_comm_mod.o \ + comm/psb_m_comm_a_mod.o comm/psb_e_comm_a_mod.o \ + comm/psb_s_comm_a_mod.o comm/psb_d_comm_a_mod.o\ + comm/psb_c_comm_a_mod.o comm/psb_z_comm_a_mod.o \ + comm/psi_e_comm_a_mod.o comm/psi_m_comm_a_mod.o \ + comm/psi_s_comm_a_mod.o comm/psi_d_comm_a_mod.o \ + comm/psi_c_comm_a_mod.o comm/psi_z_comm_a_mod.o \ + comm/psi_i_comm_v_mod.o comm/psi_l_comm_v_mod.o \ + comm/psi_s_comm_v_mod.o comm/psi_d_comm_v_mod.o \ + comm/psi_c_comm_v_mod.o comm/psi_z_comm_v_mod.o \ + psblas/psb_s_psblas_mod.o psblas/psb_c_psblas_mod.o \ + psblas/psb_d_psblas_mod.o psblas/psb_z_psblas_mod.o \ + psblas/psb_psblas_mod.o \ + psb_check_mod.o desc/psb_hash_mod.o + -MODULES=$(BASIC_MODS) $(UTIL_MODS) +MODULES=$(BASIC_MODS) $(SERIAL_MODS) $(UTIL_MODS) OBJS = error.o psb_base_mod.o $(EXTRA_COBJS) cutil.o LIBDIR=.. CINCLUDES=-I. @@ -118,8 +120,8 @@ $(LIBDIR)/$(LIBNAME): $(MODULES) $(OBJS) $(MPFOBJS) $(AR) $(LIBDIR)/$(LIBNAME) $(MODULES) $(OBJS) $(MPFOBJS) $(RANLIB) $(LIBDIR)/$(LIBNAME) - -psb_error_mod.o: psb_const_mod.o +$(OBJS): $(MODULES) +psb_error_mod.o: psb_const_mod.o psb_realloc_mod.o \ auxil/psb_m_realloc_mod.o \ auxil/psb_e_realloc_mod.o \ @@ -161,7 +163,7 @@ penv/psi_d_collective_mod.o penv/psi_c_collective_mod.o penv/psi_z_collective_m auxil/psb_string_mod.o desc/psb_desc_const_mod.o psi_penv_mod.o: psb_const_mod.o -desc/psb_hash_mod.o: psb_realloc_mod.o psb_const_mod.o desc/psb_desc_const_mod.o +desc/psb_indx_map_mod.o desc/psb_hash_mod.o: psb_realloc_mod.o psb_const_mod.o desc/psb_desc_const_mod.o auxil/psb_i_sort_mod.o auxil/psb_s_sort_mod.o auxil/psb_d_sort_mod.o auxil/psb_c_sort_mod.o auxil/psb_z_sort_mod.o \ auxil/psb_ip_reord_mod.o auxil/psi_serial_mod.o auxil/psb_sort_mod.o: $(BASIC_MODS) auxil/psb_sort_mod.o: auxil/psb_m_hsort_mod.o auxil/psb_m_isort_mod.o \ @@ -272,7 +274,7 @@ desc/psb_glist_map_mod.o: desc/psb_list_map_mod.o desc/psb_hash_map_mod.o: desc/psb_hash_mod.o auxil/psb_sort_mod.o desc/psb_gen_block_map_mod.o: desc/psb_hash_mod.o desc/psb_hash_mod.o: psb_cbind_const_mod.o - +psb_cbind_const_mod.o: psb_const_mod.o psb_check_mod.o: desc/psb_desc_mod.o comm/psb_linmap_mod.o: comm/psb_s_linmap_mod.o comm/psb_d_linmap_mod.o comm/psb_c_linmap_mod.o comm/psb_z_linmap_mod.o @@ -346,7 +348,7 @@ psblas/psb_s_psblas_mod.o psblas/psb_c_psblas_mod.o psblas/psb_d_psblas_mod.o ps psb_base_mod.o: $(MODULES) -penv/psi_penv_mod.o: penv/psi_penv_mod.F90 $(BASIC_MODS) serial/psb_vect_mod.o serial/psb_mat_mod.o +penv/psi_penv_mod.o: penv/psi_penv_mod.F90 psb_const_mod.o serial/psb_vect_mod.o serial/psb_mat_mod.o $(FC) $(FINCLUDES) $(FDEFINES) $(FCOPT) $(EXTRA_OPT) -c $< -o $@ psb_penv_mod.o: psb_penv_mod.F90 $(COMMINT) $(BASIC_MODS) diff --git a/base/modules/comm/psb_c_comm_a_mod.f90 b/base/modules/comm/psb_c_comm_a_mod.f90 index 5d0b236e..0fbcf01e 100644 --- a/base/modules/comm/psb_c_comm_a_mod.f90 +++ b/base/modules/comm/psb_c_comm_a_mod.f90 @@ -38,7 +38,7 @@ module psb_c_comm_a_mod implicit none complex(psb_spk_), intent(inout), target :: x(:,:) type(psb_desc_type), intent(in) :: desc_a - integer(psb_ipk_), intent(out) :: info + integer(psb_ipk_), intent(out) :: info complex(psb_spk_), intent(inout), optional, target :: work(:) integer(psb_ipk_), intent(in), optional :: update,jx,ik,mode end subroutine psb_covrlm @@ -47,7 +47,7 @@ module psb_c_comm_a_mod implicit none complex(psb_spk_), intent(inout), target :: x(:) type(psb_desc_type), intent(in) :: desc_a - integer(psb_ipk_), intent(out) :: info + integer(psb_ipk_), intent(out) :: info complex(psb_spk_), intent(inout), optional, target :: work(:) integer(psb_ipk_), intent(in), optional :: update,mode end subroutine psb_covrlv @@ -68,8 +68,8 @@ module psb_c_comm_a_mod import implicit none complex(psb_spk_), intent(inout) :: x(:) - type(psb_desc_type), intent(in) :: desc_a - integer(psb_ipk_), intent(out) :: info + type(psb_desc_type), intent(in) :: desc_a + integer(psb_ipk_), intent(out) :: info complex(psb_spk_), target, optional, intent(inout) :: work(:) integer(psb_ipk_), intent(in), optional :: mode,data character, intent(in), optional :: tran diff --git a/base/modules/comm/psb_d_comm_a_mod.f90 b/base/modules/comm/psb_d_comm_a_mod.f90 index 8053f2d5..5fb410f2 100644 --- a/base/modules/comm/psb_d_comm_a_mod.f90 +++ b/base/modules/comm/psb_d_comm_a_mod.f90 @@ -38,7 +38,7 @@ module psb_d_comm_a_mod implicit none real(psb_dpk_), intent(inout), target :: x(:,:) type(psb_desc_type), intent(in) :: desc_a - integer(psb_ipk_), intent(out) :: info + integer(psb_ipk_), intent(out) :: info real(psb_dpk_), intent(inout), optional, target :: work(:) integer(psb_ipk_), intent(in), optional :: update,jx,ik,mode end subroutine psb_dovrlm @@ -47,7 +47,7 @@ module psb_d_comm_a_mod implicit none real(psb_dpk_), intent(inout), target :: x(:) type(psb_desc_type), intent(in) :: desc_a - integer(psb_ipk_), intent(out) :: info + integer(psb_ipk_), intent(out) :: info real(psb_dpk_), intent(inout), optional, target :: work(:) integer(psb_ipk_), intent(in), optional :: update,mode end subroutine psb_dovrlv @@ -68,8 +68,8 @@ module psb_d_comm_a_mod import implicit none real(psb_dpk_), intent(inout) :: x(:) - type(psb_desc_type), intent(in) :: desc_a - integer(psb_ipk_), intent(out) :: info + type(psb_desc_type), intent(in) :: desc_a + integer(psb_ipk_), intent(out) :: info real(psb_dpk_), target, optional, intent(inout) :: work(:) integer(psb_ipk_), intent(in), optional :: mode,data character, intent(in), optional :: tran diff --git a/base/modules/comm/psb_e_comm_a_mod.f90 b/base/modules/comm/psb_e_comm_a_mod.f90 index 46057d94..0e57a459 100644 --- a/base/modules/comm/psb_e_comm_a_mod.f90 +++ b/base/modules/comm/psb_e_comm_a_mod.f90 @@ -39,7 +39,7 @@ module psb_e_comm_a_mod implicit none integer(psb_epk_), intent(inout), target :: x(:,:) type(psb_desc_type), intent(in) :: desc_a - integer(psb_ipk_), intent(out) :: info + integer(psb_ipk_), intent(out) :: info integer(psb_epk_), intent(inout), optional, target :: work(:) integer(psb_ipk_), intent(in), optional :: update,jx,ik,mode end subroutine psb_eovrlm @@ -48,7 +48,7 @@ module psb_e_comm_a_mod implicit none integer(psb_epk_), intent(inout), target :: x(:) type(psb_desc_type), intent(in) :: desc_a - integer(psb_ipk_), intent(out) :: info + integer(psb_ipk_), intent(out) :: info integer(psb_epk_), intent(inout), optional, target :: work(:) integer(psb_ipk_), intent(in), optional :: update,mode end subroutine psb_eovrlv @@ -69,8 +69,8 @@ module psb_e_comm_a_mod import implicit none integer(psb_epk_), intent(inout) :: x(:) - type(psb_desc_type), intent(in) :: desc_a - integer(psb_ipk_), intent(out) :: info + type(psb_desc_type), intent(in) :: desc_a + integer(psb_ipk_), intent(out) :: info integer(psb_epk_), target, optional, intent(inout) :: work(:) integer(psb_ipk_), intent(in), optional :: mode,data character, intent(in), optional :: tran diff --git a/base/modules/comm/psb_i2_comm_a_mod.f90 b/base/modules/comm/psb_i2_comm_a_mod.f90 index 09398722..72cdf228 100644 --- a/base/modules/comm/psb_i2_comm_a_mod.f90 +++ b/base/modules/comm/psb_i2_comm_a_mod.f90 @@ -39,7 +39,7 @@ module psb_i2_comm_a_mod implicit none integer(psb_i2pk_), intent(inout), target :: x(:,:) type(psb_desc_type), intent(in) :: desc_a - integer(psb_ipk_), intent(out) :: info + integer(psb_ipk_), intent(out) :: info integer(psb_i2pk_), intent(inout), optional, target :: work(:) integer(psb_ipk_), intent(in), optional :: update,jx,ik,mode end subroutine psb_i2ovrlm @@ -48,7 +48,7 @@ module psb_i2_comm_a_mod implicit none integer(psb_i2pk_), intent(inout), target :: x(:) type(psb_desc_type), intent(in) :: desc_a - integer(psb_ipk_), intent(out) :: info + integer(psb_ipk_), intent(out) :: info integer(psb_i2pk_), intent(inout), optional, target :: work(:) integer(psb_ipk_), intent(in), optional :: update,mode end subroutine psb_i2ovrlv @@ -69,8 +69,8 @@ module psb_i2_comm_a_mod import implicit none integer(psb_i2pk_), intent(inout) :: x(:) - type(psb_desc_type), intent(in) :: desc_a - integer(psb_ipk_), intent(out) :: info + type(psb_desc_type), intent(in) :: desc_a + integer(psb_ipk_), intent(out) :: info integer(psb_i2pk_), target, optional, intent(inout) :: work(:) integer(psb_ipk_), intent(in), optional :: mode,data character, intent(in), optional :: tran diff --git a/base/modules/comm/psb_m_comm_a_mod.f90 b/base/modules/comm/psb_m_comm_a_mod.f90 index dbec118a..105f14d7 100644 --- a/base/modules/comm/psb_m_comm_a_mod.f90 +++ b/base/modules/comm/psb_m_comm_a_mod.f90 @@ -39,7 +39,7 @@ module psb_m_comm_a_mod implicit none integer(psb_mpk_), intent(inout), target :: x(:,:) type(psb_desc_type), intent(in) :: desc_a - integer(psb_ipk_), intent(out) :: info + integer(psb_ipk_), intent(out) :: info integer(psb_mpk_), intent(inout), optional, target :: work(:) integer(psb_ipk_), intent(in), optional :: update,jx,ik,mode end subroutine psb_movrlm @@ -48,7 +48,7 @@ module psb_m_comm_a_mod implicit none integer(psb_mpk_), intent(inout), target :: x(:) type(psb_desc_type), intent(in) :: desc_a - integer(psb_ipk_), intent(out) :: info + integer(psb_ipk_), intent(out) :: info integer(psb_mpk_), intent(inout), optional, target :: work(:) integer(psb_ipk_), intent(in), optional :: update,mode end subroutine psb_movrlv @@ -69,8 +69,8 @@ module psb_m_comm_a_mod import implicit none integer(psb_mpk_), intent(inout) :: x(:) - type(psb_desc_type), intent(in) :: desc_a - integer(psb_ipk_), intent(out) :: info + type(psb_desc_type), intent(in) :: desc_a + integer(psb_ipk_), intent(out) :: info integer(psb_mpk_), target, optional, intent(inout) :: work(:) integer(psb_ipk_), intent(in), optional :: mode,data character, intent(in), optional :: tran diff --git a/base/modules/comm/psb_s_comm_a_mod.f90 b/base/modules/comm/psb_s_comm_a_mod.f90 index 9e7a768a..5ceaad8b 100644 --- a/base/modules/comm/psb_s_comm_a_mod.f90 +++ b/base/modules/comm/psb_s_comm_a_mod.f90 @@ -38,7 +38,7 @@ module psb_s_comm_a_mod implicit none real(psb_spk_), intent(inout), target :: x(:,:) type(psb_desc_type), intent(in) :: desc_a - integer(psb_ipk_), intent(out) :: info + integer(psb_ipk_), intent(out) :: info real(psb_spk_), intent(inout), optional, target :: work(:) integer(psb_ipk_), intent(in), optional :: update,jx,ik,mode end subroutine psb_sovrlm @@ -47,7 +47,7 @@ module psb_s_comm_a_mod implicit none real(psb_spk_), intent(inout), target :: x(:) type(psb_desc_type), intent(in) :: desc_a - integer(psb_ipk_), intent(out) :: info + integer(psb_ipk_), intent(out) :: info real(psb_spk_), intent(inout), optional, target :: work(:) integer(psb_ipk_), intent(in), optional :: update,mode end subroutine psb_sovrlv @@ -68,8 +68,8 @@ module psb_s_comm_a_mod import implicit none real(psb_spk_), intent(inout) :: x(:) - type(psb_desc_type), intent(in) :: desc_a - integer(psb_ipk_), intent(out) :: info + type(psb_desc_type), intent(in) :: desc_a + integer(psb_ipk_), intent(out) :: info real(psb_spk_), target, optional, intent(inout) :: work(:) integer(psb_ipk_), intent(in), optional :: mode,data character, intent(in), optional :: tran diff --git a/base/modules/comm/psb_z_comm_a_mod.f90 b/base/modules/comm/psb_z_comm_a_mod.f90 index 0c276945..708efead 100644 --- a/base/modules/comm/psb_z_comm_a_mod.f90 +++ b/base/modules/comm/psb_z_comm_a_mod.f90 @@ -38,7 +38,7 @@ module psb_z_comm_a_mod implicit none complex(psb_dpk_), intent(inout), target :: x(:,:) type(psb_desc_type), intent(in) :: desc_a - integer(psb_ipk_), intent(out) :: info + integer(psb_ipk_), intent(out) :: info complex(psb_dpk_), intent(inout), optional, target :: work(:) integer(psb_ipk_), intent(in), optional :: update,jx,ik,mode end subroutine psb_zovrlm @@ -47,7 +47,7 @@ module psb_z_comm_a_mod implicit none complex(psb_dpk_), intent(inout), target :: x(:) type(psb_desc_type), intent(in) :: desc_a - integer(psb_ipk_), intent(out) :: info + integer(psb_ipk_), intent(out) :: info complex(psb_dpk_), intent(inout), optional, target :: work(:) integer(psb_ipk_), intent(in), optional :: update,mode end subroutine psb_zovrlv @@ -68,8 +68,8 @@ module psb_z_comm_a_mod import implicit none complex(psb_dpk_), intent(inout) :: x(:) - type(psb_desc_type), intent(in) :: desc_a - integer(psb_ipk_), intent(out) :: info + type(psb_desc_type), intent(in) :: desc_a + integer(psb_ipk_), intent(out) :: info complex(psb_dpk_), target, optional, intent(inout) :: work(:) integer(psb_ipk_), intent(in), optional :: mode,data character, intent(in), optional :: tran diff --git a/base/modules/comm/psi_c_comm_a_mod.f90 b/base/modules/comm/psi_c_comm_a_mod.f90 index 030d7465..05724a9d 100644 --- a/base/modules/comm/psi_c_comm_a_mod.f90 +++ b/base/modules/comm/psi_c_comm_a_mod.f90 @@ -30,7 +30,8 @@ ! ! module psi_c_comm_a_mod - use psb_desc_mod, only : psb_desc_type, psb_ipk_, psb_spk_, psb_i_base_vect_type + use psi_penv_mod, only : psb_ctxt_type + use psb_desc_mod, only : psb_desc_type, psb_mpk_, psb_ipk_, psb_spk_, psb_i_base_vect_type interface psi_swapdata subroutine psi_cswapdatam(flag,n,beta,y,desc_a,work,info,data) @@ -54,8 +55,10 @@ module psi_c_comm_a_mod subroutine psi_cswapidxm(ictxt,icomm,flag,n,beta,y,idx,& & totxch,totsnd,totrcv,work,info) import - integer(psb_ipk_), intent(in) :: ictxt,icomm,flag, n - integer(psb_ipk_), intent(out) :: info + type(psb_ctxt_type), intent(in) :: ictxt + integer(psb_mpk_), intent(in) :: icomm + integer(psb_ipk_), intent(in) :: flag, n + integer(psb_ipk_), intent(out) :: info complex(psb_spk_) :: y(:,:), beta complex(psb_spk_),target :: work(:) integer(psb_ipk_), intent(in) :: idx(:),totxch,totsnd,totrcv @@ -63,8 +66,10 @@ module psi_c_comm_a_mod subroutine psi_cswapidxv(ictxt,icomm,flag,beta,y,idx,& & totxch,totsnd,totrcv,work,info) import - integer(psb_ipk_), intent(in) :: ictxt,icomm,flag - integer(psb_ipk_), intent(out) :: info + type(psb_ctxt_type), intent(in) :: ictxt + integer(psb_Mpk_), intent(in) :: icomm + integer(psb_ipk_), intent(in) :: flag + integer(psb_ipk_), intent(out) :: info complex(psb_spk_) :: y(:), beta complex(psb_spk_),target :: work(:) integer(psb_ipk_), intent(in) :: idx(:),totxch,totsnd,totrcv @@ -94,8 +99,10 @@ module psi_c_comm_a_mod subroutine psi_ctranidxm(ictxt,icomm,flag,n,beta,y,idx,& & totxch,totsnd,totrcv,work,info) import - integer(psb_ipk_), intent(in) :: ictxt,icomm,flag, n - integer(psb_ipk_), intent(out) :: info + type(psb_ctxt_type), intent(in) :: ictxt + integer(psb_mpk_), intent(in) :: icomm + integer(psb_ipk_), intent(in) :: flag, n + integer(psb_ipk_), intent(out) :: info complex(psb_spk_) :: y(:,:), beta complex(psb_spk_),target :: work(:) integer(psb_ipk_), intent(in) :: idx(:),totxch,totsnd,totrcv @@ -103,8 +110,10 @@ module psi_c_comm_a_mod subroutine psi_ctranidxv(ictxt,icomm,flag,beta,y,idx,& & totxch,totsnd,totrcv,work,info) import - integer(psb_ipk_), intent(in) :: ictxt,icomm,flag - integer(psb_ipk_), intent(out) :: info + type(psb_ctxt_type), intent(in) :: ictxt + integer(psb_mpk_), intent(in) :: icomm + integer(psb_ipk_), intent(in) :: flag + integer(psb_ipk_), intent(out) :: info complex(psb_spk_) :: y(:), beta complex(psb_spk_),target :: work(:) integer(psb_ipk_), intent(in) :: idx(:),totxch,totsnd,totrcv @@ -115,16 +124,16 @@ module psi_c_comm_a_mod subroutine psi_covrl_updr1(x,desc_a,update,info) import complex(psb_spk_), intent(inout), target :: x(:) - type(psb_desc_type), intent(in) :: desc_a - integer(psb_ipk_), intent(in) :: update - integer(psb_ipk_), intent(out) :: info + type(psb_desc_type), intent(in) :: desc_a + integer(psb_ipk_), intent(in) :: update + integer(psb_ipk_), intent(out) :: info end subroutine psi_covrl_updr1 subroutine psi_covrl_updr2(x,desc_a,update,info) import complex(psb_spk_), intent(inout), target :: x(:,:) - type(psb_desc_type), intent(in) :: desc_a - integer(psb_ipk_), intent(in) :: update - integer(psb_ipk_), intent(out) :: info + type(psb_desc_type), intent(in) :: desc_a + integer(psb_ipk_), intent(in) :: update + integer(psb_ipk_), intent(out) :: info end subroutine psi_covrl_updr2 end interface psi_ovrl_upd @@ -134,14 +143,14 @@ module psi_c_comm_a_mod complex(psb_spk_), intent(inout) :: x(:) complex(psb_spk_), allocatable :: xs(:) type(psb_desc_type), intent(in) :: desc_a - integer(psb_ipk_), intent(out) :: info + integer(psb_ipk_), intent(out) :: info end subroutine psi_covrl_saver1 subroutine psi_covrl_saver2(x,xs,desc_a,info) import complex(psb_spk_), intent(inout) :: x(:,:) complex(psb_spk_), allocatable :: xs(:,:) type(psb_desc_type), intent(in) :: desc_a - integer(psb_ipk_), intent(out) :: info + integer(psb_ipk_), intent(out) :: info end subroutine psi_covrl_saver2 end interface psi_ovrl_save @@ -151,14 +160,14 @@ module psi_c_comm_a_mod complex(psb_spk_), intent(inout) :: x(:) complex(psb_spk_) :: xs(:) type(psb_desc_type), intent(in) :: desc_a - integer(psb_ipk_), intent(out) :: info + integer(psb_ipk_), intent(out) :: info end subroutine psi_covrl_restrr1 subroutine psi_covrl_restrr2(x,xs,desc_a,info) import complex(psb_spk_), intent(inout) :: x(:,:) complex(psb_spk_) :: xs(:,:) type(psb_desc_type), intent(in) :: desc_a - integer(psb_ipk_), intent(out) :: info + integer(psb_ipk_), intent(out) :: info end subroutine psi_covrl_restrr2 end interface psi_ovrl_restore diff --git a/base/modules/comm/psi_c_comm_v_mod.f90 b/base/modules/comm/psi_c_comm_v_mod.f90 index 78fee8ae..3a2037a2 100644 --- a/base/modules/comm/psi_c_comm_v_mod.f90 +++ b/base/modules/comm/psi_c_comm_v_mod.f90 @@ -30,7 +30,8 @@ ! ! module psi_c_comm_v_mod - use psb_desc_mod, only : psb_desc_type, psb_ipk_, psb_spk_, psb_i_base_vect_type + use psi_penv_mod, only : psb_ctxt_type + use psb_desc_mod, only : psb_desc_type, psb_ipk_, psb_mpk_, psb_spk_, psb_i_base_vect_type use psb_c_base_vect_mod, only : psb_c_base_vect_type use psb_c_base_multivect_mod, only : psb_c_base_multivect_type @@ -43,7 +44,7 @@ module psi_c_comm_v_mod complex(psb_spk_) :: beta complex(psb_spk_),target :: work(:) type(psb_desc_type), target :: desc_a - integer(psb_ipk_), optional :: data + integer(psb_ipk_), optional :: data end subroutine psi_cswapdata_vect subroutine psi_cswapdata_multivect(flag,beta,y,desc_a,work,info,data) import @@ -53,12 +54,14 @@ module psi_c_comm_v_mod complex(psb_spk_) :: beta complex(psb_spk_),target :: work(:) type(psb_desc_type), target :: desc_a - integer(psb_ipk_), optional :: data + integer(psb_ipk_), optional :: data end subroutine psi_cswapdata_multivect subroutine psi_cswap_vidx_vect(iictxt,iicomm,flag,beta,y,idx,& & totxch,totsnd,totrcv,work,info) import - integer(psb_ipk_), intent(in) :: iictxt,iicomm,flag + type(psb_ctxt_type), intent(in) :: iictxt + integer(psb_mpk_), intent(in) :: iicomm + integer(psb_ipk_), intent(in) :: flag integer(psb_ipk_), intent(out) :: info class(psb_c_base_vect_type) :: y complex(psb_spk_) :: beta @@ -69,9 +72,11 @@ module psi_c_comm_v_mod subroutine psi_cswap_vidx_multivect(iictxt,iicomm,flag,beta,y,idx,& & totxch,totsnd,totrcv,work,info) import - integer(psb_ipk_), intent(in) :: iictxt,iicomm,flag - integer(psb_ipk_), intent(out) :: info - class(psb_c_base_multivect_type) :: y + type(psb_ctxt_type), intent(in) :: iictxt + integer(psb_mpk_), intent(in) :: iicomm + integer(psb_ipk_), intent(in) :: flag + integer(psb_ipk_), intent(out) :: info + class(psb_c_base_multivect_type) :: y complex(psb_spk_) :: beta complex(psb_spk_), target :: work(:) class(psb_i_base_vect_type), intent(inout) :: idx @@ -104,9 +109,11 @@ module psi_c_comm_v_mod subroutine psi_ctran_vidx_vect(iictxt,iicomm,flag,beta,y,idx,& & totxch,totsnd,totrcv,work,info) import - integer(psb_ipk_), intent(in) :: iictxt,iicomm,flag - integer(psb_ipk_), intent(out) :: info - class(psb_c_base_vect_type) :: y + type(psb_ctxt_type), intent(in) :: iictxt + integer(psb_mpk_), intent(in) :: iicomm + integer(psb_ipk_), intent(in) :: flag + integer(psb_ipk_), intent(out) :: info + class(psb_c_base_vect_type) :: y complex(psb_spk_) :: beta complex(psb_spk_), target :: work(:) class(psb_i_base_vect_type), intent(inout) :: idx @@ -115,8 +122,10 @@ module psi_c_comm_v_mod subroutine psi_ctran_vidx_multivect(iictxt,iicomm,flag,beta,y,idx,& & totxch,totsnd,totrcv,work,info) import - integer(psb_ipk_), intent(in) :: iictxt,iicomm,flag - integer(psb_ipk_), intent(out) :: info + type(psb_ctxt_type), intent(in) :: iictxt + integer(psb_mpk_), intent(in) :: iicomm + integer(psb_ipk_), intent(in) :: flag + integer(psb_ipk_), intent(out) :: info class(psb_c_base_multivect_type) :: y complex(psb_spk_) :: beta complex(psb_spk_), target :: work(:) diff --git a/base/modules/comm/psi_d_comm_a_mod.f90 b/base/modules/comm/psi_d_comm_a_mod.f90 index 43b74b1d..c8bcc3a2 100644 --- a/base/modules/comm/psi_d_comm_a_mod.f90 +++ b/base/modules/comm/psi_d_comm_a_mod.f90 @@ -30,7 +30,8 @@ ! ! module psi_d_comm_a_mod - use psb_desc_mod, only : psb_desc_type, psb_ipk_, psb_dpk_, psb_i_base_vect_type + use psi_penv_mod, only : psb_ctxt_type + use psb_desc_mod, only : psb_desc_type, psb_mpk_, psb_ipk_, psb_dpk_, psb_i_base_vect_type interface psi_swapdata subroutine psi_dswapdatam(flag,n,beta,y,desc_a,work,info,data) @@ -54,8 +55,10 @@ module psi_d_comm_a_mod subroutine psi_dswapidxm(ictxt,icomm,flag,n,beta,y,idx,& & totxch,totsnd,totrcv,work,info) import - integer(psb_ipk_), intent(in) :: ictxt,icomm,flag, n - integer(psb_ipk_), intent(out) :: info + type(psb_ctxt_type), intent(in) :: ictxt + integer(psb_mpk_), intent(in) :: icomm + integer(psb_ipk_), intent(in) :: flag, n + integer(psb_ipk_), intent(out) :: info real(psb_dpk_) :: y(:,:), beta real(psb_dpk_),target :: work(:) integer(psb_ipk_), intent(in) :: idx(:),totxch,totsnd,totrcv @@ -63,8 +66,10 @@ module psi_d_comm_a_mod subroutine psi_dswapidxv(ictxt,icomm,flag,beta,y,idx,& & totxch,totsnd,totrcv,work,info) import - integer(psb_ipk_), intent(in) :: ictxt,icomm,flag - integer(psb_ipk_), intent(out) :: info + type(psb_ctxt_type), intent(in) :: ictxt + integer(psb_Mpk_), intent(in) :: icomm + integer(psb_ipk_), intent(in) :: flag + integer(psb_ipk_), intent(out) :: info real(psb_dpk_) :: y(:), beta real(psb_dpk_),target :: work(:) integer(psb_ipk_), intent(in) :: idx(:),totxch,totsnd,totrcv @@ -94,8 +99,10 @@ module psi_d_comm_a_mod subroutine psi_dtranidxm(ictxt,icomm,flag,n,beta,y,idx,& & totxch,totsnd,totrcv,work,info) import - integer(psb_ipk_), intent(in) :: ictxt,icomm,flag, n - integer(psb_ipk_), intent(out) :: info + type(psb_ctxt_type), intent(in) :: ictxt + integer(psb_mpk_), intent(in) :: icomm + integer(psb_ipk_), intent(in) :: flag, n + integer(psb_ipk_), intent(out) :: info real(psb_dpk_) :: y(:,:), beta real(psb_dpk_),target :: work(:) integer(psb_ipk_), intent(in) :: idx(:),totxch,totsnd,totrcv @@ -103,8 +110,10 @@ module psi_d_comm_a_mod subroutine psi_dtranidxv(ictxt,icomm,flag,beta,y,idx,& & totxch,totsnd,totrcv,work,info) import - integer(psb_ipk_), intent(in) :: ictxt,icomm,flag - integer(psb_ipk_), intent(out) :: info + type(psb_ctxt_type), intent(in) :: ictxt + integer(psb_mpk_), intent(in) :: icomm + integer(psb_ipk_), intent(in) :: flag + integer(psb_ipk_), intent(out) :: info real(psb_dpk_) :: y(:), beta real(psb_dpk_),target :: work(:) integer(psb_ipk_), intent(in) :: idx(:),totxch,totsnd,totrcv @@ -115,16 +124,16 @@ module psi_d_comm_a_mod subroutine psi_dovrl_updr1(x,desc_a,update,info) import real(psb_dpk_), intent(inout), target :: x(:) - type(psb_desc_type), intent(in) :: desc_a - integer(psb_ipk_), intent(in) :: update - integer(psb_ipk_), intent(out) :: info + type(psb_desc_type), intent(in) :: desc_a + integer(psb_ipk_), intent(in) :: update + integer(psb_ipk_), intent(out) :: info end subroutine psi_dovrl_updr1 subroutine psi_dovrl_updr2(x,desc_a,update,info) import real(psb_dpk_), intent(inout), target :: x(:,:) - type(psb_desc_type), intent(in) :: desc_a - integer(psb_ipk_), intent(in) :: update - integer(psb_ipk_), intent(out) :: info + type(psb_desc_type), intent(in) :: desc_a + integer(psb_ipk_), intent(in) :: update + integer(psb_ipk_), intent(out) :: info end subroutine psi_dovrl_updr2 end interface psi_ovrl_upd @@ -134,14 +143,14 @@ module psi_d_comm_a_mod real(psb_dpk_), intent(inout) :: x(:) real(psb_dpk_), allocatable :: xs(:) type(psb_desc_type), intent(in) :: desc_a - integer(psb_ipk_), intent(out) :: info + integer(psb_ipk_), intent(out) :: info end subroutine psi_dovrl_saver1 subroutine psi_dovrl_saver2(x,xs,desc_a,info) import real(psb_dpk_), intent(inout) :: x(:,:) real(psb_dpk_), allocatable :: xs(:,:) type(psb_desc_type), intent(in) :: desc_a - integer(psb_ipk_), intent(out) :: info + integer(psb_ipk_), intent(out) :: info end subroutine psi_dovrl_saver2 end interface psi_ovrl_save @@ -151,14 +160,14 @@ module psi_d_comm_a_mod real(psb_dpk_), intent(inout) :: x(:) real(psb_dpk_) :: xs(:) type(psb_desc_type), intent(in) :: desc_a - integer(psb_ipk_), intent(out) :: info + integer(psb_ipk_), intent(out) :: info end subroutine psi_dovrl_restrr1 subroutine psi_dovrl_restrr2(x,xs,desc_a,info) import real(psb_dpk_), intent(inout) :: x(:,:) real(psb_dpk_) :: xs(:,:) type(psb_desc_type), intent(in) :: desc_a - integer(psb_ipk_), intent(out) :: info + integer(psb_ipk_), intent(out) :: info end subroutine psi_dovrl_restrr2 end interface psi_ovrl_restore diff --git a/base/modules/comm/psi_d_comm_v_mod.f90 b/base/modules/comm/psi_d_comm_v_mod.f90 index 41aeab6f..bee737af 100644 --- a/base/modules/comm/psi_d_comm_v_mod.f90 +++ b/base/modules/comm/psi_d_comm_v_mod.f90 @@ -30,7 +30,8 @@ ! ! module psi_d_comm_v_mod - use psb_desc_mod, only : psb_desc_type, psb_ipk_, psb_dpk_, psb_i_base_vect_type + use psi_penv_mod, only : psb_ctxt_type + use psb_desc_mod, only : psb_desc_type, psb_ipk_, psb_mpk_, psb_dpk_, psb_i_base_vect_type use psb_d_base_vect_mod, only : psb_d_base_vect_type use psb_d_base_multivect_mod, only : psb_d_base_multivect_type @@ -43,7 +44,7 @@ module psi_d_comm_v_mod real(psb_dpk_) :: beta real(psb_dpk_),target :: work(:) type(psb_desc_type), target :: desc_a - integer(psb_ipk_), optional :: data + integer(psb_ipk_), optional :: data end subroutine psi_dswapdata_vect subroutine psi_dswapdata_multivect(flag,beta,y,desc_a,work,info,data) import @@ -53,12 +54,14 @@ module psi_d_comm_v_mod real(psb_dpk_) :: beta real(psb_dpk_),target :: work(:) type(psb_desc_type), target :: desc_a - integer(psb_ipk_), optional :: data + integer(psb_ipk_), optional :: data end subroutine psi_dswapdata_multivect subroutine psi_dswap_vidx_vect(iictxt,iicomm,flag,beta,y,idx,& & totxch,totsnd,totrcv,work,info) import - integer(psb_ipk_), intent(in) :: iictxt,iicomm,flag + type(psb_ctxt_type), intent(in) :: iictxt + integer(psb_mpk_), intent(in) :: iicomm + integer(psb_ipk_), intent(in) :: flag integer(psb_ipk_), intent(out) :: info class(psb_d_base_vect_type) :: y real(psb_dpk_) :: beta @@ -69,9 +72,11 @@ module psi_d_comm_v_mod subroutine psi_dswap_vidx_multivect(iictxt,iicomm,flag,beta,y,idx,& & totxch,totsnd,totrcv,work,info) import - integer(psb_ipk_), intent(in) :: iictxt,iicomm,flag - integer(psb_ipk_), intent(out) :: info - class(psb_d_base_multivect_type) :: y + type(psb_ctxt_type), intent(in) :: iictxt + integer(psb_mpk_), intent(in) :: iicomm + integer(psb_ipk_), intent(in) :: flag + integer(psb_ipk_), intent(out) :: info + class(psb_d_base_multivect_type) :: y real(psb_dpk_) :: beta real(psb_dpk_), target :: work(:) class(psb_i_base_vect_type), intent(inout) :: idx @@ -104,9 +109,11 @@ module psi_d_comm_v_mod subroutine psi_dtran_vidx_vect(iictxt,iicomm,flag,beta,y,idx,& & totxch,totsnd,totrcv,work,info) import - integer(psb_ipk_), intent(in) :: iictxt,iicomm,flag - integer(psb_ipk_), intent(out) :: info - class(psb_d_base_vect_type) :: y + type(psb_ctxt_type), intent(in) :: iictxt + integer(psb_mpk_), intent(in) :: iicomm + integer(psb_ipk_), intent(in) :: flag + integer(psb_ipk_), intent(out) :: info + class(psb_d_base_vect_type) :: y real(psb_dpk_) :: beta real(psb_dpk_), target :: work(:) class(psb_i_base_vect_type), intent(inout) :: idx @@ -115,8 +122,10 @@ module psi_d_comm_v_mod subroutine psi_dtran_vidx_multivect(iictxt,iicomm,flag,beta,y,idx,& & totxch,totsnd,totrcv,work,info) import - integer(psb_ipk_), intent(in) :: iictxt,iicomm,flag - integer(psb_ipk_), intent(out) :: info + type(psb_ctxt_type), intent(in) :: iictxt + integer(psb_mpk_), intent(in) :: iicomm + integer(psb_ipk_), intent(in) :: flag + integer(psb_ipk_), intent(out) :: info class(psb_d_base_multivect_type) :: y real(psb_dpk_) :: beta real(psb_dpk_), target :: work(:) diff --git a/base/modules/comm/psi_e_comm_a_mod.f90 b/base/modules/comm/psi_e_comm_a_mod.f90 index 98522486..8f268a8f 100644 --- a/base/modules/comm/psi_e_comm_a_mod.f90 +++ b/base/modules/comm/psi_e_comm_a_mod.f90 @@ -30,7 +30,8 @@ ! ! module psi_e_comm_a_mod - use psb_desc_mod, only : psb_desc_type, psb_ipk_, psb_mpk_, psb_epk_ + use psi_penv_mod, only : psb_ctxt_type + use psb_desc_mod, only : psb_desc_type, psb_mpk_, psb_ipk_, psb_epk_ interface psi_swapdata subroutine psi_eswapdatam(flag,n,beta,y,desc_a,work,info,data) @@ -54,8 +55,10 @@ module psi_e_comm_a_mod subroutine psi_eswapidxm(ictxt,icomm,flag,n,beta,y,idx,& & totxch,totsnd,totrcv,work,info) import - integer(psb_ipk_), intent(in) :: ictxt,icomm,flag, n - integer(psb_ipk_), intent(out) :: info + type(psb_ctxt_type), intent(in) :: ictxt + integer(psb_mpk_), intent(in) :: icomm + integer(psb_ipk_), intent(in) :: flag, n + integer(psb_ipk_), intent(out) :: info integer(psb_epk_) :: y(:,:), beta integer(psb_epk_),target :: work(:) integer(psb_ipk_), intent(in) :: idx(:),totxch,totsnd,totrcv @@ -63,8 +66,10 @@ module psi_e_comm_a_mod subroutine psi_eswapidxv(ictxt,icomm,flag,beta,y,idx,& & totxch,totsnd,totrcv,work,info) import - integer(psb_ipk_), intent(in) :: ictxt,icomm,flag - integer(psb_ipk_), intent(out) :: info + type(psb_ctxt_type), intent(in) :: ictxt + integer(psb_Mpk_), intent(in) :: icomm + integer(psb_ipk_), intent(in) :: flag + integer(psb_ipk_), intent(out) :: info integer(psb_epk_) :: y(:), beta integer(psb_epk_),target :: work(:) integer(psb_ipk_), intent(in) :: idx(:),totxch,totsnd,totrcv @@ -94,8 +99,10 @@ module psi_e_comm_a_mod subroutine psi_etranidxm(ictxt,icomm,flag,n,beta,y,idx,& & totxch,totsnd,totrcv,work,info) import - integer(psb_ipk_), intent(in) :: ictxt,icomm,flag, n - integer(psb_ipk_), intent(out) :: info + type(psb_ctxt_type), intent(in) :: ictxt + integer(psb_mpk_), intent(in) :: icomm + integer(psb_ipk_), intent(in) :: flag, n + integer(psb_ipk_), intent(out) :: info integer(psb_epk_) :: y(:,:), beta integer(psb_epk_),target :: work(:) integer(psb_ipk_), intent(in) :: idx(:),totxch,totsnd,totrcv @@ -103,8 +110,10 @@ module psi_e_comm_a_mod subroutine psi_etranidxv(ictxt,icomm,flag,beta,y,idx,& & totxch,totsnd,totrcv,work,info) import - integer(psb_ipk_), intent(in) :: ictxt,icomm,flag - integer(psb_ipk_), intent(out) :: info + type(psb_ctxt_type), intent(in) :: ictxt + integer(psb_mpk_), intent(in) :: icomm + integer(psb_ipk_), intent(in) :: flag + integer(psb_ipk_), intent(out) :: info integer(psb_epk_) :: y(:), beta integer(psb_epk_),target :: work(:) integer(psb_ipk_), intent(in) :: idx(:),totxch,totsnd,totrcv @@ -115,16 +124,16 @@ module psi_e_comm_a_mod subroutine psi_eovrl_updr1(x,desc_a,update,info) import integer(psb_epk_), intent(inout), target :: x(:) - type(psb_desc_type), intent(in) :: desc_a - integer(psb_ipk_), intent(in) :: update - integer(psb_ipk_), intent(out) :: info + type(psb_desc_type), intent(in) :: desc_a + integer(psb_ipk_), intent(in) :: update + integer(psb_ipk_), intent(out) :: info end subroutine psi_eovrl_updr1 subroutine psi_eovrl_updr2(x,desc_a,update,info) import integer(psb_epk_), intent(inout), target :: x(:,:) - type(psb_desc_type), intent(in) :: desc_a - integer(psb_ipk_), intent(in) :: update - integer(psb_ipk_), intent(out) :: info + type(psb_desc_type), intent(in) :: desc_a + integer(psb_ipk_), intent(in) :: update + integer(psb_ipk_), intent(out) :: info end subroutine psi_eovrl_updr2 end interface psi_ovrl_upd @@ -134,14 +143,14 @@ module psi_e_comm_a_mod integer(psb_epk_), intent(inout) :: x(:) integer(psb_epk_), allocatable :: xs(:) type(psb_desc_type), intent(in) :: desc_a - integer(psb_ipk_), intent(out) :: info + integer(psb_ipk_), intent(out) :: info end subroutine psi_eovrl_saver1 subroutine psi_eovrl_saver2(x,xs,desc_a,info) import integer(psb_epk_), intent(inout) :: x(:,:) integer(psb_epk_), allocatable :: xs(:,:) type(psb_desc_type), intent(in) :: desc_a - integer(psb_ipk_), intent(out) :: info + integer(psb_ipk_), intent(out) :: info end subroutine psi_eovrl_saver2 end interface psi_ovrl_save @@ -151,14 +160,14 @@ module psi_e_comm_a_mod integer(psb_epk_), intent(inout) :: x(:) integer(psb_epk_) :: xs(:) type(psb_desc_type), intent(in) :: desc_a - integer(psb_ipk_), intent(out) :: info + integer(psb_ipk_), intent(out) :: info end subroutine psi_eovrl_restrr1 subroutine psi_eovrl_restrr2(x,xs,desc_a,info) import integer(psb_epk_), intent(inout) :: x(:,:) integer(psb_epk_) :: xs(:,:) type(psb_desc_type), intent(in) :: desc_a - integer(psb_ipk_), intent(out) :: info + integer(psb_ipk_), intent(out) :: info end subroutine psi_eovrl_restrr2 end interface psi_ovrl_restore diff --git a/base/modules/comm/psi_i2_comm_a_mod.f90 b/base/modules/comm/psi_i2_comm_a_mod.f90 index f67b5654..b16d1621 100644 --- a/base/modules/comm/psi_i2_comm_a_mod.f90 +++ b/base/modules/comm/psi_i2_comm_a_mod.f90 @@ -30,7 +30,8 @@ ! ! module psi_i2_comm_a_mod - use psb_desc_mod, only : psb_desc_type, psb_ipk_, psb_mpk_, psb_epk_ + use psi_penv_mod, only : psb_ctxt_type + use psb_desc_mod, only : psb_desc_type, psb_mpk_, psb_ipk_, psb_epk_ interface psi_swapdata subroutine psi_i2swapdatam(flag,n,beta,y,desc_a,work,info,data) @@ -54,8 +55,10 @@ module psi_i2_comm_a_mod subroutine psi_i2swapidxm(ictxt,icomm,flag,n,beta,y,idx,& & totxch,totsnd,totrcv,work,info) import - integer(psb_ipk_), intent(in) :: ictxt,icomm,flag, n - integer(psb_ipk_), intent(out) :: info + type(psb_ctxt_type), intent(in) :: ictxt + integer(psb_mpk_), intent(in) :: icomm + integer(psb_ipk_), intent(in) :: flag, n + integer(psb_ipk_), intent(out) :: info integer(psb_i2pk_) :: y(:,:), beta integer(psb_i2pk_),target :: work(:) integer(psb_ipk_), intent(in) :: idx(:),totxch,totsnd,totrcv @@ -63,8 +66,10 @@ module psi_i2_comm_a_mod subroutine psi_i2swapidxv(ictxt,icomm,flag,beta,y,idx,& & totxch,totsnd,totrcv,work,info) import - integer(psb_ipk_), intent(in) :: ictxt,icomm,flag - integer(psb_ipk_), intent(out) :: info + type(psb_ctxt_type), intent(in) :: ictxt + integer(psb_Mpk_), intent(in) :: icomm + integer(psb_ipk_), intent(in) :: flag + integer(psb_ipk_), intent(out) :: info integer(psb_i2pk_) :: y(:), beta integer(psb_i2pk_),target :: work(:) integer(psb_ipk_), intent(in) :: idx(:),totxch,totsnd,totrcv @@ -94,8 +99,10 @@ module psi_i2_comm_a_mod subroutine psi_i2tranidxm(ictxt,icomm,flag,n,beta,y,idx,& & totxch,totsnd,totrcv,work,info) import - integer(psb_ipk_), intent(in) :: ictxt,icomm,flag, n - integer(psb_ipk_), intent(out) :: info + type(psb_ctxt_type), intent(in) :: ictxt + integer(psb_mpk_), intent(in) :: icomm + integer(psb_ipk_), intent(in) :: flag, n + integer(psb_ipk_), intent(out) :: info integer(psb_i2pk_) :: y(:,:), beta integer(psb_i2pk_),target :: work(:) integer(psb_ipk_), intent(in) :: idx(:),totxch,totsnd,totrcv @@ -103,8 +110,10 @@ module psi_i2_comm_a_mod subroutine psi_i2tranidxv(ictxt,icomm,flag,beta,y,idx,& & totxch,totsnd,totrcv,work,info) import - integer(psb_ipk_), intent(in) :: ictxt,icomm,flag - integer(psb_ipk_), intent(out) :: info + type(psb_ctxt_type), intent(in) :: ictxt + integer(psb_mpk_), intent(in) :: icomm + integer(psb_ipk_), intent(in) :: flag + integer(psb_ipk_), intent(out) :: info integer(psb_i2pk_) :: y(:), beta integer(psb_i2pk_),target :: work(:) integer(psb_ipk_), intent(in) :: idx(:),totxch,totsnd,totrcv @@ -115,16 +124,16 @@ module psi_i2_comm_a_mod subroutine psi_i2ovrl_updr1(x,desc_a,update,info) import integer(psb_i2pk_), intent(inout), target :: x(:) - type(psb_desc_type), intent(in) :: desc_a - integer(psb_ipk_), intent(in) :: update - integer(psb_ipk_), intent(out) :: info + type(psb_desc_type), intent(in) :: desc_a + integer(psb_ipk_), intent(in) :: update + integer(psb_ipk_), intent(out) :: info end subroutine psi_i2ovrl_updr1 subroutine psi_i2ovrl_updr2(x,desc_a,update,info) import integer(psb_i2pk_), intent(inout), target :: x(:,:) - type(psb_desc_type), intent(in) :: desc_a - integer(psb_ipk_), intent(in) :: update - integer(psb_ipk_), intent(out) :: info + type(psb_desc_type), intent(in) :: desc_a + integer(psb_ipk_), intent(in) :: update + integer(psb_ipk_), intent(out) :: info end subroutine psi_i2ovrl_updr2 end interface psi_ovrl_upd @@ -134,14 +143,14 @@ module psi_i2_comm_a_mod integer(psb_i2pk_), intent(inout) :: x(:) integer(psb_i2pk_), allocatable :: xs(:) type(psb_desc_type), intent(in) :: desc_a - integer(psb_ipk_), intent(out) :: info + integer(psb_ipk_), intent(out) :: info end subroutine psi_i2ovrl_saver1 subroutine psi_i2ovrl_saver2(x,xs,desc_a,info) import integer(psb_i2pk_), intent(inout) :: x(:,:) integer(psb_i2pk_), allocatable :: xs(:,:) type(psb_desc_type), intent(in) :: desc_a - integer(psb_ipk_), intent(out) :: info + integer(psb_ipk_), intent(out) :: info end subroutine psi_i2ovrl_saver2 end interface psi_ovrl_save @@ -151,14 +160,14 @@ module psi_i2_comm_a_mod integer(psb_i2pk_), intent(inout) :: x(:) integer(psb_i2pk_) :: xs(:) type(psb_desc_type), intent(in) :: desc_a - integer(psb_ipk_), intent(out) :: info + integer(psb_ipk_), intent(out) :: info end subroutine psi_i2ovrl_restrr1 subroutine psi_i2ovrl_restrr2(x,xs,desc_a,info) import integer(psb_i2pk_), intent(inout) :: x(:,:) integer(psb_i2pk_) :: xs(:,:) type(psb_desc_type), intent(in) :: desc_a - integer(psb_ipk_), intent(out) :: info + integer(psb_ipk_), intent(out) :: info end subroutine psi_i2ovrl_restrr2 end interface psi_ovrl_restore diff --git a/base/modules/comm/psi_i_comm_v_mod.f90 b/base/modules/comm/psi_i_comm_v_mod.f90 index bc4ea2a8..6e10eb80 100644 --- a/base/modules/comm/psi_i_comm_v_mod.f90 +++ b/base/modules/comm/psi_i_comm_v_mod.f90 @@ -30,6 +30,7 @@ ! ! module psi_i_comm_v_mod + use psi_penv_mod, only : psb_ctxt_type use psb_desc_mod, only : psb_desc_type, psb_ipk_, psb_mpk_, & & psb_lpk_, psb_epk_, psb_i2pk_ use psb_i_base_vect_mod, only : psb_i_base_vect_type @@ -44,7 +45,7 @@ module psi_i_comm_v_mod integer(psb_ipk_) :: beta integer(psb_ipk_),target :: work(:) type(psb_desc_type), target :: desc_a - integer(psb_ipk_), optional :: data + integer(psb_ipk_), optional :: data end subroutine psi_iswapdata_vect subroutine psi_iswapdata_multivect(flag,beta,y,desc_a,work,info,data) import @@ -54,12 +55,14 @@ module psi_i_comm_v_mod integer(psb_ipk_) :: beta integer(psb_ipk_),target :: work(:) type(psb_desc_type), target :: desc_a - integer(psb_ipk_), optional :: data + integer(psb_ipk_), optional :: data end subroutine psi_iswapdata_multivect subroutine psi_iswap_vidx_vect(iictxt,iicomm,flag,beta,y,idx,& & totxch,totsnd,totrcv,work,info) import - integer(psb_ipk_), intent(in) :: iictxt,iicomm,flag + type(psb_ctxt_type), intent(in) :: iictxt + integer(psb_mpk_), intent(in) :: iicomm + integer(psb_ipk_), intent(in) :: flag integer(psb_ipk_), intent(out) :: info class(psb_i_base_vect_type) :: y integer(psb_ipk_) :: beta @@ -70,9 +73,11 @@ module psi_i_comm_v_mod subroutine psi_iswap_vidx_multivect(iictxt,iicomm,flag,beta,y,idx,& & totxch,totsnd,totrcv,work,info) import - integer(psb_ipk_), intent(in) :: iictxt,iicomm,flag - integer(psb_ipk_), intent(out) :: info - class(psb_i_base_multivect_type) :: y + type(psb_ctxt_type), intent(in) :: iictxt + integer(psb_mpk_), intent(in) :: iicomm + integer(psb_ipk_), intent(in) :: flag + integer(psb_ipk_), intent(out) :: info + class(psb_i_base_multivect_type) :: y integer(psb_ipk_) :: beta integer(psb_ipk_), target :: work(:) class(psb_i_base_vect_type), intent(inout) :: idx @@ -105,9 +110,11 @@ module psi_i_comm_v_mod subroutine psi_itran_vidx_vect(iictxt,iicomm,flag,beta,y,idx,& & totxch,totsnd,totrcv,work,info) import - integer(psb_ipk_), intent(in) :: iictxt,iicomm,flag - integer(psb_ipk_), intent(out) :: info - class(psb_i_base_vect_type) :: y + type(psb_ctxt_type), intent(in) :: iictxt + integer(psb_mpk_), intent(in) :: iicomm + integer(psb_ipk_), intent(in) :: flag + integer(psb_ipk_), intent(out) :: info + class(psb_i_base_vect_type) :: y integer(psb_ipk_) :: beta integer(psb_ipk_), target :: work(:) class(psb_i_base_vect_type), intent(inout) :: idx @@ -116,8 +123,10 @@ module psi_i_comm_v_mod subroutine psi_itran_vidx_multivect(iictxt,iicomm,flag,beta,y,idx,& & totxch,totsnd,totrcv,work,info) import - integer(psb_ipk_), intent(in) :: iictxt,iicomm,flag - integer(psb_ipk_), intent(out) :: info + type(psb_ctxt_type), intent(in) :: iictxt + integer(psb_mpk_), intent(in) :: iicomm + integer(psb_ipk_), intent(in) :: flag + integer(psb_ipk_), intent(out) :: info class(psb_i_base_multivect_type) :: y integer(psb_ipk_) :: beta integer(psb_ipk_), target :: work(:) diff --git a/base/modules/comm/psi_l_comm_v_mod.f90 b/base/modules/comm/psi_l_comm_v_mod.f90 index 4c80b090..375c15de 100644 --- a/base/modules/comm/psi_l_comm_v_mod.f90 +++ b/base/modules/comm/psi_l_comm_v_mod.f90 @@ -30,6 +30,7 @@ ! ! module psi_l_comm_v_mod + use psi_penv_mod, only : psb_ctxt_type use psb_desc_mod, only : psb_desc_type, psb_ipk_, psb_mpk_, & & psb_lpk_, psb_epk_, psb_i2pk_ use psb_desc_mod, only : psb_desc_type, psb_ipk_, psb_mpk_, psb_lpk_, psb_epk_, psb_i_base_vect_type @@ -45,7 +46,7 @@ module psi_l_comm_v_mod integer(psb_lpk_) :: beta integer(psb_lpk_),target :: work(:) type(psb_desc_type), target :: desc_a - integer(psb_ipk_), optional :: data + integer(psb_ipk_), optional :: data end subroutine psi_lswapdata_vect subroutine psi_lswapdata_multivect(flag,beta,y,desc_a,work,info,data) import @@ -55,12 +56,14 @@ module psi_l_comm_v_mod integer(psb_lpk_) :: beta integer(psb_lpk_),target :: work(:) type(psb_desc_type), target :: desc_a - integer(psb_ipk_), optional :: data + integer(psb_ipk_), optional :: data end subroutine psi_lswapdata_multivect subroutine psi_lswap_vidx_vect(iictxt,iicomm,flag,beta,y,idx,& & totxch,totsnd,totrcv,work,info) import - integer(psb_ipk_), intent(in) :: iictxt,iicomm,flag + type(psb_ctxt_type), intent(in) :: iictxt + integer(psb_mpk_), intent(in) :: iicomm + integer(psb_ipk_), intent(in) :: flag integer(psb_ipk_), intent(out) :: info class(psb_l_base_vect_type) :: y integer(psb_lpk_) :: beta @@ -71,9 +74,11 @@ module psi_l_comm_v_mod subroutine psi_lswap_vidx_multivect(iictxt,iicomm,flag,beta,y,idx,& & totxch,totsnd,totrcv,work,info) import - integer(psb_ipk_), intent(in) :: iictxt,iicomm,flag - integer(psb_ipk_), intent(out) :: info - class(psb_l_base_multivect_type) :: y + type(psb_ctxt_type), intent(in) :: iictxt + integer(psb_mpk_), intent(in) :: iicomm + integer(psb_ipk_), intent(in) :: flag + integer(psb_ipk_), intent(out) :: info + class(psb_l_base_multivect_type) :: y integer(psb_lpk_) :: beta integer(psb_lpk_), target :: work(:) class(psb_i_base_vect_type), intent(inout) :: idx @@ -106,9 +111,11 @@ module psi_l_comm_v_mod subroutine psi_ltran_vidx_vect(iictxt,iicomm,flag,beta,y,idx,& & totxch,totsnd,totrcv,work,info) import - integer(psb_ipk_), intent(in) :: iictxt,iicomm,flag - integer(psb_ipk_), intent(out) :: info - class(psb_l_base_vect_type) :: y + type(psb_ctxt_type), intent(in) :: iictxt + integer(psb_mpk_), intent(in) :: iicomm + integer(psb_ipk_), intent(in) :: flag + integer(psb_ipk_), intent(out) :: info + class(psb_l_base_vect_type) :: y integer(psb_lpk_) :: beta integer(psb_lpk_), target :: work(:) class(psb_i_base_vect_type), intent(inout) :: idx @@ -117,8 +124,10 @@ module psi_l_comm_v_mod subroutine psi_ltran_vidx_multivect(iictxt,iicomm,flag,beta,y,idx,& & totxch,totsnd,totrcv,work,info) import - integer(psb_ipk_), intent(in) :: iictxt,iicomm,flag - integer(psb_ipk_), intent(out) :: info + type(psb_ctxt_type), intent(in) :: iictxt + integer(psb_mpk_), intent(in) :: iicomm + integer(psb_ipk_), intent(in) :: flag + integer(psb_ipk_), intent(out) :: info class(psb_l_base_multivect_type) :: y integer(psb_lpk_) :: beta integer(psb_lpk_), target :: work(:) diff --git a/base/modules/comm/psi_m_comm_a_mod.f90 b/base/modules/comm/psi_m_comm_a_mod.f90 index 4d0608c3..58ff0214 100644 --- a/base/modules/comm/psi_m_comm_a_mod.f90 +++ b/base/modules/comm/psi_m_comm_a_mod.f90 @@ -30,7 +30,8 @@ ! ! module psi_m_comm_a_mod - use psb_desc_mod, only : psb_desc_type, psb_ipk_, psb_mpk_, psb_epk_ + use psi_penv_mod, only : psb_ctxt_type + use psb_desc_mod, only : psb_desc_type, psb_mpk_, psb_ipk_, psb_epk_ interface psi_swapdata subroutine psi_mswapdatam(flag,n,beta,y,desc_a,work,info,data) @@ -54,8 +55,10 @@ module psi_m_comm_a_mod subroutine psi_mswapidxm(ictxt,icomm,flag,n,beta,y,idx,& & totxch,totsnd,totrcv,work,info) import - integer(psb_ipk_), intent(in) :: ictxt,icomm,flag, n - integer(psb_ipk_), intent(out) :: info + type(psb_ctxt_type), intent(in) :: ictxt + integer(psb_mpk_), intent(in) :: icomm + integer(psb_ipk_), intent(in) :: flag, n + integer(psb_ipk_), intent(out) :: info integer(psb_mpk_) :: y(:,:), beta integer(psb_mpk_),target :: work(:) integer(psb_ipk_), intent(in) :: idx(:),totxch,totsnd,totrcv @@ -63,8 +66,10 @@ module psi_m_comm_a_mod subroutine psi_mswapidxv(ictxt,icomm,flag,beta,y,idx,& & totxch,totsnd,totrcv,work,info) import - integer(psb_ipk_), intent(in) :: ictxt,icomm,flag - integer(psb_ipk_), intent(out) :: info + type(psb_ctxt_type), intent(in) :: ictxt + integer(psb_Mpk_), intent(in) :: icomm + integer(psb_ipk_), intent(in) :: flag + integer(psb_ipk_), intent(out) :: info integer(psb_mpk_) :: y(:), beta integer(psb_mpk_),target :: work(:) integer(psb_ipk_), intent(in) :: idx(:),totxch,totsnd,totrcv @@ -94,8 +99,10 @@ module psi_m_comm_a_mod subroutine psi_mtranidxm(ictxt,icomm,flag,n,beta,y,idx,& & totxch,totsnd,totrcv,work,info) import - integer(psb_ipk_), intent(in) :: ictxt,icomm,flag, n - integer(psb_ipk_), intent(out) :: info + type(psb_ctxt_type), intent(in) :: ictxt + integer(psb_mpk_), intent(in) :: icomm + integer(psb_ipk_), intent(in) :: flag, n + integer(psb_ipk_), intent(out) :: info integer(psb_mpk_) :: y(:,:), beta integer(psb_mpk_),target :: work(:) integer(psb_ipk_), intent(in) :: idx(:),totxch,totsnd,totrcv @@ -103,8 +110,10 @@ module psi_m_comm_a_mod subroutine psi_mtranidxv(ictxt,icomm,flag,beta,y,idx,& & totxch,totsnd,totrcv,work,info) import - integer(psb_ipk_), intent(in) :: ictxt,icomm,flag - integer(psb_ipk_), intent(out) :: info + type(psb_ctxt_type), intent(in) :: ictxt + integer(psb_mpk_), intent(in) :: icomm + integer(psb_ipk_), intent(in) :: flag + integer(psb_ipk_), intent(out) :: info integer(psb_mpk_) :: y(:), beta integer(psb_mpk_),target :: work(:) integer(psb_ipk_), intent(in) :: idx(:),totxch,totsnd,totrcv @@ -115,16 +124,16 @@ module psi_m_comm_a_mod subroutine psi_movrl_updr1(x,desc_a,update,info) import integer(psb_mpk_), intent(inout), target :: x(:) - type(psb_desc_type), intent(in) :: desc_a - integer(psb_ipk_), intent(in) :: update - integer(psb_ipk_), intent(out) :: info + type(psb_desc_type), intent(in) :: desc_a + integer(psb_ipk_), intent(in) :: update + integer(psb_ipk_), intent(out) :: info end subroutine psi_movrl_updr1 subroutine psi_movrl_updr2(x,desc_a,update,info) import integer(psb_mpk_), intent(inout), target :: x(:,:) - type(psb_desc_type), intent(in) :: desc_a - integer(psb_ipk_), intent(in) :: update - integer(psb_ipk_), intent(out) :: info + type(psb_desc_type), intent(in) :: desc_a + integer(psb_ipk_), intent(in) :: update + integer(psb_ipk_), intent(out) :: info end subroutine psi_movrl_updr2 end interface psi_ovrl_upd @@ -134,14 +143,14 @@ module psi_m_comm_a_mod integer(psb_mpk_), intent(inout) :: x(:) integer(psb_mpk_), allocatable :: xs(:) type(psb_desc_type), intent(in) :: desc_a - integer(psb_ipk_), intent(out) :: info + integer(psb_ipk_), intent(out) :: info end subroutine psi_movrl_saver1 subroutine psi_movrl_saver2(x,xs,desc_a,info) import integer(psb_mpk_), intent(inout) :: x(:,:) integer(psb_mpk_), allocatable :: xs(:,:) type(psb_desc_type), intent(in) :: desc_a - integer(psb_ipk_), intent(out) :: info + integer(psb_ipk_), intent(out) :: info end subroutine psi_movrl_saver2 end interface psi_ovrl_save @@ -151,14 +160,14 @@ module psi_m_comm_a_mod integer(psb_mpk_), intent(inout) :: x(:) integer(psb_mpk_) :: xs(:) type(psb_desc_type), intent(in) :: desc_a - integer(psb_ipk_), intent(out) :: info + integer(psb_ipk_), intent(out) :: info end subroutine psi_movrl_restrr1 subroutine psi_movrl_restrr2(x,xs,desc_a,info) import integer(psb_mpk_), intent(inout) :: x(:,:) integer(psb_mpk_) :: xs(:,:) type(psb_desc_type), intent(in) :: desc_a - integer(psb_ipk_), intent(out) :: info + integer(psb_ipk_), intent(out) :: info end subroutine psi_movrl_restrr2 end interface psi_ovrl_restore diff --git a/base/modules/comm/psi_s_comm_a_mod.f90 b/base/modules/comm/psi_s_comm_a_mod.f90 index e3fdabb2..8320dd9f 100644 --- a/base/modules/comm/psi_s_comm_a_mod.f90 +++ b/base/modules/comm/psi_s_comm_a_mod.f90 @@ -30,7 +30,8 @@ ! ! module psi_s_comm_a_mod - use psb_desc_mod, only : psb_desc_type, psb_ipk_, psb_spk_, psb_i_base_vect_type + use psi_penv_mod, only : psb_ctxt_type + use psb_desc_mod, only : psb_desc_type, psb_mpk_, psb_ipk_, psb_spk_, psb_i_base_vect_type interface psi_swapdata subroutine psi_sswapdatam(flag,n,beta,y,desc_a,work,info,data) @@ -54,8 +55,10 @@ module psi_s_comm_a_mod subroutine psi_sswapidxm(ictxt,icomm,flag,n,beta,y,idx,& & totxch,totsnd,totrcv,work,info) import - integer(psb_ipk_), intent(in) :: ictxt,icomm,flag, n - integer(psb_ipk_), intent(out) :: info + type(psb_ctxt_type), intent(in) :: ictxt + integer(psb_mpk_), intent(in) :: icomm + integer(psb_ipk_), intent(in) :: flag, n + integer(psb_ipk_), intent(out) :: info real(psb_spk_) :: y(:,:), beta real(psb_spk_),target :: work(:) integer(psb_ipk_), intent(in) :: idx(:),totxch,totsnd,totrcv @@ -63,8 +66,10 @@ module psi_s_comm_a_mod subroutine psi_sswapidxv(ictxt,icomm,flag,beta,y,idx,& & totxch,totsnd,totrcv,work,info) import - integer(psb_ipk_), intent(in) :: ictxt,icomm,flag - integer(psb_ipk_), intent(out) :: info + type(psb_ctxt_type), intent(in) :: ictxt + integer(psb_Mpk_), intent(in) :: icomm + integer(psb_ipk_), intent(in) :: flag + integer(psb_ipk_), intent(out) :: info real(psb_spk_) :: y(:), beta real(psb_spk_),target :: work(:) integer(psb_ipk_), intent(in) :: idx(:),totxch,totsnd,totrcv @@ -94,8 +99,10 @@ module psi_s_comm_a_mod subroutine psi_stranidxm(ictxt,icomm,flag,n,beta,y,idx,& & totxch,totsnd,totrcv,work,info) import - integer(psb_ipk_), intent(in) :: ictxt,icomm,flag, n - integer(psb_ipk_), intent(out) :: info + type(psb_ctxt_type), intent(in) :: ictxt + integer(psb_mpk_), intent(in) :: icomm + integer(psb_ipk_), intent(in) :: flag, n + integer(psb_ipk_), intent(out) :: info real(psb_spk_) :: y(:,:), beta real(psb_spk_),target :: work(:) integer(psb_ipk_), intent(in) :: idx(:),totxch,totsnd,totrcv @@ -103,8 +110,10 @@ module psi_s_comm_a_mod subroutine psi_stranidxv(ictxt,icomm,flag,beta,y,idx,& & totxch,totsnd,totrcv,work,info) import - integer(psb_ipk_), intent(in) :: ictxt,icomm,flag - integer(psb_ipk_), intent(out) :: info + type(psb_ctxt_type), intent(in) :: ictxt + integer(psb_mpk_), intent(in) :: icomm + integer(psb_ipk_), intent(in) :: flag + integer(psb_ipk_), intent(out) :: info real(psb_spk_) :: y(:), beta real(psb_spk_),target :: work(:) integer(psb_ipk_), intent(in) :: idx(:),totxch,totsnd,totrcv @@ -115,16 +124,16 @@ module psi_s_comm_a_mod subroutine psi_sovrl_updr1(x,desc_a,update,info) import real(psb_spk_), intent(inout), target :: x(:) - type(psb_desc_type), intent(in) :: desc_a - integer(psb_ipk_), intent(in) :: update - integer(psb_ipk_), intent(out) :: info + type(psb_desc_type), intent(in) :: desc_a + integer(psb_ipk_), intent(in) :: update + integer(psb_ipk_), intent(out) :: info end subroutine psi_sovrl_updr1 subroutine psi_sovrl_updr2(x,desc_a,update,info) import real(psb_spk_), intent(inout), target :: x(:,:) - type(psb_desc_type), intent(in) :: desc_a - integer(psb_ipk_), intent(in) :: update - integer(psb_ipk_), intent(out) :: info + type(psb_desc_type), intent(in) :: desc_a + integer(psb_ipk_), intent(in) :: update + integer(psb_ipk_), intent(out) :: info end subroutine psi_sovrl_updr2 end interface psi_ovrl_upd @@ -134,14 +143,14 @@ module psi_s_comm_a_mod real(psb_spk_), intent(inout) :: x(:) real(psb_spk_), allocatable :: xs(:) type(psb_desc_type), intent(in) :: desc_a - integer(psb_ipk_), intent(out) :: info + integer(psb_ipk_), intent(out) :: info end subroutine psi_sovrl_saver1 subroutine psi_sovrl_saver2(x,xs,desc_a,info) import real(psb_spk_), intent(inout) :: x(:,:) real(psb_spk_), allocatable :: xs(:,:) type(psb_desc_type), intent(in) :: desc_a - integer(psb_ipk_), intent(out) :: info + integer(psb_ipk_), intent(out) :: info end subroutine psi_sovrl_saver2 end interface psi_ovrl_save @@ -151,14 +160,14 @@ module psi_s_comm_a_mod real(psb_spk_), intent(inout) :: x(:) real(psb_spk_) :: xs(:) type(psb_desc_type), intent(in) :: desc_a - integer(psb_ipk_), intent(out) :: info + integer(psb_ipk_), intent(out) :: info end subroutine psi_sovrl_restrr1 subroutine psi_sovrl_restrr2(x,xs,desc_a,info) import real(psb_spk_), intent(inout) :: x(:,:) real(psb_spk_) :: xs(:,:) type(psb_desc_type), intent(in) :: desc_a - integer(psb_ipk_), intent(out) :: info + integer(psb_ipk_), intent(out) :: info end subroutine psi_sovrl_restrr2 end interface psi_ovrl_restore diff --git a/base/modules/comm/psi_s_comm_v_mod.f90 b/base/modules/comm/psi_s_comm_v_mod.f90 index 9e7f525d..419d6967 100644 --- a/base/modules/comm/psi_s_comm_v_mod.f90 +++ b/base/modules/comm/psi_s_comm_v_mod.f90 @@ -30,7 +30,8 @@ ! ! module psi_s_comm_v_mod - use psb_desc_mod, only : psb_desc_type, psb_ipk_, psb_spk_, psb_i_base_vect_type + use psi_penv_mod, only : psb_ctxt_type + use psb_desc_mod, only : psb_desc_type, psb_ipk_, psb_mpk_, psb_spk_, psb_i_base_vect_type use psb_s_base_vect_mod, only : psb_s_base_vect_type use psb_s_base_multivect_mod, only : psb_s_base_multivect_type @@ -43,7 +44,7 @@ module psi_s_comm_v_mod real(psb_spk_) :: beta real(psb_spk_),target :: work(:) type(psb_desc_type), target :: desc_a - integer(psb_ipk_), optional :: data + integer(psb_ipk_), optional :: data end subroutine psi_sswapdata_vect subroutine psi_sswapdata_multivect(flag,beta,y,desc_a,work,info,data) import @@ -53,12 +54,14 @@ module psi_s_comm_v_mod real(psb_spk_) :: beta real(psb_spk_),target :: work(:) type(psb_desc_type), target :: desc_a - integer(psb_ipk_), optional :: data + integer(psb_ipk_), optional :: data end subroutine psi_sswapdata_multivect subroutine psi_sswap_vidx_vect(iictxt,iicomm,flag,beta,y,idx,& & totxch,totsnd,totrcv,work,info) import - integer(psb_ipk_), intent(in) :: iictxt,iicomm,flag + type(psb_ctxt_type), intent(in) :: iictxt + integer(psb_mpk_), intent(in) :: iicomm + integer(psb_ipk_), intent(in) :: flag integer(psb_ipk_), intent(out) :: info class(psb_s_base_vect_type) :: y real(psb_spk_) :: beta @@ -69,9 +72,11 @@ module psi_s_comm_v_mod subroutine psi_sswap_vidx_multivect(iictxt,iicomm,flag,beta,y,idx,& & totxch,totsnd,totrcv,work,info) import - integer(psb_ipk_), intent(in) :: iictxt,iicomm,flag - integer(psb_ipk_), intent(out) :: info - class(psb_s_base_multivect_type) :: y + type(psb_ctxt_type), intent(in) :: iictxt + integer(psb_mpk_), intent(in) :: iicomm + integer(psb_ipk_), intent(in) :: flag + integer(psb_ipk_), intent(out) :: info + class(psb_s_base_multivect_type) :: y real(psb_spk_) :: beta real(psb_spk_), target :: work(:) class(psb_i_base_vect_type), intent(inout) :: idx @@ -104,9 +109,11 @@ module psi_s_comm_v_mod subroutine psi_stran_vidx_vect(iictxt,iicomm,flag,beta,y,idx,& & totxch,totsnd,totrcv,work,info) import - integer(psb_ipk_), intent(in) :: iictxt,iicomm,flag - integer(psb_ipk_), intent(out) :: info - class(psb_s_base_vect_type) :: y + type(psb_ctxt_type), intent(in) :: iictxt + integer(psb_mpk_), intent(in) :: iicomm + integer(psb_ipk_), intent(in) :: flag + integer(psb_ipk_), intent(out) :: info + class(psb_s_base_vect_type) :: y real(psb_spk_) :: beta real(psb_spk_), target :: work(:) class(psb_i_base_vect_type), intent(inout) :: idx @@ -115,8 +122,10 @@ module psi_s_comm_v_mod subroutine psi_stran_vidx_multivect(iictxt,iicomm,flag,beta,y,idx,& & totxch,totsnd,totrcv,work,info) import - integer(psb_ipk_), intent(in) :: iictxt,iicomm,flag - integer(psb_ipk_), intent(out) :: info + type(psb_ctxt_type), intent(in) :: iictxt + integer(psb_mpk_), intent(in) :: iicomm + integer(psb_ipk_), intent(in) :: flag + integer(psb_ipk_), intent(out) :: info class(psb_s_base_multivect_type) :: y real(psb_spk_) :: beta real(psb_spk_), target :: work(:) diff --git a/base/modules/comm/psi_z_comm_a_mod.f90 b/base/modules/comm/psi_z_comm_a_mod.f90 index c3dcd876..109fc60c 100644 --- a/base/modules/comm/psi_z_comm_a_mod.f90 +++ b/base/modules/comm/psi_z_comm_a_mod.f90 @@ -30,7 +30,8 @@ ! ! module psi_z_comm_a_mod - use psb_desc_mod, only : psb_desc_type, psb_ipk_, psb_dpk_, psb_i_base_vect_type + use psi_penv_mod, only : psb_ctxt_type + use psb_desc_mod, only : psb_desc_type, psb_mpk_, psb_ipk_, psb_dpk_, psb_i_base_vect_type interface psi_swapdata subroutine psi_zswapdatam(flag,n,beta,y,desc_a,work,info,data) @@ -54,8 +55,10 @@ module psi_z_comm_a_mod subroutine psi_zswapidxm(ictxt,icomm,flag,n,beta,y,idx,& & totxch,totsnd,totrcv,work,info) import - integer(psb_ipk_), intent(in) :: ictxt,icomm,flag, n - integer(psb_ipk_), intent(out) :: info + type(psb_ctxt_type), intent(in) :: ictxt + integer(psb_mpk_), intent(in) :: icomm + integer(psb_ipk_), intent(in) :: flag, n + integer(psb_ipk_), intent(out) :: info complex(psb_dpk_) :: y(:,:), beta complex(psb_dpk_),target :: work(:) integer(psb_ipk_), intent(in) :: idx(:),totxch,totsnd,totrcv @@ -63,8 +66,10 @@ module psi_z_comm_a_mod subroutine psi_zswapidxv(ictxt,icomm,flag,beta,y,idx,& & totxch,totsnd,totrcv,work,info) import - integer(psb_ipk_), intent(in) :: ictxt,icomm,flag - integer(psb_ipk_), intent(out) :: info + type(psb_ctxt_type), intent(in) :: ictxt + integer(psb_Mpk_), intent(in) :: icomm + integer(psb_ipk_), intent(in) :: flag + integer(psb_ipk_), intent(out) :: info complex(psb_dpk_) :: y(:), beta complex(psb_dpk_),target :: work(:) integer(psb_ipk_), intent(in) :: idx(:),totxch,totsnd,totrcv @@ -94,8 +99,10 @@ module psi_z_comm_a_mod subroutine psi_ztranidxm(ictxt,icomm,flag,n,beta,y,idx,& & totxch,totsnd,totrcv,work,info) import - integer(psb_ipk_), intent(in) :: ictxt,icomm,flag, n - integer(psb_ipk_), intent(out) :: info + type(psb_ctxt_type), intent(in) :: ictxt + integer(psb_mpk_), intent(in) :: icomm + integer(psb_ipk_), intent(in) :: flag, n + integer(psb_ipk_), intent(out) :: info complex(psb_dpk_) :: y(:,:), beta complex(psb_dpk_),target :: work(:) integer(psb_ipk_), intent(in) :: idx(:),totxch,totsnd,totrcv @@ -103,8 +110,10 @@ module psi_z_comm_a_mod subroutine psi_ztranidxv(ictxt,icomm,flag,beta,y,idx,& & totxch,totsnd,totrcv,work,info) import - integer(psb_ipk_), intent(in) :: ictxt,icomm,flag - integer(psb_ipk_), intent(out) :: info + type(psb_ctxt_type), intent(in) :: ictxt + integer(psb_mpk_), intent(in) :: icomm + integer(psb_ipk_), intent(in) :: flag + integer(psb_ipk_), intent(out) :: info complex(psb_dpk_) :: y(:), beta complex(psb_dpk_),target :: work(:) integer(psb_ipk_), intent(in) :: idx(:),totxch,totsnd,totrcv @@ -115,16 +124,16 @@ module psi_z_comm_a_mod subroutine psi_zovrl_updr1(x,desc_a,update,info) import complex(psb_dpk_), intent(inout), target :: x(:) - type(psb_desc_type), intent(in) :: desc_a - integer(psb_ipk_), intent(in) :: update - integer(psb_ipk_), intent(out) :: info + type(psb_desc_type), intent(in) :: desc_a + integer(psb_ipk_), intent(in) :: update + integer(psb_ipk_), intent(out) :: info end subroutine psi_zovrl_updr1 subroutine psi_zovrl_updr2(x,desc_a,update,info) import complex(psb_dpk_), intent(inout), target :: x(:,:) - type(psb_desc_type), intent(in) :: desc_a - integer(psb_ipk_), intent(in) :: update - integer(psb_ipk_), intent(out) :: info + type(psb_desc_type), intent(in) :: desc_a + integer(psb_ipk_), intent(in) :: update + integer(psb_ipk_), intent(out) :: info end subroutine psi_zovrl_updr2 end interface psi_ovrl_upd @@ -134,14 +143,14 @@ module psi_z_comm_a_mod complex(psb_dpk_), intent(inout) :: x(:) complex(psb_dpk_), allocatable :: xs(:) type(psb_desc_type), intent(in) :: desc_a - integer(psb_ipk_), intent(out) :: info + integer(psb_ipk_), intent(out) :: info end subroutine psi_zovrl_saver1 subroutine psi_zovrl_saver2(x,xs,desc_a,info) import complex(psb_dpk_), intent(inout) :: x(:,:) complex(psb_dpk_), allocatable :: xs(:,:) type(psb_desc_type), intent(in) :: desc_a - integer(psb_ipk_), intent(out) :: info + integer(psb_ipk_), intent(out) :: info end subroutine psi_zovrl_saver2 end interface psi_ovrl_save @@ -151,14 +160,14 @@ module psi_z_comm_a_mod complex(psb_dpk_), intent(inout) :: x(:) complex(psb_dpk_) :: xs(:) type(psb_desc_type), intent(in) :: desc_a - integer(psb_ipk_), intent(out) :: info + integer(psb_ipk_), intent(out) :: info end subroutine psi_zovrl_restrr1 subroutine psi_zovrl_restrr2(x,xs,desc_a,info) import complex(psb_dpk_), intent(inout) :: x(:,:) complex(psb_dpk_) :: xs(:,:) type(psb_desc_type), intent(in) :: desc_a - integer(psb_ipk_), intent(out) :: info + integer(psb_ipk_), intent(out) :: info end subroutine psi_zovrl_restrr2 end interface psi_ovrl_restore diff --git a/base/modules/comm/psi_z_comm_v_mod.f90 b/base/modules/comm/psi_z_comm_v_mod.f90 index 9e9816e6..58341880 100644 --- a/base/modules/comm/psi_z_comm_v_mod.f90 +++ b/base/modules/comm/psi_z_comm_v_mod.f90 @@ -30,7 +30,8 @@ ! ! module psi_z_comm_v_mod - use psb_desc_mod, only : psb_desc_type, psb_ipk_, psb_dpk_, psb_i_base_vect_type + use psi_penv_mod, only : psb_ctxt_type + use psb_desc_mod, only : psb_desc_type, psb_ipk_, psb_mpk_, psb_dpk_, psb_i_base_vect_type use psb_z_base_vect_mod, only : psb_z_base_vect_type use psb_z_base_multivect_mod, only : psb_z_base_multivect_type @@ -43,7 +44,7 @@ module psi_z_comm_v_mod complex(psb_dpk_) :: beta complex(psb_dpk_),target :: work(:) type(psb_desc_type), target :: desc_a - integer(psb_ipk_), optional :: data + integer(psb_ipk_), optional :: data end subroutine psi_zswapdata_vect subroutine psi_zswapdata_multivect(flag,beta,y,desc_a,work,info,data) import @@ -53,12 +54,14 @@ module psi_z_comm_v_mod complex(psb_dpk_) :: beta complex(psb_dpk_),target :: work(:) type(psb_desc_type), target :: desc_a - integer(psb_ipk_), optional :: data + integer(psb_ipk_), optional :: data end subroutine psi_zswapdata_multivect subroutine psi_zswap_vidx_vect(iictxt,iicomm,flag,beta,y,idx,& & totxch,totsnd,totrcv,work,info) import - integer(psb_ipk_), intent(in) :: iictxt,iicomm,flag + type(psb_ctxt_type), intent(in) :: iictxt + integer(psb_mpk_), intent(in) :: iicomm + integer(psb_ipk_), intent(in) :: flag integer(psb_ipk_), intent(out) :: info class(psb_z_base_vect_type) :: y complex(psb_dpk_) :: beta @@ -69,9 +72,11 @@ module psi_z_comm_v_mod subroutine psi_zswap_vidx_multivect(iictxt,iicomm,flag,beta,y,idx,& & totxch,totsnd,totrcv,work,info) import - integer(psb_ipk_), intent(in) :: iictxt,iicomm,flag - integer(psb_ipk_), intent(out) :: info - class(psb_z_base_multivect_type) :: y + type(psb_ctxt_type), intent(in) :: iictxt + integer(psb_mpk_), intent(in) :: iicomm + integer(psb_ipk_), intent(in) :: flag + integer(psb_ipk_), intent(out) :: info + class(psb_z_base_multivect_type) :: y complex(psb_dpk_) :: beta complex(psb_dpk_), target :: work(:) class(psb_i_base_vect_type), intent(inout) :: idx @@ -104,9 +109,11 @@ module psi_z_comm_v_mod subroutine psi_ztran_vidx_vect(iictxt,iicomm,flag,beta,y,idx,& & totxch,totsnd,totrcv,work,info) import - integer(psb_ipk_), intent(in) :: iictxt,iicomm,flag - integer(psb_ipk_), intent(out) :: info - class(psb_z_base_vect_type) :: y + type(psb_ctxt_type), intent(in) :: iictxt + integer(psb_mpk_), intent(in) :: iicomm + integer(psb_ipk_), intent(in) :: flag + integer(psb_ipk_), intent(out) :: info + class(psb_z_base_vect_type) :: y complex(psb_dpk_) :: beta complex(psb_dpk_), target :: work(:) class(psb_i_base_vect_type), intent(inout) :: idx @@ -115,8 +122,10 @@ module psi_z_comm_v_mod subroutine psi_ztran_vidx_multivect(iictxt,iicomm,flag,beta,y,idx,& & totxch,totsnd,totrcv,work,info) import - integer(psb_ipk_), intent(in) :: iictxt,iicomm,flag - integer(psb_ipk_), intent(out) :: info + type(psb_ctxt_type), intent(in) :: iictxt + integer(psb_mpk_), intent(in) :: iicomm + integer(psb_ipk_), intent(in) :: flag + integer(psb_ipk_), intent(out) :: info class(psb_z_base_multivect_type) :: y complex(psb_dpk_) :: beta complex(psb_dpk_), target :: work(:) diff --git a/base/modules/desc/psb_desc_mod.F90 b/base/modules/desc/psb_desc_mod.F90 index 6378c699..8d2c6190 100644 --- a/base/modules/desc/psb_desc_mod.F90 +++ b/base/modules/desc/psb_desc_mod.F90 @@ -1,4 +1,4 @@ - +! ! Parallel Sparse BLAS version 3.5 ! (C) Copyright 2006-2018 ! Salvatore Filippone @@ -399,8 +399,8 @@ contains use psb_penv_mod implicit none - integer(psb_ipk_), intent(in) :: ictxt - integer(psb_lpk_), intent(in) :: m + type(psb_ctxt_type), intent(in) :: ictxt + integer(psb_lpk_), intent(in) :: m logical :: val !locals integer(psb_ipk_) :: np,me @@ -435,7 +435,7 @@ contains function psb_is_ok_desc(desc) result(val) implicit none class(psb_desc_type), intent(in) :: desc - logical :: val + logical :: val val = .false. if (allocated(desc%indxmap)) & @@ -446,7 +446,7 @@ contains function psb_is_valid_desc(desc) result(val) implicit none class(psb_desc_type), intent(in) :: desc - logical :: val + logical :: val val = .false. if (allocated(desc%indxmap)) & @@ -468,7 +468,7 @@ contains function psb_is_upd_desc(desc) result(val) implicit none class(psb_desc_type), intent(in) :: desc - logical :: val + logical :: val val = .false. if (allocated(desc%indxmap)) & @@ -479,7 +479,7 @@ contains function psb_is_repl_desc(desc) result(val) implicit none class(psb_desc_type), intent(in) :: desc - logical :: val + logical :: val val = .false. if (allocated(desc%indxmap)) & @@ -490,7 +490,7 @@ contains function psb_is_ovl_desc(desc) result(val) implicit none class(psb_desc_type), intent(in) :: desc - logical :: val + logical :: val val = .false. if (allocated(desc%indxmap)) & @@ -502,7 +502,7 @@ contains function psb_is_asb_desc(desc) result(val) implicit none class(psb_desc_type), intent(in) :: desc - logical :: val + logical :: val val = .false. if (allocated(desc%indxmap)) & @@ -608,12 +608,11 @@ contains function psb_cd_get_context(desc) result(val) use psb_error_mod implicit none - integer(psb_ipk_) :: val + type(psb_ctxt_type) :: val class(psb_desc_type), intent(in) :: desc if (allocated(desc%indxmap)) then val = desc%indxmap%get_ctxt() else - val = -1 call psb_errpush(psb_err_invalid_cd_state_,'psb_cd_get_context') call psb_error() end if @@ -745,15 +744,16 @@ contains use psb_penv_mod implicit none - integer(psb_ipk_), intent(in) :: data - integer(psb_ipk_), pointer :: ipnt(:) - class(psb_desc_type), target :: desc - integer(psb_ipk_), intent(out) :: totxch,idxr,idxs,info + integer(psb_ipk_), intent(in) :: data + integer(psb_ipk_), pointer :: ipnt(:) + class(psb_desc_type), target :: desc + integer(psb_ipk_), intent(out) :: totxch,idxr,idxs,info !locals - integer(psb_ipk_) :: np,me,ictxt,err_act, debug_level,debug_unit - logical, parameter :: debug=.false.,debugprt=.false. - character(len=20), parameter :: name='psb_cd_get_list' + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me, err_act, debug_level, debug_unit + logical, parameter :: debug=.false., debugprt=.false. + character(len=20), parameter :: name='psb_cd_get_list' info = psb_success_ call psb_erractionsave(err_act) @@ -809,15 +809,16 @@ contains use psb_error_mod use psb_penv_mod implicit none - integer(psb_ipk_), intent(in) :: data - class(psb_i_base_vect_type), pointer :: ipnt - class(psb_desc_type), target :: desc - integer(psb_ipk_), intent(out) :: totxch,idxr,idxs,info + integer(psb_ipk_), intent(in) :: data + class(psb_i_base_vect_type), pointer :: ipnt + class(psb_desc_type), target :: desc + integer(psb_ipk_), intent(out) :: totxch,idxr,idxs,info !locals - integer(psb_ipk_) :: np,me,ictxt,err_act, debug_level,debug_unit - logical, parameter :: debug=.false.,debugprt=.false. - character(len=20), parameter :: name='psb_cd_v_get_list' + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me, err_act, debug_level, debug_unit + logical, parameter :: debug=.false., debugprt=.false. + character(len=20), parameter :: name='psb_cd_v_get_list' info = psb_success_ call psb_erractionsave(err_act) @@ -895,7 +896,8 @@ contains class(psb_desc_type), intent(inout) :: desc integer(psb_ipk_), intent(out) :: info !...locals.... - integer(psb_ipk_) :: ictxt,np,me, err_act + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me, err_act character(len=20) :: name info=psb_success_ @@ -930,7 +932,6 @@ contains !...locals.... integer(psb_ipk_) :: info - if (allocated(desc%halo_index)) & & deallocate(desc%halo_index,stat=info) @@ -990,13 +991,14 @@ contains implicit none !....parameters... - type(psb_desc_type), intent(inout) :: desc - type(psb_desc_type), intent(inout) :: desc_out - integer(psb_ipk_), intent(out) :: info + type(psb_desc_type), intent(inout) :: desc + type(psb_desc_type), intent(inout) :: desc_out + integer(psb_ipk_), intent(out) :: info !locals - integer(psb_ipk_) :: np,me,ictxt, err_act - integer(psb_ipk_) :: debug_level, debug_unit + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me, err_act + integer(psb_ipk_) :: debug_level, debug_unit character(len=20) :: name if (psb_get_errstatus() /= 0) return @@ -1010,7 +1012,7 @@ contains ! when desc is empty. ! if (desc%is_valid()) then - ictxt = psb_cd_get_context(desc) + ictxt = desc%get_ctxt() call psb_info(ictxt,me,np) if (info == psb_success_) & @@ -1083,8 +1085,9 @@ contains class(psb_desc_type), intent(inout) :: desc_out integer(psb_ipk_), intent(out) :: info !locals - integer(psb_ipk_) :: np,me,ictxt, err_act - integer(psb_ipk_) :: debug_level, debug_unit + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me, err_act + integer(psb_ipk_) :: debug_level, debug_unit character(len=20) :: name debug_unit = psb_get_debug_unit() @@ -1097,7 +1100,7 @@ contains call desc_out%free(info) if ((info == psb_success_).and.desc%is_valid()) then - ictxt = desc%get_context() + ictxt = desc%get_ctxt() ! check on blacs grid call psb_info(ictxt, me, np) @@ -1162,13 +1165,14 @@ contains use psb_penv_mod use psb_realloc_mod Implicit None - integer(psb_ipk_), allocatable, intent(out) :: tmp(:) - integer(psb_ipk_), intent(in) :: data - Type(psb_desc_type), Intent(in), target :: desc - integer(psb_ipk_), intent(out) :: info + integer(psb_ipk_), allocatable, intent(out) :: tmp(:) + integer(psb_ipk_), intent(in) :: data + Type(psb_desc_type), Intent(in), target :: desc + integer(psb_ipk_), intent(out) :: info ! .. Local Scalars .. - integer(psb_ipk_) :: incnt, outcnt, j, np, me, ictxt, l_tmp,& + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: incnt, outcnt, j, np, me, l_tmp,& & idx, proc, n_elem_send, n_elem_recv integer(psb_ipk_), pointer :: idxlist(:) integer(psb_ipk_) :: debug_level, debug_unit, err_act @@ -1180,7 +1184,7 @@ contains debug_unit = psb_get_debug_unit() debug_level = psb_get_debug_level() - ictxt = psb_cd_get_context(desc) + ictxt = desc%get_context() call psb_info(ictxt, me, np) select case(data) @@ -1248,18 +1252,19 @@ contains use psb_penv_mod use psb_realloc_mod Implicit None - integer(psb_lpk_), allocatable, intent(out) :: tmp(:) - integer(psb_ipk_), intent(in) :: data - Type(psb_desc_type), Intent(in), target :: desc - integer(psb_ipk_), intent(out) :: info + integer(psb_lpk_), allocatable, intent(out) :: tmp(:) + integer(psb_ipk_), intent(in) :: data + type(psb_desc_type), Intent(in), target :: desc + integer(psb_ipk_), intent(out) :: info ! .. Local Scalars .. - integer(psb_ipk_) :: incnt, outcnt, j, np, me, ictxt, l_tmp,& + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: incnt, outcnt, j, np, me, l_tmp,& & idx, proc, n_elem_send, n_elem_recv integer(psb_ipk_), pointer :: idxlist(:) integer(psb_lpk_) :: gidx integer(psb_ipk_) :: debug_level, debug_unit, err_act - character(len=20) :: name + character(len=20) :: name name = 'psb_cd_get_recv_idx' info = psb_success_ @@ -1267,7 +1272,7 @@ contains debug_unit = psb_get_debug_unit() debug_level = psb_get_debug_level() - ictxt = psb_cd_get_context(desc) + ictxt = desc%get_context() call psb_info(ictxt, me, np) select case(data) @@ -1338,7 +1343,7 @@ contains subroutine psb_cd_cnv(desc, mold) class(psb_desc_type), intent(inout), target :: desc - class(psb_i_base_vect_type), intent(in) :: mold + class(psb_i_base_vect_type), intent(in) :: mold call desc%v_halo_index%cnv(mold) call desc%v_ext_index%cnv(mold) @@ -1389,8 +1394,8 @@ contains integer(psb_ipk_), intent(in) :: idxin integer(psb_lpk_), intent(out) :: idxout integer(psb_ipk_), intent(out) :: info - logical, intent(in), optional :: mask - logical, intent(in), optional :: owned + logical, intent(in), optional :: mask + logical, intent(in), optional :: owned integer(psb_ipk_) :: err_act character(len=20) :: name='cd_l2g' @@ -1425,8 +1430,8 @@ contains class(psb_desc_type), intent(in) :: desc integer(psb_lpk_), intent(inout) :: idx(:) integer(psb_ipk_), intent(out) :: info - logical, intent(in), optional :: mask(:) - logical, intent(in), optional :: owned + logical, intent(in), optional :: mask(:) + logical, intent(in), optional :: owned integer(psb_ipk_) :: err_act character(len=20) :: name='cd_l2g' logical, parameter :: debug=.false. @@ -1460,8 +1465,8 @@ contains integer(psb_ipk_), intent(in) :: idxin(:) integer(psb_lpk_), intent(out) :: idxout(:) integer(psb_ipk_), intent(out) :: info - logical, intent(in), optional :: mask(:) - logical, intent(in), optional :: owned + logical, intent(in), optional :: mask(:) + logical, intent(in), optional :: owned integer(psb_ipk_) :: err_act character(len=20) :: name='cd_l2g' logical, parameter :: debug=.false. @@ -1495,8 +1500,8 @@ contains class(psb_desc_type), intent(in) :: desc integer(psb_lpk_), intent(inout) :: idx integer(psb_ipk_), intent(out) :: info - logical, intent(in), optional :: mask - logical, intent(in), optional :: owned + logical, intent(in), optional :: mask + logical, intent(in), optional :: owned integer(psb_ipk_) :: err_act character(len=20) :: name='cd_g2l' logical, parameter :: debug=.false. @@ -1530,8 +1535,8 @@ contains integer(psb_lpk_), intent(in) :: idxin integer(psb_ipk_), intent(out) :: idxout integer(psb_ipk_), intent(out) :: info - logical, intent(in), optional :: mask - logical, intent(in), optional :: owned + logical, intent(in), optional :: mask + logical, intent(in), optional :: owned integer(psb_ipk_) :: err_act character(len=20) :: name='cd_g2l' @@ -1566,8 +1571,8 @@ contains class(psb_desc_type), intent(in) :: desc integer(psb_lpk_), intent(inout) :: idx(:) integer(psb_ipk_), intent(out) :: info - logical, intent(in), optional :: mask(:) - logical, intent(in), optional :: owned + logical, intent(in), optional :: mask(:) + logical, intent(in), optional :: owned integer(psb_ipk_) :: err_act character(len=20) :: name='cd_g2l' logical, parameter :: debug=.false. @@ -1601,9 +1606,9 @@ contains integer(psb_lpk_), intent(in) :: idxin(:) integer(psb_ipk_), intent(out) :: idxout(:) integer(psb_ipk_), intent(out) :: info - logical, intent(in), optional :: mask(:) - logical, intent(in), optional :: owned - + logical, intent(in), optional :: mask(:) + logical, intent(in), optional :: owned + integer(psb_ipk_) :: err_act character(len=20) :: name='cd_g2l' logical, parameter :: debug=.false. @@ -1637,9 +1642,9 @@ contains use psb_error_mod implicit none class(psb_desc_type), intent(inout) :: desc - integer(psb_lpk_), intent(inout) :: idx - integer(psb_ipk_), intent(out) :: info - logical, intent(in), optional :: mask + integer(psb_lpk_), intent(inout) :: idx + integer(psb_ipk_), intent(out) :: info + logical, intent(in), optional :: mask integer(psb_ipk_), intent(in), optional :: lidx integer(psb_ipk_) :: err_act character(len=20) :: name='cd_g2l_ins' @@ -1671,10 +1676,10 @@ contains use psb_error_mod implicit none class(psb_desc_type), intent(inout) :: desc - integer(psb_lpk_), intent(in) :: idxin - integer(psb_ipk_), intent(out) :: idxout - integer(psb_ipk_), intent(out) :: info - logical, intent(in), optional :: mask + integer(psb_lpk_), intent(in) :: idxin + integer(psb_ipk_), intent(out) :: idxout + integer(psb_ipk_), intent(out) :: info + logical, intent(in), optional :: mask integer(psb_ipk_), intent(in), optional :: lidx integer(psb_ipk_) :: err_act @@ -1709,9 +1714,9 @@ contains use psb_error_mod implicit none class(psb_desc_type), intent(inout) :: desc - integer(psb_lpk_), intent(inout) :: idx(:) - integer(psb_ipk_), intent(out) :: info - logical, intent(in), optional :: mask(:) + integer(psb_lpk_), intent(inout) :: idx(:) + integer(psb_ipk_), intent(out) :: info + logical, intent(in), optional :: mask(:) integer(psb_ipk_), intent(in), optional :: lidx(:) integer(psb_ipk_) :: err_act @@ -1745,10 +1750,10 @@ contains use psb_error_mod implicit none class(psb_desc_type), intent(inout) :: desc - integer(psb_lpk_), intent(in) :: idxin(:) - integer(psb_ipk_), intent(out) :: idxout(:) - integer(psb_ipk_), intent(out) :: info - logical, intent(in), optional :: mask(:) + integer(psb_lpk_), intent(in) :: idxin(:) + integer(psb_ipk_), intent(out) :: idxout(:) + integer(psb_ipk_), intent(out) :: info + logical, intent(in), optional :: mask(:) integer(psb_ipk_), intent(in), optional :: lidx(:) integer(psb_ipk_) :: err_act @@ -1786,7 +1791,7 @@ contains integer(psb_ipk_), allocatable, intent(out) :: iprc(:) class(psb_desc_type), intent(inout) :: desc integer(psb_ipk_), intent(out) :: info - integer(psb_ipk_) :: err_act + integer(psb_ipk_) :: err_act character(len=20) :: name='cd_fnd_owner' logical, parameter :: debug=.false. diff --git a/base/modules/desc/psb_gen_block_map_mod.F90 b/base/modules/desc/psb_gen_block_map_mod.F90 index 6fc8123f..20dc28e4 100644 --- a/base/modules/desc/psb_gen_block_map_mod.F90 +++ b/base/modules/desc/psb_gen_block_map_mod.F90 @@ -805,8 +805,9 @@ contains logical, intent(in), optional :: mask(:) logical, intent(in), optional :: owned integer(psb_ipk_) :: i, nv, is - integer(psb_lpk_) :: tidx, ip, lip - integer(psb_ipk_) :: ictxt, iam, np + integer(psb_lpk_) :: tidx, ip, lip + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: iam, np logical :: owned_ info = 0 @@ -922,7 +923,8 @@ contains integer(psb_ipk_) :: i, nv, is, im integer(psb_lpk_) :: tidx, ip, lip - integer(psb_ipk_) :: ictxt, iam, np + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: iam, np logical :: owned_ info = 0 @@ -1938,7 +1940,8 @@ contains integer(psb_ipk_), allocatable, intent(out) :: iprc(:) class(psb_gen_block_map), intent(inout) :: idxmap integer(psb_ipk_), intent(out) :: info - integer(psb_ipk_) :: ictxt, iam, np, nv, ip, i + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: iam, np, nv, ip, i integer(psb_lpk_) :: tidx ictxt = idxmap%get_ctxt() @@ -1964,7 +1967,7 @@ contains use psb_error_mod implicit none class(psb_gen_block_map), intent(inout) :: idxmap - integer(psb_ipk_), intent(in) :: ictxt + type(psb_ctxt_type), intent(in) :: ictxt integer(psb_ipk_), intent(in) :: nl integer(psb_ipk_), intent(out) :: info ! To be implemented @@ -1976,7 +1979,7 @@ contains info = 0 call psb_info(ictxt,iam,np) if (np < 0) then - write(psb_err_unit,*) 'Invalid ictxt:',ictxt + write(psb_err_unit,*) 'Invalid ictxt' info = -1 return end if @@ -2030,7 +2033,8 @@ contains integer(psb_ipk_), intent(out) :: info integer(psb_ipk_) :: nhal, i - integer(psb_ipk_) :: ictxt, iam, np + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: iam, np logical :: debug=.false. info = 0 ictxt = idxmap%get_ctxt() @@ -2135,7 +2139,7 @@ contains implicit none class(psb_gen_block_map), intent(inout) :: idxmap integer(psb_ipk_), intent(out) :: info - integer(psb_ipk_) :: err_act, ictxt + integer(psb_ipk_) :: err_act integer(psb_ipk_) :: k, nr, nc integer(psb_lpk_) :: lk integer(psb_ipk_), allocatable :: lidx(:) diff --git a/base/modules/desc/psb_glist_map_mod.f90 b/base/modules/desc/psb_glist_map_mod.f90 index 69169b17..aa721b7d 100644 --- a/base/modules/desc/psb_glist_map_mod.f90 +++ b/base/modules/desc/psb_glist_map_mod.f90 @@ -96,7 +96,7 @@ contains use psb_error_mod implicit none class(psb_glist_map), intent(inout) :: idxmap - integer(psb_ipk_), intent(in) :: ictxt + type(psb_ctxt_type), intent(in) :: ictxt integer(psb_ipk_), intent(in) :: vg(:) integer(psb_ipk_), intent(out) :: info ! To be implemented @@ -108,7 +108,7 @@ contains info = 0 call psb_info(ictxt,iam,np) if (np < 0) then - write(psb_err_unit,*) 'Invalid ictxt:',ictxt + write(psb_err_unit,*) 'Invalid ictxt' info = -1 return end if @@ -158,8 +158,9 @@ contains integer(psb_ipk_), allocatable, intent(out) :: iprc(:) class(psb_glist_map), intent(inout) :: idxmap integer(psb_ipk_), intent(out) :: info - integer(psb_mpk_) :: ictxt, iam, np - integer(psb_lpk_) :: nv, i, ngp + type(psb_ctxt_type) :: ictxt + integer(psb_mpk_) :: iam, np + integer(psb_lpk_) :: nv, i, ngp ictxt = idxmap%get_ctxt() call psb_info(ictxt,iam,np) diff --git a/base/modules/desc/psb_hash_map_mod.f90 b/base/modules/desc/psb_hash_map_mod.f90 index ae109d5a..04ed6e75 100644 --- a/base/modules/desc/psb_hash_map_mod.f90 +++ b/base/modules/desc/psb_hash_map_mod.f90 @@ -329,7 +329,8 @@ contains logical, intent(in), optional :: owned integer(psb_ipk_) :: i, lip, nrow, nrm, is integer(psb_lpk_) :: ncol, ip, tlip, mglob - integer(psb_mpk_) :: ictxt, iam, np + type(psb_ctxt_type) :: ictxt + integer(psb_mpk_) :: iam, np logical :: owned_ info = 0 @@ -541,8 +542,9 @@ contains integer(psb_ipk_) :: i, is, lip, nrow, ncol, & & err_act integer(psb_lpk_) :: mglob, ip, nxt, tlip - integer(psb_ipk_) :: ictxt, me, np - character(len=20) :: name,ch_err + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: me, np + character(len=20) :: name,ch_err info = psb_success_ name = 'hash_g2l_ins' @@ -805,7 +807,7 @@ contains use psb_realloc_mod implicit none class(psb_hash_map), intent(inout) :: idxmap - integer(psb_ipk_), intent(in) :: ictxt + type(psb_ctxt_type), intent(in) :: ictxt integer(psb_lpk_), intent(in) :: vl(:) integer(psb_ipk_), intent(out) :: info ! To be implemented @@ -819,7 +821,7 @@ contains info = 0 call psb_info(ictxt,iam,np) if (np < 0) then - write(psb_err_unit,*) 'Invalid ictxt:',ictxt + write(psb_err_unit,*) 'Invalid ictxt' info = -1 return end if @@ -878,7 +880,7 @@ contains use psb_error_mod implicit none class(psb_hash_map), intent(inout) :: idxmap - integer(psb_ipk_), intent(in) :: ictxt + type(psb_ctxt_type), intent(in) :: ictxt integer(psb_ipk_), intent(in) :: vg(:) integer(psb_ipk_), intent(out) :: info ! To be implemented @@ -890,7 +892,7 @@ contains info = 0 call psb_info(ictxt,iam,np) if (np < 0) then - write(psb_err_unit,*) 'Invalid ictxt:',ictxt + write(psb_err_unit,*) 'Invalid ictxt:' info = -1 return end if @@ -938,7 +940,7 @@ contains use psb_realloc_mod implicit none class(psb_hash_map), intent(inout) :: idxmap - integer(psb_ipk_), intent(in) :: ictxt + type(psb_ctxt_type), intent(in) :: ictxt integer(psb_lpk_), intent(in) :: vlu(:), ntot integer(psb_ipk_), intent(in) :: nl integer(psb_ipk_), intent(out) :: info @@ -950,7 +952,7 @@ contains info = 0 call psb_info(ictxt,iam,np) if (np < 0) then - write(psb_err_unit,*) 'Invalid ictxt:',ictxt + write(psb_err_unit,*) 'Invalid ictxt:' info = -1 return end if @@ -996,10 +998,11 @@ contains class(psb_hash_map), intent(inout) :: idxmap integer(psb_ipk_), intent(out) :: info ! To be implemented - integer(psb_mpk_) :: ictxt, iam, np - integer(psb_ipk_) :: i, j, m, nl - integer(psb_ipk_) :: ih, nh, idx, nbits - integer(psb_lpk_) :: key, hsize, hmask + type(psb_ctxt_type) :: ictxt + integer(psb_mpk_) :: iam, np + integer(psb_ipk_) :: i, j, m, nl + integer(psb_ipk_) :: ih, nh, idx, nbits + integer(psb_lpk_) :: key, hsize, hmask character(len=20), parameter :: name='hash_map_init_vlu' info = 0 @@ -1007,7 +1010,7 @@ contains call psb_info(ictxt,iam,np) if (np < 0) then - write(psb_err_unit,*) 'Invalid ictxt:',ictxt + write(psb_err_unit,*) 'Invalid ictxt:' info = -1 return end if @@ -1098,10 +1101,11 @@ contains use psb_sort_mod implicit none class(psb_hash_map), intent(inout) :: idxmap - integer(psb_ipk_), intent(out) :: info + integer(psb_ipk_), intent(out) :: info - integer(psb_mpk_) :: ictxt, iam, np - integer(psb_ipk_) :: nhal + type(psb_ctxt_type) :: ictxt + integer(psb_mpk_) :: iam, np + integer(psb_ipk_) :: nhal info = 0 ictxt = idxmap%get_ctxt() @@ -1534,7 +1538,8 @@ contains integer(psb_ipk_) :: err_act, nr,nc,k, nl integer(psb_lpk_) :: lk integer(psb_lpk_) :: ntot - integer(psb_ipk_) :: ictxt, me, np + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: me, np integer(psb_ipk_), allocatable :: lidx(:), tadj(:), th_own(:) integer(psb_lpk_), allocatable :: gidx(:) character(len=20) :: name='hash_reinit' diff --git a/base/modules/desc/psb_indx_map_mod.f90 b/base/modules/desc/psb_indx_map_mod.f90 index dd72280b..a8752007 100644 --- a/base/modules/desc/psb_indx_map_mod.f90 +++ b/base/modules/desc/psb_indx_map_mod.f90 @@ -40,7 +40,7 @@ module psb_indx_map_mod use psb_const_mod use psb_desc_const_mod - + use psi_penv_mod, only : psb_ctxt_type ! !> \namespace psb_base_mod \class psb_indx_map !! \brief Object to handle the mapping between global and local indices. @@ -106,19 +106,19 @@ module psb_indx_map_mod !! type :: psb_indx_map !> State of the map - integer(psb_ipk_) :: state = psb_desc_null_ + integer(psb_ipk_) :: state = psb_desc_null_ !> Communication context - integer(psb_ipk_) :: ictxt = -1 + type(psb_ctxt_type) :: ictxt !> MPI communicator - integer(psb_mpk_) :: mpic = -1 + integer(psb_mpk_) :: mpic = -1 !> Number of global rows - integer(psb_lpk_) :: global_rows = -1 + integer(psb_lpk_) :: global_rows = -1 !> Number of global columns - integer(psb_lpk_) :: global_cols = -1 + integer(psb_lpk_) :: global_cols = -1 !> Number of local rows - integer(psb_ipk_) :: local_rows = -1 + integer(psb_ipk_) :: local_rows = -1 !> Number of local columns - integer(psb_ipk_) :: local_cols = -1 + integer(psb_ipk_) :: local_cols = -1 !> A pointer to the user-defined parts subroutine procedure(psb_parts), nopass, pointer :: parts => null() !> The global vector assigning indices to processes, temp copy @@ -335,18 +335,20 @@ module psb_indx_map_mod integer, parameter :: psi_symm_flag_inrv_ = 1 interface psi_symm_dep_list subroutine psi_symm_dep_list_inrv(rvsz,adj,ictxt,info) - import :: psb_indx_map, psb_ipk_, psb_lpk_, psb_mpk_ + import :: psb_indx_map, psb_ipk_, psb_lpk_, psb_mpk_, & + & psb_ctxt_type implicit none integer(psb_mpk_), intent(inout) :: rvsz(0:) integer(psb_ipk_), allocatable, intent(inout) :: adj(:) - integer(psb_ipk_), intent(in) :: ictxt + type(psb_ctxt_type), intent(in) :: ictxt integer(psb_ipk_), intent(out) :: info end subroutine psi_symm_dep_list_inrv subroutine psi_symm_dep_list_norv(adj,ictxt,info) - import :: psb_indx_map, psb_ipk_, psb_lpk_, psb_mpk_ + import :: psb_indx_map, psb_ipk_, psb_lpk_, psb_mpk_, & + & psb_ctxt_type implicit none integer(psb_ipk_), allocatable, intent(inout) :: adj(:) - integer(psb_ipk_), intent(in) :: ictxt + type(psb_ctxt_type), intent(in) :: ictxt integer(psb_ipk_), intent(out) :: info end subroutine psi_symm_dep_list_norv end interface psi_symm_dep_list @@ -487,7 +489,7 @@ contains function base_get_ctxt(idxmap) result(val) implicit none class(psb_indx_map), intent(in) :: idxmap - integer(psb_ipk_) :: val + type(psb_ctxt_type) :: val val = idxmap%ictxt @@ -515,7 +517,7 @@ contains subroutine base_set_ctxt(idxmap,val) implicit none class(psb_indx_map), intent(inout) :: idxmap - integer(psb_ipk_), intent(in) :: val + type(psb_ctxt_type), intent(in) :: val idxmap%ictxt = val end subroutine base_set_ctxt @@ -1318,7 +1320,7 @@ contains ! almost nothing to be done here idxmap%state = -1 - idxmap%ictxt = -1 + if (allocated(idxmap%ictxt%ctxt)) deallocate(idxmap%ictxt%ctxt) idxmap%mpic = -1 idxmap%global_rows = -1 idxmap%global_cols = -1 @@ -1334,7 +1336,7 @@ contains class(psb_indx_map), intent(inout) :: idxmap idxmap%state = psb_desc_null_ - idxmap%ictxt = -1 + if (allocated(idxmap%ictxt%ctxt)) deallocate(idxmap%ictxt%ctxt) idxmap%mpic = -1 idxmap%global_rows = -1 idxmap%global_cols = -1 @@ -1348,7 +1350,7 @@ contains use psb_error_mod implicit none class(psb_indx_map), intent(inout) :: idxmap - integer(psb_ipk_), intent(in) :: ictxt + type(psb_ctxt_type), intent(in) :: ictxt integer(psb_lpk_), intent(in) :: vl(:) integer(psb_ipk_), intent(out) :: info integer(psb_ipk_) :: err_act diff --git a/base/modules/desc/psb_list_map_mod.f90 b/base/modules/desc/psb_list_map_mod.f90 index aab2a9d4..558b4bc2 100644 --- a/base/modules/desc/psb_list_map_mod.f90 +++ b/base/modules/desc/psb_list_map_mod.f90 @@ -1044,7 +1044,7 @@ contains use psb_error_mod implicit none class(psb_list_map), intent(inout) :: idxmap - integer(psb_ipk_), intent(in) :: ictxt + type(psb_ctxt_type), intent(in) :: ictxt integer(psb_ipk_), intent(in) :: vl(:) integer(psb_ipk_), intent(out) :: info ! To be implemented @@ -1055,7 +1055,7 @@ contains info = 0 call psb_info(ictxt,iam,np) if (np < 0) then - write(psb_err_unit,*) 'Invalid ictxt:',ictxt + write(psb_err_unit,*) 'Invalid ictxt:' info = -1 return end if @@ -1078,7 +1078,7 @@ contains use psb_error_mod implicit none class(psb_list_map), intent(inout) :: idxmap - integer(psb_ipk_), intent(in) :: ictxt + type(psb_ctxt_type), intent(in) :: ictxt integer(psb_lpk_), intent(in) :: vl(:) integer(psb_ipk_), intent(out) :: info ! To be implemented @@ -1088,7 +1088,7 @@ contains info = 0 call psb_info(ictxt,iam,np) if (np < 0) then - write(psb_err_unit,*) 'Invalid ictxt:',ictxt + write(psb_err_unit,*) 'Invalid ictxt:' info = -1 return end if @@ -1147,7 +1147,8 @@ contains integer(psb_ipk_), intent(out) :: info integer(psb_ipk_) :: nhal - integer(psb_mpk_) :: ictxt, iam, np + type(psb_ctxt_type) :: ictxt + integer(psb_mpk_) :: iam, np info = 0 ictxt = idxmap%get_ctxt() diff --git a/base/modules/desc/psb_repl_map_mod.f90 b/base/modules/desc/psb_repl_map_mod.f90 index 7b29833b..815a1431 100644 --- a/base/modules/desc/psb_repl_map_mod.f90 +++ b/base/modules/desc/psb_repl_map_mod.f90 @@ -703,8 +703,9 @@ contains integer(psb_ipk_), allocatable, intent(out) :: iprc(:) class(psb_repl_map), intent(inout) :: idxmap integer(psb_ipk_), intent(out) :: info - integer(psb_ipk_) :: nv - integer(psb_mpk_) :: ictxt, iam, np + integer(psb_ipk_) :: nv + type(psb_ctxt_type) :: ictxt + integer(psb_mpk_) :: iam, np ictxt = idxmap%get_ctxt() call psb_info(ictxt,iam,np) @@ -726,7 +727,7 @@ contains implicit none class(psb_repl_map), intent(inout) :: idxmap integer(psb_lpk_), intent(in) :: nl - integer(psb_ipk_), intent(in) :: ictxt + type(psb_ctxt_type), intent(in) :: ictxt integer(psb_ipk_), intent(out) :: info ! To be implemented integer(psb_ipk_) :: iam, np @@ -734,7 +735,7 @@ contains info = 0 call psb_info(ictxt,iam,np) if (np < 0) then - write(psb_err_unit,*) 'Invalid ictxt:',ictxt + write(psb_err_unit,*) 'Invalid ictxt:' info = -1 return end if @@ -759,7 +760,8 @@ contains class(psb_repl_map), intent(inout) :: idxmap integer(psb_ipk_), intent(out) :: info - integer(psb_mpk_) :: ictxt, iam, np + type(psb_ctxt_type) :: ictxt + integer(psb_mpk_) :: iam, np info = 0 ictxt = idxmap%get_ctxt() diff --git a/base/modules/error.f90 b/base/modules/error.f90 index 89411836..4e20e708 100644 --- a/base/modules/error.f90 +++ b/base/modules/error.f90 @@ -36,7 +36,8 @@ subroutine FCpsb_errcomm(ictxt, err) use psb_const_mod use psb_error_mod - integer(psb_ipk_), intent(in) :: ictxt + use psi_penv_mod + type(psb_ctxt_type), intent(in) :: ictxt integer(psb_ipk_), intent(inout):: err call psb_errcomm(ictxt, err) @@ -48,16 +49,14 @@ subroutine FCpsb_errpush(err_c, r_name, i_err) use psb_error_mod implicit none - integer(psb_ipk_), intent(in) :: err_c - character(len=20), intent(in) :: r_name + integer(psb_ipk_), intent(in) :: err_c + character(len=20), intent(in) :: r_name integer(psb_ipk_) :: i_err(5) call psb_errpush(err_c, r_name, i_err=i_err) end subroutine FCpsb_errpush - - subroutine FCpsb_serror() use psb_const_mod use psb_error_mod @@ -67,23 +66,18 @@ subroutine FCpsb_serror() end subroutine FCpsb_serror - - - - subroutine FCpsb_perror(ictxt) use psb_const_mod use psb_error_mod + use psi_penv_mod implicit none - integer(psb_ipk_), intent(in) :: ictxt - + type(psb_ctxt_type), intent(in) :: ictxt + call psb_error(ictxt) end subroutine FCpsb_perror - - function FCpsb_get_errstatus() use psb_const_mod use psb_error_mod @@ -95,7 +89,6 @@ function FCpsb_get_errstatus() end function FCpsb_get_errstatus - subroutine FCpsb_get_errverbosity(v) use psb_const_mod use psb_error_mod @@ -107,8 +100,6 @@ subroutine FCpsb_get_errverbosity(v) end subroutine FCpsb_get_errverbosity - - subroutine FCpsb_set_errverbosity(v) use psb_const_mod use psb_error_mod @@ -120,8 +111,6 @@ subroutine FCpsb_set_errverbosity(v) end subroutine FCpsb_set_errverbosity - - subroutine FCpsb_erractionsave(err_act) use psb_const_mod use psb_error_mod @@ -133,7 +122,6 @@ subroutine FCpsb_erractionsave(err_act) end subroutine FCpsb_erractionsave - subroutine FCpsb_get_erraction(err_act) use psb_const_mod use psb_error_mod @@ -143,8 +131,6 @@ subroutine FCpsb_get_erraction(err_act) call psb_get_erraction(err_act) end subroutine FCpsb_get_erraction - - subroutine FCpsb_erractionrestore(err_act) use psb_const_mod use psb_error_mod @@ -155,9 +141,3 @@ subroutine FCpsb_erractionrestore(err_act) call psb_erractionrestore(err_act) end subroutine FCpsb_erractionrestore - - - - - - diff --git a/base/modules/penv/psi_penv_mod.F90 b/base/modules/penv/psi_penv_mod.F90 index 4ddef9e0..b9555a97 100644 --- a/base/modules/penv/psi_penv_mod.F90 +++ b/base/modules/penv/psi_penv_mod.F90 @@ -94,11 +94,6 @@ module psi_penv_mod integer(psb_mpk_), private, parameter:: psb_int4_type = psb_int2_type + 1 integer(psb_mpk_), private, parameter:: psb_long_type = psb_int4_type + 1 - - type psb_ctxt_type - integer(psb_mpk_), allocatable :: ctxt - end type psb_ctxt_type - type psb_buffer_node integer(psb_mpk_) :: request type(psb_ctxt_type) :: icontxt @@ -196,19 +191,6 @@ module psi_penv_mod contains - - function psb_cmp_ctxt(ctxt1, ctxt2) result(res) - type(psb_ctxt_type), intent(in) :: ctxt1, ctxt2 - logical :: res - - res = .false. - if (.not.allocated(ctxt1%ctxt).and.(.not.allocated(ctxt2%ctxt))) & - & res = .true. - if (allocated(ctxt1%ctxt).and.allocated(ctxt2%ctxt)) & - & res = (ctxt1%ctxt == ctxt2%ctxt) - - end function psb_cmp_ctxt - subroutine psb_init_queue(mesg_queue,info) implicit none type(psb_buffer_queue), intent(inout) :: mesg_queue diff --git a/base/modules/psb_cbind_const_mod.F90 b/base/modules/psb_cbind_const_mod.F90 index 2b4bdf69..a20258ac 100644 --- a/base/modules/psb_cbind_const_mod.F90 +++ b/base/modules/psb_cbind_const_mod.F90 @@ -32,6 +32,7 @@ module psb_cbind_const_mod use iso_c_binding + use psb_const_mod integer, parameter :: psb_c_mpk_ = c_int32_t #if defined(IPK4) && defined(LPK4) @@ -48,5 +49,4 @@ module psb_cbind_const_mod integer, parameter :: psb_c_lpk_ = -1 #endif integer, parameter :: psb_c_epk_ = c_int64_t - end module psb_cbind_const_mod diff --git a/base/modules/psb_const_mod.F90 b/base/modules/psb_const_mod.F90 index 26a100a7..c8ed484a 100644 --- a/base/modules/psb_const_mod.F90 +++ b/base/modules/psb_const_mod.F90 @@ -315,4 +315,23 @@ module psb_const_mod integer(psb_ipk_), parameter, public :: psb_err_invalid_preci_=5003 integer(psb_ipk_), parameter, public :: psb_err_invalid_preca_=5004 + + type psb_ctxt_type + integer(psb_mpk_), allocatable :: ctxt + end type psb_ctxt_type + +contains + + function psb_cmp_ctxt(ctxt1, ctxt2) result(res) + type(psb_ctxt_type), intent(in) :: ctxt1, ctxt2 + logical :: res + + res = .false. + if (.not.allocated(ctxt1%ctxt).and.(.not.allocated(ctxt2%ctxt))) & + & res = .true. + if (allocated(ctxt1%ctxt).and.allocated(ctxt2%ctxt)) & + & res = (ctxt1%ctxt == ctxt2%ctxt) + + end function psb_cmp_ctxt + end module psb_const_mod diff --git a/base/modules/psb_error_impl.F90 b/base/modules/psb_error_impl.F90 index 1073f24d..e8f58dd8 100644 --- a/base/modules/psb_error_impl.F90 +++ b/base/modules/psb_error_impl.F90 @@ -2,8 +2,8 @@ subroutine psb_errcomm_i(ictxt, err) use psb_error_mod, psb_protect_name => psb_errcomm use psb_penv_mod - integer(psb_ipk_), intent(in) :: ictxt - integer(psb_ipk_), intent(inout):: err + type(psb_ctxt_type), intent(in) :: ictxt + integer(psb_ipk_), intent(inout) :: err if (psb_get_global_checks()) call psb_amx(ictxt, err) @@ -14,8 +14,8 @@ end subroutine psb_errcomm_i subroutine psb_errcomm_m(ictxt, err) use psb_error_mod, psb_protect_name => psb_errcomm use psb_penv_mod - integer(psb_mpk_), intent(in) :: ictxt - integer(psb_ipk_), intent(inout):: err + type(psb_ctxt_type), intent(in) :: ictxt + integer(psb_ipk_), intent(inout) :: err if (psb_get_global_checks()) call psb_amx(ictxt, err) @@ -41,8 +41,8 @@ subroutine psb_par_error_handler(ictxt,err_act) use psb_error_mod, psb_protect_name => psb_par_error_handler use psb_penv_mod implicit none - integer(psb_ipk_), intent(in) :: ictxt - integer(psb_ipk_), intent(in) :: err_act + type(psb_ctxt_type), intent(in) :: ictxt + integer(psb_ipk_), intent(in) :: err_act call psb_erractionrestore(err_act) @@ -58,7 +58,7 @@ end subroutine psb_par_error_handler subroutine psb_par_error_print_stack(ictxt) use psb_error_mod, psb_protect_name => psb_par_error_print_stack use psb_penv_mod - integer(psb_ipk_), intent(in) :: ictxt + type(psb_ctxt_type), intent(in) :: ictxt call psb_error(ictxt, abrt=.false.) @@ -79,8 +79,8 @@ subroutine psb_serror() use psb_error_mod implicit none integer(psb_ipk_) :: err_c - character(len=20) :: r_name - character(len=40) :: a_e_d + character(len=20) :: r_name + character(len=40) :: a_e_d integer(psb_epk_) :: e_e_d(5) if (psb_errstatus_fatal()) then @@ -116,20 +116,19 @@ subroutine psb_perror(ictxt,abrt) use psb_error_mod use psb_penv_mod implicit none - integer(psb_ipk_), intent(in) :: ictxt - logical, intent(in), optional :: abrt - - integer(psb_ipk_) :: err_c - character(len=20) :: r_name - character(len=40) :: a_e_d - integer(psb_epk_) :: e_e_d(5) - integer(psb_mpk_) :: iictxt, iam, np + type(psb_ctxt_type), intent(in) :: ictxt + logical, intent(in), optional :: abrt + + integer(psb_ipk_) :: err_c + character(len=20) :: r_name + character(len=40) :: a_e_d + integer(psb_epk_) :: e_e_d(5) + integer(psb_mpk_) :: iam, np logical :: abrt_ abrt_=.true. if (present(abrt)) abrt_=abrt - iictxt = ictxt - call psb_info(iictxt,iam,np) + call psb_info(ictxt,iam,np) if (psb_errstatus_fatal()) then if (psb_get_errverbosity() > 1) then @@ -144,7 +143,7 @@ subroutine psb_perror(ictxt,abrt) flush(psb_err_unit) #endif - if (abrt_) call psb_abort(iictxt,-1) + if (abrt_) call psb_abort(ictxt,-1) else @@ -157,7 +156,7 @@ subroutine psb_perror(ictxt,abrt) flush(psb_err_unit) #endif - if (abrt_) call psb_abort(iictxt,-1) + if (abrt_) call psb_abort(ictxt,-1) end if end if diff --git a/base/modules/psb_error_mod.F90 b/base/modules/psb_error_mod.F90 index df76dd20..75988639 100644 --- a/base/modules/psb_error_mod.F90 +++ b/base/modules/psb_error_mod.F90 @@ -31,7 +31,7 @@ ! module psb_error_mod use psb_const_mod - + integer(psb_ipk_), parameter, public :: psb_act_ret_=0 integer(psb_ipk_), parameter, public :: psb_act_print_=1 integer(psb_ipk_), parameter, public :: psb_act_abort_=2 @@ -72,8 +72,8 @@ module psb_error_mod integer(psb_ipk_), intent(inout) :: err_act end subroutine psb_ser_error_handler subroutine psb_par_error_handler(ictxt,err_act) - import :: psb_ipk_,psb_mpk_ - integer(psb_ipk_), intent(in) :: ictxt + import :: psb_ipk_,psb_mpk_, psb_ctxt_type + type(psb_ctxt_type), intent(in) :: ictxt integer(psb_ipk_), intent(in) :: err_act end subroutine psb_par_error_handler end interface @@ -82,8 +82,8 @@ module psb_error_mod subroutine psb_serror() end subroutine psb_serror subroutine psb_perror(ictxt,abrt) - import :: psb_ipk_ - integer(psb_ipk_), intent(in) :: ictxt + import :: psb_ipk_, psb_ctxt_type + type(psb_ctxt_type), intent(in) :: ictxt logical, intent(in), optional :: abrt end subroutine psb_perror end interface @@ -91,8 +91,8 @@ module psb_error_mod interface psb_error_print_stack subroutine psb_par_error_print_stack(ictxt) - import :: psb_ipk_ - integer(psb_ipk_), intent(in) :: ictxt + import :: psb_ipk_, psb_ctxt_type + type(psb_ctxt_type), intent(in) :: ictxt end subroutine psb_par_error_print_stack subroutine psb_ser_error_print_stack() end subroutine psb_ser_error_print_stack @@ -101,15 +101,15 @@ module psb_error_mod interface psb_errcomm #if defined(IPK8) subroutine psb_errcomm_m(ictxt, err) - import :: psb_ipk_, psb_mpk_ - integer(psb_mpk_), intent(in) :: ictxt - integer(psb_ipk_), intent(inout):: err + import :: psb_ipk_, psb_mpk_, psb_ctxt_type + type(pxb_ctxt_type), intent(in) :: ictxt + integer(psb_ipk_), intent(inout) :: err end subroutine psb_errcomm_m #endif subroutine psb_errcomm_i(ictxt, err) - import :: psb_ipk_ - integer(psb_ipk_), intent(in) :: ictxt - integer(psb_ipk_), intent(inout):: err + import :: psb_ipk_, psb_ctxt_type + type(psb_ctxt_type), intent(in) :: ictxt + integer(psb_ipk_), intent(inout) :: err end subroutine psb_errcomm_i end interface psb_errcomm diff --git a/base/modules/psb_timers_mod.f90 b/base/modules/psb_timers_mod.f90 index 18107d6d..69428558 100644 --- a/base/modules/psb_timers_mod.f90 +++ b/base/modules/psb_timers_mod.f90 @@ -97,7 +97,7 @@ contains subroutine psb_print_timers(ictxt, idx, proc, global, iout) implicit none - integer(psb_ipk_), intent(in) :: ictxt + type(psb_ctxt_type), intent(in) :: ictxt integer(psb_ipk_), intent(in), optional :: idx, proc, iout logical, optional :: global ! @@ -280,7 +280,7 @@ contains use psb_error_mod implicit none ! ...Subroutine Arguments - integer(psb_ipk_),Intent(in) :: len + integer(psb_ipk_),Intent(in) :: len type(psb_string_item),allocatable, intent(inout) :: rrax(:) integer(psb_ipk_) :: info integer(psb_ipk_), optional, intent(in) :: lb diff --git a/base/modules/psi_i_mod.F90 b/base/modules/psi_i_mod.F90 index 5eebad41..04d74be6 100644 --- a/base/modules/psi_i_mod.F90 +++ b/base/modules/psi_i_mod.F90 @@ -38,17 +38,6 @@ module psi_i_mod use psb_i_base_multivect_mod, only : psb_i_base_multivect_type use psi_i_comm_v_mod - interface psi_compute_size - subroutine psi_i_compute_size(desc_data,& - & index_in, dl_lda, info) - import - implicit none - integer(psb_ipk_) :: info - integer(psb_ipk_) :: dl_lda - integer(psb_ipk_) :: desc_data(:), index_in(:) - end subroutine psi_i_compute_size - end interface - interface psi_crea_bnd_elem subroutine psi_i_crea_bnd_elem(bndel,desc_a,info) import @@ -100,7 +89,7 @@ module psi_i_mod implicit none integer(psb_ipk_), intent(in) :: c_dep_list(:), dl_ptr(0:) integer(psb_ipk_), intent(inout) :: l_dep_list(0:) - integer(psb_ipk_) :: ictxt + type(psb_ctxt_type) :: ictxt integer(psb_ipk_) :: info end subroutine psi_i_csr_sort_dl end interface @@ -110,24 +99,25 @@ module psi_i_mod & length_dl,dl_lda,mode,info) import implicit none - logical, intent(in) :: is_bld, is_upd - integer(psb_ipk_), intent(in) :: ictxt, mode - integer(psb_ipk_), intent(out) :: dl_lda - integer(psb_ipk_), intent(in) :: desc_str(*) + logical, intent(in) :: is_bld, is_upd + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_), intent(in) :: mode + integer(psb_ipk_), intent(out) :: dl_lda + integer(psb_ipk_), intent(in) :: desc_str(*) integer(psb_ipk_), allocatable, intent(out) :: dep_list(:,:), length_dl(:) integer(psb_ipk_), intent(out) :: info end subroutine psi_i_extract_dep_list end interface interface psi_bld_glb_dep_list - subroutine psi_i_bld_glb_dep_list(ictxt,loc_dl,length_dl,dep_list,dl_lda,info) - import - integer(psb_ipk_), intent(in) :: ictxt - integer(psb_ipk_), intent(out) :: dl_lda - integer(psb_ipk_), intent(in) :: loc_dl(:), length_dl(0:) - integer(psb_ipk_), allocatable, intent(out) :: dep_list(:,:) - integer(psb_ipk_), intent(out) :: info - end subroutine psi_i_bld_glb_dep_list +!!$ subroutine psi_i_bld_glb_dep_list(ictxt,loc_dl,length_dl,dep_list,dl_lda,info) +!!$ import +!!$ type(psb_ctxt_type), intent(in) :: ictxt +!!$ integer(psb_ipk_), intent(out) :: dl_lda +!!$ integer(psb_ipk_), intent(in) :: loc_dl(:), length_dl(0:) +!!$ integer(psb_ipk_), allocatable, intent(out) :: dep_list(:,:) +!!$ integer(psb_ipk_), intent(out) :: info +!!$ end subroutine psi_i_bld_glb_dep_list subroutine psi_i_bld_glb_csr_dep_list(ictxt,loc_dl,length_dl,c_dep_list,dl_ptr,info) import integer(psb_ipk_), intent(in) :: ictxt @@ -141,7 +131,7 @@ module psi_i_mod subroutine psi_i_xtr_loc_dl(ictxt,is_bld,is_upd,desc_str,loc_dl,length_dl,info) import logical, intent(in) :: is_bld, is_upd - integer(psb_ipk_), intent(in) :: ictxt + type(psb_ctxt_type), intent(in) :: ictxt integer(psb_ipk_), intent(in) :: desc_str(:) integer(psb_ipk_), allocatable, intent(out) :: loc_dl(:), length_dl(:) integer(psb_ipk_), intent(out) :: info diff --git a/base/modules/tools/psb_cd_tools_mod.F90 b/base/modules/tools/psb_cd_tools_mod.F90 index 3a67d829..e7efae9c 100644 --- a/base/modules/tools/psb_cd_tools_mod.F90 +++ b/base/modules/tools/psb_cd_tools_mod.F90 @@ -192,11 +192,12 @@ module psb_cd_tools_mod subroutine psb_cdall(ictxt, desc, info,mg,ng,parts,vg,vl,flag,nl,repl,& & globalcheck,lidx,usehash) - import :: psb_ipk_, psb_lpk_, psb_desc_type, psb_parts + import :: psb_ipk_, psb_lpk_, psb_desc_type, psb_parts, psb_ctxt_type implicit None procedure(psb_parts) :: parts integer(psb_lpk_), intent(in) :: mg,ng, vl(:) - integer(psb_ipk_), intent(in) :: ictxt, vg(:), lidx(:),nl + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_), intent(in) :: vg(:), lidx(:),nl integer(psb_ipk_), intent(in) :: flag logical, intent(in) :: repl, globalcheck, usehash integer(psb_ipk_), intent(out) :: info diff --git a/base/psblas/psb_cabs_vect.f90 b/base/psblas/psb_cabs_vect.f90 index 46e74635..f70f9a46 100644 --- a/base/psblas/psb_cabs_vect.f90 +++ b/base/psblas/psb_cabs_vect.f90 @@ -40,7 +40,8 @@ subroutine psb_cabs_vect(x,y,desc_a,info) integer(psb_ipk_), intent(out) :: info ! locals - integer(psb_ipk_) :: ictxt, np, me,& + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me,& & err_act, iix, jjx, iiy, jjy integer(psb_lpk_) :: ix, ijx, iy, ijy, m character(len=20) :: name, ch_err diff --git a/base/psblas/psb_camax.f90 b/base/psblas/psb_camax.f90 index 21569613..2347eb80 100644 --- a/base/psblas/psb_camax.f90 +++ b/base/psblas/psb_camax.f90 @@ -57,7 +57,8 @@ function psb_camax(x,desc_a, info, jx,global) result(res) logical, intent(in), optional :: global ! locals - integer(psb_ipk_) :: ictxt, np, me,& + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me,& & err_act, iix, jjx, ldx integer(psb_lpk_) :: ix, ijx, iy, ijy, m logical :: global_ @@ -185,7 +186,8 @@ function psb_camaxv (x,desc_a, info,global) result(res) logical, intent(in), optional :: global ! locals - integer(psb_ipk_) :: ictxt, np, me,& + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me,& & err_act, iix, jjx, ldx integer(psb_lpk_) :: ix, jx, iy, ijy, m logical :: global_ @@ -280,7 +282,8 @@ function psb_camax_vect(x, desc_a, info,global) result(res) logical, intent(in), optional :: global ! locals - integer(psb_ipk_) :: ictxt, np, me,& + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me,& & err_act, iix, jjx integer(psb_lpk_) :: ix, jx, iy, ijy, m logical :: global_ @@ -409,7 +412,8 @@ subroutine psb_camaxvs(res,x,desc_a, info,global) logical, intent(in), optional :: global ! locals - integer(psb_ipk_) :: ictxt, np, me,& + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me,& & err_act, iix, jjx, ldx integer(psb_lpk_) :: ix, ijx, iy, ijy, m logical :: global_ @@ -532,7 +536,8 @@ subroutine psb_cmamaxs(res,x,desc_a, info,jx,global) logical, intent(in), optional :: global ! locals - integer(psb_ipk_) :: ictxt, np, me,& + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me,& & err_act, iix, jjx, ldx, i, k integer(psb_lpk_) :: ix, ijx, iy, ijy, m logical :: global_ diff --git a/base/psblas/psb_casum.f90 b/base/psblas/psb_casum.f90 index a0bf5262..3edfb637 100644 --- a/base/psblas/psb_casum.f90 +++ b/base/psblas/psb_casum.f90 @@ -57,7 +57,8 @@ function psb_casum (x,desc_a, info, jx,global) result(res) logical, intent(in), optional :: global ! locals - integer(psb_ipk_) :: ictxt, np, me, & + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me, & & err_act, iix, jjx, i, idx, ndm, ldx integer(psb_lpk_) :: ix, ijx, iy, ijy, m logical :: global_ @@ -160,7 +161,8 @@ function psb_casum_vect(x, desc_a, info,global) result(res) logical, intent(in), optional :: global ! locals - integer(psb_ipk_) :: ictxt, np, me,& + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me,& & err_act, iix, jjx, imax, i, idx, ndm integer(psb_lpk_) :: ix, jx, iy, ijy, m logical :: global_ @@ -297,7 +299,8 @@ function psb_casumv(x,desc_a, info,global) result(res) logical, intent(in), optional :: global ! locals - integer(psb_ipk_) :: ictxt, np, me,& + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me,& & err_act, iix, jjx, i, idx, ndm, ldx integer(psb_lpk_) :: ix, jx, iy, ijy, m logical :: global_ @@ -428,7 +431,8 @@ subroutine psb_casumvs(res,x,desc_a, info,global) logical, intent(in), optional :: global ! locals - integer(psb_ipk_) :: ictxt, np, me,& + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me,& & err_act, iix, jjx, i, idx, ndm, ldx integer(psb_lpk_) :: ix, jx, iy, ijy, m logical :: global_ diff --git a/base/psblas/psb_caxpby.f90 b/base/psblas/psb_caxpby.f90 index 6518e730..b37f9a6d 100644 --- a/base/psblas/psb_caxpby.f90 +++ b/base/psblas/psb_caxpby.f90 @@ -59,7 +59,8 @@ subroutine psb_caxpby_vect(alpha, x, beta, y,& integer(psb_ipk_), intent(out) :: info ! locals - integer(psb_ipk_) :: ictxt, np, me,& + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me,& & err_act, iix, jjx, iiy, jjy integer(psb_lpk_) :: ix, ijx, iy, ijy, m character(len=20) :: name, ch_err @@ -192,7 +193,8 @@ subroutine psb_caxpby_vect_out(alpha, x, beta, y,& integer(psb_ipk_), intent(out) :: info ! locals - integer(psb_ipk_) :: ictxt, np, me,& + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me,& & err_act, iix, jjx, iiy, jjy, iiz, jjz integer(psb_lpk_) :: ix, ijx, iy, ijy, iz, ijz, m character(len=20) :: name, ch_err @@ -308,7 +310,8 @@ subroutine psb_caxpby(alpha, x, beta,y,desc_a,info, n, jx, jy) complex(psb_spk_), intent(inout) :: y(:,:) ! locals - integer(psb_ipk_) :: ictxt, np, me,& + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me,& & err_act, iix, jjx, iiy, in, jjy, lldx, lldy integer(psb_lpk_) :: ix, ijx, iy, ijy, m character(len=20) :: name, ch_err @@ -456,7 +459,8 @@ subroutine psb_caxpbyv(alpha, x, beta,y,desc_a,info) complex(psb_spk_), intent(inout) :: y(:) ! locals - integer(psb_ipk_) :: ictxt, np, me,& + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me,& & err_act, iix, jjx, iiy, jjy, lldx, lldy integer(psb_lpk_) :: ix, ijx, iy, ijy, m character(len=20) :: name, ch_err @@ -578,7 +582,8 @@ subroutine psb_caxpbyvout(alpha, x, beta,y, z, desc_a,info) complex(psb_spk_), intent(inout) :: z(:) ! locals - integer(psb_ipk_) :: ictxt, np, me,& + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me,& & err_act, iix, jjx, iiy, jjy, iiz, jjz, lldx, lldy, lldz integer(psb_lpk_) :: ix, ijx, iy, ijy, iz, ijz, m character(len=20) :: name, ch_err @@ -673,7 +678,8 @@ subroutine psb_caddconst_vect(x,b,z,desc_a,info) integer(psb_ipk_), intent(out) :: info ! locals - integer(psb_ipk_) :: ictxt, np, me,& + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me,& & err_act, iix, jjx, iiy, jjy integer(psb_lpk_) :: ix, ijx, iy, ijy, m character(len=20) :: name, ch_err diff --git a/base/psblas/psb_ccmp_vect.f90 b/base/psblas/psb_ccmp_vect.f90 index 367f193b..f8442d97 100644 --- a/base/psblas/psb_ccmp_vect.f90 +++ b/base/psblas/psb_ccmp_vect.f90 @@ -41,7 +41,8 @@ subroutine psb_ccmp_vect(x,c,z,desc_a,info) integer(psb_ipk_), intent(out) :: info ! locals - integer(psb_ipk_) :: ictxt, np, me,& + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me,& & err_act, iix, jjx, iiy, jjy integer(psb_lpk_) :: ix, ijx, iy, ijy, m character(len=20) :: name, ch_err @@ -115,7 +116,8 @@ subroutine psb_ccmp_spmatval(a,val,tol,desc_a,res,info) logical, intent(out) :: res ! Local - integer(psb_ipk_) :: ictxt, np, me + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me integer(psb_ipk_) :: err_act character(len=20) :: name, ch_err integer(psb_ipk_) :: debug_level, debug_unit @@ -169,7 +171,8 @@ subroutine psb_ccmp_spmat(a,b,tol,desc_a,res,info) logical, intent(out) :: res ! Local - integer(psb_ipk_) :: ictxt, np, me + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me integer(psb_ipk_) :: err_act character(len=20) :: name, ch_err integer(psb_ipk_) :: debug_level, debug_unit diff --git a/base/psblas/psb_cdiv_vect.f90 b/base/psblas/psb_cdiv_vect.f90 index 3e709da4..5149d1e2 100644 --- a/base/psblas/psb_cdiv_vect.f90 +++ b/base/psblas/psb_cdiv_vect.f90 @@ -40,7 +40,8 @@ subroutine psb_cdiv_vect(x,y,desc_a,info) integer(psb_ipk_), intent(out) :: info ! locals - integer(psb_ipk_) :: ictxt, np, me,& + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me,& & err_act, iix, jjx, iiy, jjy integer(psb_lpk_) :: ix, ijx, iy, ijy, m character(len=20) :: name, ch_err @@ -114,7 +115,8 @@ subroutine psb_cdiv_vect2(x,y,z,desc_a,info) integer(psb_ipk_), intent(out) :: info ! locals - integer(psb_ipk_) :: ictxt, np, me,& + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me,& & err_act, iix, jjx, iiy, jjy, iiz, jjz integer(psb_lpk_) :: ix, ijx, iy, ijy, iz, ijz, m character(len=20) :: name, ch_err @@ -201,7 +203,8 @@ subroutine psb_cdiv_vect_check(x,y,desc_a,info,flag) logical, intent(in) :: flag ! locals - integer(psb_ipk_) :: ictxt, np, me,& + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me,& & err_act, iix, jjx, iiy, jjy integer(psb_lpk_) :: ix, ijx, iy, ijy, m character(len=20) :: name, ch_err @@ -276,7 +279,8 @@ subroutine psb_cdiv_vect2_check(x,y,z,desc_a,info,flag) logical, intent(in) :: flag ! locals - integer(psb_ipk_) :: ictxt, np, me,& + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me,& & err_act, iix, jjx, iiy, jjy, iiz, jjz integer(psb_lpk_) :: ix, ijx, iy, ijy, iz, ijz, m character(len=20) :: name, ch_err diff --git a/base/psblas/psb_cdot.f90 b/base/psblas/psb_cdot.f90 index 5432eb32..6d012e77 100644 --- a/base/psblas/psb_cdot.f90 +++ b/base/psblas/psb_cdot.f90 @@ -64,7 +64,8 @@ function psb_cdot_vect(x, y, desc_a,info,global) result(res) logical, intent(in), optional :: global ! locals - integer(psb_ipk_) :: ictxt, np, me, idx, ndm,& + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me, idx, ndm,& & err_act, iix, jjx, iiy, jjy, i, nr integer(psb_lpk_) :: ix, ijx, iy, ijy, m logical :: global_ @@ -187,7 +188,8 @@ function psb_cdot(x, y,desc_a, info, jx, jy,global) result(res) logical, intent(in), optional :: global ! locals - integer(psb_ipk_) :: ictxt, np, me, idx, ndm,& + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me, idx, ndm,& & err_act, iix, jjx, iiy, jjy, i, nr, lldx, lldy integer(psb_lpk_) :: ix, ijx, iy, ijy, m complex(psb_spk_) :: cdotc @@ -338,7 +340,8 @@ function psb_cdotv(x, y,desc_a, info,global) result(res) logical, intent(in), optional :: global ! locals - integer(psb_ipk_) :: ictxt, np, me, idx, ndm,& + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me, idx, ndm,& & err_act, iix, jjx, iiy, jjy, i, nr, lldx, lldy integer(psb_lpk_) :: ix, jx, iy, jy, m logical :: global_ @@ -474,7 +477,8 @@ subroutine psb_cdotvs(res, x, y,desc_a, info,global) logical, intent(in), optional :: global ! locals - integer(psb_ipk_) :: ictxt, np, me, idx, ndm,& + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me, idx, ndm,& & err_act, iix, jjx, iiy, jjy, i,nr, lldx, lldy integer(psb_lpk_) :: ix, jx, iy, jy, m logical :: global_ @@ -608,7 +612,8 @@ subroutine psb_cmdots(res, x, y, desc_a, info,global) logical, intent(in), optional :: global ! locals - integer(psb_ipk_) :: ictxt, np, me, idx, ndm,& + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me, idx, ndm,& & err_act, iix, jjx, iiy, jjy, i, j, k, nr, lldx, lldy integer(psb_lpk_) :: ix, ijx, iy, ijy, m logical :: global_ diff --git a/base/psblas/psb_cgetmatinfo.f90 b/base/psblas/psb_cgetmatinfo.f90 index 9e406c15..c5e59862 100644 --- a/base/psblas/psb_cgetmatinfo.f90 +++ b/base/psblas/psb_cgetmatinfo.f90 @@ -47,7 +47,8 @@ function psb_cget_nnz(a,desc_a,info) result(res) integer(psb_ipk_), intent(out) :: info ! locals - integer(psb_ipk_) :: ictxt, np, me,& + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me,& & err_act, iia, jja integer(psb_lpk_) :: localnnz character(len=20) :: name, ch_err diff --git a/base/psblas/psb_cinv_vect.f90 b/base/psblas/psb_cinv_vect.f90 index 27f04681..6dea51b3 100644 --- a/base/psblas/psb_cinv_vect.f90 +++ b/base/psblas/psb_cinv_vect.f90 @@ -40,7 +40,8 @@ subroutine psb_cinv_vect(x,y,desc_a,info) integer(psb_ipk_), intent(out) :: info ! locals - integer(psb_ipk_) :: ictxt, np, me,& + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me,& & err_act, iix, jjx, iiy, jjy integer(psb_lpk_) :: ix, ijx, iy, ijy, m character(len=20) :: name, ch_err @@ -115,7 +116,8 @@ subroutine psb_cinv_vect_check(x,y,desc_a,info,flag) logical :: check ! locals - integer(psb_ipk_) :: ictxt, np, me,& + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me,& & err_act, iix, jjx, iiy, jjy integer(psb_lpk_) :: ix, ijx, iy, ijy, m character(len=20) :: name, ch_err diff --git a/base/psblas/psb_cmlt_vect.f90 b/base/psblas/psb_cmlt_vect.f90 index e2b09270..2e7743ff 100644 --- a/base/psblas/psb_cmlt_vect.f90 +++ b/base/psblas/psb_cmlt_vect.f90 @@ -40,7 +40,8 @@ subroutine psb_cmlt_vect(x,y,desc_a,info) integer(psb_ipk_), intent(out) :: info ! locals - integer(psb_ipk_) :: ictxt, np, me,& + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me,& & err_act, iix, jjx, iiy, jjy integer(psb_lpk_) :: ix, ijx, iy, ijy, m character(len=20) :: name, ch_err @@ -120,7 +121,8 @@ subroutine psb_cmlt_vect2(alpha,x,y,beta,z,desc_a,info,conjgx, conjgy) character(len=1), intent(in), optional :: conjgx, conjgy ! locals - integer(psb_ipk_) :: ictxt, np, me,& + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me,& & err_act, iix, jjx, iiy, jjy, iiz, jjz integer(psb_lpk_) :: ix, ijx, iy, ijy, iz, ijz, m character(len=20) :: name, ch_err diff --git a/base/psblas/psb_cnrm2.f90 b/base/psblas/psb_cnrm2.f90 index d357c951..e5eac8e6 100644 --- a/base/psblas/psb_cnrm2.f90 +++ b/base/psblas/psb_cnrm2.f90 @@ -60,7 +60,8 @@ function psb_cnrm2(x, desc_a, info, jx,global) result(res) logical, intent(in), optional :: global ! locals - integer(psb_ipk_) :: ictxt, np, me,& + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me,& & err_act, iix, jjx, ndim, i, id, idx, ndm, ldx integer(psb_lpk_) :: ix, ijx, iy, ijy, m logical :: global_ @@ -195,7 +196,8 @@ function psb_cnrm2v(x, desc_a, info,global) result(res) logical, intent(in), optional :: global ! locals - integer(psb_ipk_) :: ictxt, np, me,& + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me,& & err_act, iix, jjx, ndim, i, id, idx, ndm, ldx integer(psb_lpk_) :: ix, jx, iy, ijy, m real(psb_spk_) :: scnrm2, dd @@ -291,7 +293,8 @@ function psb_cnrm2_vect(x, desc_a, info,global) result(res) logical, intent(in), optional :: global ! locals - integer(psb_ipk_) :: ictxt, np, me,& + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me,& & err_act, iix, jjx, ndim, i, id, idx, ndm, ldx integer(psb_lpk_) :: ix, jx, iy, ijy, m logical :: global_ @@ -398,7 +401,8 @@ function psb_cnrm2_weight_vect(x,w, desc_a, info,global) result(res) logical, intent(in), optional :: global ! locals - integer(psb_ipk_) :: ictxt, np, me,& + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me,& & err_act, iix, jjx, ndim, i, id, idx, ndm, ldx integer(psb_lpk_) :: ix, jx, iy, ijy, m logical :: global_ @@ -508,7 +512,8 @@ function psb_cnrm2_weightmask_vect(x,w,idv, desc_a, info,global) result(res) logical, intent(in), optional :: global ! locals - integer(psb_ipk_) :: ictxt, np, me,& + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me,& & err_act, iix, jjx, ndim, i, id, idx, ndm, ldx integer(psb_lpk_) :: ix, jx, iy, ijy, m logical :: global_ @@ -645,7 +650,8 @@ subroutine psb_cnrm2vs(res, x, desc_a, info,global) logical, intent(in), optional :: global ! locals - integer(psb_ipk_) :: ictxt, np, me,& + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me,& & err_act, iix, jjx, ndim, i, id, idx, ndm, ldx integer(psb_lpk_) :: ix, jx, iy, ijy, m logical :: global_ diff --git a/base/psblas/psb_cnrmi.f90 b/base/psblas/psb_cnrmi.f90 index 0abece53..1303e5d8 100644 --- a/base/psblas/psb_cnrmi.f90 +++ b/base/psblas/psb_cnrmi.f90 @@ -53,7 +53,8 @@ function psb_cnrmi(a,desc_a,info,global) result(res) logical, intent(in), optional :: global ! locals - integer(psb_ipk_) :: ictxt, np, me,& + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me,& & err_act, iia, jja, mdim, ndim integer(psb_lpk_) :: m, n, ia, ja logical :: global_ diff --git a/base/psblas/psb_cspmm.f90 b/base/psblas/psb_cspmm.f90 index 5a059647..b35aa4af 100644 --- a/base/psblas/psb_cspmm.f90 +++ b/base/psblas/psb_cspmm.f90 @@ -71,7 +71,8 @@ subroutine psb_cspmv_vect(alpha,a,x,beta,y,desc_a,info,& logical, intent(in), optional :: doswap ! locals - integer(psb_ipk_) :: ictxt, np, me,& + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me,& & err_act, iix, jjx, iia, jja, nrow, ncol, lldx, lldy, & & liwork, iiy, jjy, ib, ip, idx integer(psb_lpk_) :: ix, ijx, iy, ijy, m, n, ia, ja @@ -309,7 +310,8 @@ subroutine psb_cspmm(alpha,a,x,beta,y,desc_a,info,& logical, intent(in), optional :: doswap ! locals - integer(psb_ipk_) :: ictxt, np, me,& + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me,& & err_act, iix, jjx, iia, jja, nrow, ncol, lldx, lldy, & & liwork, iiy, jjy, i, ib, ib1, ip, idx, ik integer(psb_lpk_) :: ix, ijx, iy, ijy, m, n, ia, ja, lik @@ -656,7 +658,8 @@ subroutine psb_cspmv(alpha,a,x,beta,y,desc_a,info,& logical, intent(in), optional :: doswap ! locals - integer(psb_ipk_) :: ictxt, np, me,& + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me,& & err_act, iix, jjx, iia, jja, nrow, ncol, lldx, lldy, & & liwork, iiy, jjy, ib, ip, idx, ik integer(psb_lpk_) :: ix, ijx, iy, ijy, m, n, ia, ja, lik, jx, jy diff --git a/base/psblas/psb_cspnrm1.f90 b/base/psblas/psb_cspnrm1.f90 index c49fdcc1..22e5f8a4 100644 --- a/base/psblas/psb_cspnrm1.f90 +++ b/base/psblas/psb_cspnrm1.f90 @@ -53,7 +53,8 @@ function psb_cspnrm1(a,desc_a,info,global) result(res) logical, intent(in), optional :: global ! locals - integer(psb_ipk_) :: ictxt, np, me, nr,nc,& + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me, nr,nc,& & err_act, iia, jja, mdim, ndim integer(psb_lpk_) :: ix, ijx, iy, ijy, m, n, ia, ja logical :: global_ diff --git a/base/psblas/psb_cspsm.f90 b/base/psblas/psb_cspsm.f90 index 3fc8138c..0c0b4b4b 100644 --- a/base/psblas/psb_cspsm.f90 +++ b/base/psblas/psb_cspsm.f90 @@ -84,7 +84,8 @@ subroutine psb_cspsv_vect(alpha,a,x,beta,y,desc_a,info,& integer(psb_ipk_), intent(in), optional :: choice ! locals - integer(psb_ipk_) :: ictxt, np, me, & + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me, & & err_act, iix, jjx, ia, ja, iia, jja, lldx,lldy, choice_,& & ix, iy, ik, jx, jy, i, lld,& & m, nrow, ncol, liwork, llwork, iiy, jjy, idx, ndm @@ -289,7 +290,8 @@ subroutine psb_cspsm(alpha,a,x,beta,y,desc_a,info,& integer(psb_ipk_), intent(in), optional :: k, jx, jy ! locals - integer(psb_ipk_) :: ictxt, np, me,& + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me,& & err_act, iix, jjx, iia, jja, lldx,lldy, choice_,& & ik, i, lld, nrow, ncol, liwork, llwork, iiy, jjy, idx, ndm @@ -533,7 +535,8 @@ subroutine psb_cspsv(alpha,a,x,beta,y,desc_a,info,& integer(psb_ipk_), intent(in), optional :: choice ! locals - integer(psb_ipk_) :: ictxt, np, me, & + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me, & & err_act, iix, jjx, iia, jja, lldx,lldy, choice_,& & ik, i, lld, nrow, ncol, liwork, llwork, iiy, jjy, idx, ndm integer(psb_lpk_) :: ix, ijx, iy, ijy, m, n, ia, ja, lik, jx, jy diff --git a/base/psblas/psb_dabs_vect.f90 b/base/psblas/psb_dabs_vect.f90 index 78f2b75c..e749adf1 100644 --- a/base/psblas/psb_dabs_vect.f90 +++ b/base/psblas/psb_dabs_vect.f90 @@ -40,7 +40,8 @@ subroutine psb_dabs_vect(x,y,desc_a,info) integer(psb_ipk_), intent(out) :: info ! locals - integer(psb_ipk_) :: ictxt, np, me,& + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me,& & err_act, iix, jjx, iiy, jjy integer(psb_lpk_) :: ix, ijx, iy, ijy, m character(len=20) :: name, ch_err diff --git a/base/psblas/psb_damax.f90 b/base/psblas/psb_damax.f90 index ea3581d4..30fc025f 100644 --- a/base/psblas/psb_damax.f90 +++ b/base/psblas/psb_damax.f90 @@ -57,7 +57,8 @@ function psb_damax(x,desc_a, info, jx,global) result(res) logical, intent(in), optional :: global ! locals - integer(psb_ipk_) :: ictxt, np, me,& + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me,& & err_act, iix, jjx, ldx integer(psb_lpk_) :: ix, ijx, iy, ijy, m logical :: global_ @@ -185,7 +186,8 @@ function psb_damaxv (x,desc_a, info,global) result(res) logical, intent(in), optional :: global ! locals - integer(psb_ipk_) :: ictxt, np, me,& + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me,& & err_act, iix, jjx, ldx integer(psb_lpk_) :: ix, jx, iy, ijy, m logical :: global_ @@ -280,7 +282,8 @@ function psb_damax_vect(x, desc_a, info,global) result(res) logical, intent(in), optional :: global ! locals - integer(psb_ipk_) :: ictxt, np, me,& + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me,& & err_act, iix, jjx integer(psb_lpk_) :: ix, jx, iy, ijy, m logical :: global_ @@ -409,7 +412,8 @@ subroutine psb_damaxvs(res,x,desc_a, info,global) logical, intent(in), optional :: global ! locals - integer(psb_ipk_) :: ictxt, np, me,& + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me,& & err_act, iix, jjx, ldx integer(psb_lpk_) :: ix, ijx, iy, ijy, m logical :: global_ @@ -532,7 +536,8 @@ subroutine psb_dmamaxs(res,x,desc_a, info,jx,global) logical, intent(in), optional :: global ! locals - integer(psb_ipk_) :: ictxt, np, me,& + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me,& & err_act, iix, jjx, ldx, i, k integer(psb_lpk_) :: ix, ijx, iy, ijy, m logical :: global_ @@ -631,7 +636,8 @@ function psb_dmin_vect(x, desc_a, info,global) result(res) logical, intent(in), optional :: global ! locals - integer(psb_ipk_) :: ictxt, np, me,& + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me,& & err_act, iix, jjx integer(psb_lpk_) :: ix, jx, iy, ijy, m logical :: global_ diff --git a/base/psblas/psb_dasum.f90 b/base/psblas/psb_dasum.f90 index 5de367f7..f3e02141 100644 --- a/base/psblas/psb_dasum.f90 +++ b/base/psblas/psb_dasum.f90 @@ -57,7 +57,8 @@ function psb_dasum (x,desc_a, info, jx,global) result(res) logical, intent(in), optional :: global ! locals - integer(psb_ipk_) :: ictxt, np, me, & + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me, & & err_act, iix, jjx, i, idx, ndm, ldx integer(psb_lpk_) :: ix, ijx, iy, ijy, m logical :: global_ @@ -160,7 +161,8 @@ function psb_dasum_vect(x, desc_a, info,global) result(res) logical, intent(in), optional :: global ! locals - integer(psb_ipk_) :: ictxt, np, me,& + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me,& & err_act, iix, jjx, imax, i, idx, ndm integer(psb_lpk_) :: ix, jx, iy, ijy, m logical :: global_ @@ -297,7 +299,8 @@ function psb_dasumv(x,desc_a, info,global) result(res) logical, intent(in), optional :: global ! locals - integer(psb_ipk_) :: ictxt, np, me,& + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me,& & err_act, iix, jjx, i, idx, ndm, ldx integer(psb_lpk_) :: ix, jx, iy, ijy, m logical :: global_ @@ -428,7 +431,8 @@ subroutine psb_dasumvs(res,x,desc_a, info,global) logical, intent(in), optional :: global ! locals - integer(psb_ipk_) :: ictxt, np, me,& + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me,& & err_act, iix, jjx, i, idx, ndm, ldx integer(psb_lpk_) :: ix, jx, iy, ijy, m logical :: global_ diff --git a/base/psblas/psb_daxpby.f90 b/base/psblas/psb_daxpby.f90 index 550711e4..5206bec3 100644 --- a/base/psblas/psb_daxpby.f90 +++ b/base/psblas/psb_daxpby.f90 @@ -59,7 +59,8 @@ subroutine psb_daxpby_vect(alpha, x, beta, y,& integer(psb_ipk_), intent(out) :: info ! locals - integer(psb_ipk_) :: ictxt, np, me,& + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me,& & err_act, iix, jjx, iiy, jjy integer(psb_lpk_) :: ix, ijx, iy, ijy, m character(len=20) :: name, ch_err @@ -192,7 +193,8 @@ subroutine psb_daxpby_vect_out(alpha, x, beta, y,& integer(psb_ipk_), intent(out) :: info ! locals - integer(psb_ipk_) :: ictxt, np, me,& + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me,& & err_act, iix, jjx, iiy, jjy, iiz, jjz integer(psb_lpk_) :: ix, ijx, iy, ijy, iz, ijz, m character(len=20) :: name, ch_err @@ -308,7 +310,8 @@ subroutine psb_daxpby(alpha, x, beta,y,desc_a,info, n, jx, jy) real(psb_dpk_), intent(inout) :: y(:,:) ! locals - integer(psb_ipk_) :: ictxt, np, me,& + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me,& & err_act, iix, jjx, iiy, in, jjy, lldx, lldy integer(psb_lpk_) :: ix, ijx, iy, ijy, m character(len=20) :: name, ch_err @@ -456,7 +459,8 @@ subroutine psb_daxpbyv(alpha, x, beta,y,desc_a,info) real(psb_dpk_), intent(inout) :: y(:) ! locals - integer(psb_ipk_) :: ictxt, np, me,& + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me,& & err_act, iix, jjx, iiy, jjy, lldx, lldy integer(psb_lpk_) :: ix, ijx, iy, ijy, m character(len=20) :: name, ch_err @@ -578,7 +582,8 @@ subroutine psb_daxpbyvout(alpha, x, beta,y, z, desc_a,info) real(psb_dpk_), intent(inout) :: z(:) ! locals - integer(psb_ipk_) :: ictxt, np, me,& + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me,& & err_act, iix, jjx, iiy, jjy, iiz, jjz, lldx, lldy, lldz integer(psb_lpk_) :: ix, ijx, iy, ijy, iz, ijz, m character(len=20) :: name, ch_err @@ -673,7 +678,8 @@ subroutine psb_daddconst_vect(x,b,z,desc_a,info) integer(psb_ipk_), intent(out) :: info ! locals - integer(psb_ipk_) :: ictxt, np, me,& + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me,& & err_act, iix, jjx, iiy, jjy integer(psb_lpk_) :: ix, ijx, iy, ijy, m character(len=20) :: name, ch_err diff --git a/base/psblas/psb_dcmp_vect.f90 b/base/psblas/psb_dcmp_vect.f90 index 084feeda..eb426a10 100644 --- a/base/psblas/psb_dcmp_vect.f90 +++ b/base/psblas/psb_dcmp_vect.f90 @@ -41,7 +41,8 @@ subroutine psb_dcmp_vect(x,c,z,desc_a,info) integer(psb_ipk_), intent(out) :: info ! locals - integer(psb_ipk_) :: ictxt, np, me,& + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me,& & err_act, iix, jjx, iiy, jjy integer(psb_lpk_) :: ix, ijx, iy, ijy, m character(len=20) :: name, ch_err @@ -148,7 +149,8 @@ subroutine psb_dmask_vect(c,x,m,t,desc_a,info) integer(psb_ipk_), intent(out) :: info ! locals - integer(psb_ipk_) :: ictxt, np, me,& + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me,& & err_act, iix, jjx, iiy, jjy integer(psb_lpk_) :: ix, ijx, iy, ijy, mm character(len=20) :: name, ch_err @@ -237,7 +239,8 @@ subroutine psb_dcmp_spmatval(a,val,tol,desc_a,res,info) logical, intent(out) :: res ! Local - integer(psb_ipk_) :: ictxt, np, me + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me integer(psb_ipk_) :: err_act character(len=20) :: name, ch_err integer(psb_ipk_) :: debug_level, debug_unit @@ -291,7 +294,8 @@ subroutine psb_dcmp_spmat(a,b,tol,desc_a,res,info) logical, intent(out) :: res ! Local - integer(psb_ipk_) :: ictxt, np, me + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me integer(psb_ipk_) :: err_act character(len=20) :: name, ch_err integer(psb_ipk_) :: debug_level, debug_unit diff --git a/base/psblas/psb_ddiv_vect.f90 b/base/psblas/psb_ddiv_vect.f90 index d5a85913..ba57776b 100644 --- a/base/psblas/psb_ddiv_vect.f90 +++ b/base/psblas/psb_ddiv_vect.f90 @@ -40,7 +40,8 @@ subroutine psb_ddiv_vect(x,y,desc_a,info) integer(psb_ipk_), intent(out) :: info ! locals - integer(psb_ipk_) :: ictxt, np, me,& + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me,& & err_act, iix, jjx, iiy, jjy integer(psb_lpk_) :: ix, ijx, iy, ijy, m character(len=20) :: name, ch_err @@ -114,7 +115,8 @@ subroutine psb_ddiv_vect2(x,y,z,desc_a,info) integer(psb_ipk_), intent(out) :: info ! locals - integer(psb_ipk_) :: ictxt, np, me,& + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me,& & err_act, iix, jjx, iiy, jjy, iiz, jjz integer(psb_lpk_) :: ix, ijx, iy, ijy, iz, ijz, m character(len=20) :: name, ch_err @@ -201,7 +203,8 @@ subroutine psb_ddiv_vect_check(x,y,desc_a,info,flag) logical, intent(in) :: flag ! locals - integer(psb_ipk_) :: ictxt, np, me,& + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me,& & err_act, iix, jjx, iiy, jjy integer(psb_lpk_) :: ix, ijx, iy, ijy, m character(len=20) :: name, ch_err @@ -276,7 +279,8 @@ subroutine psb_ddiv_vect2_check(x,y,z,desc_a,info,flag) logical, intent(in) :: flag ! locals - integer(psb_ipk_) :: ictxt, np, me,& + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me,& & err_act, iix, jjx, iiy, jjy, iiz, jjz integer(psb_lpk_) :: ix, ijx, iy, ijy, iz, ijz, m character(len=20) :: name, ch_err @@ -369,7 +373,8 @@ function psb_dminquotient_vect(x,y,desc_a,info,global) result(res) logical, intent(in), optional :: global ! locals - integer(psb_ipk_) :: ictxt, np, me,& + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me,& & err_act, iix, jjx integer(psb_lpk_) :: ix, jx, iy, ijy, m logical :: global_ diff --git a/base/psblas/psb_ddot.f90 b/base/psblas/psb_ddot.f90 index ba1d9619..65474433 100644 --- a/base/psblas/psb_ddot.f90 +++ b/base/psblas/psb_ddot.f90 @@ -64,7 +64,8 @@ function psb_ddot_vect(x, y, desc_a,info,global) result(res) logical, intent(in), optional :: global ! locals - integer(psb_ipk_) :: ictxt, np, me, idx, ndm,& + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me, idx, ndm,& & err_act, iix, jjx, iiy, jjy, i, nr integer(psb_lpk_) :: ix, ijx, iy, ijy, m logical :: global_ @@ -187,7 +188,8 @@ function psb_ddot(x, y,desc_a, info, jx, jy,global) result(res) logical, intent(in), optional :: global ! locals - integer(psb_ipk_) :: ictxt, np, me, idx, ndm,& + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me, idx, ndm,& & err_act, iix, jjx, iiy, jjy, i, nr, lldx, lldy integer(psb_lpk_) :: ix, ijx, iy, ijy, m real(psb_dpk_) :: ddot @@ -338,7 +340,8 @@ function psb_ddotv(x, y,desc_a, info,global) result(res) logical, intent(in), optional :: global ! locals - integer(psb_ipk_) :: ictxt, np, me, idx, ndm,& + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me, idx, ndm,& & err_act, iix, jjx, iiy, jjy, i, nr, lldx, lldy integer(psb_lpk_) :: ix, jx, iy, jy, m logical :: global_ @@ -474,7 +477,8 @@ subroutine psb_ddotvs(res, x, y,desc_a, info,global) logical, intent(in), optional :: global ! locals - integer(psb_ipk_) :: ictxt, np, me, idx, ndm,& + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me, idx, ndm,& & err_act, iix, jjx, iiy, jjy, i,nr, lldx, lldy integer(psb_lpk_) :: ix, jx, iy, jy, m logical :: global_ @@ -608,7 +612,8 @@ subroutine psb_dmdots(res, x, y, desc_a, info,global) logical, intent(in), optional :: global ! locals - integer(psb_ipk_) :: ictxt, np, me, idx, ndm,& + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me, idx, ndm,& & err_act, iix, jjx, iiy, jjy, i, j, k, nr, lldx, lldy integer(psb_lpk_) :: ix, ijx, iy, ijy, m logical :: global_ diff --git a/base/psblas/psb_dgetmatinfo.f90 b/base/psblas/psb_dgetmatinfo.f90 index 2caf8ed4..f27acbd3 100644 --- a/base/psblas/psb_dgetmatinfo.f90 +++ b/base/psblas/psb_dgetmatinfo.f90 @@ -47,7 +47,8 @@ function psb_dget_nnz(a,desc_a,info) result(res) integer(psb_ipk_), intent(out) :: info ! locals - integer(psb_ipk_) :: ictxt, np, me,& + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me,& & err_act, iia, jja integer(psb_lpk_) :: localnnz character(len=20) :: name, ch_err diff --git a/base/psblas/psb_dinv_vect.f90 b/base/psblas/psb_dinv_vect.f90 index 89b25e38..a4ef6ecc 100644 --- a/base/psblas/psb_dinv_vect.f90 +++ b/base/psblas/psb_dinv_vect.f90 @@ -40,7 +40,8 @@ subroutine psb_dinv_vect(x,y,desc_a,info) integer(psb_ipk_), intent(out) :: info ! locals - integer(psb_ipk_) :: ictxt, np, me,& + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me,& & err_act, iix, jjx, iiy, jjy integer(psb_lpk_) :: ix, ijx, iy, ijy, m character(len=20) :: name, ch_err @@ -115,7 +116,8 @@ subroutine psb_dinv_vect_check(x,y,desc_a,info,flag) logical :: check ! locals - integer(psb_ipk_) :: ictxt, np, me,& + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me,& & err_act, iix, jjx, iiy, jjy integer(psb_lpk_) :: ix, ijx, iy, ijy, m character(len=20) :: name, ch_err diff --git a/base/psblas/psb_dmlt_vect.f90 b/base/psblas/psb_dmlt_vect.f90 index ac45802f..72754d11 100644 --- a/base/psblas/psb_dmlt_vect.f90 +++ b/base/psblas/psb_dmlt_vect.f90 @@ -40,7 +40,8 @@ subroutine psb_dmlt_vect(x,y,desc_a,info) integer(psb_ipk_), intent(out) :: info ! locals - integer(psb_ipk_) :: ictxt, np, me,& + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me,& & err_act, iix, jjx, iiy, jjy integer(psb_lpk_) :: ix, ijx, iy, ijy, m character(len=20) :: name, ch_err @@ -120,7 +121,8 @@ subroutine psb_dmlt_vect2(alpha,x,y,beta,z,desc_a,info,conjgx, conjgy) character(len=1), intent(in), optional :: conjgx, conjgy ! locals - integer(psb_ipk_) :: ictxt, np, me,& + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me,& & err_act, iix, jjx, iiy, jjy, iiz, jjz integer(psb_lpk_) :: ix, ijx, iy, ijy, iz, ijz, m character(len=20) :: name, ch_err diff --git a/base/psblas/psb_dnrm2.f90 b/base/psblas/psb_dnrm2.f90 index 16b18d91..2afd6982 100644 --- a/base/psblas/psb_dnrm2.f90 +++ b/base/psblas/psb_dnrm2.f90 @@ -60,7 +60,8 @@ function psb_dnrm2(x, desc_a, info, jx,global) result(res) logical, intent(in), optional :: global ! locals - integer(psb_ipk_) :: ictxt, np, me,& + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me,& & err_act, iix, jjx, ndim, i, id, idx, ndm, ldx integer(psb_lpk_) :: ix, ijx, iy, ijy, m logical :: global_ @@ -195,7 +196,8 @@ function psb_dnrm2v(x, desc_a, info,global) result(res) logical, intent(in), optional :: global ! locals - integer(psb_ipk_) :: ictxt, np, me,& + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me,& & err_act, iix, jjx, ndim, i, id, idx, ndm, ldx integer(psb_lpk_) :: ix, jx, iy, ijy, m real(psb_dpk_) :: dnrm2, dd @@ -291,7 +293,8 @@ function psb_dnrm2_vect(x, desc_a, info,global) result(res) logical, intent(in), optional :: global ! locals - integer(psb_ipk_) :: ictxt, np, me,& + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me,& & err_act, iix, jjx, ndim, i, id, idx, ndm, ldx integer(psb_lpk_) :: ix, jx, iy, ijy, m logical :: global_ @@ -398,7 +401,8 @@ function psb_dnrm2_weight_vect(x,w, desc_a, info,global) result(res) logical, intent(in), optional :: global ! locals - integer(psb_ipk_) :: ictxt, np, me,& + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me,& & err_act, iix, jjx, ndim, i, id, idx, ndm, ldx integer(psb_lpk_) :: ix, jx, iy, ijy, m logical :: global_ @@ -508,7 +512,8 @@ function psb_dnrm2_weightmask_vect(x,w,idv, desc_a, info,global) result(res) logical, intent(in), optional :: global ! locals - integer(psb_ipk_) :: ictxt, np, me,& + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me,& & err_act, iix, jjx, ndim, i, id, idx, ndm, ldx integer(psb_lpk_) :: ix, jx, iy, ijy, m logical :: global_ @@ -645,7 +650,8 @@ subroutine psb_dnrm2vs(res, x, desc_a, info,global) logical, intent(in), optional :: global ! locals - integer(psb_ipk_) :: ictxt, np, me,& + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me,& & err_act, iix, jjx, ndim, i, id, idx, ndm, ldx integer(psb_lpk_) :: ix, jx, iy, ijy, m logical :: global_ diff --git a/base/psblas/psb_dnrmi.f90 b/base/psblas/psb_dnrmi.f90 index a6a97751..2d67fb7c 100644 --- a/base/psblas/psb_dnrmi.f90 +++ b/base/psblas/psb_dnrmi.f90 @@ -53,7 +53,8 @@ function psb_dnrmi(a,desc_a,info,global) result(res) logical, intent(in), optional :: global ! locals - integer(psb_ipk_) :: ictxt, np, me,& + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me,& & err_act, iia, jja, mdim, ndim integer(psb_lpk_) :: m, n, ia, ja logical :: global_ diff --git a/base/psblas/psb_dspmm.f90 b/base/psblas/psb_dspmm.f90 index 1fdf6171..ab733692 100644 --- a/base/psblas/psb_dspmm.f90 +++ b/base/psblas/psb_dspmm.f90 @@ -71,7 +71,8 @@ subroutine psb_dspmv_vect(alpha,a,x,beta,y,desc_a,info,& logical, intent(in), optional :: doswap ! locals - integer(psb_ipk_) :: ictxt, np, me,& + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me,& & err_act, iix, jjx, iia, jja, nrow, ncol, lldx, lldy, & & liwork, iiy, jjy, ib, ip, idx integer(psb_lpk_) :: ix, ijx, iy, ijy, m, n, ia, ja @@ -309,7 +310,8 @@ subroutine psb_dspmm(alpha,a,x,beta,y,desc_a,info,& logical, intent(in), optional :: doswap ! locals - integer(psb_ipk_) :: ictxt, np, me,& + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me,& & err_act, iix, jjx, iia, jja, nrow, ncol, lldx, lldy, & & liwork, iiy, jjy, i, ib, ib1, ip, idx, ik integer(psb_lpk_) :: ix, ijx, iy, ijy, m, n, ia, ja, lik @@ -656,7 +658,8 @@ subroutine psb_dspmv(alpha,a,x,beta,y,desc_a,info,& logical, intent(in), optional :: doswap ! locals - integer(psb_ipk_) :: ictxt, np, me,& + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me,& & err_act, iix, jjx, iia, jja, nrow, ncol, lldx, lldy, & & liwork, iiy, jjy, ib, ip, idx, ik integer(psb_lpk_) :: ix, ijx, iy, ijy, m, n, ia, ja, lik, jx, jy diff --git a/base/psblas/psb_dspnrm1.f90 b/base/psblas/psb_dspnrm1.f90 index 9d367615..1e118a35 100644 --- a/base/psblas/psb_dspnrm1.f90 +++ b/base/psblas/psb_dspnrm1.f90 @@ -53,7 +53,8 @@ function psb_dspnrm1(a,desc_a,info,global) result(res) logical, intent(in), optional :: global ! locals - integer(psb_ipk_) :: ictxt, np, me, nr,nc,& + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me, nr,nc,& & err_act, iia, jja, mdim, ndim integer(psb_lpk_) :: ix, ijx, iy, ijy, m, n, ia, ja logical :: global_ diff --git a/base/psblas/psb_dspsm.f90 b/base/psblas/psb_dspsm.f90 index f1a019ad..2c5d4807 100644 --- a/base/psblas/psb_dspsm.f90 +++ b/base/psblas/psb_dspsm.f90 @@ -84,7 +84,8 @@ subroutine psb_dspsv_vect(alpha,a,x,beta,y,desc_a,info,& integer(psb_ipk_), intent(in), optional :: choice ! locals - integer(psb_ipk_) :: ictxt, np, me, & + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me, & & err_act, iix, jjx, ia, ja, iia, jja, lldx,lldy, choice_,& & ix, iy, ik, jx, jy, i, lld,& & m, nrow, ncol, liwork, llwork, iiy, jjy, idx, ndm @@ -289,7 +290,8 @@ subroutine psb_dspsm(alpha,a,x,beta,y,desc_a,info,& integer(psb_ipk_), intent(in), optional :: k, jx, jy ! locals - integer(psb_ipk_) :: ictxt, np, me,& + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me,& & err_act, iix, jjx, iia, jja, lldx,lldy, choice_,& & ik, i, lld, nrow, ncol, liwork, llwork, iiy, jjy, idx, ndm @@ -533,7 +535,8 @@ subroutine psb_dspsv(alpha,a,x,beta,y,desc_a,info,& integer(psb_ipk_), intent(in), optional :: choice ! locals - integer(psb_ipk_) :: ictxt, np, me, & + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me, & & err_act, iix, jjx, iia, jja, lldx,lldy, choice_,& & ik, i, lld, nrow, ncol, liwork, llwork, iiy, jjy, idx, ndm integer(psb_lpk_) :: ix, ijx, iy, ijy, m, n, ia, ja, lik, jx, jy diff --git a/base/psblas/psb_sabs_vect.f90 b/base/psblas/psb_sabs_vect.f90 index 1d4897a9..9d88b526 100644 --- a/base/psblas/psb_sabs_vect.f90 +++ b/base/psblas/psb_sabs_vect.f90 @@ -40,7 +40,8 @@ subroutine psb_sabs_vect(x,y,desc_a,info) integer(psb_ipk_), intent(out) :: info ! locals - integer(psb_ipk_) :: ictxt, np, me,& + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me,& & err_act, iix, jjx, iiy, jjy integer(psb_lpk_) :: ix, ijx, iy, ijy, m character(len=20) :: name, ch_err diff --git a/base/psblas/psb_samax.f90 b/base/psblas/psb_samax.f90 index 30b22fd8..08d921d3 100644 --- a/base/psblas/psb_samax.f90 +++ b/base/psblas/psb_samax.f90 @@ -57,7 +57,8 @@ function psb_samax(x,desc_a, info, jx,global) result(res) logical, intent(in), optional :: global ! locals - integer(psb_ipk_) :: ictxt, np, me,& + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me,& & err_act, iix, jjx, ldx integer(psb_lpk_) :: ix, ijx, iy, ijy, m logical :: global_ @@ -185,7 +186,8 @@ function psb_samaxv (x,desc_a, info,global) result(res) logical, intent(in), optional :: global ! locals - integer(psb_ipk_) :: ictxt, np, me,& + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me,& & err_act, iix, jjx, ldx integer(psb_lpk_) :: ix, jx, iy, ijy, m logical :: global_ @@ -280,7 +282,8 @@ function psb_samax_vect(x, desc_a, info,global) result(res) logical, intent(in), optional :: global ! locals - integer(psb_ipk_) :: ictxt, np, me,& + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me,& & err_act, iix, jjx integer(psb_lpk_) :: ix, jx, iy, ijy, m logical :: global_ @@ -409,7 +412,8 @@ subroutine psb_samaxvs(res,x,desc_a, info,global) logical, intent(in), optional :: global ! locals - integer(psb_ipk_) :: ictxt, np, me,& + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me,& & err_act, iix, jjx, ldx integer(psb_lpk_) :: ix, ijx, iy, ijy, m logical :: global_ @@ -532,7 +536,8 @@ subroutine psb_smamaxs(res,x,desc_a, info,jx,global) logical, intent(in), optional :: global ! locals - integer(psb_ipk_) :: ictxt, np, me,& + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me,& & err_act, iix, jjx, ldx, i, k integer(psb_lpk_) :: ix, ijx, iy, ijy, m logical :: global_ @@ -631,7 +636,8 @@ function psb_smin_vect(x, desc_a, info,global) result(res) logical, intent(in), optional :: global ! locals - integer(psb_ipk_) :: ictxt, np, me,& + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me,& & err_act, iix, jjx integer(psb_lpk_) :: ix, jx, iy, ijy, m logical :: global_ diff --git a/base/psblas/psb_sasum.f90 b/base/psblas/psb_sasum.f90 index a61f1851..406b8e8e 100644 --- a/base/psblas/psb_sasum.f90 +++ b/base/psblas/psb_sasum.f90 @@ -57,7 +57,8 @@ function psb_sasum (x,desc_a, info, jx,global) result(res) logical, intent(in), optional :: global ! locals - integer(psb_ipk_) :: ictxt, np, me, & + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me, & & err_act, iix, jjx, i, idx, ndm, ldx integer(psb_lpk_) :: ix, ijx, iy, ijy, m logical :: global_ @@ -160,7 +161,8 @@ function psb_sasum_vect(x, desc_a, info,global) result(res) logical, intent(in), optional :: global ! locals - integer(psb_ipk_) :: ictxt, np, me,& + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me,& & err_act, iix, jjx, imax, i, idx, ndm integer(psb_lpk_) :: ix, jx, iy, ijy, m logical :: global_ @@ -297,7 +299,8 @@ function psb_sasumv(x,desc_a, info,global) result(res) logical, intent(in), optional :: global ! locals - integer(psb_ipk_) :: ictxt, np, me,& + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me,& & err_act, iix, jjx, i, idx, ndm, ldx integer(psb_lpk_) :: ix, jx, iy, ijy, m logical :: global_ @@ -428,7 +431,8 @@ subroutine psb_sasumvs(res,x,desc_a, info,global) logical, intent(in), optional :: global ! locals - integer(psb_ipk_) :: ictxt, np, me,& + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me,& & err_act, iix, jjx, i, idx, ndm, ldx integer(psb_lpk_) :: ix, jx, iy, ijy, m logical :: global_ diff --git a/base/psblas/psb_saxpby.f90 b/base/psblas/psb_saxpby.f90 index b264c3b0..a04b622e 100644 --- a/base/psblas/psb_saxpby.f90 +++ b/base/psblas/psb_saxpby.f90 @@ -59,7 +59,8 @@ subroutine psb_saxpby_vect(alpha, x, beta, y,& integer(psb_ipk_), intent(out) :: info ! locals - integer(psb_ipk_) :: ictxt, np, me,& + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me,& & err_act, iix, jjx, iiy, jjy integer(psb_lpk_) :: ix, ijx, iy, ijy, m character(len=20) :: name, ch_err @@ -192,7 +193,8 @@ subroutine psb_saxpby_vect_out(alpha, x, beta, y,& integer(psb_ipk_), intent(out) :: info ! locals - integer(psb_ipk_) :: ictxt, np, me,& + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me,& & err_act, iix, jjx, iiy, jjy, iiz, jjz integer(psb_lpk_) :: ix, ijx, iy, ijy, iz, ijz, m character(len=20) :: name, ch_err @@ -308,7 +310,8 @@ subroutine psb_saxpby(alpha, x, beta,y,desc_a,info, n, jx, jy) real(psb_spk_), intent(inout) :: y(:,:) ! locals - integer(psb_ipk_) :: ictxt, np, me,& + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me,& & err_act, iix, jjx, iiy, in, jjy, lldx, lldy integer(psb_lpk_) :: ix, ijx, iy, ijy, m character(len=20) :: name, ch_err @@ -456,7 +459,8 @@ subroutine psb_saxpbyv(alpha, x, beta,y,desc_a,info) real(psb_spk_), intent(inout) :: y(:) ! locals - integer(psb_ipk_) :: ictxt, np, me,& + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me,& & err_act, iix, jjx, iiy, jjy, lldx, lldy integer(psb_lpk_) :: ix, ijx, iy, ijy, m character(len=20) :: name, ch_err @@ -578,7 +582,8 @@ subroutine psb_saxpbyvout(alpha, x, beta,y, z, desc_a,info) real(psb_spk_), intent(inout) :: z(:) ! locals - integer(psb_ipk_) :: ictxt, np, me,& + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me,& & err_act, iix, jjx, iiy, jjy, iiz, jjz, lldx, lldy, lldz integer(psb_lpk_) :: ix, ijx, iy, ijy, iz, ijz, m character(len=20) :: name, ch_err @@ -673,7 +678,8 @@ subroutine psb_saddconst_vect(x,b,z,desc_a,info) integer(psb_ipk_), intent(out) :: info ! locals - integer(psb_ipk_) :: ictxt, np, me,& + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me,& & err_act, iix, jjx, iiy, jjy integer(psb_lpk_) :: ix, ijx, iy, ijy, m character(len=20) :: name, ch_err diff --git a/base/psblas/psb_scmp_vect.f90 b/base/psblas/psb_scmp_vect.f90 index c67cda7c..7a32dd6e 100644 --- a/base/psblas/psb_scmp_vect.f90 +++ b/base/psblas/psb_scmp_vect.f90 @@ -41,7 +41,8 @@ subroutine psb_scmp_vect(x,c,z,desc_a,info) integer(psb_ipk_), intent(out) :: info ! locals - integer(psb_ipk_) :: ictxt, np, me,& + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me,& & err_act, iix, jjx, iiy, jjy integer(psb_lpk_) :: ix, ijx, iy, ijy, m character(len=20) :: name, ch_err @@ -148,7 +149,8 @@ subroutine psb_smask_vect(c,x,m,t,desc_a,info) integer(psb_ipk_), intent(out) :: info ! locals - integer(psb_ipk_) :: ictxt, np, me,& + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me,& & err_act, iix, jjx, iiy, jjy integer(psb_lpk_) :: ix, ijx, iy, ijy, mm character(len=20) :: name, ch_err @@ -237,7 +239,8 @@ subroutine psb_scmp_spmatval(a,val,tol,desc_a,res,info) logical, intent(out) :: res ! Local - integer(psb_ipk_) :: ictxt, np, me + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me integer(psb_ipk_) :: err_act character(len=20) :: name, ch_err integer(psb_ipk_) :: debug_level, debug_unit @@ -291,7 +294,8 @@ subroutine psb_scmp_spmat(a,b,tol,desc_a,res,info) logical, intent(out) :: res ! Local - integer(psb_ipk_) :: ictxt, np, me + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me integer(psb_ipk_) :: err_act character(len=20) :: name, ch_err integer(psb_ipk_) :: debug_level, debug_unit diff --git a/base/psblas/psb_sdiv_vect.f90 b/base/psblas/psb_sdiv_vect.f90 index 2fba3e73..1857200c 100644 --- a/base/psblas/psb_sdiv_vect.f90 +++ b/base/psblas/psb_sdiv_vect.f90 @@ -40,7 +40,8 @@ subroutine psb_sdiv_vect(x,y,desc_a,info) integer(psb_ipk_), intent(out) :: info ! locals - integer(psb_ipk_) :: ictxt, np, me,& + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me,& & err_act, iix, jjx, iiy, jjy integer(psb_lpk_) :: ix, ijx, iy, ijy, m character(len=20) :: name, ch_err @@ -114,7 +115,8 @@ subroutine psb_sdiv_vect2(x,y,z,desc_a,info) integer(psb_ipk_), intent(out) :: info ! locals - integer(psb_ipk_) :: ictxt, np, me,& + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me,& & err_act, iix, jjx, iiy, jjy, iiz, jjz integer(psb_lpk_) :: ix, ijx, iy, ijy, iz, ijz, m character(len=20) :: name, ch_err @@ -201,7 +203,8 @@ subroutine psb_sdiv_vect_check(x,y,desc_a,info,flag) logical, intent(in) :: flag ! locals - integer(psb_ipk_) :: ictxt, np, me,& + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me,& & err_act, iix, jjx, iiy, jjy integer(psb_lpk_) :: ix, ijx, iy, ijy, m character(len=20) :: name, ch_err @@ -276,7 +279,8 @@ subroutine psb_sdiv_vect2_check(x,y,z,desc_a,info,flag) logical, intent(in) :: flag ! locals - integer(psb_ipk_) :: ictxt, np, me,& + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me,& & err_act, iix, jjx, iiy, jjy, iiz, jjz integer(psb_lpk_) :: ix, ijx, iy, ijy, iz, ijz, m character(len=20) :: name, ch_err @@ -369,7 +373,8 @@ function psb_sminquotient_vect(x,y,desc_a,info,global) result(res) logical, intent(in), optional :: global ! locals - integer(psb_ipk_) :: ictxt, np, me,& + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me,& & err_act, iix, jjx integer(psb_lpk_) :: ix, jx, iy, ijy, m logical :: global_ diff --git a/base/psblas/psb_sdot.f90 b/base/psblas/psb_sdot.f90 index cce9e15c..dbc1a17e 100644 --- a/base/psblas/psb_sdot.f90 +++ b/base/psblas/psb_sdot.f90 @@ -64,7 +64,8 @@ function psb_sdot_vect(x, y, desc_a,info,global) result(res) logical, intent(in), optional :: global ! locals - integer(psb_ipk_) :: ictxt, np, me, idx, ndm,& + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me, idx, ndm,& & err_act, iix, jjx, iiy, jjy, i, nr integer(psb_lpk_) :: ix, ijx, iy, ijy, m logical :: global_ @@ -187,7 +188,8 @@ function psb_sdot(x, y,desc_a, info, jx, jy,global) result(res) logical, intent(in), optional :: global ! locals - integer(psb_ipk_) :: ictxt, np, me, idx, ndm,& + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me, idx, ndm,& & err_act, iix, jjx, iiy, jjy, i, nr, lldx, lldy integer(psb_lpk_) :: ix, ijx, iy, ijy, m real(psb_spk_) :: sdot @@ -338,7 +340,8 @@ function psb_sdotv(x, y,desc_a, info,global) result(res) logical, intent(in), optional :: global ! locals - integer(psb_ipk_) :: ictxt, np, me, idx, ndm,& + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me, idx, ndm,& & err_act, iix, jjx, iiy, jjy, i, nr, lldx, lldy integer(psb_lpk_) :: ix, jx, iy, jy, m logical :: global_ @@ -474,7 +477,8 @@ subroutine psb_sdotvs(res, x, y,desc_a, info,global) logical, intent(in), optional :: global ! locals - integer(psb_ipk_) :: ictxt, np, me, idx, ndm,& + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me, idx, ndm,& & err_act, iix, jjx, iiy, jjy, i,nr, lldx, lldy integer(psb_lpk_) :: ix, jx, iy, jy, m logical :: global_ @@ -608,7 +612,8 @@ subroutine psb_smdots(res, x, y, desc_a, info,global) logical, intent(in), optional :: global ! locals - integer(psb_ipk_) :: ictxt, np, me, idx, ndm,& + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me, idx, ndm,& & err_act, iix, jjx, iiy, jjy, i, j, k, nr, lldx, lldy integer(psb_lpk_) :: ix, ijx, iy, ijy, m logical :: global_ diff --git a/base/psblas/psb_sgetmatinfo.f90 b/base/psblas/psb_sgetmatinfo.f90 index 8888d4db..7e10aee1 100644 --- a/base/psblas/psb_sgetmatinfo.f90 +++ b/base/psblas/psb_sgetmatinfo.f90 @@ -47,7 +47,8 @@ function psb_sget_nnz(a,desc_a,info) result(res) integer(psb_ipk_), intent(out) :: info ! locals - integer(psb_ipk_) :: ictxt, np, me,& + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me,& & err_act, iia, jja integer(psb_lpk_) :: localnnz character(len=20) :: name, ch_err diff --git a/base/psblas/psb_sinv_vect.f90 b/base/psblas/psb_sinv_vect.f90 index 5666a821..c3e3e891 100644 --- a/base/psblas/psb_sinv_vect.f90 +++ b/base/psblas/psb_sinv_vect.f90 @@ -40,7 +40,8 @@ subroutine psb_sinv_vect(x,y,desc_a,info) integer(psb_ipk_), intent(out) :: info ! locals - integer(psb_ipk_) :: ictxt, np, me,& + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me,& & err_act, iix, jjx, iiy, jjy integer(psb_lpk_) :: ix, ijx, iy, ijy, m character(len=20) :: name, ch_err @@ -115,7 +116,8 @@ subroutine psb_sinv_vect_check(x,y,desc_a,info,flag) logical :: check ! locals - integer(psb_ipk_) :: ictxt, np, me,& + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me,& & err_act, iix, jjx, iiy, jjy integer(psb_lpk_) :: ix, ijx, iy, ijy, m character(len=20) :: name, ch_err diff --git a/base/psblas/psb_smlt_vect.f90 b/base/psblas/psb_smlt_vect.f90 index 8f1623d9..30722022 100644 --- a/base/psblas/psb_smlt_vect.f90 +++ b/base/psblas/psb_smlt_vect.f90 @@ -40,7 +40,8 @@ subroutine psb_smlt_vect(x,y,desc_a,info) integer(psb_ipk_), intent(out) :: info ! locals - integer(psb_ipk_) :: ictxt, np, me,& + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me,& & err_act, iix, jjx, iiy, jjy integer(psb_lpk_) :: ix, ijx, iy, ijy, m character(len=20) :: name, ch_err @@ -120,7 +121,8 @@ subroutine psb_smlt_vect2(alpha,x,y,beta,z,desc_a,info,conjgx, conjgy) character(len=1), intent(in), optional :: conjgx, conjgy ! locals - integer(psb_ipk_) :: ictxt, np, me,& + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me,& & err_act, iix, jjx, iiy, jjy, iiz, jjz integer(psb_lpk_) :: ix, ijx, iy, ijy, iz, ijz, m character(len=20) :: name, ch_err diff --git a/base/psblas/psb_snrm2.f90 b/base/psblas/psb_snrm2.f90 index ab9c56ca..fbf1bdd5 100644 --- a/base/psblas/psb_snrm2.f90 +++ b/base/psblas/psb_snrm2.f90 @@ -60,7 +60,8 @@ function psb_snrm2(x, desc_a, info, jx,global) result(res) logical, intent(in), optional :: global ! locals - integer(psb_ipk_) :: ictxt, np, me,& + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me,& & err_act, iix, jjx, ndim, i, id, idx, ndm, ldx integer(psb_lpk_) :: ix, ijx, iy, ijy, m logical :: global_ @@ -195,7 +196,8 @@ function psb_snrm2v(x, desc_a, info,global) result(res) logical, intent(in), optional :: global ! locals - integer(psb_ipk_) :: ictxt, np, me,& + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me,& & err_act, iix, jjx, ndim, i, id, idx, ndm, ldx integer(psb_lpk_) :: ix, jx, iy, ijy, m real(psb_spk_) :: snrm2, dd @@ -291,7 +293,8 @@ function psb_snrm2_vect(x, desc_a, info,global) result(res) logical, intent(in), optional :: global ! locals - integer(psb_ipk_) :: ictxt, np, me,& + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me,& & err_act, iix, jjx, ndim, i, id, idx, ndm, ldx integer(psb_lpk_) :: ix, jx, iy, ijy, m logical :: global_ @@ -398,7 +401,8 @@ function psb_snrm2_weight_vect(x,w, desc_a, info,global) result(res) logical, intent(in), optional :: global ! locals - integer(psb_ipk_) :: ictxt, np, me,& + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me,& & err_act, iix, jjx, ndim, i, id, idx, ndm, ldx integer(psb_lpk_) :: ix, jx, iy, ijy, m logical :: global_ @@ -508,7 +512,8 @@ function psb_snrm2_weightmask_vect(x,w,idv, desc_a, info,global) result(res) logical, intent(in), optional :: global ! locals - integer(psb_ipk_) :: ictxt, np, me,& + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me,& & err_act, iix, jjx, ndim, i, id, idx, ndm, ldx integer(psb_lpk_) :: ix, jx, iy, ijy, m logical :: global_ @@ -645,7 +650,8 @@ subroutine psb_snrm2vs(res, x, desc_a, info,global) logical, intent(in), optional :: global ! locals - integer(psb_ipk_) :: ictxt, np, me,& + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me,& & err_act, iix, jjx, ndim, i, id, idx, ndm, ldx integer(psb_lpk_) :: ix, jx, iy, ijy, m logical :: global_ diff --git a/base/psblas/psb_snrmi.f90 b/base/psblas/psb_snrmi.f90 index 9fc41073..2234474c 100644 --- a/base/psblas/psb_snrmi.f90 +++ b/base/psblas/psb_snrmi.f90 @@ -53,7 +53,8 @@ function psb_snrmi(a,desc_a,info,global) result(res) logical, intent(in), optional :: global ! locals - integer(psb_ipk_) :: ictxt, np, me,& + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me,& & err_act, iia, jja, mdim, ndim integer(psb_lpk_) :: m, n, ia, ja logical :: global_ diff --git a/base/psblas/psb_sspmm.f90 b/base/psblas/psb_sspmm.f90 index 56b881b8..769450e7 100644 --- a/base/psblas/psb_sspmm.f90 +++ b/base/psblas/psb_sspmm.f90 @@ -71,7 +71,8 @@ subroutine psb_sspmv_vect(alpha,a,x,beta,y,desc_a,info,& logical, intent(in), optional :: doswap ! locals - integer(psb_ipk_) :: ictxt, np, me,& + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me,& & err_act, iix, jjx, iia, jja, nrow, ncol, lldx, lldy, & & liwork, iiy, jjy, ib, ip, idx integer(psb_lpk_) :: ix, ijx, iy, ijy, m, n, ia, ja @@ -309,7 +310,8 @@ subroutine psb_sspmm(alpha,a,x,beta,y,desc_a,info,& logical, intent(in), optional :: doswap ! locals - integer(psb_ipk_) :: ictxt, np, me,& + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me,& & err_act, iix, jjx, iia, jja, nrow, ncol, lldx, lldy, & & liwork, iiy, jjy, i, ib, ib1, ip, idx, ik integer(psb_lpk_) :: ix, ijx, iy, ijy, m, n, ia, ja, lik @@ -656,7 +658,8 @@ subroutine psb_sspmv(alpha,a,x,beta,y,desc_a,info,& logical, intent(in), optional :: doswap ! locals - integer(psb_ipk_) :: ictxt, np, me,& + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me,& & err_act, iix, jjx, iia, jja, nrow, ncol, lldx, lldy, & & liwork, iiy, jjy, ib, ip, idx, ik integer(psb_lpk_) :: ix, ijx, iy, ijy, m, n, ia, ja, lik, jx, jy diff --git a/base/psblas/psb_sspnrm1.f90 b/base/psblas/psb_sspnrm1.f90 index 9d2afeb8..71b540bf 100644 --- a/base/psblas/psb_sspnrm1.f90 +++ b/base/psblas/psb_sspnrm1.f90 @@ -53,7 +53,8 @@ function psb_sspnrm1(a,desc_a,info,global) result(res) logical, intent(in), optional :: global ! locals - integer(psb_ipk_) :: ictxt, np, me, nr,nc,& + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me, nr,nc,& & err_act, iia, jja, mdim, ndim integer(psb_lpk_) :: ix, ijx, iy, ijy, m, n, ia, ja logical :: global_ diff --git a/base/psblas/psb_sspsm.f90 b/base/psblas/psb_sspsm.f90 index 1cbbd6d2..d9371624 100644 --- a/base/psblas/psb_sspsm.f90 +++ b/base/psblas/psb_sspsm.f90 @@ -84,7 +84,8 @@ subroutine psb_sspsv_vect(alpha,a,x,beta,y,desc_a,info,& integer(psb_ipk_), intent(in), optional :: choice ! locals - integer(psb_ipk_) :: ictxt, np, me, & + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me, & & err_act, iix, jjx, ia, ja, iia, jja, lldx,lldy, choice_,& & ix, iy, ik, jx, jy, i, lld,& & m, nrow, ncol, liwork, llwork, iiy, jjy, idx, ndm @@ -289,7 +290,8 @@ subroutine psb_sspsm(alpha,a,x,beta,y,desc_a,info,& integer(psb_ipk_), intent(in), optional :: k, jx, jy ! locals - integer(psb_ipk_) :: ictxt, np, me,& + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me,& & err_act, iix, jjx, iia, jja, lldx,lldy, choice_,& & ik, i, lld, nrow, ncol, liwork, llwork, iiy, jjy, idx, ndm @@ -533,7 +535,8 @@ subroutine psb_sspsv(alpha,a,x,beta,y,desc_a,info,& integer(psb_ipk_), intent(in), optional :: choice ! locals - integer(psb_ipk_) :: ictxt, np, me, & + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me, & & err_act, iix, jjx, iia, jja, lldx,lldy, choice_,& & ik, i, lld, nrow, ncol, liwork, llwork, iiy, jjy, idx, ndm integer(psb_lpk_) :: ix, ijx, iy, ijy, m, n, ia, ja, lik, jx, jy diff --git a/base/psblas/psb_zabs_vect.f90 b/base/psblas/psb_zabs_vect.f90 index 86ac6bfb..fe1a1f7f 100644 --- a/base/psblas/psb_zabs_vect.f90 +++ b/base/psblas/psb_zabs_vect.f90 @@ -40,7 +40,8 @@ subroutine psb_zabs_vect(x,y,desc_a,info) integer(psb_ipk_), intent(out) :: info ! locals - integer(psb_ipk_) :: ictxt, np, me,& + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me,& & err_act, iix, jjx, iiy, jjy integer(psb_lpk_) :: ix, ijx, iy, ijy, m character(len=20) :: name, ch_err diff --git a/base/psblas/psb_zamax.f90 b/base/psblas/psb_zamax.f90 index 8fd10043..035697da 100644 --- a/base/psblas/psb_zamax.f90 +++ b/base/psblas/psb_zamax.f90 @@ -57,7 +57,8 @@ function psb_zamax(x,desc_a, info, jx,global) result(res) logical, intent(in), optional :: global ! locals - integer(psb_ipk_) :: ictxt, np, me,& + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me,& & err_act, iix, jjx, ldx integer(psb_lpk_) :: ix, ijx, iy, ijy, m logical :: global_ @@ -185,7 +186,8 @@ function psb_zamaxv (x,desc_a, info,global) result(res) logical, intent(in), optional :: global ! locals - integer(psb_ipk_) :: ictxt, np, me,& + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me,& & err_act, iix, jjx, ldx integer(psb_lpk_) :: ix, jx, iy, ijy, m logical :: global_ @@ -280,7 +282,8 @@ function psb_zamax_vect(x, desc_a, info,global) result(res) logical, intent(in), optional :: global ! locals - integer(psb_ipk_) :: ictxt, np, me,& + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me,& & err_act, iix, jjx integer(psb_lpk_) :: ix, jx, iy, ijy, m logical :: global_ @@ -409,7 +412,8 @@ subroutine psb_zamaxvs(res,x,desc_a, info,global) logical, intent(in), optional :: global ! locals - integer(psb_ipk_) :: ictxt, np, me,& + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me,& & err_act, iix, jjx, ldx integer(psb_lpk_) :: ix, ijx, iy, ijy, m logical :: global_ @@ -532,7 +536,8 @@ subroutine psb_zmamaxs(res,x,desc_a, info,jx,global) logical, intent(in), optional :: global ! locals - integer(psb_ipk_) :: ictxt, np, me,& + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me,& & err_act, iix, jjx, ldx, i, k integer(psb_lpk_) :: ix, ijx, iy, ijy, m logical :: global_ diff --git a/base/psblas/psb_zasum.f90 b/base/psblas/psb_zasum.f90 index 9b6fddd7..6ede26d8 100644 --- a/base/psblas/psb_zasum.f90 +++ b/base/psblas/psb_zasum.f90 @@ -57,7 +57,8 @@ function psb_zasum (x,desc_a, info, jx,global) result(res) logical, intent(in), optional :: global ! locals - integer(psb_ipk_) :: ictxt, np, me, & + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me, & & err_act, iix, jjx, i, idx, ndm, ldx integer(psb_lpk_) :: ix, ijx, iy, ijy, m logical :: global_ @@ -160,7 +161,8 @@ function psb_zasum_vect(x, desc_a, info,global) result(res) logical, intent(in), optional :: global ! locals - integer(psb_ipk_) :: ictxt, np, me,& + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me,& & err_act, iix, jjx, imax, i, idx, ndm integer(psb_lpk_) :: ix, jx, iy, ijy, m logical :: global_ @@ -297,7 +299,8 @@ function psb_zasumv(x,desc_a, info,global) result(res) logical, intent(in), optional :: global ! locals - integer(psb_ipk_) :: ictxt, np, me,& + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me,& & err_act, iix, jjx, i, idx, ndm, ldx integer(psb_lpk_) :: ix, jx, iy, ijy, m logical :: global_ @@ -428,7 +431,8 @@ subroutine psb_zasumvs(res,x,desc_a, info,global) logical, intent(in), optional :: global ! locals - integer(psb_ipk_) :: ictxt, np, me,& + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me,& & err_act, iix, jjx, i, idx, ndm, ldx integer(psb_lpk_) :: ix, jx, iy, ijy, m logical :: global_ diff --git a/base/psblas/psb_zaxpby.f90 b/base/psblas/psb_zaxpby.f90 index c0cf79fd..ce96a080 100644 --- a/base/psblas/psb_zaxpby.f90 +++ b/base/psblas/psb_zaxpby.f90 @@ -59,7 +59,8 @@ subroutine psb_zaxpby_vect(alpha, x, beta, y,& integer(psb_ipk_), intent(out) :: info ! locals - integer(psb_ipk_) :: ictxt, np, me,& + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me,& & err_act, iix, jjx, iiy, jjy integer(psb_lpk_) :: ix, ijx, iy, ijy, m character(len=20) :: name, ch_err @@ -192,7 +193,8 @@ subroutine psb_zaxpby_vect_out(alpha, x, beta, y,& integer(psb_ipk_), intent(out) :: info ! locals - integer(psb_ipk_) :: ictxt, np, me,& + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me,& & err_act, iix, jjx, iiy, jjy, iiz, jjz integer(psb_lpk_) :: ix, ijx, iy, ijy, iz, ijz, m character(len=20) :: name, ch_err @@ -308,7 +310,8 @@ subroutine psb_zaxpby(alpha, x, beta,y,desc_a,info, n, jx, jy) complex(psb_dpk_), intent(inout) :: y(:,:) ! locals - integer(psb_ipk_) :: ictxt, np, me,& + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me,& & err_act, iix, jjx, iiy, in, jjy, lldx, lldy integer(psb_lpk_) :: ix, ijx, iy, ijy, m character(len=20) :: name, ch_err @@ -456,7 +459,8 @@ subroutine psb_zaxpbyv(alpha, x, beta,y,desc_a,info) complex(psb_dpk_), intent(inout) :: y(:) ! locals - integer(psb_ipk_) :: ictxt, np, me,& + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me,& & err_act, iix, jjx, iiy, jjy, lldx, lldy integer(psb_lpk_) :: ix, ijx, iy, ijy, m character(len=20) :: name, ch_err @@ -578,7 +582,8 @@ subroutine psb_zaxpbyvout(alpha, x, beta,y, z, desc_a,info) complex(psb_dpk_), intent(inout) :: z(:) ! locals - integer(psb_ipk_) :: ictxt, np, me,& + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me,& & err_act, iix, jjx, iiy, jjy, iiz, jjz, lldx, lldy, lldz integer(psb_lpk_) :: ix, ijx, iy, ijy, iz, ijz, m character(len=20) :: name, ch_err @@ -673,7 +678,8 @@ subroutine psb_zaddconst_vect(x,b,z,desc_a,info) integer(psb_ipk_), intent(out) :: info ! locals - integer(psb_ipk_) :: ictxt, np, me,& + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me,& & err_act, iix, jjx, iiy, jjy integer(psb_lpk_) :: ix, ijx, iy, ijy, m character(len=20) :: name, ch_err diff --git a/base/psblas/psb_zcmp_vect.f90 b/base/psblas/psb_zcmp_vect.f90 index d0184d09..2e6d65d1 100644 --- a/base/psblas/psb_zcmp_vect.f90 +++ b/base/psblas/psb_zcmp_vect.f90 @@ -41,7 +41,8 @@ subroutine psb_zcmp_vect(x,c,z,desc_a,info) integer(psb_ipk_), intent(out) :: info ! locals - integer(psb_ipk_) :: ictxt, np, me,& + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me,& & err_act, iix, jjx, iiy, jjy integer(psb_lpk_) :: ix, ijx, iy, ijy, m character(len=20) :: name, ch_err @@ -115,7 +116,8 @@ subroutine psb_zcmp_spmatval(a,val,tol,desc_a,res,info) logical, intent(out) :: res ! Local - integer(psb_ipk_) :: ictxt, np, me + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me integer(psb_ipk_) :: err_act character(len=20) :: name, ch_err integer(psb_ipk_) :: debug_level, debug_unit @@ -169,7 +171,8 @@ subroutine psb_zcmp_spmat(a,b,tol,desc_a,res,info) logical, intent(out) :: res ! Local - integer(psb_ipk_) :: ictxt, np, me + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me integer(psb_ipk_) :: err_act character(len=20) :: name, ch_err integer(psb_ipk_) :: debug_level, debug_unit diff --git a/base/psblas/psb_zdiv_vect.f90 b/base/psblas/psb_zdiv_vect.f90 index f07f5d00..f6ef22ec 100644 --- a/base/psblas/psb_zdiv_vect.f90 +++ b/base/psblas/psb_zdiv_vect.f90 @@ -40,7 +40,8 @@ subroutine psb_zdiv_vect(x,y,desc_a,info) integer(psb_ipk_), intent(out) :: info ! locals - integer(psb_ipk_) :: ictxt, np, me,& + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me,& & err_act, iix, jjx, iiy, jjy integer(psb_lpk_) :: ix, ijx, iy, ijy, m character(len=20) :: name, ch_err @@ -114,7 +115,8 @@ subroutine psb_zdiv_vect2(x,y,z,desc_a,info) integer(psb_ipk_), intent(out) :: info ! locals - integer(psb_ipk_) :: ictxt, np, me,& + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me,& & err_act, iix, jjx, iiy, jjy, iiz, jjz integer(psb_lpk_) :: ix, ijx, iy, ijy, iz, ijz, m character(len=20) :: name, ch_err @@ -201,7 +203,8 @@ subroutine psb_zdiv_vect_check(x,y,desc_a,info,flag) logical, intent(in) :: flag ! locals - integer(psb_ipk_) :: ictxt, np, me,& + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me,& & err_act, iix, jjx, iiy, jjy integer(psb_lpk_) :: ix, ijx, iy, ijy, m character(len=20) :: name, ch_err @@ -276,7 +279,8 @@ subroutine psb_zdiv_vect2_check(x,y,z,desc_a,info,flag) logical, intent(in) :: flag ! locals - integer(psb_ipk_) :: ictxt, np, me,& + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me,& & err_act, iix, jjx, iiy, jjy, iiz, jjz integer(psb_lpk_) :: ix, ijx, iy, ijy, iz, ijz, m character(len=20) :: name, ch_err diff --git a/base/psblas/psb_zdot.f90 b/base/psblas/psb_zdot.f90 index ad21b1d8..12a82696 100644 --- a/base/psblas/psb_zdot.f90 +++ b/base/psblas/psb_zdot.f90 @@ -64,7 +64,8 @@ function psb_zdot_vect(x, y, desc_a,info,global) result(res) logical, intent(in), optional :: global ! locals - integer(psb_ipk_) :: ictxt, np, me, idx, ndm,& + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me, idx, ndm,& & err_act, iix, jjx, iiy, jjy, i, nr integer(psb_lpk_) :: ix, ijx, iy, ijy, m logical :: global_ @@ -187,7 +188,8 @@ function psb_zdot(x, y,desc_a, info, jx, jy,global) result(res) logical, intent(in), optional :: global ! locals - integer(psb_ipk_) :: ictxt, np, me, idx, ndm,& + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me, idx, ndm,& & err_act, iix, jjx, iiy, jjy, i, nr, lldx, lldy integer(psb_lpk_) :: ix, ijx, iy, ijy, m complex(psb_dpk_) :: zdotc @@ -338,7 +340,8 @@ function psb_zdotv(x, y,desc_a, info,global) result(res) logical, intent(in), optional :: global ! locals - integer(psb_ipk_) :: ictxt, np, me, idx, ndm,& + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me, idx, ndm,& & err_act, iix, jjx, iiy, jjy, i, nr, lldx, lldy integer(psb_lpk_) :: ix, jx, iy, jy, m logical :: global_ @@ -474,7 +477,8 @@ subroutine psb_zdotvs(res, x, y,desc_a, info,global) logical, intent(in), optional :: global ! locals - integer(psb_ipk_) :: ictxt, np, me, idx, ndm,& + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me, idx, ndm,& & err_act, iix, jjx, iiy, jjy, i,nr, lldx, lldy integer(psb_lpk_) :: ix, jx, iy, jy, m logical :: global_ @@ -608,7 +612,8 @@ subroutine psb_zmdots(res, x, y, desc_a, info,global) logical, intent(in), optional :: global ! locals - integer(psb_ipk_) :: ictxt, np, me, idx, ndm,& + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me, idx, ndm,& & err_act, iix, jjx, iiy, jjy, i, j, k, nr, lldx, lldy integer(psb_lpk_) :: ix, ijx, iy, ijy, m logical :: global_ diff --git a/base/psblas/psb_zgetmatinfo.f90 b/base/psblas/psb_zgetmatinfo.f90 index 7d18418b..c157613f 100644 --- a/base/psblas/psb_zgetmatinfo.f90 +++ b/base/psblas/psb_zgetmatinfo.f90 @@ -47,7 +47,8 @@ function psb_zget_nnz(a,desc_a,info) result(res) integer(psb_ipk_), intent(out) :: info ! locals - integer(psb_ipk_) :: ictxt, np, me,& + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me,& & err_act, iia, jja integer(psb_lpk_) :: localnnz character(len=20) :: name, ch_err diff --git a/base/psblas/psb_zinv_vect.f90 b/base/psblas/psb_zinv_vect.f90 index bb37ee69..938ec42e 100644 --- a/base/psblas/psb_zinv_vect.f90 +++ b/base/psblas/psb_zinv_vect.f90 @@ -40,7 +40,8 @@ subroutine psb_zinv_vect(x,y,desc_a,info) integer(psb_ipk_), intent(out) :: info ! locals - integer(psb_ipk_) :: ictxt, np, me,& + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me,& & err_act, iix, jjx, iiy, jjy integer(psb_lpk_) :: ix, ijx, iy, ijy, m character(len=20) :: name, ch_err @@ -115,7 +116,8 @@ subroutine psb_zinv_vect_check(x,y,desc_a,info,flag) logical :: check ! locals - integer(psb_ipk_) :: ictxt, np, me,& + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me,& & err_act, iix, jjx, iiy, jjy integer(psb_lpk_) :: ix, ijx, iy, ijy, m character(len=20) :: name, ch_err diff --git a/base/psblas/psb_zmlt_vect.f90 b/base/psblas/psb_zmlt_vect.f90 index 598a12a7..e35a3b5a 100644 --- a/base/psblas/psb_zmlt_vect.f90 +++ b/base/psblas/psb_zmlt_vect.f90 @@ -40,7 +40,8 @@ subroutine psb_zmlt_vect(x,y,desc_a,info) integer(psb_ipk_), intent(out) :: info ! locals - integer(psb_ipk_) :: ictxt, np, me,& + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me,& & err_act, iix, jjx, iiy, jjy integer(psb_lpk_) :: ix, ijx, iy, ijy, m character(len=20) :: name, ch_err @@ -120,7 +121,8 @@ subroutine psb_zmlt_vect2(alpha,x,y,beta,z,desc_a,info,conjgx, conjgy) character(len=1), intent(in), optional :: conjgx, conjgy ! locals - integer(psb_ipk_) :: ictxt, np, me,& + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me,& & err_act, iix, jjx, iiy, jjy, iiz, jjz integer(psb_lpk_) :: ix, ijx, iy, ijy, iz, ijz, m character(len=20) :: name, ch_err diff --git a/base/psblas/psb_znrm2.f90 b/base/psblas/psb_znrm2.f90 index bfa29d18..2a616a8c 100644 --- a/base/psblas/psb_znrm2.f90 +++ b/base/psblas/psb_znrm2.f90 @@ -60,7 +60,8 @@ function psb_znrm2(x, desc_a, info, jx,global) result(res) logical, intent(in), optional :: global ! locals - integer(psb_ipk_) :: ictxt, np, me,& + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me,& & err_act, iix, jjx, ndim, i, id, idx, ndm, ldx integer(psb_lpk_) :: ix, ijx, iy, ijy, m logical :: global_ @@ -195,7 +196,8 @@ function psb_znrm2v(x, desc_a, info,global) result(res) logical, intent(in), optional :: global ! locals - integer(psb_ipk_) :: ictxt, np, me,& + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me,& & err_act, iix, jjx, ndim, i, id, idx, ndm, ldx integer(psb_lpk_) :: ix, jx, iy, ijy, m real(psb_dpk_) :: dznrm2, dd @@ -291,7 +293,8 @@ function psb_znrm2_vect(x, desc_a, info,global) result(res) logical, intent(in), optional :: global ! locals - integer(psb_ipk_) :: ictxt, np, me,& + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me,& & err_act, iix, jjx, ndim, i, id, idx, ndm, ldx integer(psb_lpk_) :: ix, jx, iy, ijy, m logical :: global_ @@ -398,7 +401,8 @@ function psb_znrm2_weight_vect(x,w, desc_a, info,global) result(res) logical, intent(in), optional :: global ! locals - integer(psb_ipk_) :: ictxt, np, me,& + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me,& & err_act, iix, jjx, ndim, i, id, idx, ndm, ldx integer(psb_lpk_) :: ix, jx, iy, ijy, m logical :: global_ @@ -508,7 +512,8 @@ function psb_znrm2_weightmask_vect(x,w,idv, desc_a, info,global) result(res) logical, intent(in), optional :: global ! locals - integer(psb_ipk_) :: ictxt, np, me,& + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me,& & err_act, iix, jjx, ndim, i, id, idx, ndm, ldx integer(psb_lpk_) :: ix, jx, iy, ijy, m logical :: global_ @@ -645,7 +650,8 @@ subroutine psb_znrm2vs(res, x, desc_a, info,global) logical, intent(in), optional :: global ! locals - integer(psb_ipk_) :: ictxt, np, me,& + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me,& & err_act, iix, jjx, ndim, i, id, idx, ndm, ldx integer(psb_lpk_) :: ix, jx, iy, ijy, m logical :: global_ diff --git a/base/psblas/psb_znrmi.f90 b/base/psblas/psb_znrmi.f90 index 19b071e4..d49ae9cd 100644 --- a/base/psblas/psb_znrmi.f90 +++ b/base/psblas/psb_znrmi.f90 @@ -53,7 +53,8 @@ function psb_znrmi(a,desc_a,info,global) result(res) logical, intent(in), optional :: global ! locals - integer(psb_ipk_) :: ictxt, np, me,& + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me,& & err_act, iia, jja, mdim, ndim integer(psb_lpk_) :: m, n, ia, ja logical :: global_ diff --git a/base/psblas/psb_zspmm.f90 b/base/psblas/psb_zspmm.f90 index add3205b..8eeefe37 100644 --- a/base/psblas/psb_zspmm.f90 +++ b/base/psblas/psb_zspmm.f90 @@ -71,7 +71,8 @@ subroutine psb_zspmv_vect(alpha,a,x,beta,y,desc_a,info,& logical, intent(in), optional :: doswap ! locals - integer(psb_ipk_) :: ictxt, np, me,& + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me,& & err_act, iix, jjx, iia, jja, nrow, ncol, lldx, lldy, & & liwork, iiy, jjy, ib, ip, idx integer(psb_lpk_) :: ix, ijx, iy, ijy, m, n, ia, ja @@ -309,7 +310,8 @@ subroutine psb_zspmm(alpha,a,x,beta,y,desc_a,info,& logical, intent(in), optional :: doswap ! locals - integer(psb_ipk_) :: ictxt, np, me,& + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me,& & err_act, iix, jjx, iia, jja, nrow, ncol, lldx, lldy, & & liwork, iiy, jjy, i, ib, ib1, ip, idx, ik integer(psb_lpk_) :: ix, ijx, iy, ijy, m, n, ia, ja, lik @@ -656,7 +658,8 @@ subroutine psb_zspmv(alpha,a,x,beta,y,desc_a,info,& logical, intent(in), optional :: doswap ! locals - integer(psb_ipk_) :: ictxt, np, me,& + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me,& & err_act, iix, jjx, iia, jja, nrow, ncol, lldx, lldy, & & liwork, iiy, jjy, ib, ip, idx, ik integer(psb_lpk_) :: ix, ijx, iy, ijy, m, n, ia, ja, lik, jx, jy diff --git a/base/psblas/psb_zspnrm1.f90 b/base/psblas/psb_zspnrm1.f90 index 7bc5fa15..578c8329 100644 --- a/base/psblas/psb_zspnrm1.f90 +++ b/base/psblas/psb_zspnrm1.f90 @@ -53,7 +53,8 @@ function psb_zspnrm1(a,desc_a,info,global) result(res) logical, intent(in), optional :: global ! locals - integer(psb_ipk_) :: ictxt, np, me, nr,nc,& + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me, nr,nc,& & err_act, iia, jja, mdim, ndim integer(psb_lpk_) :: ix, ijx, iy, ijy, m, n, ia, ja logical :: global_ diff --git a/base/psblas/psb_zspsm.f90 b/base/psblas/psb_zspsm.f90 index 63cbe783..6daca718 100644 --- a/base/psblas/psb_zspsm.f90 +++ b/base/psblas/psb_zspsm.f90 @@ -84,7 +84,8 @@ subroutine psb_zspsv_vect(alpha,a,x,beta,y,desc_a,info,& integer(psb_ipk_), intent(in), optional :: choice ! locals - integer(psb_ipk_) :: ictxt, np, me, & + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me, & & err_act, iix, jjx, ia, ja, iia, jja, lldx,lldy, choice_,& & ix, iy, ik, jx, jy, i, lld,& & m, nrow, ncol, liwork, llwork, iiy, jjy, idx, ndm @@ -289,7 +290,8 @@ subroutine psb_zspsm(alpha,a,x,beta,y,desc_a,info,& integer(psb_ipk_), intent(in), optional :: k, jx, jy ! locals - integer(psb_ipk_) :: ictxt, np, me,& + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me,& & err_act, iix, jjx, iia, jja, lldx,lldy, choice_,& & ik, i, lld, nrow, ncol, liwork, llwork, iiy, jjy, idx, ndm @@ -533,7 +535,8 @@ subroutine psb_zspsv(alpha,a,x,beta,y,desc_a,info,& integer(psb_ipk_), intent(in), optional :: choice ! locals - integer(psb_ipk_) :: ictxt, np, me, & + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me, & & err_act, iix, jjx, iia, jja, lldx,lldy, choice_,& & ik, i, lld, nrow, ncol, liwork, llwork, iiy, jjy, idx, ndm integer(psb_lpk_) :: ix, ijx, iy, ijy, m, n, ia, ja, lik, jx, jy diff --git a/base/tools/psb_c_glob_transpose.F90 b/base/tools/psb_c_glob_transpose.F90 index 1509cf33..aa342bdb 100644 --- a/base/tools/psb_c_glob_transpose.F90 +++ b/base/tools/psb_c_glob_transpose.F90 @@ -110,7 +110,8 @@ subroutine psb_lc_coo_glob_transpose(ain,desc_r,info,atrans,desc_c,desc_rx) integer(psb_ipk_), intent(out) :: info ! ...local scalars.... - integer(psb_ipk_) :: ictxt, np,me + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np,me integer(psb_ipk_) :: counter,proc, err_act, j integer(psb_lpk_) :: i, k, idx, r, ipx,mat_recv, iszs, iszr,idxs,idxr,nz,& & l1, nsnds, nrcvs, nr,nc,nzl, hlstart, nzt, nzd @@ -406,7 +407,8 @@ subroutine psb_c_coo_glob_transpose(ain,desc_r,info,atrans,desc_c,desc_rx) type(psb_desc_type), intent(out), optional :: desc_rx integer(psb_ipk_), intent(out) :: info - integer(psb_ipk_) :: ictxt, np,me + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np,me integer(psb_ipk_) :: counter,proc, err_act, j integer(psb_ipk_) :: i, k, idx, r, ipx,mat_recv, iszs, iszr,idxs,idxr,nz,& & l1, nsnds, nrcvs, nr,nc,nzl, hlstart, nzd @@ -709,7 +711,8 @@ subroutine psb_c_simple_glob_transpose_ip(ain,desc_a,info) ! type(psb_c_coo_sparse_mat) :: tmpc1, tmpc2 integer(psb_ipk_) :: nz1, nz2, nzh, nz - integer(psb_ipk_) :: ictxt, me, np + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: me, np integer(psb_lpk_) :: i, j, k, nrow, ncol, nlz integer(psb_lpk_), allocatable :: ilv(:) character(len=80) :: aname @@ -760,7 +763,8 @@ subroutine psb_c_simple_glob_transpose(ain,aout,desc_a,info) ! type(psb_c_coo_sparse_mat) :: tmpc1, tmpc2 integer(psb_ipk_) :: nz1, nz2, nzh, nz - integer(psb_ipk_) :: ictxt, me, np + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: me, np integer(psb_lpk_) :: i, j, k, nrow, ncol, nlz integer(psb_lpk_), allocatable :: ilv(:) character(len=80) :: aname @@ -811,7 +815,8 @@ subroutine psb_lc_simple_glob_transpose_ip(ain,desc_a,info) ! type(psb_lc_coo_sparse_mat) :: tmpc1, tmpc2 integer(psb_ipk_) :: nz1, nz2, nzh, nz - integer(psb_ipk_) :: ictxt, me, np + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: me, np integer(psb_lpk_) :: i, j, k, nrow, ncol, nlz integer(psb_lpk_), allocatable :: ilv(:) character(len=80) :: aname @@ -862,7 +867,8 @@ subroutine psb_lc_simple_glob_transpose(ain,aout,desc_a,info) ! type(psb_lc_coo_sparse_mat) :: tmpc1, tmpc2 integer(psb_ipk_) :: nz1, nz2, nzh, nz - integer(psb_ipk_) :: ictxt, me, np + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: me, np integer(psb_lpk_) :: i, j, k, nrow, ncol, nlz integer(psb_lpk_), allocatable :: ilv(:) character(len=80) :: aname diff --git a/base/tools/psb_c_map.f90 b/base/tools/psb_c_map.f90 index 83a54d32..be2d432c 100644 --- a/base/tools/psb_c_map.f90 +++ b/base/tools/psb_c_map.f90 @@ -51,7 +51,8 @@ subroutine psb_c_map_U2V_a(alpha,x,beta,y,map,info,work) ! complex(psb_spk_), allocatable :: xt(:), yt(:) integer(psb_ipk_) :: i, j, nr1, nc1,nr2, nc2,& - & map_kind, nr, ictxt + & map_kind, nr + type(psb_ctxt_type) :: ictxt character(len=20), parameter :: name='psb_map_U2V' info = psb_success_ @@ -125,7 +126,8 @@ subroutine psb_c_map_U2V_v(alpha,x,beta,y,map,info,work,vtx,vty) type(psb_c_vect_type),pointer :: ptx, pty complex(psb_spk_), allocatable :: xta(:), yta(:) integer(psb_ipk_) :: i, j, nr1, nc1,nr2, nc2 ,& - & map_kind, nr, ictxt, iam, np + & map_kind, nr, iam, np + type(psb_ctxt_type) :: ictxt character(len=20), parameter :: name='psb_map_U2V_v' info = psb_success_ @@ -232,7 +234,8 @@ subroutine psb_c_map_V2U_a(alpha,x,beta,y,map,info,work) ! complex(psb_spk_), allocatable :: xt(:), yt(:) integer(psb_ipk_) :: i, j, nr1, nc1,nr2, nc2,& - & map_kind, nr, ictxt + & map_kind, nr + type(psb_ctxt_type) :: ictxt character(len=20), parameter :: name='psb_map_V2U' info = psb_success_ @@ -305,7 +308,8 @@ subroutine psb_c_map_V2U_v(alpha,x,beta,y,map,info,work,vtx,vty) type(psb_c_vect_type),pointer :: ptx, pty complex(psb_spk_), allocatable :: xta(:), yta(:) integer(psb_ipk_) :: i, j, nr1, nc1,nr2, nc2,& - & map_kind, nr, ictxt, iam, np + & map_kind, nr, iam, np + type(psb_ctxt_type) :: ictxt character(len=20), parameter :: name='psb_map_V2U_v' info = psb_success_ diff --git a/base/tools/psb_c_par_csr_spspmm.f90 b/base/tools/psb_c_par_csr_spspmm.f90 index 058d1a62..a236254a 100644 --- a/base/tools/psb_c_par_csr_spspmm.f90 +++ b/base/tools/psb_c_par_csr_spspmm.f90 @@ -73,7 +73,8 @@ Subroutine psb_c_par_csr_spspmm(acsr,desc_a,bcsr,ccsr,desc_c,info,data) integer(psb_ipk_), intent(out) :: info integer(psb_ipk_), intent(in), optional :: data ! ...local scalars.... - integer(psb_ipk_) :: ictxt, np,me + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np,me integer(psb_ipk_) :: ncol, nnz type(psb_lc_csr_sparse_mat) :: ltcsr type(psb_c_csr_sparse_mat) :: tcsr @@ -168,7 +169,8 @@ Subroutine psb_lc_par_csr_spspmm(acsr,desc_a,bcsr,ccsr,desc_c,info,data) integer(psb_ipk_), intent(out) :: info integer(psb_ipk_), intent(in), optional :: data ! ...local scalars.... - integer(psb_ipk_) :: ictxt, np,me + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np,me integer(psb_lpk_) :: nacol, nccol, nnz type(psb_lc_csr_sparse_mat) :: tcsr1 logical :: update_desc_c diff --git a/base/tools/psb_callc.f90 b/base/tools/psb_callc.f90 index 19924fbe..cbc189f0 100644 --- a/base/tools/psb_callc.f90 +++ b/base/tools/psb_callc.f90 @@ -52,7 +52,7 @@ subroutine psb_calloc_vect(x, desc_a,info) !locals integer(psb_ipk_) :: np,me,nr,i,err_act - integer(psb_ipk_) :: ictxt + type(psb_ctxt_type) :: ictxt integer(psb_ipk_) :: debug_level, debug_unit character(len=20) :: name @@ -133,8 +133,9 @@ subroutine psb_calloc_vect_r2(x, desc_a,info,n,lb) integer(psb_ipk_), optional, intent(in) :: n,lb !locals + type(psb_ctxt_type) :: ictxt integer(psb_ipk_) :: np,me,nr,i,err_act, n_, lb_ - integer(psb_ipk_) :: ictxt, exch(1) + integer(psb_ipk_) :: exch(1) integer(psb_ipk_) :: debug_level, debug_unit character(len=20) :: name @@ -235,8 +236,9 @@ subroutine psb_calloc_multivect(x, desc_a,info,n) integer(psb_ipk_), optional, intent(in) :: n !locals + type(psb_ctxt_type) :: ictxt integer(psb_ipk_) :: np,me,nr,i,err_act, n_, lb_ - integer(psb_ipk_) :: ictxt, exch(1) + integer(psb_ipk_) :: exch(1) integer(psb_ipk_) :: debug_level, debug_unit character(len=20) :: name diff --git a/base/tools/psb_callc_a.f90 b/base/tools/psb_callc_a.f90 index df3a41b1..ffb5a6bb 100644 --- a/base/tools/psb_callc_a.f90 +++ b/base/tools/psb_callc_a.f90 @@ -55,7 +55,8 @@ subroutine psb_calloc(x, desc_a, info, n, lb) !locals integer(psb_ipk_) :: err,nr,i,j,n_,err_act - integer(psb_ipk_) :: ictxt,np,me + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np,me integer(psb_ipk_) :: exch(3) character(len=20) :: name @@ -183,7 +184,8 @@ subroutine psb_callocv(x, desc_a,info,n) !locals integer(psb_ipk_) :: nr,i,err_act - integer(psb_ipk_) :: ictxt, np,me + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np,me integer(psb_ipk_) :: debug_level, debug_unit character(len=20) :: name diff --git a/base/tools/psb_casb.f90 b/base/tools/psb_casb.f90 index b7e57549..70649385 100644 --- a/base/tools/psb_casb.f90 +++ b/base/tools/psb_casb.f90 @@ -62,7 +62,8 @@ subroutine psb_casb_vect(x, desc_a, info, mold, scratch) logical, intent(in), optional :: scratch ! local variables - integer(psb_ipk_) :: ictxt,np,me + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np,me integer(psb_ipk_) :: i1sz,nrow,ncol, err_act logical :: scratch_ integer(psb_ipk_) :: debug_level, debug_unit @@ -135,7 +136,8 @@ subroutine psb_casb_vect_r2(x, desc_a, info, mold, scratch) logical, intent(in), optional :: scratch ! local variables - integer(psb_ipk_) :: ictxt,np,me, i, n + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np,me, i, n integer(psb_ipk_) :: i1sz,nrow,ncol, err_act logical :: scratch_ integer(psb_ipk_) :: debug_level, debug_unit @@ -217,7 +219,8 @@ subroutine psb_casb_multivect(x, desc_a, info, mold, scratch,n) logical, intent(in), optional :: scratch ! local variables - integer(psb_ipk_) :: ictxt,np,me + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np,me integer(psb_ipk_) :: i1sz,nrow,ncol, err_act, n_ logical :: scratch_ diff --git a/base/tools/psb_casb_a.f90 b/base/tools/psb_casb_a.f90 index 5d4e4d6a..887cc7c9 100644 --- a/base/tools/psb_casb_a.f90 +++ b/base/tools/psb_casb_a.f90 @@ -52,7 +52,8 @@ subroutine psb_casb(x, desc_a, info, scratch) logical, intent(in), optional :: scratch ! local variables - integer(psb_ipk_) :: ictxt,np,me,nrow,ncol, err_act + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np,me,nrow,ncol, err_act integer(psb_ipk_) :: i1sz, i2sz integer(psb_ipk_) :: debug_level, debug_unit logical :: scratch_ @@ -188,7 +189,8 @@ subroutine psb_casbv(x, desc_a, info, scratch) logical, intent(in), optional :: scratch ! local variables - integer(psb_ipk_) :: ictxt,np,me + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np,me integer(psb_ipk_) :: i1sz,nrow,ncol, err_act integer(psb_ipk_) :: debug_level, debug_unit logical :: scratch_ diff --git a/base/tools/psb_ccdbldext.F90 b/base/tools/psb_ccdbldext.F90 index b039cbeb..02041a2a 100644 --- a/base/tools/psb_ccdbldext.F90 +++ b/base/tools/psb_ccdbldext.F90 @@ -90,7 +90,9 @@ Subroutine psb_ccdbldext(a,desc_a,novr,desc_ov,info, extype) & counter_t,n_elem,i_ovr,jj,proc_id,isz, & & idxr, idxs, iszr, iszs, nxch, nsnd, nrcv,lidx, extype_ integer(psb_lpk_) :: gidx, lnz - integer(psb_mpk_) :: icomm, ictxt, me, np, minfo + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: me, np + integer(psb_mpk_) :: icomm, minfo integer(psb_ipk_), allocatable :: irow(:), icol(:) integer(psb_ipk_), allocatable :: tmp_halo(:),tmp_ovr_idx(:), orig_ovr(:) @@ -701,7 +703,7 @@ Subroutine psb_ccdbldext(a,desc_a,novr,desc_ov,info, extype) call psb_erractionrestore(err_act) return -9999 call psb_error_handler(ione*ictxt,err_act) +9999 call psb_error_handler(ictxt,err_act) return diff --git a/base/tools/psb_cd_inloc.f90 b/base/tools/psb_cd_inloc.f90 index 010901b5..44950748 100644 --- a/base/tools/psb_cd_inloc.f90 +++ b/base/tools/psb_cd_inloc.f90 @@ -49,11 +49,11 @@ subroutine psb_cd_inloc(v, ictxt, desc, info, globalcheck,idx,usehash) use psb_hash_map_mod implicit None !....Parameters... - integer(psb_ipk_), intent(in) :: ictxt - integer(psb_lpk_), intent(in) :: v(:) - integer(psb_ipk_), intent(out) :: info - type(psb_desc_type), intent(out) :: desc - logical, intent(in), optional :: globalcheck,usehash + type(psb_ctxt_type), intent(in) :: ictxt + integer(psb_lpk_), intent(in) :: v(:) + integer(psb_ipk_), intent(out) :: info + type(psb_desc_type), intent(out) :: desc + logical, intent(in), optional :: globalcheck,usehash integer(psb_ipk_), intent(in), optional :: idx(:) !locals diff --git a/base/tools/psb_cd_lstext.f90 b/base/tools/psb_cd_lstext.f90 index d8f60f25..06d5c7e7 100644 --- a/base/tools/psb_cd_lstext.f90 +++ b/base/tools/psb_cd_lstext.f90 @@ -38,15 +38,16 @@ Subroutine psb_cd_lstext(desc_a,in_list,desc_ov,info, mask,extype) ! .. Array Arguments .. Type(psb_desc_type), Intent(inout), target :: desc_a - integer(psb_lpk_), intent(in) :: in_list(:) + integer(psb_lpk_), intent(in) :: in_list(:) Type(psb_desc_type), Intent(out) :: desc_ov - integer(psb_ipk_), intent(out) :: info + integer(psb_ipk_), intent(out) :: info logical, intent(in), optional, target :: mask(:) - integer(psb_ipk_), intent(in),optional :: extype + integer(psb_ipk_), intent(in),optional :: extype ! .. Local Scalars .. - integer(psb_ipk_) :: i, j, np, me,m,nnzero,& - & ictxt, lovr, lworks,lworkr, n_row,n_col, int_err(5),& + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: i, j, np, me,m,nnzero,& + & lovr, lworks,lworkr, n_row,n_col, int_err(5),& & index_dim,elem_dim, l_tmp_ovr_idx,l_tmp_halo, nztot,nhalo integer(psb_ipk_) :: counter,counter_h, counter_o, counter_e,idx,gidx,proc,n_elem_recv,& & n_elem_send,tot_recv,tot_elem,cntov_o,& diff --git a/base/tools/psb_cd_reinit.f90 b/base/tools/psb_cd_reinit.f90 index 15dbbc59..b33c6eef 100644 --- a/base/tools/psb_cd_reinit.f90 +++ b/base/tools/psb_cd_reinit.f90 @@ -41,13 +41,14 @@ Subroutine psb_cd_reinit(desc,info) Type(psb_desc_type), Intent(inout) :: desc integer(psb_ipk_), intent(out) :: info - integer(psb_ipk_) :: icomm, err_act ! .. Local Scalars .. - integer(psb_ipk_) :: np, me, ictxt + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me, err_act + integer(psb_mpk_) :: icomm integer(psb_ipk_), allocatable :: tmp_halo(:),tmp_ext(:), tmp_ovr(:) - integer(psb_ipk_) :: debug_level, debug_unit - character(len=20) :: name, ch_err + integer(psb_ipk_) :: debug_level, debug_unit + character(len=20) :: name, ch_err name='psb_cd_reinit' info = psb_success_ diff --git a/base/tools/psb_cd_renum_block.F90 b/base/tools/psb_cd_renum_block.F90 index 1d64a09e..2b9203e2 100644 --- a/base/tools/psb_cd_renum_block.F90 +++ b/base/tools/psb_cd_renum_block.F90 @@ -53,10 +53,11 @@ subroutine psb_cd_renum_block(desc_in, desc_out, info) type(psb_gen_block_map), allocatable :: blck_map integer(psb_ipk_), allocatable :: lidx(:),reflidx(:) integer(psb_lpk_), allocatable :: gidx(:),vnl(:) - integer(psb_ipk_) :: i, n_row, n_col - integer(psb_lpk_) :: li, n_glob_row, n_glob_col - integer(psb_ipk_) :: np, me, ictxt, err_act - integer(psb_ipk_) :: debug_level, debug_unit + integer(psb_ipk_) :: i, n_row, n_col + integer(psb_lpk_) :: li, n_glob_row, n_glob_col + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me, err_act + integer(psb_ipk_) :: debug_level, debug_unit character(len=20) :: name debug_unit = psb_get_debug_unit() diff --git a/base/tools/psb_cd_set_bld.f90 b/base/tools/psb_cd_set_bld.f90 index 54133cf5..71f6ac85 100644 --- a/base/tools/psb_cd_set_bld.f90 +++ b/base/tools/psb_cd_set_bld.f90 @@ -53,7 +53,8 @@ subroutine psb_cd_set_bld(desc,info) type(psb_desc_type), intent(inout) :: desc integer(psb_ipk_) :: info !locals - integer(psb_ipk_) :: np,me,ictxt, err_act,idx,gidx,lidx,nc + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me, err_act,idx,gidx,lidx,nc logical, parameter :: debug=.false.,debugprt=.false. character(len=20) :: name if (debug) write(psb_err_unit,*) me,'Entered CDCPY' @@ -64,7 +65,7 @@ subroutine psb_cd_set_bld(desc,info) ictxt = desc%get_context() - if (debug) write(psb_err_unit,*)'Entered CDSETBLD',ictxt + if (debug) write(psb_err_unit,*)'Entered CDSETBLD' ! check on blacs grid call psb_info(ictxt, me, np) if (debug) write(psb_err_unit,*) me,'Entered CDSETBLD' diff --git a/base/tools/psb_cd_switch_ovl_indxmap.f90 b/base/tools/psb_cd_switch_ovl_indxmap.f90 index b2bdd9e4..80eca15a 100644 --- a/base/tools/psb_cd_switch_ovl_indxmap.f90 +++ b/base/tools/psb_cd_switch_ovl_indxmap.f90 @@ -45,9 +45,10 @@ Subroutine psb_cd_switch_ovl_indxmap(desc,info) integer(psb_ipk_), intent(out) :: info ! .. Local Scalars .. - integer(psb_ipk_) :: i, j, np, me, ictxt, n_row, n_col - integer(psb_lpk_) :: mglob - integer(psb_ipk_) :: err_act + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: i, j, np, me, n_row, n_col + integer(psb_lpk_) :: mglob + integer(psb_ipk_) :: err_act integer(psb_lpk_), allocatable :: vl(:) integer(psb_ipk_) :: debug_level, debug_unit, ierr(5) diff --git a/base/tools/psb_cdall.f90 b/base/tools/psb_cdall.f90 index 15ce572f..69cf82e4 100644 --- a/base/tools/psb_cdall.f90 +++ b/base/tools/psb_cdall.f90 @@ -1,4 +1,5 @@ -subroutine psb_cdall(ictxt, desc, info,mg,ng,parts,vg,vl,flag,nl,repl,globalcheck,lidx,usehash) +subroutine psb_cdall(ictxt, desc, info,mg,ng,parts,& + & vg,vl,flag,nl,repl,globalcheck,lidx,usehash) use psb_desc_mod use psb_serial_mod use psb_const_mod @@ -7,13 +8,14 @@ subroutine psb_cdall(ictxt, desc, info,mg,ng,parts,vg,vl,flag,nl,repl,globalchec use psb_cd_tools_mod, psb_protect_name => psb_cdall use psi_mod implicit None - procedure(psb_parts) :: parts - integer(psb_lpk_), intent(in) :: mg,ng, vl(:) - integer(psb_ipk_), intent(in) :: ictxt, vg(:), lidx(:),nl - integer(psb_ipk_), intent(in) :: flag - logical, intent(in) :: repl, globalcheck,usehash - integer(psb_ipk_), intent(out) :: info - type(psb_desc_type), intent(out) :: desc + procedure(psb_parts) :: parts + integer(psb_lpk_), intent(in) :: mg,ng, vl(:) + type(psb_ctxt_type), intent(in) :: ictxt + integer(psb_ipk_), intent(in) :: vg(:), lidx(:),nl + integer(psb_ipk_), intent(in) :: flag + logical, intent(in) :: repl, globalcheck,usehash + integer(psb_ipk_), intent(out) :: info + type(psb_desc_type), intent(out) :: desc optional :: mg,ng,parts,vg,vl,flag,nl,repl, globalcheck,lidx, usehash @@ -22,13 +24,14 @@ subroutine psb_cdall(ictxt, desc, info,mg,ng,parts,vg,vl,flag,nl,repl,globalchec use psb_desc_mod procedure(psb_parts) :: parts integer(psb_lpk_), intent(in) :: m,n - integer(psb_ipk_), intent(in) :: ictxt + type(psb_ctxt_type), intent(in) :: ictxt Type(psb_desc_type), intent(out) :: desc integer(psb_ipk_), intent(out) :: info end subroutine psb_cdals subroutine psb_cdalv(v, ictxt, desc, info, flag) use psb_desc_mod - integer(psb_ipk_), intent(in) :: ictxt, v(:) + type(psb_ctxt_type), intent(in) :: ictxt + integer(psb_ipk_), intent(in) :: v(:) integer(psb_ipk_), intent(in), optional :: flag integer(psb_ipk_), intent(out) :: info Type(psb_desc_type), intent(out) :: desc @@ -36,7 +39,7 @@ subroutine psb_cdall(ictxt, desc, info,mg,ng,parts,vg,vl,flag,nl,repl,globalchec subroutine psb_cd_inloc(v, ictxt, desc, info, globalcheck,idx, usehash) use psb_desc_mod implicit None - integer(psb_ipk_), intent(in) :: ictxt + type(psb_ctxt_type), intent(in) :: ictxt integer(psb_lpk_), intent(in) :: v(:) integer(psb_ipk_), intent(out) :: info type(psb_desc_type), intent(out) :: desc @@ -46,7 +49,9 @@ subroutine psb_cdall(ictxt, desc, info,mg,ng,parts,vg,vl,flag,nl,repl,globalchec subroutine psb_cdrep(m, ictxt, desc,info) use psb_desc_mod integer(psb_lpk_), intent(in) :: m - integer(psb_ipk_), intent(in) :: ictxt + type(psb_ctxt_type), intent(in) :: ictxt + + Type(psb_desc_type), intent(out) :: desc integer(psb_ipk_), intent(out) :: info end subroutine psb_cdrep diff --git a/base/tools/psb_cdals.f90 b/base/tools/psb_cdals.f90 index dfee4113..945d2c40 100644 --- a/base/tools/psb_cdals.f90 +++ b/base/tools/psb_cdals.f90 @@ -50,12 +50,12 @@ subroutine psb_cdals(m, n, parts, ictxt, desc, info) use psb_list_map_mod use psb_hash_map_mod implicit None - procedure(psb_parts) :: parts + procedure(psb_parts) :: parts !....Parameters... - integer(psb_lpk_), intent(in) :: M,N - integer(psb_ipk_), intent(in) :: ictxt - Type(psb_desc_type), intent(out) :: desc - integer(psb_ipk_), intent(out) :: info + integer(psb_lpk_), intent(in) :: M,N + type(psb_ctxt_type), intent(in) :: ictxt + Type(psb_desc_type), intent(out) :: desc + integer(psb_ipk_), intent(out) :: info !locals integer(psb_ipk_) :: counter,i,j,loc_row,err,loc_col,& diff --git a/base/tools/psb_cdalv.f90 b/base/tools/psb_cdalv.f90 index 8b850f6b..fa0795a7 100644 --- a/base/tools/psb_cdalv.f90 +++ b/base/tools/psb_cdalv.f90 @@ -51,9 +51,10 @@ subroutine psb_cdalv(v, ictxt, desc, info, flag) use psb_hash_map_mod implicit None !....Parameters... - integer(psb_ipk_), intent(in) :: ictxt, v(:) - integer(psb_ipk_), intent(in), optional :: flag - integer(psb_ipk_), intent(out) :: info + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_), intent(in) :: v(:) + integer(psb_ipk_), intent(in), optional :: flag + integer(psb_ipk_), intent(out) :: info type(psb_desc_type), intent(out) :: desc !locals diff --git a/base/tools/psb_cdcpy.F90 b/base/tools/psb_cdcpy.F90 index 7605006a..2977ccc2 100644 --- a/base/tools/psb_cdcpy.F90 +++ b/base/tools/psb_cdcpy.F90 @@ -29,14 +29,14 @@ ! POSSIBILITY OF SUCH DAMAGE. ! ! - ! - ! Subroutine: psb_cdcpy - ! Produces a clone of a descriptor. - ! - ! Arguments: - ! desc_in - type(psb_desc_type). The communication descriptor to be cloned. - ! desc_out - type(psb_desc_type). The output communication descriptor. - ! info - integer. Return code. +! +! Subroutine: psb_cdcpy +! Produces a clone of a descriptor. +! +! Arguments: +! desc_in - type(psb_desc_type). The communication descriptor to be cloned. +! desc_out - type(psb_desc_type). The output communication descriptor. +! info - integer. Return code. subroutine psb_cdcpy(desc_in, desc_out, info) use psb_base_mod, psb_protect_name => psb_cdcpy @@ -49,7 +49,8 @@ subroutine psb_cdcpy(desc_in, desc_out, info) integer(psb_ipk_), intent(out) :: info !locals - integer(psb_ipk_) :: np,me,ictxt, err_act + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me, err_act integer(psb_ipk_) :: debug_level, debug_unit character(len=20) :: name diff --git a/base/tools/psb_cdins.F90 b/base/tools/psb_cdins.F90 index d1b186f9..cc1fd1ef 100644 --- a/base/tools/psb_cdins.F90 +++ b/base/tools/psb_cdins.F90 @@ -74,11 +74,12 @@ subroutine psb_lcdinsrc(nz,ia,ja,desc_a,info,ila,jla) integer(psb_lpk_), intent(in) :: ia(:),ja(:) integer(psb_ipk_), intent(out) :: info integer(psb_ipk_), optional, intent(out) :: ila(:), jla(:) - !LOCALS..... - integer(psb_ipk_) :: ictxt,dectype,mglob, nglob - integer(psb_ipk_) :: np, me - integer(psb_ipk_) :: nrow,ncol, err_act + !LOCALS..... + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: dectype,mglob, nglob + integer(psb_ipk_) :: np, me + integer(psb_ipk_) :: nrow,ncol, err_act logical, parameter :: debug=.false. integer(psb_ipk_), parameter :: relocsz=200 integer(psb_ipk_), allocatable :: ila_(:), jla_(:) @@ -218,11 +219,11 @@ subroutine psb_lcdinsc(nz,ja,desc,info,jla,mask,lidx) !LOCALS..... - - integer(psb_ipk_) :: ictxt,dectype,mglob, nglob - integer(psb_ipk_) :: np, me - integer(psb_ipk_) :: nrow,ncol, err_act - logical, parameter :: debug=.false. + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: dectype,mglob, nglob + integer(psb_ipk_) :: np, me + integer(psb_ipk_) :: nrow,ncol, err_act + logical, parameter :: debug=.false. integer(psb_ipk_), parameter :: relocsz=200 integer(psb_ipk_), allocatable :: ila_(:), jla_(:) character(len=20) :: name diff --git a/base/tools/psb_cdprt.f90 b/base/tools/psb_cdprt.f90 index 1f68c73d..2c83af17 100644 --- a/base/tools/psb_cdprt.f90 +++ b/base/tools/psb_cdprt.f90 @@ -52,10 +52,11 @@ subroutine psb_cdprt(iout,desc_p,glob,short, verbosity) integer(psb_ipk_) :: m, n_row, n_col,counter,idx,& & n_elem_recv,n_elem_send,proc,i, verb_ - integer(psb_ipk_) :: ictxt, me, np - integer(psb_ipk_) :: total_snd, total_rcv, total_xhcg, global_halo, global_points - integer(psb_ipk_) :: local_snd, local_rcv, local_xhcg, local_halo, local_points - real(psb_dpk_) :: av2s, v2s + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: me, np + integer(psb_ipk_) :: total_snd, total_rcv, total_xhcg, global_halo, global_points + integer(psb_ipk_) :: local_snd, local_rcv, local_xhcg, local_halo, local_points + real(psb_dpk_) :: av2s, v2s if (present(glob)) then glob_ = glob @@ -147,8 +148,9 @@ contains logical, intent(in), optional :: glob,short logical :: short_, glob_ - integer(psb_ipk_) :: ip, nerv, nesd, totxch,idxr,idxs - integer(psb_ipk_) :: ictxt, me, np, data_, info, verb_ + integer(psb_ipk_) :: ip, nerv, nesd, totxch,idxr,idxs + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: me, np, data_, info, verb_ integer(psb_lpk_), allocatable :: gidx(:) class(psb_i_base_vect_type), pointer :: vpnt diff --git a/base/tools/psb_cdren.f90 b/base/tools/psb_cdren.f90 index 95568a8e..9a065028 100644 --- a/base/tools/psb_cdren.f90 +++ b/base/tools/psb_cdren.f90 @@ -56,11 +56,12 @@ subroutine psb_cdren(trans,iperm,desc_a,info) character, intent(in) :: trans integer(psb_ipk_), intent(out) :: info !....locals.... - integer(psb_ipk_) :: i,j,np,me, n_col, kh, nh - integer(psb_ipk_) :: dectype - integer(psb_ipk_) :: ictxt,n_row, err_act - integer(psb_ipk_) :: debug_level, debug_unit - character(len=20) :: name + integer(psb_ipk_) :: i,j,np,me, n_col, kh, nh + integer(psb_ipk_) :: dectype + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: n_row, err_act + integer(psb_ipk_) :: debug_level, debug_unit + character(len=20) :: name if(psb_get_errstatus() /= 0) return info=psb_success_ diff --git a/base/tools/psb_cdrep.f90 b/base/tools/psb_cdrep.f90 index 2ba47c2c..93d7e348 100644 --- a/base/tools/psb_cdrep.f90 +++ b/base/tools/psb_cdrep.f90 @@ -29,88 +29,88 @@ ! POSSIBILITY OF SUCH DAMAGE. ! ! - ! Purpose - ! == = ==== - ! - ! Allocate special descriptor for replicated index space. - ! - ! - ! - ! INPUT - ! == ==== - ! M :(Global Input) Integer - ! Total number of equations - ! required. - ! - ! ictxt : (Global Input)Integer BLACS context for an NPx1 grid - ! required. - ! - ! OUTPUT - ! == ======= - ! desc : TYPEDESC - ! desc OUTPUT FIELDS: - ! - ! MATRIX_DATA : Pointer to integer Array - ! contains some - ! local and global information about matrix: - ! - ! NOTATION STORED IN EXPLANATION - ! ------------ ---------------------- ------------------------------------- - ! DEC_TYPE MATRIX_DATA[DEC_TYPE_] Decomposition type, temporarly is - ! setted to 1( matrix not yet assembled) - ! M MATRIX_DATA[M_] Total number of equations - ! N MATRIX_DATA[N_] Total number of variables - ! N_ROW MATRIX_DATA[N_ROW_] Number of local equations - ! N_COL MATRIX_DATA[N_COL_] Number of local columns (see below) - ! CTXT_A MATRIX_DATA[CTXT_] The BLACS context handle, - ! indicating - ! the global context of the operation - ! on the matrix. - ! The context itself is global. - ! - ! GLOB_TO_LOC Array of dimension equal to number of global - ! rows/cols (MATRIX_DATA[M_]). On exit, - ! for all global indices either: - ! 1. The index belongs to the current process; the entry - ! is set to the next free local row index. - ! 2. The index belongs to process P (0<=P<=NP-1); the entry - ! is set to - ! -(NP+P+1) - ! - ! LOC_TO_GLOB An array of dimension equal to number of local cols N_COL - ! i.e. all columns of the matrix such that there is at least - ! one nonzero entry within the local row range. At the time - ! this routine is called N_COL cannot be know, so we set - ! N_COL=N_ROW, and dimension this vector on N_ROW plus an - ! estimate. On exit the vector elements are set - ! to the index of the corresponding entry in GLOB_TO_LOC, or - ! to -1 for indices I>N_ROW. - ! - ! - ! HALO_INDEX Not touched here, as it depends on the matrix pattern - ! - ! OVRLAP_INDEX On exit from this routine, the overlap indices are stored in - ! triples (Proc, 1, Index), similar to the assembled format - ! but neither optimized, nor deadlock free. - ! List is terminated with -1 - ! - ! OVRLAP_ELEM On exit from this routine, just a list of pairs (index,#p). - ! List is terminated with -1. - ! - ! - ! END OF desc OUTPUT FIELDS - ! - ! +! Purpose +! == = ==== +! +! Allocate special descriptor for replicated index space. +! +! +! +! INPUT +! == ==== +! M :(Global Input) Integer +! Total number of equations +! required. +! +! ictxt : (Global Input)Integer BLACS context for an NPx1 grid +! required. +! +! OUTPUT +! == ======= +! desc : TYPEDESC +! desc OUTPUT FIELDS: +! +! MATRIX_DATA : Pointer to integer Array +! contains some +! local and global information about matrix: +! +! NOTATION STORED IN EXPLANATION +! ------------ ---------------------- ------------------------------------- +! DEC_TYPE MATRIX_DATA[DEC_TYPE_] Decomposition type, temporarly is +! setted to 1( matrix not yet assembled) +! M MATRIX_DATA[M_] Total number of equations +! N MATRIX_DATA[N_] Total number of variables +! N_ROW MATRIX_DATA[N_ROW_] Number of local equations +! N_COL MATRIX_DATA[N_COL_] Number of local columns (see below) +! CTXT_A MATRIX_DATA[CTXT_] The BLACS context handle, +! indicating +! the global context of the operation +! on the matrix. +! The context itself is global. +! +! GLOB_TO_LOC Array of dimension equal to number of global +! rows/cols (MATRIX_DATA[M_]). On exit, +! for all global indices either: +! 1. The index belongs to the current process; the entry +! is set to the next free local row index. +! 2. The index belongs to process P (0<=P<=NP-1); the entry +! is set to +! -(NP+P+1) +! +! LOC_TO_GLOB An array of dimension equal to number of local cols N_COL +! i.e. all columns of the matrix such that there is at least +! one nonzero entry within the local row range. At the time +! this routine is called N_COL cannot be know, so we set +! N_COL=N_ROW, and dimension this vector on N_ROW plus an +! estimate. On exit the vector elements are set +! to the index of the corresponding entry in GLOB_TO_LOC, or +! to -1 for indices I>N_ROW. +! +! +! HALO_INDEX Not touched here, as it depends on the matrix pattern +! +! OVRLAP_INDEX On exit from this routine, the overlap indices are stored in +! triples (Proc, 1, Index), similar to the assembled format +! but neither optimized, nor deadlock free. +! List is terminated with -1 +! +! OVRLAP_ELEM On exit from this routine, just a list of pairs (index,#p). +! List is terminated with -1. +! +! +! END OF desc OUTPUT FIELDS +! +! subroutine psb_cdrep(m, ictxt, desc, info) use psb_base_mod use psi_mod use psb_repl_map_mod implicit None !....Parameters... - integer(psb_lpk_), intent(in) :: m - integer(psb_ipk_), intent(in) :: ictxt - integer(psb_ipk_), intent(out) :: info - Type(psb_desc_type), intent(out) :: desc + integer(psb_lpk_), intent(in) :: m + type(psb_ctxt_type), intent(in) :: ictxt + integer(psb_ipk_), intent(out) :: info + Type(psb_desc_type), intent(out) :: desc !locals integer(psb_ipk_) :: i,np,me,err,err_act diff --git a/base/tools/psb_cfree.f90 b/base/tools/psb_cfree.f90 index 2d38887a..a5f79d8e 100644 --- a/base/tools/psb_cfree.f90 +++ b/base/tools/psb_cfree.f90 @@ -46,7 +46,8 @@ subroutine psb_cfree_vect(x, desc_a, info) type(psb_desc_type), intent(in) :: desc_a integer(psb_ipk_), intent(out) :: info !...locals.... - integer(psb_ipk_) :: ictxt,np,me,err_act + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np,me,err_act character(len=20) :: name @@ -100,7 +101,8 @@ subroutine psb_cfree_vect_r2(x, desc_a, info) type(psb_desc_type), intent(in) :: desc_a integer(psb_ipk_), intent(out) :: info !...locals.... - integer(psb_ipk_) :: ictxt,np,me,err_act, i + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np,me,err_act, i character(len=20) :: name @@ -152,7 +154,8 @@ subroutine psb_cfree_multivect(x, desc_a, info) type(psb_desc_type), intent(in) :: desc_a integer(psb_ipk_), intent(out) :: info !...locals.... - integer(psb_ipk_) :: ictxt,np,me,err_act + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np,me,err_act character(len=20) :: name diff --git a/base/tools/psb_cfree_a.f90 b/base/tools/psb_cfree_a.f90 index 38621be4..dadb05a7 100644 --- a/base/tools/psb_cfree_a.f90 +++ b/base/tools/psb_cfree_a.f90 @@ -48,7 +48,8 @@ subroutine psb_cfree(x, desc_a, info) integer(psb_ipk_), intent(out) :: info !...locals.... - integer(psb_ipk_) :: ictxt,np,me, err_act + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np,me, err_act character(len=20) :: name name='psb_cfree' @@ -116,7 +117,8 @@ subroutine psb_cfreev(x, desc_a, info) integer(psb_ipk_), intent(out) :: info !...locals.... - integer(psb_ipk_) :: ictxt,np,me, err_act + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np,me, err_act character(len=20) :: name name='psb_cfreev' diff --git a/base/tools/psb_cgetelem.f90 b/base/tools/psb_cgetelem.f90 index 728b4d1e..2dc981e0 100644 --- a/base/tools/psb_cgetelem.f90 +++ b/base/tools/psb_cgetelem.f90 @@ -55,7 +55,8 @@ function psb_c_getelem(x,index,desc_a,info) result(res) !locals integer(psb_ipk_) :: localindex(1) - integer(psb_ipk_) :: ictxt, np, me, err_act + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me, err_act integer(psb_lpk_) :: gindex(1) integer(psb_lpk_), allocatable :: myidx(:),mylocal(:) character(len=20) :: name diff --git a/base/tools/psb_cins.f90 b/base/tools/psb_cins.f90 index cfb82b88..45f99156 100644 --- a/base/tools/psb_cins.f90 +++ b/base/tools/psb_cins.f90 @@ -63,7 +63,8 @@ subroutine psb_cins_vect(m, irw, val, x, desc_a, info, dupl,local) !locals..... integer(psb_ipk_) :: i, loc_rows,loc_cols integer(psb_lpk_) :: mglob - integer(psb_ipk_) :: ictxt, np, me, dupl_,err_act + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me, dupl_,err_act integer(psb_ipk_), allocatable :: irl(:) logical :: local_ character(len=20) :: name @@ -190,7 +191,8 @@ subroutine psb_cins_vect_v(m, irw, val, x, desc_a, info, dupl,local) !locals..... integer(psb_ipk_) :: i, loc_rows,loc_cols,err_act integer(psb_lpk_) :: mglob - integer(psb_ipk_) :: ictxt, np, me, dupl_ + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me, dupl_ integer(psb_ipk_), allocatable :: irl(:) complex(psb_spk_), allocatable :: lval(:) logical :: local_ @@ -295,7 +297,8 @@ subroutine psb_cins_vect_r2(m, irw, val, x, desc_a, info, dupl,local) !locals..... integer(psb_ipk_) :: i, loc_rows,loc_cols, n integer(psb_lpk_) :: mglob - integer(psb_ipk_) :: ictxt, np, me, dupl_, err_act + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me, dupl_, err_act integer(psb_ipk_), allocatable :: irl(:) logical :: local_ character(len=20) :: name @@ -409,7 +412,8 @@ subroutine psb_cins_multivect(m, irw, val, x, desc_a, info, dupl,local) !locals..... integer(psb_ipk_) :: i, loc_rows,loc_cols integer(psb_lpk_) :: mglob - integer(psb_ipk_) :: ictxt, np, me, dupl_, err_act + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me, dupl_, err_act integer(psb_ipk_), allocatable :: irl(:) logical :: local_ character(len=20) :: name diff --git a/base/tools/psb_cins_a.f90 b/base/tools/psb_cins_a.f90 index 6e67a0e6..9fab5c02 100644 --- a/base/tools/psb_cins_a.f90 +++ b/base/tools/psb_cins_a.f90 @@ -68,7 +68,8 @@ subroutine psb_cinsvi(m, irw, val, x, desc_a, info, dupl,local) !locals..... integer(psb_ipk_) :: i, loc_rows,loc_cols,err_act integer(psb_lpk_) :: mglob - integer(psb_ipk_) :: ictxt,np, me, dupl_ + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me, dupl_ integer(psb_ipk_), allocatable :: irl(:) logical :: local_ character(len=20) :: name @@ -248,7 +249,8 @@ subroutine psb_cinsi(m, irw, val, x, desc_a, info, dupl,local) !locals..... integer(psb_ipk_) :: i,loc_row,j,n, loc_rows,loc_cols,err_act integer(psb_lpk_) :: mglob - integer(psb_ipk_) :: ictxt,np,me,dupl_ + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np,me,dupl_ integer(psb_ipk_), allocatable :: irl(:) logical :: local_ character(len=20) :: name diff --git a/base/tools/psb_cspalloc.f90 b/base/tools/psb_cspalloc.f90 index b67aeede..d73a99dd 100644 --- a/base/tools/psb_cspalloc.f90 +++ b/base/tools/psb_cspalloc.f90 @@ -52,7 +52,8 @@ subroutine psb_cspalloc(a, desc_a, info, nnz) integer(psb_ipk_), optional, intent(in) :: nnz !locals - integer(psb_ipk_) :: ictxt, np, me, err_act + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me, err_act integer(psb_ipk_) :: loc_row,loc_col, nnz_, dectype integer(psb_lpk_) :: m, n integer(psb_ipk_) :: debug_level, debug_unit diff --git a/base/tools/psb_cspasb.f90 b/base/tools/psb_cspasb.f90 index 073fcbbd..ef4fd438 100644 --- a/base/tools/psb_cspasb.f90 +++ b/base/tools/psb_cspasb.f90 @@ -62,7 +62,8 @@ subroutine psb_cspasb(a,desc_a, info, afmt, upd, dupl, mold) character(len=*), optional, intent(in) :: afmt class(psb_c_base_sparse_mat), intent(in), optional :: mold !....Locals.... - integer(psb_ipk_) :: ictxt,np,me, err_act + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np,me, err_act integer(psb_ipk_) :: n_row,n_col integer(psb_ipk_) :: debug_level, debug_unit character(len=20) :: name, ch_err diff --git a/base/tools/psb_cspfree.f90 b/base/tools/psb_cspfree.f90 index 6defa911..9a908d1b 100644 --- a/base/tools/psb_cspfree.f90 +++ b/base/tools/psb_cspfree.f90 @@ -48,7 +48,8 @@ subroutine psb_cspfree(a, desc_a,info) type(psb_cspmat_type), intent(inout) :: a integer(psb_ipk_), intent(out) :: info !...locals.... - integer(psb_ipk_) :: ictxt, err_act + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: err_act character(len=20) :: name info=psb_success_ diff --git a/base/tools/psb_csphalo.F90 b/base/tools/psb_csphalo.F90 index 79b2b5b7..ced2d5ff 100644 --- a/base/tools/psb_csphalo.F90 +++ b/base/tools/psb_csphalo.F90 @@ -90,7 +90,8 @@ Subroutine psb_csphalo(a,desc_a,blk,info,rowcnv,colcnv,& character(len=5), optional :: outfmt integer(psb_ipk_), intent(in), optional :: data ! ...local scalars.... - integer(psb_ipk_) :: ictxt, np,me + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np,me integer(psb_ipk_) :: counter,proc,i, & & n_el_send,k,n_el_recv,idx, r, tot_elem,& & n_elem, j, ipx,mat_recv, iszs, iszr,idxs,idxr,nz,& @@ -557,7 +558,8 @@ Subroutine psb_lcsphalo(a,desc_a,blk,info,rowcnv,colcnv,& character(len=5), optional :: outfmt integer(psb_ipk_), intent(in), optional :: data ! ...local scalars.... - integer(psb_ipk_) :: ictxt, np,me + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np,me integer(psb_ipk_) :: counter, proc, i, n_el_send,n_el_recv, & & n_elem, j, ipx,mat_recv, idxs,idxr,nz,& & data_,totxch,nxs, nxr, ncg @@ -900,7 +902,8 @@ Subroutine psb_lc_csr_halo(a,desc_a,blk,info,rowcnv,colcnv,& integer(psb_ipk_), intent(in), optional :: data type(psb_desc_type),Intent(in), optional, target :: col_desc ! ...local scalars.... - integer(psb_ipk_) :: ictxt, np,me + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np,me integer(psb_ipk_) :: counter,proc,i, n_el_send,n_el_recv,& & n_elem, j,ipx,mat_recv, iszs, iszr,idxs,idxr,nz,& & data_,totxch,nxs, nxr, err_act, nsnds, nrcvs @@ -1260,7 +1263,8 @@ Subroutine psb_c_lc_csr_halo(a,desc_a,blk,info,rowcnv,colcnv,& integer(psb_ipk_), intent(in), optional :: data type(psb_desc_type),Intent(in), optional, target :: col_desc ! ...local scalars.... - integer(psb_ipk_) :: ictxt, np,me + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np,me integer(psb_ipk_) :: counter,proc,i, n_el_send,n_el_recv,& & n_elem, j,ipx,mat_recv, iszs, iszr,idxs,idxr,nz,& & data_,totxch,ngtz, idx, nxs, nxr, err_act, & diff --git a/base/tools/psb_cspins.F90 b/base/tools/psb_cspins.F90 index c2a52eb3..bc5ff7c5 100644 --- a/base/tools/psb_cspins.F90 +++ b/base/tools/psb_cspins.F90 @@ -64,7 +64,8 @@ subroutine psb_cspins(nz,ia,ja,val,a,desc_a,info,rebuild,local) !locals..... integer(psb_ipk_) :: nrow, err_act, ncol, spstate - integer(psb_ipk_) :: ictxt,np,me + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np,me logical, parameter :: debug=.false. integer(psb_ipk_), parameter :: relocsz=200 logical :: rebuild_, local_ @@ -208,7 +209,8 @@ subroutine psb_cspins_csr_lirp(nr,irp,ja,val,irw,a,desc_a,info,rebuild,local) integer(psb_ipk_) :: nrow, err_act, ncol, spstate, nz, i, j integer(psb_lpk_) :: ir - integer(psb_ipk_) :: ictxt,np,me + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np,me logical, parameter :: debug=.false. integer(psb_ipk_), parameter :: relocsz=200 logical :: rebuild_, local_ @@ -306,7 +308,8 @@ subroutine psb_cspins_csr_iirp(nr,irw,irp,ja,val,a,desc_a,info,rebuild,local) integer(psb_ipk_) :: nrow, err_act, ncol, spstate, nz, i, j integer(psb_lpk_) :: ir - integer(psb_ipk_) :: ictxt,np,me + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np,me logical, parameter :: debug=.false. integer(psb_ipk_), parameter :: relocsz=200 logical :: rebuild_, local_ @@ -403,7 +406,8 @@ subroutine psb_cspins_2desc(nz,ia,ja,val,a,desc_ar,desc_ac,info) !locals..... integer(psb_ipk_) :: nrow, err_act, ncol, spstate - integer(psb_ipk_) :: ictxt,np,me + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np,me logical, parameter :: debug=.false. integer(psb_ipk_), parameter :: relocsz=200 integer(psb_ipk_), allocatable :: ila(:),jla(:) @@ -518,7 +522,8 @@ subroutine psb_cspins_v(nz,ia,ja,val,a,desc_a,info,rebuild,local) !locals..... integer(psb_ipk_) :: nrow, err_act, ncol, spstate - integer(psb_ipk_) :: ictxt,np,me + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np,me logical, parameter :: debug=.false. integer(psb_ipk_), parameter :: relocsz=200 logical :: rebuild_, local_ diff --git a/base/tools/psb_csprn.f90 b/base/tools/psb_csprn.f90 index 3912cdae..1dc4da91 100644 --- a/base/tools/psb_csprn.f90 +++ b/base/tools/psb_csprn.f90 @@ -53,7 +53,8 @@ Subroutine psb_csprn(a, desc_a,info,clear) logical, intent(in), optional :: clear !locals - integer(psb_ipk_) :: ictxt,np,me,err_act + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np,me,err_act integer(psb_ipk_) :: debug_level, debug_unit character(len=20) :: name logical :: clear_ diff --git a/base/tools/psb_d_glob_transpose.F90 b/base/tools/psb_d_glob_transpose.F90 index 638ba174..938adb0f 100644 --- a/base/tools/psb_d_glob_transpose.F90 +++ b/base/tools/psb_d_glob_transpose.F90 @@ -110,7 +110,8 @@ subroutine psb_ld_coo_glob_transpose(ain,desc_r,info,atrans,desc_c,desc_rx) integer(psb_ipk_), intent(out) :: info ! ...local scalars.... - integer(psb_ipk_) :: ictxt, np,me + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np,me integer(psb_ipk_) :: counter,proc, err_act, j integer(psb_lpk_) :: i, k, idx, r, ipx,mat_recv, iszs, iszr,idxs,idxr,nz,& & l1, nsnds, nrcvs, nr,nc,nzl, hlstart, nzt, nzd @@ -406,7 +407,8 @@ subroutine psb_d_coo_glob_transpose(ain,desc_r,info,atrans,desc_c,desc_rx) type(psb_desc_type), intent(out), optional :: desc_rx integer(psb_ipk_), intent(out) :: info - integer(psb_ipk_) :: ictxt, np,me + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np,me integer(psb_ipk_) :: counter,proc, err_act, j integer(psb_ipk_) :: i, k, idx, r, ipx,mat_recv, iszs, iszr,idxs,idxr,nz,& & l1, nsnds, nrcvs, nr,nc,nzl, hlstart, nzd @@ -709,7 +711,8 @@ subroutine psb_d_simple_glob_transpose_ip(ain,desc_a,info) ! type(psb_d_coo_sparse_mat) :: tmpc1, tmpc2 integer(psb_ipk_) :: nz1, nz2, nzh, nz - integer(psb_ipk_) :: ictxt, me, np + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: me, np integer(psb_lpk_) :: i, j, k, nrow, ncol, nlz integer(psb_lpk_), allocatable :: ilv(:) character(len=80) :: aname @@ -760,7 +763,8 @@ subroutine psb_d_simple_glob_transpose(ain,aout,desc_a,info) ! type(psb_d_coo_sparse_mat) :: tmpc1, tmpc2 integer(psb_ipk_) :: nz1, nz2, nzh, nz - integer(psb_ipk_) :: ictxt, me, np + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: me, np integer(psb_lpk_) :: i, j, k, nrow, ncol, nlz integer(psb_lpk_), allocatable :: ilv(:) character(len=80) :: aname @@ -811,7 +815,8 @@ subroutine psb_ld_simple_glob_transpose_ip(ain,desc_a,info) ! type(psb_ld_coo_sparse_mat) :: tmpc1, tmpc2 integer(psb_ipk_) :: nz1, nz2, nzh, nz - integer(psb_ipk_) :: ictxt, me, np + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: me, np integer(psb_lpk_) :: i, j, k, nrow, ncol, nlz integer(psb_lpk_), allocatable :: ilv(:) character(len=80) :: aname @@ -862,7 +867,8 @@ subroutine psb_ld_simple_glob_transpose(ain,aout,desc_a,info) ! type(psb_ld_coo_sparse_mat) :: tmpc1, tmpc2 integer(psb_ipk_) :: nz1, nz2, nzh, nz - integer(psb_ipk_) :: ictxt, me, np + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: me, np integer(psb_lpk_) :: i, j, k, nrow, ncol, nlz integer(psb_lpk_), allocatable :: ilv(:) character(len=80) :: aname diff --git a/base/tools/psb_d_map.f90 b/base/tools/psb_d_map.f90 index 51672121..18bbc0ec 100644 --- a/base/tools/psb_d_map.f90 +++ b/base/tools/psb_d_map.f90 @@ -51,7 +51,8 @@ subroutine psb_d_map_U2V_a(alpha,x,beta,y,map,info,work) ! real(psb_dpk_), allocatable :: xt(:), yt(:) integer(psb_ipk_) :: i, j, nr1, nc1,nr2, nc2,& - & map_kind, nr, ictxt + & map_kind, nr + type(psb_ctxt_type) :: ictxt character(len=20), parameter :: name='psb_map_U2V' info = psb_success_ @@ -125,7 +126,8 @@ subroutine psb_d_map_U2V_v(alpha,x,beta,y,map,info,work,vtx,vty) type(psb_d_vect_type),pointer :: ptx, pty real(psb_dpk_), allocatable :: xta(:), yta(:) integer(psb_ipk_) :: i, j, nr1, nc1,nr2, nc2 ,& - & map_kind, nr, ictxt, iam, np + & map_kind, nr, iam, np + type(psb_ctxt_type) :: ictxt character(len=20), parameter :: name='psb_map_U2V_v' info = psb_success_ @@ -232,7 +234,8 @@ subroutine psb_d_map_V2U_a(alpha,x,beta,y,map,info,work) ! real(psb_dpk_), allocatable :: xt(:), yt(:) integer(psb_ipk_) :: i, j, nr1, nc1,nr2, nc2,& - & map_kind, nr, ictxt + & map_kind, nr + type(psb_ctxt_type) :: ictxt character(len=20), parameter :: name='psb_map_V2U' info = psb_success_ @@ -305,7 +308,8 @@ subroutine psb_d_map_V2U_v(alpha,x,beta,y,map,info,work,vtx,vty) type(psb_d_vect_type),pointer :: ptx, pty real(psb_dpk_), allocatable :: xta(:), yta(:) integer(psb_ipk_) :: i, j, nr1, nc1,nr2, nc2,& - & map_kind, nr, ictxt, iam, np + & map_kind, nr, iam, np + type(psb_ctxt_type) :: ictxt character(len=20), parameter :: name='psb_map_V2U_v' info = psb_success_ diff --git a/base/tools/psb_d_par_csr_spspmm.f90 b/base/tools/psb_d_par_csr_spspmm.f90 index 2e34a32c..04deeb3f 100644 --- a/base/tools/psb_d_par_csr_spspmm.f90 +++ b/base/tools/psb_d_par_csr_spspmm.f90 @@ -73,7 +73,8 @@ Subroutine psb_d_par_csr_spspmm(acsr,desc_a,bcsr,ccsr,desc_c,info,data) integer(psb_ipk_), intent(out) :: info integer(psb_ipk_), intent(in), optional :: data ! ...local scalars.... - integer(psb_ipk_) :: ictxt, np,me + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np,me integer(psb_ipk_) :: ncol, nnz type(psb_ld_csr_sparse_mat) :: ltcsr type(psb_d_csr_sparse_mat) :: tcsr @@ -168,7 +169,8 @@ Subroutine psb_ld_par_csr_spspmm(acsr,desc_a,bcsr,ccsr,desc_c,info,data) integer(psb_ipk_), intent(out) :: info integer(psb_ipk_), intent(in), optional :: data ! ...local scalars.... - integer(psb_ipk_) :: ictxt, np,me + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np,me integer(psb_lpk_) :: nacol, nccol, nnz type(psb_ld_csr_sparse_mat) :: tcsr1 logical :: update_desc_c diff --git a/base/tools/psb_dallc.f90 b/base/tools/psb_dallc.f90 index 73611ad7..a2d8214d 100644 --- a/base/tools/psb_dallc.f90 +++ b/base/tools/psb_dallc.f90 @@ -52,7 +52,7 @@ subroutine psb_dalloc_vect(x, desc_a,info) !locals integer(psb_ipk_) :: np,me,nr,i,err_act - integer(psb_ipk_) :: ictxt + type(psb_ctxt_type) :: ictxt integer(psb_ipk_) :: debug_level, debug_unit character(len=20) :: name @@ -133,8 +133,9 @@ subroutine psb_dalloc_vect_r2(x, desc_a,info,n,lb) integer(psb_ipk_), optional, intent(in) :: n,lb !locals + type(psb_ctxt_type) :: ictxt integer(psb_ipk_) :: np,me,nr,i,err_act, n_, lb_ - integer(psb_ipk_) :: ictxt, exch(1) + integer(psb_ipk_) :: exch(1) integer(psb_ipk_) :: debug_level, debug_unit character(len=20) :: name @@ -235,8 +236,9 @@ subroutine psb_dalloc_multivect(x, desc_a,info,n) integer(psb_ipk_), optional, intent(in) :: n !locals + type(psb_ctxt_type) :: ictxt integer(psb_ipk_) :: np,me,nr,i,err_act, n_, lb_ - integer(psb_ipk_) :: ictxt, exch(1) + integer(psb_ipk_) :: exch(1) integer(psb_ipk_) :: debug_level, debug_unit character(len=20) :: name diff --git a/base/tools/psb_dallc_a.f90 b/base/tools/psb_dallc_a.f90 index b9fcf114..2633e088 100644 --- a/base/tools/psb_dallc_a.f90 +++ b/base/tools/psb_dallc_a.f90 @@ -55,7 +55,8 @@ subroutine psb_dalloc(x, desc_a, info, n, lb) !locals integer(psb_ipk_) :: err,nr,i,j,n_,err_act - integer(psb_ipk_) :: ictxt,np,me + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np,me integer(psb_ipk_) :: exch(3) character(len=20) :: name @@ -183,7 +184,8 @@ subroutine psb_dallocv(x, desc_a,info,n) !locals integer(psb_ipk_) :: nr,i,err_act - integer(psb_ipk_) :: ictxt, np,me + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np,me integer(psb_ipk_) :: debug_level, debug_unit character(len=20) :: name diff --git a/base/tools/psb_dasb.f90 b/base/tools/psb_dasb.f90 index 1d141cdf..86ee0eb1 100644 --- a/base/tools/psb_dasb.f90 +++ b/base/tools/psb_dasb.f90 @@ -62,7 +62,8 @@ subroutine psb_dasb_vect(x, desc_a, info, mold, scratch) logical, intent(in), optional :: scratch ! local variables - integer(psb_ipk_) :: ictxt,np,me + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np,me integer(psb_ipk_) :: i1sz,nrow,ncol, err_act logical :: scratch_ integer(psb_ipk_) :: debug_level, debug_unit @@ -135,7 +136,8 @@ subroutine psb_dasb_vect_r2(x, desc_a, info, mold, scratch) logical, intent(in), optional :: scratch ! local variables - integer(psb_ipk_) :: ictxt,np,me, i, n + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np,me, i, n integer(psb_ipk_) :: i1sz,nrow,ncol, err_act logical :: scratch_ integer(psb_ipk_) :: debug_level, debug_unit @@ -217,7 +219,8 @@ subroutine psb_dasb_multivect(x, desc_a, info, mold, scratch,n) logical, intent(in), optional :: scratch ! local variables - integer(psb_ipk_) :: ictxt,np,me + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np,me integer(psb_ipk_) :: i1sz,nrow,ncol, err_act, n_ logical :: scratch_ diff --git a/base/tools/psb_dasb_a.f90 b/base/tools/psb_dasb_a.f90 index 42a60fbf..82db47d5 100644 --- a/base/tools/psb_dasb_a.f90 +++ b/base/tools/psb_dasb_a.f90 @@ -52,7 +52,8 @@ subroutine psb_dasb(x, desc_a, info, scratch) logical, intent(in), optional :: scratch ! local variables - integer(psb_ipk_) :: ictxt,np,me,nrow,ncol, err_act + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np,me,nrow,ncol, err_act integer(psb_ipk_) :: i1sz, i2sz integer(psb_ipk_) :: debug_level, debug_unit logical :: scratch_ @@ -188,7 +189,8 @@ subroutine psb_dasbv(x, desc_a, info, scratch) logical, intent(in), optional :: scratch ! local variables - integer(psb_ipk_) :: ictxt,np,me + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np,me integer(psb_ipk_) :: i1sz,nrow,ncol, err_act integer(psb_ipk_) :: debug_level, debug_unit logical :: scratch_ diff --git a/base/tools/psb_dcdbldext.F90 b/base/tools/psb_dcdbldext.F90 index 771e746f..c35e4493 100644 --- a/base/tools/psb_dcdbldext.F90 +++ b/base/tools/psb_dcdbldext.F90 @@ -90,7 +90,9 @@ Subroutine psb_dcdbldext(a,desc_a,novr,desc_ov,info, extype) & counter_t,n_elem,i_ovr,jj,proc_id,isz, & & idxr, idxs, iszr, iszs, nxch, nsnd, nrcv,lidx, extype_ integer(psb_lpk_) :: gidx, lnz - integer(psb_mpk_) :: icomm, ictxt, me, np, minfo + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: me, np + integer(psb_mpk_) :: icomm, minfo integer(psb_ipk_), allocatable :: irow(:), icol(:) integer(psb_ipk_), allocatable :: tmp_halo(:),tmp_ovr_idx(:), orig_ovr(:) @@ -701,7 +703,7 @@ Subroutine psb_dcdbldext(a,desc_a,novr,desc_ov,info, extype) call psb_erractionrestore(err_act) return -9999 call psb_error_handler(ione*ictxt,err_act) +9999 call psb_error_handler(ictxt,err_act) return diff --git a/base/tools/psb_dfree.f90 b/base/tools/psb_dfree.f90 index 6c36dd09..7f51dc84 100644 --- a/base/tools/psb_dfree.f90 +++ b/base/tools/psb_dfree.f90 @@ -46,7 +46,8 @@ subroutine psb_dfree_vect(x, desc_a, info) type(psb_desc_type), intent(in) :: desc_a integer(psb_ipk_), intent(out) :: info !...locals.... - integer(psb_ipk_) :: ictxt,np,me,err_act + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np,me,err_act character(len=20) :: name @@ -100,7 +101,8 @@ subroutine psb_dfree_vect_r2(x, desc_a, info) type(psb_desc_type), intent(in) :: desc_a integer(psb_ipk_), intent(out) :: info !...locals.... - integer(psb_ipk_) :: ictxt,np,me,err_act, i + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np,me,err_act, i character(len=20) :: name @@ -152,7 +154,8 @@ subroutine psb_dfree_multivect(x, desc_a, info) type(psb_desc_type), intent(in) :: desc_a integer(psb_ipk_), intent(out) :: info !...locals.... - integer(psb_ipk_) :: ictxt,np,me,err_act + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np,me,err_act character(len=20) :: name diff --git a/base/tools/psb_dfree_a.f90 b/base/tools/psb_dfree_a.f90 index a33c41be..a5087078 100644 --- a/base/tools/psb_dfree_a.f90 +++ b/base/tools/psb_dfree_a.f90 @@ -48,7 +48,8 @@ subroutine psb_dfree(x, desc_a, info) integer(psb_ipk_), intent(out) :: info !...locals.... - integer(psb_ipk_) :: ictxt,np,me, err_act + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np,me, err_act character(len=20) :: name name='psb_dfree' @@ -116,7 +117,8 @@ subroutine psb_dfreev(x, desc_a, info) integer(psb_ipk_), intent(out) :: info !...locals.... - integer(psb_ipk_) :: ictxt,np,me, err_act + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np,me, err_act character(len=20) :: name name='psb_dfreev' diff --git a/base/tools/psb_dgetelem.f90 b/base/tools/psb_dgetelem.f90 index 0611221e..8058b897 100644 --- a/base/tools/psb_dgetelem.f90 +++ b/base/tools/psb_dgetelem.f90 @@ -55,7 +55,8 @@ function psb_d_getelem(x,index,desc_a,info) result(res) !locals integer(psb_ipk_) :: localindex(1) - integer(psb_ipk_) :: ictxt, np, me, err_act + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me, err_act integer(psb_lpk_) :: gindex(1) integer(psb_lpk_), allocatable :: myidx(:),mylocal(:) character(len=20) :: name diff --git a/base/tools/psb_dins.f90 b/base/tools/psb_dins.f90 index ad7f8d90..4ee99acc 100644 --- a/base/tools/psb_dins.f90 +++ b/base/tools/psb_dins.f90 @@ -63,7 +63,8 @@ subroutine psb_dins_vect(m, irw, val, x, desc_a, info, dupl,local) !locals..... integer(psb_ipk_) :: i, loc_rows,loc_cols integer(psb_lpk_) :: mglob - integer(psb_ipk_) :: ictxt, np, me, dupl_,err_act + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me, dupl_,err_act integer(psb_ipk_), allocatable :: irl(:) logical :: local_ character(len=20) :: name @@ -190,7 +191,8 @@ subroutine psb_dins_vect_v(m, irw, val, x, desc_a, info, dupl,local) !locals..... integer(psb_ipk_) :: i, loc_rows,loc_cols,err_act integer(psb_lpk_) :: mglob - integer(psb_ipk_) :: ictxt, np, me, dupl_ + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me, dupl_ integer(psb_ipk_), allocatable :: irl(:) real(psb_dpk_), allocatable :: lval(:) logical :: local_ @@ -295,7 +297,8 @@ subroutine psb_dins_vect_r2(m, irw, val, x, desc_a, info, dupl,local) !locals..... integer(psb_ipk_) :: i, loc_rows,loc_cols, n integer(psb_lpk_) :: mglob - integer(psb_ipk_) :: ictxt, np, me, dupl_, err_act + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me, dupl_, err_act integer(psb_ipk_), allocatable :: irl(:) logical :: local_ character(len=20) :: name @@ -409,7 +412,8 @@ subroutine psb_dins_multivect(m, irw, val, x, desc_a, info, dupl,local) !locals..... integer(psb_ipk_) :: i, loc_rows,loc_cols integer(psb_lpk_) :: mglob - integer(psb_ipk_) :: ictxt, np, me, dupl_, err_act + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me, dupl_, err_act integer(psb_ipk_), allocatable :: irl(:) logical :: local_ character(len=20) :: name diff --git a/base/tools/psb_dins_a.f90 b/base/tools/psb_dins_a.f90 index 9aee33bd..96a8d669 100644 --- a/base/tools/psb_dins_a.f90 +++ b/base/tools/psb_dins_a.f90 @@ -68,7 +68,8 @@ subroutine psb_dinsvi(m, irw, val, x, desc_a, info, dupl,local) !locals..... integer(psb_ipk_) :: i, loc_rows,loc_cols,err_act integer(psb_lpk_) :: mglob - integer(psb_ipk_) :: ictxt,np, me, dupl_ + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me, dupl_ integer(psb_ipk_), allocatable :: irl(:) logical :: local_ character(len=20) :: name @@ -248,7 +249,8 @@ subroutine psb_dinsi(m, irw, val, x, desc_a, info, dupl,local) !locals..... integer(psb_ipk_) :: i,loc_row,j,n, loc_rows,loc_cols,err_act integer(psb_lpk_) :: mglob - integer(psb_ipk_) :: ictxt,np,me,dupl_ + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np,me,dupl_ integer(psb_ipk_), allocatable :: irl(:) logical :: local_ character(len=20) :: name diff --git a/base/tools/psb_dspalloc.f90 b/base/tools/psb_dspalloc.f90 index 9ae4572a..1f623a64 100644 --- a/base/tools/psb_dspalloc.f90 +++ b/base/tools/psb_dspalloc.f90 @@ -52,7 +52,8 @@ subroutine psb_dspalloc(a, desc_a, info, nnz) integer(psb_ipk_), optional, intent(in) :: nnz !locals - integer(psb_ipk_) :: ictxt, np, me, err_act + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me, err_act integer(psb_ipk_) :: loc_row,loc_col, nnz_, dectype integer(psb_lpk_) :: m, n integer(psb_ipk_) :: debug_level, debug_unit diff --git a/base/tools/psb_dspasb.f90 b/base/tools/psb_dspasb.f90 index 542e6901..03193e66 100644 --- a/base/tools/psb_dspasb.f90 +++ b/base/tools/psb_dspasb.f90 @@ -62,7 +62,8 @@ subroutine psb_dspasb(a,desc_a, info, afmt, upd, dupl, mold) character(len=*), optional, intent(in) :: afmt class(psb_d_base_sparse_mat), intent(in), optional :: mold !....Locals.... - integer(psb_ipk_) :: ictxt,np,me, err_act + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np,me, err_act integer(psb_ipk_) :: n_row,n_col integer(psb_ipk_) :: debug_level, debug_unit character(len=20) :: name, ch_err diff --git a/base/tools/psb_dspfree.f90 b/base/tools/psb_dspfree.f90 index ee8388ce..201c6b4f 100644 --- a/base/tools/psb_dspfree.f90 +++ b/base/tools/psb_dspfree.f90 @@ -48,7 +48,8 @@ subroutine psb_dspfree(a, desc_a,info) type(psb_dspmat_type), intent(inout) :: a integer(psb_ipk_), intent(out) :: info !...locals.... - integer(psb_ipk_) :: ictxt, err_act + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: err_act character(len=20) :: name info=psb_success_ diff --git a/base/tools/psb_dsphalo.F90 b/base/tools/psb_dsphalo.F90 index 24949cff..d4487757 100644 --- a/base/tools/psb_dsphalo.F90 +++ b/base/tools/psb_dsphalo.F90 @@ -90,7 +90,8 @@ Subroutine psb_dsphalo(a,desc_a,blk,info,rowcnv,colcnv,& character(len=5), optional :: outfmt integer(psb_ipk_), intent(in), optional :: data ! ...local scalars.... - integer(psb_ipk_) :: ictxt, np,me + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np,me integer(psb_ipk_) :: counter,proc,i, & & n_el_send,k,n_el_recv,idx, r, tot_elem,& & n_elem, j, ipx,mat_recv, iszs, iszr,idxs,idxr,nz,& @@ -557,7 +558,8 @@ Subroutine psb_ldsphalo(a,desc_a,blk,info,rowcnv,colcnv,& character(len=5), optional :: outfmt integer(psb_ipk_), intent(in), optional :: data ! ...local scalars.... - integer(psb_ipk_) :: ictxt, np,me + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np,me integer(psb_ipk_) :: counter, proc, i, n_el_send,n_el_recv, & & n_elem, j, ipx,mat_recv, idxs,idxr,nz,& & data_,totxch,nxs, nxr, ncg @@ -900,7 +902,8 @@ Subroutine psb_ld_csr_halo(a,desc_a,blk,info,rowcnv,colcnv,& integer(psb_ipk_), intent(in), optional :: data type(psb_desc_type),Intent(in), optional, target :: col_desc ! ...local scalars.... - integer(psb_ipk_) :: ictxt, np,me + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np,me integer(psb_ipk_) :: counter,proc,i, n_el_send,n_el_recv,& & n_elem, j,ipx,mat_recv, iszs, iszr,idxs,idxr,nz,& & data_,totxch,nxs, nxr, err_act, nsnds, nrcvs @@ -1260,7 +1263,8 @@ Subroutine psb_d_ld_csr_halo(a,desc_a,blk,info,rowcnv,colcnv,& integer(psb_ipk_), intent(in), optional :: data type(psb_desc_type),Intent(in), optional, target :: col_desc ! ...local scalars.... - integer(psb_ipk_) :: ictxt, np,me + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np,me integer(psb_ipk_) :: counter,proc,i, n_el_send,n_el_recv,& & n_elem, j,ipx,mat_recv, iszs, iszr,idxs,idxr,nz,& & data_,totxch,ngtz, idx, nxs, nxr, err_act, & diff --git a/base/tools/psb_dspins.F90 b/base/tools/psb_dspins.F90 index 4018a36a..9816aade 100644 --- a/base/tools/psb_dspins.F90 +++ b/base/tools/psb_dspins.F90 @@ -64,7 +64,8 @@ subroutine psb_dspins(nz,ia,ja,val,a,desc_a,info,rebuild,local) !locals..... integer(psb_ipk_) :: nrow, err_act, ncol, spstate - integer(psb_ipk_) :: ictxt,np,me + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np,me logical, parameter :: debug=.false. integer(psb_ipk_), parameter :: relocsz=200 logical :: rebuild_, local_ @@ -208,7 +209,8 @@ subroutine psb_dspins_csr_lirp(nr,irp,ja,val,irw,a,desc_a,info,rebuild,local) integer(psb_ipk_) :: nrow, err_act, ncol, spstate, nz, i, j integer(psb_lpk_) :: ir - integer(psb_ipk_) :: ictxt,np,me + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np,me logical, parameter :: debug=.false. integer(psb_ipk_), parameter :: relocsz=200 logical :: rebuild_, local_ @@ -306,7 +308,8 @@ subroutine psb_dspins_csr_iirp(nr,irw,irp,ja,val,a,desc_a,info,rebuild,local) integer(psb_ipk_) :: nrow, err_act, ncol, spstate, nz, i, j integer(psb_lpk_) :: ir - integer(psb_ipk_) :: ictxt,np,me + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np,me logical, parameter :: debug=.false. integer(psb_ipk_), parameter :: relocsz=200 logical :: rebuild_, local_ @@ -403,7 +406,8 @@ subroutine psb_dspins_2desc(nz,ia,ja,val,a,desc_ar,desc_ac,info) !locals..... integer(psb_ipk_) :: nrow, err_act, ncol, spstate - integer(psb_ipk_) :: ictxt,np,me + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np,me logical, parameter :: debug=.false. integer(psb_ipk_), parameter :: relocsz=200 integer(psb_ipk_), allocatable :: ila(:),jla(:) @@ -518,7 +522,8 @@ subroutine psb_dspins_v(nz,ia,ja,val,a,desc_a,info,rebuild,local) !locals..... integer(psb_ipk_) :: nrow, err_act, ncol, spstate - integer(psb_ipk_) :: ictxt,np,me + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np,me logical, parameter :: debug=.false. integer(psb_ipk_), parameter :: relocsz=200 logical :: rebuild_, local_ diff --git a/base/tools/psb_dsprn.f90 b/base/tools/psb_dsprn.f90 index c5f81e48..ebd05185 100644 --- a/base/tools/psb_dsprn.f90 +++ b/base/tools/psb_dsprn.f90 @@ -53,7 +53,8 @@ Subroutine psb_dsprn(a, desc_a,info,clear) logical, intent(in), optional :: clear !locals - integer(psb_ipk_) :: ictxt,np,me,err_act + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np,me,err_act integer(psb_ipk_) :: debug_level, debug_unit character(len=20) :: name logical :: clear_ diff --git a/base/tools/psb_eallc_a.f90 b/base/tools/psb_eallc_a.f90 index 5f6e3c36..6d360c31 100644 --- a/base/tools/psb_eallc_a.f90 +++ b/base/tools/psb_eallc_a.f90 @@ -55,7 +55,8 @@ subroutine psb_ealloc(x, desc_a, info, n, lb) !locals integer(psb_ipk_) :: err,nr,i,j,n_,err_act - integer(psb_ipk_) :: ictxt,np,me + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np,me integer(psb_ipk_) :: exch(3) character(len=20) :: name @@ -183,7 +184,8 @@ subroutine psb_eallocv(x, desc_a,info,n) !locals integer(psb_ipk_) :: nr,i,err_act - integer(psb_ipk_) :: ictxt, np,me + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np,me integer(psb_ipk_) :: debug_level, debug_unit character(len=20) :: name diff --git a/base/tools/psb_easb_a.f90 b/base/tools/psb_easb_a.f90 index 5c62aa59..c93af356 100644 --- a/base/tools/psb_easb_a.f90 +++ b/base/tools/psb_easb_a.f90 @@ -52,7 +52,8 @@ subroutine psb_easb(x, desc_a, info, scratch) logical, intent(in), optional :: scratch ! local variables - integer(psb_ipk_) :: ictxt,np,me,nrow,ncol, err_act + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np,me,nrow,ncol, err_act integer(psb_ipk_) :: i1sz, i2sz integer(psb_ipk_) :: debug_level, debug_unit logical :: scratch_ @@ -188,7 +189,8 @@ subroutine psb_easbv(x, desc_a, info, scratch) logical, intent(in), optional :: scratch ! local variables - integer(psb_ipk_) :: ictxt,np,me + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np,me integer(psb_ipk_) :: i1sz,nrow,ncol, err_act integer(psb_ipk_) :: debug_level, debug_unit logical :: scratch_ diff --git a/base/tools/psb_efree_a.f90 b/base/tools/psb_efree_a.f90 index c07ee694..738c5c3f 100644 --- a/base/tools/psb_efree_a.f90 +++ b/base/tools/psb_efree_a.f90 @@ -48,7 +48,8 @@ subroutine psb_efree(x, desc_a, info) integer(psb_ipk_), intent(out) :: info !...locals.... - integer(psb_ipk_) :: ictxt,np,me, err_act + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np,me, err_act character(len=20) :: name name='psb_efree' @@ -116,7 +117,8 @@ subroutine psb_efreev(x, desc_a, info) integer(psb_ipk_), intent(out) :: info !...locals.... - integer(psb_ipk_) :: ictxt,np,me, err_act + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np,me, err_act character(len=20) :: name name='psb_efreev' diff --git a/base/tools/psb_eins_a.f90 b/base/tools/psb_eins_a.f90 index 3923a265..87cf75d3 100644 --- a/base/tools/psb_eins_a.f90 +++ b/base/tools/psb_eins_a.f90 @@ -68,7 +68,8 @@ subroutine psb_einsvi(m, irw, val, x, desc_a, info, dupl,local) !locals..... integer(psb_ipk_) :: i, loc_rows,loc_cols,err_act integer(psb_lpk_) :: mglob - integer(psb_ipk_) :: ictxt,np, me, dupl_ + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me, dupl_ integer(psb_ipk_), allocatable :: irl(:) logical :: local_ character(len=20) :: name @@ -248,7 +249,8 @@ subroutine psb_einsi(m, irw, val, x, desc_a, info, dupl,local) !locals..... integer(psb_ipk_) :: i,loc_row,j,n, loc_rows,loc_cols,err_act integer(psb_lpk_) :: mglob - integer(psb_ipk_) :: ictxt,np,me,dupl_ + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np,me,dupl_ integer(psb_ipk_), allocatable :: irl(:) logical :: local_ character(len=20) :: name diff --git a/base/tools/psb_get_overlap.f90 b/base/tools/psb_get_overlap.f90 index 9563754f..9ef3377e 100644 --- a/base/tools/psb_get_overlap.f90 +++ b/base/tools/psb_get_overlap.f90 @@ -47,7 +47,7 @@ subroutine psb_get_ovrlap(ovrel,desc,info) implicit none integer(psb_ipk_), allocatable, intent(out) :: ovrel(:) type(psb_desc_type), intent(in) :: desc - integer(psb_ipk_), intent(out) :: info + integer(psb_ipk_), intent(out) :: info integer(psb_ipk_) :: i,j, err_act character(len=20) :: name @@ -56,7 +56,7 @@ subroutine psb_get_ovrlap(ovrel,desc,info) name='psi_get_overlap' call psb_erractionsave(err_act) - if (.not.psb_is_asb_desc(desc)) then + if (.not.desc%is_asb()) then info = psb_err_invalid_cd_state_ call psb_errpush(info,name) goto 9999 diff --git a/base/tools/psb_glob_to_loc.f90 b/base/tools/psb_glob_to_loc.f90 index 79799d19..240c1efc 100644 --- a/base/tools/psb_glob_to_loc.f90 +++ b/base/tools/psb_glob_to_loc.f90 @@ -59,7 +59,8 @@ subroutine psb_glob_to_loc2v(x,y,desc_a,info,iact,owned) logical, intent(in), optional :: owned !....locals.... - integer(psb_ipk_) :: n, ictxt, iam, np + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: n, iam, np character :: act integer(psb_ipk_) :: err_act character(len=20) :: name @@ -183,7 +184,8 @@ subroutine psb_glob_to_loc1v(x,desc_a,info,iact,owned) character :: act integer(psb_ipk_) :: err_act character(len=20) :: name - integer(psb_ipk_) :: ictxt, iam, np + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: iam, np if(psb_get_errstatus() /= 0) return info=psb_success_ diff --git a/base/tools/psb_i2allc_a.f90 b/base/tools/psb_i2allc_a.f90 index 3d453ea8..c7305e0c 100644 --- a/base/tools/psb_i2allc_a.f90 +++ b/base/tools/psb_i2allc_a.f90 @@ -55,7 +55,8 @@ subroutine psb_i2alloc(x, desc_a, info, n, lb) !locals integer(psb_ipk_) :: err,nr,i,j,n_,err_act - integer(psb_ipk_) :: ictxt,np,me + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np,me integer(psb_ipk_) :: exch(3) character(len=20) :: name @@ -183,7 +184,8 @@ subroutine psb_i2allocv(x, desc_a,info,n) !locals integer(psb_ipk_) :: nr,i,err_act - integer(psb_ipk_) :: ictxt, np,me + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np,me integer(psb_ipk_) :: debug_level, debug_unit character(len=20) :: name diff --git a/base/tools/psb_i2asb_a.f90 b/base/tools/psb_i2asb_a.f90 index 4e7cc9b0..b76c39ff 100644 --- a/base/tools/psb_i2asb_a.f90 +++ b/base/tools/psb_i2asb_a.f90 @@ -52,7 +52,8 @@ subroutine psb_i2asb(x, desc_a, info, scratch) logical, intent(in), optional :: scratch ! local variables - integer(psb_ipk_) :: ictxt,np,me,nrow,ncol, err_act + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np,me,nrow,ncol, err_act integer(psb_ipk_) :: i1sz, i2sz integer(psb_ipk_) :: debug_level, debug_unit logical :: scratch_ @@ -188,7 +189,8 @@ subroutine psb_i2asbv(x, desc_a, info, scratch) logical, intent(in), optional :: scratch ! local variables - integer(psb_ipk_) :: ictxt,np,me + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np,me integer(psb_ipk_) :: i1sz,nrow,ncol, err_act integer(psb_ipk_) :: debug_level, debug_unit logical :: scratch_ diff --git a/base/tools/psb_i2free_a.f90 b/base/tools/psb_i2free_a.f90 index 5e673626..e1892cab 100644 --- a/base/tools/psb_i2free_a.f90 +++ b/base/tools/psb_i2free_a.f90 @@ -48,7 +48,8 @@ subroutine psb_i2free(x, desc_a, info) integer(psb_ipk_), intent(out) :: info !...locals.... - integer(psb_ipk_) :: ictxt,np,me, err_act + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np,me, err_act character(len=20) :: name name='psb_i2free' @@ -116,7 +117,8 @@ subroutine psb_i2freev(x, desc_a, info) integer(psb_ipk_), intent(out) :: info !...locals.... - integer(psb_ipk_) :: ictxt,np,me, err_act + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np,me, err_act character(len=20) :: name name='psb_i2freev' diff --git a/base/tools/psb_i2ins_a.f90 b/base/tools/psb_i2ins_a.f90 index 76d7c260..1db07847 100644 --- a/base/tools/psb_i2ins_a.f90 +++ b/base/tools/psb_i2ins_a.f90 @@ -68,7 +68,8 @@ subroutine psb_i2insvi(m, irw, val, x, desc_a, info, dupl,local) !locals..... integer(psb_ipk_) :: i, loc_rows,loc_cols,err_act integer(psb_lpk_) :: mglob - integer(psb_ipk_) :: ictxt,np, me, dupl_ + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me, dupl_ integer(psb_ipk_), allocatable :: irl(:) logical :: local_ character(len=20) :: name @@ -248,7 +249,8 @@ subroutine psb_i2insi(m, irw, val, x, desc_a, info, dupl,local) !locals..... integer(psb_ipk_) :: i,loc_row,j,n, loc_rows,loc_cols,err_act integer(psb_lpk_) :: mglob - integer(psb_ipk_) :: ictxt,np,me,dupl_ + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np,me,dupl_ integer(psb_ipk_), allocatable :: irl(:) logical :: local_ character(len=20) :: name diff --git a/base/tools/psb_iallc.f90 b/base/tools/psb_iallc.f90 index 65f5f1da..1dbb09f4 100644 --- a/base/tools/psb_iallc.f90 +++ b/base/tools/psb_iallc.f90 @@ -52,7 +52,7 @@ subroutine psb_ialloc_vect(x, desc_a,info) !locals integer(psb_ipk_) :: np,me,nr,i,err_act - integer(psb_ipk_) :: ictxt + type(psb_ctxt_type) :: ictxt integer(psb_ipk_) :: debug_level, debug_unit character(len=20) :: name @@ -133,8 +133,9 @@ subroutine psb_ialloc_vect_r2(x, desc_a,info,n,lb) integer(psb_ipk_), optional, intent(in) :: n,lb !locals + type(psb_ctxt_type) :: ictxt integer(psb_ipk_) :: np,me,nr,i,err_act, n_, lb_ - integer(psb_ipk_) :: ictxt, exch(1) + integer(psb_ipk_) :: exch(1) integer(psb_ipk_) :: debug_level, debug_unit character(len=20) :: name @@ -235,8 +236,9 @@ subroutine psb_ialloc_multivect(x, desc_a,info,n) integer(psb_ipk_), optional, intent(in) :: n !locals + type(psb_ctxt_type) :: ictxt integer(psb_ipk_) :: np,me,nr,i,err_act, n_, lb_ - integer(psb_ipk_) :: ictxt, exch(1) + integer(psb_ipk_) :: exch(1) integer(psb_ipk_) :: debug_level, debug_unit character(len=20) :: name diff --git a/base/tools/psb_iasb.f90 b/base/tools/psb_iasb.f90 index 52fbe165..1326a5e9 100644 --- a/base/tools/psb_iasb.f90 +++ b/base/tools/psb_iasb.f90 @@ -62,7 +62,8 @@ subroutine psb_iasb_vect(x, desc_a, info, mold, scratch) logical, intent(in), optional :: scratch ! local variables - integer(psb_ipk_) :: ictxt,np,me + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np,me integer(psb_ipk_) :: i1sz,nrow,ncol, err_act logical :: scratch_ integer(psb_ipk_) :: debug_level, debug_unit @@ -135,7 +136,8 @@ subroutine psb_iasb_vect_r2(x, desc_a, info, mold, scratch) logical, intent(in), optional :: scratch ! local variables - integer(psb_ipk_) :: ictxt,np,me, i, n + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np,me, i, n integer(psb_ipk_) :: i1sz,nrow,ncol, err_act logical :: scratch_ integer(psb_ipk_) :: debug_level, debug_unit @@ -217,7 +219,8 @@ subroutine psb_iasb_multivect(x, desc_a, info, mold, scratch,n) logical, intent(in), optional :: scratch ! local variables - integer(psb_ipk_) :: ictxt,np,me + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np,me integer(psb_ipk_) :: i1sz,nrow,ncol, err_act, n_ logical :: scratch_ diff --git a/base/tools/psb_icdasb.F90 b/base/tools/psb_icdasb.F90 index b68485ee..6c2fd03e 100644 --- a/base/tools/psb_icdasb.F90 +++ b/base/tools/psb_icdasb.F90 @@ -63,7 +63,9 @@ subroutine psb_icdasb(desc,info,ext_hv,mold) integer(psb_ipk_),allocatable :: ovrlap_index(:),halo_index(:), ext_index(:) integer(psb_ipk_) :: i, n_col, dectype, err_act, n_row - integer(psb_mpk_) :: np,me, icomm, ictxt + type(psb_ctxt_type) :: ictxt + integer(psb_mpk_) :: icomm + integer(psb_ipk_) :: np,me logical :: ext_hv_ logical, parameter :: do_timings=.true. integer(psb_ipk_), save :: idx_phase1=-1, idx_phase2=-1, idx_phase3=-1 @@ -191,7 +193,7 @@ subroutine psb_icdasb(desc,info,ext_hv,mold) call psb_erractionrestore(err_act) return -9999 call psb_error_handler(ione*ictxt,err_act) +9999 call psb_error_handler(ictxt,err_act) return diff --git a/base/tools/psb_ifree.f90 b/base/tools/psb_ifree.f90 index 516f1219..2dbc0b80 100644 --- a/base/tools/psb_ifree.f90 +++ b/base/tools/psb_ifree.f90 @@ -46,7 +46,8 @@ subroutine psb_ifree_vect(x, desc_a, info) type(psb_desc_type), intent(in) :: desc_a integer(psb_ipk_), intent(out) :: info !...locals.... - integer(psb_ipk_) :: ictxt,np,me,err_act + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np,me,err_act character(len=20) :: name @@ -100,7 +101,8 @@ subroutine psb_ifree_vect_r2(x, desc_a, info) type(psb_desc_type), intent(in) :: desc_a integer(psb_ipk_), intent(out) :: info !...locals.... - integer(psb_ipk_) :: ictxt,np,me,err_act, i + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np,me,err_act, i character(len=20) :: name @@ -152,7 +154,8 @@ subroutine psb_ifree_multivect(x, desc_a, info) type(psb_desc_type), intent(in) :: desc_a integer(psb_ipk_), intent(out) :: info !...locals.... - integer(psb_ipk_) :: ictxt,np,me,err_act + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np,me,err_act character(len=20) :: name diff --git a/base/tools/psb_iins.f90 b/base/tools/psb_iins.f90 index 48aa97fb..9366a656 100644 --- a/base/tools/psb_iins.f90 +++ b/base/tools/psb_iins.f90 @@ -63,7 +63,8 @@ subroutine psb_iins_vect(m, irw, val, x, desc_a, info, dupl,local) !locals..... integer(psb_ipk_) :: i, loc_rows,loc_cols integer(psb_lpk_) :: mglob - integer(psb_ipk_) :: ictxt, np, me, dupl_,err_act + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me, dupl_,err_act integer(psb_ipk_), allocatable :: irl(:) logical :: local_ character(len=20) :: name @@ -190,7 +191,8 @@ subroutine psb_iins_vect_v(m, irw, val, x, desc_a, info, dupl,local) !locals..... integer(psb_ipk_) :: i, loc_rows,loc_cols,err_act integer(psb_lpk_) :: mglob - integer(psb_ipk_) :: ictxt, np, me, dupl_ + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me, dupl_ integer(psb_ipk_), allocatable :: irl(:) integer(psb_ipk_), allocatable :: lval(:) logical :: local_ @@ -295,7 +297,8 @@ subroutine psb_iins_vect_r2(m, irw, val, x, desc_a, info, dupl,local) !locals..... integer(psb_ipk_) :: i, loc_rows,loc_cols, n integer(psb_lpk_) :: mglob - integer(psb_ipk_) :: ictxt, np, me, dupl_, err_act + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me, dupl_, err_act integer(psb_ipk_), allocatable :: irl(:) logical :: local_ character(len=20) :: name @@ -409,7 +412,8 @@ subroutine psb_iins_multivect(m, irw, val, x, desc_a, info, dupl,local) !locals..... integer(psb_ipk_) :: i, loc_rows,loc_cols integer(psb_lpk_) :: mglob - integer(psb_ipk_) :: ictxt, np, me, dupl_, err_act + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me, dupl_, err_act integer(psb_ipk_), allocatable :: irl(:) logical :: local_ character(len=20) :: name diff --git a/base/tools/psb_lallc.f90 b/base/tools/psb_lallc.f90 index e397f7cb..99870a11 100644 --- a/base/tools/psb_lallc.f90 +++ b/base/tools/psb_lallc.f90 @@ -52,7 +52,7 @@ subroutine psb_lalloc_vect(x, desc_a,info) !locals integer(psb_ipk_) :: np,me,nr,i,err_act - integer(psb_ipk_) :: ictxt + type(psb_ctxt_type) :: ictxt integer(psb_ipk_) :: debug_level, debug_unit character(len=20) :: name @@ -133,8 +133,9 @@ subroutine psb_lalloc_vect_r2(x, desc_a,info,n,lb) integer(psb_ipk_), optional, intent(in) :: n,lb !locals + type(psb_ctxt_type) :: ictxt integer(psb_ipk_) :: np,me,nr,i,err_act, n_, lb_ - integer(psb_ipk_) :: ictxt, exch(1) + integer(psb_ipk_) :: exch(1) integer(psb_ipk_) :: debug_level, debug_unit character(len=20) :: name @@ -235,8 +236,9 @@ subroutine psb_lalloc_multivect(x, desc_a,info,n) integer(psb_ipk_), optional, intent(in) :: n !locals + type(psb_ctxt_type) :: ictxt integer(psb_ipk_) :: np,me,nr,i,err_act, n_, lb_ - integer(psb_ipk_) :: ictxt, exch(1) + integer(psb_ipk_) :: exch(1) integer(psb_ipk_) :: debug_level, debug_unit character(len=20) :: name diff --git a/base/tools/psb_lasb.f90 b/base/tools/psb_lasb.f90 index c1835b05..f7ab7824 100644 --- a/base/tools/psb_lasb.f90 +++ b/base/tools/psb_lasb.f90 @@ -62,7 +62,8 @@ subroutine psb_lasb_vect(x, desc_a, info, mold, scratch) logical, intent(in), optional :: scratch ! local variables - integer(psb_ipk_) :: ictxt,np,me + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np,me integer(psb_ipk_) :: i1sz,nrow,ncol, err_act logical :: scratch_ integer(psb_ipk_) :: debug_level, debug_unit @@ -135,7 +136,8 @@ subroutine psb_lasb_vect_r2(x, desc_a, info, mold, scratch) logical, intent(in), optional :: scratch ! local variables - integer(psb_ipk_) :: ictxt,np,me, i, n + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np,me, i, n integer(psb_ipk_) :: i1sz,nrow,ncol, err_act logical :: scratch_ integer(psb_ipk_) :: debug_level, debug_unit @@ -217,7 +219,8 @@ subroutine psb_lasb_multivect(x, desc_a, info, mold, scratch,n) logical, intent(in), optional :: scratch ! local variables - integer(psb_ipk_) :: ictxt,np,me + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np,me integer(psb_ipk_) :: i1sz,nrow,ncol, err_act, n_ logical :: scratch_ diff --git a/base/tools/psb_lfree.f90 b/base/tools/psb_lfree.f90 index d6c597a8..85d7bd7e 100644 --- a/base/tools/psb_lfree.f90 +++ b/base/tools/psb_lfree.f90 @@ -46,7 +46,8 @@ subroutine psb_lfree_vect(x, desc_a, info) type(psb_desc_type), intent(in) :: desc_a integer(psb_ipk_), intent(out) :: info !...locals.... - integer(psb_ipk_) :: ictxt,np,me,err_act + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np,me,err_act character(len=20) :: name @@ -100,7 +101,8 @@ subroutine psb_lfree_vect_r2(x, desc_a, info) type(psb_desc_type), intent(in) :: desc_a integer(psb_ipk_), intent(out) :: info !...locals.... - integer(psb_ipk_) :: ictxt,np,me,err_act, i + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np,me,err_act, i character(len=20) :: name @@ -152,7 +154,8 @@ subroutine psb_lfree_multivect(x, desc_a, info) type(psb_desc_type), intent(in) :: desc_a integer(psb_ipk_), intent(out) :: info !...locals.... - integer(psb_ipk_) :: ictxt,np,me,err_act + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np,me,err_act character(len=20) :: name diff --git a/base/tools/psb_lins.f90 b/base/tools/psb_lins.f90 index d7c044d1..8db980e9 100644 --- a/base/tools/psb_lins.f90 +++ b/base/tools/psb_lins.f90 @@ -63,7 +63,8 @@ subroutine psb_lins_vect(m, irw, val, x, desc_a, info, dupl,local) !locals..... integer(psb_ipk_) :: i, loc_rows,loc_cols integer(psb_lpk_) :: mglob - integer(psb_ipk_) :: ictxt, np, me, dupl_,err_act + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me, dupl_,err_act integer(psb_ipk_), allocatable :: irl(:) logical :: local_ character(len=20) :: name @@ -190,7 +191,8 @@ subroutine psb_lins_vect_v(m, irw, val, x, desc_a, info, dupl,local) !locals..... integer(psb_ipk_) :: i, loc_rows,loc_cols,err_act integer(psb_lpk_) :: mglob - integer(psb_ipk_) :: ictxt, np, me, dupl_ + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me, dupl_ integer(psb_ipk_), allocatable :: irl(:) integer(psb_lpk_), allocatable :: lval(:) logical :: local_ @@ -295,7 +297,8 @@ subroutine psb_lins_vect_r2(m, irw, val, x, desc_a, info, dupl,local) !locals..... integer(psb_ipk_) :: i, loc_rows,loc_cols, n integer(psb_lpk_) :: mglob - integer(psb_ipk_) :: ictxt, np, me, dupl_, err_act + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me, dupl_, err_act integer(psb_ipk_), allocatable :: irl(:) logical :: local_ character(len=20) :: name @@ -409,7 +412,8 @@ subroutine psb_lins_multivect(m, irw, val, x, desc_a, info, dupl,local) !locals..... integer(psb_ipk_) :: i, loc_rows,loc_cols integer(psb_lpk_) :: mglob - integer(psb_ipk_) :: ictxt, np, me, dupl_, err_act + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me, dupl_, err_act integer(psb_ipk_), allocatable :: irl(:) logical :: local_ character(len=20) :: name diff --git a/base/tools/psb_mallc_a.f90 b/base/tools/psb_mallc_a.f90 index 2bcedc5b..fc545678 100644 --- a/base/tools/psb_mallc_a.f90 +++ b/base/tools/psb_mallc_a.f90 @@ -55,7 +55,8 @@ subroutine psb_malloc(x, desc_a, info, n, lb) !locals integer(psb_ipk_) :: err,nr,i,j,n_,err_act - integer(psb_ipk_) :: ictxt,np,me + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np,me integer(psb_ipk_) :: exch(3) character(len=20) :: name @@ -183,7 +184,8 @@ subroutine psb_mallocv(x, desc_a,info,n) !locals integer(psb_ipk_) :: nr,i,err_act - integer(psb_ipk_) :: ictxt, np,me + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np,me integer(psb_ipk_) :: debug_level, debug_unit character(len=20) :: name diff --git a/base/tools/psb_masb_a.f90 b/base/tools/psb_masb_a.f90 index 47c35d2a..7999cb03 100644 --- a/base/tools/psb_masb_a.f90 +++ b/base/tools/psb_masb_a.f90 @@ -52,7 +52,8 @@ subroutine psb_masb(x, desc_a, info, scratch) logical, intent(in), optional :: scratch ! local variables - integer(psb_ipk_) :: ictxt,np,me,nrow,ncol, err_act + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np,me,nrow,ncol, err_act integer(psb_ipk_) :: i1sz, i2sz integer(psb_ipk_) :: debug_level, debug_unit logical :: scratch_ @@ -188,7 +189,8 @@ subroutine psb_masbv(x, desc_a, info, scratch) logical, intent(in), optional :: scratch ! local variables - integer(psb_ipk_) :: ictxt,np,me + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np,me integer(psb_ipk_) :: i1sz,nrow,ncol, err_act integer(psb_ipk_) :: debug_level, debug_unit logical :: scratch_ diff --git a/base/tools/psb_mfree_a.f90 b/base/tools/psb_mfree_a.f90 index 49f255da..3f534b2b 100644 --- a/base/tools/psb_mfree_a.f90 +++ b/base/tools/psb_mfree_a.f90 @@ -48,7 +48,8 @@ subroutine psb_mfree(x, desc_a, info) integer(psb_ipk_), intent(out) :: info !...locals.... - integer(psb_ipk_) :: ictxt,np,me, err_act + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np,me, err_act character(len=20) :: name name='psb_mfree' @@ -116,7 +117,8 @@ subroutine psb_mfreev(x, desc_a, info) integer(psb_ipk_), intent(out) :: info !...locals.... - integer(psb_ipk_) :: ictxt,np,me, err_act + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np,me, err_act character(len=20) :: name name='psb_mfreev' diff --git a/base/tools/psb_mins_a.f90 b/base/tools/psb_mins_a.f90 index 6d83b724..fa3ff081 100644 --- a/base/tools/psb_mins_a.f90 +++ b/base/tools/psb_mins_a.f90 @@ -68,7 +68,8 @@ subroutine psb_minsvi(m, irw, val, x, desc_a, info, dupl,local) !locals..... integer(psb_ipk_) :: i, loc_rows,loc_cols,err_act integer(psb_lpk_) :: mglob - integer(psb_ipk_) :: ictxt,np, me, dupl_ + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me, dupl_ integer(psb_ipk_), allocatable :: irl(:) logical :: local_ character(len=20) :: name @@ -248,7 +249,8 @@ subroutine psb_minsi(m, irw, val, x, desc_a, info, dupl,local) !locals..... integer(psb_ipk_) :: i,loc_row,j,n, loc_rows,loc_cols,err_act integer(psb_lpk_) :: mglob - integer(psb_ipk_) :: ictxt,np,me,dupl_ + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np,me,dupl_ integer(psb_ipk_), allocatable :: irl(:) logical :: local_ character(len=20) :: name diff --git a/base/tools/psb_s_glob_transpose.F90 b/base/tools/psb_s_glob_transpose.F90 index 875f92db..e747b270 100644 --- a/base/tools/psb_s_glob_transpose.F90 +++ b/base/tools/psb_s_glob_transpose.F90 @@ -110,7 +110,8 @@ subroutine psb_ls_coo_glob_transpose(ain,desc_r,info,atrans,desc_c,desc_rx) integer(psb_ipk_), intent(out) :: info ! ...local scalars.... - integer(psb_ipk_) :: ictxt, np,me + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np,me integer(psb_ipk_) :: counter,proc, err_act, j integer(psb_lpk_) :: i, k, idx, r, ipx,mat_recv, iszs, iszr,idxs,idxr,nz,& & l1, nsnds, nrcvs, nr,nc,nzl, hlstart, nzt, nzd @@ -406,7 +407,8 @@ subroutine psb_s_coo_glob_transpose(ain,desc_r,info,atrans,desc_c,desc_rx) type(psb_desc_type), intent(out), optional :: desc_rx integer(psb_ipk_), intent(out) :: info - integer(psb_ipk_) :: ictxt, np,me + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np,me integer(psb_ipk_) :: counter,proc, err_act, j integer(psb_ipk_) :: i, k, idx, r, ipx,mat_recv, iszs, iszr,idxs,idxr,nz,& & l1, nsnds, nrcvs, nr,nc,nzl, hlstart, nzd @@ -709,7 +711,8 @@ subroutine psb_s_simple_glob_transpose_ip(ain,desc_a,info) ! type(psb_s_coo_sparse_mat) :: tmpc1, tmpc2 integer(psb_ipk_) :: nz1, nz2, nzh, nz - integer(psb_ipk_) :: ictxt, me, np + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: me, np integer(psb_lpk_) :: i, j, k, nrow, ncol, nlz integer(psb_lpk_), allocatable :: ilv(:) character(len=80) :: aname @@ -760,7 +763,8 @@ subroutine psb_s_simple_glob_transpose(ain,aout,desc_a,info) ! type(psb_s_coo_sparse_mat) :: tmpc1, tmpc2 integer(psb_ipk_) :: nz1, nz2, nzh, nz - integer(psb_ipk_) :: ictxt, me, np + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: me, np integer(psb_lpk_) :: i, j, k, nrow, ncol, nlz integer(psb_lpk_), allocatable :: ilv(:) character(len=80) :: aname @@ -811,7 +815,8 @@ subroutine psb_ls_simple_glob_transpose_ip(ain,desc_a,info) ! type(psb_ls_coo_sparse_mat) :: tmpc1, tmpc2 integer(psb_ipk_) :: nz1, nz2, nzh, nz - integer(psb_ipk_) :: ictxt, me, np + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: me, np integer(psb_lpk_) :: i, j, k, nrow, ncol, nlz integer(psb_lpk_), allocatable :: ilv(:) character(len=80) :: aname @@ -862,7 +867,8 @@ subroutine psb_ls_simple_glob_transpose(ain,aout,desc_a,info) ! type(psb_ls_coo_sparse_mat) :: tmpc1, tmpc2 integer(psb_ipk_) :: nz1, nz2, nzh, nz - integer(psb_ipk_) :: ictxt, me, np + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: me, np integer(psb_lpk_) :: i, j, k, nrow, ncol, nlz integer(psb_lpk_), allocatable :: ilv(:) character(len=80) :: aname diff --git a/base/tools/psb_s_map.f90 b/base/tools/psb_s_map.f90 index 6fa9b7b7..f20ff196 100644 --- a/base/tools/psb_s_map.f90 +++ b/base/tools/psb_s_map.f90 @@ -51,7 +51,8 @@ subroutine psb_s_map_U2V_a(alpha,x,beta,y,map,info,work) ! real(psb_spk_), allocatable :: xt(:), yt(:) integer(psb_ipk_) :: i, j, nr1, nc1,nr2, nc2,& - & map_kind, nr, ictxt + & map_kind, nr + type(psb_ctxt_type) :: ictxt character(len=20), parameter :: name='psb_map_U2V' info = psb_success_ @@ -125,7 +126,8 @@ subroutine psb_s_map_U2V_v(alpha,x,beta,y,map,info,work,vtx,vty) type(psb_s_vect_type),pointer :: ptx, pty real(psb_spk_), allocatable :: xta(:), yta(:) integer(psb_ipk_) :: i, j, nr1, nc1,nr2, nc2 ,& - & map_kind, nr, ictxt, iam, np + & map_kind, nr, iam, np + type(psb_ctxt_type) :: ictxt character(len=20), parameter :: name='psb_map_U2V_v' info = psb_success_ @@ -232,7 +234,8 @@ subroutine psb_s_map_V2U_a(alpha,x,beta,y,map,info,work) ! real(psb_spk_), allocatable :: xt(:), yt(:) integer(psb_ipk_) :: i, j, nr1, nc1,nr2, nc2,& - & map_kind, nr, ictxt + & map_kind, nr + type(psb_ctxt_type) :: ictxt character(len=20), parameter :: name='psb_map_V2U' info = psb_success_ @@ -305,7 +308,8 @@ subroutine psb_s_map_V2U_v(alpha,x,beta,y,map,info,work,vtx,vty) type(psb_s_vect_type),pointer :: ptx, pty real(psb_spk_), allocatable :: xta(:), yta(:) integer(psb_ipk_) :: i, j, nr1, nc1,nr2, nc2,& - & map_kind, nr, ictxt, iam, np + & map_kind, nr, iam, np + type(psb_ctxt_type) :: ictxt character(len=20), parameter :: name='psb_map_V2U_v' info = psb_success_ diff --git a/base/tools/psb_s_par_csr_spspmm.f90 b/base/tools/psb_s_par_csr_spspmm.f90 index fba99f27..928ff101 100644 --- a/base/tools/psb_s_par_csr_spspmm.f90 +++ b/base/tools/psb_s_par_csr_spspmm.f90 @@ -73,7 +73,8 @@ Subroutine psb_s_par_csr_spspmm(acsr,desc_a,bcsr,ccsr,desc_c,info,data) integer(psb_ipk_), intent(out) :: info integer(psb_ipk_), intent(in), optional :: data ! ...local scalars.... - integer(psb_ipk_) :: ictxt, np,me + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np,me integer(psb_ipk_) :: ncol, nnz type(psb_ls_csr_sparse_mat) :: ltcsr type(psb_s_csr_sparse_mat) :: tcsr @@ -168,7 +169,8 @@ Subroutine psb_ls_par_csr_spspmm(acsr,desc_a,bcsr,ccsr,desc_c,info,data) integer(psb_ipk_), intent(out) :: info integer(psb_ipk_), intent(in), optional :: data ! ...local scalars.... - integer(psb_ipk_) :: ictxt, np,me + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np,me integer(psb_lpk_) :: nacol, nccol, nnz type(psb_ls_csr_sparse_mat) :: tcsr1 logical :: update_desc_c diff --git a/base/tools/psb_sallc.f90 b/base/tools/psb_sallc.f90 index 6e20f82e..e4286f40 100644 --- a/base/tools/psb_sallc.f90 +++ b/base/tools/psb_sallc.f90 @@ -52,7 +52,7 @@ subroutine psb_salloc_vect(x, desc_a,info) !locals integer(psb_ipk_) :: np,me,nr,i,err_act - integer(psb_ipk_) :: ictxt + type(psb_ctxt_type) :: ictxt integer(psb_ipk_) :: debug_level, debug_unit character(len=20) :: name @@ -133,8 +133,9 @@ subroutine psb_salloc_vect_r2(x, desc_a,info,n,lb) integer(psb_ipk_), optional, intent(in) :: n,lb !locals + type(psb_ctxt_type) :: ictxt integer(psb_ipk_) :: np,me,nr,i,err_act, n_, lb_ - integer(psb_ipk_) :: ictxt, exch(1) + integer(psb_ipk_) :: exch(1) integer(psb_ipk_) :: debug_level, debug_unit character(len=20) :: name @@ -235,8 +236,9 @@ subroutine psb_salloc_multivect(x, desc_a,info,n) integer(psb_ipk_), optional, intent(in) :: n !locals + type(psb_ctxt_type) :: ictxt integer(psb_ipk_) :: np,me,nr,i,err_act, n_, lb_ - integer(psb_ipk_) :: ictxt, exch(1) + integer(psb_ipk_) :: exch(1) integer(psb_ipk_) :: debug_level, debug_unit character(len=20) :: name diff --git a/base/tools/psb_sallc_a.f90 b/base/tools/psb_sallc_a.f90 index 815acb61..6f783584 100644 --- a/base/tools/psb_sallc_a.f90 +++ b/base/tools/psb_sallc_a.f90 @@ -55,7 +55,8 @@ subroutine psb_salloc(x, desc_a, info, n, lb) !locals integer(psb_ipk_) :: err,nr,i,j,n_,err_act - integer(psb_ipk_) :: ictxt,np,me + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np,me integer(psb_ipk_) :: exch(3) character(len=20) :: name @@ -183,7 +184,8 @@ subroutine psb_sallocv(x, desc_a,info,n) !locals integer(psb_ipk_) :: nr,i,err_act - integer(psb_ipk_) :: ictxt, np,me + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np,me integer(psb_ipk_) :: debug_level, debug_unit character(len=20) :: name diff --git a/base/tools/psb_sasb.f90 b/base/tools/psb_sasb.f90 index 67d4ac92..36b98c7c 100644 --- a/base/tools/psb_sasb.f90 +++ b/base/tools/psb_sasb.f90 @@ -62,7 +62,8 @@ subroutine psb_sasb_vect(x, desc_a, info, mold, scratch) logical, intent(in), optional :: scratch ! local variables - integer(psb_ipk_) :: ictxt,np,me + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np,me integer(psb_ipk_) :: i1sz,nrow,ncol, err_act logical :: scratch_ integer(psb_ipk_) :: debug_level, debug_unit @@ -135,7 +136,8 @@ subroutine psb_sasb_vect_r2(x, desc_a, info, mold, scratch) logical, intent(in), optional :: scratch ! local variables - integer(psb_ipk_) :: ictxt,np,me, i, n + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np,me, i, n integer(psb_ipk_) :: i1sz,nrow,ncol, err_act logical :: scratch_ integer(psb_ipk_) :: debug_level, debug_unit @@ -217,7 +219,8 @@ subroutine psb_sasb_multivect(x, desc_a, info, mold, scratch,n) logical, intent(in), optional :: scratch ! local variables - integer(psb_ipk_) :: ictxt,np,me + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np,me integer(psb_ipk_) :: i1sz,nrow,ncol, err_act, n_ logical :: scratch_ diff --git a/base/tools/psb_sasb_a.f90 b/base/tools/psb_sasb_a.f90 index bef96be7..4ce6201a 100644 --- a/base/tools/psb_sasb_a.f90 +++ b/base/tools/psb_sasb_a.f90 @@ -52,7 +52,8 @@ subroutine psb_sasb(x, desc_a, info, scratch) logical, intent(in), optional :: scratch ! local variables - integer(psb_ipk_) :: ictxt,np,me,nrow,ncol, err_act + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np,me,nrow,ncol, err_act integer(psb_ipk_) :: i1sz, i2sz integer(psb_ipk_) :: debug_level, debug_unit logical :: scratch_ @@ -188,7 +189,8 @@ subroutine psb_sasbv(x, desc_a, info, scratch) logical, intent(in), optional :: scratch ! local variables - integer(psb_ipk_) :: ictxt,np,me + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np,me integer(psb_ipk_) :: i1sz,nrow,ncol, err_act integer(psb_ipk_) :: debug_level, debug_unit logical :: scratch_ diff --git a/base/tools/psb_scdbldext.F90 b/base/tools/psb_scdbldext.F90 index 34047ded..d57e20ed 100644 --- a/base/tools/psb_scdbldext.F90 +++ b/base/tools/psb_scdbldext.F90 @@ -90,7 +90,9 @@ Subroutine psb_scdbldext(a,desc_a,novr,desc_ov,info, extype) & counter_t,n_elem,i_ovr,jj,proc_id,isz, & & idxr, idxs, iszr, iszs, nxch, nsnd, nrcv,lidx, extype_ integer(psb_lpk_) :: gidx, lnz - integer(psb_mpk_) :: icomm, ictxt, me, np, minfo + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: me, np + integer(psb_mpk_) :: icomm, minfo integer(psb_ipk_), allocatable :: irow(:), icol(:) integer(psb_ipk_), allocatable :: tmp_halo(:),tmp_ovr_idx(:), orig_ovr(:) @@ -701,7 +703,7 @@ Subroutine psb_scdbldext(a,desc_a,novr,desc_ov,info, extype) call psb_erractionrestore(err_act) return -9999 call psb_error_handler(ione*ictxt,err_act) +9999 call psb_error_handler(ictxt,err_act) return diff --git a/base/tools/psb_sfree.f90 b/base/tools/psb_sfree.f90 index 34f03cae..39e01666 100644 --- a/base/tools/psb_sfree.f90 +++ b/base/tools/psb_sfree.f90 @@ -46,7 +46,8 @@ subroutine psb_sfree_vect(x, desc_a, info) type(psb_desc_type), intent(in) :: desc_a integer(psb_ipk_), intent(out) :: info !...locals.... - integer(psb_ipk_) :: ictxt,np,me,err_act + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np,me,err_act character(len=20) :: name @@ -100,7 +101,8 @@ subroutine psb_sfree_vect_r2(x, desc_a, info) type(psb_desc_type), intent(in) :: desc_a integer(psb_ipk_), intent(out) :: info !...locals.... - integer(psb_ipk_) :: ictxt,np,me,err_act, i + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np,me,err_act, i character(len=20) :: name @@ -152,7 +154,8 @@ subroutine psb_sfree_multivect(x, desc_a, info) type(psb_desc_type), intent(in) :: desc_a integer(psb_ipk_), intent(out) :: info !...locals.... - integer(psb_ipk_) :: ictxt,np,me,err_act + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np,me,err_act character(len=20) :: name diff --git a/base/tools/psb_sfree_a.f90 b/base/tools/psb_sfree_a.f90 index 6d7412d0..7cddb76f 100644 --- a/base/tools/psb_sfree_a.f90 +++ b/base/tools/psb_sfree_a.f90 @@ -48,7 +48,8 @@ subroutine psb_sfree(x, desc_a, info) integer(psb_ipk_), intent(out) :: info !...locals.... - integer(psb_ipk_) :: ictxt,np,me, err_act + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np,me, err_act character(len=20) :: name name='psb_sfree' @@ -116,7 +117,8 @@ subroutine psb_sfreev(x, desc_a, info) integer(psb_ipk_), intent(out) :: info !...locals.... - integer(psb_ipk_) :: ictxt,np,me, err_act + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np,me, err_act character(len=20) :: name name='psb_sfreev' diff --git a/base/tools/psb_sgetelem.f90 b/base/tools/psb_sgetelem.f90 index 6a8f764e..f0eceee2 100644 --- a/base/tools/psb_sgetelem.f90 +++ b/base/tools/psb_sgetelem.f90 @@ -55,7 +55,8 @@ function psb_s_getelem(x,index,desc_a,info) result(res) !locals integer(psb_ipk_) :: localindex(1) - integer(psb_ipk_) :: ictxt, np, me, err_act + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me, err_act integer(psb_lpk_) :: gindex(1) integer(psb_lpk_), allocatable :: myidx(:),mylocal(:) character(len=20) :: name diff --git a/base/tools/psb_sins.f90 b/base/tools/psb_sins.f90 index 85b68322..8fc5c312 100644 --- a/base/tools/psb_sins.f90 +++ b/base/tools/psb_sins.f90 @@ -63,7 +63,8 @@ subroutine psb_sins_vect(m, irw, val, x, desc_a, info, dupl,local) !locals..... integer(psb_ipk_) :: i, loc_rows,loc_cols integer(psb_lpk_) :: mglob - integer(psb_ipk_) :: ictxt, np, me, dupl_,err_act + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me, dupl_,err_act integer(psb_ipk_), allocatable :: irl(:) logical :: local_ character(len=20) :: name @@ -190,7 +191,8 @@ subroutine psb_sins_vect_v(m, irw, val, x, desc_a, info, dupl,local) !locals..... integer(psb_ipk_) :: i, loc_rows,loc_cols,err_act integer(psb_lpk_) :: mglob - integer(psb_ipk_) :: ictxt, np, me, dupl_ + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me, dupl_ integer(psb_ipk_), allocatable :: irl(:) real(psb_spk_), allocatable :: lval(:) logical :: local_ @@ -295,7 +297,8 @@ subroutine psb_sins_vect_r2(m, irw, val, x, desc_a, info, dupl,local) !locals..... integer(psb_ipk_) :: i, loc_rows,loc_cols, n integer(psb_lpk_) :: mglob - integer(psb_ipk_) :: ictxt, np, me, dupl_, err_act + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me, dupl_, err_act integer(psb_ipk_), allocatable :: irl(:) logical :: local_ character(len=20) :: name @@ -409,7 +412,8 @@ subroutine psb_sins_multivect(m, irw, val, x, desc_a, info, dupl,local) !locals..... integer(psb_ipk_) :: i, loc_rows,loc_cols integer(psb_lpk_) :: mglob - integer(psb_ipk_) :: ictxt, np, me, dupl_, err_act + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me, dupl_, err_act integer(psb_ipk_), allocatable :: irl(:) logical :: local_ character(len=20) :: name diff --git a/base/tools/psb_sins_a.f90 b/base/tools/psb_sins_a.f90 index 51bd0bbd..bf0c7e42 100644 --- a/base/tools/psb_sins_a.f90 +++ b/base/tools/psb_sins_a.f90 @@ -68,7 +68,8 @@ subroutine psb_sinsvi(m, irw, val, x, desc_a, info, dupl,local) !locals..... integer(psb_ipk_) :: i, loc_rows,loc_cols,err_act integer(psb_lpk_) :: mglob - integer(psb_ipk_) :: ictxt,np, me, dupl_ + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me, dupl_ integer(psb_ipk_), allocatable :: irl(:) logical :: local_ character(len=20) :: name @@ -248,7 +249,8 @@ subroutine psb_sinsi(m, irw, val, x, desc_a, info, dupl,local) !locals..... integer(psb_ipk_) :: i,loc_row,j,n, loc_rows,loc_cols,err_act integer(psb_lpk_) :: mglob - integer(psb_ipk_) :: ictxt,np,me,dupl_ + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np,me,dupl_ integer(psb_ipk_), allocatable :: irl(:) logical :: local_ character(len=20) :: name diff --git a/base/tools/psb_sspalloc.f90 b/base/tools/psb_sspalloc.f90 index 4b092e62..7092ab4b 100644 --- a/base/tools/psb_sspalloc.f90 +++ b/base/tools/psb_sspalloc.f90 @@ -52,7 +52,8 @@ subroutine psb_sspalloc(a, desc_a, info, nnz) integer(psb_ipk_), optional, intent(in) :: nnz !locals - integer(psb_ipk_) :: ictxt, np, me, err_act + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me, err_act integer(psb_ipk_) :: loc_row,loc_col, nnz_, dectype integer(psb_lpk_) :: m, n integer(psb_ipk_) :: debug_level, debug_unit diff --git a/base/tools/psb_sspasb.f90 b/base/tools/psb_sspasb.f90 index 01187497..87d34f86 100644 --- a/base/tools/psb_sspasb.f90 +++ b/base/tools/psb_sspasb.f90 @@ -62,7 +62,8 @@ subroutine psb_sspasb(a,desc_a, info, afmt, upd, dupl, mold) character(len=*), optional, intent(in) :: afmt class(psb_s_base_sparse_mat), intent(in), optional :: mold !....Locals.... - integer(psb_ipk_) :: ictxt,np,me, err_act + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np,me, err_act integer(psb_ipk_) :: n_row,n_col integer(psb_ipk_) :: debug_level, debug_unit character(len=20) :: name, ch_err diff --git a/base/tools/psb_sspfree.f90 b/base/tools/psb_sspfree.f90 index aa4cea76..f55c8718 100644 --- a/base/tools/psb_sspfree.f90 +++ b/base/tools/psb_sspfree.f90 @@ -48,7 +48,8 @@ subroutine psb_sspfree(a, desc_a,info) type(psb_sspmat_type), intent(inout) :: a integer(psb_ipk_), intent(out) :: info !...locals.... - integer(psb_ipk_) :: ictxt, err_act + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: err_act character(len=20) :: name info=psb_success_ diff --git a/base/tools/psb_ssphalo.F90 b/base/tools/psb_ssphalo.F90 index f8958a45..f6fad075 100644 --- a/base/tools/psb_ssphalo.F90 +++ b/base/tools/psb_ssphalo.F90 @@ -90,7 +90,8 @@ Subroutine psb_ssphalo(a,desc_a,blk,info,rowcnv,colcnv,& character(len=5), optional :: outfmt integer(psb_ipk_), intent(in), optional :: data ! ...local scalars.... - integer(psb_ipk_) :: ictxt, np,me + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np,me integer(psb_ipk_) :: counter,proc,i, & & n_el_send,k,n_el_recv,idx, r, tot_elem,& & n_elem, j, ipx,mat_recv, iszs, iszr,idxs,idxr,nz,& @@ -557,7 +558,8 @@ Subroutine psb_lssphalo(a,desc_a,blk,info,rowcnv,colcnv,& character(len=5), optional :: outfmt integer(psb_ipk_), intent(in), optional :: data ! ...local scalars.... - integer(psb_ipk_) :: ictxt, np,me + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np,me integer(psb_ipk_) :: counter, proc, i, n_el_send,n_el_recv, & & n_elem, j, ipx,mat_recv, idxs,idxr,nz,& & data_,totxch,nxs, nxr, ncg @@ -900,7 +902,8 @@ Subroutine psb_ls_csr_halo(a,desc_a,blk,info,rowcnv,colcnv,& integer(psb_ipk_), intent(in), optional :: data type(psb_desc_type),Intent(in), optional, target :: col_desc ! ...local scalars.... - integer(psb_ipk_) :: ictxt, np,me + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np,me integer(psb_ipk_) :: counter,proc,i, n_el_send,n_el_recv,& & n_elem, j,ipx,mat_recv, iszs, iszr,idxs,idxr,nz,& & data_,totxch,nxs, nxr, err_act, nsnds, nrcvs @@ -1260,7 +1263,8 @@ Subroutine psb_s_ls_csr_halo(a,desc_a,blk,info,rowcnv,colcnv,& integer(psb_ipk_), intent(in), optional :: data type(psb_desc_type),Intent(in), optional, target :: col_desc ! ...local scalars.... - integer(psb_ipk_) :: ictxt, np,me + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np,me integer(psb_ipk_) :: counter,proc,i, n_el_send,n_el_recv,& & n_elem, j,ipx,mat_recv, iszs, iszr,idxs,idxr,nz,& & data_,totxch,ngtz, idx, nxs, nxr, err_act, & diff --git a/base/tools/psb_sspins.F90 b/base/tools/psb_sspins.F90 index 7a86e559..464dd953 100644 --- a/base/tools/psb_sspins.F90 +++ b/base/tools/psb_sspins.F90 @@ -64,7 +64,8 @@ subroutine psb_sspins(nz,ia,ja,val,a,desc_a,info,rebuild,local) !locals..... integer(psb_ipk_) :: nrow, err_act, ncol, spstate - integer(psb_ipk_) :: ictxt,np,me + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np,me logical, parameter :: debug=.false. integer(psb_ipk_), parameter :: relocsz=200 logical :: rebuild_, local_ @@ -208,7 +209,8 @@ subroutine psb_sspins_csr_lirp(nr,irp,ja,val,irw,a,desc_a,info,rebuild,local) integer(psb_ipk_) :: nrow, err_act, ncol, spstate, nz, i, j integer(psb_lpk_) :: ir - integer(psb_ipk_) :: ictxt,np,me + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np,me logical, parameter :: debug=.false. integer(psb_ipk_), parameter :: relocsz=200 logical :: rebuild_, local_ @@ -306,7 +308,8 @@ subroutine psb_sspins_csr_iirp(nr,irw,irp,ja,val,a,desc_a,info,rebuild,local) integer(psb_ipk_) :: nrow, err_act, ncol, spstate, nz, i, j integer(psb_lpk_) :: ir - integer(psb_ipk_) :: ictxt,np,me + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np,me logical, parameter :: debug=.false. integer(psb_ipk_), parameter :: relocsz=200 logical :: rebuild_, local_ @@ -403,7 +406,8 @@ subroutine psb_sspins_2desc(nz,ia,ja,val,a,desc_ar,desc_ac,info) !locals..... integer(psb_ipk_) :: nrow, err_act, ncol, spstate - integer(psb_ipk_) :: ictxt,np,me + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np,me logical, parameter :: debug=.false. integer(psb_ipk_), parameter :: relocsz=200 integer(psb_ipk_), allocatable :: ila(:),jla(:) @@ -518,7 +522,8 @@ subroutine psb_sspins_v(nz,ia,ja,val,a,desc_a,info,rebuild,local) !locals..... integer(psb_ipk_) :: nrow, err_act, ncol, spstate - integer(psb_ipk_) :: ictxt,np,me + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np,me logical, parameter :: debug=.false. integer(psb_ipk_), parameter :: relocsz=200 logical :: rebuild_, local_ diff --git a/base/tools/psb_ssprn.f90 b/base/tools/psb_ssprn.f90 index 3a750033..663ba185 100644 --- a/base/tools/psb_ssprn.f90 +++ b/base/tools/psb_ssprn.f90 @@ -53,7 +53,8 @@ Subroutine psb_ssprn(a, desc_a,info,clear) logical, intent(in), optional :: clear !locals - integer(psb_ipk_) :: ictxt,np,me,err_act + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np,me,err_act integer(psb_ipk_) :: debug_level, debug_unit character(len=20) :: name logical :: clear_ diff --git a/base/tools/psb_z_glob_transpose.F90 b/base/tools/psb_z_glob_transpose.F90 index 8f7cadd5..4ee53c38 100644 --- a/base/tools/psb_z_glob_transpose.F90 +++ b/base/tools/psb_z_glob_transpose.F90 @@ -110,7 +110,8 @@ subroutine psb_lz_coo_glob_transpose(ain,desc_r,info,atrans,desc_c,desc_rx) integer(psb_ipk_), intent(out) :: info ! ...local scalars.... - integer(psb_ipk_) :: ictxt, np,me + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np,me integer(psb_ipk_) :: counter,proc, err_act, j integer(psb_lpk_) :: i, k, idx, r, ipx,mat_recv, iszs, iszr,idxs,idxr,nz,& & l1, nsnds, nrcvs, nr,nc,nzl, hlstart, nzt, nzd @@ -406,7 +407,8 @@ subroutine psb_z_coo_glob_transpose(ain,desc_r,info,atrans,desc_c,desc_rx) type(psb_desc_type), intent(out), optional :: desc_rx integer(psb_ipk_), intent(out) :: info - integer(psb_ipk_) :: ictxt, np,me + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np,me integer(psb_ipk_) :: counter,proc, err_act, j integer(psb_ipk_) :: i, k, idx, r, ipx,mat_recv, iszs, iszr,idxs,idxr,nz,& & l1, nsnds, nrcvs, nr,nc,nzl, hlstart, nzd @@ -709,7 +711,8 @@ subroutine psb_z_simple_glob_transpose_ip(ain,desc_a,info) ! type(psb_z_coo_sparse_mat) :: tmpc1, tmpc2 integer(psb_ipk_) :: nz1, nz2, nzh, nz - integer(psb_ipk_) :: ictxt, me, np + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: me, np integer(psb_lpk_) :: i, j, k, nrow, ncol, nlz integer(psb_lpk_), allocatable :: ilv(:) character(len=80) :: aname @@ -760,7 +763,8 @@ subroutine psb_z_simple_glob_transpose(ain,aout,desc_a,info) ! type(psb_z_coo_sparse_mat) :: tmpc1, tmpc2 integer(psb_ipk_) :: nz1, nz2, nzh, nz - integer(psb_ipk_) :: ictxt, me, np + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: me, np integer(psb_lpk_) :: i, j, k, nrow, ncol, nlz integer(psb_lpk_), allocatable :: ilv(:) character(len=80) :: aname @@ -811,7 +815,8 @@ subroutine psb_lz_simple_glob_transpose_ip(ain,desc_a,info) ! type(psb_lz_coo_sparse_mat) :: tmpc1, tmpc2 integer(psb_ipk_) :: nz1, nz2, nzh, nz - integer(psb_ipk_) :: ictxt, me, np + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: me, np integer(psb_lpk_) :: i, j, k, nrow, ncol, nlz integer(psb_lpk_), allocatable :: ilv(:) character(len=80) :: aname @@ -862,7 +867,8 @@ subroutine psb_lz_simple_glob_transpose(ain,aout,desc_a,info) ! type(psb_lz_coo_sparse_mat) :: tmpc1, tmpc2 integer(psb_ipk_) :: nz1, nz2, nzh, nz - integer(psb_ipk_) :: ictxt, me, np + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: me, np integer(psb_lpk_) :: i, j, k, nrow, ncol, nlz integer(psb_lpk_), allocatable :: ilv(:) character(len=80) :: aname diff --git a/base/tools/psb_z_map.f90 b/base/tools/psb_z_map.f90 index 86858c60..b41f1fc9 100644 --- a/base/tools/psb_z_map.f90 +++ b/base/tools/psb_z_map.f90 @@ -51,7 +51,8 @@ subroutine psb_z_map_U2V_a(alpha,x,beta,y,map,info,work) ! complex(psb_dpk_), allocatable :: xt(:), yt(:) integer(psb_ipk_) :: i, j, nr1, nc1,nr2, nc2,& - & map_kind, nr, ictxt + & map_kind, nr + type(psb_ctxt_type) :: ictxt character(len=20), parameter :: name='psb_map_U2V' info = psb_success_ @@ -125,7 +126,8 @@ subroutine psb_z_map_U2V_v(alpha,x,beta,y,map,info,work,vtx,vty) type(psb_z_vect_type),pointer :: ptx, pty complex(psb_dpk_), allocatable :: xta(:), yta(:) integer(psb_ipk_) :: i, j, nr1, nc1,nr2, nc2 ,& - & map_kind, nr, ictxt, iam, np + & map_kind, nr, iam, np + type(psb_ctxt_type) :: ictxt character(len=20), parameter :: name='psb_map_U2V_v' info = psb_success_ @@ -232,7 +234,8 @@ subroutine psb_z_map_V2U_a(alpha,x,beta,y,map,info,work) ! complex(psb_dpk_), allocatable :: xt(:), yt(:) integer(psb_ipk_) :: i, j, nr1, nc1,nr2, nc2,& - & map_kind, nr, ictxt + & map_kind, nr + type(psb_ctxt_type) :: ictxt character(len=20), parameter :: name='psb_map_V2U' info = psb_success_ @@ -305,7 +308,8 @@ subroutine psb_z_map_V2U_v(alpha,x,beta,y,map,info,work,vtx,vty) type(psb_z_vect_type),pointer :: ptx, pty complex(psb_dpk_), allocatable :: xta(:), yta(:) integer(psb_ipk_) :: i, j, nr1, nc1,nr2, nc2,& - & map_kind, nr, ictxt, iam, np + & map_kind, nr, iam, np + type(psb_ctxt_type) :: ictxt character(len=20), parameter :: name='psb_map_V2U_v' info = psb_success_ diff --git a/base/tools/psb_z_par_csr_spspmm.f90 b/base/tools/psb_z_par_csr_spspmm.f90 index 3be9d0e8..c59f183f 100644 --- a/base/tools/psb_z_par_csr_spspmm.f90 +++ b/base/tools/psb_z_par_csr_spspmm.f90 @@ -73,7 +73,8 @@ Subroutine psb_z_par_csr_spspmm(acsr,desc_a,bcsr,ccsr,desc_c,info,data) integer(psb_ipk_), intent(out) :: info integer(psb_ipk_), intent(in), optional :: data ! ...local scalars.... - integer(psb_ipk_) :: ictxt, np,me + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np,me integer(psb_ipk_) :: ncol, nnz type(psb_lz_csr_sparse_mat) :: ltcsr type(psb_z_csr_sparse_mat) :: tcsr @@ -168,7 +169,8 @@ Subroutine psb_lz_par_csr_spspmm(acsr,desc_a,bcsr,ccsr,desc_c,info,data) integer(psb_ipk_), intent(out) :: info integer(psb_ipk_), intent(in), optional :: data ! ...local scalars.... - integer(psb_ipk_) :: ictxt, np,me + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np,me integer(psb_lpk_) :: nacol, nccol, nnz type(psb_lz_csr_sparse_mat) :: tcsr1 logical :: update_desc_c diff --git a/base/tools/psb_zallc.f90 b/base/tools/psb_zallc.f90 index 1bf67e74..1c86b430 100644 --- a/base/tools/psb_zallc.f90 +++ b/base/tools/psb_zallc.f90 @@ -52,7 +52,7 @@ subroutine psb_zalloc_vect(x, desc_a,info) !locals integer(psb_ipk_) :: np,me,nr,i,err_act - integer(psb_ipk_) :: ictxt + type(psb_ctxt_type) :: ictxt integer(psb_ipk_) :: debug_level, debug_unit character(len=20) :: name @@ -133,8 +133,9 @@ subroutine psb_zalloc_vect_r2(x, desc_a,info,n,lb) integer(psb_ipk_), optional, intent(in) :: n,lb !locals + type(psb_ctxt_type) :: ictxt integer(psb_ipk_) :: np,me,nr,i,err_act, n_, lb_ - integer(psb_ipk_) :: ictxt, exch(1) + integer(psb_ipk_) :: exch(1) integer(psb_ipk_) :: debug_level, debug_unit character(len=20) :: name @@ -235,8 +236,9 @@ subroutine psb_zalloc_multivect(x, desc_a,info,n) integer(psb_ipk_), optional, intent(in) :: n !locals + type(psb_ctxt_type) :: ictxt integer(psb_ipk_) :: np,me,nr,i,err_act, n_, lb_ - integer(psb_ipk_) :: ictxt, exch(1) + integer(psb_ipk_) :: exch(1) integer(psb_ipk_) :: debug_level, debug_unit character(len=20) :: name diff --git a/base/tools/psb_zallc_a.f90 b/base/tools/psb_zallc_a.f90 index 9fa7993c..96cbfdf9 100644 --- a/base/tools/psb_zallc_a.f90 +++ b/base/tools/psb_zallc_a.f90 @@ -55,7 +55,8 @@ subroutine psb_zalloc(x, desc_a, info, n, lb) !locals integer(psb_ipk_) :: err,nr,i,j,n_,err_act - integer(psb_ipk_) :: ictxt,np,me + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np,me integer(psb_ipk_) :: exch(3) character(len=20) :: name @@ -183,7 +184,8 @@ subroutine psb_zallocv(x, desc_a,info,n) !locals integer(psb_ipk_) :: nr,i,err_act - integer(psb_ipk_) :: ictxt, np,me + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np,me integer(psb_ipk_) :: debug_level, debug_unit character(len=20) :: name diff --git a/base/tools/psb_zasb.f90 b/base/tools/psb_zasb.f90 index 6ebf4281..883ba129 100644 --- a/base/tools/psb_zasb.f90 +++ b/base/tools/psb_zasb.f90 @@ -62,7 +62,8 @@ subroutine psb_zasb_vect(x, desc_a, info, mold, scratch) logical, intent(in), optional :: scratch ! local variables - integer(psb_ipk_) :: ictxt,np,me + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np,me integer(psb_ipk_) :: i1sz,nrow,ncol, err_act logical :: scratch_ integer(psb_ipk_) :: debug_level, debug_unit @@ -135,7 +136,8 @@ subroutine psb_zasb_vect_r2(x, desc_a, info, mold, scratch) logical, intent(in), optional :: scratch ! local variables - integer(psb_ipk_) :: ictxt,np,me, i, n + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np,me, i, n integer(psb_ipk_) :: i1sz,nrow,ncol, err_act logical :: scratch_ integer(psb_ipk_) :: debug_level, debug_unit @@ -217,7 +219,8 @@ subroutine psb_zasb_multivect(x, desc_a, info, mold, scratch,n) logical, intent(in), optional :: scratch ! local variables - integer(psb_ipk_) :: ictxt,np,me + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np,me integer(psb_ipk_) :: i1sz,nrow,ncol, err_act, n_ logical :: scratch_ diff --git a/base/tools/psb_zasb_a.f90 b/base/tools/psb_zasb_a.f90 index 0492475a..6f0e8221 100644 --- a/base/tools/psb_zasb_a.f90 +++ b/base/tools/psb_zasb_a.f90 @@ -52,7 +52,8 @@ subroutine psb_zasb(x, desc_a, info, scratch) logical, intent(in), optional :: scratch ! local variables - integer(psb_ipk_) :: ictxt,np,me,nrow,ncol, err_act + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np,me,nrow,ncol, err_act integer(psb_ipk_) :: i1sz, i2sz integer(psb_ipk_) :: debug_level, debug_unit logical :: scratch_ @@ -188,7 +189,8 @@ subroutine psb_zasbv(x, desc_a, info, scratch) logical, intent(in), optional :: scratch ! local variables - integer(psb_ipk_) :: ictxt,np,me + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np,me integer(psb_ipk_) :: i1sz,nrow,ncol, err_act integer(psb_ipk_) :: debug_level, debug_unit logical :: scratch_ diff --git a/base/tools/psb_zcdbldext.F90 b/base/tools/psb_zcdbldext.F90 index 528e78f5..f53ad714 100644 --- a/base/tools/psb_zcdbldext.F90 +++ b/base/tools/psb_zcdbldext.F90 @@ -90,7 +90,9 @@ Subroutine psb_zcdbldext(a,desc_a,novr,desc_ov,info, extype) & counter_t,n_elem,i_ovr,jj,proc_id,isz, & & idxr, idxs, iszr, iszs, nxch, nsnd, nrcv,lidx, extype_ integer(psb_lpk_) :: gidx, lnz - integer(psb_mpk_) :: icomm, ictxt, me, np, minfo + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: me, np + integer(psb_mpk_) :: icomm, minfo integer(psb_ipk_), allocatable :: irow(:), icol(:) integer(psb_ipk_), allocatable :: tmp_halo(:),tmp_ovr_idx(:), orig_ovr(:) @@ -701,7 +703,7 @@ Subroutine psb_zcdbldext(a,desc_a,novr,desc_ov,info, extype) call psb_erractionrestore(err_act) return -9999 call psb_error_handler(ione*ictxt,err_act) +9999 call psb_error_handler(ictxt,err_act) return diff --git a/base/tools/psb_zfree.f90 b/base/tools/psb_zfree.f90 index cdb9d047..b544970b 100644 --- a/base/tools/psb_zfree.f90 +++ b/base/tools/psb_zfree.f90 @@ -46,7 +46,8 @@ subroutine psb_zfree_vect(x, desc_a, info) type(psb_desc_type), intent(in) :: desc_a integer(psb_ipk_), intent(out) :: info !...locals.... - integer(psb_ipk_) :: ictxt,np,me,err_act + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np,me,err_act character(len=20) :: name @@ -100,7 +101,8 @@ subroutine psb_zfree_vect_r2(x, desc_a, info) type(psb_desc_type), intent(in) :: desc_a integer(psb_ipk_), intent(out) :: info !...locals.... - integer(psb_ipk_) :: ictxt,np,me,err_act, i + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np,me,err_act, i character(len=20) :: name @@ -152,7 +154,8 @@ subroutine psb_zfree_multivect(x, desc_a, info) type(psb_desc_type), intent(in) :: desc_a integer(psb_ipk_), intent(out) :: info !...locals.... - integer(psb_ipk_) :: ictxt,np,me,err_act + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np,me,err_act character(len=20) :: name diff --git a/base/tools/psb_zfree_a.f90 b/base/tools/psb_zfree_a.f90 index 7dc6498e..c7bd6c00 100644 --- a/base/tools/psb_zfree_a.f90 +++ b/base/tools/psb_zfree_a.f90 @@ -48,7 +48,8 @@ subroutine psb_zfree(x, desc_a, info) integer(psb_ipk_), intent(out) :: info !...locals.... - integer(psb_ipk_) :: ictxt,np,me, err_act + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np,me, err_act character(len=20) :: name name='psb_zfree' @@ -116,7 +117,8 @@ subroutine psb_zfreev(x, desc_a, info) integer(psb_ipk_), intent(out) :: info !...locals.... - integer(psb_ipk_) :: ictxt,np,me, err_act + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np,me, err_act character(len=20) :: name name='psb_zfreev' diff --git a/base/tools/psb_zgetelem.f90 b/base/tools/psb_zgetelem.f90 index 5e7e975f..030c62b8 100644 --- a/base/tools/psb_zgetelem.f90 +++ b/base/tools/psb_zgetelem.f90 @@ -55,7 +55,8 @@ function psb_z_getelem(x,index,desc_a,info) result(res) !locals integer(psb_ipk_) :: localindex(1) - integer(psb_ipk_) :: ictxt, np, me, err_act + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me, err_act integer(psb_lpk_) :: gindex(1) integer(psb_lpk_), allocatable :: myidx(:),mylocal(:) character(len=20) :: name diff --git a/base/tools/psb_zins.f90 b/base/tools/psb_zins.f90 index 8307434b..a5c1edb3 100644 --- a/base/tools/psb_zins.f90 +++ b/base/tools/psb_zins.f90 @@ -63,7 +63,8 @@ subroutine psb_zins_vect(m, irw, val, x, desc_a, info, dupl,local) !locals..... integer(psb_ipk_) :: i, loc_rows,loc_cols integer(psb_lpk_) :: mglob - integer(psb_ipk_) :: ictxt, np, me, dupl_,err_act + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me, dupl_,err_act integer(psb_ipk_), allocatable :: irl(:) logical :: local_ character(len=20) :: name @@ -190,7 +191,8 @@ subroutine psb_zins_vect_v(m, irw, val, x, desc_a, info, dupl,local) !locals..... integer(psb_ipk_) :: i, loc_rows,loc_cols,err_act integer(psb_lpk_) :: mglob - integer(psb_ipk_) :: ictxt, np, me, dupl_ + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me, dupl_ integer(psb_ipk_), allocatable :: irl(:) complex(psb_dpk_), allocatable :: lval(:) logical :: local_ @@ -295,7 +297,8 @@ subroutine psb_zins_vect_r2(m, irw, val, x, desc_a, info, dupl,local) !locals..... integer(psb_ipk_) :: i, loc_rows,loc_cols, n integer(psb_lpk_) :: mglob - integer(psb_ipk_) :: ictxt, np, me, dupl_, err_act + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me, dupl_, err_act integer(psb_ipk_), allocatable :: irl(:) logical :: local_ character(len=20) :: name @@ -409,7 +412,8 @@ subroutine psb_zins_multivect(m, irw, val, x, desc_a, info, dupl,local) !locals..... integer(psb_ipk_) :: i, loc_rows,loc_cols integer(psb_lpk_) :: mglob - integer(psb_ipk_) :: ictxt, np, me, dupl_, err_act + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me, dupl_, err_act integer(psb_ipk_), allocatable :: irl(:) logical :: local_ character(len=20) :: name diff --git a/base/tools/psb_zins_a.f90 b/base/tools/psb_zins_a.f90 index 7db797f8..19d5a869 100644 --- a/base/tools/psb_zins_a.f90 +++ b/base/tools/psb_zins_a.f90 @@ -68,7 +68,8 @@ subroutine psb_zinsvi(m, irw, val, x, desc_a, info, dupl,local) !locals..... integer(psb_ipk_) :: i, loc_rows,loc_cols,err_act integer(psb_lpk_) :: mglob - integer(psb_ipk_) :: ictxt,np, me, dupl_ + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me, dupl_ integer(psb_ipk_), allocatable :: irl(:) logical :: local_ character(len=20) :: name @@ -248,7 +249,8 @@ subroutine psb_zinsi(m, irw, val, x, desc_a, info, dupl,local) !locals..... integer(psb_ipk_) :: i,loc_row,j,n, loc_rows,loc_cols,err_act integer(psb_lpk_) :: mglob - integer(psb_ipk_) :: ictxt,np,me,dupl_ + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np,me,dupl_ integer(psb_ipk_), allocatable :: irl(:) logical :: local_ character(len=20) :: name diff --git a/base/tools/psb_zspalloc.f90 b/base/tools/psb_zspalloc.f90 index 81099dcb..84222f07 100644 --- a/base/tools/psb_zspalloc.f90 +++ b/base/tools/psb_zspalloc.f90 @@ -52,7 +52,8 @@ subroutine psb_zspalloc(a, desc_a, info, nnz) integer(psb_ipk_), optional, intent(in) :: nnz !locals - integer(psb_ipk_) :: ictxt, np, me, err_act + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me, err_act integer(psb_ipk_) :: loc_row,loc_col, nnz_, dectype integer(psb_lpk_) :: m, n integer(psb_ipk_) :: debug_level, debug_unit diff --git a/base/tools/psb_zspasb.f90 b/base/tools/psb_zspasb.f90 index 6cdfc61f..9ec41ecb 100644 --- a/base/tools/psb_zspasb.f90 +++ b/base/tools/psb_zspasb.f90 @@ -62,7 +62,8 @@ subroutine psb_zspasb(a,desc_a, info, afmt, upd, dupl, mold) character(len=*), optional, intent(in) :: afmt class(psb_z_base_sparse_mat), intent(in), optional :: mold !....Locals.... - integer(psb_ipk_) :: ictxt,np,me, err_act + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np,me, err_act integer(psb_ipk_) :: n_row,n_col integer(psb_ipk_) :: debug_level, debug_unit character(len=20) :: name, ch_err diff --git a/base/tools/psb_zspfree.f90 b/base/tools/psb_zspfree.f90 index b002999d..01c1883e 100644 --- a/base/tools/psb_zspfree.f90 +++ b/base/tools/psb_zspfree.f90 @@ -48,7 +48,8 @@ subroutine psb_zspfree(a, desc_a,info) type(psb_zspmat_type), intent(inout) :: a integer(psb_ipk_), intent(out) :: info !...locals.... - integer(psb_ipk_) :: ictxt, err_act + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: err_act character(len=20) :: name info=psb_success_ diff --git a/base/tools/psb_zsphalo.F90 b/base/tools/psb_zsphalo.F90 index a862ce99..1021c726 100644 --- a/base/tools/psb_zsphalo.F90 +++ b/base/tools/psb_zsphalo.F90 @@ -90,7 +90,8 @@ Subroutine psb_zsphalo(a,desc_a,blk,info,rowcnv,colcnv,& character(len=5), optional :: outfmt integer(psb_ipk_), intent(in), optional :: data ! ...local scalars.... - integer(psb_ipk_) :: ictxt, np,me + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np,me integer(psb_ipk_) :: counter,proc,i, & & n_el_send,k,n_el_recv,idx, r, tot_elem,& & n_elem, j, ipx,mat_recv, iszs, iszr,idxs,idxr,nz,& @@ -557,7 +558,8 @@ Subroutine psb_lzsphalo(a,desc_a,blk,info,rowcnv,colcnv,& character(len=5), optional :: outfmt integer(psb_ipk_), intent(in), optional :: data ! ...local scalars.... - integer(psb_ipk_) :: ictxt, np,me + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np,me integer(psb_ipk_) :: counter, proc, i, n_el_send,n_el_recv, & & n_elem, j, ipx,mat_recv, idxs,idxr,nz,& & data_,totxch,nxs, nxr, ncg @@ -900,7 +902,8 @@ Subroutine psb_lz_csr_halo(a,desc_a,blk,info,rowcnv,colcnv,& integer(psb_ipk_), intent(in), optional :: data type(psb_desc_type),Intent(in), optional, target :: col_desc ! ...local scalars.... - integer(psb_ipk_) :: ictxt, np,me + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np,me integer(psb_ipk_) :: counter,proc,i, n_el_send,n_el_recv,& & n_elem, j,ipx,mat_recv, iszs, iszr,idxs,idxr,nz,& & data_,totxch,nxs, nxr, err_act, nsnds, nrcvs @@ -1260,7 +1263,8 @@ Subroutine psb_z_lz_csr_halo(a,desc_a,blk,info,rowcnv,colcnv,& integer(psb_ipk_), intent(in), optional :: data type(psb_desc_type),Intent(in), optional, target :: col_desc ! ...local scalars.... - integer(psb_ipk_) :: ictxt, np,me + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np,me integer(psb_ipk_) :: counter,proc,i, n_el_send,n_el_recv,& & n_elem, j,ipx,mat_recv, iszs, iszr,idxs,idxr,nz,& & data_,totxch,ngtz, idx, nxs, nxr, err_act, & diff --git a/base/tools/psb_zspins.F90 b/base/tools/psb_zspins.F90 index 6926bdc0..e9970ac5 100644 --- a/base/tools/psb_zspins.F90 +++ b/base/tools/psb_zspins.F90 @@ -64,7 +64,8 @@ subroutine psb_zspins(nz,ia,ja,val,a,desc_a,info,rebuild,local) !locals..... integer(psb_ipk_) :: nrow, err_act, ncol, spstate - integer(psb_ipk_) :: ictxt,np,me + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np,me logical, parameter :: debug=.false. integer(psb_ipk_), parameter :: relocsz=200 logical :: rebuild_, local_ @@ -208,7 +209,8 @@ subroutine psb_zspins_csr_lirp(nr,irp,ja,val,irw,a,desc_a,info,rebuild,local) integer(psb_ipk_) :: nrow, err_act, ncol, spstate, nz, i, j integer(psb_lpk_) :: ir - integer(psb_ipk_) :: ictxt,np,me + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np,me logical, parameter :: debug=.false. integer(psb_ipk_), parameter :: relocsz=200 logical :: rebuild_, local_ @@ -306,7 +308,8 @@ subroutine psb_zspins_csr_iirp(nr,irw,irp,ja,val,a,desc_a,info,rebuild,local) integer(psb_ipk_) :: nrow, err_act, ncol, spstate, nz, i, j integer(psb_lpk_) :: ir - integer(psb_ipk_) :: ictxt,np,me + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np,me logical, parameter :: debug=.false. integer(psb_ipk_), parameter :: relocsz=200 logical :: rebuild_, local_ @@ -403,7 +406,8 @@ subroutine psb_zspins_2desc(nz,ia,ja,val,a,desc_ar,desc_ac,info) !locals..... integer(psb_ipk_) :: nrow, err_act, ncol, spstate - integer(psb_ipk_) :: ictxt,np,me + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np,me logical, parameter :: debug=.false. integer(psb_ipk_), parameter :: relocsz=200 integer(psb_ipk_), allocatable :: ila(:),jla(:) @@ -518,7 +522,8 @@ subroutine psb_zspins_v(nz,ia,ja,val,a,desc_a,info,rebuild,local) !locals..... integer(psb_ipk_) :: nrow, err_act, ncol, spstate - integer(psb_ipk_) :: ictxt,np,me + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np,me logical, parameter :: debug=.false. integer(psb_ipk_), parameter :: relocsz=200 logical :: rebuild_, local_ diff --git a/base/tools/psb_zsprn.f90 b/base/tools/psb_zsprn.f90 index aa87a8f0..d7187f86 100644 --- a/base/tools/psb_zsprn.f90 +++ b/base/tools/psb_zsprn.f90 @@ -53,7 +53,8 @@ Subroutine psb_zsprn(a, desc_a,info,clear) logical, intent(in), optional :: clear !locals - integer(psb_ipk_) :: ictxt,np,me,err_act + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np,me,err_act integer(psb_ipk_) :: debug_level, debug_unit character(len=20) :: name logical :: clear_ diff --git a/cbind/base/psb_base_tools_cbind_mod.F90 b/cbind/base/psb_base_tools_cbind_mod.F90 index 6d31778a..b102477a 100644 --- a/cbind/base/psb_base_tools_cbind_mod.F90 +++ b/cbind/base/psb_base_tools_cbind_mod.F90 @@ -33,6 +33,8 @@ contains type(psb_c_object_type) :: cdh type(psb_desc_type), pointer :: descp integer(psb_c_ipk_) :: info + type(psb_ctxt_type) :: ctxt + ctxt%ctxt = ictxt res = -1 if (ng <=0) then @@ -50,7 +52,7 @@ contains allocate(descp,stat=info) if (info < 0) return - call psb_cdall(ictxt,descp,info,vg=vg(1:ng)) + call psb_cdall(ctxt,descp,info,vg=vg(1:ng)) cdh%item = c_loc(descp) res = info @@ -66,6 +68,8 @@ contains type(psb_c_object_type) :: cdh type(psb_desc_type), pointer :: descp integer(psb_c_ipk_) :: info, ixb + type(psb_ctxt_type) :: ctxt + ctxt%ctxt = ictxt res = -1 if (nl <=0) then @@ -86,9 +90,9 @@ contains ixb = psb_c_get_index_base() if (ixb == 1) then - call psb_cdall(ictxt,descp,info,vl=vl(1:nl)) + call psb_cdall(ctxt,descp,info,vl=vl(1:nl)) else - call psb_cdall(ictxt,descp,info,vl=(vl(1:nl)+(1-ixb))) + call psb_cdall(ctxt,descp,info,vl=(vl(1:nl)+(1-ixb))) end if cdh%item = c_loc(descp) res = info @@ -103,6 +107,8 @@ contains type(psb_c_object_type) :: cdh type(psb_desc_type), pointer :: descp integer(psb_c_ipk_) :: info + type(psb_ctxt_type) :: ctxt + ctxt%ctxt = ictxt res = -1 if (nl <=0) then @@ -120,7 +126,7 @@ contains allocate(descp,stat=info) if (info < 0) return - call psb_cdall(ictxt,descp,info,nl=nl) + call psb_cdall(ctxt,descp,info,nl=nl) cdh%item = c_loc(descp) res = info @@ -135,6 +141,8 @@ contains type(psb_c_object_type) :: cdh type(psb_desc_type), pointer :: descp integer(psb_c_ipk_) :: info + type(psb_ctxt_type) :: ctxt + ctxt%ctxt = ictxt res = -1 if (n <=0) then @@ -152,7 +160,7 @@ contains allocate(descp,stat=info) if (info < 0) return - call psb_cdall(ictxt,descp,info,mg=n,repl=.true.) + call psb_cdall(ctxt,descp,info,mg=n,repl=.true.) cdh%item = c_loc(descp) res = info @@ -301,7 +309,8 @@ contains end function psb_c_cd_get_global_cols - function psb_c_cd_get_global_indices(idx,nidx,owned,cdh) bind(c,name='psb_c_cd_get_global_indices') result(res) + function psb_c_cd_get_global_indices(idx,nidx,owned,cdh) & + & bind(c,name='psb_c_cd_get_global_indices') result(res) implicit none integer(psb_c_ipk_) :: res diff --git a/cbind/base/psb_cpenv_mod.f90 b/cbind/base/psb_cpenv_mod.f90 index ac311fa2..1814303d 100644 --- a/cbind/base/psb_cpenv_mod.f90 +++ b/cbind/base/psb_cpenv_mod.f90 @@ -22,7 +22,7 @@ contains end subroutine psb_c_set_index_base function psb_c_get_errstatus() bind(c) result(res) - use psb_base_mod, only : psb_get_errstatus + use psb_base_mod, only : psb_get_errstatus, psb_ctxt_type implicit none integer(psb_c_ipk_) :: res @@ -31,84 +31,101 @@ contains end function psb_c_get_errstatus function psb_c_init() bind(c) - use psb_base_mod, only : psb_init + use psb_base_mod, only : psb_init, psb_ctxt_type implicit none integer(psb_c_ipk_) :: psb_c_init - integer :: ictxt + type(psb_ctxt_type) :: ictxt call psb_init(ictxt) - psb_c_init = ictxt + psb_c_init = ictxt%ctxt end function psb_c_init subroutine psb_c_exit_ctxt(ictxt) bind(c) - use psb_base_mod, only : psb_exit + use psb_base_mod, only : psb_exit, psb_ctxt_type integer(psb_c_ipk_), value :: ictxt - - call psb_exit(ictxt,close=.false.) + + type(psb_ctxt_type) :: ctxt + ctxt%ctxt = ictxt + call psb_exit(ctxt,close=.false.) return end subroutine psb_c_exit_ctxt subroutine psb_c_exit(ictxt) bind(c) - use psb_base_mod, only : psb_exit + use psb_base_mod, only : psb_exit, psb_ctxt_type integer(psb_c_ipk_), value :: ictxt + + type(psb_ctxt_type) :: ctxt + ctxt%ctxt = ictxt - call psb_exit(ictxt) + call psb_exit(ctxt) return end subroutine psb_c_exit subroutine psb_c_abort(ictxt) bind(c) - use psb_base_mod, only : psb_abort + use psb_base_mod, only : psb_abort, psb_ctxt_type integer(psb_c_ipk_), value :: ictxt - call psb_abort(ictxt) + type(psb_ctxt_type) :: ctxt + ctxt%ctxt = ictxt + call psb_abort(ctxt) return end subroutine psb_c_abort subroutine psb_c_info(ictxt,iam,np) bind(c) - use psb_base_mod, only : psb_info + use psb_base_mod, only : psb_info, psb_ctxt_type integer(psb_c_ipk_), value :: ictxt integer(psb_c_ipk_) :: iam,np - call psb_info(ictxt,iam,np) + type(psb_ctxt_type) :: ctxt + ctxt%ctxt = ictxt + call psb_info(ctxt,iam,np) return end subroutine psb_c_info subroutine psb_c_barrier(ictxt) bind(c) - use psb_base_mod, only : psb_barrier + use psb_base_mod, only : psb_barrier, psb_ctxt_type integer(psb_c_ipk_), value :: ictxt - call psb_barrier(ictxt) + type(psb_ctxt_type) :: ctxt + ctxt%ctxt = ictxt + call psb_barrier(ctxt) end subroutine psb_c_barrier real(c_double) function psb_c_wtime() bind(c) - use psb_base_mod, only : psb_wtime + use psb_base_mod, only : psb_wtime, psb_ctxt_type psb_c_wtime = psb_wtime() end function psb_c_wtime subroutine psb_c_mbcast(ictxt,n,v,root) bind(c) - use psb_base_mod, only : psb_bcast + use psb_base_mod, only : psb_bcast, psb_ctxt_type implicit none integer(psb_c_ipk_), value :: ictxt,n, root integer(psb_c_mpk_) :: v(*) + type(psb_ctxt_type) :: ctxt + ctxt%ctxt = ictxt + if (n < 0) then write(0,*) 'Wrong size in BCAST' return end if if (n==0) return - call psb_bcast(ictxt,v(1:n),root=root) + call psb_bcast(ctxt,v(1:n),root=root) end subroutine psb_c_mbcast subroutine psb_c_ibcast(ictxt,n,v,root) bind(c) - use psb_base_mod, only : psb_bcast + use psb_base_mod, only : psb_bcast, psb_ctxt_type implicit none integer(psb_c_ipk_), value :: ictxt,n, root integer(psb_c_ipk_) :: v(*) + type(psb_ctxt_type) :: ctxt + + ctxt%ctxt = ictxt if (n < 0) then write(0,*) 'Wrong size in BCAST' @@ -116,37 +133,41 @@ contains end if if (n==0) return - call psb_bcast(ictxt,v(1:n),root=root) + call psb_bcast(ctxt,v(1:n),root=root) end subroutine psb_c_ibcast subroutine psb_c_lbcast(ictxt,n,v,root) bind(c) - use psb_base_mod, only : psb_bcast + use psb_base_mod, only : psb_bcast, psb_ctxt_type implicit none integer(psb_c_ipk_), value :: ictxt,n, root integer(psb_c_lpk_) :: v(*) - + type(psb_ctxt_type) :: ctxt + ctxt%ctxt = ictxt + if (n < 0) then write(0,*) 'Wrong size in BCAST' return end if if (n==0) return - call psb_bcast(ictxt,v(1:n),root=root) + call psb_bcast(ctxt,v(1:n),root=root) end subroutine psb_c_lbcast subroutine psb_c_ebcast(ictxt,n,v,root) bind(c) - use psb_base_mod, only : psb_bcast + use psb_base_mod, only : psb_bcast, psb_ctxt_type implicit none integer(psb_c_ipk_), value :: ictxt,n, root integer(psb_c_epk_) :: v(*) - + type(psb_ctxt_type) :: ctxt + ctxt%ctxt = ictxt + if (n < 0) then write(0,*) 'Wrong size in BCAST' return end if if (n==0) return - call psb_bcast(ictxt,v(1:n),root=root) + call psb_bcast(ctxt,v(1:n),root=root) end subroutine psb_c_ebcast subroutine psb_c_sbcast(ictxt,n,v,root) bind(c) @@ -154,6 +175,8 @@ contains implicit none integer(psb_c_ipk_), value :: ictxt,n, root real(c_float) :: v(*) + type(psb_ctxt_type) :: ctxt + ctxt%ctxt = ictxt if (n < 0) then write(0,*) 'Wrong size in BCAST' @@ -161,14 +184,16 @@ contains end if if (n==0) return - call psb_bcast(ictxt,v(1:n),root=root) + call psb_bcast(ctxt,v(1:n),root=root) end subroutine psb_c_sbcast subroutine psb_c_dbcast(ictxt,n,v,root) bind(c) - use psb_base_mod, only : psb_bcast + use psb_base_mod, only : psb_bcast, psb_ctxt_type implicit none integer(psb_c_ipk_), value :: ictxt,n, root real(c_double) :: v(*) + type(psb_ctxt_type) :: ctxt + ctxt%ctxt = ictxt if (n < 0) then write(0,*) 'Wrong size in BCAST' @@ -176,15 +201,17 @@ contains end if if (n==0) return - call psb_bcast(ictxt,v(1:n),root=root) + call psb_bcast(ctxt,v(1:n),root=root) end subroutine psb_c_dbcast subroutine psb_c_cbcast(ictxt,n,v,root) bind(c) - use psb_base_mod, only : psb_bcast + use psb_base_mod, only : psb_bcast, psb_ctxt_type implicit none integer(psb_c_ipk_), value :: ictxt,n, root complex(c_float_complex) :: v(*) + type(psb_ctxt_type) :: ctxt + ctxt%ctxt = ictxt if (n < 0) then write(0,*) 'Wrong size in BCAST' @@ -192,7 +219,7 @@ contains end if if (n==0) return - call psb_bcast(ictxt,v(1:n),root=root) + call psb_bcast(ctxt,v(1:n),root=root) end subroutine psb_c_cbcast subroutine psb_c_zbcast(ictxt,n,v,root) bind(c) @@ -200,6 +227,8 @@ contains implicit none integer(psb_c_ipk_), value :: ictxt,n, root complex(c_double_complex) :: v(*) + type(psb_ctxt_type) :: ctxt + ctxt%ctxt = ictxt if (n < 0) then write(0,*) 'Wrong size in BCAST' @@ -207,17 +236,19 @@ contains end if if (n==0) return - call psb_bcast(ictxt,v(1:n),root=root) + call psb_bcast(ctxt,v(1:n),root=root) end subroutine psb_c_zbcast subroutine psb_c_hbcast(ictxt,v,root) bind(c) - use psb_base_mod, only : psb_bcast, psb_info, psb_ipk_ + use psb_base_mod, only : psb_bcast, psb_info, psb_ipk_, psb_ctxt_type implicit none integer(psb_c_ipk_), value :: ictxt, root character(c_char) :: v(*) integer(psb_ipk_) :: iam, np, n + type(psb_ctxt_type) :: ctxt + ctxt%ctxt = ictxt - call psb_info(ictxt,iam,np) + call psb_info(ctxt,iam,np) if (iam==root) then n = 1 @@ -226,12 +257,12 @@ contains n = n + 1 end do end if - call psb_bcast(ictxt,n,root=root) - call psb_bcast(ictxt,v(1:n),root=root) + call psb_bcast(ctxt,n,root=root) + call psb_bcast(ctxt,v(1:n),root=root) end subroutine psb_c_hbcast function psb_c_f2c_errmsg(cmesg,len) bind(c) result(res) - use psb_base_mod, only : psb_errpop,psb_max_errmsg_len_ + use psb_base_mod, only : psb_errpop,psb_max_errmsg_len_, psb_ctxt_type use psb_base_string_cbind_mod implicit none character(c_char), intent(inout) :: cmesg(*) @@ -261,17 +292,17 @@ contains end function psb_c_f2c_errmsg subroutine psb_c_seterraction_ret() bind(c) - use psb_base_mod, only : psb_set_erraction, psb_act_ret_ + use psb_base_mod, only : psb_set_erraction, psb_act_ret_, psb_ctxt_type call psb_set_erraction(psb_act_ret_) end subroutine psb_c_seterraction_ret subroutine psb_c_seterraction_print() bind(c) - use psb_base_mod, only : psb_set_erraction, psb_act_print_ + use psb_base_mod, only : psb_set_erraction, psb_act_print_, psb_ctxt_type call psb_set_erraction(psb_act_print_) end subroutine psb_c_seterraction_print subroutine psb_c_seterraction_abort() bind(c) - use psb_base_mod, only : psb_set_erraction, psb_act_abort_ + use psb_base_mod, only : psb_set_erraction, psb_act_abort_, psb_ctxt_type call psb_set_erraction(psb_act_abort_) end subroutine psb_c_seterraction_abort diff --git a/cbind/prec/psb_cprec_cbind_mod.f90 b/cbind/prec/psb_cprec_cbind_mod.f90 index 94c34f16..25c545de 100644 --- a/cbind/prec/psb_cprec_cbind_mod.f90 +++ b/cbind/prec/psb_cprec_cbind_mod.f90 @@ -26,6 +26,8 @@ contains type(psb_cprec_type), pointer :: precp integer(psb_c_ipk_) :: info character(len=80) :: fptype + type(psb_ctxt_type) :: ctxt + ctxt%ctxt = ictxt res = -1 if (c_associated(ph%item)) then @@ -38,7 +40,7 @@ contains call stringc2f(ptype,fptype) - call psb_precinit(ictxt,precp,fptype,info) + call psb_precinit(ctxt,precp,fptype,info) res = min(0,info) return diff --git a/cbind/prec/psb_dprec_cbind_mod.f90 b/cbind/prec/psb_dprec_cbind_mod.f90 index d1625ad9..b311f890 100644 --- a/cbind/prec/psb_dprec_cbind_mod.f90 +++ b/cbind/prec/psb_dprec_cbind_mod.f90 @@ -26,6 +26,8 @@ contains type(psb_dprec_type), pointer :: precp integer(psb_c_ipk_) :: info character(len=80) :: fptype + type(psb_ctxt_type) :: ctxt + ctxt%ctxt = ictxt res = -1 if (c_associated(ph%item)) then @@ -38,7 +40,7 @@ contains call stringc2f(ptype,fptype) - call psb_precinit(ictxt,precp,fptype,info) + call psb_precinit(ctxt,precp,fptype,info) res = min(0,info) return diff --git a/cbind/prec/psb_sprec_cbind_mod.f90 b/cbind/prec/psb_sprec_cbind_mod.f90 index 5fb8a807..91854bcd 100644 --- a/cbind/prec/psb_sprec_cbind_mod.f90 +++ b/cbind/prec/psb_sprec_cbind_mod.f90 @@ -26,6 +26,8 @@ contains type(psb_sprec_type), pointer :: precp integer(psb_c_ipk_) :: info character(len=80) :: fptype + type(psb_ctxt_type) :: ctxt + ctxt%ctxt = ictxt res = -1 if (c_associated(ph%item)) then @@ -38,7 +40,7 @@ contains call stringc2f(ptype,fptype) - call psb_precinit(ictxt,precp,fptype,info) + call psb_precinit(ctxt,precp,fptype,info) res = min(0,info) return diff --git a/cbind/prec/psb_zprec_cbind_mod.f90 b/cbind/prec/psb_zprec_cbind_mod.f90 index 36755d23..15068ab0 100644 --- a/cbind/prec/psb_zprec_cbind_mod.f90 +++ b/cbind/prec/psb_zprec_cbind_mod.f90 @@ -26,6 +26,8 @@ contains type(psb_zprec_type), pointer :: precp integer(psb_c_ipk_) :: info character(len=80) :: fptype + type(psb_ctxt_type) :: ctxt + ctxt%ctxt = ictxt res = -1 if (c_associated(ph%item)) then @@ -38,7 +40,7 @@ contains call stringc2f(ptype,fptype) - call psb_precinit(ictxt,precp,fptype,info) + call psb_precinit(ctxt,precp,fptype,info) res = min(0,info) return diff --git a/krylov/psb_base_krylov_conv_mod.f90 b/krylov/psb_base_krylov_conv_mod.f90 index 5139157d..292e86ac 100644 --- a/krylov/psb_base_krylov_conv_mod.f90 +++ b/krylov/psb_base_krylov_conv_mod.f90 @@ -146,7 +146,8 @@ contains real(psb_dpk_), optional, intent(out) :: err integer(psb_ipk_), optional, intent(out) :: iter - integer(psb_ipk_) :: ictxt, me, np, err_act, itrace + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: me, np, err_act, itrace real(psb_dpk_) :: errnum, errden, eps character(len=20) :: name diff --git a/krylov/psb_c_krylov_conv_mod.f90 b/krylov/psb_c_krylov_conv_mod.f90 index 0eb44aab..20f96e28 100644 --- a/krylov/psb_c_krylov_conv_mod.f90 +++ b/krylov/psb_c_krylov_conv_mod.f90 @@ -61,7 +61,8 @@ contains type(psb_itconv_type) :: stopdat integer(psb_ipk_), intent(out) :: info - integer(psb_ipk_) :: ictxt, me, np, err_act + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: me, np, err_act character(len=20) :: name complex(psb_spk_), allocatable :: r(:) @@ -134,7 +135,8 @@ contains logical :: res integer(psb_ipk_), intent(out) :: info - integer(psb_ipk_) :: ictxt, me, np, err_act + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: me, np, err_act character(len=20) :: name info = psb_success_ @@ -212,7 +214,8 @@ contains type(psb_itconv_type) :: stopdat integer(psb_ipk_), intent(out) :: info - integer(psb_ipk_) :: ictxt, me, np, err_act + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: me, np, err_act character(len=20) :: name type(psb_c_vect_type) :: r @@ -284,7 +287,8 @@ contains logical :: res integer(psb_ipk_), intent(out) :: info - integer(psb_ipk_) :: ictxt, me, np, err_act + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: me, np, err_act character(len=20) :: name info = psb_success_ diff --git a/krylov/psb_cbicg.f90 b/krylov/psb_cbicg.f90 index fbcc2d03..2f219782 100644 --- a/krylov/psb_cbicg.f90 +++ b/krylov/psb_cbicg.f90 @@ -123,7 +123,8 @@ subroutine psb_cbicg_vect(a,prec,b,x,eps,desc_a,info,& logical, parameter :: exchange=.true., noexchange=.false. integer(psb_ipk_), parameter :: irmax = 8 integer(psb_ipk_) :: itx - integer(psb_ipk_) :: ictxt, np, me + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me complex(psb_spk_) :: alpha, beta, rho, rho_old, sigma real(psb_dpk_) :: derr type(psb_itconv_type) :: stopdat diff --git a/krylov/psb_ccg.F90 b/krylov/psb_ccg.F90 index 41f64c77..7c855926 100644 --- a/krylov/psb_ccg.F90 +++ b/krylov/psb_ccg.F90 @@ -122,7 +122,8 @@ subroutine psb_ccg_vect(a,prec,b,x,eps,desc_a,info,& & n_col, n_row,err_act, ieg,nspl, istebz integer(psb_lpk_) :: mglob integer(psb_ipk_) :: debug_level, debug_unit - integer(psb_ipk_) :: np, me, ictxt + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me real(psb_dpk_) :: derr type(psb_itconv_type) :: stopdat logical :: do_cond diff --git a/krylov/psb_ccgs.f90 b/krylov/psb_ccgs.f90 index 240f98e6..bf4de563 100644 --- a/krylov/psb_ccgs.f90 +++ b/krylov/psb_ccgs.f90 @@ -117,7 +117,8 @@ Subroutine psb_ccgs_vect(a,prec,b,x,eps,desc_a,info,& integer(psb_ipk_) :: itmax_, naux, it, itrace_,& & n_row, n_col,istop_, itx, err_act integer(psb_lpk_) :: mglob - integer(psb_ipk_) :: np, me, ictxt + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me integer(psb_ipk_) :: debug_level, debug_unit complex(psb_spk_) :: alpha, beta, rho, rho_old, sigma real(psb_dpk_) :: derr diff --git a/krylov/psb_ccgstab.f90 b/krylov/psb_ccgstab.f90 index c8c1709c..06e6bb24 100644 --- a/krylov/psb_ccgstab.f90 +++ b/krylov/psb_ccgstab.f90 @@ -121,7 +121,8 @@ Subroutine psb_ccgstab_vect(a,prec,b,x,eps,desc_a,info,itmax,iter,err,itrace,ist integer(psb_ipk_), Parameter :: irmax = 8 integer(psb_ipk_) :: itx, err_act, i integer(psb_ipk_) :: istop_ - integer(psb_ipk_) :: ictxt, np, me + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me real(psb_dpk_) :: derr complex(psb_spk_) :: alpha, beta, rho, rho_old, sigma, omega, tau type(psb_itconv_type) :: stopdat diff --git a/krylov/psb_ccgstabl.f90 b/krylov/psb_ccgstabl.f90 index 4c6dc896..2e829575 100644 --- a/krylov/psb_ccgstabl.f90 +++ b/krylov/psb_ccgstabl.f90 @@ -134,7 +134,8 @@ Subroutine psb_ccgstabl_vect(a,prec,b,x,eps,desc_a,info,& integer(psb_ipk_), Parameter :: irmax = 8 integer(psb_ipk_) :: itx, i, istop_,j, k integer(psb_ipk_) :: debug_level, debug_unit - integer(psb_ipk_) :: ictxt, np, me + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me complex(psb_spk_) :: alpha, beta, rho, rho_old, rni, xni, bni, ani,bn2,& & omega real(psb_dpk_) :: derr diff --git a/krylov/psb_cfcg.F90 b/krylov/psb_cfcg.F90 index 73b221d3..a90c4d67 100644 --- a/krylov/psb_cfcg.F90 +++ b/krylov/psb_cfcg.F90 @@ -128,7 +128,8 @@ subroutine psb_cfcg_vect(a,prec,b,x,eps,desc_a,info,& integer(psb_ipk_) :: n_col, naux, err_act integer(psb_lpk_) :: mglob integer(psb_ipk_) :: debug_level, debug_unit - integer(psb_ipk_) :: np, me, ictxt + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me complex(psb_spk_), allocatable, target :: aux(:) complex(psb_spk_) :: vres(3) character(len=20) :: name diff --git a/krylov/psb_cgcr.f90 b/krylov/psb_cgcr.f90 index a59b15a1..82fb99c0 100644 --- a/krylov/psb_cgcr.f90 +++ b/krylov/psb_cgcr.f90 @@ -133,7 +133,8 @@ subroutine psb_cgcr_vect(a,prec,b,x,eps,desc_a,info,& integer(psb_ipk_) :: n_col, naux, err_act integer(psb_lpk_) :: mglob integer(psb_ipk_) :: debug_level, debug_unit - integer(psb_ipk_) :: np, me, ictxt + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me integer(psb_ipk_) :: i, j, it, itx, istop_, itmax_, itrace_, nl, m, nrst complex(psb_spk_) :: hjj complex(psb_spk_), allocatable, target :: aux(:) diff --git a/krylov/psb_ckrylov.f90 b/krylov/psb_ckrylov.f90 index e9f12ea1..67702e5e 100644 --- a/krylov/psb_ckrylov.f90 +++ b/krylov/psb_ckrylov.f90 @@ -152,7 +152,8 @@ Subroutine psb_ckrylov_vect(method,a,prec,b,x,eps,desc_a,info,& procedure(psb_ckryl_cond_vect) :: psb_ccg_vect, psb_cfcg_vect logical :: do_alloc_wrk - integer(psb_ipk_) :: ictxt,me,np,err_act, itrace_ + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: me,np,err_act, itrace_ character(len=20) :: name info = psb_success_ diff --git a/krylov/psb_crgmres.f90 b/krylov/psb_crgmres.f90 index 9e20350f..1b062944 100644 --- a/krylov/psb_crgmres.f90 +++ b/krylov/psb_crgmres.f90 @@ -137,7 +137,8 @@ subroutine psb_crgmres_vect(a,prec,b,x,eps,desc_a,info,& integer(psb_ipk_), Parameter :: irmax = 8 integer(psb_ipk_) :: itx, i, istop_, err_act integer(psb_ipk_) :: debug_level, debug_unit - integer(psb_ipk_) :: ictxt, np, me + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me Real(psb_spk_) :: rni, xni, bni, ani,bn2, dt, r0n2 real(psb_dpk_) :: errnum, errden, deps, derr character(len=20) :: name diff --git a/krylov/psb_d_krylov_conv_mod.f90 b/krylov/psb_d_krylov_conv_mod.f90 index d275bdbc..d0890584 100644 --- a/krylov/psb_d_krylov_conv_mod.f90 +++ b/krylov/psb_d_krylov_conv_mod.f90 @@ -61,7 +61,8 @@ contains type(psb_itconv_type) :: stopdat integer(psb_ipk_), intent(out) :: info - integer(psb_ipk_) :: ictxt, me, np, err_act + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: me, np, err_act character(len=20) :: name real(psb_dpk_), allocatable :: r(:) @@ -134,7 +135,8 @@ contains logical :: res integer(psb_ipk_), intent(out) :: info - integer(psb_ipk_) :: ictxt, me, np, err_act + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: me, np, err_act character(len=20) :: name info = psb_success_ @@ -212,7 +214,8 @@ contains type(psb_itconv_type) :: stopdat integer(psb_ipk_), intent(out) :: info - integer(psb_ipk_) :: ictxt, me, np, err_act + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: me, np, err_act character(len=20) :: name type(psb_d_vect_type) :: r @@ -284,7 +287,8 @@ contains logical :: res integer(psb_ipk_), intent(out) :: info - integer(psb_ipk_) :: ictxt, me, np, err_act + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: me, np, err_act character(len=20) :: name info = psb_success_ diff --git a/krylov/psb_dbicg.f90 b/krylov/psb_dbicg.f90 index abea8b86..3b81275b 100644 --- a/krylov/psb_dbicg.f90 +++ b/krylov/psb_dbicg.f90 @@ -123,7 +123,8 @@ subroutine psb_dbicg_vect(a,prec,b,x,eps,desc_a,info,& logical, parameter :: exchange=.true., noexchange=.false. integer(psb_ipk_), parameter :: irmax = 8 integer(psb_ipk_) :: itx - integer(psb_ipk_) :: ictxt, np, me + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me real(psb_dpk_) :: alpha, beta, rho, rho_old, sigma real(psb_dpk_) :: derr type(psb_itconv_type) :: stopdat diff --git a/krylov/psb_dcg.F90 b/krylov/psb_dcg.F90 index 2166ff39..94678aac 100644 --- a/krylov/psb_dcg.F90 +++ b/krylov/psb_dcg.F90 @@ -122,7 +122,8 @@ subroutine psb_dcg_vect(a,prec,b,x,eps,desc_a,info,& & n_col, n_row,err_act, ieg,nspl, istebz integer(psb_lpk_) :: mglob integer(psb_ipk_) :: debug_level, debug_unit - integer(psb_ipk_) :: np, me, ictxt + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me real(psb_dpk_) :: derr type(psb_itconv_type) :: stopdat logical :: do_cond diff --git a/krylov/psb_dcgs.f90 b/krylov/psb_dcgs.f90 index 0545483d..0fa922d6 100644 --- a/krylov/psb_dcgs.f90 +++ b/krylov/psb_dcgs.f90 @@ -117,7 +117,8 @@ Subroutine psb_dcgs_vect(a,prec,b,x,eps,desc_a,info,& integer(psb_ipk_) :: itmax_, naux, it, itrace_,& & n_row, n_col,istop_, itx, err_act integer(psb_lpk_) :: mglob - integer(psb_ipk_) :: np, me, ictxt + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me integer(psb_ipk_) :: debug_level, debug_unit real(psb_dpk_) :: alpha, beta, rho, rho_old, sigma real(psb_dpk_) :: derr diff --git a/krylov/psb_dcgstab.f90 b/krylov/psb_dcgstab.f90 index 449e5511..27136ca2 100644 --- a/krylov/psb_dcgstab.f90 +++ b/krylov/psb_dcgstab.f90 @@ -121,7 +121,8 @@ Subroutine psb_dcgstab_vect(a,prec,b,x,eps,desc_a,info,itmax,iter,err,itrace,ist integer(psb_ipk_), Parameter :: irmax = 8 integer(psb_ipk_) :: itx, err_act, i integer(psb_ipk_) :: istop_ - integer(psb_ipk_) :: ictxt, np, me + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me real(psb_dpk_) :: derr real(psb_dpk_) :: alpha, beta, rho, rho_old, sigma, omega, tau type(psb_itconv_type) :: stopdat diff --git a/krylov/psb_dcgstabl.f90 b/krylov/psb_dcgstabl.f90 index ca8a6fe0..2e8a895b 100644 --- a/krylov/psb_dcgstabl.f90 +++ b/krylov/psb_dcgstabl.f90 @@ -134,7 +134,8 @@ Subroutine psb_dcgstabl_vect(a,prec,b,x,eps,desc_a,info,& integer(psb_ipk_), Parameter :: irmax = 8 integer(psb_ipk_) :: itx, i, istop_,j, k integer(psb_ipk_) :: debug_level, debug_unit - integer(psb_ipk_) :: ictxt, np, me + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me real(psb_dpk_) :: alpha, beta, rho, rho_old, rni, xni, bni, ani,bn2,& & omega real(psb_dpk_) :: derr diff --git a/krylov/psb_dfcg.F90 b/krylov/psb_dfcg.F90 index 990d70ec..22e1f2ee 100644 --- a/krylov/psb_dfcg.F90 +++ b/krylov/psb_dfcg.F90 @@ -128,7 +128,8 @@ subroutine psb_dfcg_vect(a,prec,b,x,eps,desc_a,info,& integer(psb_ipk_) :: n_col, naux, err_act integer(psb_lpk_) :: mglob integer(psb_ipk_) :: debug_level, debug_unit - integer(psb_ipk_) :: np, me, ictxt + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me real(psb_dpk_), allocatable, target :: aux(:) real(psb_dpk_) :: vres(3) character(len=20) :: name diff --git a/krylov/psb_dgcr.f90 b/krylov/psb_dgcr.f90 index 59c5e243..42c24b40 100644 --- a/krylov/psb_dgcr.f90 +++ b/krylov/psb_dgcr.f90 @@ -133,7 +133,8 @@ subroutine psb_dgcr_vect(a,prec,b,x,eps,desc_a,info,& integer(psb_ipk_) :: n_col, naux, err_act integer(psb_lpk_) :: mglob integer(psb_ipk_) :: debug_level, debug_unit - integer(psb_ipk_) :: np, me, ictxt + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me integer(psb_ipk_) :: i, j, it, itx, istop_, itmax_, itrace_, nl, m, nrst real(psb_dpk_) :: hjj real(psb_dpk_), allocatable, target :: aux(:) diff --git a/krylov/psb_dkrylov.f90 b/krylov/psb_dkrylov.f90 index a1fe405a..2beb922c 100644 --- a/krylov/psb_dkrylov.f90 +++ b/krylov/psb_dkrylov.f90 @@ -152,7 +152,8 @@ Subroutine psb_dkrylov_vect(method,a,prec,b,x,eps,desc_a,info,& procedure(psb_dkryl_cond_vect) :: psb_dcg_vect, psb_dfcg_vect logical :: do_alloc_wrk - integer(psb_ipk_) :: ictxt,me,np,err_act, itrace_ + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: me,np,err_act, itrace_ character(len=20) :: name info = psb_success_ diff --git a/krylov/psb_drgmres.f90 b/krylov/psb_drgmres.f90 index f30b3391..0e2a3ef7 100644 --- a/krylov/psb_drgmres.f90 +++ b/krylov/psb_drgmres.f90 @@ -137,7 +137,8 @@ subroutine psb_drgmres_vect(a,prec,b,x,eps,desc_a,info,& integer(psb_ipk_), Parameter :: irmax = 8 integer(psb_ipk_) :: itx, i, istop_, err_act integer(psb_ipk_) :: debug_level, debug_unit - integer(psb_ipk_) :: ictxt, np, me + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me Real(psb_dpk_) :: rni, xni, bni, ani,bn2, dt, r0n2 real(psb_dpk_) :: errnum, errden, deps, derr character(len=20) :: name diff --git a/krylov/psb_s_krylov_conv_mod.f90 b/krylov/psb_s_krylov_conv_mod.f90 index ede2eb75..19d84930 100644 --- a/krylov/psb_s_krylov_conv_mod.f90 +++ b/krylov/psb_s_krylov_conv_mod.f90 @@ -61,7 +61,8 @@ contains type(psb_itconv_type) :: stopdat integer(psb_ipk_), intent(out) :: info - integer(psb_ipk_) :: ictxt, me, np, err_act + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: me, np, err_act character(len=20) :: name real(psb_spk_), allocatable :: r(:) @@ -134,7 +135,8 @@ contains logical :: res integer(psb_ipk_), intent(out) :: info - integer(psb_ipk_) :: ictxt, me, np, err_act + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: me, np, err_act character(len=20) :: name info = psb_success_ @@ -212,7 +214,8 @@ contains type(psb_itconv_type) :: stopdat integer(psb_ipk_), intent(out) :: info - integer(psb_ipk_) :: ictxt, me, np, err_act + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: me, np, err_act character(len=20) :: name type(psb_s_vect_type) :: r @@ -284,7 +287,8 @@ contains logical :: res integer(psb_ipk_), intent(out) :: info - integer(psb_ipk_) :: ictxt, me, np, err_act + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: me, np, err_act character(len=20) :: name info = psb_success_ diff --git a/krylov/psb_sbicg.f90 b/krylov/psb_sbicg.f90 index f5f54387..ee2b0cf4 100644 --- a/krylov/psb_sbicg.f90 +++ b/krylov/psb_sbicg.f90 @@ -123,7 +123,8 @@ subroutine psb_sbicg_vect(a,prec,b,x,eps,desc_a,info,& logical, parameter :: exchange=.true., noexchange=.false. integer(psb_ipk_), parameter :: irmax = 8 integer(psb_ipk_) :: itx - integer(psb_ipk_) :: ictxt, np, me + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me real(psb_spk_) :: alpha, beta, rho, rho_old, sigma real(psb_dpk_) :: derr type(psb_itconv_type) :: stopdat diff --git a/krylov/psb_scg.F90 b/krylov/psb_scg.F90 index cbb41e3b..2df33788 100644 --- a/krylov/psb_scg.F90 +++ b/krylov/psb_scg.F90 @@ -122,7 +122,8 @@ subroutine psb_scg_vect(a,prec,b,x,eps,desc_a,info,& & n_col, n_row,err_act, ieg,nspl, istebz integer(psb_lpk_) :: mglob integer(psb_ipk_) :: debug_level, debug_unit - integer(psb_ipk_) :: np, me, ictxt + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me real(psb_dpk_) :: derr type(psb_itconv_type) :: stopdat logical :: do_cond diff --git a/krylov/psb_scgs.f90 b/krylov/psb_scgs.f90 index b45d6b9d..40095ff6 100644 --- a/krylov/psb_scgs.f90 +++ b/krylov/psb_scgs.f90 @@ -117,7 +117,8 @@ Subroutine psb_scgs_vect(a,prec,b,x,eps,desc_a,info,& integer(psb_ipk_) :: itmax_, naux, it, itrace_,& & n_row, n_col,istop_, itx, err_act integer(psb_lpk_) :: mglob - integer(psb_ipk_) :: np, me, ictxt + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me integer(psb_ipk_) :: debug_level, debug_unit real(psb_spk_) :: alpha, beta, rho, rho_old, sigma real(psb_dpk_) :: derr diff --git a/krylov/psb_scgstab.f90 b/krylov/psb_scgstab.f90 index 62eb965a..ecb1de1b 100644 --- a/krylov/psb_scgstab.f90 +++ b/krylov/psb_scgstab.f90 @@ -121,7 +121,8 @@ Subroutine psb_scgstab_vect(a,prec,b,x,eps,desc_a,info,itmax,iter,err,itrace,ist integer(psb_ipk_), Parameter :: irmax = 8 integer(psb_ipk_) :: itx, err_act, i integer(psb_ipk_) :: istop_ - integer(psb_ipk_) :: ictxt, np, me + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me real(psb_dpk_) :: derr real(psb_spk_) :: alpha, beta, rho, rho_old, sigma, omega, tau type(psb_itconv_type) :: stopdat diff --git a/krylov/psb_scgstabl.f90 b/krylov/psb_scgstabl.f90 index 5c53781d..ea5d26b1 100644 --- a/krylov/psb_scgstabl.f90 +++ b/krylov/psb_scgstabl.f90 @@ -134,7 +134,8 @@ Subroutine psb_scgstabl_vect(a,prec,b,x,eps,desc_a,info,& integer(psb_ipk_), Parameter :: irmax = 8 integer(psb_ipk_) :: itx, i, istop_,j, k integer(psb_ipk_) :: debug_level, debug_unit - integer(psb_ipk_) :: ictxt, np, me + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me real(psb_spk_) :: alpha, beta, rho, rho_old, rni, xni, bni, ani,bn2,& & omega real(psb_dpk_) :: derr diff --git a/krylov/psb_sfcg.F90 b/krylov/psb_sfcg.F90 index 6c233f0e..67685c98 100644 --- a/krylov/psb_sfcg.F90 +++ b/krylov/psb_sfcg.F90 @@ -128,7 +128,8 @@ subroutine psb_sfcg_vect(a,prec,b,x,eps,desc_a,info,& integer(psb_ipk_) :: n_col, naux, err_act integer(psb_lpk_) :: mglob integer(psb_ipk_) :: debug_level, debug_unit - integer(psb_ipk_) :: np, me, ictxt + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me real(psb_spk_), allocatable, target :: aux(:) real(psb_spk_) :: vres(3) character(len=20) :: name diff --git a/krylov/psb_sgcr.f90 b/krylov/psb_sgcr.f90 index ce11c389..b26cf80e 100644 --- a/krylov/psb_sgcr.f90 +++ b/krylov/psb_sgcr.f90 @@ -133,7 +133,8 @@ subroutine psb_sgcr_vect(a,prec,b,x,eps,desc_a,info,& integer(psb_ipk_) :: n_col, naux, err_act integer(psb_lpk_) :: mglob integer(psb_ipk_) :: debug_level, debug_unit - integer(psb_ipk_) :: np, me, ictxt + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me integer(psb_ipk_) :: i, j, it, itx, istop_, itmax_, itrace_, nl, m, nrst real(psb_spk_) :: hjj real(psb_spk_), allocatable, target :: aux(:) diff --git a/krylov/psb_skrylov.f90 b/krylov/psb_skrylov.f90 index e2c02732..38a1ae77 100644 --- a/krylov/psb_skrylov.f90 +++ b/krylov/psb_skrylov.f90 @@ -152,7 +152,8 @@ Subroutine psb_skrylov_vect(method,a,prec,b,x,eps,desc_a,info,& procedure(psb_skryl_cond_vect) :: psb_scg_vect, psb_sfcg_vect logical :: do_alloc_wrk - integer(psb_ipk_) :: ictxt,me,np,err_act, itrace_ + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: me,np,err_act, itrace_ character(len=20) :: name info = psb_success_ diff --git a/krylov/psb_srgmres.f90 b/krylov/psb_srgmres.f90 index f6443c30..b7ae8d08 100644 --- a/krylov/psb_srgmres.f90 +++ b/krylov/psb_srgmres.f90 @@ -137,7 +137,8 @@ subroutine psb_srgmres_vect(a,prec,b,x,eps,desc_a,info,& integer(psb_ipk_), Parameter :: irmax = 8 integer(psb_ipk_) :: itx, i, istop_, err_act integer(psb_ipk_) :: debug_level, debug_unit - integer(psb_ipk_) :: ictxt, np, me + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me Real(psb_spk_) :: rni, xni, bni, ani,bn2, dt, r0n2 real(psb_dpk_) :: errnum, errden, deps, derr character(len=20) :: name diff --git a/krylov/psb_z_krylov_conv_mod.f90 b/krylov/psb_z_krylov_conv_mod.f90 index 333dd031..af236e54 100644 --- a/krylov/psb_z_krylov_conv_mod.f90 +++ b/krylov/psb_z_krylov_conv_mod.f90 @@ -61,7 +61,8 @@ contains type(psb_itconv_type) :: stopdat integer(psb_ipk_), intent(out) :: info - integer(psb_ipk_) :: ictxt, me, np, err_act + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: me, np, err_act character(len=20) :: name complex(psb_dpk_), allocatable :: r(:) @@ -134,7 +135,8 @@ contains logical :: res integer(psb_ipk_), intent(out) :: info - integer(psb_ipk_) :: ictxt, me, np, err_act + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: me, np, err_act character(len=20) :: name info = psb_success_ @@ -212,7 +214,8 @@ contains type(psb_itconv_type) :: stopdat integer(psb_ipk_), intent(out) :: info - integer(psb_ipk_) :: ictxt, me, np, err_act + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: me, np, err_act character(len=20) :: name type(psb_z_vect_type) :: r @@ -284,7 +287,8 @@ contains logical :: res integer(psb_ipk_), intent(out) :: info - integer(psb_ipk_) :: ictxt, me, np, err_act + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: me, np, err_act character(len=20) :: name info = psb_success_ diff --git a/krylov/psb_zbicg.f90 b/krylov/psb_zbicg.f90 index d216c93c..223e6998 100644 --- a/krylov/psb_zbicg.f90 +++ b/krylov/psb_zbicg.f90 @@ -123,7 +123,8 @@ subroutine psb_zbicg_vect(a,prec,b,x,eps,desc_a,info,& logical, parameter :: exchange=.true., noexchange=.false. integer(psb_ipk_), parameter :: irmax = 8 integer(psb_ipk_) :: itx - integer(psb_ipk_) :: ictxt, np, me + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me complex(psb_dpk_) :: alpha, beta, rho, rho_old, sigma real(psb_dpk_) :: derr type(psb_itconv_type) :: stopdat diff --git a/krylov/psb_zcg.F90 b/krylov/psb_zcg.F90 index f89764ce..66f3fdbe 100644 --- a/krylov/psb_zcg.F90 +++ b/krylov/psb_zcg.F90 @@ -122,7 +122,8 @@ subroutine psb_zcg_vect(a,prec,b,x,eps,desc_a,info,& & n_col, n_row,err_act, ieg,nspl, istebz integer(psb_lpk_) :: mglob integer(psb_ipk_) :: debug_level, debug_unit - integer(psb_ipk_) :: np, me, ictxt + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me real(psb_dpk_) :: derr type(psb_itconv_type) :: stopdat logical :: do_cond diff --git a/krylov/psb_zcgs.f90 b/krylov/psb_zcgs.f90 index c4091428..2a245980 100644 --- a/krylov/psb_zcgs.f90 +++ b/krylov/psb_zcgs.f90 @@ -117,7 +117,8 @@ Subroutine psb_zcgs_vect(a,prec,b,x,eps,desc_a,info,& integer(psb_ipk_) :: itmax_, naux, it, itrace_,& & n_row, n_col,istop_, itx, err_act integer(psb_lpk_) :: mglob - integer(psb_ipk_) :: np, me, ictxt + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me integer(psb_ipk_) :: debug_level, debug_unit complex(psb_dpk_) :: alpha, beta, rho, rho_old, sigma real(psb_dpk_) :: derr diff --git a/krylov/psb_zcgstab.f90 b/krylov/psb_zcgstab.f90 index 4fca5c03..e6060d1b 100644 --- a/krylov/psb_zcgstab.f90 +++ b/krylov/psb_zcgstab.f90 @@ -121,7 +121,8 @@ Subroutine psb_zcgstab_vect(a,prec,b,x,eps,desc_a,info,itmax,iter,err,itrace,ist integer(psb_ipk_), Parameter :: irmax = 8 integer(psb_ipk_) :: itx, err_act, i integer(psb_ipk_) :: istop_ - integer(psb_ipk_) :: ictxt, np, me + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me real(psb_dpk_) :: derr complex(psb_dpk_) :: alpha, beta, rho, rho_old, sigma, omega, tau type(psb_itconv_type) :: stopdat diff --git a/krylov/psb_zcgstabl.f90 b/krylov/psb_zcgstabl.f90 index bcb4b652..e2421e98 100644 --- a/krylov/psb_zcgstabl.f90 +++ b/krylov/psb_zcgstabl.f90 @@ -134,7 +134,8 @@ Subroutine psb_zcgstabl_vect(a,prec,b,x,eps,desc_a,info,& integer(psb_ipk_), Parameter :: irmax = 8 integer(psb_ipk_) :: itx, i, istop_,j, k integer(psb_ipk_) :: debug_level, debug_unit - integer(psb_ipk_) :: ictxt, np, me + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me complex(psb_dpk_) :: alpha, beta, rho, rho_old, rni, xni, bni, ani,bn2,& & omega real(psb_dpk_) :: derr diff --git a/krylov/psb_zfcg.F90 b/krylov/psb_zfcg.F90 index 14ecc985..21f1d3cb 100644 --- a/krylov/psb_zfcg.F90 +++ b/krylov/psb_zfcg.F90 @@ -128,7 +128,8 @@ subroutine psb_zfcg_vect(a,prec,b,x,eps,desc_a,info,& integer(psb_ipk_) :: n_col, naux, err_act integer(psb_lpk_) :: mglob integer(psb_ipk_) :: debug_level, debug_unit - integer(psb_ipk_) :: np, me, ictxt + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me complex(psb_dpk_), allocatable, target :: aux(:) complex(psb_dpk_) :: vres(3) character(len=20) :: name diff --git a/krylov/psb_zgcr.f90 b/krylov/psb_zgcr.f90 index c40f2166..a8a05268 100644 --- a/krylov/psb_zgcr.f90 +++ b/krylov/psb_zgcr.f90 @@ -133,7 +133,8 @@ subroutine psb_zgcr_vect(a,prec,b,x,eps,desc_a,info,& integer(psb_ipk_) :: n_col, naux, err_act integer(psb_lpk_) :: mglob integer(psb_ipk_) :: debug_level, debug_unit - integer(psb_ipk_) :: np, me, ictxt + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me integer(psb_ipk_) :: i, j, it, itx, istop_, itmax_, itrace_, nl, m, nrst complex(psb_dpk_) :: hjj complex(psb_dpk_), allocatable, target :: aux(:) diff --git a/krylov/psb_zkrylov.f90 b/krylov/psb_zkrylov.f90 index 48371920..34344407 100644 --- a/krylov/psb_zkrylov.f90 +++ b/krylov/psb_zkrylov.f90 @@ -152,7 +152,8 @@ Subroutine psb_zkrylov_vect(method,a,prec,b,x,eps,desc_a,info,& procedure(psb_zkryl_cond_vect) :: psb_zcg_vect, psb_zfcg_vect logical :: do_alloc_wrk - integer(psb_ipk_) :: ictxt,me,np,err_act, itrace_ + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: me,np,err_act, itrace_ character(len=20) :: name info = psb_success_ diff --git a/krylov/psb_zrgmres.f90 b/krylov/psb_zrgmres.f90 index 73d7f08b..fefefa5e 100644 --- a/krylov/psb_zrgmres.f90 +++ b/krylov/psb_zrgmres.f90 @@ -137,7 +137,8 @@ subroutine psb_zrgmres_vect(a,prec,b,x,eps,desc_a,info,& integer(psb_ipk_), Parameter :: irmax = 8 integer(psb_ipk_) :: itx, i, istop_, err_act integer(psb_ipk_) :: debug_level, debug_unit - integer(psb_ipk_) :: ictxt, np, me + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np, me Real(psb_dpk_) :: rni, xni, bni, ani,bn2, dt, r0n2 real(psb_dpk_) :: errnum, errden, deps, derr character(len=20) :: name diff --git a/prec/impl/psb_c_bjacprec_impl.f90 b/prec/impl/psb_c_bjacprec_impl.f90 index de453684..de0a57e5 100644 --- a/prec/impl/psb_c_bjacprec_impl.f90 +++ b/prec/impl/psb_c_bjacprec_impl.f90 @@ -38,7 +38,8 @@ subroutine psb_c_bjac_dump(prec,info,prefix,head) integer(psb_ipk_), intent(out) :: info character(len=*), intent(in), optional :: prefix,head integer(psb_ipk_) :: i, j, il1, iln, lname, lev - integer(psb_ipk_) :: ictxt,iam, np + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: iam, np character(len=80) :: prefix_ character(len=120) :: fname ! len should be at least 20 more than @@ -87,7 +88,8 @@ subroutine psb_c_bjac_apply_vect(alpha,prec,x,beta,y,desc_data,info,trans,work) integer(psb_ipk_) :: n_row,n_col complex(psb_spk_), pointer :: ww(:), aux(:) type(psb_c_vect_type) :: wv, wv1 - integer(psb_ipk_) :: ictxt,np,me + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np,me integer(psb_ipk_) :: err_act, ierr(5) integer(psb_ipk_) :: debug_level, debug_unit logical :: do_alloc_wrk @@ -242,7 +244,8 @@ subroutine psb_c_bjac_apply(alpha,prec,x,beta,y,desc_data,info,trans,work) ! Local variables integer(psb_ipk_) :: n_row,n_col complex(psb_spk_), pointer :: ww(:), aux(:) - integer(psb_ipk_) :: ictxt,np,me + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np,me integer(psb_ipk_) :: err_act, ierr(5) integer(psb_ipk_) :: debug_level, debug_unit character :: trans_ @@ -432,7 +435,8 @@ subroutine psb_c_bjac_precbld(a,desc_a,prec,info,amold,vmold,imold) type(psb_c_csr_sparse_mat), allocatable :: lf, uf complex(psb_spk_), allocatable :: dd(:) integer(psb_ipk_) :: nztota, err_act, n_row, nrow_a,n_col, nhalo - integer(psb_ipk_) :: ictxt,np,me + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np,me character(len=20) :: name='c_bjac_precbld' character(len=20) :: ch_err diff --git a/prec/impl/psb_c_diagprec_impl.f90 b/prec/impl/psb_c_diagprec_impl.f90 index f31aae1e..6ad7586d 100644 --- a/prec/impl/psb_c_diagprec_impl.f90 +++ b/prec/impl/psb_c_diagprec_impl.f90 @@ -38,7 +38,8 @@ subroutine psb_c_diag_dump(prec,info,prefix,head) integer(psb_ipk_), intent(out) :: info character(len=*), intent(in), optional :: prefix,head integer(psb_ipk_) :: i, j, il1, iln, lname, lev - integer(psb_ipk_) :: ictxt,iam, np + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: iam, np character(len=80) :: prefix_ character(len=120) :: fname ! len should be at least 20 more than diff --git a/prec/impl/psb_c_prec_type_impl.f90 b/prec/impl/psb_c_prec_type_impl.f90 index e1f13fc4..5858df0b 100644 --- a/prec/impl/psb_c_prec_type_impl.f90 +++ b/prec/impl/psb_c_prec_type_impl.f90 @@ -76,7 +76,8 @@ subroutine psb_c_apply2_vect(prec,x,y,desc_data,info,trans,work) character :: trans_ complex(psb_spk_), pointer :: work_(:) - integer(psb_ipk_) :: ictxt,np,me + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np,me integer(psb_ipk_) :: err_act character(len=20) :: name @@ -146,7 +147,8 @@ subroutine psb_c_apply1_vect(prec,x,desc_data,info,trans,work) type(psb_c_vect_type) :: ww character :: trans_ complex(psb_spk_), pointer :: work_(:) - integer(psb_ipk_) :: ictxt,np,me + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np,me integer(psb_ipk_) :: err_act character(len=20) :: name @@ -218,7 +220,8 @@ subroutine psb_c_apply2v(prec,x,y,desc_data,info,trans,work) character :: trans_ complex(psb_spk_), pointer :: work_(:) - integer(psb_ipk_) :: ictxt,np,me + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np,me integer(psb_ipk_) :: err_act character(len=20) :: name @@ -282,7 +285,8 @@ subroutine psb_c_apply1v(prec,x,desc_data,info,trans) character(len=1), optional :: trans character :: trans_ - integer(psb_ipk_) :: ictxt,np,me + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np,me integer(psb_ipk_) :: err_act complex(psb_spk_), pointer :: WW(:), w1(:) character(len=20) :: name @@ -291,7 +295,7 @@ subroutine psb_c_apply1v(prec,x,desc_data,info,trans) call psb_erractionsave(err_act) - ictxt=desc_data%get_context() + ictxt = desc_data%get_context() call psb_info(ictxt, me, np) if (present(trans)) then trans_=psb_toupper(trans) diff --git a/prec/impl/psb_cprecbld.f90 b/prec/impl/psb_cprecbld.f90 index 588ac84d..39d16bd8 100644 --- a/prec/impl/psb_cprecbld.f90 +++ b/prec/impl/psb_cprecbld.f90 @@ -44,7 +44,8 @@ subroutine psb_cprecbld(a,desc_a,p,info,amold,vmold,imold) class(psb_i_base_vect_type), intent(in), optional :: imold ! Local scalars - integer(psb_ipk_) :: ictxt, me,np + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: me,np integer(psb_ipk_) :: err, n_row, n_col,mglob, err_act integer(psb_ipk_),parameter :: iroot=psb_root_,iout=60,ilout=40 character(len=20) :: name, ch_err diff --git a/prec/impl/psb_cprecinit.f90 b/prec/impl/psb_cprecinit.f90 index 9f0b4d68..ace7fea3 100644 --- a/prec/impl/psb_cprecinit.f90 +++ b/prec/impl/psb_cprecinit.f90 @@ -37,7 +37,7 @@ subroutine psb_cprecinit(ictxt,p,ptype,info) use psb_c_diagprec, only : psb_c_diag_prec_type use psb_c_bjacprec, only : psb_c_bjac_prec_type implicit none - integer(psb_ipk_), intent(in) :: ictxt + type(psb_ctxt_type), intent(in) :: ictxt class(psb_cprec_type), intent(inout) :: p character(len=*), intent(in) :: ptype integer(psb_ipk_), intent(out) :: info diff --git a/prec/impl/psb_d_bjacprec_impl.f90 b/prec/impl/psb_d_bjacprec_impl.f90 index ef8c52c3..b8643385 100644 --- a/prec/impl/psb_d_bjacprec_impl.f90 +++ b/prec/impl/psb_d_bjacprec_impl.f90 @@ -38,7 +38,8 @@ subroutine psb_d_bjac_dump(prec,info,prefix,head) integer(psb_ipk_), intent(out) :: info character(len=*), intent(in), optional :: prefix,head integer(psb_ipk_) :: i, j, il1, iln, lname, lev - integer(psb_ipk_) :: ictxt,iam, np + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: iam, np character(len=80) :: prefix_ character(len=120) :: fname ! len should be at least 20 more than @@ -87,7 +88,8 @@ subroutine psb_d_bjac_apply_vect(alpha,prec,x,beta,y,desc_data,info,trans,work) integer(psb_ipk_) :: n_row,n_col real(psb_dpk_), pointer :: ww(:), aux(:) type(psb_d_vect_type) :: wv, wv1 - integer(psb_ipk_) :: ictxt,np,me + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np,me integer(psb_ipk_) :: err_act, ierr(5) integer(psb_ipk_) :: debug_level, debug_unit logical :: do_alloc_wrk @@ -242,7 +244,8 @@ subroutine psb_d_bjac_apply(alpha,prec,x,beta,y,desc_data,info,trans,work) ! Local variables integer(psb_ipk_) :: n_row,n_col real(psb_dpk_), pointer :: ww(:), aux(:) - integer(psb_ipk_) :: ictxt,np,me + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np,me integer(psb_ipk_) :: err_act, ierr(5) integer(psb_ipk_) :: debug_level, debug_unit character :: trans_ @@ -432,7 +435,8 @@ subroutine psb_d_bjac_precbld(a,desc_a,prec,info,amold,vmold,imold) type(psb_d_csr_sparse_mat), allocatable :: lf, uf real(psb_dpk_), allocatable :: dd(:) integer(psb_ipk_) :: nztota, err_act, n_row, nrow_a,n_col, nhalo - integer(psb_ipk_) :: ictxt,np,me + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np,me character(len=20) :: name='d_bjac_precbld' character(len=20) :: ch_err diff --git a/prec/impl/psb_d_diagprec_impl.f90 b/prec/impl/psb_d_diagprec_impl.f90 index 5e0175a2..4c0d4937 100644 --- a/prec/impl/psb_d_diagprec_impl.f90 +++ b/prec/impl/psb_d_diagprec_impl.f90 @@ -38,7 +38,8 @@ subroutine psb_d_diag_dump(prec,info,prefix,head) integer(psb_ipk_), intent(out) :: info character(len=*), intent(in), optional :: prefix,head integer(psb_ipk_) :: i, j, il1, iln, lname, lev - integer(psb_ipk_) :: ictxt,iam, np + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: iam, np character(len=80) :: prefix_ character(len=120) :: fname ! len should be at least 20 more than diff --git a/prec/impl/psb_d_prec_type_impl.f90 b/prec/impl/psb_d_prec_type_impl.f90 index 793afac7..2dead542 100644 --- a/prec/impl/psb_d_prec_type_impl.f90 +++ b/prec/impl/psb_d_prec_type_impl.f90 @@ -76,7 +76,8 @@ subroutine psb_d_apply2_vect(prec,x,y,desc_data,info,trans,work) character :: trans_ real(psb_dpk_), pointer :: work_(:) - integer(psb_ipk_) :: ictxt,np,me + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np,me integer(psb_ipk_) :: err_act character(len=20) :: name @@ -146,7 +147,8 @@ subroutine psb_d_apply1_vect(prec,x,desc_data,info,trans,work) type(psb_d_vect_type) :: ww character :: trans_ real(psb_dpk_), pointer :: work_(:) - integer(psb_ipk_) :: ictxt,np,me + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np,me integer(psb_ipk_) :: err_act character(len=20) :: name @@ -218,7 +220,8 @@ subroutine psb_d_apply2v(prec,x,y,desc_data,info,trans,work) character :: trans_ real(psb_dpk_), pointer :: work_(:) - integer(psb_ipk_) :: ictxt,np,me + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np,me integer(psb_ipk_) :: err_act character(len=20) :: name @@ -282,7 +285,8 @@ subroutine psb_d_apply1v(prec,x,desc_data,info,trans) character(len=1), optional :: trans character :: trans_ - integer(psb_ipk_) :: ictxt,np,me + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np,me integer(psb_ipk_) :: err_act real(psb_dpk_), pointer :: WW(:), w1(:) character(len=20) :: name @@ -291,7 +295,7 @@ subroutine psb_d_apply1v(prec,x,desc_data,info,trans) call psb_erractionsave(err_act) - ictxt=desc_data%get_context() + ictxt = desc_data%get_context() call psb_info(ictxt, me, np) if (present(trans)) then trans_=psb_toupper(trans) diff --git a/prec/impl/psb_dprecbld.f90 b/prec/impl/psb_dprecbld.f90 index dc3d7585..f3cef96a 100644 --- a/prec/impl/psb_dprecbld.f90 +++ b/prec/impl/psb_dprecbld.f90 @@ -44,7 +44,8 @@ subroutine psb_dprecbld(a,desc_a,p,info,amold,vmold,imold) class(psb_i_base_vect_type), intent(in), optional :: imold ! Local scalars - integer(psb_ipk_) :: ictxt, me,np + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: me,np integer(psb_ipk_) :: err, n_row, n_col,mglob, err_act integer(psb_ipk_),parameter :: iroot=psb_root_,iout=60,ilout=40 character(len=20) :: name, ch_err diff --git a/prec/impl/psb_dprecinit.f90 b/prec/impl/psb_dprecinit.f90 index f28bd446..771a1c21 100644 --- a/prec/impl/psb_dprecinit.f90 +++ b/prec/impl/psb_dprecinit.f90 @@ -37,7 +37,7 @@ subroutine psb_dprecinit(ictxt,p,ptype,info) use psb_d_diagprec, only : psb_d_diag_prec_type use psb_d_bjacprec, only : psb_d_bjac_prec_type implicit none - integer(psb_ipk_), intent(in) :: ictxt + type(psb_ctxt_type), intent(in) :: ictxt class(psb_dprec_type), intent(inout) :: p character(len=*), intent(in) :: ptype integer(psb_ipk_), intent(out) :: info diff --git a/prec/impl/psb_s_bjacprec_impl.f90 b/prec/impl/psb_s_bjacprec_impl.f90 index 3a9cfce2..7903eda0 100644 --- a/prec/impl/psb_s_bjacprec_impl.f90 +++ b/prec/impl/psb_s_bjacprec_impl.f90 @@ -38,7 +38,8 @@ subroutine psb_s_bjac_dump(prec,info,prefix,head) integer(psb_ipk_), intent(out) :: info character(len=*), intent(in), optional :: prefix,head integer(psb_ipk_) :: i, j, il1, iln, lname, lev - integer(psb_ipk_) :: ictxt,iam, np + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: iam, np character(len=80) :: prefix_ character(len=120) :: fname ! len should be at least 20 more than @@ -87,7 +88,8 @@ subroutine psb_s_bjac_apply_vect(alpha,prec,x,beta,y,desc_data,info,trans,work) integer(psb_ipk_) :: n_row,n_col real(psb_spk_), pointer :: ww(:), aux(:) type(psb_s_vect_type) :: wv, wv1 - integer(psb_ipk_) :: ictxt,np,me + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np,me integer(psb_ipk_) :: err_act, ierr(5) integer(psb_ipk_) :: debug_level, debug_unit logical :: do_alloc_wrk @@ -242,7 +244,8 @@ subroutine psb_s_bjac_apply(alpha,prec,x,beta,y,desc_data,info,trans,work) ! Local variables integer(psb_ipk_) :: n_row,n_col real(psb_spk_), pointer :: ww(:), aux(:) - integer(psb_ipk_) :: ictxt,np,me + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np,me integer(psb_ipk_) :: err_act, ierr(5) integer(psb_ipk_) :: debug_level, debug_unit character :: trans_ @@ -432,7 +435,8 @@ subroutine psb_s_bjac_precbld(a,desc_a,prec,info,amold,vmold,imold) type(psb_s_csr_sparse_mat), allocatable :: lf, uf real(psb_spk_), allocatable :: dd(:) integer(psb_ipk_) :: nztota, err_act, n_row, nrow_a,n_col, nhalo - integer(psb_ipk_) :: ictxt,np,me + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np,me character(len=20) :: name='s_bjac_precbld' character(len=20) :: ch_err diff --git a/prec/impl/psb_s_diagprec_impl.f90 b/prec/impl/psb_s_diagprec_impl.f90 index 79ba27cc..b463bfdb 100644 --- a/prec/impl/psb_s_diagprec_impl.f90 +++ b/prec/impl/psb_s_diagprec_impl.f90 @@ -38,7 +38,8 @@ subroutine psb_s_diag_dump(prec,info,prefix,head) integer(psb_ipk_), intent(out) :: info character(len=*), intent(in), optional :: prefix,head integer(psb_ipk_) :: i, j, il1, iln, lname, lev - integer(psb_ipk_) :: ictxt,iam, np + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: iam, np character(len=80) :: prefix_ character(len=120) :: fname ! len should be at least 20 more than diff --git a/prec/impl/psb_s_prec_type_impl.f90 b/prec/impl/psb_s_prec_type_impl.f90 index 547272a0..36e0ccbc 100644 --- a/prec/impl/psb_s_prec_type_impl.f90 +++ b/prec/impl/psb_s_prec_type_impl.f90 @@ -76,7 +76,8 @@ subroutine psb_s_apply2_vect(prec,x,y,desc_data,info,trans,work) character :: trans_ real(psb_spk_), pointer :: work_(:) - integer(psb_ipk_) :: ictxt,np,me + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np,me integer(psb_ipk_) :: err_act character(len=20) :: name @@ -146,7 +147,8 @@ subroutine psb_s_apply1_vect(prec,x,desc_data,info,trans,work) type(psb_s_vect_type) :: ww character :: trans_ real(psb_spk_), pointer :: work_(:) - integer(psb_ipk_) :: ictxt,np,me + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np,me integer(psb_ipk_) :: err_act character(len=20) :: name @@ -218,7 +220,8 @@ subroutine psb_s_apply2v(prec,x,y,desc_data,info,trans,work) character :: trans_ real(psb_spk_), pointer :: work_(:) - integer(psb_ipk_) :: ictxt,np,me + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np,me integer(psb_ipk_) :: err_act character(len=20) :: name @@ -282,7 +285,8 @@ subroutine psb_s_apply1v(prec,x,desc_data,info,trans) character(len=1), optional :: trans character :: trans_ - integer(psb_ipk_) :: ictxt,np,me + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np,me integer(psb_ipk_) :: err_act real(psb_spk_), pointer :: WW(:), w1(:) character(len=20) :: name @@ -291,7 +295,7 @@ subroutine psb_s_apply1v(prec,x,desc_data,info,trans) call psb_erractionsave(err_act) - ictxt=desc_data%get_context() + ictxt = desc_data%get_context() call psb_info(ictxt, me, np) if (present(trans)) then trans_=psb_toupper(trans) diff --git a/prec/impl/psb_sprecbld.f90 b/prec/impl/psb_sprecbld.f90 index 8cc48eab..7e67fe05 100644 --- a/prec/impl/psb_sprecbld.f90 +++ b/prec/impl/psb_sprecbld.f90 @@ -44,7 +44,8 @@ subroutine psb_sprecbld(a,desc_a,p,info,amold,vmold,imold) class(psb_i_base_vect_type), intent(in), optional :: imold ! Local scalars - integer(psb_ipk_) :: ictxt, me,np + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: me,np integer(psb_ipk_) :: err, n_row, n_col,mglob, err_act integer(psb_ipk_),parameter :: iroot=psb_root_,iout=60,ilout=40 character(len=20) :: name, ch_err diff --git a/prec/impl/psb_sprecinit.f90 b/prec/impl/psb_sprecinit.f90 index fa5b83c2..b7924628 100644 --- a/prec/impl/psb_sprecinit.f90 +++ b/prec/impl/psb_sprecinit.f90 @@ -37,7 +37,7 @@ subroutine psb_sprecinit(ictxt,p,ptype,info) use psb_s_diagprec, only : psb_s_diag_prec_type use psb_s_bjacprec, only : psb_s_bjac_prec_type implicit none - integer(psb_ipk_), intent(in) :: ictxt + type(psb_ctxt_type), intent(in) :: ictxt class(psb_sprec_type), intent(inout) :: p character(len=*), intent(in) :: ptype integer(psb_ipk_), intent(out) :: info diff --git a/prec/impl/psb_z_bjacprec_impl.f90 b/prec/impl/psb_z_bjacprec_impl.f90 index b70018f4..e0265ecb 100644 --- a/prec/impl/psb_z_bjacprec_impl.f90 +++ b/prec/impl/psb_z_bjacprec_impl.f90 @@ -38,7 +38,8 @@ subroutine psb_z_bjac_dump(prec,info,prefix,head) integer(psb_ipk_), intent(out) :: info character(len=*), intent(in), optional :: prefix,head integer(psb_ipk_) :: i, j, il1, iln, lname, lev - integer(psb_ipk_) :: ictxt,iam, np + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: iam, np character(len=80) :: prefix_ character(len=120) :: fname ! len should be at least 20 more than @@ -87,7 +88,8 @@ subroutine psb_z_bjac_apply_vect(alpha,prec,x,beta,y,desc_data,info,trans,work) integer(psb_ipk_) :: n_row,n_col complex(psb_dpk_), pointer :: ww(:), aux(:) type(psb_z_vect_type) :: wv, wv1 - integer(psb_ipk_) :: ictxt,np,me + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np,me integer(psb_ipk_) :: err_act, ierr(5) integer(psb_ipk_) :: debug_level, debug_unit logical :: do_alloc_wrk @@ -242,7 +244,8 @@ subroutine psb_z_bjac_apply(alpha,prec,x,beta,y,desc_data,info,trans,work) ! Local variables integer(psb_ipk_) :: n_row,n_col complex(psb_dpk_), pointer :: ww(:), aux(:) - integer(psb_ipk_) :: ictxt,np,me + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np,me integer(psb_ipk_) :: err_act, ierr(5) integer(psb_ipk_) :: debug_level, debug_unit character :: trans_ @@ -432,7 +435,8 @@ subroutine psb_z_bjac_precbld(a,desc_a,prec,info,amold,vmold,imold) type(psb_z_csr_sparse_mat), allocatable :: lf, uf complex(psb_dpk_), allocatable :: dd(:) integer(psb_ipk_) :: nztota, err_act, n_row, nrow_a,n_col, nhalo - integer(psb_ipk_) :: ictxt,np,me + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np,me character(len=20) :: name='z_bjac_precbld' character(len=20) :: ch_err diff --git a/prec/impl/psb_z_diagprec_impl.f90 b/prec/impl/psb_z_diagprec_impl.f90 index 24e288f5..a70d6492 100644 --- a/prec/impl/psb_z_diagprec_impl.f90 +++ b/prec/impl/psb_z_diagprec_impl.f90 @@ -38,7 +38,8 @@ subroutine psb_z_diag_dump(prec,info,prefix,head) integer(psb_ipk_), intent(out) :: info character(len=*), intent(in), optional :: prefix,head integer(psb_ipk_) :: i, j, il1, iln, lname, lev - integer(psb_ipk_) :: ictxt,iam, np + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: iam, np character(len=80) :: prefix_ character(len=120) :: fname ! len should be at least 20 more than diff --git a/prec/impl/psb_z_prec_type_impl.f90 b/prec/impl/psb_z_prec_type_impl.f90 index 982fc008..8b25f94e 100644 --- a/prec/impl/psb_z_prec_type_impl.f90 +++ b/prec/impl/psb_z_prec_type_impl.f90 @@ -76,7 +76,8 @@ subroutine psb_z_apply2_vect(prec,x,y,desc_data,info,trans,work) character :: trans_ complex(psb_dpk_), pointer :: work_(:) - integer(psb_ipk_) :: ictxt,np,me + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np,me integer(psb_ipk_) :: err_act character(len=20) :: name @@ -146,7 +147,8 @@ subroutine psb_z_apply1_vect(prec,x,desc_data,info,trans,work) type(psb_z_vect_type) :: ww character :: trans_ complex(psb_dpk_), pointer :: work_(:) - integer(psb_ipk_) :: ictxt,np,me + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np,me integer(psb_ipk_) :: err_act character(len=20) :: name @@ -218,7 +220,8 @@ subroutine psb_z_apply2v(prec,x,y,desc_data,info,trans,work) character :: trans_ complex(psb_dpk_), pointer :: work_(:) - integer(psb_ipk_) :: ictxt,np,me + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np,me integer(psb_ipk_) :: err_act character(len=20) :: name @@ -282,7 +285,8 @@ subroutine psb_z_apply1v(prec,x,desc_data,info,trans) character(len=1), optional :: trans character :: trans_ - integer(psb_ipk_) :: ictxt,np,me + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: np,me integer(psb_ipk_) :: err_act complex(psb_dpk_), pointer :: WW(:), w1(:) character(len=20) :: name @@ -291,7 +295,7 @@ subroutine psb_z_apply1v(prec,x,desc_data,info,trans) call psb_erractionsave(err_act) - ictxt=desc_data%get_context() + ictxt = desc_data%get_context() call psb_info(ictxt, me, np) if (present(trans)) then trans_=psb_toupper(trans) diff --git a/prec/impl/psb_zprecbld.f90 b/prec/impl/psb_zprecbld.f90 index b99cfe92..dbe33611 100644 --- a/prec/impl/psb_zprecbld.f90 +++ b/prec/impl/psb_zprecbld.f90 @@ -44,7 +44,8 @@ subroutine psb_zprecbld(a,desc_a,p,info,amold,vmold,imold) class(psb_i_base_vect_type), intent(in), optional :: imold ! Local scalars - integer(psb_ipk_) :: ictxt, me,np + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: me,np integer(psb_ipk_) :: err, n_row, n_col,mglob, err_act integer(psb_ipk_),parameter :: iroot=psb_root_,iout=60,ilout=40 character(len=20) :: name, ch_err diff --git a/prec/impl/psb_zprecinit.f90 b/prec/impl/psb_zprecinit.f90 index d9f5aa01..5f9556d3 100644 --- a/prec/impl/psb_zprecinit.f90 +++ b/prec/impl/psb_zprecinit.f90 @@ -37,7 +37,7 @@ subroutine psb_zprecinit(ictxt,p,ptype,info) use psb_z_diagprec, only : psb_z_diag_prec_type use psb_z_bjacprec, only : psb_z_bjac_prec_type implicit none - integer(psb_ipk_), intent(in) :: ictxt + type(psb_ctxt_type), intent(in) :: ictxt class(psb_zprec_type), intent(inout) :: p character(len=*), intent(in) :: ptype integer(psb_ipk_), intent(out) :: info diff --git a/prec/psb_c_base_prec_mod.f90 b/prec/psb_c_base_prec_mod.f90 index 8b453241..62c997aa 100644 --- a/prec/psb_c_base_prec_mod.f90 +++ b/prec/psb_c_base_prec_mod.f90 @@ -36,17 +36,18 @@ module psb_c_base_prec_mod ! Reduces size of .mod file. - use psb_base_mod, only : psb_spk_, psb_ipk_, psb_epk_,& + use psb_base_mod, only : psb_spk_, psb_ipk_, psb_epk_, psb_ctxt_type, & & psb_desc_type, psb_sizeof, psb_free, psb_cdfree, psb_errpush, psb_act_abort_,& & psb_sizeof_ip, psb_sizeof_lp, psb_sizeof_sp, psb_sizeof_dp, & - & psb_erractionsave, psb_erractionrestore, psb_error, psb_errstatus_fatal, psb_success_,& + & psb_erractionsave, psb_erractionrestore, psb_error, & + & psb_errstatus_fatal, psb_success_,& & psb_c_base_sparse_mat, psb_cspmat_type, psb_c_csr_sparse_mat,& & psb_c_base_vect_type, psb_c_vect_type, psb_i_base_vect_type use psb_prec_const_mod type, abstract :: psb_c_base_prec_type - integer(psb_ipk_) :: ictxt + type(psb_ctxt_type) :: ictxt contains procedure, pass(prec) :: set_ctxt => psb_c_base_set_ctxt procedure, pass(prec) :: get_ctxt => psb_c_base_get_ctxt @@ -345,7 +346,7 @@ contains subroutine psb_c_base_set_ctxt(prec,ictxt) implicit none class(psb_c_base_prec_type), intent(inout) :: prec - integer(psb_ipk_), intent(in) :: ictxt + type(psb_ctxt_type) :: ictxt prec%ictxt = ictxt @@ -361,7 +362,7 @@ contains function psb_c_base_get_ctxt(prec) result(val) class(psb_c_base_prec_type), intent(in) :: prec - integer(psb_ipk_) :: val + type(psb_ctxt_type) :: val val = prec%ictxt return @@ -382,7 +383,8 @@ contains character(len=32) :: res ! character(len=32) :: frmtv - integer(psb_ipk_) :: ni, ictxt,iam,np + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: ni, iam, np ictxt = prec%ictxt call psb_info(ictxt,iam,np) diff --git a/prec/psb_c_bjacprec.f90 b/prec/psb_c_bjacprec.f90 index 2a46a6df..67cee500 100644 --- a/prec/psb_c_bjacprec.f90 +++ b/prec/psb_c_bjacprec.f90 @@ -148,7 +148,8 @@ contains integer(psb_ipk_) :: err_act, nrow, info character(len=20) :: name='c_bjac_precdescr' - integer(psb_ipk_) :: iout_, ictxt, iam, np, root_ + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: iout_, iam, np, root_ call psb_erractionsave(err_act) diff --git a/prec/psb_c_diagprec.f90 b/prec/psb_c_diagprec.f90 index f2eaa4d0..cedcf0c4 100644 --- a/prec/psb_c_diagprec.f90 +++ b/prec/psb_c_diagprec.f90 @@ -171,7 +171,8 @@ contains integer(psb_ipk_) :: err_act, nrow, info character(len=20) :: name='c_diag_precdescr' - integer(psb_ipk_) :: iout_, ictxt, iam, np, root_ + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: iout_, iam, np, root_ call psb_erractionsave(err_act) diff --git a/prec/psb_c_nullprec.f90 b/prec/psb_c_nullprec.f90 index 9a75366e..7130679a 100644 --- a/prec/psb_c_nullprec.f90 +++ b/prec/psb_c_nullprec.f90 @@ -170,7 +170,8 @@ contains character(len=20) :: name='c_null_precset' character(len=32) :: dprefix, frmtv integer(psb_ipk_) :: ni - integer(psb_ipk_) :: iout_, ictxt, iam, np, root_ + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: iout_, iam, np, root_ call psb_erractionsave(err_act) @@ -212,7 +213,8 @@ contains class(psb_c_null_prec_type), intent(in) :: prec integer(psb_ipk_), intent(out) :: info character(len=*), intent(in), optional :: prefix,head - integer(psb_ipk_) :: iout, iam, np, ictxt, lname + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: iout, iam, np, lname logical :: isopen character(len=80) :: prefix_ character(len=120) :: fname ! len should be at least 20 more than diff --git a/prec/psb_c_prec_type.f90 b/prec/psb_c_prec_type.f90 index 6d9aa908..4314b672 100644 --- a/prec/psb_c_prec_type.f90 +++ b/prec/psb_c_prec_type.f90 @@ -39,7 +39,7 @@ module psb_c_prec_type use psb_c_base_prec_mod type psb_cprec_type - integer(psb_ipk_) :: ictxt + type(psb_ctxt_type) :: ictxt class(psb_c_base_prec_type), allocatable :: prec contains procedure, pass(prec) :: psb_c_apply1_vect @@ -65,9 +65,9 @@ module psb_c_prec_type interface psb_precinit subroutine psb_cprecinit(ictxt,prec,ptype,info) - import :: psb_ipk_, psb_cprec_type + import :: psb_ipk_, psb_cprec_type, psb_ctxt_type implicit none - integer(psb_ipk_), intent(in) :: ictxt + type(psb_ctxt_type), intent(in) :: ictxt class(psb_cprec_type), intent(inout) :: prec character(len=*), intent(in) :: ptype integer(psb_ipk_), intent(out) :: info diff --git a/prec/psb_d_base_prec_mod.f90 b/prec/psb_d_base_prec_mod.f90 index dc39ca70..59689197 100644 --- a/prec/psb_d_base_prec_mod.f90 +++ b/prec/psb_d_base_prec_mod.f90 @@ -36,17 +36,18 @@ module psb_d_base_prec_mod ! Reduces size of .mod file. - use psb_base_mod, only : psb_dpk_, psb_ipk_, psb_epk_,& + use psb_base_mod, only : psb_dpk_, psb_ipk_, psb_epk_, psb_ctxt_type, & & psb_desc_type, psb_sizeof, psb_free, psb_cdfree, psb_errpush, psb_act_abort_,& & psb_sizeof_ip, psb_sizeof_lp, psb_sizeof_sp, psb_sizeof_dp, & - & psb_erractionsave, psb_erractionrestore, psb_error, psb_errstatus_fatal, psb_success_,& + & psb_erractionsave, psb_erractionrestore, psb_error, & + & psb_errstatus_fatal, psb_success_,& & psb_d_base_sparse_mat, psb_dspmat_type, psb_d_csr_sparse_mat,& & psb_d_base_vect_type, psb_d_vect_type, psb_i_base_vect_type use psb_prec_const_mod type, abstract :: psb_d_base_prec_type - integer(psb_ipk_) :: ictxt + type(psb_ctxt_type) :: ictxt contains procedure, pass(prec) :: set_ctxt => psb_d_base_set_ctxt procedure, pass(prec) :: get_ctxt => psb_d_base_get_ctxt @@ -345,7 +346,7 @@ contains subroutine psb_d_base_set_ctxt(prec,ictxt) implicit none class(psb_d_base_prec_type), intent(inout) :: prec - integer(psb_ipk_), intent(in) :: ictxt + type(psb_ctxt_type) :: ictxt prec%ictxt = ictxt @@ -361,7 +362,7 @@ contains function psb_d_base_get_ctxt(prec) result(val) class(psb_d_base_prec_type), intent(in) :: prec - integer(psb_ipk_) :: val + type(psb_ctxt_type) :: val val = prec%ictxt return @@ -382,7 +383,8 @@ contains character(len=32) :: res ! character(len=32) :: frmtv - integer(psb_ipk_) :: ni, ictxt,iam,np + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: ni, iam, np ictxt = prec%ictxt call psb_info(ictxt,iam,np) diff --git a/prec/psb_d_bjacprec.f90 b/prec/psb_d_bjacprec.f90 index 06279ae1..1ca350ce 100644 --- a/prec/psb_d_bjacprec.f90 +++ b/prec/psb_d_bjacprec.f90 @@ -148,7 +148,8 @@ contains integer(psb_ipk_) :: err_act, nrow, info character(len=20) :: name='d_bjac_precdescr' - integer(psb_ipk_) :: iout_, ictxt, iam, np, root_ + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: iout_, iam, np, root_ call psb_erractionsave(err_act) diff --git a/prec/psb_d_diagprec.f90 b/prec/psb_d_diagprec.f90 index 4bdda8bc..36e49247 100644 --- a/prec/psb_d_diagprec.f90 +++ b/prec/psb_d_diagprec.f90 @@ -171,7 +171,8 @@ contains integer(psb_ipk_) :: err_act, nrow, info character(len=20) :: name='d_diag_precdescr' - integer(psb_ipk_) :: iout_, ictxt, iam, np, root_ + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: iout_, iam, np, root_ call psb_erractionsave(err_act) diff --git a/prec/psb_d_nullprec.f90 b/prec/psb_d_nullprec.f90 index 421c59ef..4b8f22a5 100644 --- a/prec/psb_d_nullprec.f90 +++ b/prec/psb_d_nullprec.f90 @@ -170,7 +170,8 @@ contains character(len=20) :: name='d_null_precset' character(len=32) :: dprefix, frmtv integer(psb_ipk_) :: ni - integer(psb_ipk_) :: iout_, ictxt, iam, np, root_ + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: iout_, iam, np, root_ call psb_erractionsave(err_act) @@ -212,7 +213,8 @@ contains class(psb_d_null_prec_type), intent(in) :: prec integer(psb_ipk_), intent(out) :: info character(len=*), intent(in), optional :: prefix,head - integer(psb_ipk_) :: iout, iam, np, ictxt, lname + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: iout, iam, np, lname logical :: isopen character(len=80) :: prefix_ character(len=120) :: fname ! len should be at least 20 more than diff --git a/prec/psb_d_prec_type.f90 b/prec/psb_d_prec_type.f90 index f50339a3..322fade3 100644 --- a/prec/psb_d_prec_type.f90 +++ b/prec/psb_d_prec_type.f90 @@ -39,7 +39,7 @@ module psb_d_prec_type use psb_d_base_prec_mod type psb_dprec_type - integer(psb_ipk_) :: ictxt + type(psb_ctxt_type) :: ictxt class(psb_d_base_prec_type), allocatable :: prec contains procedure, pass(prec) :: psb_d_apply1_vect @@ -65,9 +65,9 @@ module psb_d_prec_type interface psb_precinit subroutine psb_dprecinit(ictxt,prec,ptype,info) - import :: psb_ipk_, psb_dprec_type + import :: psb_ipk_, psb_dprec_type, psb_ctxt_type implicit none - integer(psb_ipk_), intent(in) :: ictxt + type(psb_ctxt_type), intent(in) :: ictxt class(psb_dprec_type), intent(inout) :: prec character(len=*), intent(in) :: ptype integer(psb_ipk_), intent(out) :: info diff --git a/prec/psb_s_base_prec_mod.f90 b/prec/psb_s_base_prec_mod.f90 index b2a89f06..35bcc785 100644 --- a/prec/psb_s_base_prec_mod.f90 +++ b/prec/psb_s_base_prec_mod.f90 @@ -36,17 +36,18 @@ module psb_s_base_prec_mod ! Reduces size of .mod file. - use psb_base_mod, only : psb_spk_, psb_ipk_, psb_epk_,& + use psb_base_mod, only : psb_spk_, psb_ipk_, psb_epk_, psb_ctxt_type, & & psb_desc_type, psb_sizeof, psb_free, psb_cdfree, psb_errpush, psb_act_abort_,& & psb_sizeof_ip, psb_sizeof_lp, psb_sizeof_sp, psb_sizeof_dp, & - & psb_erractionsave, psb_erractionrestore, psb_error, psb_errstatus_fatal, psb_success_,& + & psb_erractionsave, psb_erractionrestore, psb_error, & + & psb_errstatus_fatal, psb_success_,& & psb_s_base_sparse_mat, psb_sspmat_type, psb_s_csr_sparse_mat,& & psb_s_base_vect_type, psb_s_vect_type, psb_i_base_vect_type use psb_prec_const_mod type, abstract :: psb_s_base_prec_type - integer(psb_ipk_) :: ictxt + type(psb_ctxt_type) :: ictxt contains procedure, pass(prec) :: set_ctxt => psb_s_base_set_ctxt procedure, pass(prec) :: get_ctxt => psb_s_base_get_ctxt @@ -345,7 +346,7 @@ contains subroutine psb_s_base_set_ctxt(prec,ictxt) implicit none class(psb_s_base_prec_type), intent(inout) :: prec - integer(psb_ipk_), intent(in) :: ictxt + type(psb_ctxt_type) :: ictxt prec%ictxt = ictxt @@ -361,7 +362,7 @@ contains function psb_s_base_get_ctxt(prec) result(val) class(psb_s_base_prec_type), intent(in) :: prec - integer(psb_ipk_) :: val + type(psb_ctxt_type) :: val val = prec%ictxt return @@ -382,7 +383,8 @@ contains character(len=32) :: res ! character(len=32) :: frmtv - integer(psb_ipk_) :: ni, ictxt,iam,np + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: ni, iam, np ictxt = prec%ictxt call psb_info(ictxt,iam,np) diff --git a/prec/psb_s_bjacprec.f90 b/prec/psb_s_bjacprec.f90 index 25ad7642..6d404d47 100644 --- a/prec/psb_s_bjacprec.f90 +++ b/prec/psb_s_bjacprec.f90 @@ -148,7 +148,8 @@ contains integer(psb_ipk_) :: err_act, nrow, info character(len=20) :: name='s_bjac_precdescr' - integer(psb_ipk_) :: iout_, ictxt, iam, np, root_ + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: iout_, iam, np, root_ call psb_erractionsave(err_act) diff --git a/prec/psb_s_diagprec.f90 b/prec/psb_s_diagprec.f90 index 56c3c458..6807ae48 100644 --- a/prec/psb_s_diagprec.f90 +++ b/prec/psb_s_diagprec.f90 @@ -171,7 +171,8 @@ contains integer(psb_ipk_) :: err_act, nrow, info character(len=20) :: name='s_diag_precdescr' - integer(psb_ipk_) :: iout_, ictxt, iam, np, root_ + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: iout_, iam, np, root_ call psb_erractionsave(err_act) diff --git a/prec/psb_s_nullprec.f90 b/prec/psb_s_nullprec.f90 index 06e31251..c7ad6ee9 100644 --- a/prec/psb_s_nullprec.f90 +++ b/prec/psb_s_nullprec.f90 @@ -170,7 +170,8 @@ contains character(len=20) :: name='s_null_precset' character(len=32) :: dprefix, frmtv integer(psb_ipk_) :: ni - integer(psb_ipk_) :: iout_, ictxt, iam, np, root_ + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: iout_, iam, np, root_ call psb_erractionsave(err_act) @@ -212,7 +213,8 @@ contains class(psb_s_null_prec_type), intent(in) :: prec integer(psb_ipk_), intent(out) :: info character(len=*), intent(in), optional :: prefix,head - integer(psb_ipk_) :: iout, iam, np, ictxt, lname + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: iout, iam, np, lname logical :: isopen character(len=80) :: prefix_ character(len=120) :: fname ! len should be at least 20 more than diff --git a/prec/psb_s_prec_type.f90 b/prec/psb_s_prec_type.f90 index ded50ca4..b59e71a5 100644 --- a/prec/psb_s_prec_type.f90 +++ b/prec/psb_s_prec_type.f90 @@ -39,7 +39,7 @@ module psb_s_prec_type use psb_s_base_prec_mod type psb_sprec_type - integer(psb_ipk_) :: ictxt + type(psb_ctxt_type) :: ictxt class(psb_s_base_prec_type), allocatable :: prec contains procedure, pass(prec) :: psb_s_apply1_vect @@ -65,9 +65,9 @@ module psb_s_prec_type interface psb_precinit subroutine psb_sprecinit(ictxt,prec,ptype,info) - import :: psb_ipk_, psb_sprec_type + import :: psb_ipk_, psb_sprec_type, psb_ctxt_type implicit none - integer(psb_ipk_), intent(in) :: ictxt + type(psb_ctxt_type), intent(in) :: ictxt class(psb_sprec_type), intent(inout) :: prec character(len=*), intent(in) :: ptype integer(psb_ipk_), intent(out) :: info diff --git a/prec/psb_z_base_prec_mod.f90 b/prec/psb_z_base_prec_mod.f90 index a1e832f4..79c185a3 100644 --- a/prec/psb_z_base_prec_mod.f90 +++ b/prec/psb_z_base_prec_mod.f90 @@ -36,17 +36,18 @@ module psb_z_base_prec_mod ! Reduces size of .mod file. - use psb_base_mod, only : psb_dpk_, psb_ipk_, psb_epk_,& + use psb_base_mod, only : psb_dpk_, psb_ipk_, psb_epk_, psb_ctxt_type, & & psb_desc_type, psb_sizeof, psb_free, psb_cdfree, psb_errpush, psb_act_abort_,& & psb_sizeof_ip, psb_sizeof_lp, psb_sizeof_sp, psb_sizeof_dp, & - & psb_erractionsave, psb_erractionrestore, psb_error, psb_errstatus_fatal, psb_success_,& + & psb_erractionsave, psb_erractionrestore, psb_error, & + & psb_errstatus_fatal, psb_success_,& & psb_z_base_sparse_mat, psb_zspmat_type, psb_z_csr_sparse_mat,& & psb_z_base_vect_type, psb_z_vect_type, psb_i_base_vect_type use psb_prec_const_mod type, abstract :: psb_z_base_prec_type - integer(psb_ipk_) :: ictxt + type(psb_ctxt_type) :: ictxt contains procedure, pass(prec) :: set_ctxt => psb_z_base_set_ctxt procedure, pass(prec) :: get_ctxt => psb_z_base_get_ctxt @@ -345,7 +346,7 @@ contains subroutine psb_z_base_set_ctxt(prec,ictxt) implicit none class(psb_z_base_prec_type), intent(inout) :: prec - integer(psb_ipk_), intent(in) :: ictxt + type(psb_ctxt_type) :: ictxt prec%ictxt = ictxt @@ -361,7 +362,7 @@ contains function psb_z_base_get_ctxt(prec) result(val) class(psb_z_base_prec_type), intent(in) :: prec - integer(psb_ipk_) :: val + type(psb_ctxt_type) :: val val = prec%ictxt return @@ -382,7 +383,8 @@ contains character(len=32) :: res ! character(len=32) :: frmtv - integer(psb_ipk_) :: ni, ictxt,iam,np + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: ni, iam, np ictxt = prec%ictxt call psb_info(ictxt,iam,np) diff --git a/prec/psb_z_bjacprec.f90 b/prec/psb_z_bjacprec.f90 index 8ca5616a..853358fe 100644 --- a/prec/psb_z_bjacprec.f90 +++ b/prec/psb_z_bjacprec.f90 @@ -148,7 +148,8 @@ contains integer(psb_ipk_) :: err_act, nrow, info character(len=20) :: name='z_bjac_precdescr' - integer(psb_ipk_) :: iout_, ictxt, iam, np, root_ + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: iout_, iam, np, root_ call psb_erractionsave(err_act) diff --git a/prec/psb_z_diagprec.f90 b/prec/psb_z_diagprec.f90 index 5201989d..957d6357 100644 --- a/prec/psb_z_diagprec.f90 +++ b/prec/psb_z_diagprec.f90 @@ -171,7 +171,8 @@ contains integer(psb_ipk_) :: err_act, nrow, info character(len=20) :: name='z_diag_precdescr' - integer(psb_ipk_) :: iout_, ictxt, iam, np, root_ + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: iout_, iam, np, root_ call psb_erractionsave(err_act) diff --git a/prec/psb_z_nullprec.f90 b/prec/psb_z_nullprec.f90 index 7c0d26ff..9343bcc2 100644 --- a/prec/psb_z_nullprec.f90 +++ b/prec/psb_z_nullprec.f90 @@ -170,7 +170,8 @@ contains character(len=20) :: name='z_null_precset' character(len=32) :: dprefix, frmtv integer(psb_ipk_) :: ni - integer(psb_ipk_) :: iout_, ictxt, iam, np, root_ + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: iout_, iam, np, root_ call psb_erractionsave(err_act) @@ -212,7 +213,8 @@ contains class(psb_z_null_prec_type), intent(in) :: prec integer(psb_ipk_), intent(out) :: info character(len=*), intent(in), optional :: prefix,head - integer(psb_ipk_) :: iout, iam, np, ictxt, lname + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: iout, iam, np, lname logical :: isopen character(len=80) :: prefix_ character(len=120) :: fname ! len should be at least 20 more than diff --git a/prec/psb_z_prec_type.f90 b/prec/psb_z_prec_type.f90 index 8b1a8f4b..48243b29 100644 --- a/prec/psb_z_prec_type.f90 +++ b/prec/psb_z_prec_type.f90 @@ -39,7 +39,7 @@ module psb_z_prec_type use psb_z_base_prec_mod type psb_zprec_type - integer(psb_ipk_) :: ictxt + type(psb_ctxt_type) :: ictxt class(psb_z_base_prec_type), allocatable :: prec contains procedure, pass(prec) :: psb_z_apply1_vect @@ -65,9 +65,9 @@ module psb_z_prec_type interface psb_precinit subroutine psb_zprecinit(ictxt,prec,ptype,info) - import :: psb_ipk_, psb_zprec_type + import :: psb_ipk_, psb_zprec_type, psb_ctxt_type implicit none - integer(psb_ipk_), intent(in) :: ictxt + type(psb_ctxt_type), intent(in) :: ictxt class(psb_zprec_type), intent(inout) :: prec character(len=*), intent(in) :: ptype integer(psb_ipk_), intent(out) :: info diff --git a/test/cdasb/psb_d_pde3d.f90 b/test/cdasb/psb_d_pde3d.f90 index c14f8446..fa23602f 100644 --- a/test/cdasb/psb_d_pde3d.f90 +++ b/test/cdasb/psb_d_pde3d.f90 @@ -192,7 +192,8 @@ contains type(psb_dspmat_type) :: a type(psb_d_vect_type) :: xv,bv type(psb_desc_type) :: desc_a - integer(psb_ipk_) :: ictxt, info + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: info character(len=*) :: afmt procedure(d_func_3d), optional :: f class(psb_d_base_sparse_mat), optional :: amold @@ -641,7 +642,8 @@ program psb_d_pde3d ! dense vectors type(psb_d_vect_type) :: xxv,bv ! parallel environment - integer(psb_ipk_) :: ictxt, iam, np + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: iam, np ! solver parameters integer(psb_ipk_) :: iter, itmax,itrace, istopc, irst, ipart @@ -722,7 +724,7 @@ contains ! get iteration parameters from standard input ! subroutine get_parms(ictxt,kmethd,ptype,afmt,idim,istopc,itmax,itrace,irst,ipart) - integer(psb_ipk_) :: ictxt + type(psb_ctxt_type) :: ictxt character(len=*) :: kmethd, ptype, afmt integer(psb_ipk_) :: idim, istopc,itmax,itrace,irst,ipart integer(psb_ipk_) :: np, iam diff --git a/test/fileread/getp.f90 b/test/fileread/getp.f90 index e9ddf7d2..5dc39d4e 100644 --- a/test/fileread/getp.f90 +++ b/test/fileread/getp.f90 @@ -41,7 +41,7 @@ contains subroutine get_dparms(ictxt,mtrx_file,rhs_file,filefmt,kmethd,ptype,part,& & afmt,istopc,itmax,itrace,irst,eps) use psb_base_mod - integer(psb_ipk_) :: ictxt + type(psb_ctxt_type) :: ictxt character(len=2) :: filefmt character(len=40) :: kmethd, mtrx_file, rhs_file, ptype character(len=20) :: part @@ -161,7 +161,7 @@ contains subroutine get_sparms(ictxt,mtrx_file,rhs_file,filefmt,kmethd,ptype,part,& & afmt,istopc,itmax,itrace,irst,eps) use psb_base_mod - integer(psb_ipk_) :: ictxt + type(psb_ctxt_type) :: ictxt character(len=2) :: filefmt character(len=40) :: kmethd, mtrx_file, rhs_file, ptype character(len=20) :: part diff --git a/test/fileread/psb_cf_sample.f90 b/test/fileread/psb_cf_sample.f90 index d340c90d..25f8533c 100644 --- a/test/fileread/psb_cf_sample.f90 +++ b/test/fileread/psb_cf_sample.f90 @@ -56,7 +56,8 @@ program psb_cf_sample ! communications data structure type(psb_desc_type):: desc_a - integer(psb_ipk_) :: ictxt, iam, np + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: iam, np integer(psb_lpk_) :: lnp ! solver paramters integer(psb_ipk_) :: iter, itmax, ierr, itrace, ircode,& diff --git a/test/fileread/psb_df_sample.f90 b/test/fileread/psb_df_sample.f90 index d0665723..8c7f56d2 100644 --- a/test/fileread/psb_df_sample.f90 +++ b/test/fileread/psb_df_sample.f90 @@ -56,7 +56,8 @@ program psb_df_sample ! communications data structure type(psb_desc_type):: desc_a - integer(psb_ipk_) :: ictxt, iam, np + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: iam, np integer(psb_lpk_) :: lnp ! solver paramters integer(psb_ipk_) :: iter, itmax, ierr, itrace, ircode,& diff --git a/test/fileread/psb_sf_sample.f90 b/test/fileread/psb_sf_sample.f90 index 2801c178..cf49b1a6 100644 --- a/test/fileread/psb_sf_sample.f90 +++ b/test/fileread/psb_sf_sample.f90 @@ -56,7 +56,8 @@ program psb_sf_sample ! communications data structure type(psb_desc_type):: desc_a - integer(psb_ipk_) :: ictxt, iam, np + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: iam, np integer(psb_lpk_) :: lnp ! solver paramters integer(psb_ipk_) :: iter, itmax, ierr, itrace, ircode,& diff --git a/test/fileread/psb_zf_sample.f90 b/test/fileread/psb_zf_sample.f90 index c327a80b..58028532 100644 --- a/test/fileread/psb_zf_sample.f90 +++ b/test/fileread/psb_zf_sample.f90 @@ -56,7 +56,8 @@ program psb_zf_sample ! communications data structure type(psb_desc_type):: desc_a - integer(psb_ipk_) :: ictxt, iam, np + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: iam, np integer(psb_lpk_) :: lnp ! solver paramters integer(psb_ipk_) :: iter, itmax, ierr, itrace, ircode,& diff --git a/test/hello/hello.f90 b/test/hello/hello.f90 index 2a07dba3..9f28e211 100644 --- a/test/hello/hello.f90 +++ b/test/hello/hello.f90 @@ -1,7 +1,8 @@ program hello use psb_base_mod implicit none - integer(psb_ipk_) :: iam, np, icontxt, ip, jp, idummy + type(psb_ctxt_type) :: icontxt + integer(psb_ipk_) :: iam, np, ip, jp, idummy call psb_init(icontxt) call psb_info(icontxt,iam,np) diff --git a/test/hello/pingpong.f90 b/test/hello/pingpong.f90 index b6a53c2f..ba0cbb77 100644 --- a/test/hello/pingpong.f90 +++ b/test/hello/pingpong.f90 @@ -1,7 +1,8 @@ program pingpong use psb_base_mod implicit none - integer(psb_ipk_) :: iam, np, icontxt, ip, jp, idummy + type(psb_ctxt_type) :: icontxt + integer(psb_ipk_) :: iam, np, ip, jp, idummy integer(psb_ipk_), parameter :: nmax=2**16 integer(psb_ipk_) :: i,j,k,n real(psb_dpk_) :: v(nmax) diff --git a/test/kernel/d_file_spmv.f90 b/test/kernel/d_file_spmv.f90 index bc4bb38d..f7bb3932 100644 --- a/test/kernel/d_file_spmv.f90 +++ b/test/kernel/d_file_spmv.f90 @@ -51,7 +51,8 @@ program d_file_spmv ! communications data structure type(psb_desc_type):: desc_a - integer(psb_ipk_) :: ictxt, iam, np + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: iam, np ! solver paramters integer(psb_ipk_) :: iter, itmax, ierr, itrace, ircode, ipart,& diff --git a/test/kernel/pdgenspmv.f90 b/test/kernel/pdgenspmv.f90 index 1a59902f..aaf16fe6 100644 --- a/test/kernel/pdgenspmv.f90 +++ b/test/kernel/pdgenspmv.f90 @@ -165,7 +165,8 @@ contains type(psb_dspmat_type) :: a type(psb_d_vect_type) :: xv,bv type(psb_desc_type) :: desc_a - integer(psb_ipk_) :: ictxt, info + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: info character(len=*) :: afmt procedure(d_func_3d), optional :: f class(psb_d_base_sparse_mat), optional :: amold @@ -567,7 +568,8 @@ program pdgenspmv type(psb_d_vect_type) :: xv,bv, vtst real(psb_dpk_), allocatable :: tst(:) ! blacs parameters - integer(psb_ipk_) :: ictxt, iam, np + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: iam, np ! solver parameters integer(psb_ipk_) :: iter, itmax,itrace, istopc, irst, nr, ipart @@ -720,7 +722,7 @@ contains ! get iteration parameters from standard input ! subroutine get_parms(ictxt,afmt,idim) - integer(psb_ipk_) :: ictxt + type(psb_ctxt_type) :: ictxt character(len=*) :: afmt integer(psb_ipk_) :: idim integer(psb_ipk_) :: np, iam diff --git a/test/kernel/s_file_spmv.f90 b/test/kernel/s_file_spmv.f90 index 68decacd..4675a5d5 100644 --- a/test/kernel/s_file_spmv.f90 +++ b/test/kernel/s_file_spmv.f90 @@ -50,7 +50,8 @@ program s_file_spmv ! communications data structure type(psb_desc_type):: desc_a - integer(psb_ipk_) :: ictxt, iam, np + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: iam, np ! solver paramters integer(psb_ipk_) :: iter, itmax, ierr, itrace, ircode, ipart,& diff --git a/test/kernel/vecoperation.f90 b/test/kernel/vecoperation.f90 index 0b73ff15..139364aa 100644 --- a/test/kernel/vecoperation.f90 +++ b/test/kernel/vecoperation.f90 @@ -34,7 +34,7 @@ module unittestvector_mod use psb_base_mod, only : psb_dpk_, psb_ipk_, psb_desc_type,& - & psb_dspmat_type, psb_d_vect_type, dzero,& + & psb_dspmat_type, psb_d_vect_type, dzero, psb_ctxt_type,& & psb_d_base_sparse_mat, psb_d_base_vect_type, psb_i_base_vect_type interface psb_gen_const @@ -50,7 +50,7 @@ contains type(psb_d_vect_type) :: v real(psb_dpk_) :: val - integer(psb_ipk_) :: ictxt + type(psb_ctxt_type) :: ictxt logical :: ans ! Local variables @@ -84,7 +84,8 @@ contains type(psb_d_vect_type) :: v type(psb_desc_type) :: desc_a integer(psb_lpk_) :: idim - integer(psb_ipk_) :: ictxt, info + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: info real(psb_dpk_) :: val ! Local variables @@ -184,7 +185,8 @@ program vecoperation ! vector type(psb_d_vect_type) :: x,y,z ! blacs parameters - integer(psb_ipk_) :: ictxt, iam, np + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: iam, np ! auxiliary parameters integer(psb_ipk_) :: info character(len=20) :: name,ch_err,readinput diff --git a/test/pargen/psb_d_pde2d.f90 b/test/pargen/psb_d_pde2d.f90 index 4b8b6584..51a4e7d1 100644 --- a/test/pargen/psb_d_pde2d.f90 +++ b/test/pargen/psb_d_pde2d.f90 @@ -176,7 +176,8 @@ contains type(psb_dspmat_type) :: a type(psb_d_vect_type) :: xv,bv type(psb_desc_type) :: desc_a - integer(psb_ipk_) :: ictxt, info + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: info character(len=*) :: afmt procedure(d_func_2d), optional :: f class(psb_d_base_sparse_mat), optional :: amold @@ -556,7 +557,8 @@ program psb_d_pde2d ! dense vectors type(psb_d_vect_type) :: xxv,bv ! parallel environment - integer(psb_ipk_) :: ictxt, iam, np + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: iam, np ! solver parameters integer(psb_ipk_) :: iter, itmax,itrace, istopc, irst, ipart @@ -705,7 +707,7 @@ contains ! get iteration parameters from standard input ! subroutine get_parms(ictxt,kmethd,ptype,afmt,idim,istopc,itmax,itrace,irst,ipart) - integer(psb_ipk_) :: ictxt + type(psb_ctxt_type) :: ictxt character(len=*) :: kmethd, ptype, afmt integer(psb_ipk_) :: idim, istopc,itmax,itrace,irst,ipart integer(psb_ipk_) :: np, iam diff --git a/test/pargen/psb_d_pde3d.f90 b/test/pargen/psb_d_pde3d.f90 index 429e9a0e..4080ab9a 100644 --- a/test/pargen/psb_d_pde3d.f90 +++ b/test/pargen/psb_d_pde3d.f90 @@ -192,7 +192,8 @@ contains type(psb_dspmat_type) :: a type(psb_d_vect_type) :: xv,bv type(psb_desc_type) :: desc_a - integer(psb_ipk_) :: ictxt, info + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: info character(len=*) :: afmt procedure(d_func_3d), optional :: f class(psb_d_base_sparse_mat), optional :: amold @@ -597,7 +598,8 @@ program psb_d_pde3d ! dense vectors type(psb_d_vect_type) :: xxv,bv ! parallel environment - integer(psb_ipk_) :: ictxt, iam, np + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: iam, np ! solver parameters integer(psb_ipk_) :: iter, itmax,itrace, istopc, irst, ipart @@ -746,7 +748,7 @@ contains ! get iteration parameters from standard input ! subroutine get_parms(ictxt,kmethd,ptype,afmt,idim,istopc,itmax,itrace,irst,ipart) - integer(psb_ipk_) :: ictxt + type(psb_ctxt_type) :: ictxt character(len=*) :: kmethd, ptype, afmt integer(psb_ipk_) :: idim, istopc,itmax,itrace,irst,ipart integer(psb_ipk_) :: np, iam diff --git a/test/pargen/psb_s_pde2d.f90 b/test/pargen/psb_s_pde2d.f90 index b0fe9a7e..2a79da53 100644 --- a/test/pargen/psb_s_pde2d.f90 +++ b/test/pargen/psb_s_pde2d.f90 @@ -176,7 +176,8 @@ contains type(psb_sspmat_type) :: a type(psb_s_vect_type) :: xv,bv type(psb_desc_type) :: desc_a - integer(psb_ipk_) :: ictxt, info + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: info character(len=*) :: afmt procedure(s_func_2d), optional :: f class(psb_s_base_sparse_mat), optional :: amold @@ -556,7 +557,8 @@ program psb_s_pde2d ! dense vectors type(psb_s_vect_type) :: xxv,bv ! parallel environment - integer(psb_ipk_) :: ictxt, iam, np + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: iam, np ! solver parameters integer(psb_ipk_) :: iter, itmax,itrace, istopc, irst, ipart @@ -705,7 +707,7 @@ contains ! get iteration parameters from standard input ! subroutine get_parms(ictxt,kmethd,ptype,afmt,idim,istopc,itmax,itrace,irst,ipart) - integer(psb_ipk_) :: ictxt + type(psb_ctxt_type) :: ictxt character(len=*) :: kmethd, ptype, afmt integer(psb_ipk_) :: idim, istopc,itmax,itrace,irst,ipart integer(psb_ipk_) :: np, iam diff --git a/test/pargen/psb_s_pde3d.f90 b/test/pargen/psb_s_pde3d.f90 index e7c7725e..da1d65f1 100644 --- a/test/pargen/psb_s_pde3d.f90 +++ b/test/pargen/psb_s_pde3d.f90 @@ -192,7 +192,8 @@ contains type(psb_sspmat_type) :: a type(psb_s_vect_type) :: xv,bv type(psb_desc_type) :: desc_a - integer(psb_ipk_) :: ictxt, info + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: info character(len=*) :: afmt procedure(s_func_3d), optional :: f class(psb_s_base_sparse_mat), optional :: amold @@ -597,7 +598,8 @@ program psb_s_pde3d ! dense vectors type(psb_s_vect_type) :: xxv,bv ! parallel environment - integer(psb_ipk_) :: ictxt, iam, np + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: iam, np ! solver parameters integer(psb_ipk_) :: iter, itmax,itrace, istopc, irst, ipart @@ -746,7 +748,7 @@ contains ! get iteration parameters from standard input ! subroutine get_parms(ictxt,kmethd,ptype,afmt,idim,istopc,itmax,itrace,irst,ipart) - integer(psb_ipk_) :: ictxt + type(psb_ctxt_type) :: ictxt character(len=*) :: kmethd, ptype, afmt integer(psb_ipk_) :: idim, istopc,itmax,itrace,irst,ipart integer(psb_ipk_) :: np, iam diff --git a/test/serial/d_matgen.F90 b/test/serial/d_matgen.F90 index ab41f790..e96a1de9 100644 --- a/test/serial/d_matgen.F90 +++ b/test/serial/d_matgen.F90 @@ -58,7 +58,8 @@ contains type(psb_dspmat_type) :: a type(psb_d_vect_type) :: xv,bv type(psb_desc_type) :: desc_a - integer(psb_ipk_) :: ictxt, info + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: info character(len=*) :: afmt procedure(d_func_3d), optional :: f class(psb_d_base_sparse_mat), optional :: amold @@ -377,7 +378,8 @@ program d_matgen ! dense matrices type(psb_d_vect_type) :: b, x ! blacs parameters - integer(psb_ipk_) :: ictxt, iam, np + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: iam, np ! solver parameters integer(psb_ipk_) :: iter, itmax,itrace, istopc, irst @@ -438,7 +440,7 @@ contains ! get iteration parameters from standard input ! subroutine get_parms(ictxt,idim) - integer(psb_ipk_) :: ictxt + type(psb_ctxt_type) :: ictxt integer(psb_ipk_) :: idim integer(psb_ipk_) :: np, iam integer(psb_ipk_) :: intbuf(10), ip diff --git a/test/torture/psb_c_mvsv_tester.f90 b/test/torture/psb_c_mvsv_tester.f90 index f1f72183..468a0297 100644 --- a/test/torture/psb_c_mvsv_tester.f90 +++ b/test/torture/psb_c_mvsv_tester.f90 @@ -7,7 +7,8 @@ contains character(len=*) :: afmt type(psb_cspmat_type) :: a type(psb_desc_type) :: desc_a - integer(psb_ipk_) :: ictxt, iam=-1, np=-1 + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: iam=-1, np=-1 integer(psb_ipk_) :: info=-1 integer(psb_ipk_) ::res,istat=0,i @@ -83,7 +84,8 @@ contains character(len=*) :: afmt type(psb_cspmat_type) :: a type(psb_desc_type) :: desc_a - integer(psb_ipk_) :: ictxt, iam=-1, np=-1 + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: iam=-1, np=-1 integer(psb_ipk_) :: info=-1 integer(psb_ipk_) ::res,istat=0,i @@ -159,7 +161,8 @@ contains character(len=*) :: afmt type(psb_cspmat_type) :: a type(psb_desc_type) :: desc_a - integer(psb_ipk_) :: ictxt, iam=-1, np=-1 + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: iam=-1, np=-1 integer(psb_ipk_) :: info=-1 integer(psb_ipk_) ::res,istat=0,i @@ -235,7 +238,8 @@ contains character(len=*) :: afmt type(psb_cspmat_type) :: a type(psb_desc_type) :: desc_a - integer(psb_ipk_) :: ictxt, iam=-1, np=-1 + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: iam=-1, np=-1 integer(psb_ipk_) :: info=-1 integer(psb_ipk_) ::res,istat=0,i @@ -311,7 +315,8 @@ contains character(len=*) :: afmt type(psb_cspmat_type) :: a type(psb_desc_type) :: desc_a - integer(psb_ipk_) :: ictxt, iam=-1, np=-1 + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: iam=-1, np=-1 integer(psb_ipk_) :: info=-1 integer(psb_ipk_) ::res,istat=0,i @@ -387,7 +392,8 @@ contains character(len=*) :: afmt type(psb_cspmat_type) :: a type(psb_desc_type) :: desc_a - integer(psb_ipk_) :: ictxt, iam=-1, np=-1 + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: iam=-1, np=-1 integer(psb_ipk_) :: info=-1 integer(psb_ipk_) ::res,istat=0,i @@ -463,7 +469,8 @@ contains character(len=*) :: afmt type(psb_cspmat_type) :: a type(psb_desc_type) :: desc_a - integer(psb_ipk_) :: ictxt, iam=-1, np=-1 + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: iam=-1, np=-1 integer(psb_ipk_) :: info=-1 integer(psb_ipk_) ::res,istat=0,i @@ -539,7 +546,8 @@ contains character(len=*) :: afmt type(psb_cspmat_type) :: a type(psb_desc_type) :: desc_a - integer(psb_ipk_) :: ictxt, iam=-1, np=-1 + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: iam=-1, np=-1 integer(psb_ipk_) :: info=-1 integer(psb_ipk_) ::res,istat=0,i @@ -615,7 +623,8 @@ contains character(len=*) :: afmt type(psb_cspmat_type) :: a type(psb_desc_type) :: desc_a - integer(psb_ipk_) :: ictxt, iam=-1, np=-1 + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: iam=-1, np=-1 integer(psb_ipk_) :: info=-1 integer(psb_ipk_) ::res,istat=0,i @@ -691,7 +700,8 @@ contains character(len=*) :: afmt type(psb_cspmat_type) :: a type(psb_desc_type) :: desc_a - integer(psb_ipk_) :: ictxt, iam=-1, np=-1 + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: iam=-1, np=-1 integer(psb_ipk_) :: info=-1 integer(psb_ipk_) ::res,istat=0,i @@ -767,7 +777,8 @@ contains character(len=*) :: afmt type(psb_cspmat_type) :: a type(psb_desc_type) :: desc_a - integer(psb_ipk_) :: ictxt, iam=-1, np=-1 + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: iam=-1, np=-1 integer(psb_ipk_) :: info=-1 integer(psb_ipk_) ::res,istat=0,i @@ -843,7 +854,8 @@ contains character(len=*) :: afmt type(psb_cspmat_type) :: a type(psb_desc_type) :: desc_a - integer(psb_ipk_) :: ictxt, iam=-1, np=-1 + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: iam=-1, np=-1 integer(psb_ipk_) :: info=-1 integer(psb_ipk_) ::res,istat=0,i @@ -919,7 +931,8 @@ contains character(len=*) :: afmt type(psb_cspmat_type) :: a type(psb_desc_type) :: desc_a - integer(psb_ipk_) :: ictxt, iam=-1, np=-1 + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: iam=-1, np=-1 integer(psb_ipk_) :: info=-1 integer(psb_ipk_) ::res,istat=0,i @@ -995,7 +1008,8 @@ contains character(len=*) :: afmt type(psb_cspmat_type) :: a type(psb_desc_type) :: desc_a - integer(psb_ipk_) :: ictxt, iam=-1, np=-1 + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: iam=-1, np=-1 integer(psb_ipk_) :: info=-1 integer(psb_ipk_) ::res,istat=0,i @@ -1071,7 +1085,8 @@ contains character(len=*) :: afmt type(psb_cspmat_type) :: a type(psb_desc_type) :: desc_a - integer(psb_ipk_) :: ictxt, iam=-1, np=-1 + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: iam=-1, np=-1 integer(psb_ipk_) :: info=-1 integer(psb_ipk_) ::res,istat=0,i @@ -1147,7 +1162,8 @@ contains character(len=*) :: afmt type(psb_cspmat_type) :: a type(psb_desc_type) :: desc_a - integer(psb_ipk_) :: ictxt, iam=-1, np=-1 + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: iam=-1, np=-1 integer(psb_ipk_) :: info=-1 integer(psb_ipk_) ::res,istat=0,i @@ -1223,7 +1239,8 @@ contains character(len=*) :: afmt type(psb_cspmat_type) :: a type(psb_desc_type) :: desc_a - integer(psb_ipk_) :: ictxt, iam=-1, np=-1 + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: iam=-1, np=-1 integer(psb_ipk_) :: info=-1 integer(psb_ipk_) ::res,istat=0,i @@ -1299,7 +1316,8 @@ contains character(len=*) :: afmt type(psb_cspmat_type) :: a type(psb_desc_type) :: desc_a - integer(psb_ipk_) :: ictxt, iam=-1, np=-1 + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: iam=-1, np=-1 integer(psb_ipk_) :: info=-1 integer(psb_ipk_) ::res,istat=0,i @@ -1375,7 +1393,8 @@ contains character(len=*) :: afmt type(psb_cspmat_type) :: a type(psb_desc_type) :: desc_a - integer(psb_ipk_) :: ictxt, iam=-1, np=-1 + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: iam=-1, np=-1 integer(psb_ipk_) :: info=-1 integer(psb_ipk_) ::res,istat=0,i @@ -1451,7 +1470,8 @@ contains character(len=*) :: afmt type(psb_cspmat_type) :: a type(psb_desc_type) :: desc_a - integer(psb_ipk_) :: ictxt, iam=-1, np=-1 + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: iam=-1, np=-1 integer(psb_ipk_) :: info=-1 integer(psb_ipk_) ::res,istat=0,i @@ -1527,7 +1547,8 @@ contains character(len=*) :: afmt type(psb_cspmat_type) :: a type(psb_desc_type) :: desc_a - integer(psb_ipk_) :: ictxt, iam=-1, np=-1 + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: iam=-1, np=-1 integer(psb_ipk_) :: info=-1 integer(psb_ipk_) ::res,istat=0,i @@ -1603,7 +1624,8 @@ contains character(len=*) :: afmt type(psb_cspmat_type) :: a type(psb_desc_type) :: desc_a - integer(psb_ipk_) :: ictxt, iam=-1, np=-1 + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: iam=-1, np=-1 integer(psb_ipk_) :: info=-1 integer(psb_ipk_) ::res,istat=0,i @@ -1679,7 +1701,8 @@ contains character(len=*) :: afmt type(psb_cspmat_type) :: a type(psb_desc_type) :: desc_a - integer(psb_ipk_) :: ictxt, iam=-1, np=-1 + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: iam=-1, np=-1 integer(psb_ipk_) :: info=-1 integer(psb_ipk_) ::res,istat=0,i @@ -1755,7 +1778,8 @@ contains character(len=*) :: afmt type(psb_cspmat_type) :: a type(psb_desc_type) :: desc_a - integer(psb_ipk_) :: ictxt, iam=-1, np=-1 + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: iam=-1, np=-1 integer(psb_ipk_) :: info=-1 integer(psb_ipk_) ::res,istat=0,i @@ -1831,7 +1855,8 @@ contains character(len=*) :: afmt type(psb_cspmat_type) :: a type(psb_desc_type) :: desc_a - integer(psb_ipk_) :: ictxt, iam=-1, np=-1 + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: iam=-1, np=-1 integer(psb_ipk_) :: info=-1 integer(psb_ipk_) ::res,istat=0,i @@ -1910,7 +1935,8 @@ contains character(len=*) :: afmt type(psb_cspmat_type) :: a type(psb_desc_type) :: desc_a - integer(psb_ipk_) :: ictxt, iam=-1, np=-1 + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: iam=-1, np=-1 integer(psb_ipk_) :: info=-1 integer(psb_ipk_) ::res,istat=0,i @@ -1989,7 +2015,8 @@ contains character(len=*) :: afmt type(psb_cspmat_type) :: a type(psb_desc_type) :: desc_a - integer(psb_ipk_) :: ictxt, iam=-1, np=-1 + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: iam=-1, np=-1 integer(psb_ipk_) :: info=-1 integer(psb_ipk_) ::res,istat=0,i @@ -2068,7 +2095,8 @@ contains character(len=*) :: afmt type(psb_cspmat_type) :: a type(psb_desc_type) :: desc_a - integer(psb_ipk_) :: ictxt, iam=-1, np=-1 + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: iam=-1, np=-1 integer(psb_ipk_) :: info=-1 integer(psb_ipk_) ::res,istat=0,i @@ -2147,7 +2175,8 @@ contains character(len=*) :: afmt type(psb_cspmat_type) :: a type(psb_desc_type) :: desc_a - integer(psb_ipk_) :: ictxt, iam=-1, np=-1 + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: iam=-1, np=-1 integer(psb_ipk_) :: info=-1 integer(psb_ipk_) ::res,istat=0,i @@ -2226,7 +2255,8 @@ contains character(len=*) :: afmt type(psb_cspmat_type) :: a type(psb_desc_type) :: desc_a - integer(psb_ipk_) :: ictxt, iam=-1, np=-1 + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: iam=-1, np=-1 integer(psb_ipk_) :: info=-1 integer(psb_ipk_) ::res,istat=0,i @@ -2305,7 +2335,8 @@ contains character(len=*) :: afmt type(psb_cspmat_type) :: a type(psb_desc_type) :: desc_a - integer(psb_ipk_) :: ictxt, iam=-1, np=-1 + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: iam=-1, np=-1 integer(psb_ipk_) :: info=-1 integer(psb_ipk_) ::res,istat=0,i @@ -2384,7 +2415,8 @@ contains character(len=*) :: afmt type(psb_cspmat_type) :: a type(psb_desc_type) :: desc_a - integer(psb_ipk_) :: ictxt, iam=-1, np=-1 + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: iam=-1, np=-1 integer(psb_ipk_) :: info=-1 integer(psb_ipk_) ::res,istat=0,i @@ -2463,7 +2495,8 @@ contains character(len=*) :: afmt type(psb_cspmat_type) :: a type(psb_desc_type) :: desc_a - integer(psb_ipk_) :: ictxt, iam=-1, np=-1 + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: iam=-1, np=-1 integer(psb_ipk_) :: info=-1 integer(psb_ipk_) ::res,istat=0,i @@ -2542,7 +2575,8 @@ contains character(len=*) :: afmt type(psb_cspmat_type) :: a type(psb_desc_type) :: desc_a - integer(psb_ipk_) :: ictxt, iam=-1, np=-1 + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: iam=-1, np=-1 integer(psb_ipk_) :: info=-1 integer(psb_ipk_) ::res,istat=0,i @@ -2621,7 +2655,8 @@ contains character(len=*) :: afmt type(psb_cspmat_type) :: a type(psb_desc_type) :: desc_a - integer(psb_ipk_) :: ictxt, iam=-1, np=-1 + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: iam=-1, np=-1 integer(psb_ipk_) :: info=-1 integer(psb_ipk_) ::res,istat=0,i @@ -2700,7 +2735,8 @@ contains character(len=*) :: afmt type(psb_cspmat_type) :: a type(psb_desc_type) :: desc_a - integer(psb_ipk_) :: ictxt, iam=-1, np=-1 + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: iam=-1, np=-1 integer(psb_ipk_) :: info=-1 integer(psb_ipk_) ::res,istat=0,i diff --git a/test/torture/psb_d_mvsv_tester.f90 b/test/torture/psb_d_mvsv_tester.f90 index 44d11336..c34bcf56 100644 --- a/test/torture/psb_d_mvsv_tester.f90 +++ b/test/torture/psb_d_mvsv_tester.f90 @@ -8,7 +8,8 @@ contains character(len=*) :: afmt type(psb_dspmat_type) :: a type(psb_desc_type) :: desc_a - integer(psb_ipk_) :: ictxt, iam=-1, np=-1 + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: iam=-1, np=-1 integer(psb_ipk_) :: info=-1 integer(psb_ipk_) ::res,istat=0,i @@ -84,7 +85,8 @@ contains character(len=*) :: afmt type(psb_dspmat_type) :: a type(psb_desc_type) :: desc_a - integer(psb_ipk_) :: ictxt, iam=-1, np=-1 + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: iam=-1, np=-1 integer(psb_ipk_) :: info=-1 integer(psb_ipk_) ::res,istat=0,i @@ -160,7 +162,8 @@ contains character(len=*) :: afmt type(psb_dspmat_type) :: a type(psb_desc_type) :: desc_a - integer(psb_ipk_) :: ictxt, iam=-1, np=-1 + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: iam=-1, np=-1 integer(psb_ipk_) :: info=-1 integer(psb_ipk_) ::res,istat=0,i @@ -236,7 +239,8 @@ contains character(len=*) :: afmt type(psb_dspmat_type) :: a type(psb_desc_type) :: desc_a - integer(psb_ipk_) :: ictxt, iam=-1, np=-1 + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: iam=-1, np=-1 integer(psb_ipk_) :: info=-1 integer(psb_ipk_) ::res,istat=0,i @@ -312,7 +316,8 @@ contains character(len=*) :: afmt type(psb_dspmat_type) :: a type(psb_desc_type) :: desc_a - integer(psb_ipk_) :: ictxt, iam=-1, np=-1 + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: iam=-1, np=-1 integer(psb_ipk_) :: info=-1 integer(psb_ipk_) ::res,istat=0,i @@ -388,7 +393,8 @@ contains character(len=*) :: afmt type(psb_dspmat_type) :: a type(psb_desc_type) :: desc_a - integer(psb_ipk_) :: ictxt, iam=-1, np=-1 + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: iam=-1, np=-1 integer(psb_ipk_) :: info=-1 integer(psb_ipk_) ::res,istat=0,i @@ -464,7 +470,8 @@ contains character(len=*) :: afmt type(psb_dspmat_type) :: a type(psb_desc_type) :: desc_a - integer(psb_ipk_) :: ictxt, iam=-1, np=-1 + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: iam=-1, np=-1 integer(psb_ipk_) :: info=-1 integer(psb_ipk_) ::res,istat=0,i @@ -540,7 +547,8 @@ contains character(len=*) :: afmt type(psb_dspmat_type) :: a type(psb_desc_type) :: desc_a - integer(psb_ipk_) :: ictxt, iam=-1, np=-1 + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: iam=-1, np=-1 integer(psb_ipk_) :: info=-1 integer(psb_ipk_) ::res,istat=0,i @@ -616,7 +624,8 @@ contains character(len=*) :: afmt type(psb_dspmat_type) :: a type(psb_desc_type) :: desc_a - integer(psb_ipk_) :: ictxt, iam=-1, np=-1 + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: iam=-1, np=-1 integer(psb_ipk_) :: info=-1 integer(psb_ipk_) ::res,istat=0,i @@ -692,7 +701,8 @@ contains character(len=*) :: afmt type(psb_dspmat_type) :: a type(psb_desc_type) :: desc_a - integer(psb_ipk_) :: ictxt, iam=-1, np=-1 + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: iam=-1, np=-1 integer(psb_ipk_) :: info=-1 integer(psb_ipk_) ::res,istat=0,i @@ -768,7 +778,8 @@ contains character(len=*) :: afmt type(psb_dspmat_type) :: a type(psb_desc_type) :: desc_a - integer(psb_ipk_) :: ictxt, iam=-1, np=-1 + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: iam=-1, np=-1 integer(psb_ipk_) :: info=-1 integer(psb_ipk_) ::res,istat=0,i @@ -844,7 +855,8 @@ contains character(len=*) :: afmt type(psb_dspmat_type) :: a type(psb_desc_type) :: desc_a - integer(psb_ipk_) :: ictxt, iam=-1, np=-1 + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: iam=-1, np=-1 integer(psb_ipk_) :: info=-1 integer(psb_ipk_) ::res,istat=0,i @@ -920,7 +932,8 @@ contains character(len=*) :: afmt type(psb_dspmat_type) :: a type(psb_desc_type) :: desc_a - integer(psb_ipk_) :: ictxt, iam=-1, np=-1 + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: iam=-1, np=-1 integer(psb_ipk_) :: info=-1 integer(psb_ipk_) ::res,istat=0,i @@ -996,7 +1009,8 @@ contains character(len=*) :: afmt type(psb_dspmat_type) :: a type(psb_desc_type) :: desc_a - integer(psb_ipk_) :: ictxt, iam=-1, np=-1 + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: iam=-1, np=-1 integer(psb_ipk_) :: info=-1 integer(psb_ipk_) ::res,istat=0,i @@ -1072,7 +1086,8 @@ contains character(len=*) :: afmt type(psb_dspmat_type) :: a type(psb_desc_type) :: desc_a - integer(psb_ipk_) :: ictxt, iam=-1, np=-1 + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: iam=-1, np=-1 integer(psb_ipk_) :: info=-1 integer(psb_ipk_) ::res,istat=0,i @@ -1148,7 +1163,8 @@ contains character(len=*) :: afmt type(psb_dspmat_type) :: a type(psb_desc_type) :: desc_a - integer(psb_ipk_) :: ictxt, iam=-1, np=-1 + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: iam=-1, np=-1 integer(psb_ipk_) :: info=-1 integer(psb_ipk_) ::res,istat=0,i @@ -1224,7 +1240,8 @@ contains character(len=*) :: afmt type(psb_dspmat_type) :: a type(psb_desc_type) :: desc_a - integer(psb_ipk_) :: ictxt, iam=-1, np=-1 + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: iam=-1, np=-1 integer(psb_ipk_) :: info=-1 integer(psb_ipk_) ::res,istat=0,i @@ -1300,7 +1317,8 @@ contains character(len=*) :: afmt type(psb_dspmat_type) :: a type(psb_desc_type) :: desc_a - integer(psb_ipk_) :: ictxt, iam=-1, np=-1 + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: iam=-1, np=-1 integer(psb_ipk_) :: info=-1 integer(psb_ipk_) ::res,istat=0,i @@ -1376,7 +1394,8 @@ contains character(len=*) :: afmt type(psb_dspmat_type) :: a type(psb_desc_type) :: desc_a - integer(psb_ipk_) :: ictxt, iam=-1, np=-1 + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: iam=-1, np=-1 integer(psb_ipk_) :: info=-1 integer(psb_ipk_) ::res,istat=0,i @@ -1452,7 +1471,8 @@ contains character(len=*) :: afmt type(psb_dspmat_type) :: a type(psb_desc_type) :: desc_a - integer(psb_ipk_) :: ictxt, iam=-1, np=-1 + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: iam=-1, np=-1 integer(psb_ipk_) :: info=-1 integer(psb_ipk_) ::res,istat=0,i @@ -1528,7 +1548,8 @@ contains character(len=*) :: afmt type(psb_dspmat_type) :: a type(psb_desc_type) :: desc_a - integer(psb_ipk_) :: ictxt, iam=-1, np=-1 + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: iam=-1, np=-1 integer(psb_ipk_) :: info=-1 integer(psb_ipk_) ::res,istat=0,i @@ -1604,7 +1625,8 @@ contains character(len=*) :: afmt type(psb_dspmat_type) :: a type(psb_desc_type) :: desc_a - integer(psb_ipk_) :: ictxt, iam=-1, np=-1 + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: iam=-1, np=-1 integer(psb_ipk_) :: info=-1 integer(psb_ipk_) ::res,istat=0,i @@ -1680,7 +1702,8 @@ contains character(len=*) :: afmt type(psb_dspmat_type) :: a type(psb_desc_type) :: desc_a - integer(psb_ipk_) :: ictxt, iam=-1, np=-1 + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: iam=-1, np=-1 integer(psb_ipk_) :: info=-1 integer(psb_ipk_) ::res,istat=0,i @@ -1756,7 +1779,8 @@ contains character(len=*) :: afmt type(psb_dspmat_type) :: a type(psb_desc_type) :: desc_a - integer(psb_ipk_) :: ictxt, iam=-1, np=-1 + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: iam=-1, np=-1 integer(psb_ipk_) :: info=-1 integer(psb_ipk_) ::res,istat=0,i @@ -1832,7 +1856,8 @@ contains character(len=*) :: afmt type(psb_dspmat_type) :: a type(psb_desc_type) :: desc_a - integer(psb_ipk_) :: ictxt, iam=-1, np=-1 + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: iam=-1, np=-1 integer(psb_ipk_) :: info=-1 integer(psb_ipk_) ::res,istat=0,i @@ -1911,7 +1936,8 @@ contains character(len=*) :: afmt type(psb_dspmat_type) :: a type(psb_desc_type) :: desc_a - integer(psb_ipk_) :: ictxt, iam=-1, np=-1 + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: iam=-1, np=-1 integer(psb_ipk_) :: info=-1 integer(psb_ipk_) ::res,istat=0,i @@ -1990,7 +2016,8 @@ contains character(len=*) :: afmt type(psb_dspmat_type) :: a type(psb_desc_type) :: desc_a - integer(psb_ipk_) :: ictxt, iam=-1, np=-1 + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: iam=-1, np=-1 integer(psb_ipk_) :: info=-1 integer(psb_ipk_) ::res,istat=0,i @@ -2069,7 +2096,8 @@ contains character(len=*) :: afmt type(psb_dspmat_type) :: a type(psb_desc_type) :: desc_a - integer(psb_ipk_) :: ictxt, iam=-1, np=-1 + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: iam=-1, np=-1 integer(psb_ipk_) :: info=-1 integer(psb_ipk_) ::res,istat=0,i @@ -2148,7 +2176,8 @@ contains character(len=*) :: afmt type(psb_dspmat_type) :: a type(psb_desc_type) :: desc_a - integer(psb_ipk_) :: ictxt, iam=-1, np=-1 + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: iam=-1, np=-1 integer(psb_ipk_) :: info=-1 integer(psb_ipk_) ::res,istat=0,i @@ -2227,7 +2256,8 @@ contains character(len=*) :: afmt type(psb_dspmat_type) :: a type(psb_desc_type) :: desc_a - integer(psb_ipk_) :: ictxt, iam=-1, np=-1 + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: iam=-1, np=-1 integer(psb_ipk_) :: info=-1 integer(psb_ipk_) ::res,istat=0,i @@ -2306,7 +2336,8 @@ contains character(len=*) :: afmt type(psb_dspmat_type) :: a type(psb_desc_type) :: desc_a - integer(psb_ipk_) :: ictxt, iam=-1, np=-1 + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: iam=-1, np=-1 integer(psb_ipk_) :: info=-1 integer(psb_ipk_) ::res,istat=0,i @@ -2385,7 +2416,8 @@ contains character(len=*) :: afmt type(psb_dspmat_type) :: a type(psb_desc_type) :: desc_a - integer(psb_ipk_) :: ictxt, iam=-1, np=-1 + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: iam=-1, np=-1 integer(psb_ipk_) :: info=-1 integer(psb_ipk_) ::res,istat=0,i @@ -2464,7 +2496,8 @@ contains character(len=*) :: afmt type(psb_dspmat_type) :: a type(psb_desc_type) :: desc_a - integer(psb_ipk_) :: ictxt, iam=-1, np=-1 + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: iam=-1, np=-1 integer(psb_ipk_) :: info=-1 integer(psb_ipk_) ::res,istat=0,i @@ -2543,7 +2576,8 @@ contains character(len=*) :: afmt type(psb_dspmat_type) :: a type(psb_desc_type) :: desc_a - integer(psb_ipk_) :: ictxt, iam=-1, np=-1 + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: iam=-1, np=-1 integer(psb_ipk_) :: info=-1 integer(psb_ipk_) ::res,istat=0,i @@ -2622,7 +2656,8 @@ contains character(len=*) :: afmt type(psb_dspmat_type) :: a type(psb_desc_type) :: desc_a - integer(psb_ipk_) :: ictxt, iam=-1, np=-1 + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: iam=-1, np=-1 integer(psb_ipk_) :: info=-1 integer(psb_ipk_) ::res,istat=0,i @@ -2701,7 +2736,8 @@ contains character(len=*) :: afmt type(psb_dspmat_type) :: a type(psb_desc_type) :: desc_a - integer(psb_ipk_) :: ictxt, iam=-1, np=-1 + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: iam=-1, np=-1 integer(psb_ipk_) :: info=-1 integer(psb_ipk_) ::res,istat=0,i diff --git a/test/torture/psb_s_mvsv_tester.f90 b/test/torture/psb_s_mvsv_tester.f90 index 8203067e..7330df18 100644 --- a/test/torture/psb_s_mvsv_tester.f90 +++ b/test/torture/psb_s_mvsv_tester.f90 @@ -6,7 +6,8 @@ contains character(len=*) :: afmt type(psb_sspmat_type) :: a type(psb_desc_type) :: desc_a - integer(psb_ipk_) :: ictxt, iam=-1, np=-1 + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: iam=-1, np=-1 integer(psb_ipk_) :: info=-1 integer(psb_ipk_) ::res,istat=0,i @@ -82,7 +83,8 @@ contains character(len=*) :: afmt type(psb_sspmat_type) :: a type(psb_desc_type) :: desc_a - integer(psb_ipk_) :: ictxt, iam=-1, np=-1 + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: iam=-1, np=-1 integer(psb_ipk_) :: info=-1 integer(psb_ipk_) ::res,istat=0,i @@ -158,7 +160,8 @@ contains character(len=*) :: afmt type(psb_sspmat_type) :: a type(psb_desc_type) :: desc_a - integer(psb_ipk_) :: ictxt, iam=-1, np=-1 + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: iam=-1, np=-1 integer(psb_ipk_) :: info=-1 integer(psb_ipk_) ::res,istat=0,i @@ -234,7 +237,8 @@ contains character(len=*) :: afmt type(psb_sspmat_type) :: a type(psb_desc_type) :: desc_a - integer(psb_ipk_) :: ictxt, iam=-1, np=-1 + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: iam=-1, np=-1 integer(psb_ipk_) :: info=-1 integer(psb_ipk_) ::res,istat=0,i @@ -310,7 +314,8 @@ contains character(len=*) :: afmt type(psb_sspmat_type) :: a type(psb_desc_type) :: desc_a - integer(psb_ipk_) :: ictxt, iam=-1, np=-1 + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: iam=-1, np=-1 integer(psb_ipk_) :: info=-1 integer(psb_ipk_) ::res,istat=0,i @@ -386,7 +391,8 @@ contains character(len=*) :: afmt type(psb_sspmat_type) :: a type(psb_desc_type) :: desc_a - integer(psb_ipk_) :: ictxt, iam=-1, np=-1 + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: iam=-1, np=-1 integer(psb_ipk_) :: info=-1 integer(psb_ipk_) ::res,istat=0,i @@ -462,7 +468,8 @@ contains character(len=*) :: afmt type(psb_sspmat_type) :: a type(psb_desc_type) :: desc_a - integer(psb_ipk_) :: ictxt, iam=-1, np=-1 + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: iam=-1, np=-1 integer(psb_ipk_) :: info=-1 integer(psb_ipk_) ::res,istat=0,i @@ -538,7 +545,8 @@ contains character(len=*) :: afmt type(psb_sspmat_type) :: a type(psb_desc_type) :: desc_a - integer(psb_ipk_) :: ictxt, iam=-1, np=-1 + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: iam=-1, np=-1 integer(psb_ipk_) :: info=-1 integer(psb_ipk_) ::res,istat=0,i @@ -614,7 +622,8 @@ contains character(len=*) :: afmt type(psb_sspmat_type) :: a type(psb_desc_type) :: desc_a - integer(psb_ipk_) :: ictxt, iam=-1, np=-1 + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: iam=-1, np=-1 integer(psb_ipk_) :: info=-1 integer(psb_ipk_) ::res,istat=0,i @@ -690,7 +699,8 @@ contains character(len=*) :: afmt type(psb_sspmat_type) :: a type(psb_desc_type) :: desc_a - integer(psb_ipk_) :: ictxt, iam=-1, np=-1 + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: iam=-1, np=-1 integer(psb_ipk_) :: info=-1 integer(psb_ipk_) ::res,istat=0,i @@ -766,7 +776,8 @@ contains character(len=*) :: afmt type(psb_sspmat_type) :: a type(psb_desc_type) :: desc_a - integer(psb_ipk_) :: ictxt, iam=-1, np=-1 + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: iam=-1, np=-1 integer(psb_ipk_) :: info=-1 integer(psb_ipk_) ::res,istat=0,i @@ -842,7 +853,8 @@ contains character(len=*) :: afmt type(psb_sspmat_type) :: a type(psb_desc_type) :: desc_a - integer(psb_ipk_) :: ictxt, iam=-1, np=-1 + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: iam=-1, np=-1 integer(psb_ipk_) :: info=-1 integer(psb_ipk_) ::res,istat=0,i @@ -918,7 +930,8 @@ contains character(len=*) :: afmt type(psb_sspmat_type) :: a type(psb_desc_type) :: desc_a - integer(psb_ipk_) :: ictxt, iam=-1, np=-1 + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: iam=-1, np=-1 integer(psb_ipk_) :: info=-1 integer(psb_ipk_) ::res,istat=0,i @@ -994,7 +1007,8 @@ contains character(len=*) :: afmt type(psb_sspmat_type) :: a type(psb_desc_type) :: desc_a - integer(psb_ipk_) :: ictxt, iam=-1, np=-1 + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: iam=-1, np=-1 integer(psb_ipk_) :: info=-1 integer(psb_ipk_) ::res,istat=0,i @@ -1070,7 +1084,8 @@ contains character(len=*) :: afmt type(psb_sspmat_type) :: a type(psb_desc_type) :: desc_a - integer(psb_ipk_) :: ictxt, iam=-1, np=-1 + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: iam=-1, np=-1 integer(psb_ipk_) :: info=-1 integer(psb_ipk_) ::res,istat=0,i @@ -1146,7 +1161,8 @@ contains character(len=*) :: afmt type(psb_sspmat_type) :: a type(psb_desc_type) :: desc_a - integer(psb_ipk_) :: ictxt, iam=-1, np=-1 + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: iam=-1, np=-1 integer(psb_ipk_) :: info=-1 integer(psb_ipk_) ::res,istat=0,i @@ -1222,7 +1238,8 @@ contains character(len=*) :: afmt type(psb_sspmat_type) :: a type(psb_desc_type) :: desc_a - integer(psb_ipk_) :: ictxt, iam=-1, np=-1 + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: iam=-1, np=-1 integer(psb_ipk_) :: info=-1 integer(psb_ipk_) ::res,istat=0,i @@ -1298,7 +1315,8 @@ contains character(len=*) :: afmt type(psb_sspmat_type) :: a type(psb_desc_type) :: desc_a - integer(psb_ipk_) :: ictxt, iam=-1, np=-1 + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: iam=-1, np=-1 integer(psb_ipk_) :: info=-1 integer(psb_ipk_) ::res,istat=0,i @@ -1374,7 +1392,8 @@ contains character(len=*) :: afmt type(psb_sspmat_type) :: a type(psb_desc_type) :: desc_a - integer(psb_ipk_) :: ictxt, iam=-1, np=-1 + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: iam=-1, np=-1 integer(psb_ipk_) :: info=-1 integer(psb_ipk_) ::res,istat=0,i @@ -1450,7 +1469,8 @@ contains character(len=*) :: afmt type(psb_sspmat_type) :: a type(psb_desc_type) :: desc_a - integer(psb_ipk_) :: ictxt, iam=-1, np=-1 + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: iam=-1, np=-1 integer(psb_ipk_) :: info=-1 integer(psb_ipk_) ::res,istat=0,i @@ -1526,7 +1546,8 @@ contains character(len=*) :: afmt type(psb_sspmat_type) :: a type(psb_desc_type) :: desc_a - integer(psb_ipk_) :: ictxt, iam=-1, np=-1 + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: iam=-1, np=-1 integer(psb_ipk_) :: info=-1 integer(psb_ipk_) ::res,istat=0,i @@ -1602,7 +1623,8 @@ contains character(len=*) :: afmt type(psb_sspmat_type) :: a type(psb_desc_type) :: desc_a - integer(psb_ipk_) :: ictxt, iam=-1, np=-1 + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: iam=-1, np=-1 integer(psb_ipk_) :: info=-1 integer(psb_ipk_) ::res,istat=0,i @@ -1678,7 +1700,8 @@ contains character(len=*) :: afmt type(psb_sspmat_type) :: a type(psb_desc_type) :: desc_a - integer(psb_ipk_) :: ictxt, iam=-1, np=-1 + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: iam=-1, np=-1 integer(psb_ipk_) :: info=-1 integer(psb_ipk_) ::res,istat=0,i @@ -1754,7 +1777,8 @@ contains character(len=*) :: afmt type(psb_sspmat_type) :: a type(psb_desc_type) :: desc_a - integer(psb_ipk_) :: ictxt, iam=-1, np=-1 + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: iam=-1, np=-1 integer(psb_ipk_) :: info=-1 integer(psb_ipk_) ::res,istat=0,i @@ -1830,7 +1854,8 @@ contains character(len=*) :: afmt type(psb_sspmat_type) :: a type(psb_desc_type) :: desc_a - integer(psb_ipk_) :: ictxt, iam=-1, np=-1 + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: iam=-1, np=-1 integer(psb_ipk_) :: info=-1 integer(psb_ipk_) ::res,istat=0,i @@ -1908,7 +1933,8 @@ contains character(len=*) :: afmt type(psb_sspmat_type) :: a type(psb_desc_type) :: desc_a - integer(psb_ipk_) :: ictxt, iam=-1, np=-1 + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: iam=-1, np=-1 integer(psb_ipk_) :: info=-1 integer(psb_ipk_) ::res,istat=0,i @@ -1987,7 +2013,8 @@ contains character(len=*) :: afmt type(psb_sspmat_type) :: a type(psb_desc_type) :: desc_a - integer(psb_ipk_) :: ictxt, iam=-1, np=-1 + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: iam=-1, np=-1 integer(psb_ipk_) :: info=-1 integer(psb_ipk_) ::res,istat=0,i @@ -2066,7 +2093,8 @@ contains character(len=*) :: afmt type(psb_sspmat_type) :: a type(psb_desc_type) :: desc_a - integer(psb_ipk_) :: ictxt, iam=-1, np=-1 + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: iam=-1, np=-1 integer(psb_ipk_) :: info=-1 integer(psb_ipk_) ::res,istat=0,i @@ -2145,7 +2173,8 @@ contains character(len=*) :: afmt type(psb_sspmat_type) :: a type(psb_desc_type) :: desc_a - integer(psb_ipk_) :: ictxt, iam=-1, np=-1 + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: iam=-1, np=-1 integer(psb_ipk_) :: info=-1 integer(psb_ipk_) ::res,istat=0,i @@ -2224,7 +2253,8 @@ contains character(len=*) :: afmt type(psb_sspmat_type) :: a type(psb_desc_type) :: desc_a - integer(psb_ipk_) :: ictxt, iam=-1, np=-1 + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: iam=-1, np=-1 integer(psb_ipk_) :: info=-1 integer(psb_ipk_) ::res,istat=0,i @@ -2303,7 +2333,8 @@ contains character(len=*) :: afmt type(psb_sspmat_type) :: a type(psb_desc_type) :: desc_a - integer(psb_ipk_) :: ictxt, iam=-1, np=-1 + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: iam=-1, np=-1 integer(psb_ipk_) :: info=-1 integer(psb_ipk_) ::res,istat=0,i @@ -2382,7 +2413,8 @@ contains character(len=*) :: afmt type(psb_sspmat_type) :: a type(psb_desc_type) :: desc_a - integer(psb_ipk_) :: ictxt, iam=-1, np=-1 + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: iam=-1, np=-1 integer(psb_ipk_) :: info=-1 integer(psb_ipk_) ::res,istat=0,i @@ -2461,7 +2493,8 @@ contains character(len=*) :: afmt type(psb_sspmat_type) :: a type(psb_desc_type) :: desc_a - integer(psb_ipk_) :: ictxt, iam=-1, np=-1 + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: iam=-1, np=-1 integer(psb_ipk_) :: info=-1 integer(psb_ipk_) ::res,istat=0,i @@ -2540,7 +2573,8 @@ contains character(len=*) :: afmt type(psb_sspmat_type) :: a type(psb_desc_type) :: desc_a - integer(psb_ipk_) :: ictxt, iam=-1, np=-1 + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: iam=-1, np=-1 integer(psb_ipk_) :: info=-1 integer(psb_ipk_) ::res,istat=0,i @@ -2619,7 +2653,8 @@ contains character(len=*) :: afmt type(psb_sspmat_type) :: a type(psb_desc_type) :: desc_a - integer(psb_ipk_) :: ictxt, iam=-1, np=-1 + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: iam=-1, np=-1 integer(psb_ipk_) :: info=-1 integer(psb_ipk_) ::res,istat=0,i @@ -2698,7 +2733,8 @@ contains character(len=*) :: afmt type(psb_sspmat_type) :: a type(psb_desc_type) :: desc_a - integer(psb_ipk_) :: ictxt, iam=-1, np=-1 + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: iam=-1, np=-1 integer(psb_ipk_) :: info=-1 integer(psb_ipk_) ::res,istat=0,i diff --git a/test/torture/psb_z_mvsv_tester.f90 b/test/torture/psb_z_mvsv_tester.f90 index 11c4b766..d3fda477 100644 --- a/test/torture/psb_z_mvsv_tester.f90 +++ b/test/torture/psb_z_mvsv_tester.f90 @@ -7,7 +7,8 @@ contains character(len=*) :: afmt type(psb_zspmat_type) :: a type(psb_desc_type) :: desc_a - integer(psb_ipk_) :: ictxt, iam=-1, np=-1 + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: iam=-1, np=-1 integer(psb_ipk_) :: info=-1 integer(psb_ipk_) ::res,istat=0,i @@ -83,7 +84,8 @@ contains character(len=*) :: afmt type(psb_zspmat_type) :: a type(psb_desc_type) :: desc_a - integer(psb_ipk_) :: ictxt, iam=-1, np=-1 + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: iam=-1, np=-1 integer(psb_ipk_) :: info=-1 integer(psb_ipk_) ::res,istat=0,i @@ -159,7 +161,8 @@ contains character(len=*) :: afmt type(psb_zspmat_type) :: a type(psb_desc_type) :: desc_a - integer(psb_ipk_) :: ictxt, iam=-1, np=-1 + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: iam=-1, np=-1 integer(psb_ipk_) :: info=-1 integer(psb_ipk_) ::res,istat=0,i @@ -235,7 +238,8 @@ contains character(len=*) :: afmt type(psb_zspmat_type) :: a type(psb_desc_type) :: desc_a - integer(psb_ipk_) :: ictxt, iam=-1, np=-1 + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: iam=-1, np=-1 integer(psb_ipk_) :: info=-1 integer(psb_ipk_) ::res,istat=0,i @@ -311,7 +315,8 @@ contains character(len=*) :: afmt type(psb_zspmat_type) :: a type(psb_desc_type) :: desc_a - integer(psb_ipk_) :: ictxt, iam=-1, np=-1 + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: iam=-1, np=-1 integer(psb_ipk_) :: info=-1 integer(psb_ipk_) ::res,istat=0,i @@ -387,7 +392,8 @@ contains character(len=*) :: afmt type(psb_zspmat_type) :: a type(psb_desc_type) :: desc_a - integer(psb_ipk_) :: ictxt, iam=-1, np=-1 + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: iam=-1, np=-1 integer(psb_ipk_) :: info=-1 integer(psb_ipk_) ::res,istat=0,i @@ -463,7 +469,8 @@ contains character(len=*) :: afmt type(psb_zspmat_type) :: a type(psb_desc_type) :: desc_a - integer(psb_ipk_) :: ictxt, iam=-1, np=-1 + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: iam=-1, np=-1 integer(psb_ipk_) :: info=-1 integer(psb_ipk_) ::res,istat=0,i @@ -539,7 +546,8 @@ contains character(len=*) :: afmt type(psb_zspmat_type) :: a type(psb_desc_type) :: desc_a - integer(psb_ipk_) :: ictxt, iam=-1, np=-1 + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: iam=-1, np=-1 integer(psb_ipk_) :: info=-1 integer(psb_ipk_) ::res,istat=0,i @@ -615,7 +623,8 @@ contains character(len=*) :: afmt type(psb_zspmat_type) :: a type(psb_desc_type) :: desc_a - integer(psb_ipk_) :: ictxt, iam=-1, np=-1 + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: iam=-1, np=-1 integer(psb_ipk_) :: info=-1 integer(psb_ipk_) ::res,istat=0,i @@ -691,7 +700,8 @@ contains character(len=*) :: afmt type(psb_zspmat_type) :: a type(psb_desc_type) :: desc_a - integer(psb_ipk_) :: ictxt, iam=-1, np=-1 + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: iam=-1, np=-1 integer(psb_ipk_) :: info=-1 integer(psb_ipk_) ::res,istat=0,i @@ -767,7 +777,8 @@ contains character(len=*) :: afmt type(psb_zspmat_type) :: a type(psb_desc_type) :: desc_a - integer(psb_ipk_) :: ictxt, iam=-1, np=-1 + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: iam=-1, np=-1 integer(psb_ipk_) :: info=-1 integer(psb_ipk_) ::res,istat=0,i @@ -843,7 +854,8 @@ contains character(len=*) :: afmt type(psb_zspmat_type) :: a type(psb_desc_type) :: desc_a - integer(psb_ipk_) :: ictxt, iam=-1, np=-1 + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: iam=-1, np=-1 integer(psb_ipk_) :: info=-1 integer(psb_ipk_) ::res,istat=0,i @@ -919,7 +931,8 @@ contains character(len=*) :: afmt type(psb_zspmat_type) :: a type(psb_desc_type) :: desc_a - integer(psb_ipk_) :: ictxt, iam=-1, np=-1 + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: iam=-1, np=-1 integer(psb_ipk_) :: info=-1 integer(psb_ipk_) ::res,istat=0,i @@ -995,7 +1008,8 @@ contains character(len=*) :: afmt type(psb_zspmat_type) :: a type(psb_desc_type) :: desc_a - integer(psb_ipk_) :: ictxt, iam=-1, np=-1 + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: iam=-1, np=-1 integer(psb_ipk_) :: info=-1 integer(psb_ipk_) ::res,istat=0,i @@ -1071,7 +1085,8 @@ contains character(len=*) :: afmt type(psb_zspmat_type) :: a type(psb_desc_type) :: desc_a - integer(psb_ipk_) :: ictxt, iam=-1, np=-1 + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: iam=-1, np=-1 integer(psb_ipk_) :: info=-1 integer(psb_ipk_) ::res,istat=0,i @@ -1147,7 +1162,8 @@ contains character(len=*) :: afmt type(psb_zspmat_type) :: a type(psb_desc_type) :: desc_a - integer(psb_ipk_) :: ictxt, iam=-1, np=-1 + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: iam=-1, np=-1 integer(psb_ipk_) :: info=-1 integer(psb_ipk_) ::res,istat=0,i @@ -1223,7 +1239,8 @@ contains character(len=*) :: afmt type(psb_zspmat_type) :: a type(psb_desc_type) :: desc_a - integer(psb_ipk_) :: ictxt, iam=-1, np=-1 + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: iam=-1, np=-1 integer(psb_ipk_) :: info=-1 integer(psb_ipk_) ::res,istat=0,i @@ -1299,7 +1316,8 @@ contains character(len=*) :: afmt type(psb_zspmat_type) :: a type(psb_desc_type) :: desc_a - integer(psb_ipk_) :: ictxt, iam=-1, np=-1 + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: iam=-1, np=-1 integer(psb_ipk_) :: info=-1 integer(psb_ipk_) ::res,istat=0,i @@ -1375,7 +1393,8 @@ contains character(len=*) :: afmt type(psb_zspmat_type) :: a type(psb_desc_type) :: desc_a - integer(psb_ipk_) :: ictxt, iam=-1, np=-1 + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: iam=-1, np=-1 integer(psb_ipk_) :: info=-1 integer(psb_ipk_) ::res,istat=0,i @@ -1451,7 +1470,8 @@ contains character(len=*) :: afmt type(psb_zspmat_type) :: a type(psb_desc_type) :: desc_a - integer(psb_ipk_) :: ictxt, iam=-1, np=-1 + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: iam=-1, np=-1 integer(psb_ipk_) :: info=-1 integer(psb_ipk_) ::res,istat=0,i @@ -1527,7 +1547,8 @@ contains character(len=*) :: afmt type(psb_zspmat_type) :: a type(psb_desc_type) :: desc_a - integer(psb_ipk_) :: ictxt, iam=-1, np=-1 + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: iam=-1, np=-1 integer(psb_ipk_) :: info=-1 integer(psb_ipk_) ::res,istat=0,i @@ -1603,7 +1624,8 @@ contains character(len=*) :: afmt type(psb_zspmat_type) :: a type(psb_desc_type) :: desc_a - integer(psb_ipk_) :: ictxt, iam=-1, np=-1 + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: iam=-1, np=-1 integer(psb_ipk_) :: info=-1 integer(psb_ipk_) ::res,istat=0,i @@ -1679,7 +1701,8 @@ contains character(len=*) :: afmt type(psb_zspmat_type) :: a type(psb_desc_type) :: desc_a - integer(psb_ipk_) :: ictxt, iam=-1, np=-1 + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: iam=-1, np=-1 integer(psb_ipk_) :: info=-1 integer(psb_ipk_) ::res,istat=0,i @@ -1755,7 +1778,8 @@ contains character(len=*) :: afmt type(psb_zspmat_type) :: a type(psb_desc_type) :: desc_a - integer(psb_ipk_) :: ictxt, iam=-1, np=-1 + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: iam=-1, np=-1 integer(psb_ipk_) :: info=-1 integer(psb_ipk_) ::res,istat=0,i @@ -1831,7 +1855,8 @@ contains character(len=*) :: afmt type(psb_zspmat_type) :: a type(psb_desc_type) :: desc_a - integer(psb_ipk_) :: ictxt, iam=-1, np=-1 + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: iam=-1, np=-1 integer(psb_ipk_) :: info=-1 integer(psb_ipk_) ::res,istat=0,i @@ -1910,7 +1935,8 @@ contains character(len=*) :: afmt type(psb_zspmat_type) :: a type(psb_desc_type) :: desc_a - integer(psb_ipk_) :: ictxt, iam=-1, np=-1 + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: iam=-1, np=-1 integer(psb_ipk_) :: info=-1 integer(psb_ipk_) ::res,istat=0,i @@ -1989,7 +2015,8 @@ contains character(len=*) :: afmt type(psb_zspmat_type) :: a type(psb_desc_type) :: desc_a - integer(psb_ipk_) :: ictxt, iam=-1, np=-1 + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: iam=-1, np=-1 integer(psb_ipk_) :: info=-1 integer(psb_ipk_) ::res,istat=0,i @@ -2068,7 +2095,8 @@ contains character(len=*) :: afmt type(psb_zspmat_type) :: a type(psb_desc_type) :: desc_a - integer(psb_ipk_) :: ictxt, iam=-1, np=-1 + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: iam=-1, np=-1 integer(psb_ipk_) :: info=-1 integer(psb_ipk_) ::res,istat=0,i @@ -2147,7 +2175,8 @@ contains character(len=*) :: afmt type(psb_zspmat_type) :: a type(psb_desc_type) :: desc_a - integer(psb_ipk_) :: ictxt, iam=-1, np=-1 + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: iam=-1, np=-1 integer(psb_ipk_) :: info=-1 integer(psb_ipk_) ::res,istat=0,i @@ -2226,7 +2255,8 @@ contains character(len=*) :: afmt type(psb_zspmat_type) :: a type(psb_desc_type) :: desc_a - integer(psb_ipk_) :: ictxt, iam=-1, np=-1 + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: iam=-1, np=-1 integer(psb_ipk_) :: info=-1 integer(psb_ipk_) ::res,istat=0,i @@ -2305,7 +2335,8 @@ contains character(len=*) :: afmt type(psb_zspmat_type) :: a type(psb_desc_type) :: desc_a - integer(psb_ipk_) :: ictxt, iam=-1, np=-1 + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: iam=-1, np=-1 integer(psb_ipk_) :: info=-1 integer(psb_ipk_) ::res,istat=0,i @@ -2384,7 +2415,8 @@ contains character(len=*) :: afmt type(psb_zspmat_type) :: a type(psb_desc_type) :: desc_a - integer(psb_ipk_) :: ictxt, iam=-1, np=-1 + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: iam=-1, np=-1 integer(psb_ipk_) :: info=-1 integer(psb_ipk_) ::res,istat=0,i @@ -2463,7 +2495,8 @@ contains character(len=*) :: afmt type(psb_zspmat_type) :: a type(psb_desc_type) :: desc_a - integer(psb_ipk_) :: ictxt, iam=-1, np=-1 + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: iam=-1, np=-1 integer(psb_ipk_) :: info=-1 integer(psb_ipk_) ::res,istat=0,i @@ -2542,7 +2575,8 @@ contains character(len=*) :: afmt type(psb_zspmat_type) :: a type(psb_desc_type) :: desc_a - integer(psb_ipk_) :: ictxt, iam=-1, np=-1 + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: iam=-1, np=-1 integer(psb_ipk_) :: info=-1 integer(psb_ipk_) ::res,istat=0,i @@ -2621,7 +2655,8 @@ contains character(len=*) :: afmt type(psb_zspmat_type) :: a type(psb_desc_type) :: desc_a - integer(psb_ipk_) :: ictxt, iam=-1, np=-1 + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: iam=-1, np=-1 integer(psb_ipk_) :: info=-1 integer(psb_ipk_) ::res,istat=0,i @@ -2700,7 +2735,8 @@ contains character(len=*) :: afmt type(psb_zspmat_type) :: a type(psb_desc_type) :: desc_a - integer(psb_ipk_) :: ictxt, iam=-1, np=-1 + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: iam=-1, np=-1 integer(psb_ipk_) :: info=-1 integer(psb_ipk_) ::res,istat=0,i diff --git a/util/psb_c_mat_dist_impl.f90 b/util/psb_c_mat_dist_impl.f90 index 7767ce2e..2e57e4f8 100644 --- a/util/psb_c_mat_dist_impl.f90 +++ b/util/psb_c_mat_dist_impl.f90 @@ -75,7 +75,7 @@ subroutine psb_cmatdist(a_glob, a, ictxt, desc_a,& ! parameters type(psb_cspmat_type) :: a_glob - integer(psb_ipk_) :: ictxt + type(psb_ctxt_type) :: ictxt type(psb_cspmat_type) :: a type(psb_desc_type) :: desc_a integer(psb_ipk_), intent(out) :: info @@ -416,7 +416,7 @@ subroutine psb_lcmatdist(a_glob, a, ictxt, desc_a,& ! parameters type(psb_lcspmat_type) :: a_glob - integer(psb_ipk_) :: ictxt + type(psb_ctxt_type) :: ictxt type(psb_cspmat_type) :: a type(psb_desc_type) :: desc_a integer(psb_ipk_), intent(out) :: info diff --git a/util/psb_c_mat_dist_mod.f90 b/util/psb_c_mat_dist_mod.f90 index c46efd2f..8a435e70 100644 --- a/util/psb_c_mat_dist_mod.f90 +++ b/util/psb_c_mat_dist_mod.f90 @@ -32,7 +32,7 @@ module psb_c_mat_dist_mod use psb_base_mod, only : psb_ipk_, psb_spk_, psb_desc_type, psb_parts, & & psb_cspmat_type, psb_c_base_sparse_mat, psb_c_vect_type, & - & psb_lcspmat_type + & psb_lcspmat_type, psb_ctxt_type interface psb_matdist subroutine psb_cmatdist(a_glob, a, ictxt, desc_a,& @@ -76,13 +76,12 @@ module psb_c_mat_dist_mod ! on entry: specifies processor holding a_glob. default: 0 ! on exit : unchanged. ! - import :: psb_ipk_, psb_cspmat_type, psb_spk_, psb_desc_type,& - & psb_c_base_sparse_mat, psb_c_vect_type, psb_parts + import implicit none ! parameters type(psb_cspmat_type) :: a_glob - integer(psb_ipk_) :: ictxt + type(psb_ctxt_type) :: ictxt type(psb_cspmat_type) :: a type(psb_desc_type) :: desc_a integer(psb_ipk_), intent(out) :: info @@ -134,14 +133,12 @@ module psb_c_mat_dist_mod ! on entry: specifies processor holding a_glob. default: 0 ! on exit : unchanged. ! - import :: psb_ipk_, psb_cspmat_type, psb_spk_, psb_desc_type,& - & psb_c_base_sparse_mat, psb_c_vect_type, psb_parts, & - & psb_lcspmat_type + import implicit none ! parameters type(psb_lcspmat_type) :: a_glob - integer(psb_ipk_) :: ictxt + type(psb_ctxt_type) :: ictxt type(psb_cspmat_type) :: a type(psb_desc_type) :: desc_a integer(psb_ipk_), intent(out) :: info diff --git a/util/psb_d_mat_dist_impl.f90 b/util/psb_d_mat_dist_impl.f90 index 17df5f69..0dbc4682 100644 --- a/util/psb_d_mat_dist_impl.f90 +++ b/util/psb_d_mat_dist_impl.f90 @@ -75,7 +75,7 @@ subroutine psb_dmatdist(a_glob, a, ictxt, desc_a,& ! parameters type(psb_dspmat_type) :: a_glob - integer(psb_ipk_) :: ictxt + type(psb_ctxt_type) :: ictxt type(psb_dspmat_type) :: a type(psb_desc_type) :: desc_a integer(psb_ipk_), intent(out) :: info @@ -416,7 +416,7 @@ subroutine psb_ldmatdist(a_glob, a, ictxt, desc_a,& ! parameters type(psb_ldspmat_type) :: a_glob - integer(psb_ipk_) :: ictxt + type(psb_ctxt_type) :: ictxt type(psb_dspmat_type) :: a type(psb_desc_type) :: desc_a integer(psb_ipk_), intent(out) :: info diff --git a/util/psb_d_mat_dist_mod.f90 b/util/psb_d_mat_dist_mod.f90 index dc0e4958..a1ed3a7c 100644 --- a/util/psb_d_mat_dist_mod.f90 +++ b/util/psb_d_mat_dist_mod.f90 @@ -32,7 +32,7 @@ module psb_d_mat_dist_mod use psb_base_mod, only : psb_ipk_, psb_dpk_, psb_desc_type, psb_parts, & & psb_dspmat_type, psb_d_base_sparse_mat, psb_d_vect_type, & - & psb_ldspmat_type + & psb_ldspmat_type, psb_ctxt_type interface psb_matdist subroutine psb_dmatdist(a_glob, a, ictxt, desc_a,& @@ -76,13 +76,12 @@ module psb_d_mat_dist_mod ! on entry: specifies processor holding a_glob. default: 0 ! on exit : unchanged. ! - import :: psb_ipk_, psb_dspmat_type, psb_dpk_, psb_desc_type,& - & psb_d_base_sparse_mat, psb_d_vect_type, psb_parts + import implicit none ! parameters type(psb_dspmat_type) :: a_glob - integer(psb_ipk_) :: ictxt + type(psb_ctxt_type) :: ictxt type(psb_dspmat_type) :: a type(psb_desc_type) :: desc_a integer(psb_ipk_), intent(out) :: info @@ -134,14 +133,12 @@ module psb_d_mat_dist_mod ! on entry: specifies processor holding a_glob. default: 0 ! on exit : unchanged. ! - import :: psb_ipk_, psb_dspmat_type, psb_dpk_, psb_desc_type,& - & psb_d_base_sparse_mat, psb_d_vect_type, psb_parts, & - & psb_ldspmat_type + import implicit none ! parameters type(psb_ldspmat_type) :: a_glob - integer(psb_ipk_) :: ictxt + type(psb_ctxt_type) :: ictxt type(psb_dspmat_type) :: a type(psb_desc_type) :: desc_a integer(psb_ipk_), intent(out) :: info diff --git a/util/psb_metispart_mod.F90 b/util/psb_metispart_mod.F90 index 8a928b84..f1c7195d 100644 --- a/util/psb_metispart_mod.F90 +++ b/util/psb_metispart_mod.F90 @@ -55,7 +55,7 @@ ! module psb_metispart_mod use psb_base_mod, only : psb_ipk_, psb_lpk_, psb_mpk_, psb_epk_, & - & psb_err_unit, psb_spk_, psb_dpk_,& + & psb_err_unit, psb_spk_, psb_dpk_, psb_ctxt_type,& & psb_lsspmat_type, psb_lcspmat_type,& & psb_ldspmat_type, psb_lzspmat_type, & & psb_ls_csr_sparse_mat, psb_ld_csr_sparse_mat, & @@ -115,7 +115,8 @@ contains subroutine distr_mtpart(root, ictxt) use psb_base_mod implicit none - integer(psb_ipk_) :: root, ictxt + type(psb_ctxt_type) :: ictxt + integer(psb_ipk_) :: root integer(psb_ipk_) :: me, np, info integer(psb_lpk_) :: n diff --git a/util/psb_s_mat_dist_impl.f90 b/util/psb_s_mat_dist_impl.f90 index 2ae59c3d..f4e9e5a8 100644 --- a/util/psb_s_mat_dist_impl.f90 +++ b/util/psb_s_mat_dist_impl.f90 @@ -75,7 +75,7 @@ subroutine psb_smatdist(a_glob, a, ictxt, desc_a,& ! parameters type(psb_sspmat_type) :: a_glob - integer(psb_ipk_) :: ictxt + type(psb_ctxt_type) :: ictxt type(psb_sspmat_type) :: a type(psb_desc_type) :: desc_a integer(psb_ipk_), intent(out) :: info @@ -416,7 +416,7 @@ subroutine psb_lsmatdist(a_glob, a, ictxt, desc_a,& ! parameters type(psb_lsspmat_type) :: a_glob - integer(psb_ipk_) :: ictxt + type(psb_ctxt_type) :: ictxt type(psb_sspmat_type) :: a type(psb_desc_type) :: desc_a integer(psb_ipk_), intent(out) :: info diff --git a/util/psb_s_mat_dist_mod.f90 b/util/psb_s_mat_dist_mod.f90 index c4207da7..c1ae8cc5 100644 --- a/util/psb_s_mat_dist_mod.f90 +++ b/util/psb_s_mat_dist_mod.f90 @@ -32,7 +32,7 @@ module psb_s_mat_dist_mod use psb_base_mod, only : psb_ipk_, psb_spk_, psb_desc_type, psb_parts, & & psb_sspmat_type, psb_s_base_sparse_mat, psb_s_vect_type, & - & psb_lsspmat_type + & psb_lsspmat_type, psb_ctxt_type interface psb_matdist subroutine psb_smatdist(a_glob, a, ictxt, desc_a,& @@ -76,13 +76,12 @@ module psb_s_mat_dist_mod ! on entry: specifies processor holding a_glob. default: 0 ! on exit : unchanged. ! - import :: psb_ipk_, psb_sspmat_type, psb_spk_, psb_desc_type,& - & psb_s_base_sparse_mat, psb_s_vect_type, psb_parts + import implicit none ! parameters type(psb_sspmat_type) :: a_glob - integer(psb_ipk_) :: ictxt + type(psb_ctxt_type) :: ictxt type(psb_sspmat_type) :: a type(psb_desc_type) :: desc_a integer(psb_ipk_), intent(out) :: info @@ -134,14 +133,12 @@ module psb_s_mat_dist_mod ! on entry: specifies processor holding a_glob. default: 0 ! on exit : unchanged. ! - import :: psb_ipk_, psb_sspmat_type, psb_spk_, psb_desc_type,& - & psb_s_base_sparse_mat, psb_s_vect_type, psb_parts, & - & psb_lsspmat_type + import implicit none ! parameters type(psb_lsspmat_type) :: a_glob - integer(psb_ipk_) :: ictxt + type(psb_ctxt_type) :: ictxt type(psb_sspmat_type) :: a type(psb_desc_type) :: desc_a integer(psb_ipk_), intent(out) :: info diff --git a/util/psb_z_mat_dist_impl.f90 b/util/psb_z_mat_dist_impl.f90 index d45382f3..770e3527 100644 --- a/util/psb_z_mat_dist_impl.f90 +++ b/util/psb_z_mat_dist_impl.f90 @@ -75,7 +75,7 @@ subroutine psb_zmatdist(a_glob, a, ictxt, desc_a,& ! parameters type(psb_zspmat_type) :: a_glob - integer(psb_ipk_) :: ictxt + type(psb_ctxt_type) :: ictxt type(psb_zspmat_type) :: a type(psb_desc_type) :: desc_a integer(psb_ipk_), intent(out) :: info @@ -416,7 +416,7 @@ subroutine psb_lzmatdist(a_glob, a, ictxt, desc_a,& ! parameters type(psb_lzspmat_type) :: a_glob - integer(psb_ipk_) :: ictxt + type(psb_ctxt_type) :: ictxt type(psb_zspmat_type) :: a type(psb_desc_type) :: desc_a integer(psb_ipk_), intent(out) :: info diff --git a/util/psb_z_mat_dist_mod.f90 b/util/psb_z_mat_dist_mod.f90 index d10200dd..f34e09f3 100644 --- a/util/psb_z_mat_dist_mod.f90 +++ b/util/psb_z_mat_dist_mod.f90 @@ -32,7 +32,7 @@ module psb_z_mat_dist_mod use psb_base_mod, only : psb_ipk_, psb_dpk_, psb_desc_type, psb_parts, & & psb_zspmat_type, psb_z_base_sparse_mat, psb_z_vect_type, & - & psb_lzspmat_type + & psb_lzspmat_type, psb_ctxt_type interface psb_matdist subroutine psb_zmatdist(a_glob, a, ictxt, desc_a,& @@ -76,13 +76,12 @@ module psb_z_mat_dist_mod ! on entry: specifies processor holding a_glob. default: 0 ! on exit : unchanged. ! - import :: psb_ipk_, psb_zspmat_type, psb_dpk_, psb_desc_type,& - & psb_z_base_sparse_mat, psb_z_vect_type, psb_parts + import implicit none ! parameters type(psb_zspmat_type) :: a_glob - integer(psb_ipk_) :: ictxt + type(psb_ctxt_type) :: ictxt type(psb_zspmat_type) :: a type(psb_desc_type) :: desc_a integer(psb_ipk_), intent(out) :: info @@ -134,14 +133,12 @@ module psb_z_mat_dist_mod ! on entry: specifies processor holding a_glob. default: 0 ! on exit : unchanged. ! - import :: psb_ipk_, psb_zspmat_type, psb_dpk_, psb_desc_type,& - & psb_z_base_sparse_mat, psb_z_vect_type, psb_parts, & - & psb_lzspmat_type + import implicit none ! parameters type(psb_lzspmat_type) :: a_glob - integer(psb_ipk_) :: ictxt + type(psb_ctxt_type) :: ictxt type(psb_zspmat_type) :: a type(psb_desc_type) :: desc_a integer(psb_ipk_), intent(out) :: info