From 83fddb1f578d134e6fbdcb5da94ab26c7461eb8a Mon Sep 17 00:00:00 2001 From: Joe Taylor Date: Mon, 29 Jun 2020 12:21:34 -0400 Subject: [PATCH] Pass more parameters to fst240_decode(). --- lib/decoder.f90 | 3 ++- lib/fst240_decode.f90 | 8 +++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/lib/decoder.f90 b/lib/decoder.f90 index dee9044de..0266dc2a6 100644 --- a/lib/decoder.f90 +++ b/lib/decoder.f90 @@ -193,7 +193,8 @@ subroutine multimode_decoder(ss,id2,params,nfsample) call my_fst240%decode(fst240_decoded,id2,params%nutc, & params%nQSOProgress,params%nfqso,params%nfa,params%nfb, & params%nsubmode,params%ndepth,params%ntr,params%nexp_decode, & - params%ntol) + params%ntol,params%nzhsym,params%emedelay, & + logical(params%lapcqonly),params%napwid,mycall,hiscall) call timer('dec240 ',1) go to 800 endif diff --git a/lib/fst240_decode.f90 b/lib/fst240_decode.f90 index aaf422911..1347654a4 100644 --- a/lib/fst240_decode.f90 +++ b/lib/fst240_decode.f90 @@ -27,7 +27,8 @@ module fst240_decode contains subroutine decode(this,callback,iwave,nutc,nQSOProgress,nfqso, & - nfa,nfb,nsubmode,ndeep,ntrperiod,nexp_decode,ntol) + nfa,nfb,nsubmode,ndeep,ntrperiod,nexp_decode,ntol,nzhsym, & + emedelay,lapcqonly,napwid,mycall,hiscall) use timer_module, only: timer use packjt77 @@ -38,6 +39,7 @@ contains character*37 decodes(100) character*37 msg character*77 c77 + character*12 mycall,hiscall complex, allocatable :: c2(:) complex, allocatable :: cframe(:) complex, allocatable :: c_bigfft(:) !Complex waveform @@ -46,6 +48,7 @@ contains real candidates(100,4) real bitmetrics(320,4) real s4(0:3,NN) + logical lapcqonly integer itone(NN) integer hmod integer*1 apmask(240),cw(240) @@ -58,6 +61,9 @@ contains 1,0,0,1,0,1,1,0,0,0,0,1,0,0,0,1,0,1,0,0,1,1,1,1,0,0,1,0,1, & 0,1,0,1,0,1,1,0,1,1,1,1,1,0,0,0,1,0,1/ + write(*,3001) nzhsym,emedelay,lapcqonly,napwid,mycall,hiscall +3001 format(i4,f6.1,L3,i3,2x,2a12) + this%callback => callback hmod=2**nsubmode if(nfqso+nqsoprogress.eq.-999) return