diff --git a/psb_dasmatbld.f90 b/psb_dasmatbld.f90 index 65b8fda3..63c1a38e 100644 --- a/psb_dasmatbld.f90 +++ b/psb_dasmatbld.f90 @@ -68,8 +68,7 @@ Subroutine psb_dasmatbld(ptype,novr,a,blk,desc_data,upd,desc_p,info,outfmt) character(len=5), optional :: outfmt - real(kind(1.d0)) :: t1,t2,t3,mpi_wtime - external mpi_wtime + real(kind(1.d0)) :: t1,t2,t3 integer icomm ! .. Local Scalars .. @@ -170,7 +169,7 @@ Subroutine psb_dasmatbld(ptype,novr,a,blk,desc_data,upd,desc_p,info,outfmt) call psb_get_mpicomm(ictxt,icomm) If(debug)Write(0,*)'BEGIN dasmatbld',me,upd,novr - t1 = mpi_wtime() + t1 = psb_wtime() If (upd == 'F') Then ! @@ -190,7 +189,7 @@ Subroutine psb_dasmatbld(ptype,novr,a,blk,desc_data,upd,desc_p,info,outfmt) n_row = desc_p%matrix_data(psb_n_row_) - t2 = mpi_wtime() + t2 = psb_wtime() !!$ open(60+me) !!$ call psb_cdprt(60+me,desc_p,short=.false.) !!$ call flush(60+me) @@ -220,7 +219,7 @@ Subroutine psb_dasmatbld(ptype,novr,a,blk,desc_data,upd,desc_p,info,outfmt) if (debug) write(0,*) 'After psb_sphalo ',blk%fida,blk%m,psb_nnz_,blk%infoa(psb_nnz_) !!$ ierr = MPE_Log_event( iovre, 0, "ed OVR" ) - t3 = mpi_wtime() + t3 = psb_wtime() if (debugprt) then open(40+me) call psb_csprt(40+me,blk,head='% Ovrlap rows') diff --git a/psb_dbaseprc_aply.f90 b/psb_dbaseprc_aply.f90 index fcc220a5..393f045a 100644 --- a/psb_dbaseprc_aply.f90 +++ b/psb_dbaseprc_aply.f90 @@ -57,9 +57,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/psb_dbjac_aply.f90 b/psb_dbjac_aply.f90 index ab351b93..81ab3cc4 100644 --- a/psb_dbjac_aply.f90 +++ b/psb_dbjac_aply.f90 @@ -59,9 +59,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/psb_dilu_bld.f90 b/psb_dilu_bld.f90 index 7e22984d..6d1e21c0 100644 --- a/psb_dilu_bld.f90 +++ b/psb_dilu_bld.f90 @@ -67,8 +67,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 @@ -143,7 +142,7 @@ subroutine psb_dilu_bld(a,desc_a,p,upd,info) call psb_nullify_sp(blck) call psb_nullify_sp(atmp) - t1= mpi_wtime() + t1= psb_wtime() if(debug) write(0,*)me,': calling psb_asmatbld',p%iprcparm(p_type_),p%iprcparm(n_ovr_) if (debug) call psb_barrier(ictxt) @@ -155,7 +154,7 @@ subroutine psb_dilu_bld(a,desc_a,p,upd,info) call psb_errpush(info,name,a_err=ch_err) goto 9999 end if - t2= mpi_wtime() + t2= psb_wtime() if (debug) write(0,*)me,': out of psb_asmatbld' if (debug) call psb_barrier(ictxt) @@ -240,7 +239,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) @@ -253,7 +252,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,blck=blck) if(info/=0) then @@ -273,7 +272,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 @@ -289,7 +288,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,blck=blck) @@ -323,7 +322,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/psb_dmlprc_aply.f90 b/psb_dmlprc_aply.f90 index 257eba21..3f675b07 100644 --- a/psb_dmlprc_aply.f90 +++ b/psb_dmlprc_aply.f90 @@ -102,10 +102,9 @@ subroutine psb_dmlprc_aply(alpha,baseprecv,x,beta,y,desc_data,trans,work,info) character ::diagl, diagu integer :: ictxt,np,me,i, isz, nrg,nr2l,err_act, iptype, int_err(5) real(kind(1.d0)) :: omega - 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. integer :: ismth, nlev, ilev - external mpi_wtime character(len=20) :: name, ch_err type psb_mlprec_wrk_type diff --git a/psb_dprc_aply.f90 b/psb_dprc_aply.f90 index c64e4fe7..89b3a2c6 100644 --- a/psb_dprc_aply.f90 +++ b/psb_dprc_aply.f90 @@ -52,7 +52,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/psb_dsp_renum.f90 b/psb_dsp_renum.f90 index 532d0a5c..93d50b79 100644 --- a/psb_dsp_renum.f90 +++ b/psb_dsp_renum.f90 @@ -53,8 +53,7 @@ subroutine psb_dsp_renum(a,desc_a,blck,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 @@ -103,7 +102,7 @@ subroutine psb_dsp_renum(a,desc_a,blck,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) @@ -180,7 +179,7 @@ subroutine psb_dsp_renum(a,desc_a,blck,p,atmp,info) enddo - t4 = mpi_wtime() + t4 = psb_wtime() deallocate(itmp,itmp2,rtmp) @@ -263,7 +262,7 @@ subroutine psb_dsp_renum(a,desc_a,blck,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. @@ -340,7 +339,7 @@ subroutine psb_dsp_renum(a,desc_a,blck,p,atmp,info) enddo - t4 = mpi_wtime() + t4 = psb_wtime() diff --git a/psb_zasmatbld.f90 b/psb_zasmatbld.f90 index ff176981..a46548d5 100644 --- a/psb_zasmatbld.f90 +++ b/psb_zasmatbld.f90 @@ -68,8 +68,7 @@ Subroutine psb_zasmatbld(ptype,novr,a,blk,desc_data,upd,desc_p,info,outfmt) character(len=5), optional :: outfmt - real(kind(1.d0)) :: t1,t2,t3,mpi_wtime - external mpi_wtime + real(kind(1.d0)) :: t1,t2,t3 integer icomm ! .. Local Scalars .. @@ -170,7 +169,7 @@ Subroutine psb_zasmatbld(ptype,novr,a,blk,desc_data,upd,desc_p,info,outfmt) Call psb_info(ictxt, me, np) If(debug)Write(0,*)'BEGIN dasmatbld',me,upd,novr - t1 = mpi_wtime() + t1 = psb_wtime() If (upd == 'F') Then ! @@ -189,7 +188,7 @@ Subroutine psb_zasmatbld(ptype,novr,a,blk,desc_data,upd,desc_p,info,outfmt) n_row = desc_p%matrix_data(psb_n_row_) - t2 = mpi_wtime() + t2 = psb_wtime() if (debug) write(0,*) 'Before sphalo ',blk%fida,blk%m,psb_nnz_,blk%infoa(psb_nnz_) @@ -211,7 +210,7 @@ Subroutine psb_zasmatbld(ptype,novr,a,blk,desc_data,upd,desc_p,info,outfmt) if (debug) write(0,*) 'After psb_sphalo ',blk%fida,blk%m,psb_nnz_,blk%infoa(psb_nnz_) - t3 = mpi_wtime() + t3 = psb_wtime() if (debugprt) then open(40+me) call psb_csprt(40+me,blk,head='% Ovrlap rows') diff --git a/psb_zbaseprc_aply.f90 b/psb_zbaseprc_aply.f90 index 1e55cc99..ef999ebc 100644 --- a/psb_zbaseprc_aply.f90 +++ b/psb_zbaseprc_aply.f90 @@ -56,9 +56,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 + 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/psb_zbjac_aply.f90 b/psb_zbjac_aply.f90 index aa228e0d..f92d589a 100644 --- a/psb_zbjac_aply.f90 +++ b/psb_zbjac_aply.f90 @@ -59,9 +59,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/psb_zilu_bld.f90 b/psb_zilu_bld.f90 index f7a2673f..6a14bb2d 100644 --- a/psb_zilu_bld.f90 +++ b/psb_zilu_bld.f90 @@ -67,8 +67,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 @@ -143,7 +142,7 @@ subroutine psb_zilu_bld(a,desc_a,p,upd,info) call psb_nullify_sp(blck) call psb_nullify_sp(atmp) - t1= mpi_wtime() + t1= psb_wtime() if(debug) write(0,*)me,': calling psb_asmatbld',p%iprcparm(p_type_),p%iprcparm(n_ovr_) if (debug) call psb_barrier(ictxt) @@ -155,7 +154,7 @@ subroutine psb_zilu_bld(a,desc_a,p,upd,info) call psb_errpush(info,name,a_err=ch_err) goto 9999 end if - t2= mpi_wtime() + t2= psb_wtime() if (debug) write(0,*)me,': out of psb_asmatbld' if (debug) call psb_barrier(ictxt) @@ -240,7 +239,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) @@ -253,7 +252,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,blck=blck) if(info/=0) then @@ -273,7 +272,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 @@ -289,7 +288,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,blck=blck) @@ -321,7 +320,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/psb_zmlprc_aply.f90 b/psb_zmlprc_aply.f90 index 01d0bcdc..2d09808b 100644 --- a/psb_zmlprc_aply.f90 +++ b/psb_zmlprc_aply.f90 @@ -101,10 +101,9 @@ subroutine psb_zmlprc_aply(alpha,baseprecv,x,beta,y,desc_data,trans,work,info) character ::diagl, diagu integer :: ictxt,np,me,i, isz, nrg,nr2l,err_act, iptype, int_err(5) real(kind(1.d0)) :: omega - 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. integer :: ismth, nlev, ilev - external mpi_wtime character(len=20) :: name, ch_err type psb_mlprec_wrk_type diff --git a/psb_zprc_aply.f90 b/psb_zprc_aply.f90 index 46b825ff..70ebc1ec 100644 --- a/psb_zprc_aply.f90 +++ b/psb_zprc_aply.f90 @@ -52,7 +52,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/psb_zsp_renum.f90 b/psb_zsp_renum.f90 index 0f1c1638..05683992 100644 --- a/psb_zsp_renum.f90 +++ b/psb_zsp_renum.f90 @@ -53,8 +53,7 @@ subroutine psb_zsp_renum(a,desc_a,blck,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 @@ -101,7 +100,7 @@ subroutine psb_zsp_renum(a,desc_a,blck,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) @@ -178,7 +177,7 @@ subroutine psb_zsp_renum(a,desc_a,blck,p,atmp,info) enddo - t4 = mpi_wtime() + t4 = psb_wtime() deallocate(itmp,itmp2,ztmp) @@ -262,7 +261,7 @@ subroutine psb_zsp_renum(a,desc_a,blck,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. @@ -339,7 +338,7 @@ subroutine psb_zsp_renum(a,desc_a,blck,p,atmp,info) enddo - t4 = mpi_wtime() + t4 = psb_wtime()