From 091d6d0b1a3bf53394538c681d59b68b8a93c953 Mon Sep 17 00:00:00 2001 From: Steven Franke Date: Fri, 21 Aug 2020 09:18:59 -0500 Subject: [PATCH] Tweaks to update the diagnostics that are written to fort.21. --- lib/fst4/decode240_101.f90 | 3 ++- lib/fst4/decode240_74.f90 | 3 ++- lib/fst4/get_fst4_bitmetrics.f90 | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/lib/fst4/decode240_101.f90 b/lib/fst4/decode240_101.f90 index e924f00ec..4271a464c 100644 --- a/lib/fst4/decode240_101.f90 +++ b/lib/fst4/decode240_101.f90 @@ -140,8 +140,9 @@ subroutine decode240_101(llr,Keff,maxosd,norder,apmask,message101,cw,ntype,nhard hdec=0 where(llr .ge. 0) hdec=1 nxor=ieor(hdec,cw) + nharderror=sum(nxor) ! re-calculate nharderror based on input llrs dmin=sum(nxor*abs(llr)) - ntype=1+nosd + ntype=1+i return endif enddo diff --git a/lib/fst4/decode240_74.f90 b/lib/fst4/decode240_74.f90 index 224a2860d..be18f6e09 100644 --- a/lib/fst4/decode240_74.f90 +++ b/lib/fst4/decode240_74.f90 @@ -140,8 +140,9 @@ subroutine decode240_74(llr,Keff,maxosd,norder,apmask,message74,cw,ntype,nharder hdec=0 where(llr .ge. 0) hdec=1 nxor=ieor(hdec,cw) + nharderror=sum(nxor) ! nharderror based on input llrs dmin=sum(nxor*abs(llr)) - ntype=1+nosd + ntype=1+i return endif enddo diff --git a/lib/fst4/get_fst4_bitmetrics.f90 b/lib/fst4/get_fst4_bitmetrics.f90 index f34cb9322..e245db18c 100644 --- a/lib/fst4/get_fst4_bitmetrics.f90 +++ b/lib/fst4/get_fst4_bitmetrics.f90 @@ -1,4 +1,4 @@ -subroutine get_fst4_bitmetrics(cd,nss,hmod,nmax,nhicoh,bitmetrics,s4,badsync) +subroutine get_fst4_bitmetrics(cd,nss,hmod,nmax,nhicoh,bitmetrics,s4,nsync_qual,badsync) include 'fst4_params.f90' complex cd(0:NN*nss-1)