From f984dbfbadfa1a050ce1b845f826541a1be9de34 Mon Sep 17 00:00:00 2001 From: Steven Franke Date: Wed, 3 Aug 2016 13:15:49 +0000 Subject: [PATCH] Reverse premature commit of modified genmsk40. git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6985 ab8295b8-cf94-4d9e-aec4-7959e3be5d79 --- lib/genmsk40.f90 | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/lib/genmsk40.f90 b/lib/genmsk40.f90 index 83befbfac..f0ddcc4dd 100644 --- a/lib/genmsk40.f90 +++ b/lib/genmsk40.f90 @@ -5,12 +5,11 @@ subroutine genmsk40(msg,msgsent,ichk,itone,itype,pchk_file) character*32 cwstring character*2 cwstrbit character*4 crpt,rpt(0:63) - character*16 messagestr character*512 pchk_file,gen_file character*512 pchk_file40,gen_file40 logical first integer itone(144) - integer*1 message(16),codeword(32),bitseq(40),codeword2(32) + integer*1 message(16),codeword(32),bitseq(40) integer*1 s8r(8) data s8r/1,0,1,1,0,0,0,1/ data first/.true./ @@ -62,20 +61,15 @@ subroutine genmsk40(msg,msgsent,ichk,itone,itype,pchk_file) do i=1,16 message(i)=iand(1,ishft(ig,1-i)) enddo - - write(17,'(16i1)') message - call system('./encode peg-32-16-reg3.pchk peg-32-16-reg3.gen fort.17 fort.18') - read(18,'(32i1)') codeword - -! call ldpc_encode(message,codeword) + call ldpc_encode(message,codeword) cwstring=" " do i=1,32 write(cwstrbit,'(i2)') codeword(i) cwstring=cwstring//cwstrbit enddo - write(*,'(a6,i6,2x,a6,i6,2x,a6,i6)') ' msg: ',ig,'rprt: ',irpt,'hash: ',ihash - write(*,'(a6,32i1)') ' cw: ',codeword +! write(*,'(a6,i6,2x,a6,i6,2x,a6,i6)') ' msg: ',ig,'rprt: ',irpt,'hash: ',ihash +! write(*,'(a6,32i1)') ' cw: ',codeword bitseq(1:8)=s8r bitseq(9:40)=codeword