fix formatting in ft8d.f90

This commit is contained in:
Pavel Demin 2018-03-24 17:06:33 +01:00
parent cdd1c49706
commit 90bb854cc3

View File

@ -68,22 +68,20 @@ program ft8d
f1=candidate(1,icand) f1=candidate(1,icand)
xdt=candidate(2,icand) xdt=candidate(2,icand)
xbase=10.0**(0.1*(sbase(nint(f1/3.125))-40.0)) xbase=10.0**(0.1*(sbase(nint(f1/3.125))-40.0))
nsnr0=min(99,nint(10.0*log10(sync) - 25.5)) !### empirical ### nsnr0=min(99,nint(10.0*log10(sync) - 25.5)) ! ### empirical ###
call ft8b(dd,newdat,nQSOProgress,nfqso,nftx,ndepth,lft8apon, & call ft8b(dd,newdat,nQSOProgress,nfqso,nftx,ndepth,lft8apon, &
lapcqonly,napwid,lsubtract,nagain,iaptype,mycall12,mygrid6, & lapcqonly,napwid,lsubtract,nagain,iaptype,mycall12,mygrid6, &
hiscall12,bcontest,sync,f1,xdt,xbase,apsym,nharderrors,dmin, & hiscall12,bcontest,sync,f1,xdt,xbase,apsym,nharderrors,dmin, &
nbadcrc,iappass,iera,msg37,xsnr) nbadcrc,iappass,iera,msg37,xsnr)
message=msg37(1:22) !### message=msg37(1:22)
nsnr=nint(xsnr) nsnr=nint(xsnr)
xdt=xdt-0.5 xdt=xdt-0.5
hd=nharderrors+dmin hd=nharderrors+dmin
if(nbadcrc.eq.0) then if(nbadcrc.eq.0) then
! call jtmsg(message,iflag)
if(bcontest) then if(bcontest) then
call fix_contest_msg(mygrid6,message) call fix_contest_msg(mygrid6,message)
msg37(1:22)=message msg37(1:22)=message
endif endif
! if(iand(iflag,31).ne.0) message(22:22)='?'
ldupe=.false. ldupe=.false.
do id=1,ndecodes do id=1,ndecodes
if(message.eq.allmessages(id).and.nsnr.le.allsnrs(id)) ldupe=.true. if(message.eq.allmessages(id).and.nsnr.le.allsnrs(id)) ldupe=.true.
@ -96,7 +94,7 @@ program ft8d
write(*,1004) nutc,ncand,icand,ipass,iaptype,iappass, & write(*,1004) nutc,ncand,icand,ipass,iaptype,iappass, &
nharderrors,dmin,hd,min(sync,999.0),nint(xsnr), & nharderrors,dmin,hd,min(sync,999.0),nint(xsnr), &
xdt,nint(f1),message xdt,nint(f1),message
1004 format(i6.6,2i4,3i2,i3,3f6.1,i4,f6.2,i5,2x,a22) 1004 format(i6.6,2i4,3i2,i3,3f6.1,i4,f6.2,i5,2x,a22)
endif endif
enddo enddo
enddo enddo