From ba44a4125a664dcd1e29360887dc349f6ff108b5 Mon Sep 17 00:00:00 2001 From: Joe Taylor Date: Sat, 24 Dec 2005 13:12:34 +0000 Subject: [PATCH] Reverted to Fortran four2 to fix multi-threading problem with FFTW3. git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/WSJT/trunk@13 ab8295b8-cf94-4d9e-aec4-7959e3be5d79 --- fsubs.f | 3 ++- sync.f | 7 +++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/fsubs.f b/fsubs.f index 2bddf1902..1b9f369be 100644 --- a/fsubs.f +++ b/fsubs.f @@ -19,7 +19,8 @@ include 'flat1.f' #ifdef Win32 - include 'four2a.f' +! include 'four2a.f' !Multi-threading problems with FFTW3 + include 'four2.f' #else include 'four2.f' include 'rfile2.f' diff --git a/sync.f b/sync.f index 450857261..d8b317c1f 100644 --- a/sync.f +++ b/sync.f @@ -3,20 +3,19 @@ C Input data are in the y# arrays: detected sigs in four tone-channels, C before decimation by NSPD. - parameter (NSPDMAX=200) + parameter (NSPD=25) real y1(npts) real y2(npts) real y3(npts) real y4(npts) - real zf(NSPDMAX) + real zf(NSPD) complex csum - integer nsum(NSPDMAX) + integer nsum(NSPD) real z(65538) !Ready for FSK110 complex cz(0:32768) equivalence (z,cz) data twopi/6.283185307/ - NSPD=25 do i=1,NSPD zf(i)=0.0 nsum(i)=0