diff --git a/base/internals/srtlist.f b/base/internals/srtlist.f index 79d0ebbc..83cf43ce 100644 --- a/base/internals/srtlist.f +++ b/base/internals/srtlist.f @@ -85,8 +85,6 @@ C INTEGER I,J, NEDGES,IP1,IP2,NCH,IP,IEDGE,I1,IX,IST,ISWAP(2) INTEGER NO_COMM PARAMETER (NO_COMM=-1) - double precision mpi_wtime, t1, t2 - external mpi_wtime IF (NP .LT. 0) THEN @@ -193,7 +191,6 @@ c$$$ write(0,*) 'SRTLIST Input :',i,ip ENDIF ENDDO -c$$$ t2 = mpi_wtime() c$$$ WRITE(0,*) 'Output communication:',t2-t1 c$$$ do i=1,np c$$$ do j=1,ldl(i) diff --git a/base/tools/psb_cdren.f90 b/base/tools/psb_cdren.f90 index bede3702..cd0eafec 100644 --- a/base/tools/psb_cdren.f90 +++ b/base/tools/psb_cdren.f90 @@ -63,8 +63,7 @@ subroutine psb_cdren(trans,iperm,desc_a,info) integer :: i,j,np,me, n_col, kh, nh integer :: dectype integer :: ictxt,n_row, int_err(5), err_act - real(kind(1.d0)) :: time(10), mpi_wtime, real_err(6) - external mpi_wtime + real(kind(1.d0)) :: time(10), real_err(6) logical, parameter :: debug=.false. character(len=20) :: name @@ -73,7 +72,7 @@ subroutine psb_cdren(trans,iperm,desc_a,info) call psb_erractionsave(err_act) name = 'psb_dcren' - time(1) = mpi_wtime() + time(1) = psb_wtime() ictxt = psb_cd_get_context(desc_a) dectype = psb_cd_get_dectype(desc_a) @@ -207,7 +206,7 @@ subroutine psb_cdren(trans,iperm,desc_a,info) endif - time(4) = mpi_wtime() + time(4) = psb_wtime() time(4) = time(4) - time(3) if (debug) then call psb_amx(ictxt, time(4)) diff --git a/base/tools/psb_dcsrp.f90 b/base/tools/psb_dcsrp.f90 index 748766f3..92872650 100644 --- a/base/tools/psb_dcsrp.f90 +++ b/base/tools/psb_dcsrp.f90 @@ -83,11 +83,10 @@ subroutine psb_dcsrp(trans,iperm,a, desc_a, info) integer :: ictxt,n_row,err_act, int_err(5) character(len=20) :: name, char_err - real(kind(1.d0)) :: time(10), mpi_wtime - external mpi_wtime + real(kind(1.d0)) :: time(10) logical, parameter :: debug=.false. - time(1) = mpi_wtime() + time(1) = psb_wtime() ictxt = psb_cd_get_context(desc_a) dectype = psb_cd_get_dectype(desc_a) @@ -170,7 +169,7 @@ subroutine psb_dcsrp(trans,iperm,a, desc_a, info) deallocate(ipt,work_dcsdp) - time(4) = mpi_wtime() + time(4) = psb_wtime() time(4) = time(4) - time(3) if (debug) then call psb_amx(ictxt, time(4)) diff --git a/base/tools/psb_dspcnv.f90 b/base/tools/psb_dspcnv.f90 index 71476130..6f3ccf76 100644 --- a/base/tools/psb_dspcnv.f90 +++ b/base/tools/psb_dspcnv.f90 @@ -109,8 +109,6 @@ subroutine psb_dspcnv(a,b,desc_a,info) integer :: ictxt,n_row character :: check*1, trans*1, unitd*1 - real(kind(1.d0)) :: time(10), mpi_wtime - external mpi_wtime logical, parameter :: debug=.false. character(len=20) :: name, ch_err @@ -119,7 +117,6 @@ subroutine psb_dspcnv(a,b,desc_a,info) name = 'psb_dspcnv' call psb_erractionsave(err_act) - time(1) = mpi_wtime() ictxt = psb_cd_get_context(desc_a) dectype = psb_cd_get_dectype(desc_a) diff --git a/base/tools/psb_dsphalo.f90 b/base/tools/psb_dsphalo.f90 index acab1816..d8bdde07 100644 --- a/base/tools/psb_dsphalo.f90 +++ b/base/tools/psb_dsphalo.f90 @@ -117,7 +117,7 @@ Subroutine psb_dsphalo(a,desc_a,blk,info,rwcnv,clcnv,cliprow,outfmt,data) Call psb_info(ictxt, me, np) - t1 = mpi_wtime() + t1 = psb_wtime() Allocate(sdid(np,3),rvid(np,3),brvindx(np+1),& & rvsz(np),sdsz(np),bsdindx(np+1),stat=info) @@ -220,7 +220,7 @@ Subroutine psb_dsphalo(a,desc_a,blk,info,rwcnv,clcnv,cliprow,outfmt,data) tmp%fida='COO' call psb_sp_setifld(psb_spmat_asb_,psb_state_,tmp,info) - t2 = mpi_wtime() + t2 = psb_wtime() l1 = 0 ipx = 1 @@ -284,7 +284,7 @@ Subroutine psb_dsphalo(a,desc_a,blk,info,rwcnv,clcnv,cliprow,outfmt,data) goto 9999 end if - t3 = mpi_wtime() + t3 = psb_wtime() ! @@ -334,7 +334,7 @@ Subroutine psb_dsphalo(a,desc_a,blk,info,rwcnv,clcnv,cliprow,outfmt,data) close(50+me) call psb_barrier(ictxt) end if - t4 = mpi_wtime() + t4 = psb_wtime() if(debug) Write(0,*)me,'End first loop',counter,l1,blk%m @@ -361,7 +361,7 @@ Subroutine psb_dsphalo(a,desc_a,blk,info,rwcnv,clcnv,cliprow,outfmt,data) call psb_errpush(info,name,a_err=ch_err) goto 9999 end select - t5 = mpi_wtime() + t5 = psb_wtime() diff --git a/base/tools/psb_zcsrp.f90 b/base/tools/psb_zcsrp.f90 index 54941c6a..115c125e 100644 --- a/base/tools/psb_zcsrp.f90 +++ b/base/tools/psb_zcsrp.f90 @@ -82,11 +82,10 @@ subroutine psb_zcsrp(trans,iperm,a, desc_a, info) integer :: ictxt,n_row,err_act, int_err(5) character(len=20) :: name, char_err - real(kind(1.d0)) :: time(10), mpi_wtime - external mpi_wtime + real(kind(1.d0)) :: time(10) logical, parameter :: debug=.false. - time(1) = mpi_wtime() + time(1) = psb_wtime() ictxt = psb_cd_get_context(desc_a) dectype = psb_cd_get_dectype(desc_a) @@ -169,7 +168,7 @@ subroutine psb_zcsrp(trans,iperm,a, desc_a, info) deallocate(ipt,work_dcsdp) - time(4) = mpi_wtime() + time(4) = psb_wtime() time(4) = time(4) - time(3) if (debug) then call psb_amx(ictxt, time(4)) diff --git a/base/tools/psb_zspcnv.f90 b/base/tools/psb_zspcnv.f90 index 73790c48..5e7f49d2 100644 --- a/base/tools/psb_zspcnv.f90 +++ b/base/tools/psb_zspcnv.f90 @@ -110,8 +110,6 @@ subroutine psb_zspcnv(a,b,desc_a,info) integer :: ictxt,n_row character :: check*1, trans*1, unitd*1 - real(kind(1.d0)) :: time(10), mpi_wtime - external mpi_wtime logical, parameter :: debug=.false. character(len=20) :: name, ch_err @@ -120,7 +118,6 @@ subroutine psb_zspcnv(a,b,desc_a,info) name = 'psb_zspcnv' call psb_erractionsave(err_act) - time(1) = mpi_wtime() ictxt = psb_cd_get_context(desc_a) dectype = psb_cd_get_dectype(desc_a) diff --git a/base/tools/psb_zsphalo.f90 b/base/tools/psb_zsphalo.f90 index fbdabccc..f45ca835 100644 --- a/base/tools/psb_zsphalo.f90 +++ b/base/tools/psb_zsphalo.f90 @@ -103,7 +103,7 @@ Subroutine psb_zsphalo(a,desc_a,blk,info,rwcnv,clcnv,outfmt) Call psb_info(ictxt, me, np) - t1 = mpi_wtime() + t1 = psb_wtime() Allocate(sdid(np,3),rvid(np,3),brvindx(np+1),& & rvsz(np),sdsz(np),bsdindx(np+1),stat=info) @@ -191,7 +191,7 @@ Subroutine psb_zsphalo(a,desc_a,blk,info,rwcnv,clcnv,outfmt) tmp%fida='COO' call psb_sp_setifld(psb_spmat_asb_,psb_state_,tmp,info) - t2 = mpi_wtime() + t2 = psb_wtime() l1 = 0 ipx = 1 @@ -253,7 +253,7 @@ Subroutine psb_zsphalo(a,desc_a,blk,info,rwcnv,clcnv,outfmt) goto 9999 end if - t3 = mpi_wtime() + t3 = psb_wtime() ! @@ -286,7 +286,7 @@ Subroutine psb_zsphalo(a,desc_a,blk,info,rwcnv,clcnv,outfmt) !!$ open(50+me) !!$ call csprt(50+me,blk,head='% SPHALO border .') !!$ close(50+me) - t4 = mpi_wtime() + t4 = psb_wtime() if(debug) Write(0,*)me,'End first loop',counter,l1,blk%m @@ -309,7 +309,7 @@ Subroutine psb_zsphalo(a,desc_a,blk,info,rwcnv,clcnv,outfmt) case default write(0,*) 'Error in DSPHALO : invalid outfmt "',outfmt_,'"' end select - t5 = mpi_wtime() + t5 = psb_wtime() diff --git a/baseprec/psb_dbaseprc_aply.f90 b/baseprec/psb_dbaseprc_aply.f90 index a681b975..f3fa9f75 100644 --- a/baseprec/psb_dbaseprc_aply.f90 +++ b/baseprec/psb_dbaseprc_aply.f90 @@ -51,9 +51,8 @@ subroutine psb_dbaseprc_aply(alpha,prec,x,beta,y,desc_data,trans,work,info) real(kind(1.d0)), pointer :: ww(:), aux(:), tx(:),ty(:) character ::diagl, diagu integer :: ictxt,np,me,i, isz, nrg, err_act - real(kind(1.d0)) :: t1, t2, t3, t4, t5, t6, t7, mpi_wtime + real(kind(1.d0)) :: t1, t2, t3, t4, t5, t6, t7 logical,parameter :: debug=.false., debugprt=.false. - external mpi_wtime character(len=20) :: name, ch_err interface psb_bjac_aply diff --git a/baseprec/psb_dbjac_aply.f90 b/baseprec/psb_dbjac_aply.f90 index 604ca0e1..8addae4c 100644 --- a/baseprec/psb_dbjac_aply.f90 +++ b/baseprec/psb_dbjac_aply.f90 @@ -53,9 +53,8 @@ subroutine psb_dbjac_aply(alpha,prec,x,beta,y,desc_data,trans,work,info) real(kind(1.d0)), pointer :: ww(:), aux(:), tx(:),ty(:),tb(:) character ::diagl, diagu integer :: ictxt,np,me,i, nrg, err_act, int_err(5) - real(kind(1.d0)) :: t1, t2, t3, t4, t5, t6, t7, mpi_wtime + real(kind(1.d0)) :: t1, t2, t3, t4, t5, t6, t7 logical,parameter :: debug=.false., debugprt=.false. - external mpi_wtime character(len=20) :: name, ch_err name='psb_bjac_aply' diff --git a/baseprec/psb_dilu_bld.f90 b/baseprec/psb_dilu_bld.f90 index f6684ce7..b60a0fd4 100644 --- a/baseprec/psb_dilu_bld.f90 +++ b/baseprec/psb_dilu_bld.f90 @@ -46,8 +46,7 @@ subroutine psb_dilu_bld(a,desc_a,p,upd,info) integer :: int_err(5) character :: trans, unitd type(psb_dspmat_type) :: blck, atmp - real(kind(1.d0)) :: t1,t2,t3,t4,t5,t6,mpi_wtime, t7, t8 - external mpi_wtime + real(kind(1.d0)) :: t1,t2,t3,t4,t5,t6, t7, t8 logical, parameter :: debugprt=.false., debug=.false., aggr_dump=.false. integer nztota, nztotb, nztmp, nzl, nnr, ir, err_act,& & n_row, nrow_a,n_col, nhalo, ind, iind, i1,i2,ia @@ -172,7 +171,7 @@ subroutine psb_dilu_bld(a,desc_a,p,upd,info) goto 9999 end if - t3 = mpi_wtime() + t3 = psb_wtime() if (debugprt) then call psb_barrier(ictxt) open(40+me) @@ -185,7 +184,7 @@ subroutine psb_dilu_bld(a,desc_a,p,upd,info) ! ! Ok, factor the matrix. ! - t5 = mpi_wtime() + t5 = psb_wtime() blck%m=0 call psb_ilu_fct(atmp,p%av(l_pr_),p%av(u_pr_),p%d,info) if(info/=0) then @@ -205,7 +204,7 @@ subroutine psb_dilu_bld(a,desc_a,p,upd,info) else if (p%iprcparm(iren_) == 0) then - t3 = mpi_wtime() + t3 = psb_wtime() ! This is where we have mo renumbering, thus no need ! for ATMP @@ -217,7 +216,7 @@ subroutine psb_dilu_bld(a,desc_a,p,upd,info) close(40+me) endif - t5= mpi_wtime() + t5= psb_wtime() if (debug) write(0,*) me,' Going for ilu_fct' if (debug) call psb_barrier(ictxt) call psb_ilu_fct(a,p%av(l_pr_),p%av(u_pr_),p%d,info) @@ -249,7 +248,7 @@ subroutine psb_dilu_bld(a,desc_a,p,upd,info) ! ierr = MPE_Log_event( ifcte, 0, "st SIMPLE" ) - t6 = mpi_wtime() + t6 = psb_wtime() ! ! write(0,'(i3,1x,a,3(1x,g18.9))') me,'renum/factor time',t3-t2,t6-t5 ! if (me==0) write(0,'(a,3(1x,g18.9))') 'renum/factor time',t3-t2,t6-t5 diff --git a/baseprec/psb_dprc_aply.f90 b/baseprec/psb_dprc_aply.f90 index 398f658a..de03bc89 100644 --- a/baseprec/psb_dprc_aply.f90 +++ b/baseprec/psb_dprc_aply.f90 @@ -46,7 +46,6 @@ subroutine psb_dprc_aply(prec,x,y,desc_data,info,trans, work) real(kind(1.d0)), pointer :: work_(:) integer :: ictxt,np,me,err_act logical,parameter :: debug=.false., debugprt=.false. - external mpi_wtime character(len=20) :: name interface psb_baseprc_aply diff --git a/baseprec/psb_dsp_renum.f90 b/baseprec/psb_dsp_renum.f90 index fd80d674..e038ac61 100644 --- a/baseprec/psb_dsp_renum.f90 +++ b/baseprec/psb_dsp_renum.f90 @@ -47,8 +47,7 @@ subroutine psb_dsp_renum(a,desc_a,p,atmp,info) integer ::ictxt,np,me, err_act integer, allocatable :: itmp(:), itmp2(:) real(kind(1.d0)), allocatable :: rtmp(:) - real(kind(1.d0)) :: t1,t2,t3,t4,t5,t6,mpi_wtime, t7, t8 - external mpi_wtime + real(kind(1.d0)) :: t1,t2,t3,t4,t5,t6, t7, t8 if (psb_get_errstatus().ne.0) return info=0 @@ -97,7 +96,7 @@ subroutine psb_dsp_renum(a,desc_a,p,atmp,info) do k=1, nnr p%invperm(p%perm(k)) = k enddo - t3 = mpi_wtime() + t3 = psb_wtime() ! Build ATMP with new numbering. nztmp=size(atmp%aspk) @@ -148,7 +147,7 @@ subroutine psb_dsp_renum(a,desc_a,p,atmp,info) enddo - t4 = mpi_wtime() + t4 = psb_wtime() deallocate(itmp,itmp2,rtmp) @@ -221,7 +220,7 @@ subroutine psb_dsp_renum(a,desc_a,p,atmp,info) do k=1, nnr p%invperm(p%perm(k)) = k enddo - t3 = mpi_wtime() + t3 = psb_wtime() ! Build ATMP with new numbering. @@ -271,7 +270,7 @@ subroutine psb_dsp_renum(a,desc_a,p,atmp,info) enddo - t4 = mpi_wtime() + t4 = psb_wtime() diff --git a/baseprec/psb_zbaseprc_aply.f90 b/baseprec/psb_zbaseprc_aply.f90 index f4ef8f69..824a288c 100644 --- a/baseprec/psb_zbaseprc_aply.f90 +++ b/baseprec/psb_zbaseprc_aply.f90 @@ -51,9 +51,8 @@ subroutine psb_zbaseprc_aply(alpha,prec,x,beta,y,desc_data,trans,work,info) complex(kind(1.d0)), pointer :: ww(:), aux(:), tx(:),ty(:) character ::diagl, diagu integer :: ictxt,np,me,i, isz, nrg, err_act - real(kind(1.d0)) :: t1, t2, t3, t4, t5, t6, t7, mpi_wtime - logical,parameter :: debug=.false., debugprt=.false. - external mpi_wtime + real(kind(1.d0)) :: t1, t2, t3, t4, t5, t6, t7 + logical,parameter :: debug=.false., debugprt=. character(len=20) :: name, ch_err interface psb_bjac_aply diff --git a/baseprec/psb_zbjac_aply.f90 b/baseprec/psb_zbjac_aply.f90 index fd34710d..108e1aae 100644 --- a/baseprec/psb_zbjac_aply.f90 +++ b/baseprec/psb_zbjac_aply.f90 @@ -53,9 +53,8 @@ subroutine psb_zbjac_aply(alpha,prec,x,beta,y,desc_data,trans,work,info) complex(kind(1.d0)), pointer :: ww(:), aux(:), tx(:),ty(:),tb(:) character ::diagl, diagu integer :: ictxt,np,me,i, isz, nrg, err_act, int_err(5) - real(kind(1.d0)) :: t1, t2, t3, t4, t5, t6, t7, mpi_wtime + real(kind(1.d0)) :: t1, t2, t3, t4, t5, t6, t7 logical,parameter :: debug=.false., debugprt=.false. - external mpi_wtime character(len=20) :: name, ch_err name='psb_bjac_aply' diff --git a/baseprec/psb_zilu_bld.f90 b/baseprec/psb_zilu_bld.f90 index ebf3a1f3..04e3e097 100644 --- a/baseprec/psb_zilu_bld.f90 +++ b/baseprec/psb_zilu_bld.f90 @@ -46,8 +46,7 @@ subroutine psb_zilu_bld(a,desc_a,p,upd,info) integer :: int_err(5) character :: trans, unitd type(psb_zspmat_type) :: blck, atmp - real(kind(1.d0)) :: t1,t2,t3,t4,t5,t6,mpi_wtime, t7, t8 - external mpi_wtime + real(kind(1.d0)) :: t1,t2,t3,t4,t5,t6, t7, t8 logical, parameter :: debugprt=.false., debug=.false., aggr_dump=.false. integer nztota, nztotb, nztmp, nzl, nnr, ir, err_act,& & n_row, nrow_a,n_col, nhalo, ind, iind, i1,i2,ia @@ -172,7 +171,7 @@ subroutine psb_zilu_bld(a,desc_a,p,upd,info) goto 9999 end if - t3 = mpi_wtime() + t3 = psb_wtime() if (debugprt) then call psb_barrier(ictxt) open(40+me) @@ -185,7 +184,7 @@ subroutine psb_zilu_bld(a,desc_a,p,upd,info) ! ! Ok, factor the matrix. ! - t5 = mpi_wtime() + t5 = psb_wtime() blck%m=0 call psb_ilu_fct(atmp,p%av(l_pr_),p%av(u_pr_),p%d,info) if(info/=0) then @@ -205,7 +204,7 @@ subroutine psb_zilu_bld(a,desc_a,p,upd,info) else if (p%iprcparm(iren_) == 0) then - t3 = mpi_wtime() + t3 = psb_wtime() ! This is where we have mo renumbering, thus no need ! for ATMP @@ -217,7 +216,7 @@ subroutine psb_zilu_bld(a,desc_a,p,upd,info) close(40+me) endif - t5= mpi_wtime() + t5= psb_wtime() if (debug) write(0,*) me,' Going for ilu_fct' if (debug) call psb_barrier(ictxt) call psb_ilu_fct(a,p%av(l_pr_),p%av(u_pr_),p%d,info) @@ -249,7 +248,7 @@ subroutine psb_zilu_bld(a,desc_a,p,upd,info) ! ierr = MPE_Log_event( ifcte, 0, "st SIMPLE" ) - t6 = mpi_wtime() + t6 = psb_wtime() ! ! write(0,'(i3,1x,a,3(1x,g18.9))') me,'renum/factor time',t3-t2,t6-t5 ! if (me==0) write(0,'(a,3(1x,g18.9))') 'renum/factor time',t3-t2,t6-t5 diff --git a/baseprec/psb_zprc_aply.f90 b/baseprec/psb_zprc_aply.f90 index b17d22f9..b3db94e6 100644 --- a/baseprec/psb_zprc_aply.f90 +++ b/baseprec/psb_zprc_aply.f90 @@ -46,7 +46,6 @@ subroutine psb_zprc_aply(prec,x,y,desc_data,info,trans, work) complex(kind(1.d0)), pointer :: work_(:) integer :: ictxt,np,me,err_act logical,parameter :: debug=.false., debugprt=.false. - external mpi_wtime character(len=20) :: name interface psb_baseprc_aply diff --git a/baseprec/psb_zsp_renum.f90 b/baseprec/psb_zsp_renum.f90 index 1cf7b1f2..76107607 100644 --- a/baseprec/psb_zsp_renum.f90 +++ b/baseprec/psb_zsp_renum.f90 @@ -47,8 +47,7 @@ subroutine psb_zsp_renum(a,desc_a,p,atmp,info) integer ::ictxt,np,me, err_act integer, allocatable :: itmp(:), itmp2(:) complex(kind(1.d0)), allocatable :: ztmp(:) - real(kind(1.d0)) :: t1,t2,t3,t4,t5,t6,mpi_wtime, t7, t8 - external mpi_wtime + real(kind(1.d0)) :: t1,t2,t3,t4,t5,t6, t7, t8 if (psb_get_errstatus().ne.0) return info=0 @@ -95,7 +94,7 @@ subroutine psb_zsp_renum(a,desc_a,p,atmp,info) do k=1, nnr p%invperm(p%perm(k)) = k enddo - t3 = mpi_wtime() + t3 = psb_wtime() ! Build ATMP with new numbering. nztmp=size(atmp%aspk) @@ -145,7 +144,7 @@ subroutine psb_zsp_renum(a,desc_a,p,atmp,info) enddo - t4 = mpi_wtime() + t4 = psb_wtime() deallocate(itmp,itmp2,ztmp) @@ -219,7 +218,7 @@ subroutine psb_zsp_renum(a,desc_a,p,atmp,info) do k=1, nnr p%invperm(p%perm(k)) = k enddo - t3 = mpi_wtime() + t3 = psb_wtime() ! Build ATMP with new numbering. @@ -269,7 +268,7 @@ subroutine psb_zsp_renum(a,desc_a,p,atmp,info) enddo - t4 = mpi_wtime() + t4 = psb_wtime()