From 1bcf2ff335f77b41a948261a42d1b2ae894df3dc Mon Sep 17 00:00:00 2001 From: Steven Franke Date: Mon, 4 May 2020 13:42:42 -0500 Subject: [PATCH] Cleanup. --- lib/ft8/decode174_91.f90 | 16 +++++++--------- lib/ft8/encode174_91_nocrc.f90 | 2 +- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/lib/ft8/decode174_91.f90 b/lib/ft8/decode174_91.f90 index baa9b8946..161306830 100644 --- a/lib/ft8/decode174_91.f90 +++ b/lib/ft8/decode174_91.f90 @@ -4,9 +4,8 @@ subroutine decode174_91(llr,Keff,ndeep,apmask,maxsuper,message91,cw,nharderror,i ! integer, parameter:: N=174, K=91, M=N-K integer*1 cw(N),apmask(N) -integer*1 decoded(K) integer*1 nxor(N),hdec(N) -integer*1 message91(91) +integer*1 message91(91),m96(96) integer nrw(M),ncw integer Nm(7,M) integer Mn(3,N) ! 3 checks per bit @@ -20,7 +19,6 @@ real Tmn include "ldpc_174_91_c_reordered_parity.f90" -decoded=0 toc=0 tov=0 tanhtoc=0 @@ -60,14 +58,14 @@ zsum=zsum+zn enddo ! write(*,*) 'number of unsatisfied parity checks ',ncheck if( ncheck .eq. 0 ) then ! we have a codeword - if crc is good, return it - decoded=cw(1:K) - call get_crc14(decoded,91,nbadcrc) -write(*,*) nbadcrc -write(*,'(91i1)') decoded + m96=0 + m96(1:77)=cw(1:77) + m96(83:96)=cw(78:91) + call get_crc14(m96,96,nbadcrc) nharderror=count( (2*cw-1)*llr .lt. 0.0 ) if(nbadcrc.eq.0) then - message91=decoded(1:91) -dmin=0.0 + message91=cw(1:91) + dmin=0.0 return endif endif diff --git a/lib/ft8/encode174_91_nocrc.f90 b/lib/ft8/encode174_91_nocrc.f90 index 6d583d907..8197e0762 100644 --- a/lib/ft8/encode174_91_nocrc.f90 +++ b/lib/ft8/encode174_91_nocrc.f90 @@ -1,6 +1,6 @@ subroutine encode174_91_nocrc(message,codeword) ! -! Add a 14-bit CRC to a 77-bit message and return a 174-bit codeword +! Encode a 91-bit message and return a 174-bit codeword. ! use, intrinsic :: iso_c_binding use iso_c_binding, only: c_loc,c_size_t