From 31032468a9376ef7471906b6a9c5496d7f0b7a4b Mon Sep 17 00:00:00 2001 From: Joe Taylor Date: Sat, 1 Oct 2016 01:30:41 +0000 Subject: [PATCH] Storage for cdat2 must be on a "per thread" basis. git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7132 ab8295b8-cf94-4d9e-aec4-7959e3be5d79 --- lib/msk144_freq_search.f90 | 3 +-- lib/msk144sync.f90 | 3 ++- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/msk144_freq_search.f90 b/lib/msk144_freq_search.f90 index 5e0baebb2..d4fa1c3e1 100644 --- a/lib/msk144_freq_search.f90 +++ b/lib/msk144_freq_search.f90 @@ -1,5 +1,5 @@ subroutine msk144_freq_search(cdat,fc,if1,if2,delf,nframes,navmask,cb, & - xmax,bestf,cs,xccs) + cdat2,xmax,bestf,cs,xccs) parameter (NSPM=864,NZ=7*NSPM) complex cdat(NZ) @@ -12,7 +12,6 @@ subroutine msk144_freq_search(cdat,fc,if1,if2,delf,nframes,navmask,cb, & real xcc(0:NSPM-1) real xccs(0:NSPM-1) integer navmask(nframes) ! defines which frames to average - save cdat2 navg=sum(navmask) n=nframes*NSPM diff --git a/lib/msk144sync.f90 b/lib/msk144sync.f90 index 0204d52c7..751d99902 100644 --- a/lib/msk144sync.f90 +++ b/lib/msk144sync.f90 @@ -5,6 +5,7 @@ subroutine msk144sync(cdat,nframes,ntol,delf,navmask,npeaks,fc,fest, & parameter (NSPM=864) complex cdat(NSPM*nframes) + complex cdat2(NSPM*nframes,8) complex c(NSPM) !Coherently averaged complex data complex cs(NSPM,8) complex cb(42) !Complex waveform for sync word @@ -68,7 +69,7 @@ subroutine msk144sync(cdat,nframes,ntol,delf,navmask,npeaks,fc,fest, & if2=if1+nstep-1 if(id.eq.nthreads) if2=nint(ntol/delf) call msk144_freq_search(cdat,fc,if1,if2,delf,nframes,navmask,cb, & - xm(id),bf(id),cs(1,id),xccs(1,id)) + cdat2(1,id),xm(id),bf(id),cs(1,id),xccs(1,id)) ! write(73,3002) id,if1,if2,nfreqs,nthreads,bf(id),xm(id) !3002 format(5i5,2f10.3) !$OMP END PARALLEL