w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2025-06-04 07:42:28 -04:00
Code Issues Packages Projects Releases Wiki Activity

Code cleanup.

Browse Source
This commit is contained in:
Joe Taylor 2020-10-09 15:29:16 -04:00
parent 538b0b91ab
commit e82da4484c
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/qra64a.f90
View File

@ -12,7 +12,6 @@ subroutine qra64a(dd,npts,nf1,nf2,nfqso,ntol,mode64,minsync,ndepth, &
logical ltext logical ltext
complex c00(0:720000) !Analytic signal for dd() complex c00(0:720000) !Analytic signal for dd()
real dd(NMAX) !Raw data sampled at 12000 Hz real dd(NMAX) !Raw data sampled at 12000 Hz
real s3(LN) !Symbol spectra
integer dat4(12) !Decoded message (as 12 integers) integer dat4(12) !Decoded message (as 12 integers)
data nc1z/-1/,nc2z/-1/,ng2z/-1/,maxaptypez/-1/ data nc1z/-1/,nc2z/-1/,ng2z/-1/,maxaptypez/-1/
save save
@ -42,7 +41,7 @@ subroutine qra64a(dd,npts,nf1,nf2,nfqso,ntol,mode64,minsync,ndepth, &
maxaptype.ne.maxaptypez) then maxaptype.ne.maxaptypez) then
do naptype=0,maxaptype do naptype=0,maxaptype
if(naptype.eq.2 .and. maxaptype.eq.4) cycle if(naptype.eq.2 .and. maxaptype.eq.4) cycle
call qra64_dec(s3,nc1,nc2,ng2,naptype,1,nSubmode,b90, & call qra64_dec(s3dummy,nc1,nc2,ng2,naptype,1,nSubmode,b90, &
nFadingModel,dat4,snr2,irc) nFadingModel,dat4,snr2,irc)
enddo enddo
nc1z=nc1 nc1z=nc1
@ -63,7 +62,7 @@ subroutine qra64a(dd,npts,nf1,nf2,nfqso,ntol,mode64,minsync,ndepth, &
call timer('qraloops',0) call timer('qraloops',0)
call qra_loops(c00,npts/2,64,mode64,nsubmode,nFadingModel,minsync, & call qra_loops(c00,npts/2,64,mode64,nsubmode,nFadingModel,minsync, &
ndepth,nc1,nc2,ng2,naptype,jpk0,dtx,f0,width,snr2,s3,irc,dat4) ndepth,nc1,nc2,ng2,naptype,jpk0,dtx,f0,width,snr2,irc,dat4)
call timer('qraloops',1) call timer('qraloops',1)
decoded=' ' decoded=' '

11
lib/qra_loops.f90
View File

@ -26,7 +26,7 @@ subroutine qra_loops(c00,npts2,mode,mode64,nsubmode,nFadingModel,minsync, &
napmin=99 napmin=99
ncall=0 ncall=0
nsps=3456 !QRA64 nsps=3456 !QRA64
if(mode.eq.65) nsps=3840 !QRA65 if(mode.eq.65) nsps=3840 !QRA65 ### Is 3840 too big? ###
do idf0=1,11 do idf0=1,11
idf=idf0/2 idf=idf0/2
@ -39,15 +39,14 @@ subroutine qra_loops(c00,npts2,mode,mode64,nsubmode,nFadingModel,minsync, &
if(mod(idt0,2).eq.0) idt=-idt if(mod(idt0,2).eq.0) idt=-idt
jpk=jpk0 + 750*idt jpk=jpk0 + 750*idt
if(jpk.lt.0) jpk=0 if(jpk.lt.0) jpk=0
call spec64(c0,nsps,mode,jpk,s3a,LL,NN) call spec64(c0,nsps,mode,jpk,s3,LL,NN)
call pctile(s3a,LL*NN,40,base) call pctile(s3,LL*NN,40,base)
s3a=s3a/base s3=s3/base
where(s3a(1:LL*NN)>s3lim) s3a(1:LL*NN)=s3lim where(s3(1:LL*NN)>s3lim) s3(1:LL*NN)=s3lim
do ibw=ibwmax,ibwmin,-2 do ibw=ibwmax,ibwmin,-2
b90=1.728**ibw b90=1.728**ibw
if(b90.gt.230.0) cycle if(b90.gt.230.0) cycle
if(b90.lt.0.15*width) exit if(b90.lt.0.15*width) exit
s3(1:LL*NN)=s3a(1:LL*NN)
ncall=ncall+1 ncall=ncall+1
call timer('qra64_de',0) call timer('qra64_de',0)
call qra64_dec(s3,nc1,nc2,ng2,naptype,0,nSubmode,b90, & call qra64_dec(s3,nc1,nc2,ng2,naptype,0,nSubmode,b90, &