Fix some problems in ft8sim2.f90.

This commit is contained in:
Steve Franke 2018-07-04 10:38:10 -05:00
parent df652e383b
commit d70e3dbb26
1 changed files with 34 additions and 32 deletions

View File

@ -69,17 +69,18 @@ program ft8sim2
! Source-encode, then get itone()
call pack77(msg37,i3,n3,c77)
write(*,*) c77
write(*,*) i3,n3
call unpack77(c77,msgsent37)
call genft8_174_91(msg37,mygrid6,bcontest,i3,n3,msgsent37,msgbits,itone)
write(*,1000) f0,xdt,txt,snrdb,bw,msgsent37
1000 format('f0:',f9.3,' DT:',f6.2,' TxT:',f6.1,' SNR:',f6.1, &
' BW:',f4.1,2x,a37)
write(*,'(a23,a37,i1,a1,i1)') 'New Style FT8 Message: ',msgsent37,i3,'.',n3
write(*,*)
write(*,'(a23,a37,3x,a7,i1,a1,i1)') 'New Style FT8 Message: ',msgsent37,'i3.n3: ',i3,'.',n3
write(*,1000) f0,xdt,txt,snrdb,bw
1000 format('f0:',f9.3,' DT:',f6.2,' TxT:',f6.1,' SNR:',f6.1, &
' BW:',f4.1)
write(*,*)
write(*,'(a14)') 'Message bits: '
write(*,'(77i1)') msgbits
write(*,*)
write(*,'(a17)') 'Channel symbols: '
write(*,'(79i1)') itone
@ -90,6 +91,7 @@ write(*,*) i3,n3
k=nint((xdt+0.5)/dt)
ia=k
phi=0.0
c0=0.0
do j=1,NN !Generate complex waveform
dphi=twopi*(f0*dt+itone(j)/real(NSPS))
do i=1,NSPS
@ -99,8 +101,8 @@ write(*,*) i3,n3
enddo
enddo
if(fspread.ne.0.0 .or. delay.ne.0.0) call watterson(c0,NMAX,fs,delay,fspread)
c=c+sig*c0
enddo
c=sig*c0
ib=k
wave=real(c)
peak=maxval(abs(wave(ia:ib)))
@ -128,5 +130,5 @@ write(*,*) i3,n3
close(10)
write(*,1110) ifile,xdt,f0,snrdb,fname
1110 format(i4,f7.2,f8.2,f7.1,2x,a17)
enddo
999 end program ft8sim2