w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2025-05-24 10:22:26 -04:00
Code Issues Packages Projects Releases Wiki Activity

More cleanup of global variables and unused arguments.

Browse Source
This commit is contained in:
Joe Taylor 2023-01-23 19:22:34 -05:00
parent aec42afda7
commit afcb034956
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/q65_decode.f90
View File

@ -176,7 +176,7 @@ contains
call timer('q65_dec0',0) call timer('q65_dec0',0)
! Call top-level routine in q65 module: establish sync and try for a ! Call top-level routine in q65 module: establish sync and try for a
! q3 or q0 decode. ! q3 or q0 decode.
call q65_dec0(iavg,nutc,iwave,ntrperiod,nfqso,ntol,lclearave, & call q65_dec0(iavg,iwave,ntrperiod,nfqso,ntol,lclearave, &
emedelay,xdt,f0,snr1,width,dat4,snr2,idec,stageno) emedelay,xdt,f0,snr1,width,dat4,snr2,idec,stageno)
call timer('q65_dec0',1) call timer('q65_dec0',1)
@ -227,7 +227,7 @@ contains
! Call top-level routine in q65 module: establish sync and try for a q3 ! Call top-level routine in q65 module: establish sync and try for a q3
! decode, this time using the cumulative 's1a' symbol spectra. ! decode, this time using the cumulative 's1a' symbol spectra.
iavg=1 iavg=1
call q65_dec0(iavg,nutc,iwave,ntrperiod,nfqso,ntol,lclearave, & call q65_dec0(iavg,iwave,ntrperiod,nfqso,ntol,lclearave, &
emedelay,xdt,f0,snr1,width,dat4,snr2,idec,stageno) emedelay,xdt,f0,snr1,width,dat4,snr2,idec,stageno)
call timer('list_avg',1) call timer('list_avg',1)
@ -244,7 +244,7 @@ contains
call timer('q65_avg ',0) call timer('q65_avg ',0)
iavg=2 iavg=2
call q65_dec0(iavg,nutc,iwave,ntrperiod,nfqso,ntol,lclearave, & call q65_dec0(iavg,iwave,ntrperiod,nfqso,ntol,lclearave, &
emedelay,xdt,f0,snr1,width,dat4,snr2,idec,stageno) emedelay,xdt,f0,snr1,width,dat4,snr2,idec,stageno)
call timer('q65_avg ',1) call timer('q65_avg ',1)
if(idec.ge.0) then if(idec.ge.0) then
@ -258,7 +258,7 @@ contains
call timer('q65_dec0',0) call timer('q65_dec0',0)
! Call top-level routine in q65 module: establish sync and try for a ! Call top-level routine in q65 module: establish sync and try for a
! q3 or q0 decode. ! q3 or q0 decode.
call q65_dec0(iavg,nutc,iwave,ntrperiod,nfqso,ntol,lclearave, & call q65_dec0(iavg,iwave,ntrperiod,nfqso,ntol,lclearave, &
emedelay,xdt,f0,snr1,width,dat4,snr2,idec,stageno) emedelay,xdt,f0,snr1,width,dat4,snr2,idec,stageno)
call timer('q65_dec0',1) call timer('q65_dec0',1)
if(idec.ge.0) then if(idec.ge.0) then

11
lib/qra/q65/q65.f90
View File

@ -2,8 +2,8 @@ module q65
parameter (NSTEP=8) !Number of time bins per symbol in s1, s1a, s1b parameter (NSTEP=8) !Number of time bins per symbol in s1, s1a, s1b
parameter (PLOG_MIN=-242.0) !List decoding threshold parameter (PLOG_MIN=-242.0) !List decoding threshold
integer nsave,nlist,LL0,iz0,jz0 integer iz0,jz0
integer listutc(10) ! integer listutc(10)
integer apsym0(58),aph10(10) integer apsym0(58),aph10(10)
integer apmask1(78),apsymbols1(78) integer apmask1(78),apsymbols1(78)
integer apmask(13),apsymbols(13) integer apmask(13),apsymbols(13)
@ -19,7 +19,7 @@ module q65
real candidates(20,3) !snr, xdt, and f0 of top candidates real candidates(20,3) !snr, xdt, and f0 of top candidates
real, allocatable :: s1raw(:,:) !Symbol spectra, 1/8-symbol steps real, allocatable :: s1raw(:,:) !Symbol spectra, 1/8-symbol steps
real, allocatable :: s1(:,:) !Symbol spectra w/suppressed peaks real, allocatable :: s1(:,:) !Symbol spectra w/suppressed peaks
real, allocatable :: s1w(:,:) !Symbol spectra w/suppressed peaks !w3sz added real, allocatable :: s1w(:,:) !Symbol spectra w/suppressed peaks (W3SZ)
real, allocatable,save :: s1a(:,:,:) !Cumulative symbol spectra real, allocatable,save :: s1a(:,:,:) !Cumulative symbol spectra
real, allocatable,save :: ccf2(:) !Max CCF(freq) at any lag (orange curve) real, allocatable,save :: ccf2(:) !Max CCF(freq) at any lag (orange curve)
real, allocatable,save :: ccf2_avg(:) !Like ccf2, but for avg (red curve) real, allocatable,save :: ccf2_avg(:) !Like ccf2, but for avg (red curve)
@ -28,7 +28,7 @@ module q65
contains contains
subroutine q65_dec0(iavg,nutc,iwave,ntrperiod,nfqso,ntol,lclearave, & subroutine q65_dec0(iavg,iwave,ntrperiod,nfqso,ntol,lclearave, &
emedelay,xdt,f0,snr1,width,dat4,snr2,idec,stageno) emedelay,xdt,f0,snr1,width,dat4,snr2,idec,stageno)
! Top-level routine in q65 module ! Top-level routine in q65 module
@ -67,7 +67,7 @@ subroutine q65_dec0(iavg,nutc,iwave,ntrperiod,nfqso,ntol,lclearave, &
real, allocatable :: s3(:,:) !Data-symbol energies s3(LL,63) real, allocatable :: s3(:,:) !Data-symbol energies s3(LL,63)
real, allocatable :: ccf1(:) !CCF(freq) at fixed lag (red) real, allocatable :: ccf1(:) !CCF(freq) at fixed lag (red)
data first/.true./ data first/.true./
save first save first,LL0
integer w3t integer w3t
integer w3f integer w3f
@ -75,7 +75,6 @@ subroutine q65_dec0(iavg,nutc,iwave,ntrperiod,nfqso,ntol,lclearave, &
integer stageno integer stageno
NN=63 NN=63
if(nutc.eq.-999) stop !Silence compiler warnings
! Set some parameters and allocate storage for large arrays ! Set some parameters and allocate storage for large arrays
irc=-2 irc=-2