Rearrange some FT8 code for consistency with other modes.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7741 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Joe Taylor
2017-06-27 19:44:12 +00:00
parent 7e62880e2a
commit 41336209c8
3 changed files with 96 additions and 83 deletions
+15 -9
View File
@@ -389,7 +389,7 @@ contains
end select
end subroutine jt9_decoded
subroutine ft8_decoded (this, sync, snr, dt, freq, drift, decoded)
subroutine ft8_decoded (this,sync,snr,dt,freq,nbadcrc,decoded)
use ft8_decode
implicit none
@@ -398,20 +398,26 @@ contains
integer, intent(in) :: snr
real, intent(in) :: dt
real, intent(in) :: freq
integer, intent(in) :: drift
integer, intent(in) :: nbadcrc
character(len=22), intent(in) :: decoded
!$omp critical(decode_results)
write(*,1000) params%nutc,snr,dt,nint(freq),decoded
1000 format(i4.4,i4,f5.1,i5,1x,'@ ',1x,a22)
write(13,1002) params%nutc,nint(sync),snr,dt,freq,drift,decoded
1002 format(i4.4,i4,i5,f6.1,f8.0,i4,3x,a22,' FT8')
call flush(6)
!$omp end critical(decode_results)
!### !$omp critical(decode_results)
if(nbadcrc.eq.0) then
write(*,1000) params%nutc,snr,dt,nint(freq),decoded
1000 format(i6.6,i4,f5.1,i5,' ~ ',1x,a22)
write(13,1002) params%nutc,nint(sync),snr,dt,freq,0,decoded
1002 format(i6.6,i4,i5,f6.1,f8.0,i4,3x,a22,' FT8')
call flush(6)
call flush(13)
endif
!### !$omp end critical(decode_results)
select type(this)
type is (counting_ft8_decoder)
this%decoded = this%decoded + 1
end select
return
end subroutine ft8_decoded
end subroutine multimode_decoder