From f0663512b239914beb3aa42c10900511b5c00f5c Mon Sep 17 00:00:00 2001 From: Salvatore Filippone Date: Fri, 20 Nov 2020 13:49:17 +0100 Subject: [PATCH] Merge new-context --- base/comm/internals/psi_cswapdata.F90 | 2 -- base/comm/internals/psi_cswapdata_a.F90 | 6 ++---- base/comm/internals/psi_cswaptran.F90 | 4 +--- base/comm/internals/psi_cswaptran_a.F90 | 2 -- base/comm/internals/psi_dswapdata.F90 | 2 -- base/comm/internals/psi_dswapdata_a.F90 | 6 ++---- base/comm/internals/psi_dswaptran.F90 | 4 +--- base/comm/internals/psi_dswaptran_a.F90 | 2 -- base/comm/internals/psi_eswapdata_a.F90 | 6 ++---- base/comm/internals/psi_eswaptran_a.F90 | 2 -- base/comm/internals/psi_i2swapdata_a.F90 | 6 ++---- base/comm/internals/psi_i2swaptran_a.F90 | 2 -- base/comm/internals/psi_iswapdata.F90 | 2 -- base/comm/internals/psi_iswaptran.F90 | 4 +--- base/comm/internals/psi_lswapdata.F90 | 2 -- base/comm/internals/psi_lswaptran.F90 | 4 +--- base/comm/internals/psi_mswapdata_a.F90 | 6 ++---- base/comm/internals/psi_mswaptran_a.F90 | 2 -- base/comm/internals/psi_sswapdata.F90 | 2 -- base/comm/internals/psi_sswapdata_a.F90 | 6 ++---- base/comm/internals/psi_sswaptran.F90 | 4 +--- base/comm/internals/psi_sswaptran_a.F90 | 2 -- base/comm/internals/psi_zswapdata.F90 | 2 -- base/comm/internals/psi_zswapdata_a.F90 | 6 ++---- base/comm/internals/psi_zswaptran.F90 | 4 +--- base/comm/internals/psi_zswaptran_a.F90 | 2 -- base/modules/comm/psi_c_comm_v_mod.f90 | 16 ++++++++-------- base/modules/comm/psi_d_comm_v_mod.f90 | 16 ++++++++-------- base/modules/comm/psi_i_comm_v_mod.f90 | 16 ++++++++-------- base/modules/comm/psi_l_comm_v_mod.f90 | 16 ++++++++-------- base/modules/comm/psi_s_comm_v_mod.f90 | 16 ++++++++-------- base/modules/comm/psi_z_comm_v_mod.f90 | 16 ++++++++-------- 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/serial/psb_dgelp.f90 | 4 ++-- base/serial/psb_sgelp.f90 | 13 ++++++------- 39 files changed, 76 insertions(+), 139 deletions(-) diff --git a/base/comm/internals/psi_cswapdata.F90 b/base/comm/internals/psi_cswapdata.F90 index d6e41e7a..5f0b8bdc 100644 --- a/base/comm/internals/psi_cswapdata.F90 +++ b/base/comm/internals/psi_cswapdata.F90 @@ -217,7 +217,6 @@ subroutine psi_cswap_vidx_vect(ctxt,icomm,flag,beta,y,idx, & info=psb_success_ name='psi_swap_datav' call psb_erractionsave(err_act) - call psb_info(ctxt,me,np) if (np == -1) then info=psb_err_context_error_ @@ -556,7 +555,6 @@ subroutine psi_cswap_vidx_multivect(ctxt,icomm,flag,beta,y,idx, & info=psb_success_ name='psi_swap_datav' call psb_erractionsave(err_act) - 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 b8a8291a..715b674e 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_ @@ -683,7 +682,6 @@ subroutine psi_cswapidxv(ctxt,icomm,flag,beta,y,idx, & info=psb_success_ name='psi_swap_datav' call psb_erractionsave(err_act) - 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 2710d403..aefb6b01 100644 --- a/base/comm/internals/psi_cswaptran.F90 +++ b/base/comm/internals/psi_cswaptran.F90 @@ -193,7 +193,7 @@ subroutine psi_ctran_vidx_vect(ctxt,icomm,flag,beta,y,idx,& include 'mpif.h' #endif - type(psb_ctxt_type), intent(in) :: ctxt + 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 @@ -218,7 +218,6 @@ subroutine psi_ctran_vidx_vect(ctxt,icomm,flag,beta,y,idx,& info=psb_success_ name='psi_swap_tran' call psb_erractionsave(err_act) - call psb_info(ctxt,me,np) if (np == -1) then info=psb_err_context_error_ @@ -567,7 +566,6 @@ subroutine psi_ctran_vidx_multivect(ctxt,icomm,flag,beta,y,idx,& info=psb_success_ name='psi_swap_tran' call psb_erractionsave(err_act) - 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 8af716b0..a7f2c687 100644 --- a/base/comm/internals/psi_cswaptran_a.F90 +++ b/base/comm/internals/psi_cswaptran_a.F90 @@ -201,7 +201,6 @@ subroutine psi_ctranidxm(ctxt,icomm,flag,n,beta,y,idx,& info=psb_success_ name='psi_swap_tran' call psb_erractionsave(err_act) - call psb_info(ctxt,me,np) if (np == -1) then info=psb_err_context_error_ @@ -695,7 +694,6 @@ subroutine psi_ctranidxv(ctxt,icomm,flag,beta,y,idx,& info=psb_success_ name='psi_swap_tran' call psb_erractionsave(err_act) - 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 dc165ddc..fe529706 100644 --- a/base/comm/internals/psi_dswapdata.F90 +++ b/base/comm/internals/psi_dswapdata.F90 @@ -217,7 +217,6 @@ subroutine psi_dswap_vidx_vect(ctxt,icomm,flag,beta,y,idx, & info=psb_success_ name='psi_swap_datav' call psb_erractionsave(err_act) - call psb_info(ctxt,me,np) if (np == -1) then info=psb_err_context_error_ @@ -556,7 +555,6 @@ subroutine psi_dswap_vidx_multivect(ctxt,icomm,flag,beta,y,idx, & info=psb_success_ name='psi_swap_datav' call psb_erractionsave(err_act) - 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 193859fc..aff32517 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_ @@ -683,7 +682,6 @@ subroutine psi_dswapidxv(ctxt,icomm,flag,beta,y,idx, & info=psb_success_ name='psi_swap_datav' call psb_erractionsave(err_act) - 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 1051568f..df98e1ae 100644 --- a/base/comm/internals/psi_dswaptran.F90 +++ b/base/comm/internals/psi_dswaptran.F90 @@ -193,7 +193,7 @@ subroutine psi_dtran_vidx_vect(ctxt,icomm,flag,beta,y,idx,& include 'mpif.h' #endif - type(psb_ctxt_type), intent(in) :: ctxt + 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 @@ -218,7 +218,6 @@ subroutine psi_dtran_vidx_vect(ctxt,icomm,flag,beta,y,idx,& info=psb_success_ name='psi_swap_tran' call psb_erractionsave(err_act) - call psb_info(ctxt,me,np) if (np == -1) then info=psb_err_context_error_ @@ -567,7 +566,6 @@ subroutine psi_dtran_vidx_multivect(ctxt,icomm,flag,beta,y,idx,& info=psb_success_ name='psi_swap_tran' call psb_erractionsave(err_act) - 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 604dadff..ed13df40 100644 --- a/base/comm/internals/psi_dswaptran_a.F90 +++ b/base/comm/internals/psi_dswaptran_a.F90 @@ -201,7 +201,6 @@ subroutine psi_dtranidxm(ctxt,icomm,flag,n,beta,y,idx,& info=psb_success_ name='psi_swap_tran' call psb_erractionsave(err_act) - call psb_info(ctxt,me,np) if (np == -1) then info=psb_err_context_error_ @@ -695,7 +694,6 @@ subroutine psi_dtranidxv(ctxt,icomm,flag,beta,y,idx,& info=psb_success_ name='psi_swap_tran' call psb_erractionsave(err_act) - 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 019ca2ee..6a644563 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_ @@ -683,7 +682,6 @@ subroutine psi_eswapidxv(ctxt,icomm,flag,beta,y,idx, & info=psb_success_ name='psi_swap_datav' call psb_erractionsave(err_act) - 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 0b25cefb..78ed7d8b 100644 --- a/base/comm/internals/psi_eswaptran_a.F90 +++ b/base/comm/internals/psi_eswaptran_a.F90 @@ -201,7 +201,6 @@ subroutine psi_etranidxm(ctxt,icomm,flag,n,beta,y,idx,& info=psb_success_ name='psi_swap_tran' call psb_erractionsave(err_act) - call psb_info(ctxt,me,np) if (np == -1) then info=psb_err_context_error_ @@ -695,7 +694,6 @@ subroutine psi_etranidxv(ctxt,icomm,flag,beta,y,idx,& info=psb_success_ name='psi_swap_tran' call psb_erractionsave(err_act) - 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 cffbb86a..42b4498e 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_ @@ -683,7 +682,6 @@ subroutine psi_i2swapidxv(ctxt,icomm,flag,beta,y,idx, & info=psb_success_ name='psi_swap_datav' call psb_erractionsave(err_act) - 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 ccc7136c..f94bf29e 100644 --- a/base/comm/internals/psi_i2swaptran_a.F90 +++ b/base/comm/internals/psi_i2swaptran_a.F90 @@ -201,7 +201,6 @@ subroutine psi_i2tranidxm(ctxt,icomm,flag,n,beta,y,idx,& info=psb_success_ name='psi_swap_tran' call psb_erractionsave(err_act) - call psb_info(ctxt,me,np) if (np == -1) then info=psb_err_context_error_ @@ -695,7 +694,6 @@ subroutine psi_i2tranidxv(ctxt,icomm,flag,beta,y,idx,& info=psb_success_ name='psi_swap_tran' call psb_erractionsave(err_act) - 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 0fd2e6aa..ff4bd074 100644 --- a/base/comm/internals/psi_iswapdata.F90 +++ b/base/comm/internals/psi_iswapdata.F90 @@ -217,7 +217,6 @@ subroutine psi_iswap_vidx_vect(ctxt,icomm,flag,beta,y,idx, & info=psb_success_ name='psi_swap_datav' call psb_erractionsave(err_act) - call psb_info(ctxt,me,np) if (np == -1) then info=psb_err_context_error_ @@ -556,7 +555,6 @@ subroutine psi_iswap_vidx_multivect(ctxt,icomm,flag,beta,y,idx, & info=psb_success_ name='psi_swap_datav' call psb_erractionsave(err_act) - 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 3531036c..75a0a185 100644 --- a/base/comm/internals/psi_iswaptran.F90 +++ b/base/comm/internals/psi_iswaptran.F90 @@ -193,7 +193,7 @@ subroutine psi_itran_vidx_vect(ctxt,icomm,flag,beta,y,idx,& include 'mpif.h' #endif - type(psb_ctxt_type), intent(in) :: ctxt + 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 @@ -218,7 +218,6 @@ subroutine psi_itran_vidx_vect(ctxt,icomm,flag,beta,y,idx,& info=psb_success_ name='psi_swap_tran' call psb_erractionsave(err_act) - call psb_info(ctxt,me,np) if (np == -1) then info=psb_err_context_error_ @@ -567,7 +566,6 @@ subroutine psi_itran_vidx_multivect(ctxt,icomm,flag,beta,y,idx,& info=psb_success_ name='psi_swap_tran' call psb_erractionsave(err_act) - 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 93ca50b9..9201ebfa 100644 --- a/base/comm/internals/psi_lswapdata.F90 +++ b/base/comm/internals/psi_lswapdata.F90 @@ -217,7 +217,6 @@ subroutine psi_lswap_vidx_vect(ctxt,icomm,flag,beta,y,idx, & info=psb_success_ name='psi_swap_datav' call psb_erractionsave(err_act) - call psb_info(ctxt,me,np) if (np == -1) then info=psb_err_context_error_ @@ -556,7 +555,6 @@ subroutine psi_lswap_vidx_multivect(ctxt,icomm,flag,beta,y,idx, & info=psb_success_ name='psi_swap_datav' call psb_erractionsave(err_act) - 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 b3302ac4..b2b9536c 100644 --- a/base/comm/internals/psi_lswaptran.F90 +++ b/base/comm/internals/psi_lswaptran.F90 @@ -193,7 +193,7 @@ subroutine psi_ltran_vidx_vect(ctxt,icomm,flag,beta,y,idx,& include 'mpif.h' #endif - type(psb_ctxt_type), intent(in) :: ctxt + 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 @@ -218,7 +218,6 @@ subroutine psi_ltran_vidx_vect(ctxt,icomm,flag,beta,y,idx,& info=psb_success_ name='psi_swap_tran' call psb_erractionsave(err_act) - call psb_info(ctxt,me,np) if (np == -1) then info=psb_err_context_error_ @@ -567,7 +566,6 @@ subroutine psi_ltran_vidx_multivect(ctxt,icomm,flag,beta,y,idx,& info=psb_success_ name='psi_swap_tran' call psb_erractionsave(err_act) - 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 c68013f5..e71f3a52 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_ @@ -683,7 +682,6 @@ subroutine psi_mswapidxv(ctxt,icomm,flag,beta,y,idx, & info=psb_success_ name='psi_swap_datav' call psb_erractionsave(err_act) - 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 98e367dd..3a780142 100644 --- a/base/comm/internals/psi_mswaptran_a.F90 +++ b/base/comm/internals/psi_mswaptran_a.F90 @@ -201,7 +201,6 @@ subroutine psi_mtranidxm(ctxt,icomm,flag,n,beta,y,idx,& info=psb_success_ name='psi_swap_tran' call psb_erractionsave(err_act) - call psb_info(ctxt,me,np) if (np == -1) then info=psb_err_context_error_ @@ -695,7 +694,6 @@ subroutine psi_mtranidxv(ctxt,icomm,flag,beta,y,idx,& info=psb_success_ name='psi_swap_tran' call psb_erractionsave(err_act) - 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 a9c19fe3..e4f11bd0 100644 --- a/base/comm/internals/psi_sswapdata.F90 +++ b/base/comm/internals/psi_sswapdata.F90 @@ -217,7 +217,6 @@ subroutine psi_sswap_vidx_vect(ctxt,icomm,flag,beta,y,idx, & info=psb_success_ name='psi_swap_datav' call psb_erractionsave(err_act) - call psb_info(ctxt,me,np) if (np == -1) then info=psb_err_context_error_ @@ -556,7 +555,6 @@ subroutine psi_sswap_vidx_multivect(ctxt,icomm,flag,beta,y,idx, & info=psb_success_ name='psi_swap_datav' call psb_erractionsave(err_act) - 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 5d2f5e7c..044dc141 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_ @@ -683,7 +682,6 @@ subroutine psi_sswapidxv(ctxt,icomm,flag,beta,y,idx, & info=psb_success_ name='psi_swap_datav' call psb_erractionsave(err_act) - 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 70ffd640..90c4b275 100644 --- a/base/comm/internals/psi_sswaptran.F90 +++ b/base/comm/internals/psi_sswaptran.F90 @@ -193,7 +193,7 @@ subroutine psi_stran_vidx_vect(ctxt,icomm,flag,beta,y,idx,& include 'mpif.h' #endif - type(psb_ctxt_type), intent(in) :: ctxt + 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 @@ -218,7 +218,6 @@ subroutine psi_stran_vidx_vect(ctxt,icomm,flag,beta,y,idx,& info=psb_success_ name='psi_swap_tran' call psb_erractionsave(err_act) - call psb_info(ctxt,me,np) if (np == -1) then info=psb_err_context_error_ @@ -567,7 +566,6 @@ subroutine psi_stran_vidx_multivect(ctxt,icomm,flag,beta,y,idx,& info=psb_success_ name='psi_swap_tran' call psb_erractionsave(err_act) - 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 03db9ddb..434cec4c 100644 --- a/base/comm/internals/psi_sswaptran_a.F90 +++ b/base/comm/internals/psi_sswaptran_a.F90 @@ -201,7 +201,6 @@ subroutine psi_stranidxm(ctxt,icomm,flag,n,beta,y,idx,& info=psb_success_ name='psi_swap_tran' call psb_erractionsave(err_act) - call psb_info(ctxt,me,np) if (np == -1) then info=psb_err_context_error_ @@ -695,7 +694,6 @@ subroutine psi_stranidxv(ctxt,icomm,flag,beta,y,idx,& info=psb_success_ name='psi_swap_tran' call psb_erractionsave(err_act) - 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 1ae3ed04..991d6e40 100644 --- a/base/comm/internals/psi_zswapdata.F90 +++ b/base/comm/internals/psi_zswapdata.F90 @@ -217,7 +217,6 @@ subroutine psi_zswap_vidx_vect(ctxt,icomm,flag,beta,y,idx, & info=psb_success_ name='psi_swap_datav' call psb_erractionsave(err_act) - call psb_info(ctxt,me,np) if (np == -1) then info=psb_err_context_error_ @@ -556,7 +555,6 @@ subroutine psi_zswap_vidx_multivect(ctxt,icomm,flag,beta,y,idx, & info=psb_success_ name='psi_swap_datav' call psb_erractionsave(err_act) - 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 f390e6d7..2d265c76 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_ @@ -683,7 +682,6 @@ subroutine psi_zswapidxv(ctxt,icomm,flag,beta,y,idx, & info=psb_success_ name='psi_swap_datav' call psb_erractionsave(err_act) - 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 fa6268f6..f027519f 100644 --- a/base/comm/internals/psi_zswaptran.F90 +++ b/base/comm/internals/psi_zswaptran.F90 @@ -193,7 +193,7 @@ subroutine psi_ztran_vidx_vect(ctxt,icomm,flag,beta,y,idx,& include 'mpif.h' #endif - type(psb_ctxt_type), intent(in) :: ctxt + 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 @@ -218,7 +218,6 @@ subroutine psi_ztran_vidx_vect(ctxt,icomm,flag,beta,y,idx,& info=psb_success_ name='psi_swap_tran' call psb_erractionsave(err_act) - call psb_info(ctxt,me,np) if (np == -1) then info=psb_err_context_error_ @@ -567,7 +566,6 @@ subroutine psi_ztran_vidx_multivect(ctxt,icomm,flag,beta,y,idx,& info=psb_success_ name='psi_swap_tran' call psb_erractionsave(err_act) - 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 c36f2674..508d4045 100644 --- a/base/comm/internals/psi_zswaptran_a.F90 +++ b/base/comm/internals/psi_zswaptran_a.F90 @@ -201,7 +201,6 @@ subroutine psi_ztranidxm(ctxt,icomm,flag,n,beta,y,idx,& info=psb_success_ name='psi_swap_tran' call psb_erractionsave(err_act) - call psb_info(ctxt,me,np) if (np == -1) then info=psb_err_context_error_ @@ -695,7 +694,6 @@ subroutine psi_ztranidxv(ctxt,icomm,flag,beta,y,idx,& info=psb_success_ name='psi_swap_tran' call psb_erractionsave(err_act) - 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 47eb7fdf..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(ctxt,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) :: ctxt - integer(psb_mpk_), intent(in) :: iicomm + 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(ctxt,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) :: ctxt - integer(psb_mpk_), intent(in) :: iicomm + 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(ctxt,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) :: ctxt - integer(psb_mpk_), intent(in) :: iicomm + 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(ctxt,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) :: ctxt - integer(psb_mpk_), intent(in) :: iicomm + 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 6b7cdfd6..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(ctxt,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) :: ctxt - integer(psb_mpk_), intent(in) :: iicomm + 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(ctxt,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) :: ctxt - integer(psb_mpk_), intent(in) :: iicomm + 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(ctxt,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) :: ctxt - integer(psb_mpk_), intent(in) :: iicomm + 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(ctxt,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) :: ctxt - integer(psb_mpk_), intent(in) :: iicomm + 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 4072a6c4..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(ctxt,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) :: ctxt - integer(psb_mpk_), intent(in) :: iicomm + 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(ctxt,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) :: ctxt - integer(psb_mpk_), intent(in) :: iicomm + 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(ctxt,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) :: ctxt - integer(psb_mpk_), intent(in) :: iicomm + 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(ctxt,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) :: ctxt - integer(psb_mpk_), intent(in) :: iicomm + 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 b3b55a0d..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(ctxt,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) :: ctxt - integer(psb_mpk_), intent(in) :: iicomm + 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(ctxt,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) :: ctxt - integer(psb_mpk_), intent(in) :: iicomm + 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(ctxt,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) :: ctxt - integer(psb_mpk_), intent(in) :: iicomm + 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(ctxt,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) :: ctxt - integer(psb_mpk_), intent(in) :: iicomm + 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 a2eb0bcf..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(ctxt,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) :: ctxt - integer(psb_mpk_), intent(in) :: iicomm + 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(ctxt,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) :: ctxt - integer(psb_mpk_), intent(in) :: iicomm + 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(ctxt,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) :: ctxt - integer(psb_mpk_), intent(in) :: iicomm + 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(ctxt,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) :: ctxt - integer(psb_mpk_), intent(in) :: iicomm + 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 02c1b8d8..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(ctxt,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) :: ctxt - integer(psb_mpk_), intent(in) :: iicomm + 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(ctxt,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) :: ctxt - integer(psb_mpk_), intent(in) :: iicomm + 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(ctxt,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) :: ctxt - integer(psb_mpk_), intent(in) :: iicomm + 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(ctxt,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) :: ctxt - integer(psb_mpk_), intent(in) :: iicomm + 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/serial/psb_dgelp.f90 b/base/serial/psb_dgelp.f90 index 7dc4b132..40ade223 100644 --- a/base/serial/psb_dgelp.f90 +++ b/base/serial/psb_dgelp.f90 @@ -54,7 +54,7 @@ subroutine psb_dgelp(trans,iperm,x,info) ! local variables real(psb_dpk_),allocatable :: temp(:) integer(psb_ipk_) :: int_err(5), i1sz, i2sz, err_act,i,j - integer(psb_ipk_), allocatable :: itemp(:) + integer(psb_ipk_), allocatable :: itemp(:) real(psb_dpk_),parameter :: one=1 integer(psb_ipk_) :: debug_level, debug_unit @@ -180,7 +180,7 @@ subroutine psb_dgelpv(trans,iperm,x,info) ! local variables integer(psb_ipk_) :: int_err(5), i1sz, err_act, i real(psb_dpk_),allocatable :: temp(:) - integer(psb_ipk_), allocatable :: itemp(:) + integer(psb_ipk_), allocatable :: itemp(:) real(psb_dpk_),parameter :: one=1 integer(psb_ipk_) :: debug_level, debug_unit diff --git a/base/serial/psb_sgelp.f90 b/base/serial/psb_sgelp.f90 index 73e46c71..9b7a2f64 100644 --- a/base/serial/psb_sgelp.f90 +++ b/base/serial/psb_sgelp.f90 @@ -50,11 +50,11 @@ subroutine psb_sgelp(trans,iperm,x,info) integer(psb_ipk_), intent(in) :: iperm(:) integer(psb_ipk_), intent(out) :: info character, intent(in) :: trans + ! local variables - integer(psb_ipk_) :: ctxt real(psb_spk_),allocatable :: temp(:) integer(psb_ipk_) :: int_err(5), i1sz, i2sz, err_act,i,j - integer(psb_ipk_), allocatable :: itemp(:) + integer(psb_ipk_), allocatable :: itemp(:) real(psb_spk_),parameter :: one=1 integer(psb_ipk_) :: debug_level, debug_unit @@ -178,11 +178,10 @@ subroutine psb_sgelpv(trans,iperm,x,info) character, intent(in) :: trans ! local variables - integer(psb_ipk_) :: ctxt integer(psb_ipk_) :: int_err(5), i1sz, err_act, i - real(psb_spk_),allocatable :: temp(:) - integer(psb_ipk_), allocatable :: itemp(:) - real(psb_spk_),parameter :: one=1 + real(psb_spk_),allocatable :: temp(:) + integer(psb_ipk_), allocatable :: itemp(:) + real(psb_spk_),parameter :: one=1 integer(psb_ipk_) :: debug_level, debug_unit character(len=20) :: name, ch_err @@ -205,7 +204,7 @@ subroutine psb_sgelpv(trans,iperm,x,info) goto 9999 end if itemp(:) = iperm(:) - + if (.not.psb_isaperm(i1sz,itemp)) then info=psb_err_iarg_invalid_value_ int_err(1) = 1