fdurastante/psblas3
1
0
Fork 0
mirror of https://github.com/sfilippone/psblas3.git synced 2026-10-15 18:39:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Call psb_get_mpicomm ONLY in CDALL; afterwards, always get it from DESC.

Browse Source
This commit is contained in:
Salvatore Filippone
2007-05-24 11:40:55 +00:00
parent b350f41c87
commit 4b16ee0af4
13 changed files with 32 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
base/internals/psi_dswapdata.F90
+2 -3
View File
@@ -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
base/internals/psi_dswaptran.F90
+3 -3
View File
@@ -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
base/internals/psi_fnd_owner.f90
+1 -1
View File
@@ -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
base/internals/psi_iswapdata.F90
+3 -4
View File
@@ -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
base/internals/psi_iswaptran.F90
+2 -3
View File
@@ -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
base/internals/psi_ldsc_pre_halo.f90
+4 -4
View File
@@ -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)
base/internals/psi_zswapdata.F90
+3 -4
View File
@@ -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
base/internals/psi_zswaptran.F90
+3 -3
View File
@@ -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
base/modules/psb_realloc_mod.F90
+3 -3
View File
@@ -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
base/tools/psb_dcdovr.F90
+3 -3
View File
@@ -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
base/tools/psb_dsphalo.F90
+1 -1
View File
@@ -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
base/tools/psb_zcdovr.F90
+3 -3
View File
@@ -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
base/tools/psb_zsphalo.F90
+1 -1
View File
@@ -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