Fix up simulators. No changes to WSJT-X.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7049 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Steven Franke 2016-09-01 15:16:11 +00:00
parent 76ca91c363
commit 5eaeeb6469
2 changed files with 10 additions and 9 deletions

View File

@ -15,8 +15,8 @@ integer*1 msgbits(80)
integer*1 bitseq(144)
integer*4 i4Msg6BitWords(13)
integer ihash
real*8, allocatable :: lratio(:), rxdata(:), llr(:)
real, allocatable :: yy(:)
real*8, allocatable :: lratio(:), rxdata(:)
real, allocatable :: yy(:), llr(:)
equivalence(ihash,i1hash)
nargs=iargc()
@ -93,7 +93,7 @@ msg="K9AN K1JT EN50"
call encode_msk144(msgbits,codeword)
call init_random_seed()
write(*,*) "Eb/N0 ngood nundetected nbadhash"
write(*,*) "Eb/N0 SNR2500 ngood nundetected nbadhash"
do idb = -6, 14
db=idb/2.0-1.0
sigma=1/sqrt( 2*rate*(10**(db/10.0)) )
@ -154,8 +154,8 @@ do idb = -6, 14
endif
endif
enddo
write(*,"(f4.1,1x,i8,1x,i8,1x,i8,1x,f5.2)") db,ngood,nue,nbadhash,ss
snr2500=db-4.0
write(*,"(f4.1,4x,f5.1,1x,i8,1x,i8,1x,i8,1x,f5.2)") db,snr2500,ngood,nue,nbadhash,ss
enddo

View File

@ -9,7 +9,8 @@ character*80 prefix
character*85 pchk_file,gen_file
character*8 arg
integer*1, allocatable :: codeword(:), decoded(:), message(:)
real*8, allocatable :: lratio(:), rxdata(:), llr(:)
real*8, allocatable :: lratio(:), rxdata(:)
real, allocatable :: llr(:)
integer ihash
integer*1 hardbits(32)
@ -64,9 +65,8 @@ call encode_msk40(message,codeword)
write(*,'(32i1)') codeword
call init_random_seed()
write(*,*) "Eb/N0 ngood nundetected nbadhash"
write(*,*) "Eb/N0 SNR2500 ngood nundetected nbadhash"
do idb = -6, 14
!do idb = 14, 14
db=idb/2.0-1.0
sigma=1/sqrt( 2*rate*(10**(db/10.0)) )
ngood=0
@ -138,7 +138,8 @@ do idb = -6, 14
endif
enddo
avits=real(itsum)/real(ngood+0.1)
write(*,"(f4.1,1x,i8,1x,i8,1x,i8,1x,f8.2,1x,f8.1)") db,ngood,nue,nbadhash,ss,avits
snr2500=db-10.0
write(*,"(f4.1,4x,f5.1,1x,i8,1x,i8,1x,i8,1x,f8.2,1x,f8.1)") db,snr2500,ngood,nue,nbadhash,ss,avits
enddo