From ea6e473677599770364a55dfd95369d0ea7175b5 Mon Sep 17 00:00:00 2001 From: Salvatore Filippone Date: Fri, 20 Nov 2020 13:26:23 +0100 Subject: [PATCH] Various CTXT fixes --- base/comm/internals/psi_cswapdata.F90 | 28 ++++++++------------- base/comm/internals/psi_cswapdata_a.F90 | 19 ++++++-------- base/comm/internals/psi_cswaptran.F90 | 28 ++++++++------------- base/comm/internals/psi_cswaptran_a.F90 | 28 ++++++++------------- base/comm/internals/psi_dswapdata.F90 | 28 ++++++++------------- base/comm/internals/psi_dswapdata_a.F90 | 19 ++++++-------- base/comm/internals/psi_dswaptran.F90 | 28 ++++++++------------- base/comm/internals/psi_dswaptran_a.F90 | 28 ++++++++------------- base/comm/internals/psi_eswapdata_a.F90 | 19 ++++++-------- base/comm/internals/psi_eswaptran_a.F90 | 28 ++++++++------------- base/comm/internals/psi_i2swapdata_a.F90 | 19 ++++++-------- base/comm/internals/psi_i2swaptran_a.F90 | 28 ++++++++------------- base/comm/internals/psi_iswapdata.F90 | 28 ++++++++------------- base/comm/internals/psi_iswaptran.F90 | 28 ++++++++------------- base/comm/internals/psi_lswapdata.F90 | 28 ++++++++------------- base/comm/internals/psi_lswaptran.F90 | 28 ++++++++------------- base/comm/internals/psi_mswapdata_a.F90 | 19 ++++++-------- base/comm/internals/psi_mswaptran_a.F90 | 28 ++++++++------------- base/comm/internals/psi_sswapdata.F90 | 28 ++++++++------------- base/comm/internals/psi_sswapdata_a.F90 | 19 ++++++-------- base/comm/internals/psi_sswaptran.F90 | 28 ++++++++------------- base/comm/internals/psi_sswaptran_a.F90 | 28 ++++++++------------- base/comm/internals/psi_zswapdata.F90 | 28 ++++++++------------- base/comm/internals/psi_zswapdata_a.F90 | 19 ++++++-------- base/comm/internals/psi_zswaptran.F90 | 28 ++++++++------------- base/comm/internals/psi_zswaptran_a.F90 | 28 ++++++++------------- base/modules/comm/psi_c_comm_v_mod.f90 | 24 +++++++++--------- base/modules/comm/psi_d_comm_v_mod.f90 | 24 +++++++++--------- base/modules/comm/psi_i_comm_v_mod.f90 | 24 +++++++++--------- base/modules/comm/psi_l_comm_v_mod.f90 | 24 +++++++++--------- base/modules/comm/psi_s_comm_v_mod.f90 | 24 +++++++++--------- base/modules/comm/psi_z_comm_v_mod.f90 | 24 +++++++++--------- base/modules/penv/psi_d_collective_mod.F90 | 2 -- base/modules/penv/psi_e_collective_mod.F90 | 2 -- base/modules/penv/psi_i2_collective_mod.F90 | 2 -- base/modules/penv/psi_m_collective_mod.F90 | 2 -- base/modules/penv/psi_s_collective_mod.F90 | 2 -- base/modules/psi_i_mod.F90 | 4 +-- 38 files changed, 313 insertions(+), 510 deletions(-) diff --git a/base/comm/internals/psi_cswapdata.F90 b/base/comm/internals/psi_cswapdata.F90 index 5af5b79e..5f0b8bdc 100644 --- a/base/comm/internals/psi_cswapdata.F90 +++ b/base/comm/internals/psi_cswapdata.F90 @@ -175,7 +175,7 @@ end subroutine psi_cswapdata_vect ! ! ! -subroutine psi_cswap_vidx_vect(ictxt,iicomm,flag,beta,y,idx, & +subroutine psi_cswap_vidx_vect(ctxt,icomm,flag,beta,y,idx, & & totxch,totsnd,totrcv,work,info) use psi_mod, psb_protect_name => psi_cswap_vidx_vect @@ -192,8 +192,8 @@ subroutine psi_cswap_vidx_vect(ictxt,iicomm,flag,beta,y,idx, & include 'mpif.h' #endif - type(psb_ctxt_type), intent(in) :: ictxt - integer(psb_mpk_), intent(in) :: iicomm + type(psb_ctxt_type), intent(in) :: ctxt + integer(psb_mpk_), intent(in) :: icomm integer(psb_ipk_), intent(in) :: flag integer(psb_ipk_), intent(out) :: info class(psb_c_base_vect_type) :: y @@ -203,9 +203,8 @@ subroutine psi_cswap_vidx_vect(ictxt,iicomm,flag,beta,y,idx, & integer(psb_ipk_), intent(in) :: totxch,totsnd, totrcv ! locals - type(psb_ctxt_type) :: ctxt - integer(psb_mpk_) :: icomm, np, me,& - & proc_to_comm, p2ptag, p2pstat(mpi_status_size), iret + integer(psb_ipk_) :: np, me + integer(psb_mpk_) :: proc_to_comm, p2ptag, p2pstat(mpi_status_size), iret integer(psb_mpk_), allocatable :: prcid(:) integer(psb_ipk_) :: nesd, nerv,& & err_act, i, idx_pt, totsnd_, totrcv_,& @@ -218,9 +217,6 @@ subroutine psi_cswap_vidx_vect(ictxt,iicomm,flag,beta,y,idx, & info=psb_success_ name='psi_swap_datav' call psb_erractionsave(err_act) - ctxt = ictxt - icomm = iicomm - call psb_info(ctxt,me,np) if (np == -1) then info=psb_err_context_error_ @@ -517,7 +513,7 @@ end subroutine psi_cswapdata_multivect ! ! ! -subroutine psi_cswap_vidx_multivect(ictxt,iicomm,flag,beta,y,idx, & +subroutine psi_cswap_vidx_multivect(ctxt,icomm,flag,beta,y,idx, & & totxch,totsnd,totrcv,work,info) use psi_mod, psb_protect_name => psi_cswap_vidx_multivect @@ -534,8 +530,8 @@ subroutine psi_cswap_vidx_multivect(ictxt,iicomm,flag,beta,y,idx, & include 'mpif.h' #endif - type(psb_ctxt_type), intent(in) :: ictxt - integer(psb_mpk_), intent(in) :: iicomm + type(psb_ctxt_type), intent(in) :: ctxt + integer(psb_mpk_), intent(in) :: icomm integer(psb_ipk_), intent(in) :: flag integer(psb_ipk_), intent(out) :: info class(psb_c_base_multivect_type) :: y @@ -545,9 +541,8 @@ subroutine psi_cswap_vidx_multivect(ictxt,iicomm,flag,beta,y,idx, & integer(psb_ipk_), intent(in) :: totxch,totsnd, totrcv ! locals - type(psb_ctxt_type) :: ctxt - integer(psb_mpk_) :: icomm, np, me,& - & proc_to_comm, p2ptag, p2pstat(mpi_status_size), iret + integer(psb_ipk_) :: np, me + integer(psb_mpk_) :: proc_to_comm, p2ptag, p2pstat(mpi_status_size), iret integer(psb_mpk_), allocatable :: prcid(:) integer(psb_ipk_) :: nesd, nerv,& & err_act, i, idx_pt, totsnd_, totrcv_,& @@ -560,9 +555,6 @@ subroutine psi_cswap_vidx_multivect(ictxt,iicomm,flag,beta,y,idx, & info=psb_success_ name='psi_swap_datav' call psb_erractionsave(err_act) - ctxt = ictxt - icomm = iicomm - call psb_info(ctxt,me,np) if (np == -1) then info=psb_err_context_error_ diff --git a/base/comm/internals/psi_cswapdata_a.F90 b/base/comm/internals/psi_cswapdata_a.F90 index 43b91872..cdc93aba 100644 --- a/base/comm/internals/psi_cswapdata_a.F90 +++ b/base/comm/internals/psi_cswapdata_a.F90 @@ -179,8 +179,8 @@ subroutine psi_cswapidxm(ctxt,icomm,flag,n,beta,y,idx, & ! locals - integer(psb_mpk_) :: np, me,& - & proc_to_comm, p2ptag, p2pstat(mpi_status_size), iret + integer(psb_ipk_) :: np, me + integer(psb_mpk_) :: proc_to_comm, p2ptag, p2pstat(mpi_status_size), iret integer(psb_mpk_), allocatable, dimension(:) :: bsdidx, brvidx,& & sdsz, rvsz, prcid, rvhd, sdhd integer(psb_ipk_) :: nesd, nerv,& @@ -197,7 +197,6 @@ subroutine psi_cswapidxm(ctxt,icomm,flag,n,beta,y,idx, & info=psb_success_ name='psi_swap_data' call psb_erractionsave(err_act) - call psb_info(ctxt,me,np) if (np == -1) then info=psb_err_context_error_ @@ -641,7 +640,7 @@ end subroutine psi_cswapdatav ! ! ! -subroutine psi_cswapidxv(ictxt,iicomm,flag,beta,y,idx, & +subroutine psi_cswapidxv(ctxt,icomm,flag,beta,y,idx, & & totxch,totsnd,totrcv,work,info) use psi_mod, psb_protect_name => psi_cswapidxv @@ -656,8 +655,8 @@ subroutine psi_cswapidxv(ictxt,iicomm,flag,beta,y,idx, & include 'mpif.h' #endif - type(psb_ctxt_type), intent(in) :: ictxt - integer(psb_mpk_), intent(in) :: iicomm + type(psb_ctxt_type), intent(in) :: ctxt + integer(psb_mpk_), intent(in) :: icomm integer(psb_ipk_), intent(in) :: flag integer(psb_ipk_), intent(out) :: info complex(psb_spk_) :: y(:), beta @@ -665,9 +664,8 @@ subroutine psi_cswapidxv(ictxt,iicomm,flag,beta,y,idx, & integer(psb_ipk_), intent(in) :: idx(:),totxch,totsnd, totrcv ! locals - type(psb_ctxt_type) :: ctxt - integer(psb_mpk_) :: icomm, np, me,& - & proc_to_comm, p2ptag, p2pstat(mpi_status_size), iret + integer(psb_ipk_) :: np, me + integer(psb_mpk_) :: proc_to_comm, p2ptag, p2pstat(mpi_status_size), iret integer(psb_mpk_), allocatable, dimension(:) :: bsdidx, brvidx,& & sdsz, rvsz, prcid, rvhd, sdhd integer(psb_ipk_) :: nesd, nerv,& @@ -684,9 +682,6 @@ subroutine psi_cswapidxv(ictxt,iicomm,flag,beta,y,idx, & info=psb_success_ name='psi_swap_datav' call psb_erractionsave(err_act) - ctxt = ictxt - icomm = iicomm - call psb_info(ctxt,me,np) if (np == -1) then info=psb_err_context_error_ diff --git a/base/comm/internals/psi_cswaptran.F90 b/base/comm/internals/psi_cswaptran.F90 index 401d8435..aefb6b01 100644 --- a/base/comm/internals/psi_cswaptran.F90 +++ b/base/comm/internals/psi_cswaptran.F90 @@ -176,7 +176,7 @@ end subroutine psi_cswaptran_vect ! ! ! -subroutine psi_ctran_vidx_vect(ictxt,iicomm,flag,beta,y,idx,& +subroutine psi_ctran_vidx_vect(ctxt,icomm,flag,beta,y,idx,& & totxch,totsnd,totrcv,work,info) use psi_mod, psb_protect_name => psi_ctran_vidx_vect @@ -193,8 +193,8 @@ subroutine psi_ctran_vidx_vect(ictxt,iicomm,flag,beta,y,idx,& include 'mpif.h' #endif - type(psb_ctxt_type), intent(in) :: ictxt - integer(psb_mpk_), intent(in) :: iicomm + type(psb_ctxt_type), intent(in) :: ctxt + integer(psb_mpk_), intent(in) :: icomm integer(psb_ipk_), intent(in) :: flag integer(psb_ipk_), intent(out) :: info class(psb_c_base_vect_type) :: y @@ -204,9 +204,8 @@ subroutine psi_ctran_vidx_vect(ictxt,iicomm,flag,beta,y,idx,& integer(psb_ipk_), intent(in) :: totxch,totsnd, totrcv ! locals - type(psb_ctxt_type) :: ctxt - integer(psb_mpk_) :: icomm, np, me,& - & proc_to_comm, p2ptag, p2pstat(mpi_status_size), iret + integer(psb_ipk_) :: np, me + integer(psb_mpk_) :: proc_to_comm, p2ptag, p2pstat(mpi_status_size), iret integer(psb_mpk_), allocatable :: prcid(:) integer(psb_ipk_) :: nesd, nerv,& & err_act, i, idx_pt, totsnd_, totrcv_,& @@ -219,9 +218,6 @@ subroutine psi_ctran_vidx_vect(ictxt,iicomm,flag,beta,y,idx,& info=psb_success_ name='psi_swap_tran' call psb_erractionsave(err_act) - ctxt = ictxt - icomm = iicomm - call psb_info(ctxt,me,np) if (np == -1) then info=psb_err_context_error_ @@ -528,7 +524,7 @@ subroutine psi_cswaptran_multivect(flag,beta,y,desc_a,work,info,data) ! ! ! -subroutine psi_ctran_vidx_multivect(ictxt,iicomm,flag,beta,y,idx,& +subroutine psi_ctran_vidx_multivect(ctxt,icomm,flag,beta,y,idx,& & totxch,totsnd,totrcv,work,info) use psi_mod, psb_protect_name => psi_ctran_vidx_multivect @@ -545,8 +541,8 @@ subroutine psi_ctran_vidx_multivect(ictxt,iicomm,flag,beta,y,idx,& include 'mpif.h' #endif - type(psb_ctxt_type), intent(in) :: ictxt - integer(psb_mpk_), intent(in) :: iicomm + type(psb_ctxt_type), intent(in) :: ctxt + integer(psb_mpk_), intent(in) :: icomm integer(psb_ipk_), intent(in) :: flag integer(psb_ipk_), intent(out) :: info class(psb_c_base_multivect_type) :: y @@ -556,9 +552,8 @@ subroutine psi_ctran_vidx_multivect(ictxt,iicomm,flag,beta,y,idx,& integer(psb_ipk_), intent(in) :: totxch,totsnd, totrcv ! locals - type(psb_ctxt_type) :: ctxt - integer(psb_mpk_) :: icomm, np, me,& - & proc_to_comm, p2ptag, p2pstat(mpi_status_size), iret + integer(psb_ipk_) :: np, me + integer(psb_mpk_) :: proc_to_comm, p2ptag, p2pstat(mpi_status_size), iret integer(psb_mpk_), allocatable :: prcid(:) integer(psb_ipk_) :: nesd, nerv,& & err_act, i, idx_pt, totsnd_, totrcv_,& @@ -571,9 +566,6 @@ subroutine psi_ctran_vidx_multivect(ictxt,iicomm,flag,beta,y,idx,& info=psb_success_ name='psi_swap_tran' call psb_erractionsave(err_act) - ctxt = ictxt - icomm = iicomm - call psb_info(ctxt,me,np) if (np == -1) then info=psb_err_context_error_ diff --git a/base/comm/internals/psi_cswaptran_a.F90 b/base/comm/internals/psi_cswaptran_a.F90 index 508e445d..2e75f607 100644 --- a/base/comm/internals/psi_cswaptran_a.F90 +++ b/base/comm/internals/psi_cswaptran_a.F90 @@ -159,7 +159,7 @@ subroutine psi_cswaptranm(flag,n,beta,y,desc_a,work,info,data) return end subroutine psi_cswaptranm -subroutine psi_ctranidxm(ictxt,iicomm,flag,n,beta,y,idx,& +subroutine psi_ctranidxm(ctxt,icomm,flag,n,beta,y,idx,& & totxch,totsnd,totrcv,work,info) use psi_mod, psb_protect_name => psi_ctranidxm @@ -174,8 +174,8 @@ subroutine psi_ctranidxm(ictxt,iicomm,flag,n,beta,y,idx,& include 'mpif.h' #endif - type(psb_ctxt_type), intent(in) :: ictxt - integer(psb_mpk_), intent(in) :: iicomm + type(psb_ctxt_type), intent(in) :: ctxt + integer(psb_mpk_), intent(in) :: icomm integer(psb_ipk_), intent(in) :: flag,n integer(psb_ipk_), intent(out) :: info complex(psb_spk_) :: y(:,:), beta @@ -183,9 +183,8 @@ subroutine psi_ctranidxm(ictxt,iicomm,flag,n,beta,y,idx,& integer(psb_ipk_), intent(in) :: idx(:),totxch,totsnd, totrcv ! locals - type(psb_ctxt_type) :: ctxt - integer(psb_mpk_) :: icomm, np, me,& - & proc_to_comm, p2ptag, p2pstat(mpi_status_size), iret + integer(psb_ipk_) :: np, me + integer(psb_mpk_) :: proc_to_comm, p2ptag, p2pstat(mpi_status_size), iret integer(psb_mpk_), allocatable, dimension(:) :: bsdidx, brvidx,& & sdsz, rvsz, prcid, rvhd, sdhd integer(psb_ipk_) :: nesd, nerv,& @@ -202,9 +201,6 @@ subroutine psi_ctranidxm(ictxt,iicomm,flag,n,beta,y,idx,& info=psb_success_ name='psi_swap_tran' call psb_erractionsave(err_act) - ctxt = ictxt - icomm = iicomm - call psb_info(ctxt,me,np) if (np == -1) then info=psb_err_context_error_ @@ -656,7 +652,7 @@ end subroutine psi_cswaptranv ! ! ! -subroutine psi_ctranidxv(ictxt,iicomm,flag,beta,y,idx,& +subroutine psi_ctranidxv(ctxt,icomm,flag,beta,y,idx,& & totxch,totsnd,totrcv,work,info) use psi_mod, psb_protect_name => psi_ctranidxv @@ -671,8 +667,8 @@ subroutine psi_ctranidxv(ictxt,iicomm,flag,beta,y,idx,& include 'mpif.h' #endif - type(psb_ctxt_type), intent(in) :: ictxt - integer(psb_mpk_), intent(in) :: iicomm + type(psb_ctxt_type), intent(in) :: ctxt + integer(psb_mpk_), intent(in) :: icomm integer(psb_ipk_), intent(in) :: flag integer(psb_ipk_), intent(out) :: info complex(psb_spk_) :: y(:), beta @@ -680,9 +676,8 @@ subroutine psi_ctranidxv(ictxt,iicomm,flag,beta,y,idx,& integer(psb_ipk_), intent(in) :: idx(:),totxch,totsnd, totrcv ! locals - type(psb_ctxt_type) :: ctxt - integer(psb_mpk_) :: icomm, np, me,& - & proc_to_comm, p2ptag, p2pstat(mpi_status_size), iret + integer(psb_ipk_) :: np, me + integer(psb_mpk_) :: proc_to_comm, p2ptag, p2pstat(mpi_status_size), iret integer(psb_mpk_), allocatable, dimension(:) :: bsdidx, brvidx,& & sdsz, rvsz, prcid, rvhd, sdhd integer(psb_ipk_) :: nesd, nerv,& @@ -699,9 +694,6 @@ subroutine psi_ctranidxv(ictxt,iicomm,flag,beta,y,idx,& info=psb_success_ name='psi_swap_tran' call psb_erractionsave(err_act) - ctxt = ictxt - icomm = iicomm - call psb_info(ctxt,me,np) if (np == -1) then info=psb_err_context_error_ diff --git a/base/comm/internals/psi_dswapdata.F90 b/base/comm/internals/psi_dswapdata.F90 index f99f0254..fe529706 100644 --- a/base/comm/internals/psi_dswapdata.F90 +++ b/base/comm/internals/psi_dswapdata.F90 @@ -175,7 +175,7 @@ end subroutine psi_dswapdata_vect ! ! ! -subroutine psi_dswap_vidx_vect(ictxt,iicomm,flag,beta,y,idx, & +subroutine psi_dswap_vidx_vect(ctxt,icomm,flag,beta,y,idx, & & totxch,totsnd,totrcv,work,info) use psi_mod, psb_protect_name => psi_dswap_vidx_vect @@ -192,8 +192,8 @@ subroutine psi_dswap_vidx_vect(ictxt,iicomm,flag,beta,y,idx, & include 'mpif.h' #endif - type(psb_ctxt_type), intent(in) :: ictxt - integer(psb_mpk_), intent(in) :: iicomm + type(psb_ctxt_type), intent(in) :: ctxt + integer(psb_mpk_), intent(in) :: icomm integer(psb_ipk_), intent(in) :: flag integer(psb_ipk_), intent(out) :: info class(psb_d_base_vect_type) :: y @@ -203,9 +203,8 @@ subroutine psi_dswap_vidx_vect(ictxt,iicomm,flag,beta,y,idx, & integer(psb_ipk_), intent(in) :: totxch,totsnd, totrcv ! locals - type(psb_ctxt_type) :: ctxt - integer(psb_mpk_) :: icomm, np, me,& - & proc_to_comm, p2ptag, p2pstat(mpi_status_size), iret + integer(psb_ipk_) :: np, me + integer(psb_mpk_) :: proc_to_comm, p2ptag, p2pstat(mpi_status_size), iret integer(psb_mpk_), allocatable :: prcid(:) integer(psb_ipk_) :: nesd, nerv,& & err_act, i, idx_pt, totsnd_, totrcv_,& @@ -218,9 +217,6 @@ subroutine psi_dswap_vidx_vect(ictxt,iicomm,flag,beta,y,idx, & info=psb_success_ name='psi_swap_datav' call psb_erractionsave(err_act) - ctxt = ictxt - icomm = iicomm - call psb_info(ctxt,me,np) if (np == -1) then info=psb_err_context_error_ @@ -517,7 +513,7 @@ end subroutine psi_dswapdata_multivect ! ! ! -subroutine psi_dswap_vidx_multivect(ictxt,iicomm,flag,beta,y,idx, & +subroutine psi_dswap_vidx_multivect(ctxt,icomm,flag,beta,y,idx, & & totxch,totsnd,totrcv,work,info) use psi_mod, psb_protect_name => psi_dswap_vidx_multivect @@ -534,8 +530,8 @@ subroutine psi_dswap_vidx_multivect(ictxt,iicomm,flag,beta,y,idx, & include 'mpif.h' #endif - type(psb_ctxt_type), intent(in) :: ictxt - integer(psb_mpk_), intent(in) :: iicomm + type(psb_ctxt_type), intent(in) :: ctxt + integer(psb_mpk_), intent(in) :: icomm integer(psb_ipk_), intent(in) :: flag integer(psb_ipk_), intent(out) :: info class(psb_d_base_multivect_type) :: y @@ -545,9 +541,8 @@ subroutine psi_dswap_vidx_multivect(ictxt,iicomm,flag,beta,y,idx, & integer(psb_ipk_), intent(in) :: totxch,totsnd, totrcv ! locals - type(psb_ctxt_type) :: ctxt - integer(psb_mpk_) :: icomm, np, me,& - & proc_to_comm, p2ptag, p2pstat(mpi_status_size), iret + integer(psb_ipk_) :: np, me + integer(psb_mpk_) :: proc_to_comm, p2ptag, p2pstat(mpi_status_size), iret integer(psb_mpk_), allocatable :: prcid(:) integer(psb_ipk_) :: nesd, nerv,& & err_act, i, idx_pt, totsnd_, totrcv_,& @@ -560,9 +555,6 @@ subroutine psi_dswap_vidx_multivect(ictxt,iicomm,flag,beta,y,idx, & info=psb_success_ name='psi_swap_datav' call psb_erractionsave(err_act) - ctxt = ictxt - icomm = iicomm - call psb_info(ctxt,me,np) if (np == -1) then info=psb_err_context_error_ diff --git a/base/comm/internals/psi_dswapdata_a.F90 b/base/comm/internals/psi_dswapdata_a.F90 index b85b1c6d..cd514065 100644 --- a/base/comm/internals/psi_dswapdata_a.F90 +++ b/base/comm/internals/psi_dswapdata_a.F90 @@ -179,8 +179,8 @@ subroutine psi_dswapidxm(ctxt,icomm,flag,n,beta,y,idx, & ! locals - integer(psb_mpk_) :: np, me,& - & proc_to_comm, p2ptag, p2pstat(mpi_status_size), iret + integer(psb_ipk_) :: np, me + integer(psb_mpk_) :: proc_to_comm, p2ptag, p2pstat(mpi_status_size), iret integer(psb_mpk_), allocatable, dimension(:) :: bsdidx, brvidx,& & sdsz, rvsz, prcid, rvhd, sdhd integer(psb_ipk_) :: nesd, nerv,& @@ -197,7 +197,6 @@ subroutine psi_dswapidxm(ctxt,icomm,flag,n,beta,y,idx, & info=psb_success_ name='psi_swap_data' call psb_erractionsave(err_act) - call psb_info(ctxt,me,np) if (np == -1) then info=psb_err_context_error_ @@ -641,7 +640,7 @@ end subroutine psi_dswapdatav ! ! ! -subroutine psi_dswapidxv(ictxt,iicomm,flag,beta,y,idx, & +subroutine psi_dswapidxv(ctxt,icomm,flag,beta,y,idx, & & totxch,totsnd,totrcv,work,info) use psi_mod, psb_protect_name => psi_dswapidxv @@ -656,8 +655,8 @@ subroutine psi_dswapidxv(ictxt,iicomm,flag,beta,y,idx, & include 'mpif.h' #endif - type(psb_ctxt_type), intent(in) :: ictxt - integer(psb_mpk_), intent(in) :: iicomm + type(psb_ctxt_type), intent(in) :: ctxt + integer(psb_mpk_), intent(in) :: icomm integer(psb_ipk_), intent(in) :: flag integer(psb_ipk_), intent(out) :: info real(psb_dpk_) :: y(:), beta @@ -665,9 +664,8 @@ subroutine psi_dswapidxv(ictxt,iicomm,flag,beta,y,idx, & integer(psb_ipk_), intent(in) :: idx(:),totxch,totsnd, totrcv ! locals - type(psb_ctxt_type) :: ctxt - integer(psb_mpk_) :: icomm, np, me,& - & proc_to_comm, p2ptag, p2pstat(mpi_status_size), iret + integer(psb_ipk_) :: np, me + integer(psb_mpk_) :: proc_to_comm, p2ptag, p2pstat(mpi_status_size), iret integer(psb_mpk_), allocatable, dimension(:) :: bsdidx, brvidx,& & sdsz, rvsz, prcid, rvhd, sdhd integer(psb_ipk_) :: nesd, nerv,& @@ -684,9 +682,6 @@ subroutine psi_dswapidxv(ictxt,iicomm,flag,beta,y,idx, & info=psb_success_ name='psi_swap_datav' call psb_erractionsave(err_act) - ctxt = ictxt - icomm = iicomm - call psb_info(ctxt,me,np) if (np == -1) then info=psb_err_context_error_ diff --git a/base/comm/internals/psi_dswaptran.F90 b/base/comm/internals/psi_dswaptran.F90 index de46ad03..df98e1ae 100644 --- a/base/comm/internals/psi_dswaptran.F90 +++ b/base/comm/internals/psi_dswaptran.F90 @@ -176,7 +176,7 @@ end subroutine psi_dswaptran_vect ! ! ! -subroutine psi_dtran_vidx_vect(ictxt,iicomm,flag,beta,y,idx,& +subroutine psi_dtran_vidx_vect(ctxt,icomm,flag,beta,y,idx,& & totxch,totsnd,totrcv,work,info) use psi_mod, psb_protect_name => psi_dtran_vidx_vect @@ -193,8 +193,8 @@ subroutine psi_dtran_vidx_vect(ictxt,iicomm,flag,beta,y,idx,& include 'mpif.h' #endif - type(psb_ctxt_type), intent(in) :: ictxt - integer(psb_mpk_), intent(in) :: iicomm + type(psb_ctxt_type), intent(in) :: ctxt + integer(psb_mpk_), intent(in) :: icomm integer(psb_ipk_), intent(in) :: flag integer(psb_ipk_), intent(out) :: info class(psb_d_base_vect_type) :: y @@ -204,9 +204,8 @@ subroutine psi_dtran_vidx_vect(ictxt,iicomm,flag,beta,y,idx,& integer(psb_ipk_), intent(in) :: totxch,totsnd, totrcv ! locals - type(psb_ctxt_type) :: ctxt - integer(psb_mpk_) :: icomm, np, me,& - & proc_to_comm, p2ptag, p2pstat(mpi_status_size), iret + integer(psb_ipk_) :: np, me + integer(psb_mpk_) :: proc_to_comm, p2ptag, p2pstat(mpi_status_size), iret integer(psb_mpk_), allocatable :: prcid(:) integer(psb_ipk_) :: nesd, nerv,& & err_act, i, idx_pt, totsnd_, totrcv_,& @@ -219,9 +218,6 @@ subroutine psi_dtran_vidx_vect(ictxt,iicomm,flag,beta,y,idx,& info=psb_success_ name='psi_swap_tran' call psb_erractionsave(err_act) - ctxt = ictxt - icomm = iicomm - call psb_info(ctxt,me,np) if (np == -1) then info=psb_err_context_error_ @@ -528,7 +524,7 @@ subroutine psi_dswaptran_multivect(flag,beta,y,desc_a,work,info,data) ! ! ! -subroutine psi_dtran_vidx_multivect(ictxt,iicomm,flag,beta,y,idx,& +subroutine psi_dtran_vidx_multivect(ctxt,icomm,flag,beta,y,idx,& & totxch,totsnd,totrcv,work,info) use psi_mod, psb_protect_name => psi_dtran_vidx_multivect @@ -545,8 +541,8 @@ subroutine psi_dtran_vidx_multivect(ictxt,iicomm,flag,beta,y,idx,& include 'mpif.h' #endif - type(psb_ctxt_type), intent(in) :: ictxt - integer(psb_mpk_), intent(in) :: iicomm + type(psb_ctxt_type), intent(in) :: ctxt + integer(psb_mpk_), intent(in) :: icomm integer(psb_ipk_), intent(in) :: flag integer(psb_ipk_), intent(out) :: info class(psb_d_base_multivect_type) :: y @@ -556,9 +552,8 @@ subroutine psi_dtran_vidx_multivect(ictxt,iicomm,flag,beta,y,idx,& integer(psb_ipk_), intent(in) :: totxch,totsnd, totrcv ! locals - type(psb_ctxt_type) :: ctxt - integer(psb_mpk_) :: icomm, np, me,& - & proc_to_comm, p2ptag, p2pstat(mpi_status_size), iret + integer(psb_ipk_) :: np, me + integer(psb_mpk_) :: proc_to_comm, p2ptag, p2pstat(mpi_status_size), iret integer(psb_mpk_), allocatable :: prcid(:) integer(psb_ipk_) :: nesd, nerv,& & err_act, i, idx_pt, totsnd_, totrcv_,& @@ -571,9 +566,6 @@ subroutine psi_dtran_vidx_multivect(ictxt,iicomm,flag,beta,y,idx,& info=psb_success_ name='psi_swap_tran' call psb_erractionsave(err_act) - ctxt = ictxt - icomm = iicomm - call psb_info(ctxt,me,np) if (np == -1) then info=psb_err_context_error_ diff --git a/base/comm/internals/psi_dswaptran_a.F90 b/base/comm/internals/psi_dswaptran_a.F90 index 8bc7b82f..dd5020d5 100644 --- a/base/comm/internals/psi_dswaptran_a.F90 +++ b/base/comm/internals/psi_dswaptran_a.F90 @@ -159,7 +159,7 @@ subroutine psi_dswaptranm(flag,n,beta,y,desc_a,work,info,data) return end subroutine psi_dswaptranm -subroutine psi_dtranidxm(ictxt,iicomm,flag,n,beta,y,idx,& +subroutine psi_dtranidxm(ctxt,icomm,flag,n,beta,y,idx,& & totxch,totsnd,totrcv,work,info) use psi_mod, psb_protect_name => psi_dtranidxm @@ -174,8 +174,8 @@ subroutine psi_dtranidxm(ictxt,iicomm,flag,n,beta,y,idx,& include 'mpif.h' #endif - type(psb_ctxt_type), intent(in) :: ictxt - integer(psb_mpk_), intent(in) :: iicomm + type(psb_ctxt_type), intent(in) :: ctxt + integer(psb_mpk_), intent(in) :: icomm integer(psb_ipk_), intent(in) :: flag,n integer(psb_ipk_), intent(out) :: info real(psb_dpk_) :: y(:,:), beta @@ -183,9 +183,8 @@ subroutine psi_dtranidxm(ictxt,iicomm,flag,n,beta,y,idx,& integer(psb_ipk_), intent(in) :: idx(:),totxch,totsnd, totrcv ! locals - type(psb_ctxt_type) :: ctxt - integer(psb_mpk_) :: icomm, np, me,& - & proc_to_comm, p2ptag, p2pstat(mpi_status_size), iret + integer(psb_ipk_) :: np, me + integer(psb_mpk_) :: proc_to_comm, p2ptag, p2pstat(mpi_status_size), iret integer(psb_mpk_), allocatable, dimension(:) :: bsdidx, brvidx,& & sdsz, rvsz, prcid, rvhd, sdhd integer(psb_ipk_) :: nesd, nerv,& @@ -202,9 +201,6 @@ subroutine psi_dtranidxm(ictxt,iicomm,flag,n,beta,y,idx,& info=psb_success_ name='psi_swap_tran' call psb_erractionsave(err_act) - ctxt = ictxt - icomm = iicomm - call psb_info(ctxt,me,np) if (np == -1) then info=psb_err_context_error_ @@ -656,7 +652,7 @@ end subroutine psi_dswaptranv ! ! ! -subroutine psi_dtranidxv(ictxt,iicomm,flag,beta,y,idx,& +subroutine psi_dtranidxv(ctxt,icomm,flag,beta,y,idx,& & totxch,totsnd,totrcv,work,info) use psi_mod, psb_protect_name => psi_dtranidxv @@ -671,8 +667,8 @@ subroutine psi_dtranidxv(ictxt,iicomm,flag,beta,y,idx,& include 'mpif.h' #endif - type(psb_ctxt_type), intent(in) :: ictxt - integer(psb_mpk_), intent(in) :: iicomm + type(psb_ctxt_type), intent(in) :: ctxt + integer(psb_mpk_), intent(in) :: icomm integer(psb_ipk_), intent(in) :: flag integer(psb_ipk_), intent(out) :: info real(psb_dpk_) :: y(:), beta @@ -680,9 +676,8 @@ subroutine psi_dtranidxv(ictxt,iicomm,flag,beta,y,idx,& integer(psb_ipk_), intent(in) :: idx(:),totxch,totsnd, totrcv ! locals - type(psb_ctxt_type) :: ctxt - integer(psb_mpk_) :: icomm, np, me,& - & proc_to_comm, p2ptag, p2pstat(mpi_status_size), iret + integer(psb_ipk_) :: np, me + integer(psb_mpk_) :: proc_to_comm, p2ptag, p2pstat(mpi_status_size), iret integer(psb_mpk_), allocatable, dimension(:) :: bsdidx, brvidx,& & sdsz, rvsz, prcid, rvhd, sdhd integer(psb_ipk_) :: nesd, nerv,& @@ -699,9 +694,6 @@ subroutine psi_dtranidxv(ictxt,iicomm,flag,beta,y,idx,& info=psb_success_ name='psi_swap_tran' call psb_erractionsave(err_act) - ctxt = ictxt - icomm = iicomm - call psb_info(ctxt,me,np) if (np == -1) then info=psb_err_context_error_ diff --git a/base/comm/internals/psi_eswapdata_a.F90 b/base/comm/internals/psi_eswapdata_a.F90 index 3dc1786e..bc477224 100644 --- a/base/comm/internals/psi_eswapdata_a.F90 +++ b/base/comm/internals/psi_eswapdata_a.F90 @@ -179,8 +179,8 @@ subroutine psi_eswapidxm(ctxt,icomm,flag,n,beta,y,idx, & ! locals - integer(psb_mpk_) :: np, me,& - & proc_to_comm, p2ptag, p2pstat(mpi_status_size), iret + integer(psb_ipk_) :: np, me + integer(psb_mpk_) :: proc_to_comm, p2ptag, p2pstat(mpi_status_size), iret integer(psb_mpk_), allocatable, dimension(:) :: bsdidx, brvidx,& & sdsz, rvsz, prcid, rvhd, sdhd integer(psb_ipk_) :: nesd, nerv,& @@ -197,7 +197,6 @@ subroutine psi_eswapidxm(ctxt,icomm,flag,n,beta,y,idx, & info=psb_success_ name='psi_swap_data' call psb_erractionsave(err_act) - call psb_info(ctxt,me,np) if (np == -1) then info=psb_err_context_error_ @@ -641,7 +640,7 @@ end subroutine psi_eswapdatav ! ! ! -subroutine psi_eswapidxv(ictxt,iicomm,flag,beta,y,idx, & +subroutine psi_eswapidxv(ctxt,icomm,flag,beta,y,idx, & & totxch,totsnd,totrcv,work,info) use psi_mod, psb_protect_name => psi_eswapidxv @@ -656,8 +655,8 @@ subroutine psi_eswapidxv(ictxt,iicomm,flag,beta,y,idx, & include 'mpif.h' #endif - type(psb_ctxt_type), intent(in) :: ictxt - integer(psb_mpk_), intent(in) :: iicomm + type(psb_ctxt_type), intent(in) :: ctxt + integer(psb_mpk_), intent(in) :: icomm integer(psb_ipk_), intent(in) :: flag integer(psb_ipk_), intent(out) :: info integer(psb_epk_) :: y(:), beta @@ -665,9 +664,8 @@ subroutine psi_eswapidxv(ictxt,iicomm,flag,beta,y,idx, & integer(psb_ipk_), intent(in) :: idx(:),totxch,totsnd, totrcv ! locals - type(psb_ctxt_type) :: ctxt - integer(psb_mpk_) :: icomm, np, me,& - & proc_to_comm, p2ptag, p2pstat(mpi_status_size), iret + integer(psb_ipk_) :: np, me + integer(psb_mpk_) :: proc_to_comm, p2ptag, p2pstat(mpi_status_size), iret integer(psb_mpk_), allocatable, dimension(:) :: bsdidx, brvidx,& & sdsz, rvsz, prcid, rvhd, sdhd integer(psb_ipk_) :: nesd, nerv,& @@ -684,9 +682,6 @@ subroutine psi_eswapidxv(ictxt,iicomm,flag,beta,y,idx, & info=psb_success_ name='psi_swap_datav' call psb_erractionsave(err_act) - ctxt = ictxt - icomm = iicomm - call psb_info(ctxt,me,np) if (np == -1) then info=psb_err_context_error_ diff --git a/base/comm/internals/psi_eswaptran_a.F90 b/base/comm/internals/psi_eswaptran_a.F90 index 11419613..9b8ce550 100644 --- a/base/comm/internals/psi_eswaptran_a.F90 +++ b/base/comm/internals/psi_eswaptran_a.F90 @@ -159,7 +159,7 @@ subroutine psi_eswaptranm(flag,n,beta,y,desc_a,work,info,data) return end subroutine psi_eswaptranm -subroutine psi_etranidxm(ictxt,iicomm,flag,n,beta,y,idx,& +subroutine psi_etranidxm(ctxt,icomm,flag,n,beta,y,idx,& & totxch,totsnd,totrcv,work,info) use psi_mod, psb_protect_name => psi_etranidxm @@ -174,8 +174,8 @@ subroutine psi_etranidxm(ictxt,iicomm,flag,n,beta,y,idx,& include 'mpif.h' #endif - type(psb_ctxt_type), intent(in) :: ictxt - integer(psb_mpk_), intent(in) :: iicomm + type(psb_ctxt_type), intent(in) :: ctxt + integer(psb_mpk_), intent(in) :: icomm integer(psb_ipk_), intent(in) :: flag,n integer(psb_ipk_), intent(out) :: info integer(psb_epk_) :: y(:,:), beta @@ -183,9 +183,8 @@ subroutine psi_etranidxm(ictxt,iicomm,flag,n,beta,y,idx,& integer(psb_ipk_), intent(in) :: idx(:),totxch,totsnd, totrcv ! locals - type(psb_ctxt_type) :: ctxt - integer(psb_mpk_) :: icomm, np, me,& - & proc_to_comm, p2ptag, p2pstat(mpi_status_size), iret + integer(psb_ipk_) :: np, me + integer(psb_mpk_) :: proc_to_comm, p2ptag, p2pstat(mpi_status_size), iret integer(psb_mpk_), allocatable, dimension(:) :: bsdidx, brvidx,& & sdsz, rvsz, prcid, rvhd, sdhd integer(psb_ipk_) :: nesd, nerv,& @@ -202,9 +201,6 @@ subroutine psi_etranidxm(ictxt,iicomm,flag,n,beta,y,idx,& info=psb_success_ name='psi_swap_tran' call psb_erractionsave(err_act) - ctxt = ictxt - icomm = iicomm - call psb_info(ctxt,me,np) if (np == -1) then info=psb_err_context_error_ @@ -656,7 +652,7 @@ end subroutine psi_eswaptranv ! ! ! -subroutine psi_etranidxv(ictxt,iicomm,flag,beta,y,idx,& +subroutine psi_etranidxv(ctxt,icomm,flag,beta,y,idx,& & totxch,totsnd,totrcv,work,info) use psi_mod, psb_protect_name => psi_etranidxv @@ -671,8 +667,8 @@ subroutine psi_etranidxv(ictxt,iicomm,flag,beta,y,idx,& include 'mpif.h' #endif - type(psb_ctxt_type), intent(in) :: ictxt - integer(psb_mpk_), intent(in) :: iicomm + type(psb_ctxt_type), intent(in) :: ctxt + integer(psb_mpk_), intent(in) :: icomm integer(psb_ipk_), intent(in) :: flag integer(psb_ipk_), intent(out) :: info integer(psb_epk_) :: y(:), beta @@ -680,9 +676,8 @@ subroutine psi_etranidxv(ictxt,iicomm,flag,beta,y,idx,& integer(psb_ipk_), intent(in) :: idx(:),totxch,totsnd, totrcv ! locals - type(psb_ctxt_type) :: ctxt - integer(psb_mpk_) :: icomm, np, me,& - & proc_to_comm, p2ptag, p2pstat(mpi_status_size), iret + integer(psb_ipk_) :: np, me + integer(psb_mpk_) :: proc_to_comm, p2ptag, p2pstat(mpi_status_size), iret integer(psb_mpk_), allocatable, dimension(:) :: bsdidx, brvidx,& & sdsz, rvsz, prcid, rvhd, sdhd integer(psb_ipk_) :: nesd, nerv,& @@ -699,9 +694,6 @@ subroutine psi_etranidxv(ictxt,iicomm,flag,beta,y,idx,& info=psb_success_ name='psi_swap_tran' call psb_erractionsave(err_act) - ctxt = ictxt - icomm = iicomm - call psb_info(ctxt,me,np) if (np == -1) then info=psb_err_context_error_ diff --git a/base/comm/internals/psi_i2swapdata_a.F90 b/base/comm/internals/psi_i2swapdata_a.F90 index 6d1928d3..e382c4b6 100644 --- a/base/comm/internals/psi_i2swapdata_a.F90 +++ b/base/comm/internals/psi_i2swapdata_a.F90 @@ -179,8 +179,8 @@ subroutine psi_i2swapidxm(ctxt,icomm,flag,n,beta,y,idx, & ! locals - integer(psb_mpk_) :: np, me,& - & proc_to_comm, p2ptag, p2pstat(mpi_status_size), iret + integer(psb_ipk_) :: np, me + integer(psb_mpk_) :: proc_to_comm, p2ptag, p2pstat(mpi_status_size), iret integer(psb_mpk_), allocatable, dimension(:) :: bsdidx, brvidx,& & sdsz, rvsz, prcid, rvhd, sdhd integer(psb_ipk_) :: nesd, nerv,& @@ -197,7 +197,6 @@ subroutine psi_i2swapidxm(ctxt,icomm,flag,n,beta,y,idx, & info=psb_success_ name='psi_swap_data' call psb_erractionsave(err_act) - call psb_info(ctxt,me,np) if (np == -1) then info=psb_err_context_error_ @@ -641,7 +640,7 @@ end subroutine psi_i2swapdatav ! ! ! -subroutine psi_i2swapidxv(ictxt,iicomm,flag,beta,y,idx, & +subroutine psi_i2swapidxv(ctxt,icomm,flag,beta,y,idx, & & totxch,totsnd,totrcv,work,info) use psi_mod, psb_protect_name => psi_i2swapidxv @@ -656,8 +655,8 @@ subroutine psi_i2swapidxv(ictxt,iicomm,flag,beta,y,idx, & include 'mpif.h' #endif - type(psb_ctxt_type), intent(in) :: ictxt - integer(psb_mpk_), intent(in) :: iicomm + type(psb_ctxt_type), intent(in) :: ctxt + integer(psb_mpk_), intent(in) :: icomm integer(psb_ipk_), intent(in) :: flag integer(psb_ipk_), intent(out) :: info integer(psb_i2pk_) :: y(:), beta @@ -665,9 +664,8 @@ subroutine psi_i2swapidxv(ictxt,iicomm,flag,beta,y,idx, & integer(psb_ipk_), intent(in) :: idx(:),totxch,totsnd, totrcv ! locals - type(psb_ctxt_type) :: ctxt - integer(psb_mpk_) :: icomm, np, me,& - & proc_to_comm, p2ptag, p2pstat(mpi_status_size), iret + integer(psb_ipk_) :: np, me + integer(psb_mpk_) :: proc_to_comm, p2ptag, p2pstat(mpi_status_size), iret integer(psb_mpk_), allocatable, dimension(:) :: bsdidx, brvidx,& & sdsz, rvsz, prcid, rvhd, sdhd integer(psb_ipk_) :: nesd, nerv,& @@ -684,9 +682,6 @@ subroutine psi_i2swapidxv(ictxt,iicomm,flag,beta,y,idx, & info=psb_success_ name='psi_swap_datav' call psb_erractionsave(err_act) - ctxt = ictxt - icomm = iicomm - call psb_info(ctxt,me,np) if (np == -1) then info=psb_err_context_error_ diff --git a/base/comm/internals/psi_i2swaptran_a.F90 b/base/comm/internals/psi_i2swaptran_a.F90 index 26f3c820..e9738352 100644 --- a/base/comm/internals/psi_i2swaptran_a.F90 +++ b/base/comm/internals/psi_i2swaptran_a.F90 @@ -159,7 +159,7 @@ subroutine psi_i2swaptranm(flag,n,beta,y,desc_a,work,info,data) return end subroutine psi_i2swaptranm -subroutine psi_i2tranidxm(ictxt,iicomm,flag,n,beta,y,idx,& +subroutine psi_i2tranidxm(ctxt,icomm,flag,n,beta,y,idx,& & totxch,totsnd,totrcv,work,info) use psi_mod, psb_protect_name => psi_i2tranidxm @@ -174,8 +174,8 @@ subroutine psi_i2tranidxm(ictxt,iicomm,flag,n,beta,y,idx,& include 'mpif.h' #endif - type(psb_ctxt_type), intent(in) :: ictxt - integer(psb_mpk_), intent(in) :: iicomm + type(psb_ctxt_type), intent(in) :: ctxt + integer(psb_mpk_), intent(in) :: icomm integer(psb_ipk_), intent(in) :: flag,n integer(psb_ipk_), intent(out) :: info integer(psb_i2pk_) :: y(:,:), beta @@ -183,9 +183,8 @@ subroutine psi_i2tranidxm(ictxt,iicomm,flag,n,beta,y,idx,& integer(psb_ipk_), intent(in) :: idx(:),totxch,totsnd, totrcv ! locals - type(psb_ctxt_type) :: ctxt - integer(psb_mpk_) :: icomm, np, me,& - & proc_to_comm, p2ptag, p2pstat(mpi_status_size), iret + integer(psb_ipk_) :: np, me + integer(psb_mpk_) :: proc_to_comm, p2ptag, p2pstat(mpi_status_size), iret integer(psb_mpk_), allocatable, dimension(:) :: bsdidx, brvidx,& & sdsz, rvsz, prcid, rvhd, sdhd integer(psb_ipk_) :: nesd, nerv,& @@ -202,9 +201,6 @@ subroutine psi_i2tranidxm(ictxt,iicomm,flag,n,beta,y,idx,& info=psb_success_ name='psi_swap_tran' call psb_erractionsave(err_act) - ctxt = ictxt - icomm = iicomm - call psb_info(ctxt,me,np) if (np == -1) then info=psb_err_context_error_ @@ -656,7 +652,7 @@ end subroutine psi_i2swaptranv ! ! ! -subroutine psi_i2tranidxv(ictxt,iicomm,flag,beta,y,idx,& +subroutine psi_i2tranidxv(ctxt,icomm,flag,beta,y,idx,& & totxch,totsnd,totrcv,work,info) use psi_mod, psb_protect_name => psi_i2tranidxv @@ -671,8 +667,8 @@ subroutine psi_i2tranidxv(ictxt,iicomm,flag,beta,y,idx,& include 'mpif.h' #endif - type(psb_ctxt_type), intent(in) :: ictxt - integer(psb_mpk_), intent(in) :: iicomm + type(psb_ctxt_type), intent(in) :: ctxt + integer(psb_mpk_), intent(in) :: icomm integer(psb_ipk_), intent(in) :: flag integer(psb_ipk_), intent(out) :: info integer(psb_i2pk_) :: y(:), beta @@ -680,9 +676,8 @@ subroutine psi_i2tranidxv(ictxt,iicomm,flag,beta,y,idx,& integer(psb_ipk_), intent(in) :: idx(:),totxch,totsnd, totrcv ! locals - type(psb_ctxt_type) :: ctxt - integer(psb_mpk_) :: icomm, np, me,& - & proc_to_comm, p2ptag, p2pstat(mpi_status_size), iret + integer(psb_ipk_) :: np, me + integer(psb_mpk_) :: proc_to_comm, p2ptag, p2pstat(mpi_status_size), iret integer(psb_mpk_), allocatable, dimension(:) :: bsdidx, brvidx,& & sdsz, rvsz, prcid, rvhd, sdhd integer(psb_ipk_) :: nesd, nerv,& @@ -699,9 +694,6 @@ subroutine psi_i2tranidxv(ictxt,iicomm,flag,beta,y,idx,& info=psb_success_ name='psi_swap_tran' call psb_erractionsave(err_act) - ctxt = ictxt - icomm = iicomm - call psb_info(ctxt,me,np) if (np == -1) then info=psb_err_context_error_ diff --git a/base/comm/internals/psi_iswapdata.F90 b/base/comm/internals/psi_iswapdata.F90 index e541ff6d..ff4bd074 100644 --- a/base/comm/internals/psi_iswapdata.F90 +++ b/base/comm/internals/psi_iswapdata.F90 @@ -175,7 +175,7 @@ end subroutine psi_iswapdata_vect ! ! ! -subroutine psi_iswap_vidx_vect(ictxt,iicomm,flag,beta,y,idx, & +subroutine psi_iswap_vidx_vect(ctxt,icomm,flag,beta,y,idx, & & totxch,totsnd,totrcv,work,info) use psi_mod, psb_protect_name => psi_iswap_vidx_vect @@ -192,8 +192,8 @@ subroutine psi_iswap_vidx_vect(ictxt,iicomm,flag,beta,y,idx, & include 'mpif.h' #endif - type(psb_ctxt_type), intent(in) :: ictxt - integer(psb_mpk_), intent(in) :: iicomm + type(psb_ctxt_type), intent(in) :: ctxt + integer(psb_mpk_), intent(in) :: icomm integer(psb_ipk_), intent(in) :: flag integer(psb_ipk_), intent(out) :: info class(psb_i_base_vect_type) :: y @@ -203,9 +203,8 @@ subroutine psi_iswap_vidx_vect(ictxt,iicomm,flag,beta,y,idx, & integer(psb_ipk_), intent(in) :: totxch,totsnd, totrcv ! locals - type(psb_ctxt_type) :: ctxt - integer(psb_mpk_) :: icomm, np, me,& - & proc_to_comm, p2ptag, p2pstat(mpi_status_size), iret + integer(psb_ipk_) :: np, me + integer(psb_mpk_) :: proc_to_comm, p2ptag, p2pstat(mpi_status_size), iret integer(psb_mpk_), allocatable :: prcid(:) integer(psb_ipk_) :: nesd, nerv,& & err_act, i, idx_pt, totsnd_, totrcv_,& @@ -218,9 +217,6 @@ subroutine psi_iswap_vidx_vect(ictxt,iicomm,flag,beta,y,idx, & info=psb_success_ name='psi_swap_datav' call psb_erractionsave(err_act) - ctxt = ictxt - icomm = iicomm - call psb_info(ctxt,me,np) if (np == -1) then info=psb_err_context_error_ @@ -517,7 +513,7 @@ end subroutine psi_iswapdata_multivect ! ! ! -subroutine psi_iswap_vidx_multivect(ictxt,iicomm,flag,beta,y,idx, & +subroutine psi_iswap_vidx_multivect(ctxt,icomm,flag,beta,y,idx, & & totxch,totsnd,totrcv,work,info) use psi_mod, psb_protect_name => psi_iswap_vidx_multivect @@ -534,8 +530,8 @@ subroutine psi_iswap_vidx_multivect(ictxt,iicomm,flag,beta,y,idx, & include 'mpif.h' #endif - type(psb_ctxt_type), intent(in) :: ictxt - integer(psb_mpk_), intent(in) :: iicomm + type(psb_ctxt_type), intent(in) :: ctxt + integer(psb_mpk_), intent(in) :: icomm integer(psb_ipk_), intent(in) :: flag integer(psb_ipk_), intent(out) :: info class(psb_i_base_multivect_type) :: y @@ -545,9 +541,8 @@ subroutine psi_iswap_vidx_multivect(ictxt,iicomm,flag,beta,y,idx, & integer(psb_ipk_), intent(in) :: totxch,totsnd, totrcv ! locals - type(psb_ctxt_type) :: ctxt - integer(psb_mpk_) :: icomm, np, me,& - & proc_to_comm, p2ptag, p2pstat(mpi_status_size), iret + integer(psb_ipk_) :: np, me + integer(psb_mpk_) :: proc_to_comm, p2ptag, p2pstat(mpi_status_size), iret integer(psb_mpk_), allocatable :: prcid(:) integer(psb_ipk_) :: nesd, nerv,& & err_act, i, idx_pt, totsnd_, totrcv_,& @@ -560,9 +555,6 @@ subroutine psi_iswap_vidx_multivect(ictxt,iicomm,flag,beta,y,idx, & info=psb_success_ name='psi_swap_datav' call psb_erractionsave(err_act) - ctxt = ictxt - icomm = iicomm - call psb_info(ctxt,me,np) if (np == -1) then info=psb_err_context_error_ diff --git a/base/comm/internals/psi_iswaptran.F90 b/base/comm/internals/psi_iswaptran.F90 index 46bb18b5..75a0a185 100644 --- a/base/comm/internals/psi_iswaptran.F90 +++ b/base/comm/internals/psi_iswaptran.F90 @@ -176,7 +176,7 @@ end subroutine psi_iswaptran_vect ! ! ! -subroutine psi_itran_vidx_vect(ictxt,iicomm,flag,beta,y,idx,& +subroutine psi_itran_vidx_vect(ctxt,icomm,flag,beta,y,idx,& & totxch,totsnd,totrcv,work,info) use psi_mod, psb_protect_name => psi_itran_vidx_vect @@ -193,8 +193,8 @@ subroutine psi_itran_vidx_vect(ictxt,iicomm,flag,beta,y,idx,& include 'mpif.h' #endif - type(psb_ctxt_type), intent(in) :: ictxt - integer(psb_mpk_), intent(in) :: iicomm + type(psb_ctxt_type), intent(in) :: ctxt + integer(psb_mpk_), intent(in) :: icomm integer(psb_ipk_), intent(in) :: flag integer(psb_ipk_), intent(out) :: info class(psb_i_base_vect_type) :: y @@ -204,9 +204,8 @@ subroutine psi_itran_vidx_vect(ictxt,iicomm,flag,beta,y,idx,& integer(psb_ipk_), intent(in) :: totxch,totsnd, totrcv ! locals - type(psb_ctxt_type) :: ctxt - integer(psb_mpk_) :: icomm, np, me,& - & proc_to_comm, p2ptag, p2pstat(mpi_status_size), iret + integer(psb_ipk_) :: np, me + integer(psb_mpk_) :: proc_to_comm, p2ptag, p2pstat(mpi_status_size), iret integer(psb_mpk_), allocatable :: prcid(:) integer(psb_ipk_) :: nesd, nerv,& & err_act, i, idx_pt, totsnd_, totrcv_,& @@ -219,9 +218,6 @@ subroutine psi_itran_vidx_vect(ictxt,iicomm,flag,beta,y,idx,& info=psb_success_ name='psi_swap_tran' call psb_erractionsave(err_act) - ctxt = ictxt - icomm = iicomm - call psb_info(ctxt,me,np) if (np == -1) then info=psb_err_context_error_ @@ -528,7 +524,7 @@ subroutine psi_iswaptran_multivect(flag,beta,y,desc_a,work,info,data) ! ! ! -subroutine psi_itran_vidx_multivect(ictxt,iicomm,flag,beta,y,idx,& +subroutine psi_itran_vidx_multivect(ctxt,icomm,flag,beta,y,idx,& & totxch,totsnd,totrcv,work,info) use psi_mod, psb_protect_name => psi_itran_vidx_multivect @@ -545,8 +541,8 @@ subroutine psi_itran_vidx_multivect(ictxt,iicomm,flag,beta,y,idx,& include 'mpif.h' #endif - type(psb_ctxt_type), intent(in) :: ictxt - integer(psb_mpk_), intent(in) :: iicomm + type(psb_ctxt_type), intent(in) :: ctxt + integer(psb_mpk_), intent(in) :: icomm integer(psb_ipk_), intent(in) :: flag integer(psb_ipk_), intent(out) :: info class(psb_i_base_multivect_type) :: y @@ -556,9 +552,8 @@ subroutine psi_itran_vidx_multivect(ictxt,iicomm,flag,beta,y,idx,& integer(psb_ipk_), intent(in) :: totxch,totsnd, totrcv ! locals - type(psb_ctxt_type) :: ctxt - integer(psb_mpk_) :: icomm, np, me,& - & proc_to_comm, p2ptag, p2pstat(mpi_status_size), iret + integer(psb_ipk_) :: np, me + integer(psb_mpk_) :: proc_to_comm, p2ptag, p2pstat(mpi_status_size), iret integer(psb_mpk_), allocatable :: prcid(:) integer(psb_ipk_) :: nesd, nerv,& & err_act, i, idx_pt, totsnd_, totrcv_,& @@ -571,9 +566,6 @@ subroutine psi_itran_vidx_multivect(ictxt,iicomm,flag,beta,y,idx,& info=psb_success_ name='psi_swap_tran' call psb_erractionsave(err_act) - ctxt = ictxt - icomm = iicomm - call psb_info(ctxt,me,np) if (np == -1) then info=psb_err_context_error_ diff --git a/base/comm/internals/psi_lswapdata.F90 b/base/comm/internals/psi_lswapdata.F90 index 088c6508..9201ebfa 100644 --- a/base/comm/internals/psi_lswapdata.F90 +++ b/base/comm/internals/psi_lswapdata.F90 @@ -175,7 +175,7 @@ end subroutine psi_lswapdata_vect ! ! ! -subroutine psi_lswap_vidx_vect(ictxt,iicomm,flag,beta,y,idx, & +subroutine psi_lswap_vidx_vect(ctxt,icomm,flag,beta,y,idx, & & totxch,totsnd,totrcv,work,info) use psi_mod, psb_protect_name => psi_lswap_vidx_vect @@ -192,8 +192,8 @@ subroutine psi_lswap_vidx_vect(ictxt,iicomm,flag,beta,y,idx, & include 'mpif.h' #endif - type(psb_ctxt_type), intent(in) :: ictxt - integer(psb_mpk_), intent(in) :: iicomm + type(psb_ctxt_type), intent(in) :: ctxt + integer(psb_mpk_), intent(in) :: icomm integer(psb_ipk_), intent(in) :: flag integer(psb_ipk_), intent(out) :: info class(psb_l_base_vect_type) :: y @@ -203,9 +203,8 @@ subroutine psi_lswap_vidx_vect(ictxt,iicomm,flag,beta,y,idx, & integer(psb_ipk_), intent(in) :: totxch,totsnd, totrcv ! locals - type(psb_ctxt_type) :: ctxt - integer(psb_mpk_) :: icomm, np, me,& - & proc_to_comm, p2ptag, p2pstat(mpi_status_size), iret + integer(psb_ipk_) :: np, me + integer(psb_mpk_) :: proc_to_comm, p2ptag, p2pstat(mpi_status_size), iret integer(psb_mpk_), allocatable :: prcid(:) integer(psb_ipk_) :: nesd, nerv,& & err_act, i, idx_pt, totsnd_, totrcv_,& @@ -218,9 +217,6 @@ subroutine psi_lswap_vidx_vect(ictxt,iicomm,flag,beta,y,idx, & info=psb_success_ name='psi_swap_datav' call psb_erractionsave(err_act) - ctxt = ictxt - icomm = iicomm - call psb_info(ctxt,me,np) if (np == -1) then info=psb_err_context_error_ @@ -517,7 +513,7 @@ end subroutine psi_lswapdata_multivect ! ! ! -subroutine psi_lswap_vidx_multivect(ictxt,iicomm,flag,beta,y,idx, & +subroutine psi_lswap_vidx_multivect(ctxt,icomm,flag,beta,y,idx, & & totxch,totsnd,totrcv,work,info) use psi_mod, psb_protect_name => psi_lswap_vidx_multivect @@ -534,8 +530,8 @@ subroutine psi_lswap_vidx_multivect(ictxt,iicomm,flag,beta,y,idx, & include 'mpif.h' #endif - type(psb_ctxt_type), intent(in) :: ictxt - integer(psb_mpk_), intent(in) :: iicomm + type(psb_ctxt_type), intent(in) :: ctxt + integer(psb_mpk_), intent(in) :: icomm integer(psb_ipk_), intent(in) :: flag integer(psb_ipk_), intent(out) :: info class(psb_l_base_multivect_type) :: y @@ -545,9 +541,8 @@ subroutine psi_lswap_vidx_multivect(ictxt,iicomm,flag,beta,y,idx, & integer(psb_ipk_), intent(in) :: totxch,totsnd, totrcv ! locals - type(psb_ctxt_type) :: ctxt - integer(psb_mpk_) :: icomm, np, me,& - & proc_to_comm, p2ptag, p2pstat(mpi_status_size), iret + integer(psb_ipk_) :: np, me + integer(psb_mpk_) :: proc_to_comm, p2ptag, p2pstat(mpi_status_size), iret integer(psb_mpk_), allocatable :: prcid(:) integer(psb_ipk_) :: nesd, nerv,& & err_act, i, idx_pt, totsnd_, totrcv_,& @@ -560,9 +555,6 @@ subroutine psi_lswap_vidx_multivect(ictxt,iicomm,flag,beta,y,idx, & info=psb_success_ name='psi_swap_datav' call psb_erractionsave(err_act) - ctxt = ictxt - icomm = iicomm - call psb_info(ctxt,me,np) if (np == -1) then info=psb_err_context_error_ diff --git a/base/comm/internals/psi_lswaptran.F90 b/base/comm/internals/psi_lswaptran.F90 index 60470169..b2b9536c 100644 --- a/base/comm/internals/psi_lswaptran.F90 +++ b/base/comm/internals/psi_lswaptran.F90 @@ -176,7 +176,7 @@ end subroutine psi_lswaptran_vect ! ! ! -subroutine psi_ltran_vidx_vect(ictxt,iicomm,flag,beta,y,idx,& +subroutine psi_ltran_vidx_vect(ctxt,icomm,flag,beta,y,idx,& & totxch,totsnd,totrcv,work,info) use psi_mod, psb_protect_name => psi_ltran_vidx_vect @@ -193,8 +193,8 @@ subroutine psi_ltran_vidx_vect(ictxt,iicomm,flag,beta,y,idx,& include 'mpif.h' #endif - type(psb_ctxt_type), intent(in) :: ictxt - integer(psb_mpk_), intent(in) :: iicomm + type(psb_ctxt_type), intent(in) :: ctxt + integer(psb_mpk_), intent(in) :: icomm integer(psb_ipk_), intent(in) :: flag integer(psb_ipk_), intent(out) :: info class(psb_l_base_vect_type) :: y @@ -204,9 +204,8 @@ subroutine psi_ltran_vidx_vect(ictxt,iicomm,flag,beta,y,idx,& integer(psb_ipk_), intent(in) :: totxch,totsnd, totrcv ! locals - type(psb_ctxt_type) :: ctxt - integer(psb_mpk_) :: icomm, np, me,& - & proc_to_comm, p2ptag, p2pstat(mpi_status_size), iret + integer(psb_ipk_) :: np, me + integer(psb_mpk_) :: proc_to_comm, p2ptag, p2pstat(mpi_status_size), iret integer(psb_mpk_), allocatable :: prcid(:) integer(psb_ipk_) :: nesd, nerv,& & err_act, i, idx_pt, totsnd_, totrcv_,& @@ -219,9 +218,6 @@ subroutine psi_ltran_vidx_vect(ictxt,iicomm,flag,beta,y,idx,& info=psb_success_ name='psi_swap_tran' call psb_erractionsave(err_act) - ctxt = ictxt - icomm = iicomm - call psb_info(ctxt,me,np) if (np == -1) then info=psb_err_context_error_ @@ -528,7 +524,7 @@ subroutine psi_lswaptran_multivect(flag,beta,y,desc_a,work,info,data) ! ! ! -subroutine psi_ltran_vidx_multivect(ictxt,iicomm,flag,beta,y,idx,& +subroutine psi_ltran_vidx_multivect(ctxt,icomm,flag,beta,y,idx,& & totxch,totsnd,totrcv,work,info) use psi_mod, psb_protect_name => psi_ltran_vidx_multivect @@ -545,8 +541,8 @@ subroutine psi_ltran_vidx_multivect(ictxt,iicomm,flag,beta,y,idx,& include 'mpif.h' #endif - type(psb_ctxt_type), intent(in) :: ictxt - integer(psb_mpk_), intent(in) :: iicomm + type(psb_ctxt_type), intent(in) :: ctxt + integer(psb_mpk_), intent(in) :: icomm integer(psb_ipk_), intent(in) :: flag integer(psb_ipk_), intent(out) :: info class(psb_l_base_multivect_type) :: y @@ -556,9 +552,8 @@ subroutine psi_ltran_vidx_multivect(ictxt,iicomm,flag,beta,y,idx,& integer(psb_ipk_), intent(in) :: totxch,totsnd, totrcv ! locals - type(psb_ctxt_type) :: ctxt - integer(psb_mpk_) :: icomm, np, me,& - & proc_to_comm, p2ptag, p2pstat(mpi_status_size), iret + integer(psb_ipk_) :: np, me + integer(psb_mpk_) :: proc_to_comm, p2ptag, p2pstat(mpi_status_size), iret integer(psb_mpk_), allocatable :: prcid(:) integer(psb_ipk_) :: nesd, nerv,& & err_act, i, idx_pt, totsnd_, totrcv_,& @@ -571,9 +566,6 @@ subroutine psi_ltran_vidx_multivect(ictxt,iicomm,flag,beta,y,idx,& info=psb_success_ name='psi_swap_tran' call psb_erractionsave(err_act) - ctxt = ictxt - icomm = iicomm - call psb_info(ctxt,me,np) if (np == -1) then info=psb_err_context_error_ diff --git a/base/comm/internals/psi_mswapdata_a.F90 b/base/comm/internals/psi_mswapdata_a.F90 index 8e86c515..69f64cc6 100644 --- a/base/comm/internals/psi_mswapdata_a.F90 +++ b/base/comm/internals/psi_mswapdata_a.F90 @@ -179,8 +179,8 @@ subroutine psi_mswapidxm(ctxt,icomm,flag,n,beta,y,idx, & ! locals - integer(psb_mpk_) :: np, me,& - & proc_to_comm, p2ptag, p2pstat(mpi_status_size), iret + integer(psb_ipk_) :: np, me + integer(psb_mpk_) :: proc_to_comm, p2ptag, p2pstat(mpi_status_size), iret integer(psb_mpk_), allocatable, dimension(:) :: bsdidx, brvidx,& & sdsz, rvsz, prcid, rvhd, sdhd integer(psb_ipk_) :: nesd, nerv,& @@ -197,7 +197,6 @@ subroutine psi_mswapidxm(ctxt,icomm,flag,n,beta,y,idx, & info=psb_success_ name='psi_swap_data' call psb_erractionsave(err_act) - call psb_info(ctxt,me,np) if (np == -1) then info=psb_err_context_error_ @@ -641,7 +640,7 @@ end subroutine psi_mswapdatav ! ! ! -subroutine psi_mswapidxv(ictxt,iicomm,flag,beta,y,idx, & +subroutine psi_mswapidxv(ctxt,icomm,flag,beta,y,idx, & & totxch,totsnd,totrcv,work,info) use psi_mod, psb_protect_name => psi_mswapidxv @@ -656,8 +655,8 @@ subroutine psi_mswapidxv(ictxt,iicomm,flag,beta,y,idx, & include 'mpif.h' #endif - type(psb_ctxt_type), intent(in) :: ictxt - integer(psb_mpk_), intent(in) :: iicomm + type(psb_ctxt_type), intent(in) :: ctxt + integer(psb_mpk_), intent(in) :: icomm integer(psb_ipk_), intent(in) :: flag integer(psb_ipk_), intent(out) :: info integer(psb_mpk_) :: y(:), beta @@ -665,9 +664,8 @@ subroutine psi_mswapidxv(ictxt,iicomm,flag,beta,y,idx, & integer(psb_ipk_), intent(in) :: idx(:),totxch,totsnd, totrcv ! locals - type(psb_ctxt_type) :: ctxt - integer(psb_mpk_) :: icomm, np, me,& - & proc_to_comm, p2ptag, p2pstat(mpi_status_size), iret + integer(psb_ipk_) :: np, me + integer(psb_mpk_) :: proc_to_comm, p2ptag, p2pstat(mpi_status_size), iret integer(psb_mpk_), allocatable, dimension(:) :: bsdidx, brvidx,& & sdsz, rvsz, prcid, rvhd, sdhd integer(psb_ipk_) :: nesd, nerv,& @@ -684,9 +682,6 @@ subroutine psi_mswapidxv(ictxt,iicomm,flag,beta,y,idx, & info=psb_success_ name='psi_swap_datav' call psb_erractionsave(err_act) - ctxt = ictxt - icomm = iicomm - call psb_info(ctxt,me,np) if (np == -1) then info=psb_err_context_error_ diff --git a/base/comm/internals/psi_mswaptran_a.F90 b/base/comm/internals/psi_mswaptran_a.F90 index 65b8e367..8a067126 100644 --- a/base/comm/internals/psi_mswaptran_a.F90 +++ b/base/comm/internals/psi_mswaptran_a.F90 @@ -159,7 +159,7 @@ subroutine psi_mswaptranm(flag,n,beta,y,desc_a,work,info,data) return end subroutine psi_mswaptranm -subroutine psi_mtranidxm(ictxt,iicomm,flag,n,beta,y,idx,& +subroutine psi_mtranidxm(ctxt,icomm,flag,n,beta,y,idx,& & totxch,totsnd,totrcv,work,info) use psi_mod, psb_protect_name => psi_mtranidxm @@ -174,8 +174,8 @@ subroutine psi_mtranidxm(ictxt,iicomm,flag,n,beta,y,idx,& include 'mpif.h' #endif - type(psb_ctxt_type), intent(in) :: ictxt - integer(psb_mpk_), intent(in) :: iicomm + type(psb_ctxt_type), intent(in) :: ctxt + integer(psb_mpk_), intent(in) :: icomm integer(psb_ipk_), intent(in) :: flag,n integer(psb_ipk_), intent(out) :: info integer(psb_mpk_) :: y(:,:), beta @@ -183,9 +183,8 @@ subroutine psi_mtranidxm(ictxt,iicomm,flag,n,beta,y,idx,& integer(psb_ipk_), intent(in) :: idx(:),totxch,totsnd, totrcv ! locals - type(psb_ctxt_type) :: ctxt - integer(psb_mpk_) :: icomm, np, me,& - & proc_to_comm, p2ptag, p2pstat(mpi_status_size), iret + integer(psb_ipk_) :: np, me + integer(psb_mpk_) :: proc_to_comm, p2ptag, p2pstat(mpi_status_size), iret integer(psb_mpk_), allocatable, dimension(:) :: bsdidx, brvidx,& & sdsz, rvsz, prcid, rvhd, sdhd integer(psb_ipk_) :: nesd, nerv,& @@ -202,9 +201,6 @@ subroutine psi_mtranidxm(ictxt,iicomm,flag,n,beta,y,idx,& info=psb_success_ name='psi_swap_tran' call psb_erractionsave(err_act) - ctxt = ictxt - icomm = iicomm - call psb_info(ctxt,me,np) if (np == -1) then info=psb_err_context_error_ @@ -656,7 +652,7 @@ end subroutine psi_mswaptranv ! ! ! -subroutine psi_mtranidxv(ictxt,iicomm,flag,beta,y,idx,& +subroutine psi_mtranidxv(ctxt,icomm,flag,beta,y,idx,& & totxch,totsnd,totrcv,work,info) use psi_mod, psb_protect_name => psi_mtranidxv @@ -671,8 +667,8 @@ subroutine psi_mtranidxv(ictxt,iicomm,flag,beta,y,idx,& include 'mpif.h' #endif - type(psb_ctxt_type), intent(in) :: ictxt - integer(psb_mpk_), intent(in) :: iicomm + type(psb_ctxt_type), intent(in) :: ctxt + integer(psb_mpk_), intent(in) :: icomm integer(psb_ipk_), intent(in) :: flag integer(psb_ipk_), intent(out) :: info integer(psb_mpk_) :: y(:), beta @@ -680,9 +676,8 @@ subroutine psi_mtranidxv(ictxt,iicomm,flag,beta,y,idx,& integer(psb_ipk_), intent(in) :: idx(:),totxch,totsnd, totrcv ! locals - type(psb_ctxt_type) :: ctxt - integer(psb_mpk_) :: icomm, np, me,& - & proc_to_comm, p2ptag, p2pstat(mpi_status_size), iret + integer(psb_ipk_) :: np, me + integer(psb_mpk_) :: proc_to_comm, p2ptag, p2pstat(mpi_status_size), iret integer(psb_mpk_), allocatable, dimension(:) :: bsdidx, brvidx,& & sdsz, rvsz, prcid, rvhd, sdhd integer(psb_ipk_) :: nesd, nerv,& @@ -699,9 +694,6 @@ subroutine psi_mtranidxv(ictxt,iicomm,flag,beta,y,idx,& info=psb_success_ name='psi_swap_tran' call psb_erractionsave(err_act) - ctxt = ictxt - icomm = iicomm - call psb_info(ctxt,me,np) if (np == -1) then info=psb_err_context_error_ diff --git a/base/comm/internals/psi_sswapdata.F90 b/base/comm/internals/psi_sswapdata.F90 index 307195bb..e4f11bd0 100644 --- a/base/comm/internals/psi_sswapdata.F90 +++ b/base/comm/internals/psi_sswapdata.F90 @@ -175,7 +175,7 @@ end subroutine psi_sswapdata_vect ! ! ! -subroutine psi_sswap_vidx_vect(ictxt,iicomm,flag,beta,y,idx, & +subroutine psi_sswap_vidx_vect(ctxt,icomm,flag,beta,y,idx, & & totxch,totsnd,totrcv,work,info) use psi_mod, psb_protect_name => psi_sswap_vidx_vect @@ -192,8 +192,8 @@ subroutine psi_sswap_vidx_vect(ictxt,iicomm,flag,beta,y,idx, & include 'mpif.h' #endif - type(psb_ctxt_type), intent(in) :: ictxt - integer(psb_mpk_), intent(in) :: iicomm + type(psb_ctxt_type), intent(in) :: ctxt + integer(psb_mpk_), intent(in) :: icomm integer(psb_ipk_), intent(in) :: flag integer(psb_ipk_), intent(out) :: info class(psb_s_base_vect_type) :: y @@ -203,9 +203,8 @@ subroutine psi_sswap_vidx_vect(ictxt,iicomm,flag,beta,y,idx, & integer(psb_ipk_), intent(in) :: totxch,totsnd, totrcv ! locals - type(psb_ctxt_type) :: ctxt - integer(psb_mpk_) :: icomm, np, me,& - & proc_to_comm, p2ptag, p2pstat(mpi_status_size), iret + integer(psb_ipk_) :: np, me + integer(psb_mpk_) :: proc_to_comm, p2ptag, p2pstat(mpi_status_size), iret integer(psb_mpk_), allocatable :: prcid(:) integer(psb_ipk_) :: nesd, nerv,& & err_act, i, idx_pt, totsnd_, totrcv_,& @@ -218,9 +217,6 @@ subroutine psi_sswap_vidx_vect(ictxt,iicomm,flag,beta,y,idx, & info=psb_success_ name='psi_swap_datav' call psb_erractionsave(err_act) - ctxt = ictxt - icomm = iicomm - call psb_info(ctxt,me,np) if (np == -1) then info=psb_err_context_error_ @@ -517,7 +513,7 @@ end subroutine psi_sswapdata_multivect ! ! ! -subroutine psi_sswap_vidx_multivect(ictxt,iicomm,flag,beta,y,idx, & +subroutine psi_sswap_vidx_multivect(ctxt,icomm,flag,beta,y,idx, & & totxch,totsnd,totrcv,work,info) use psi_mod, psb_protect_name => psi_sswap_vidx_multivect @@ -534,8 +530,8 @@ subroutine psi_sswap_vidx_multivect(ictxt,iicomm,flag,beta,y,idx, & include 'mpif.h' #endif - type(psb_ctxt_type), intent(in) :: ictxt - integer(psb_mpk_), intent(in) :: iicomm + type(psb_ctxt_type), intent(in) :: ctxt + integer(psb_mpk_), intent(in) :: icomm integer(psb_ipk_), intent(in) :: flag integer(psb_ipk_), intent(out) :: info class(psb_s_base_multivect_type) :: y @@ -545,9 +541,8 @@ subroutine psi_sswap_vidx_multivect(ictxt,iicomm,flag,beta,y,idx, & integer(psb_ipk_), intent(in) :: totxch,totsnd, totrcv ! locals - type(psb_ctxt_type) :: ctxt - integer(psb_mpk_) :: icomm, np, me,& - & proc_to_comm, p2ptag, p2pstat(mpi_status_size), iret + integer(psb_ipk_) :: np, me + integer(psb_mpk_) :: proc_to_comm, p2ptag, p2pstat(mpi_status_size), iret integer(psb_mpk_), allocatable :: prcid(:) integer(psb_ipk_) :: nesd, nerv,& & err_act, i, idx_pt, totsnd_, totrcv_,& @@ -560,9 +555,6 @@ subroutine psi_sswap_vidx_multivect(ictxt,iicomm,flag,beta,y,idx, & info=psb_success_ name='psi_swap_datav' call psb_erractionsave(err_act) - ctxt = ictxt - icomm = iicomm - call psb_info(ctxt,me,np) if (np == -1) then info=psb_err_context_error_ diff --git a/base/comm/internals/psi_sswapdata_a.F90 b/base/comm/internals/psi_sswapdata_a.F90 index 6d74e1ad..6ca2aa7c 100644 --- a/base/comm/internals/psi_sswapdata_a.F90 +++ b/base/comm/internals/psi_sswapdata_a.F90 @@ -179,8 +179,8 @@ subroutine psi_sswapidxm(ctxt,icomm,flag,n,beta,y,idx, & ! locals - integer(psb_mpk_) :: np, me,& - & proc_to_comm, p2ptag, p2pstat(mpi_status_size), iret + integer(psb_ipk_) :: np, me + integer(psb_mpk_) :: proc_to_comm, p2ptag, p2pstat(mpi_status_size), iret integer(psb_mpk_), allocatable, dimension(:) :: bsdidx, brvidx,& & sdsz, rvsz, prcid, rvhd, sdhd integer(psb_ipk_) :: nesd, nerv,& @@ -197,7 +197,6 @@ subroutine psi_sswapidxm(ctxt,icomm,flag,n,beta,y,idx, & info=psb_success_ name='psi_swap_data' call psb_erractionsave(err_act) - call psb_info(ctxt,me,np) if (np == -1) then info=psb_err_context_error_ @@ -641,7 +640,7 @@ end subroutine psi_sswapdatav ! ! ! -subroutine psi_sswapidxv(ictxt,iicomm,flag,beta,y,idx, & +subroutine psi_sswapidxv(ctxt,icomm,flag,beta,y,idx, & & totxch,totsnd,totrcv,work,info) use psi_mod, psb_protect_name => psi_sswapidxv @@ -656,8 +655,8 @@ subroutine psi_sswapidxv(ictxt,iicomm,flag,beta,y,idx, & include 'mpif.h' #endif - type(psb_ctxt_type), intent(in) :: ictxt - integer(psb_mpk_), intent(in) :: iicomm + type(psb_ctxt_type), intent(in) :: ctxt + integer(psb_mpk_), intent(in) :: icomm integer(psb_ipk_), intent(in) :: flag integer(psb_ipk_), intent(out) :: info real(psb_spk_) :: y(:), beta @@ -665,9 +664,8 @@ subroutine psi_sswapidxv(ictxt,iicomm,flag,beta,y,idx, & integer(psb_ipk_), intent(in) :: idx(:),totxch,totsnd, totrcv ! locals - type(psb_ctxt_type) :: ctxt - integer(psb_mpk_) :: icomm, np, me,& - & proc_to_comm, p2ptag, p2pstat(mpi_status_size), iret + integer(psb_ipk_) :: np, me + integer(psb_mpk_) :: proc_to_comm, p2ptag, p2pstat(mpi_status_size), iret integer(psb_mpk_), allocatable, dimension(:) :: bsdidx, brvidx,& & sdsz, rvsz, prcid, rvhd, sdhd integer(psb_ipk_) :: nesd, nerv,& @@ -684,9 +682,6 @@ subroutine psi_sswapidxv(ictxt,iicomm,flag,beta,y,idx, & info=psb_success_ name='psi_swap_datav' call psb_erractionsave(err_act) - ctxt = ictxt - icomm = iicomm - call psb_info(ctxt,me,np) if (np == -1) then info=psb_err_context_error_ diff --git a/base/comm/internals/psi_sswaptran.F90 b/base/comm/internals/psi_sswaptran.F90 index 25aa5303..90c4b275 100644 --- a/base/comm/internals/psi_sswaptran.F90 +++ b/base/comm/internals/psi_sswaptran.F90 @@ -176,7 +176,7 @@ end subroutine psi_sswaptran_vect ! ! ! -subroutine psi_stran_vidx_vect(ictxt,iicomm,flag,beta,y,idx,& +subroutine psi_stran_vidx_vect(ctxt,icomm,flag,beta,y,idx,& & totxch,totsnd,totrcv,work,info) use psi_mod, psb_protect_name => psi_stran_vidx_vect @@ -193,8 +193,8 @@ subroutine psi_stran_vidx_vect(ictxt,iicomm,flag,beta,y,idx,& include 'mpif.h' #endif - type(psb_ctxt_type), intent(in) :: ictxt - integer(psb_mpk_), intent(in) :: iicomm + type(psb_ctxt_type), intent(in) :: ctxt + integer(psb_mpk_), intent(in) :: icomm integer(psb_ipk_), intent(in) :: flag integer(psb_ipk_), intent(out) :: info class(psb_s_base_vect_type) :: y @@ -204,9 +204,8 @@ subroutine psi_stran_vidx_vect(ictxt,iicomm,flag,beta,y,idx,& integer(psb_ipk_), intent(in) :: totxch,totsnd, totrcv ! locals - type(psb_ctxt_type) :: ctxt - integer(psb_mpk_) :: icomm, np, me,& - & proc_to_comm, p2ptag, p2pstat(mpi_status_size), iret + integer(psb_ipk_) :: np, me + integer(psb_mpk_) :: proc_to_comm, p2ptag, p2pstat(mpi_status_size), iret integer(psb_mpk_), allocatable :: prcid(:) integer(psb_ipk_) :: nesd, nerv,& & err_act, i, idx_pt, totsnd_, totrcv_,& @@ -219,9 +218,6 @@ subroutine psi_stran_vidx_vect(ictxt,iicomm,flag,beta,y,idx,& info=psb_success_ name='psi_swap_tran' call psb_erractionsave(err_act) - ctxt = ictxt - icomm = iicomm - call psb_info(ctxt,me,np) if (np == -1) then info=psb_err_context_error_ @@ -528,7 +524,7 @@ subroutine psi_sswaptran_multivect(flag,beta,y,desc_a,work,info,data) ! ! ! -subroutine psi_stran_vidx_multivect(ictxt,iicomm,flag,beta,y,idx,& +subroutine psi_stran_vidx_multivect(ctxt,icomm,flag,beta,y,idx,& & totxch,totsnd,totrcv,work,info) use psi_mod, psb_protect_name => psi_stran_vidx_multivect @@ -545,8 +541,8 @@ subroutine psi_stran_vidx_multivect(ictxt,iicomm,flag,beta,y,idx,& include 'mpif.h' #endif - type(psb_ctxt_type), intent(in) :: ictxt - integer(psb_mpk_), intent(in) :: iicomm + type(psb_ctxt_type), intent(in) :: ctxt + integer(psb_mpk_), intent(in) :: icomm integer(psb_ipk_), intent(in) :: flag integer(psb_ipk_), intent(out) :: info class(psb_s_base_multivect_type) :: y @@ -556,9 +552,8 @@ subroutine psi_stran_vidx_multivect(ictxt,iicomm,flag,beta,y,idx,& integer(psb_ipk_), intent(in) :: totxch,totsnd, totrcv ! locals - type(psb_ctxt_type) :: ctxt - integer(psb_mpk_) :: icomm, np, me,& - & proc_to_comm, p2ptag, p2pstat(mpi_status_size), iret + integer(psb_ipk_) :: np, me + integer(psb_mpk_) :: proc_to_comm, p2ptag, p2pstat(mpi_status_size), iret integer(psb_mpk_), allocatable :: prcid(:) integer(psb_ipk_) :: nesd, nerv,& & err_act, i, idx_pt, totsnd_, totrcv_,& @@ -571,9 +566,6 @@ subroutine psi_stran_vidx_multivect(ictxt,iicomm,flag,beta,y,idx,& info=psb_success_ name='psi_swap_tran' call psb_erractionsave(err_act) - ctxt = ictxt - icomm = iicomm - call psb_info(ctxt,me,np) if (np == -1) then info=psb_err_context_error_ diff --git a/base/comm/internals/psi_sswaptran_a.F90 b/base/comm/internals/psi_sswaptran_a.F90 index 866456d4..19e02670 100644 --- a/base/comm/internals/psi_sswaptran_a.F90 +++ b/base/comm/internals/psi_sswaptran_a.F90 @@ -159,7 +159,7 @@ subroutine psi_sswaptranm(flag,n,beta,y,desc_a,work,info,data) return end subroutine psi_sswaptranm -subroutine psi_stranidxm(ictxt,iicomm,flag,n,beta,y,idx,& +subroutine psi_stranidxm(ctxt,icomm,flag,n,beta,y,idx,& & totxch,totsnd,totrcv,work,info) use psi_mod, psb_protect_name => psi_stranidxm @@ -174,8 +174,8 @@ subroutine psi_stranidxm(ictxt,iicomm,flag,n,beta,y,idx,& include 'mpif.h' #endif - type(psb_ctxt_type), intent(in) :: ictxt - integer(psb_mpk_), intent(in) :: iicomm + type(psb_ctxt_type), intent(in) :: ctxt + integer(psb_mpk_), intent(in) :: icomm integer(psb_ipk_), intent(in) :: flag,n integer(psb_ipk_), intent(out) :: info real(psb_spk_) :: y(:,:), beta @@ -183,9 +183,8 @@ subroutine psi_stranidxm(ictxt,iicomm,flag,n,beta,y,idx,& integer(psb_ipk_), intent(in) :: idx(:),totxch,totsnd, totrcv ! locals - type(psb_ctxt_type) :: ctxt - integer(psb_mpk_) :: icomm, np, me,& - & proc_to_comm, p2ptag, p2pstat(mpi_status_size), iret + integer(psb_ipk_) :: np, me + integer(psb_mpk_) :: proc_to_comm, p2ptag, p2pstat(mpi_status_size), iret integer(psb_mpk_), allocatable, dimension(:) :: bsdidx, brvidx,& & sdsz, rvsz, prcid, rvhd, sdhd integer(psb_ipk_) :: nesd, nerv,& @@ -202,9 +201,6 @@ subroutine psi_stranidxm(ictxt,iicomm,flag,n,beta,y,idx,& info=psb_success_ name='psi_swap_tran' call psb_erractionsave(err_act) - ctxt = ictxt - icomm = iicomm - call psb_info(ctxt,me,np) if (np == -1) then info=psb_err_context_error_ @@ -656,7 +652,7 @@ end subroutine psi_sswaptranv ! ! ! -subroutine psi_stranidxv(ictxt,iicomm,flag,beta,y,idx,& +subroutine psi_stranidxv(ctxt,icomm,flag,beta,y,idx,& & totxch,totsnd,totrcv,work,info) use psi_mod, psb_protect_name => psi_stranidxv @@ -671,8 +667,8 @@ subroutine psi_stranidxv(ictxt,iicomm,flag,beta,y,idx,& include 'mpif.h' #endif - type(psb_ctxt_type), intent(in) :: ictxt - integer(psb_mpk_), intent(in) :: iicomm + type(psb_ctxt_type), intent(in) :: ctxt + integer(psb_mpk_), intent(in) :: icomm integer(psb_ipk_), intent(in) :: flag integer(psb_ipk_), intent(out) :: info real(psb_spk_) :: y(:), beta @@ -680,9 +676,8 @@ subroutine psi_stranidxv(ictxt,iicomm,flag,beta,y,idx,& integer(psb_ipk_), intent(in) :: idx(:),totxch,totsnd, totrcv ! locals - type(psb_ctxt_type) :: ctxt - integer(psb_mpk_) :: icomm, np, me,& - & proc_to_comm, p2ptag, p2pstat(mpi_status_size), iret + integer(psb_ipk_) :: np, me + integer(psb_mpk_) :: proc_to_comm, p2ptag, p2pstat(mpi_status_size), iret integer(psb_mpk_), allocatable, dimension(:) :: bsdidx, brvidx,& & sdsz, rvsz, prcid, rvhd, sdhd integer(psb_ipk_) :: nesd, nerv,& @@ -699,9 +694,6 @@ subroutine psi_stranidxv(ictxt,iicomm,flag,beta,y,idx,& info=psb_success_ name='psi_swap_tran' call psb_erractionsave(err_act) - ctxt = ictxt - icomm = iicomm - call psb_info(ctxt,me,np) if (np == -1) then info=psb_err_context_error_ diff --git a/base/comm/internals/psi_zswapdata.F90 b/base/comm/internals/psi_zswapdata.F90 index e892a795..991d6e40 100644 --- a/base/comm/internals/psi_zswapdata.F90 +++ b/base/comm/internals/psi_zswapdata.F90 @@ -175,7 +175,7 @@ end subroutine psi_zswapdata_vect ! ! ! -subroutine psi_zswap_vidx_vect(ictxt,iicomm,flag,beta,y,idx, & +subroutine psi_zswap_vidx_vect(ctxt,icomm,flag,beta,y,idx, & & totxch,totsnd,totrcv,work,info) use psi_mod, psb_protect_name => psi_zswap_vidx_vect @@ -192,8 +192,8 @@ subroutine psi_zswap_vidx_vect(ictxt,iicomm,flag,beta,y,idx, & include 'mpif.h' #endif - type(psb_ctxt_type), intent(in) :: ictxt - integer(psb_mpk_), intent(in) :: iicomm + type(psb_ctxt_type), intent(in) :: ctxt + integer(psb_mpk_), intent(in) :: icomm integer(psb_ipk_), intent(in) :: flag integer(psb_ipk_), intent(out) :: info class(psb_z_base_vect_type) :: y @@ -203,9 +203,8 @@ subroutine psi_zswap_vidx_vect(ictxt,iicomm,flag,beta,y,idx, & integer(psb_ipk_), intent(in) :: totxch,totsnd, totrcv ! locals - type(psb_ctxt_type) :: ctxt - integer(psb_mpk_) :: icomm, np, me,& - & proc_to_comm, p2ptag, p2pstat(mpi_status_size), iret + integer(psb_ipk_) :: np, me + integer(psb_mpk_) :: proc_to_comm, p2ptag, p2pstat(mpi_status_size), iret integer(psb_mpk_), allocatable :: prcid(:) integer(psb_ipk_) :: nesd, nerv,& & err_act, i, idx_pt, totsnd_, totrcv_,& @@ -218,9 +217,6 @@ subroutine psi_zswap_vidx_vect(ictxt,iicomm,flag,beta,y,idx, & info=psb_success_ name='psi_swap_datav' call psb_erractionsave(err_act) - ctxt = ictxt - icomm = iicomm - call psb_info(ctxt,me,np) if (np == -1) then info=psb_err_context_error_ @@ -517,7 +513,7 @@ end subroutine psi_zswapdata_multivect ! ! ! -subroutine psi_zswap_vidx_multivect(ictxt,iicomm,flag,beta,y,idx, & +subroutine psi_zswap_vidx_multivect(ctxt,icomm,flag,beta,y,idx, & & totxch,totsnd,totrcv,work,info) use psi_mod, psb_protect_name => psi_zswap_vidx_multivect @@ -534,8 +530,8 @@ subroutine psi_zswap_vidx_multivect(ictxt,iicomm,flag,beta,y,idx, & include 'mpif.h' #endif - type(psb_ctxt_type), intent(in) :: ictxt - integer(psb_mpk_), intent(in) :: iicomm + type(psb_ctxt_type), intent(in) :: ctxt + integer(psb_mpk_), intent(in) :: icomm integer(psb_ipk_), intent(in) :: flag integer(psb_ipk_), intent(out) :: info class(psb_z_base_multivect_type) :: y @@ -545,9 +541,8 @@ subroutine psi_zswap_vidx_multivect(ictxt,iicomm,flag,beta,y,idx, & integer(psb_ipk_), intent(in) :: totxch,totsnd, totrcv ! locals - type(psb_ctxt_type) :: ctxt - integer(psb_mpk_) :: icomm, np, me,& - & proc_to_comm, p2ptag, p2pstat(mpi_status_size), iret + integer(psb_ipk_) :: np, me + integer(psb_mpk_) :: proc_to_comm, p2ptag, p2pstat(mpi_status_size), iret integer(psb_mpk_), allocatable :: prcid(:) integer(psb_ipk_) :: nesd, nerv,& & err_act, i, idx_pt, totsnd_, totrcv_,& @@ -560,9 +555,6 @@ subroutine psi_zswap_vidx_multivect(ictxt,iicomm,flag,beta,y,idx, & info=psb_success_ name='psi_swap_datav' call psb_erractionsave(err_act) - ctxt = ictxt - icomm = iicomm - call psb_info(ctxt,me,np) if (np == -1) then info=psb_err_context_error_ diff --git a/base/comm/internals/psi_zswapdata_a.F90 b/base/comm/internals/psi_zswapdata_a.F90 index 25e1a991..43cf3325 100644 --- a/base/comm/internals/psi_zswapdata_a.F90 +++ b/base/comm/internals/psi_zswapdata_a.F90 @@ -179,8 +179,8 @@ subroutine psi_zswapidxm(ctxt,icomm,flag,n,beta,y,idx, & ! locals - integer(psb_mpk_) :: np, me,& - & proc_to_comm, p2ptag, p2pstat(mpi_status_size), iret + integer(psb_ipk_) :: np, me + integer(psb_mpk_) :: proc_to_comm, p2ptag, p2pstat(mpi_status_size), iret integer(psb_mpk_), allocatable, dimension(:) :: bsdidx, brvidx,& & sdsz, rvsz, prcid, rvhd, sdhd integer(psb_ipk_) :: nesd, nerv,& @@ -197,7 +197,6 @@ subroutine psi_zswapidxm(ctxt,icomm,flag,n,beta,y,idx, & info=psb_success_ name='psi_swap_data' call psb_erractionsave(err_act) - call psb_info(ctxt,me,np) if (np == -1) then info=psb_err_context_error_ @@ -641,7 +640,7 @@ end subroutine psi_zswapdatav ! ! ! -subroutine psi_zswapidxv(ictxt,iicomm,flag,beta,y,idx, & +subroutine psi_zswapidxv(ctxt,icomm,flag,beta,y,idx, & & totxch,totsnd,totrcv,work,info) use psi_mod, psb_protect_name => psi_zswapidxv @@ -656,8 +655,8 @@ subroutine psi_zswapidxv(ictxt,iicomm,flag,beta,y,idx, & include 'mpif.h' #endif - type(psb_ctxt_type), intent(in) :: ictxt - integer(psb_mpk_), intent(in) :: iicomm + type(psb_ctxt_type), intent(in) :: ctxt + integer(psb_mpk_), intent(in) :: icomm integer(psb_ipk_), intent(in) :: flag integer(psb_ipk_), intent(out) :: info complex(psb_dpk_) :: y(:), beta @@ -665,9 +664,8 @@ subroutine psi_zswapidxv(ictxt,iicomm,flag,beta,y,idx, & integer(psb_ipk_), intent(in) :: idx(:),totxch,totsnd, totrcv ! locals - type(psb_ctxt_type) :: ctxt - integer(psb_mpk_) :: icomm, np, me,& - & proc_to_comm, p2ptag, p2pstat(mpi_status_size), iret + integer(psb_ipk_) :: np, me + integer(psb_mpk_) :: proc_to_comm, p2ptag, p2pstat(mpi_status_size), iret integer(psb_mpk_), allocatable, dimension(:) :: bsdidx, brvidx,& & sdsz, rvsz, prcid, rvhd, sdhd integer(psb_ipk_) :: nesd, nerv,& @@ -684,9 +682,6 @@ subroutine psi_zswapidxv(ictxt,iicomm,flag,beta,y,idx, & info=psb_success_ name='psi_swap_datav' call psb_erractionsave(err_act) - ctxt = ictxt - icomm = iicomm - call psb_info(ctxt,me,np) if (np == -1) then info=psb_err_context_error_ diff --git a/base/comm/internals/psi_zswaptran.F90 b/base/comm/internals/psi_zswaptran.F90 index 74fc4221..f027519f 100644 --- a/base/comm/internals/psi_zswaptran.F90 +++ b/base/comm/internals/psi_zswaptran.F90 @@ -176,7 +176,7 @@ end subroutine psi_zswaptran_vect ! ! ! -subroutine psi_ztran_vidx_vect(ictxt,iicomm,flag,beta,y,idx,& +subroutine psi_ztran_vidx_vect(ctxt,icomm,flag,beta,y,idx,& & totxch,totsnd,totrcv,work,info) use psi_mod, psb_protect_name => psi_ztran_vidx_vect @@ -193,8 +193,8 @@ subroutine psi_ztran_vidx_vect(ictxt,iicomm,flag,beta,y,idx,& include 'mpif.h' #endif - type(psb_ctxt_type), intent(in) :: ictxt - integer(psb_mpk_), intent(in) :: iicomm + type(psb_ctxt_type), intent(in) :: ctxt + integer(psb_mpk_), intent(in) :: icomm integer(psb_ipk_), intent(in) :: flag integer(psb_ipk_), intent(out) :: info class(psb_z_base_vect_type) :: y @@ -204,9 +204,8 @@ subroutine psi_ztran_vidx_vect(ictxt,iicomm,flag,beta,y,idx,& integer(psb_ipk_), intent(in) :: totxch,totsnd, totrcv ! locals - type(psb_ctxt_type) :: ctxt - integer(psb_mpk_) :: icomm, np, me,& - & proc_to_comm, p2ptag, p2pstat(mpi_status_size), iret + integer(psb_ipk_) :: np, me + integer(psb_mpk_) :: proc_to_comm, p2ptag, p2pstat(mpi_status_size), iret integer(psb_mpk_), allocatable :: prcid(:) integer(psb_ipk_) :: nesd, nerv,& & err_act, i, idx_pt, totsnd_, totrcv_,& @@ -219,9 +218,6 @@ subroutine psi_ztran_vidx_vect(ictxt,iicomm,flag,beta,y,idx,& info=psb_success_ name='psi_swap_tran' call psb_erractionsave(err_act) - ctxt = ictxt - icomm = iicomm - call psb_info(ctxt,me,np) if (np == -1) then info=psb_err_context_error_ @@ -528,7 +524,7 @@ subroutine psi_zswaptran_multivect(flag,beta,y,desc_a,work,info,data) ! ! ! -subroutine psi_ztran_vidx_multivect(ictxt,iicomm,flag,beta,y,idx,& +subroutine psi_ztran_vidx_multivect(ctxt,icomm,flag,beta,y,idx,& & totxch,totsnd,totrcv,work,info) use psi_mod, psb_protect_name => psi_ztran_vidx_multivect @@ -545,8 +541,8 @@ subroutine psi_ztran_vidx_multivect(ictxt,iicomm,flag,beta,y,idx,& include 'mpif.h' #endif - type(psb_ctxt_type), intent(in) :: ictxt - integer(psb_mpk_), intent(in) :: iicomm + type(psb_ctxt_type), intent(in) :: ctxt + integer(psb_mpk_), intent(in) :: icomm integer(psb_ipk_), intent(in) :: flag integer(psb_ipk_), intent(out) :: info class(psb_z_base_multivect_type) :: y @@ -556,9 +552,8 @@ subroutine psi_ztran_vidx_multivect(ictxt,iicomm,flag,beta,y,idx,& integer(psb_ipk_), intent(in) :: totxch,totsnd, totrcv ! locals - type(psb_ctxt_type) :: ctxt - integer(psb_mpk_) :: icomm, np, me,& - & proc_to_comm, p2ptag, p2pstat(mpi_status_size), iret + integer(psb_ipk_) :: np, me + integer(psb_mpk_) :: proc_to_comm, p2ptag, p2pstat(mpi_status_size), iret integer(psb_mpk_), allocatable :: prcid(:) integer(psb_ipk_) :: nesd, nerv,& & err_act, i, idx_pt, totsnd_, totrcv_,& @@ -571,9 +566,6 @@ subroutine psi_ztran_vidx_multivect(ictxt,iicomm,flag,beta,y,idx,& info=psb_success_ name='psi_swap_tran' call psb_erractionsave(err_act) - ctxt = ictxt - icomm = iicomm - call psb_info(ctxt,me,np) if (np == -1) then info=psb_err_context_error_ diff --git a/base/comm/internals/psi_zswaptran_a.F90 b/base/comm/internals/psi_zswaptran_a.F90 index 4984b51b..e7927480 100644 --- a/base/comm/internals/psi_zswaptran_a.F90 +++ b/base/comm/internals/psi_zswaptran_a.F90 @@ -159,7 +159,7 @@ subroutine psi_zswaptranm(flag,n,beta,y,desc_a,work,info,data) return end subroutine psi_zswaptranm -subroutine psi_ztranidxm(ictxt,iicomm,flag,n,beta,y,idx,& +subroutine psi_ztranidxm(ctxt,icomm,flag,n,beta,y,idx,& & totxch,totsnd,totrcv,work,info) use psi_mod, psb_protect_name => psi_ztranidxm @@ -174,8 +174,8 @@ subroutine psi_ztranidxm(ictxt,iicomm,flag,n,beta,y,idx,& include 'mpif.h' #endif - type(psb_ctxt_type), intent(in) :: ictxt - integer(psb_mpk_), intent(in) :: iicomm + type(psb_ctxt_type), intent(in) :: ctxt + integer(psb_mpk_), intent(in) :: icomm integer(psb_ipk_), intent(in) :: flag,n integer(psb_ipk_), intent(out) :: info complex(psb_dpk_) :: y(:,:), beta @@ -183,9 +183,8 @@ subroutine psi_ztranidxm(ictxt,iicomm,flag,n,beta,y,idx,& integer(psb_ipk_), intent(in) :: idx(:),totxch,totsnd, totrcv ! locals - type(psb_ctxt_type) :: ctxt - integer(psb_mpk_) :: icomm, np, me,& - & proc_to_comm, p2ptag, p2pstat(mpi_status_size), iret + integer(psb_ipk_) :: np, me + integer(psb_mpk_) :: proc_to_comm, p2ptag, p2pstat(mpi_status_size), iret integer(psb_mpk_), allocatable, dimension(:) :: bsdidx, brvidx,& & sdsz, rvsz, prcid, rvhd, sdhd integer(psb_ipk_) :: nesd, nerv,& @@ -202,9 +201,6 @@ subroutine psi_ztranidxm(ictxt,iicomm,flag,n,beta,y,idx,& info=psb_success_ name='psi_swap_tran' call psb_erractionsave(err_act) - ctxt = ictxt - icomm = iicomm - call psb_info(ctxt,me,np) if (np == -1) then info=psb_err_context_error_ @@ -656,7 +652,7 @@ end subroutine psi_zswaptranv ! ! ! -subroutine psi_ztranidxv(ictxt,iicomm,flag,beta,y,idx,& +subroutine psi_ztranidxv(ctxt,icomm,flag,beta,y,idx,& & totxch,totsnd,totrcv,work,info) use psi_mod, psb_protect_name => psi_ztranidxv @@ -671,8 +667,8 @@ subroutine psi_ztranidxv(ictxt,iicomm,flag,beta,y,idx,& include 'mpif.h' #endif - type(psb_ctxt_type), intent(in) :: ictxt - integer(psb_mpk_), intent(in) :: iicomm + type(psb_ctxt_type), intent(in) :: ctxt + integer(psb_mpk_), intent(in) :: icomm integer(psb_ipk_), intent(in) :: flag integer(psb_ipk_), intent(out) :: info complex(psb_dpk_) :: y(:), beta @@ -680,9 +676,8 @@ subroutine psi_ztranidxv(ictxt,iicomm,flag,beta,y,idx,& integer(psb_ipk_), intent(in) :: idx(:),totxch,totsnd, totrcv ! locals - type(psb_ctxt_type) :: ctxt - integer(psb_mpk_) :: icomm, np, me,& - & proc_to_comm, p2ptag, p2pstat(mpi_status_size), iret + integer(psb_ipk_) :: np, me + integer(psb_mpk_) :: proc_to_comm, p2ptag, p2pstat(mpi_status_size), iret integer(psb_mpk_), allocatable, dimension(:) :: bsdidx, brvidx,& & sdsz, rvsz, prcid, rvhd, sdhd integer(psb_ipk_) :: nesd, nerv,& @@ -699,9 +694,6 @@ subroutine psi_ztranidxv(ictxt,iicomm,flag,beta,y,idx,& info=psb_success_ name='psi_swap_tran' call psb_erractionsave(err_act) - ctxt = ictxt - icomm = iicomm - call psb_info(ctxt,me,np) if (np == -1) then info=psb_err_context_error_ diff --git a/base/modules/comm/psi_c_comm_v_mod.f90 b/base/modules/comm/psi_c_comm_v_mod.f90 index 27faf8a5..7d10a028 100644 --- a/base/modules/comm/psi_c_comm_v_mod.f90 +++ b/base/modules/comm/psi_c_comm_v_mod.f90 @@ -56,11 +56,11 @@ module psi_c_comm_v_mod type(psb_desc_type), target :: desc_a integer(psb_ipk_), optional :: data end subroutine psi_cswapdata_multivect - subroutine psi_cswap_vidx_vect(ictxt,iicomm,flag,beta,y,idx,& + subroutine psi_cswap_vidx_vect(ctxt,icomm,flag,beta,y,idx,& & totxch,totsnd,totrcv,work,info) import - type(psb_ctxt_type), intent(in) :: ictxt - integer(psb_mpk_), intent(in) :: iicomm + type(psb_ctxt_type), intent(in) :: ctxt + integer(psb_mpk_), intent(in) :: icomm integer(psb_ipk_), intent(in) :: flag integer(psb_ipk_), intent(out) :: info class(psb_c_base_vect_type) :: y @@ -69,11 +69,11 @@ module psi_c_comm_v_mod class(psb_i_base_vect_type), intent(inout) :: idx integer(psb_ipk_), intent(in) :: totxch,totsnd, totrcv end subroutine psi_cswap_vidx_vect - subroutine psi_cswap_vidx_multivect(ictxt,iicomm,flag,beta,y,idx,& + subroutine psi_cswap_vidx_multivect(ctxt,icomm,flag,beta,y,idx,& & totxch,totsnd,totrcv,work,info) import - type(psb_ctxt_type), intent(in) :: ictxt - integer(psb_mpk_), intent(in) :: iicomm + type(psb_ctxt_type), intent(in) :: ctxt + integer(psb_mpk_), intent(in) :: icomm integer(psb_ipk_), intent(in) :: flag integer(psb_ipk_), intent(out) :: info class(psb_c_base_multivect_type) :: y @@ -106,11 +106,11 @@ module psi_c_comm_v_mod type(psb_desc_type), target :: desc_a integer(psb_ipk_), optional :: data end subroutine psi_cswaptran_multivect - subroutine psi_ctran_vidx_vect(ictxt,iicomm,flag,beta,y,idx,& + subroutine psi_ctran_vidx_vect(ctxt,icomm,flag,beta,y,idx,& & totxch,totsnd,totrcv,work,info) import - type(psb_ctxt_type), intent(in) :: ictxt - integer(psb_mpk_), intent(in) :: iicomm + type(psb_ctxt_type), intent(in) :: ctxt + integer(psb_mpk_), intent(in) :: icomm integer(psb_ipk_), intent(in) :: flag integer(psb_ipk_), intent(out) :: info class(psb_c_base_vect_type) :: y @@ -119,11 +119,11 @@ module psi_c_comm_v_mod class(psb_i_base_vect_type), intent(inout) :: idx integer(psb_ipk_), intent(in) :: totxch,totsnd, totrcv end subroutine psi_ctran_vidx_vect - subroutine psi_ctran_vidx_multivect(ictxt,iicomm,flag,beta,y,idx,& + subroutine psi_ctran_vidx_multivect(ctxt,icomm,flag,beta,y,idx,& & totxch,totsnd,totrcv,work,info) import - type(psb_ctxt_type), intent(in) :: ictxt - integer(psb_mpk_), intent(in) :: iicomm + type(psb_ctxt_type), intent(in) :: ctxt + integer(psb_mpk_), intent(in) :: icomm integer(psb_ipk_), intent(in) :: flag integer(psb_ipk_), intent(out) :: info class(psb_c_base_multivect_type) :: y diff --git a/base/modules/comm/psi_d_comm_v_mod.f90 b/base/modules/comm/psi_d_comm_v_mod.f90 index 3fa473d3..b7a902da 100644 --- a/base/modules/comm/psi_d_comm_v_mod.f90 +++ b/base/modules/comm/psi_d_comm_v_mod.f90 @@ -56,11 +56,11 @@ module psi_d_comm_v_mod type(psb_desc_type), target :: desc_a integer(psb_ipk_), optional :: data end subroutine psi_dswapdata_multivect - subroutine psi_dswap_vidx_vect(ictxt,iicomm,flag,beta,y,idx,& + subroutine psi_dswap_vidx_vect(ctxt,icomm,flag,beta,y,idx,& & totxch,totsnd,totrcv,work,info) import - type(psb_ctxt_type), intent(in) :: ictxt - integer(psb_mpk_), intent(in) :: iicomm + type(psb_ctxt_type), intent(in) :: ctxt + integer(psb_mpk_), intent(in) :: icomm integer(psb_ipk_), intent(in) :: flag integer(psb_ipk_), intent(out) :: info class(psb_d_base_vect_type) :: y @@ -69,11 +69,11 @@ module psi_d_comm_v_mod class(psb_i_base_vect_type), intent(inout) :: idx integer(psb_ipk_), intent(in) :: totxch,totsnd, totrcv end subroutine psi_dswap_vidx_vect - subroutine psi_dswap_vidx_multivect(ictxt,iicomm,flag,beta,y,idx,& + subroutine psi_dswap_vidx_multivect(ctxt,icomm,flag,beta,y,idx,& & totxch,totsnd,totrcv,work,info) import - type(psb_ctxt_type), intent(in) :: ictxt - integer(psb_mpk_), intent(in) :: iicomm + type(psb_ctxt_type), intent(in) :: ctxt + integer(psb_mpk_), intent(in) :: icomm integer(psb_ipk_), intent(in) :: flag integer(psb_ipk_), intent(out) :: info class(psb_d_base_multivect_type) :: y @@ -106,11 +106,11 @@ module psi_d_comm_v_mod type(psb_desc_type), target :: desc_a integer(psb_ipk_), optional :: data end subroutine psi_dswaptran_multivect - subroutine psi_dtran_vidx_vect(ictxt,iicomm,flag,beta,y,idx,& + subroutine psi_dtran_vidx_vect(ctxt,icomm,flag,beta,y,idx,& & totxch,totsnd,totrcv,work,info) import - type(psb_ctxt_type), intent(in) :: ictxt - integer(psb_mpk_), intent(in) :: iicomm + type(psb_ctxt_type), intent(in) :: ctxt + integer(psb_mpk_), intent(in) :: icomm integer(psb_ipk_), intent(in) :: flag integer(psb_ipk_), intent(out) :: info class(psb_d_base_vect_type) :: y @@ -119,11 +119,11 @@ module psi_d_comm_v_mod class(psb_i_base_vect_type), intent(inout) :: idx integer(psb_ipk_), intent(in) :: totxch,totsnd, totrcv end subroutine psi_dtran_vidx_vect - subroutine psi_dtran_vidx_multivect(ictxt,iicomm,flag,beta,y,idx,& + subroutine psi_dtran_vidx_multivect(ctxt,icomm,flag,beta,y,idx,& & totxch,totsnd,totrcv,work,info) import - type(psb_ctxt_type), intent(in) :: ictxt - integer(psb_mpk_), intent(in) :: iicomm + type(psb_ctxt_type), intent(in) :: ctxt + integer(psb_mpk_), intent(in) :: icomm integer(psb_ipk_), intent(in) :: flag integer(psb_ipk_), intent(out) :: info class(psb_d_base_multivect_type) :: y diff --git a/base/modules/comm/psi_i_comm_v_mod.f90 b/base/modules/comm/psi_i_comm_v_mod.f90 index 1be09444..2fe3948c 100644 --- a/base/modules/comm/psi_i_comm_v_mod.f90 +++ b/base/modules/comm/psi_i_comm_v_mod.f90 @@ -57,11 +57,11 @@ module psi_i_comm_v_mod type(psb_desc_type), target :: desc_a integer(psb_ipk_), optional :: data end subroutine psi_iswapdata_multivect - subroutine psi_iswap_vidx_vect(ictxt,iicomm,flag,beta,y,idx,& + subroutine psi_iswap_vidx_vect(ctxt,icomm,flag,beta,y,idx,& & totxch,totsnd,totrcv,work,info) import - type(psb_ctxt_type), intent(in) :: ictxt - integer(psb_mpk_), intent(in) :: iicomm + type(psb_ctxt_type), intent(in) :: ctxt + integer(psb_mpk_), intent(in) :: icomm integer(psb_ipk_), intent(in) :: flag integer(psb_ipk_), intent(out) :: info class(psb_i_base_vect_type) :: y @@ -70,11 +70,11 @@ module psi_i_comm_v_mod class(psb_i_base_vect_type), intent(inout) :: idx integer(psb_ipk_), intent(in) :: totxch,totsnd, totrcv end subroutine psi_iswap_vidx_vect - subroutine psi_iswap_vidx_multivect(ictxt,iicomm,flag,beta,y,idx,& + subroutine psi_iswap_vidx_multivect(ctxt,icomm,flag,beta,y,idx,& & totxch,totsnd,totrcv,work,info) import - type(psb_ctxt_type), intent(in) :: ictxt - integer(psb_mpk_), intent(in) :: iicomm + type(psb_ctxt_type), intent(in) :: ctxt + integer(psb_mpk_), intent(in) :: icomm integer(psb_ipk_), intent(in) :: flag integer(psb_ipk_), intent(out) :: info class(psb_i_base_multivect_type) :: y @@ -107,11 +107,11 @@ module psi_i_comm_v_mod type(psb_desc_type), target :: desc_a integer(psb_ipk_), optional :: data end subroutine psi_iswaptran_multivect - subroutine psi_itran_vidx_vect(ictxt,iicomm,flag,beta,y,idx,& + subroutine psi_itran_vidx_vect(ctxt,icomm,flag,beta,y,idx,& & totxch,totsnd,totrcv,work,info) import - type(psb_ctxt_type), intent(in) :: ictxt - integer(psb_mpk_), intent(in) :: iicomm + type(psb_ctxt_type), intent(in) :: ctxt + integer(psb_mpk_), intent(in) :: icomm integer(psb_ipk_), intent(in) :: flag integer(psb_ipk_), intent(out) :: info class(psb_i_base_vect_type) :: y @@ -120,11 +120,11 @@ module psi_i_comm_v_mod class(psb_i_base_vect_type), intent(inout) :: idx integer(psb_ipk_), intent(in) :: totxch,totsnd, totrcv end subroutine psi_itran_vidx_vect - subroutine psi_itran_vidx_multivect(ictxt,iicomm,flag,beta,y,idx,& + subroutine psi_itran_vidx_multivect(ctxt,icomm,flag,beta,y,idx,& & totxch,totsnd,totrcv,work,info) import - type(psb_ctxt_type), intent(in) :: ictxt - integer(psb_mpk_), intent(in) :: iicomm + type(psb_ctxt_type), intent(in) :: ctxt + integer(psb_mpk_), intent(in) :: icomm integer(psb_ipk_), intent(in) :: flag integer(psb_ipk_), intent(out) :: info class(psb_i_base_multivect_type) :: y diff --git a/base/modules/comm/psi_l_comm_v_mod.f90 b/base/modules/comm/psi_l_comm_v_mod.f90 index d218c77c..b61a17b7 100644 --- a/base/modules/comm/psi_l_comm_v_mod.f90 +++ b/base/modules/comm/psi_l_comm_v_mod.f90 @@ -58,11 +58,11 @@ module psi_l_comm_v_mod type(psb_desc_type), target :: desc_a integer(psb_ipk_), optional :: data end subroutine psi_lswapdata_multivect - subroutine psi_lswap_vidx_vect(ictxt,iicomm,flag,beta,y,idx,& + subroutine psi_lswap_vidx_vect(ctxt,icomm,flag,beta,y,idx,& & totxch,totsnd,totrcv,work,info) import - type(psb_ctxt_type), intent(in) :: ictxt - integer(psb_mpk_), intent(in) :: iicomm + type(psb_ctxt_type), intent(in) :: ctxt + integer(psb_mpk_), intent(in) :: icomm integer(psb_ipk_), intent(in) :: flag integer(psb_ipk_), intent(out) :: info class(psb_l_base_vect_type) :: y @@ -71,11 +71,11 @@ module psi_l_comm_v_mod class(psb_i_base_vect_type), intent(inout) :: idx integer(psb_ipk_), intent(in) :: totxch,totsnd, totrcv end subroutine psi_lswap_vidx_vect - subroutine psi_lswap_vidx_multivect(ictxt,iicomm,flag,beta,y,idx,& + subroutine psi_lswap_vidx_multivect(ctxt,icomm,flag,beta,y,idx,& & totxch,totsnd,totrcv,work,info) import - type(psb_ctxt_type), intent(in) :: ictxt - integer(psb_mpk_), intent(in) :: iicomm + type(psb_ctxt_type), intent(in) :: ctxt + integer(psb_mpk_), intent(in) :: icomm integer(psb_ipk_), intent(in) :: flag integer(psb_ipk_), intent(out) :: info class(psb_l_base_multivect_type) :: y @@ -108,11 +108,11 @@ module psi_l_comm_v_mod type(psb_desc_type), target :: desc_a integer(psb_ipk_), optional :: data end subroutine psi_lswaptran_multivect - subroutine psi_ltran_vidx_vect(ictxt,iicomm,flag,beta,y,idx,& + subroutine psi_ltran_vidx_vect(ctxt,icomm,flag,beta,y,idx,& & totxch,totsnd,totrcv,work,info) import - type(psb_ctxt_type), intent(in) :: ictxt - integer(psb_mpk_), intent(in) :: iicomm + type(psb_ctxt_type), intent(in) :: ctxt + integer(psb_mpk_), intent(in) :: icomm integer(psb_ipk_), intent(in) :: flag integer(psb_ipk_), intent(out) :: info class(psb_l_base_vect_type) :: y @@ -121,11 +121,11 @@ module psi_l_comm_v_mod class(psb_i_base_vect_type), intent(inout) :: idx integer(psb_ipk_), intent(in) :: totxch,totsnd, totrcv end subroutine psi_ltran_vidx_vect - subroutine psi_ltran_vidx_multivect(ictxt,iicomm,flag,beta,y,idx,& + subroutine psi_ltran_vidx_multivect(ctxt,icomm,flag,beta,y,idx,& & totxch,totsnd,totrcv,work,info) import - type(psb_ctxt_type), intent(in) :: ictxt - integer(psb_mpk_), intent(in) :: iicomm + type(psb_ctxt_type), intent(in) :: ctxt + integer(psb_mpk_), intent(in) :: icomm integer(psb_ipk_), intent(in) :: flag integer(psb_ipk_), intent(out) :: info class(psb_l_base_multivect_type) :: y diff --git a/base/modules/comm/psi_s_comm_v_mod.f90 b/base/modules/comm/psi_s_comm_v_mod.f90 index b6cbf4a0..1cf4d53e 100644 --- a/base/modules/comm/psi_s_comm_v_mod.f90 +++ b/base/modules/comm/psi_s_comm_v_mod.f90 @@ -56,11 +56,11 @@ module psi_s_comm_v_mod type(psb_desc_type), target :: desc_a integer(psb_ipk_), optional :: data end subroutine psi_sswapdata_multivect - subroutine psi_sswap_vidx_vect(ictxt,iicomm,flag,beta,y,idx,& + subroutine psi_sswap_vidx_vect(ctxt,icomm,flag,beta,y,idx,& & totxch,totsnd,totrcv,work,info) import - type(psb_ctxt_type), intent(in) :: ictxt - integer(psb_mpk_), intent(in) :: iicomm + type(psb_ctxt_type), intent(in) :: ctxt + integer(psb_mpk_), intent(in) :: icomm integer(psb_ipk_), intent(in) :: flag integer(psb_ipk_), intent(out) :: info class(psb_s_base_vect_type) :: y @@ -69,11 +69,11 @@ module psi_s_comm_v_mod class(psb_i_base_vect_type), intent(inout) :: idx integer(psb_ipk_), intent(in) :: totxch,totsnd, totrcv end subroutine psi_sswap_vidx_vect - subroutine psi_sswap_vidx_multivect(ictxt,iicomm,flag,beta,y,idx,& + subroutine psi_sswap_vidx_multivect(ctxt,icomm,flag,beta,y,idx,& & totxch,totsnd,totrcv,work,info) import - type(psb_ctxt_type), intent(in) :: ictxt - integer(psb_mpk_), intent(in) :: iicomm + type(psb_ctxt_type), intent(in) :: ctxt + integer(psb_mpk_), intent(in) :: icomm integer(psb_ipk_), intent(in) :: flag integer(psb_ipk_), intent(out) :: info class(psb_s_base_multivect_type) :: y @@ -106,11 +106,11 @@ module psi_s_comm_v_mod type(psb_desc_type), target :: desc_a integer(psb_ipk_), optional :: data end subroutine psi_sswaptran_multivect - subroutine psi_stran_vidx_vect(ictxt,iicomm,flag,beta,y,idx,& + subroutine psi_stran_vidx_vect(ctxt,icomm,flag,beta,y,idx,& & totxch,totsnd,totrcv,work,info) import - type(psb_ctxt_type), intent(in) :: ictxt - integer(psb_mpk_), intent(in) :: iicomm + type(psb_ctxt_type), intent(in) :: ctxt + integer(psb_mpk_), intent(in) :: icomm integer(psb_ipk_), intent(in) :: flag integer(psb_ipk_), intent(out) :: info class(psb_s_base_vect_type) :: y @@ -119,11 +119,11 @@ module psi_s_comm_v_mod class(psb_i_base_vect_type), intent(inout) :: idx integer(psb_ipk_), intent(in) :: totxch,totsnd, totrcv end subroutine psi_stran_vidx_vect - subroutine psi_stran_vidx_multivect(ictxt,iicomm,flag,beta,y,idx,& + subroutine psi_stran_vidx_multivect(ctxt,icomm,flag,beta,y,idx,& & totxch,totsnd,totrcv,work,info) import - type(psb_ctxt_type), intent(in) :: ictxt - integer(psb_mpk_), intent(in) :: iicomm + type(psb_ctxt_type), intent(in) :: ctxt + integer(psb_mpk_), intent(in) :: icomm integer(psb_ipk_), intent(in) :: flag integer(psb_ipk_), intent(out) :: info class(psb_s_base_multivect_type) :: y diff --git a/base/modules/comm/psi_z_comm_v_mod.f90 b/base/modules/comm/psi_z_comm_v_mod.f90 index 459ddef7..de8e1117 100644 --- a/base/modules/comm/psi_z_comm_v_mod.f90 +++ b/base/modules/comm/psi_z_comm_v_mod.f90 @@ -56,11 +56,11 @@ module psi_z_comm_v_mod type(psb_desc_type), target :: desc_a integer(psb_ipk_), optional :: data end subroutine psi_zswapdata_multivect - subroutine psi_zswap_vidx_vect(ictxt,iicomm,flag,beta,y,idx,& + subroutine psi_zswap_vidx_vect(ctxt,icomm,flag,beta,y,idx,& & totxch,totsnd,totrcv,work,info) import - type(psb_ctxt_type), intent(in) :: ictxt - integer(psb_mpk_), intent(in) :: iicomm + type(psb_ctxt_type), intent(in) :: ctxt + integer(psb_mpk_), intent(in) :: icomm integer(psb_ipk_), intent(in) :: flag integer(psb_ipk_), intent(out) :: info class(psb_z_base_vect_type) :: y @@ -69,11 +69,11 @@ module psi_z_comm_v_mod class(psb_i_base_vect_type), intent(inout) :: idx integer(psb_ipk_), intent(in) :: totxch,totsnd, totrcv end subroutine psi_zswap_vidx_vect - subroutine psi_zswap_vidx_multivect(ictxt,iicomm,flag,beta,y,idx,& + subroutine psi_zswap_vidx_multivect(ctxt,icomm,flag,beta,y,idx,& & totxch,totsnd,totrcv,work,info) import - type(psb_ctxt_type), intent(in) :: ictxt - integer(psb_mpk_), intent(in) :: iicomm + type(psb_ctxt_type), intent(in) :: ctxt + integer(psb_mpk_), intent(in) :: icomm integer(psb_ipk_), intent(in) :: flag integer(psb_ipk_), intent(out) :: info class(psb_z_base_multivect_type) :: y @@ -106,11 +106,11 @@ module psi_z_comm_v_mod type(psb_desc_type), target :: desc_a integer(psb_ipk_), optional :: data end subroutine psi_zswaptran_multivect - subroutine psi_ztran_vidx_vect(ictxt,iicomm,flag,beta,y,idx,& + subroutine psi_ztran_vidx_vect(ctxt,icomm,flag,beta,y,idx,& & totxch,totsnd,totrcv,work,info) import - type(psb_ctxt_type), intent(in) :: ictxt - integer(psb_mpk_), intent(in) :: iicomm + type(psb_ctxt_type), intent(in) :: ctxt + integer(psb_mpk_), intent(in) :: icomm integer(psb_ipk_), intent(in) :: flag integer(psb_ipk_), intent(out) :: info class(psb_z_base_vect_type) :: y @@ -119,11 +119,11 @@ module psi_z_comm_v_mod class(psb_i_base_vect_type), intent(inout) :: idx integer(psb_ipk_), intent(in) :: totxch,totsnd, totrcv end subroutine psi_ztran_vidx_vect - subroutine psi_ztran_vidx_multivect(ictxt,iicomm,flag,beta,y,idx,& + subroutine psi_ztran_vidx_multivect(ctxt,icomm,flag,beta,y,idx,& & totxch,totsnd,totrcv,work,info) import - type(psb_ctxt_type), intent(in) :: ictxt - integer(psb_mpk_), intent(in) :: iicomm + type(psb_ctxt_type), intent(in) :: ctxt + integer(psb_mpk_), intent(in) :: icomm integer(psb_ipk_), intent(in) :: flag integer(psb_ipk_), intent(out) :: info class(psb_z_base_multivect_type) :: y diff --git a/base/modules/penv/psi_d_collective_mod.F90 b/base/modules/penv/psi_d_collective_mod.F90 index eabe5b3f..12d5f38b 100644 --- a/base/modules/penv/psi_d_collective_mod.F90 +++ b/base/modules/penv/psi_d_collective_mod.F90 @@ -105,8 +105,6 @@ contains integer(psb_mpk_) :: root_ real(psb_dpk_) :: dat_ integer(psb_mpk_) :: iam, np, info, icomm - integer(psb_ipk_) :: iinfo - #if !defined(SERIAL_MPI) call psb_info(ctxt,iam,np) diff --git a/base/modules/penv/psi_e_collective_mod.F90 b/base/modules/penv/psi_e_collective_mod.F90 index 54d85347..215446c0 100644 --- a/base/modules/penv/psi_e_collective_mod.F90 +++ b/base/modules/penv/psi_e_collective_mod.F90 @@ -102,8 +102,6 @@ contains integer(psb_mpk_) :: root_ integer(psb_epk_) :: dat_ integer(psb_mpk_) :: iam, np, info, icomm - integer(psb_ipk_) :: iinfo - #if !defined(SERIAL_MPI) call psb_info(ctxt,iam,np) diff --git a/base/modules/penv/psi_i2_collective_mod.F90 b/base/modules/penv/psi_i2_collective_mod.F90 index 64a49ae3..781653d4 100644 --- a/base/modules/penv/psi_i2_collective_mod.F90 +++ b/base/modules/penv/psi_i2_collective_mod.F90 @@ -102,8 +102,6 @@ contains integer(psb_mpk_) :: root_ integer(psb_i2pk_) :: dat_ integer(psb_mpk_) :: iam, np, info, icomm - integer(psb_ipk_) :: iinfo - #if !defined(SERIAL_MPI) call psb_info(ctxt,iam,np) diff --git a/base/modules/penv/psi_m_collective_mod.F90 b/base/modules/penv/psi_m_collective_mod.F90 index 462a7221..8fdea824 100644 --- a/base/modules/penv/psi_m_collective_mod.F90 +++ b/base/modules/penv/psi_m_collective_mod.F90 @@ -102,8 +102,6 @@ contains integer(psb_mpk_) :: root_ integer(psb_mpk_) :: dat_ integer(psb_mpk_) :: iam, np, info, icomm - integer(psb_ipk_) :: iinfo - #if !defined(SERIAL_MPI) call psb_info(ctxt,iam,np) diff --git a/base/modules/penv/psi_s_collective_mod.F90 b/base/modules/penv/psi_s_collective_mod.F90 index 30a10524..82f96aac 100644 --- a/base/modules/penv/psi_s_collective_mod.F90 +++ b/base/modules/penv/psi_s_collective_mod.F90 @@ -105,8 +105,6 @@ contains integer(psb_mpk_) :: root_ real(psb_spk_) :: dat_ integer(psb_mpk_) :: iam, np, info, icomm - integer(psb_ipk_) :: iinfo - #if !defined(SERIAL_MPI) call psb_info(ctxt,iam,np) diff --git a/base/modules/psi_i_mod.F90 b/base/modules/psi_i_mod.F90 index 35f03e80..147f9488 100644 --- a/base/modules/psi_i_mod.F90 +++ b/base/modules/psi_i_mod.F90 @@ -112,8 +112,8 @@ module psi_i_mod interface psi_bld_glb_dep_list subroutine psi_i_bld_glb_csr_dep_list(ctxt,loc_dl,length_dl,c_dep_list,dl_ptr,info) import - integer(psb_ipk_), intent(in) :: ctxt - integer(psb_ipk_), intent(in) :: loc_dl(:), length_dl(0:) + type(psb_ctxt_type), intent(in) :: ctxt + 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 end subroutine psi_i_bld_glb_csr_dep_list