From 073e644f1278065efa497f11e7e292d1dad0a968 Mon Sep 17 00:00:00 2001 From: Joe Taylor Date: Mon, 16 Sep 2024 10:36:03 -0400 Subject: [PATCH] Reconcile sync8.f90 between superfoxtx branch and sfox5b. --- lib/ft8/ft8d.f90 | 2 +- lib/ft8/sync8.f90 | 6 +++--- lib/ft8_decode.f90 | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/lib/ft8/ft8d.f90 b/lib/ft8/ft8d.f90 index daee7b2b8..4d1071352 100644 --- a/lib/ft8/ft8d.f90 +++ b/lib/ft8/ft8d.f90 @@ -42,7 +42,7 @@ program ft8d j2=index(infile,'.wav') read(infile(j2-6:j2-1),*) nutc datetime=infile(j2-13:j2-1) - call sync8(iwave,nfa,nfb,nfqso,s,candidate,ncand) + call sync8(iwave,NMAX,nfa,nfb,nfqso,s,candidate,ncand) syncmin=2.0 dd=iwave do icand=1,ncand diff --git a/lib/ft8/sync8.f90 b/lib/ft8/sync8.f90 index 7aff8f091..be84db236 100644 --- a/lib/ft8/sync8.f90 +++ b/lib/ft8/sync8.f90 @@ -1,4 +1,4 @@ -subroutine sync8(dd,nfa,nfb,syncmin,nfqso,maxcand,candidate,ncand,sbase) +subroutine sync8(dd,npts,nfa,nfb,syncmin,nfqso,maxcand,candidate,ncand,sbase) include 'ft8_params.f90' parameter (MAXPRECAND=1000) @@ -9,13 +9,13 @@ subroutine sync8(dd,nfa,nfb,syncmin,nfqso,maxcand,candidate,ncand,sbase) real s(NH1,NHSYM) real savg(NH1) real sbase(NH1) - real x(NFFT1) + real x(NFFT1+2) real sync2d(NH1,-JZ:JZ) real red(NH1) real red2(NH1) real candidate0(3,MAXPRECAND) real candidate(3,maxcand) - real dd(NMAX) + real dd(npts) integer jpeak(NH1) integer jpeak2(NH1) integer indx(NH1) diff --git a/lib/ft8_decode.f90 b/lib/ft8_decode.f90 index c7cc2828f..9b87114e5 100644 --- a/lib/ft8_decode.f90 +++ b/lib/ft8_decode.f90 @@ -44,18 +44,18 @@ contains class(ft8_decoder), intent(inout) :: this procedure(ft8_decode_callback) :: callback - parameter (MAXCAND=600,MAX_EARLY=200) + parameter (MAXCAND=600,MAX_EARLY=200,NPTS=15*12000) real*8 tsec,tseq real sbase(NH1) real candidate(3,MAXCAND) - real dd(15*12000),dd1(15*12000) + real dd(NPTS),dd1(NPTS) logical, intent(in) :: lft8apon,lapcqonly,nagain logical newdat,lsubtract,ldupe,lrefinedt logical*1 ldiskdat logical lsubtracted(MAX_EARLY) character*12 mycall12,hiscall12,call_1,call_2 character*4 grid4 - integer*2 iwave(15*12000) + integer*2 iwave(NPTS) integer apsym2(58),aph10(10) character datetime*13,msg37*37 character*37 allmessages(MAX_EARLY) @@ -192,7 +192,7 @@ contains endif call timer('sync8 ',0) maxc=MAXCAND - call sync8(dd,ifa,ifb,syncmin,nfqso,maxc,candidate,ncand,sbase) + call sync8(dd,NPTS,ifa,ifb,syncmin,nfqso,maxc,candidate,ncand,sbase) call timer('sync8 ',1) do icand=1,ncand sync=candidate(3,icand)