From 46736f9d39b6f54cf77b9a91bc917008e4a8370a Mon Sep 17 00:00:00 2001 From: Salvatore Filippone Date: Fri, 12 Jun 2020 19:56:13 +0200 Subject: [PATCH] Fix type handling bug in simple_triad --- base/modules/penv/psi_c_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/penv/psi_z_collective_mod.F90 | 2 +- base/tools/psb_csphalo.F90 | 2 +- base/tools/psb_dsphalo.F90 | 2 +- base/tools/psb_ssphalo.F90 | 2 +- base/tools/psb_zsphalo.F90 | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/base/modules/penv/psi_c_collective_mod.F90 b/base/modules/penv/psi_c_collective_mod.F90 index de836d38..a1fa78a3 100644 --- a/base/modules/penv/psi_c_collective_mod.F90 +++ b/base/modules/penv/psi_c_collective_mod.F90 @@ -1048,7 +1048,7 @@ contains idx = bsdindx(ip+1) p2ptag = psb_complex_tag call mpi_send(valsnd(idx+1:idx+sz),sz,& - & psb_mpi_r_dpk_,prcid(ip+1),& + & psb_mpi_c_spk_,prcid(ip+1),& & p2ptag, icomm,iret) p2ptag = psb_int_swap_tag call mpi_send(iasnd(idx+1:idx+sz),sz,& diff --git a/base/modules/penv/psi_e_collective_mod.F90 b/base/modules/penv/psi_e_collective_mod.F90 index 4c3a006e..443f5f99 100644 --- a/base/modules/penv/psi_e_collective_mod.F90 +++ b/base/modules/penv/psi_e_collective_mod.F90 @@ -1416,7 +1416,7 @@ contains idx = bsdindx(ip+1) p2ptag = psb_int8_tag call mpi_send(valsnd(idx+1:idx+sz),sz,& - & psb_mpi_r_dpk_,prcid(ip+1),& + & psb_mpi_epk_,prcid(ip+1),& & p2ptag, icomm,iret) p2ptag = psb_int_swap_tag call mpi_send(iasnd(idx+1:idx+sz),sz,& diff --git a/base/modules/penv/psi_i2_collective_mod.F90 b/base/modules/penv/psi_i2_collective_mod.F90 index 911ed938..31a245b6 100644 --- a/base/modules/penv/psi_i2_collective_mod.F90 +++ b/base/modules/penv/psi_i2_collective_mod.F90 @@ -1416,7 +1416,7 @@ contains idx = bsdindx(ip+1) p2ptag = psb_int2_tag call mpi_send(valsnd(idx+1:idx+sz),sz,& - & psb_mpi_r_dpk_,prcid(ip+1),& + & psb_mpi_i2pk_,prcid(ip+1),& & p2ptag, icomm,iret) p2ptag = psb_int_swap_tag call mpi_send(iasnd(idx+1:idx+sz),sz,& diff --git a/base/modules/penv/psi_m_collective_mod.F90 b/base/modules/penv/psi_m_collective_mod.F90 index 206b15fa..8badcf87 100644 --- a/base/modules/penv/psi_m_collective_mod.F90 +++ b/base/modules/penv/psi_m_collective_mod.F90 @@ -1416,7 +1416,7 @@ contains idx = bsdindx(ip+1) p2ptag = psb_int4_tag call mpi_send(valsnd(idx+1:idx+sz),sz,& - & psb_mpi_r_dpk_,prcid(ip+1),& + & psb_mpi_mpk_,prcid(ip+1),& & p2ptag, icomm,iret) p2ptag = psb_int_swap_tag call mpi_send(iasnd(idx+1:idx+sz),sz,& diff --git a/base/modules/penv/psi_s_collective_mod.F90 b/base/modules/penv/psi_s_collective_mod.F90 index eda86961..e4fb9d06 100644 --- a/base/modules/penv/psi_s_collective_mod.F90 +++ b/base/modules/penv/psi_s_collective_mod.F90 @@ -1539,7 +1539,7 @@ contains idx = bsdindx(ip+1) p2ptag = psb_real_tag call mpi_send(valsnd(idx+1:idx+sz),sz,& - & psb_mpi_r_dpk_,prcid(ip+1),& + & psb_mpi_r_spk_,prcid(ip+1),& & p2ptag, icomm,iret) p2ptag = psb_int_swap_tag call mpi_send(iasnd(idx+1:idx+sz),sz,& diff --git a/base/modules/penv/psi_z_collective_mod.F90 b/base/modules/penv/psi_z_collective_mod.F90 index a517cb03..8a58ffb5 100644 --- a/base/modules/penv/psi_z_collective_mod.F90 +++ b/base/modules/penv/psi_z_collective_mod.F90 @@ -1048,7 +1048,7 @@ contains idx = bsdindx(ip+1) p2ptag = psb_dcomplex_tag call mpi_send(valsnd(idx+1:idx+sz),sz,& - & psb_mpi_r_dpk_,prcid(ip+1),& + & psb_mpi_c_dpk_,prcid(ip+1),& & p2ptag, icomm,iret) p2ptag = psb_int_swap_tag call mpi_send(iasnd(idx+1:idx+sz),sz,& diff --git a/base/tools/psb_csphalo.F90 b/base/tools/psb_csphalo.F90 index 668f7d52..79b2b5b7 100644 --- a/base/tools/psb_csphalo.F90 +++ b/base/tools/psb_csphalo.F90 @@ -1284,7 +1284,7 @@ Subroutine psb_c_lc_csr_halo(a,desc_a,blk,info,rowcnv,colcnv,& if(psb_get_errstatus() /= 0) return info=psb_success_ - name='psb_lc_csr_sphalo' + name='psb_c_lc_csr_sphalo' call psb_erractionsave(err_act) if (psb_errstatus_fatal()) then info = psb_err_internal_error_ ; goto 9999 diff --git a/base/tools/psb_dsphalo.F90 b/base/tools/psb_dsphalo.F90 index 8d800f6d..24949cff 100644 --- a/base/tools/psb_dsphalo.F90 +++ b/base/tools/psb_dsphalo.F90 @@ -1284,7 +1284,7 @@ Subroutine psb_d_ld_csr_halo(a,desc_a,blk,info,rowcnv,colcnv,& if(psb_get_errstatus() /= 0) return info=psb_success_ - name='psb_ld_csr_sphalo' + name='psb_d_ld_csr_sphalo' call psb_erractionsave(err_act) if (psb_errstatus_fatal()) then info = psb_err_internal_error_ ; goto 9999 diff --git a/base/tools/psb_ssphalo.F90 b/base/tools/psb_ssphalo.F90 index 038e72a5..f8958a45 100644 --- a/base/tools/psb_ssphalo.F90 +++ b/base/tools/psb_ssphalo.F90 @@ -1284,7 +1284,7 @@ Subroutine psb_s_ls_csr_halo(a,desc_a,blk,info,rowcnv,colcnv,& if(psb_get_errstatus() /= 0) return info=psb_success_ - name='psb_ls_csr_sphalo' + name='psb_s_ls_csr_sphalo' call psb_erractionsave(err_act) if (psb_errstatus_fatal()) then info = psb_err_internal_error_ ; goto 9999 diff --git a/base/tools/psb_zsphalo.F90 b/base/tools/psb_zsphalo.F90 index 0e32938b..a862ce99 100644 --- a/base/tools/psb_zsphalo.F90 +++ b/base/tools/psb_zsphalo.F90 @@ -1284,7 +1284,7 @@ Subroutine psb_z_lz_csr_halo(a,desc_a,blk,info,rowcnv,colcnv,& if(psb_get_errstatus() /= 0) return info=psb_success_ - name='psb_lz_csr_sphalo' + name='psb_z_lz_csr_sphalo' call psb_erractionsave(err_act) if (psb_errstatus_fatal()) then info = psb_err_internal_error_ ; goto 9999