From 21db81b817adf14bdab198596d86b8c98e46d545 Mon Sep 17 00:00:00 2001 From: Salvatore Filippone Date: Thu, 26 Jan 2012 14:55:07 +0000 Subject: [PATCH] mld2p4-2: mlprec/impl/mld_caggrmat_minnrg_asb.F90 mlprec/impl/mld_caggrmat_nosmth_asb.F90 mlprec/impl/mld_daggrmat_minnrg_asb.F90 mlprec/impl/mld_daggrmat_nosmth_asb.F90 mlprec/impl/mld_saggrmat_minnrg_asb.F90 mlprec/impl/mld_saggrmat_nosmth_asb.F90 mlprec/impl/mld_zaggrmat_minnrg_asb.F90 mlprec/impl/mld_zaggrmat_nosmth_asb.F90 Switched explicit use of mpi_integer to psb_mpi_integer, in preparation to parametriztion on psb_ipk_ --- mlprec/impl/mld_caggrmat_minnrg_asb.F90 | 8 ++++---- mlprec/impl/mld_caggrmat_nosmth_asb.F90 | 8 ++++---- mlprec/impl/mld_daggrmat_minnrg_asb.F90 | 8 ++++---- mlprec/impl/mld_daggrmat_nosmth_asb.F90 | 8 ++++---- mlprec/impl/mld_saggrmat_minnrg_asb.F90 | 8 ++++---- mlprec/impl/mld_saggrmat_nosmth_asb.F90 | 8 ++++---- mlprec/impl/mld_zaggrmat_minnrg_asb.F90 | 8 ++++---- mlprec/impl/mld_zaggrmat_nosmth_asb.F90 | 8 ++++---- 8 files changed, 32 insertions(+), 32 deletions(-) diff --git a/mlprec/impl/mld_caggrmat_minnrg_asb.F90 b/mlprec/impl/mld_caggrmat_minnrg_asb.F90 index 5020b934..d4e84297 100644 --- a/mlprec/impl/mld_caggrmat_minnrg_asb.F90 +++ b/mlprec/impl/mld_caggrmat_minnrg_asb.F90 @@ -674,11 +674,11 @@ subroutine mld_caggrmat_minnrg_asb(a,desc_a,ilaggr,nlaggr,p,info) call mpi_allgatherv(bcoo%val,ndx,mpi_double_complex,tmpcoo%val,nzbr,idisp,& & mpi_double_complex,icomm,info) if (info == psb_success_)& - & call mpi_allgatherv(bcoo%ia,ndx,mpi_integer,tmpcoo%ia,nzbr,idisp,& - & mpi_integer,icomm,info) + & call mpi_allgatherv(bcoo%ia,ndx,psb_mpi_integer,tmpcoo%ia,nzbr,idisp,& + & psb_mpi_integer,icomm,info) if (info == psb_success_)& - & call mpi_allgatherv(bcoo%ja,ndx,mpi_integer,tmpcoo%ja,nzbr,idisp,& - & mpi_integer,icomm,info) + & call mpi_allgatherv(bcoo%ja,ndx,psb_mpi_integer,tmpcoo%ja,nzbr,idisp,& + & psb_mpi_integer,icomm,info) if (info /= psb_success_) then call psb_errpush(psb_err_internal_error_,name,& diff --git a/mlprec/impl/mld_caggrmat_nosmth_asb.F90 b/mlprec/impl/mld_caggrmat_nosmth_asb.F90 index 1a6658d1..b3278dbe 100644 --- a/mlprec/impl/mld_caggrmat_nosmth_asb.F90 +++ b/mlprec/impl/mld_caggrmat_nosmth_asb.F90 @@ -203,10 +203,10 @@ subroutine mld_caggrmat_nosmth_asb(a,desc_a,ilaggr,nlaggr,p,info) call mpi_allgatherv(bcoo%val,ndx,mpi_double_complex,ac_coo%val,nzbr,idisp,& & mpi_double_precision,icomm,info) - call mpi_allgatherv(bcoo%ia,ndx,mpi_integer,ac_coo%ia,nzbr,idisp,& - & mpi_integer,icomm,info) - call mpi_allgatherv(bcoo%ja,ndx,mpi_integer,ac_coo%ja,nzbr,idisp,& - & mpi_integer,icomm,info) + call mpi_allgatherv(bcoo%ia,ndx,psb_mpi_integer,ac_coo%ia,nzbr,idisp,& + & psb_mpi_integer,icomm,info) + call mpi_allgatherv(bcoo%ja,ndx,psb_mpi_integer,ac_coo%ja,nzbr,idisp,& + & psb_mpi_integer,icomm,info) if(info /= psb_success_) then info=-1 call psb_errpush(info,name) diff --git a/mlprec/impl/mld_daggrmat_minnrg_asb.F90 b/mlprec/impl/mld_daggrmat_minnrg_asb.F90 index 5a23e2a0..6fed8b3a 100644 --- a/mlprec/impl/mld_daggrmat_minnrg_asb.F90 +++ b/mlprec/impl/mld_daggrmat_minnrg_asb.F90 @@ -677,11 +677,11 @@ subroutine mld_daggrmat_minnrg_asb(a,desc_a,ilaggr,nlaggr,p,info) call mpi_allgatherv(bcoo%val,ndx,mpi_double_precision,tmpcoo%val,nzbr,idisp,& & mpi_double_precision,icomm,info) if (info == psb_success_)& - & call mpi_allgatherv(bcoo%ia,ndx,mpi_integer,tmpcoo%ia,nzbr,idisp,& - & mpi_integer,icomm,info) + & call mpi_allgatherv(bcoo%ia,ndx,psb_mpi_integer,tmpcoo%ia,nzbr,idisp,& + & psb_mpi_integer,icomm,info) if (info == psb_success_)& - & call mpi_allgatherv(bcoo%ja,ndx,mpi_integer,tmpcoo%ja,nzbr,idisp,& - & mpi_integer,icomm,info) + & call mpi_allgatherv(bcoo%ja,ndx,psb_mpi_integer,tmpcoo%ja,nzbr,idisp,& + & psb_mpi_integer,icomm,info) if (info /= psb_success_) then call psb_errpush(psb_err_internal_error_,name,& diff --git a/mlprec/impl/mld_daggrmat_nosmth_asb.F90 b/mlprec/impl/mld_daggrmat_nosmth_asb.F90 index 9a9c4e3a..6919f164 100644 --- a/mlprec/impl/mld_daggrmat_nosmth_asb.F90 +++ b/mlprec/impl/mld_daggrmat_nosmth_asb.F90 @@ -203,10 +203,10 @@ subroutine mld_daggrmat_nosmth_asb(a,desc_a,ilaggr,nlaggr,p,info) call mpi_allgatherv(bcoo%val,ndx,mpi_double_precision,ac_coo%val,nzbr,idisp,& & mpi_double_precision,icomm,info) - call mpi_allgatherv(bcoo%ia,ndx,mpi_integer,ac_coo%ia,nzbr,idisp,& - & mpi_integer,icomm,info) - call mpi_allgatherv(bcoo%ja,ndx,mpi_integer,ac_coo%ja,nzbr,idisp,& - & mpi_integer,icomm,info) + call mpi_allgatherv(bcoo%ia,ndx,psb_mpi_integer,ac_coo%ia,nzbr,idisp,& + & psb_mpi_integer,icomm,info) + call mpi_allgatherv(bcoo%ja,ndx,psb_mpi_integer,ac_coo%ja,nzbr,idisp,& + & psb_mpi_integer,icomm,info) if(info /= psb_success_) then info=-1 call psb_errpush(info,name) diff --git a/mlprec/impl/mld_saggrmat_minnrg_asb.F90 b/mlprec/impl/mld_saggrmat_minnrg_asb.F90 index d2703418..af31b57e 100644 --- a/mlprec/impl/mld_saggrmat_minnrg_asb.F90 +++ b/mlprec/impl/mld_saggrmat_minnrg_asb.F90 @@ -673,11 +673,11 @@ subroutine mld_saggrmat_minnrg_asb(a,desc_a,ilaggr,nlaggr,p,info) call mpi_allgatherv(bcoo%val,ndx,mpi_double_precision,tmpcoo%val,nzbr,idisp,& & mpi_double_precision,icomm,info) if (info == psb_success_)& - & call mpi_allgatherv(bcoo%ia,ndx,mpi_integer,tmpcoo%ia,nzbr,idisp,& - & mpi_integer,icomm,info) + & call mpi_allgatherv(bcoo%ia,ndx,psb_mpi_integer,tmpcoo%ia,nzbr,idisp,& + & psb_mpi_integer,icomm,info) if (info == psb_success_)& - & call mpi_allgatherv(bcoo%ja,ndx,mpi_integer,tmpcoo%ja,nzbr,idisp,& - & mpi_integer,icomm,info) + & call mpi_allgatherv(bcoo%ja,ndx,psb_mpi_integer,tmpcoo%ja,nzbr,idisp,& + & psb_mpi_integer,icomm,info) if (info /= psb_success_) then call psb_errpush(psb_err_internal_error_,name,& diff --git a/mlprec/impl/mld_saggrmat_nosmth_asb.F90 b/mlprec/impl/mld_saggrmat_nosmth_asb.F90 index 771b8dd5..03d1ae85 100644 --- a/mlprec/impl/mld_saggrmat_nosmth_asb.F90 +++ b/mlprec/impl/mld_saggrmat_nosmth_asb.F90 @@ -203,10 +203,10 @@ subroutine mld_saggrmat_nosmth_asb(a,desc_a,ilaggr,nlaggr,p,info) call mpi_allgatherv(bcoo%val,ndx,mpi_double_precision,ac_coo%val,nzbr,idisp,& & mpi_double_precision,icomm,info) - call mpi_allgatherv(bcoo%ia,ndx,mpi_integer,ac_coo%ia,nzbr,idisp,& - & mpi_integer,icomm,info) - call mpi_allgatherv(bcoo%ja,ndx,mpi_integer,ac_coo%ja,nzbr,idisp,& - & mpi_integer,icomm,info) + call mpi_allgatherv(bcoo%ia,ndx,psb_mpi_integer,ac_coo%ia,nzbr,idisp,& + & psb_mpi_integer,icomm,info) + call mpi_allgatherv(bcoo%ja,ndx,psb_mpi_integer,ac_coo%ja,nzbr,idisp,& + & psb_mpi_integer,icomm,info) if(info /= psb_success_) then info=-1 call psb_errpush(info,name) diff --git a/mlprec/impl/mld_zaggrmat_minnrg_asb.F90 b/mlprec/impl/mld_zaggrmat_minnrg_asb.F90 index f176ec67..053ddbb9 100644 --- a/mlprec/impl/mld_zaggrmat_minnrg_asb.F90 +++ b/mlprec/impl/mld_zaggrmat_minnrg_asb.F90 @@ -674,11 +674,11 @@ subroutine mld_zaggrmat_minnrg_asb(a,desc_a,ilaggr,nlaggr,p,info) call mpi_allgatherv(bcoo%val,ndx,mpi_double_complex,tmpcoo%val,nzbr,idisp,& & mpi_double_complex,icomm,info) if (info == psb_success_)& - & call mpi_allgatherv(bcoo%ia,ndx,mpi_integer,tmpcoo%ia,nzbr,idisp,& - & mpi_integer,icomm,info) + & call mpi_allgatherv(bcoo%ia,ndx,psb_mpi_integer,tmpcoo%ia,nzbr,idisp,& + & psb_mpi_integer,icomm,info) if (info == psb_success_)& - & call mpi_allgatherv(bcoo%ja,ndx,mpi_integer,tmpcoo%ja,nzbr,idisp,& - & mpi_integer,icomm,info) + & call mpi_allgatherv(bcoo%ja,ndx,psb_mpi_integer,tmpcoo%ja,nzbr,idisp,& + & psb_mpi_integer,icomm,info) if (info /= psb_success_) then call psb_errpush(psb_err_internal_error_,name,& diff --git a/mlprec/impl/mld_zaggrmat_nosmth_asb.F90 b/mlprec/impl/mld_zaggrmat_nosmth_asb.F90 index 5123826e..aebd75ad 100644 --- a/mlprec/impl/mld_zaggrmat_nosmth_asb.F90 +++ b/mlprec/impl/mld_zaggrmat_nosmth_asb.F90 @@ -203,10 +203,10 @@ subroutine mld_zaggrmat_nosmth_asb(a,desc_a,ilaggr,nlaggr,p,info) call mpi_allgatherv(bcoo%val,ndx,mpi_double_complex,ac_coo%val,nzbr,idisp,& & mpi_double_precision,icomm,info) - call mpi_allgatherv(bcoo%ia,ndx,mpi_integer,ac_coo%ia,nzbr,idisp,& - & mpi_integer,icomm,info) - call mpi_allgatherv(bcoo%ja,ndx,mpi_integer,ac_coo%ja,nzbr,idisp,& - & mpi_integer,icomm,info) + call mpi_allgatherv(bcoo%ia,ndx,psb_mpi_integer,ac_coo%ia,nzbr,idisp,& + & psb_mpi_integer,icomm,info) + call mpi_allgatherv(bcoo%ja,ndx,psb_mpi_integer,ac_coo%ja,nzbr,idisp,& + & psb_mpi_integer,icomm,info) if(info /= psb_success_) then info=-1 call psb_errpush(info,name)