w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2025-05-31 13:52:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

Add UTC and reformat diagnostic output to fort.53.

Browse Source
This commit is contained in:
Joe Taylor 2020-11-15 12:21:08 -05:00
parent 4903b38220
commit 24ed64e5cc
2 changed files with 25 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
lib/q65_decode.f90
View File

@ -63,9 +63,10 @@ contains
complex, allocatable :: c0(:) !Analytic signal, 6000 Sa/s complex, allocatable :: c0(:) !Analytic signal, 6000 Sa/s
mode65=2**nsubmode mode65=2**nsubmode
npts=ntrperiod*12000
nfft1=ntrperiod*12000 nfft1=ntrperiod*12000
nfft2=ntrperiod*6000 nfft2=ntrperiod*6000
allocate(dd(NMAX)) allocate(dd(npts))
allocate (c00(0:nfft1-1)) allocate (c00(0:nfft1-1))
allocate (c0(0:nfft1-1)) allocate (c0(0:nfft1-1))
@ -82,7 +83,6 @@ contains
else else
stop 'Invalid TR period' stop 'Invalid TR period'
endif endif
npts=ntrperiod*12000
baud=12000.0/nsps baud=12000.0/nsps
df1=12000.0/nfft1 df1=12000.0/nfft1
this%callback => callback this%callback => callback
@ -100,7 +100,19 @@ contains
if(ntrperiod.le.30) jpk0=(xdt+0.5)*6000 !### if(ntrperiod.le.30) jpk0=(xdt+0.5)*6000 !###
if(jpk0.lt.0) jpk0=0 if(jpk0.lt.0) jpk0=0
fac=1.0/32767.0 fac=1.0/32767.0
dd=fac*iwave dd=fac*iwave(1:npts)
!###
! Optionslly write noise level to LU 56
! sq=dot_product(dd,dd)/npts
! m=nutc
! if(ntrperiod.ge.60) m=100*m
! ihr=m/10000
! imin=mod(m/100,100)
! isec=mod(m,100)
! hours=ihr + imin/60.0 + isec/3600.0
! write(56,3056) m,hours,db(sq)+90.3
!3056 format(i6.6,f10.6,f10.3)
!###
nmode=65 nmode=65
call ana64(dd,npts,c00) call ana64(dd,npts,c00)
@ -132,9 +144,9 @@ contains
! write(54,3002) apmask,apsymbols ! write(54,3002) apmask,apsymbols
!3002 format('b ',13b6.6/4x,13b6.6) !3002 format('b ',13b6.6/4x,13b6.6)
call timer('q65loops',0) call timer('q65loops',0)
call q65_loops(c00,npts/2,nsps/2,nmode,mode65,nsubmode,nFadingModel, & call q65_loops(c00,nutc,npts/2,nsps/2,nmode,mode65,nsubmode, &
ndepth,jpk0,xdt,f0,width,iaptype,apmask,apsymbols,snr1,xdt1,f1, & nFadingModel,ndepth,jpk0,xdt,f0,width,iaptype,apmask,apsymbols, &
snr2,irc,dat4) snr1,xdt1,f1,snr2,irc,dat4)
call timer('q65loops',1) call timer('q65loops',1)
snr2=snr2 + db(6912.0/nsps) snr2=snr2 + db(6912.0/nsps)
if(irc.ge.0) exit if(irc.ge.0) exit

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

@ -1,4 +1,4 @@
subroutine q65_loops(c00,npts2,nsps,mode,mode64,nsubmode,nFadingModel, & subroutine q65_loops(c00,nutc,npts2,nsps,mode,mode64,nsubmode,nFadingModel, &
ndepth,jpk0,xdt0,f0,width,iaptype,APmask,APsymbols,snr1,xdt1,f1, & ndepth,jpk0,xdt0,f0,width,iaptype,APmask,APsymbols,snr1,xdt1,f1, &
snr2,irc,dat4) snr2,irc,dat4)
@ -121,9 +121,12 @@ subroutine q65_loops(c00,npts2,nsps,mode,mode64,nsubmode,nFadingModel, &
write(c77,1100) dat4(1:12),dat4(13)/2 write(c77,1100) dat4(1:12),dat4(13)/2
1100 format(12b6.6,b5.5) 1100 format(12b6.6,b5.5)
call unpack77(c77,0,decoded,unpk77_success) !Unpack to get msgsent call unpack77(c77,0,decoded,unpk77_success) !Unpack to get msgsent
write(53,3053) ndf,ndt,nbw,b90,xdt1,f1,snr2,ndist,irc,iaptype,navg, & if(nsps.lt.3600) write(53,3001) nutc,ndf,ndt,nbw,ndist,irc, &
snr1,trim(decoded) iaptype,navg,snr1,xdt1,f1,snr2,trim(decoded)
3053 format(3i4,f6.1,f6.2,f7.1,f6.1,4i4,f7.2,1x,a) 3001 format(i6.6,7i4,f7.1,f7.2,2f7.1,1x,a)
if(nsps.ge.3600) write(53,3002) nutc,ndf,ndt,nbw,ndist,irc, &
iaptype,navg,snr1,xdt1,f1,snr2,trim(decoded)
3002 format(i4.4,2x,7i4,f7.1,f7.2,2f7.1,1x,a)
close(53) close(53)
!### !###
nsave=0 nsave=0