From b5b2a808d408d6d9f427d77baa61e8b1673a6f7a Mon Sep 17 00:00:00 2001 From: Salvatore Filippone Date: Tue, 19 Jun 2018 12:12:04 +0100 Subject: [PATCH] Take out spurious "mpik" --- mlprec/impl/aggregator/mld_c_dec_aggregator_mat_asb.f90 | 2 +- mlprec/impl/aggregator/mld_c_dec_aggregator_tprol.f90 | 2 +- mlprec/impl/aggregator/mld_c_symdec_aggregator_tprol.f90 | 2 +- mlprec/impl/aggregator/mld_d_dec_aggregator_mat_asb.f90 | 2 +- mlprec/impl/aggregator/mld_d_dec_aggregator_tprol.f90 | 2 +- mlprec/impl/aggregator/mld_d_symdec_aggregator_tprol.f90 | 2 +- mlprec/impl/aggregator/mld_s_dec_aggregator_mat_asb.f90 | 2 +- mlprec/impl/aggregator/mld_s_dec_aggregator_tprol.f90 | 2 +- mlprec/impl/aggregator/mld_s_symdec_aggregator_tprol.f90 | 2 +- mlprec/impl/aggregator/mld_z_dec_aggregator_mat_asb.f90 | 2 +- mlprec/impl/aggregator/mld_z_dec_aggregator_tprol.f90 | 2 +- mlprec/impl/aggregator/mld_z_symdec_aggregator_tprol.f90 | 2 +- tests/Bcmatch/mld_d_bcmatch_aggregator_mat_asb.f90 | 2 +- tests/Bcmatch/mld_d_bcmatch_aggregator_tprol.f90 | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/mlprec/impl/aggregator/mld_c_dec_aggregator_mat_asb.f90 b/mlprec/impl/aggregator/mld_c_dec_aggregator_mat_asb.f90 index 0cce1101..5bf91bc6 100644 --- a/mlprec/impl/aggregator/mld_c_dec_aggregator_mat_asb.f90 +++ b/mlprec/impl/aggregator/mld_c_dec_aggregator_mat_asb.f90 @@ -147,7 +147,7 @@ subroutine mld_c_dec_aggregator_mat_asb(ag,parms,a,desc_a,ilaggr,nlaggr,ac,op_p ! Local variables character(len=20) :: name - integer(psb_mpik_) :: ictxt, np, me + integer(psb_mpk_) :: ictxt, np, me type(psb_c_coo_sparse_mat) :: acoo, bcoo type(psb_c_csr_sparse_mat) :: acsr1 integer(psb_ipk_) :: nzl,ntaggr diff --git a/mlprec/impl/aggregator/mld_c_dec_aggregator_tprol.f90 b/mlprec/impl/aggregator/mld_c_dec_aggregator_tprol.f90 index efe66b9a..17dc1f3d 100644 --- a/mlprec/impl/aggregator/mld_c_dec_aggregator_tprol.f90 +++ b/mlprec/impl/aggregator/mld_c_dec_aggregator_tprol.f90 @@ -87,7 +87,7 @@ subroutine mld_c_dec_aggregator_build_tprol(ag,parms,a,desc_a,ilaggr,nlaggr,op_ ! Local variables character(len=20) :: name - integer(psb_mpik_) :: ictxt, np, me + integer(psb_mpk_) :: ictxt, np, me integer(psb_ipk_) :: err_act integer(psb_ipk_) :: ntaggr integer(psb_ipk_) :: debug_level, debug_unit diff --git a/mlprec/impl/aggregator/mld_c_symdec_aggregator_tprol.f90 b/mlprec/impl/aggregator/mld_c_symdec_aggregator_tprol.f90 index 594831f4..6ff8bcef 100644 --- a/mlprec/impl/aggregator/mld_c_symdec_aggregator_tprol.f90 +++ b/mlprec/impl/aggregator/mld_c_symdec_aggregator_tprol.f90 @@ -91,7 +91,7 @@ subroutine mld_c_symdec_aggregator_build_tprol(ag,parms,a,desc_a,ilaggr,nlaggr, ! Local variables type(psb_cspmat_type) :: atmp, atrans character(len=20) :: name - integer(psb_mpik_) :: ictxt, np, me + integer(psb_mpk_) :: ictxt, np, me integer(psb_ipk_) :: err_act integer(psb_ipk_) :: ntaggr, nr integer(psb_ipk_) :: debug_level, debug_unit diff --git a/mlprec/impl/aggregator/mld_d_dec_aggregator_mat_asb.f90 b/mlprec/impl/aggregator/mld_d_dec_aggregator_mat_asb.f90 index 9f14fad1..2656f057 100644 --- a/mlprec/impl/aggregator/mld_d_dec_aggregator_mat_asb.f90 +++ b/mlprec/impl/aggregator/mld_d_dec_aggregator_mat_asb.f90 @@ -147,7 +147,7 @@ subroutine mld_d_dec_aggregator_mat_asb(ag,parms,a,desc_a,ilaggr,nlaggr,ac,op_p ! Local variables character(len=20) :: name - integer(psb_mpik_) :: ictxt, np, me + integer(psb_mpk_) :: ictxt, np, me type(psb_d_coo_sparse_mat) :: acoo, bcoo type(psb_d_csr_sparse_mat) :: acsr1 integer(psb_ipk_) :: nzl,ntaggr diff --git a/mlprec/impl/aggregator/mld_d_dec_aggregator_tprol.f90 b/mlprec/impl/aggregator/mld_d_dec_aggregator_tprol.f90 index 15a5c2c7..bb223590 100644 --- a/mlprec/impl/aggregator/mld_d_dec_aggregator_tprol.f90 +++ b/mlprec/impl/aggregator/mld_d_dec_aggregator_tprol.f90 @@ -87,7 +87,7 @@ subroutine mld_d_dec_aggregator_build_tprol(ag,parms,a,desc_a,ilaggr,nlaggr,op_ ! Local variables character(len=20) :: name - integer(psb_mpik_) :: ictxt, np, me + integer(psb_mpk_) :: ictxt, np, me integer(psb_ipk_) :: err_act integer(psb_ipk_) :: ntaggr integer(psb_ipk_) :: debug_level, debug_unit diff --git a/mlprec/impl/aggregator/mld_d_symdec_aggregator_tprol.f90 b/mlprec/impl/aggregator/mld_d_symdec_aggregator_tprol.f90 index b3079bdf..72078a53 100644 --- a/mlprec/impl/aggregator/mld_d_symdec_aggregator_tprol.f90 +++ b/mlprec/impl/aggregator/mld_d_symdec_aggregator_tprol.f90 @@ -91,7 +91,7 @@ subroutine mld_d_symdec_aggregator_build_tprol(ag,parms,a,desc_a,ilaggr,nlaggr, ! Local variables type(psb_dspmat_type) :: atmp, atrans character(len=20) :: name - integer(psb_mpik_) :: ictxt, np, me + integer(psb_mpk_) :: ictxt, np, me integer(psb_ipk_) :: err_act integer(psb_ipk_) :: ntaggr, nr integer(psb_ipk_) :: debug_level, debug_unit diff --git a/mlprec/impl/aggregator/mld_s_dec_aggregator_mat_asb.f90 b/mlprec/impl/aggregator/mld_s_dec_aggregator_mat_asb.f90 index e632f8fa..e0f82d1b 100644 --- a/mlprec/impl/aggregator/mld_s_dec_aggregator_mat_asb.f90 +++ b/mlprec/impl/aggregator/mld_s_dec_aggregator_mat_asb.f90 @@ -147,7 +147,7 @@ subroutine mld_s_dec_aggregator_mat_asb(ag,parms,a,desc_a,ilaggr,nlaggr,ac,op_p ! Local variables character(len=20) :: name - integer(psb_mpik_) :: ictxt, np, me + integer(psb_mpk_) :: ictxt, np, me type(psb_s_coo_sparse_mat) :: acoo, bcoo type(psb_s_csr_sparse_mat) :: acsr1 integer(psb_ipk_) :: nzl,ntaggr diff --git a/mlprec/impl/aggregator/mld_s_dec_aggregator_tprol.f90 b/mlprec/impl/aggregator/mld_s_dec_aggregator_tprol.f90 index 02552a10..19599ab8 100644 --- a/mlprec/impl/aggregator/mld_s_dec_aggregator_tprol.f90 +++ b/mlprec/impl/aggregator/mld_s_dec_aggregator_tprol.f90 @@ -87,7 +87,7 @@ subroutine mld_s_dec_aggregator_build_tprol(ag,parms,a,desc_a,ilaggr,nlaggr,op_ ! Local variables character(len=20) :: name - integer(psb_mpik_) :: ictxt, np, me + integer(psb_mpk_) :: ictxt, np, me integer(psb_ipk_) :: err_act integer(psb_ipk_) :: ntaggr integer(psb_ipk_) :: debug_level, debug_unit diff --git a/mlprec/impl/aggregator/mld_s_symdec_aggregator_tprol.f90 b/mlprec/impl/aggregator/mld_s_symdec_aggregator_tprol.f90 index a19f5344..0c310c99 100644 --- a/mlprec/impl/aggregator/mld_s_symdec_aggregator_tprol.f90 +++ b/mlprec/impl/aggregator/mld_s_symdec_aggregator_tprol.f90 @@ -91,7 +91,7 @@ subroutine mld_s_symdec_aggregator_build_tprol(ag,parms,a,desc_a,ilaggr,nlaggr, ! Local variables type(psb_sspmat_type) :: atmp, atrans character(len=20) :: name - integer(psb_mpik_) :: ictxt, np, me + integer(psb_mpk_) :: ictxt, np, me integer(psb_ipk_) :: err_act integer(psb_ipk_) :: ntaggr, nr integer(psb_ipk_) :: debug_level, debug_unit diff --git a/mlprec/impl/aggregator/mld_z_dec_aggregator_mat_asb.f90 b/mlprec/impl/aggregator/mld_z_dec_aggregator_mat_asb.f90 index 6d85871b..45d1e058 100644 --- a/mlprec/impl/aggregator/mld_z_dec_aggregator_mat_asb.f90 +++ b/mlprec/impl/aggregator/mld_z_dec_aggregator_mat_asb.f90 @@ -147,7 +147,7 @@ subroutine mld_z_dec_aggregator_mat_asb(ag,parms,a,desc_a,ilaggr,nlaggr,ac,op_p ! Local variables character(len=20) :: name - integer(psb_mpik_) :: ictxt, np, me + integer(psb_mpk_) :: ictxt, np, me type(psb_z_coo_sparse_mat) :: acoo, bcoo type(psb_z_csr_sparse_mat) :: acsr1 integer(psb_ipk_) :: nzl,ntaggr diff --git a/mlprec/impl/aggregator/mld_z_dec_aggregator_tprol.f90 b/mlprec/impl/aggregator/mld_z_dec_aggregator_tprol.f90 index aeac2317..eb017438 100644 --- a/mlprec/impl/aggregator/mld_z_dec_aggregator_tprol.f90 +++ b/mlprec/impl/aggregator/mld_z_dec_aggregator_tprol.f90 @@ -87,7 +87,7 @@ subroutine mld_z_dec_aggregator_build_tprol(ag,parms,a,desc_a,ilaggr,nlaggr,op_ ! Local variables character(len=20) :: name - integer(psb_mpik_) :: ictxt, np, me + integer(psb_mpk_) :: ictxt, np, me integer(psb_ipk_) :: err_act integer(psb_ipk_) :: ntaggr integer(psb_ipk_) :: debug_level, debug_unit diff --git a/mlprec/impl/aggregator/mld_z_symdec_aggregator_tprol.f90 b/mlprec/impl/aggregator/mld_z_symdec_aggregator_tprol.f90 index eb619419..53ae506e 100644 --- a/mlprec/impl/aggregator/mld_z_symdec_aggregator_tprol.f90 +++ b/mlprec/impl/aggregator/mld_z_symdec_aggregator_tprol.f90 @@ -91,7 +91,7 @@ subroutine mld_z_symdec_aggregator_build_tprol(ag,parms,a,desc_a,ilaggr,nlaggr, ! Local variables type(psb_zspmat_type) :: atmp, atrans character(len=20) :: name - integer(psb_mpik_) :: ictxt, np, me + integer(psb_mpk_) :: ictxt, np, me integer(psb_ipk_) :: err_act integer(psb_ipk_) :: ntaggr, nr integer(psb_ipk_) :: debug_level, debug_unit diff --git a/tests/Bcmatch/mld_d_bcmatch_aggregator_mat_asb.f90 b/tests/Bcmatch/mld_d_bcmatch_aggregator_mat_asb.f90 index 750c068b..33ce7866 100644 --- a/tests/Bcmatch/mld_d_bcmatch_aggregator_mat_asb.f90 +++ b/tests/Bcmatch/mld_d_bcmatch_aggregator_mat_asb.f90 @@ -147,7 +147,7 @@ subroutine mld_d_bcmatch_aggregator_mat_asb(ag,parms,a,desc_a,ilaggr,nlaggr,ac, ! Local variables character(len=20) :: name - integer(psb_mpik_) :: ictxt, np, me + integer(psb_mpk_) :: ictxt, np, me type(psb_d_coo_sparse_mat) :: acoo, bcoo type(psb_d_csr_sparse_mat) :: acsr1 integer(psb_ipk_) :: nzl,ntaggr diff --git a/tests/Bcmatch/mld_d_bcmatch_aggregator_tprol.f90 b/tests/Bcmatch/mld_d_bcmatch_aggregator_tprol.f90 index d6b511fe..c4b4d01c 100644 --- a/tests/Bcmatch/mld_d_bcmatch_aggregator_tprol.f90 +++ b/tests/Bcmatch/mld_d_bcmatch_aggregator_tprol.f90 @@ -227,7 +227,7 @@ subroutine mld_d_bcmatch_aggregator_build_tprol(ag,parms,a,desc_a,ilaggr,nlaggr type(bcm_CSRMatrix) :: C, P integer(c_int) :: match_algorithm, n_sweeps, max_csize, max_nlevels character(len=20) :: name, ch_err - integer(psb_mpik_) :: ictxt, np, me + integer(psb_mpk_) :: ictxt, np, me integer(psb_ipk_) :: err_act, ierr integer(psb_ipk_) :: debug_level, debug_unit integer(psb_ipk_) :: i, j, k, nr, nc, isz, num_pcols