From 4b16ee0af4be0a7c6b952de8f73636ec4ed7f1e2 Mon Sep 17 00:00:00 2001 From: Salvatore Filippone Date: Thu, 24 May 2007 11:40:55 +0000 Subject: [PATCH] Call psb_get_mpicomm ONLY in CDALL; afterwards, always get it from DESC. --- base/internals/psi_dswapdata.F90 | 5 ++--- base/internals/psi_dswaptran.F90 | 6 +++--- base/internals/psi_fnd_owner.f90 | 2 +- base/internals/psi_iswapdata.F90 | 7 +++---- base/internals/psi_iswaptran.F90 | 5 ++--- base/internals/psi_ldsc_pre_halo.f90 | 8 ++++---- base/internals/psi_zswapdata.F90 | 7 +++---- base/internals/psi_zswaptran.F90 | 6 +++--- base/modules/psb_realloc_mod.F90 | 6 +++--- base/tools/psb_dcdovr.F90 | 6 +++--- base/tools/psb_dsphalo.F90 | 2 +- base/tools/psb_zcdovr.F90 | 6 +++--- base/tools/psb_zsphalo.F90 | 2 +- 13 files changed, 32 insertions(+), 36 deletions(-) diff --git a/base/internals/psi_dswapdata.F90 b/base/internals/psi_dswapdata.F90 index e0d2d238..ac2aa4d1 100644 --- a/base/internals/psi_dswapdata.F90 +++ b/base/internals/psi_dswapdata.F90 @@ -70,7 +70,8 @@ subroutine psi_dswapdatam(flag,n,beta,y,desc_a,work,info,data) name='psi_swap_data' call psb_erractionsave(err_act) - ictxt=psb_cd_get_context(desc_a) + ictxt = psb_cd_get_context(desc_a) + icomm = psb_cd_get_mpic(desc_a) call psb_info(ictxt,me,np) if (np == -1) then info = 2010 @@ -85,8 +86,6 @@ subroutine psi_dswapdatam(flag,n,beta,y,desc_a,work,info,data) endif - icomm = desc_a%matrix_data(psb_mpi_c_) - swap_mpi = iand(flag,psb_swap_mpi_) /= 0 swap_sync = iand(flag,psb_swap_sync_) /= 0 swap_send = iand(flag,psb_swap_send_) /= 0 diff --git a/base/internals/psi_dswaptran.F90 b/base/internals/psi_dswaptran.F90 index eb0fe317..90385cc5 100644 --- a/base/internals/psi_dswaptran.F90 +++ b/base/internals/psi_dswaptran.F90 @@ -70,7 +70,9 @@ subroutine psi_dswaptranm(flag,n,beta,y,desc_a,work,info,data) name='psi_swap_tran' call psb_erractionsave(err_act) - ictxt=psb_cd_get_context(desc_a) + ictxt = psb_cd_get_context(desc_a) + icomm = psb_cd_get_mpic(desc_a) + call psb_info(ictxt,me,np) if (np == -1) then info = 2010 @@ -84,8 +86,6 @@ subroutine psi_dswaptranm(flag,n,beta,y,desc_a,work,info,data) goto 9999 endif - icomm = desc_a%matrix_data(psb_mpi_c_) - swap_mpi = iand(flag,psb_swap_mpi_) /= 0 swap_sync = iand(flag,psb_swap_sync_) /= 0 swap_send = iand(flag,psb_swap_send_) /= 0 diff --git a/base/internals/psi_fnd_owner.f90 b/base/internals/psi_fnd_owner.f90 index 5633a5b8..2075351d 100644 --- a/base/internals/psi_fnd_owner.f90 +++ b/base/internals/psi_fnd_owner.f90 @@ -57,9 +57,9 @@ subroutine psi_fnd_owner(nv,idx,iprc,desc,info) call psb_erractionsave(err_act) ictxt = psb_cd_get_context(desc) + icomm = psb_cd_get_mpic(desc) n_row = psb_cd_get_local_rows(desc) n_col = psb_cd_get_local_cols(desc) - call psb_get_mpicomm(ictxt,icomm ) ! check on blacs grid diff --git a/base/internals/psi_iswapdata.F90 b/base/internals/psi_iswapdata.F90 index 073da1c7..3cbf5ef4 100644 --- a/base/internals/psi_iswapdata.F90 +++ b/base/internals/psi_iswapdata.F90 @@ -70,7 +70,9 @@ subroutine psi_iswapdatam(flag,n,beta,y,desc_a,work,info,data) name='psi_swap_data' call psb_erractionsave(err_act) - ictxt=psb_cd_get_context(desc_a) + ictxt = psb_cd_get_context(desc_a) + icomm = psb_cd_get_mpic(desc_a) + call psb_info(ictxt,me,np) if (np == -1) then info = 2010 @@ -84,9 +86,6 @@ subroutine psi_iswapdatam(flag,n,beta,y,desc_a,work,info,data) goto 9999 endif - - icomm = desc_a%matrix_data(psb_mpi_c_) - swap_mpi = iand(flag,psb_swap_mpi_) /= 0 swap_sync = iand(flag,psb_swap_sync_) /= 0 swap_send = iand(flag,psb_swap_send_) /= 0 diff --git a/base/internals/psi_iswaptran.F90 b/base/internals/psi_iswaptran.F90 index 9bf00a78..5cc746a1 100644 --- a/base/internals/psi_iswaptran.F90 +++ b/base/internals/psi_iswaptran.F90 @@ -70,7 +70,8 @@ subroutine psi_iswaptranm(flag,n,beta,y,desc_a,work,info,data) name='psi_swap_tran' call psb_erractionsave(err_act) - ictxt=psb_cd_get_context(desc_a) + ictxt = psb_cd_get_context(desc_a) + icomm = psb_cd_get_mpic(desc_a) call psb_info(ictxt,me,np) if (np == -1) then info = 2010 @@ -84,8 +85,6 @@ subroutine psi_iswaptranm(flag,n,beta,y,desc_a,work,info,data) goto 9999 endif - icomm = desc_a%matrix_data(psb_mpi_c_) - swap_mpi = iand(flag,psb_swap_mpi_) /= 0 swap_sync = iand(flag,psb_swap_sync_) /= 0 swap_send = iand(flag,psb_swap_send_) /= 0 diff --git a/base/internals/psi_ldsc_pre_halo.f90 b/base/internals/psi_ldsc_pre_halo.f90 index 57281118..ea972e14 100644 --- a/base/internals/psi_ldsc_pre_halo.f90 +++ b/base/internals/psi_ldsc_pre_halo.f90 @@ -54,10 +54,10 @@ subroutine psi_ldsc_pre_halo(desc,ext_hv,info) name = 'psi_ldsc_pre_halo' call psb_erractionsave(err_act) - ictxt = psb_cd_get_context(desc) - n_row = psb_cd_get_local_rows(desc) - n_col = psb_cd_get_local_cols(desc) - call psb_get_mpicomm(ictxt,icomm ) + ictxt = psb_cd_get_context(desc) + icomm = psb_cd_get_mpic(desc) + n_row = psb_cd_get_local_rows(desc) + n_col = psb_cd_get_local_cols(desc) ! check on blacs grid call psb_info(ictxt, me, np) diff --git a/base/internals/psi_zswapdata.F90 b/base/internals/psi_zswapdata.F90 index b3b34dd3..7bb1ff2c 100644 --- a/base/internals/psi_zswapdata.F90 +++ b/base/internals/psi_zswapdata.F90 @@ -70,7 +70,9 @@ subroutine psi_zswapdatam(flag,n,beta,y,desc_a,work,info,data) name='psi_swap_data' call psb_erractionsave(err_act) - ictxt=psb_cd_get_context(desc_a) + ictxt = psb_cd_get_context(desc_a) + icomm = psb_cd_get_mpic(desc_a) + call psb_info(ictxt,me,np) if (np == -1) then info = 2010 @@ -84,9 +86,6 @@ subroutine psi_zswapdatam(flag,n,beta,y,desc_a,work,info,data) goto 9999 endif - - icomm = desc_a%matrix_data(psb_mpi_c_) - swap_mpi = iand(flag,psb_swap_mpi_) /= 0 swap_sync = iand(flag,psb_swap_sync_) /= 0 swap_send = iand(flag,psb_swap_send_) /= 0 diff --git a/base/internals/psi_zswaptran.F90 b/base/internals/psi_zswaptran.F90 index f209c444..acdbc46f 100644 --- a/base/internals/psi_zswaptran.F90 +++ b/base/internals/psi_zswaptran.F90 @@ -70,7 +70,9 @@ subroutine psi_zswaptranm(flag,n,beta,y,desc_a,work,info,data) name='psi_swap_tran' call psb_erractionsave(err_act) - ictxt=psb_cd_get_context(desc_a) + ictxt = psb_cd_get_context(desc_a) + icomm = psb_cd_get_mpic(desc_a) + call psb_info(ictxt,me,np) if (np == -1) then info = 2010 @@ -84,8 +86,6 @@ subroutine psi_zswaptranm(flag,n,beta,y,desc_a,work,info,data) goto 9999 endif - icomm = desc_a%matrix_data(psb_mpi_c_) - swap_mpi = iand(flag,psb_swap_mpi_) /= 0 swap_sync = iand(flag,psb_swap_sync_) /= 0 swap_send = iand(flag,psb_swap_send_) /= 0 diff --git a/base/modules/psb_realloc_mod.F90 b/base/modules/psb_realloc_mod.F90 index 0ed612c5..3b0ad214 100644 --- a/base/modules/psb_realloc_mod.F90 +++ b/base/modules/psb_realloc_mod.F90 @@ -621,7 +621,7 @@ Contains else lb_ = 1 endif - if ((len<0).or.(len>25*1024*1024)) then + if ((len<0)) then err=2025 call psb_errpush(err,name,i_err=(/len,0,0,0,0/)) goto 9999 @@ -697,7 +697,7 @@ Contains else lb_ = 1 endif - if ((len<0).or.(len>25*1024*1024)) then + if ((len<0)) then err=2025 call psb_errpush(err,name,i_err=(/len,0,0,0,0/)) goto 9999 @@ -770,7 +770,7 @@ Contains else lb_ = 1 endif - if ((len<0).or.(len>25*1024*1024)) then + if ((len<0)) then err=2025 call psb_errpush(err,name,i_err=(/len,0,0,0,0/)) goto 9999 diff --git a/base/tools/psb_dcdovr.F90 b/base/tools/psb_dcdovr.F90 index e235a74b..1e9c7ce0 100644 --- a/base/tools/psb_dcdovr.F90 +++ b/base/tools/psb_dcdovr.F90 @@ -101,8 +101,8 @@ Subroutine psb_dcdovr(a,desc_a,novr,desc_ov,info, extype) info = 0 call psb_erractionsave(err_act) - ictxt=psb_cd_get_context(desc_a) - + ictxt = psb_cd_get_context(desc_a) + icomm = psb_cd_get_mpic(desc_a) Call psb_info(ictxt, me, np) If(debug) Write(0,*)'in psb_cdovr',novr @@ -143,7 +143,7 @@ Subroutine psb_dcdovr(a,desc_a,novr,desc_ov,info, extype) return endif - call psb_get_mpicomm(ictxt,icomm ) + If(debug)then Write(0,*)'BEGIN cdovr',me,nhalo diff --git a/base/tools/psb_dsphalo.F90 b/base/tools/psb_dsphalo.F90 index cbbd7dbd..ae984c05 100644 --- a/base/tools/psb_dsphalo.F90 +++ b/base/tools/psb_dsphalo.F90 @@ -119,6 +119,7 @@ Subroutine psb_dsphalo(a,desc_a,blk,info,rwcnv,clcnv,cliprow,outfmt,data) endif ictxt = psb_cd_get_context(desc_a) + icomm = psb_get_mpic(desc_a) Call psb_info(ictxt, me, np) @@ -182,7 +183,6 @@ Subroutine psb_dsphalo(a,desc_a,blk,info,rwcnv,clcnv,cliprow,outfmt,data) counter = counter+n_el_send+3 Enddo - call psb_get_mpicomm(ictxt,icomm) call mpi_alltoall(sdsz,1,mpi_integer,rvsz,1,mpi_integer,icomm,info) if (info /= 0) then diff --git a/base/tools/psb_zcdovr.F90 b/base/tools/psb_zcdovr.F90 index d49f6e0c..a48e7823 100644 --- a/base/tools/psb_zcdovr.F90 +++ b/base/tools/psb_zcdovr.F90 @@ -99,8 +99,8 @@ Subroutine psb_zcdovr(a,desc_a,novr,desc_ov,info, extype) info = 0 call psb_erractionsave(err_act) - ictxt=psb_cd_get_context(desc_a) - + ictxt = psb_cd_get_context(desc_a) + icomm = psb_cd_get_mpic(desc_a) Call psb_info(ictxt, me, np) If(debug) Write(0,*)'in psb_cdovr',novr @@ -141,7 +141,7 @@ Subroutine psb_zcdovr(a,desc_a,novr,desc_ov,info, extype) return endif - call psb_get_mpicomm(ictxt,icomm ) + If(debug)then Write(0,*)'BEGIN cdovr',me,nhalo diff --git a/base/tools/psb_zsphalo.F90 b/base/tools/psb_zsphalo.F90 index f0c52e4e..4a3c7c84 100644 --- a/base/tools/psb_zsphalo.F90 +++ b/base/tools/psb_zsphalo.F90 @@ -119,6 +119,7 @@ Subroutine psb_zsphalo(a,desc_a,blk,info,rwcnv,clcnv,cliprow,outfmt,data) endif ictxt = psb_cd_get_context(desc_a) + icomm = psb_get_mpic(desc_a) Call psb_info(ictxt, me, np) @@ -182,7 +183,6 @@ Subroutine psb_zsphalo(a,desc_a,blk,info,rwcnv,clcnv,cliprow,outfmt,data) counter = counter+n_el_send+3 Enddo - call psb_get_mpicomm(ictxt,icomm) call mpi_alltoall(sdsz,1,mpi_integer,rvsz,1,mpi_integer,icomm,info) if (info /= 0) then