From 3d112ab26caacbdb9fdd46c73c8ac2cf1feca536 Mon Sep 17 00:00:00 2001 From: Joe Taylor Date: Sun, 1 Feb 2015 20:11:10 +0000 Subject: [PATCH] Change some calls to timer(). git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4921 ab8295b8-cf94-4d9e-aec4-7959e3be5d79 --- lib/decjt9.f90 | 1 - lib/decoder.f90 | 6 ++++++ lib/downsam9.f90 | 4 ---- lib/softsym.f90 | 4 ---- 4 files changed, 6 insertions(+), 9 deletions(-) diff --git a/lib/decjt9.f90 b/lib/decjt9.f90 index 1dd1e60f9..d39fdc901 100644 --- a/lib/decjt9.f90 +++ b/lib/decjt9.f90 @@ -83,7 +83,6 @@ subroutine decjt9(ss,id2,nutc,nfqso,newdat,npts8,nfa,nfsplit,nfb,ntol, & call timer('softsym ',0) fpk=nf0 + df3*(i-1) - call softsym(id2,npts8,nsps8,newdat,fpk,syncpk,snrdb,xdt, & freq,drift,schk,i1SoftSymbols) call timer('softsym ',1) diff --git a/lib/decoder.f90 b/lib/decoder.f90 index 9488d138a..d65a4e890 100644 --- a/lib/decoder.f90 +++ b/lib/decoder.f90 @@ -41,7 +41,9 @@ subroutine decoder(ss,id2) if(newdat.ne.0) dd(1:npts65)=id2(1:npts65) nf1=nfa nf2=nfb + call timer('jt65a ',0) call jt65a(dd,npts65,newdat,nutc,nf1,nf2,nfqso,ntol65,nagain,ndecoded) + call timer('jt65a ',1) done65=.true. endif @@ -53,8 +55,10 @@ subroutine decoder(ss,id2) !!$OMP SECTION ! print*,'B' + call timer('decjt9 ',0) call decjt9(ss,id2,nutc,nfqso,newdat,npts8,nfa,nfsplit,nfb,ntol,nzhsym, & nagain,ndepth,nmode) + call timer('decjt9 ',1) !!$OMP SECTION if(nmode.ge.65 .and. (.not.done65)) then @@ -62,7 +66,9 @@ subroutine decoder(ss,id2) nf1=nfa nf2=nfb ! print*,'C' + call timer('jt65a ',0) call jt65a(dd,npts65,newdat,nutc,nf1,nf2,nfqso,ntol65,nagain,ndecoded) + call timer('jt65a ',1) endif !!$OMP END SECTIONS NOWAIT diff --git a/lib/downsam9.f90 b/lib/downsam9.f90 index 4ae36fa64..ac9e1855a 100644 --- a/lib/downsam9.f90 +++ b/lib/downsam9.f90 @@ -73,9 +73,7 @@ subroutine downsam9(id2,npts8,nsps8,newdat,nspsd,fpk,c2,nz2) nw=100 ia=max(1,nf-nw) ib=min(5000,nf+nw) - call timer('pctile_1',0) call pctile(s(ia),ib-ia+1,40,avenoise) - call timer('pctile_1',1) fac=sqrt(1.0/avenoise) do i=0,nfft2-1 @@ -83,9 +81,7 @@ subroutine downsam9(id2,npts8,nsps8,newdat,nspsd,fpk,c2,nz2) if(i.gt.nh2) j=j-nfft2 c2(i)=fac*c1(j) enddo - call timer('FFTsmal9',0) call four2a(c2,nfft2,1,1,1) !FFT back to time domain - call timer('FFTsmal9',1) nz2=8*npts8/ndown return diff --git a/lib/softsym.f90 b/lib/softsym.f90 index 8eda5e73c..2e7c32ffa 100644 --- a/lib/softsym.f90 +++ b/lib/softsym.f90 @@ -19,9 +19,7 @@ subroutine softsym(id2,npts8,nsps8,newdat,fpk,syncpk,snrdb,xdt, & call downsam9(id2,npts8,nsps8,newdat,nspsd,fpk,c2,nz2) call timer('downsam9',1) - call timer('peakdt9 ',0) call peakdt9(c2,nz2,nsps8,nspsd,c3,nz3,xdt) !Find DT - call timer('peakdt9 ',1) fsample=1500.0/ndown a=0. @@ -42,9 +40,7 @@ subroutine softsym(id2,npts8,nsps8,newdat,fpk,syncpk,snrdb,xdt, & call timer('symspec2',1) ! Remove interleaving - call timer('interlv9',0) call interleave9(i1SoftSymbolsScrambled,-1,i1SoftSymbols) - call timer('interlv9',1) return end subroutine softsym