From 23b514a2f853afbacf9c5ac610882d06ba924a9d Mon Sep 17 00:00:00 2001 From: Steven Franke Date: Fri, 14 Jul 2017 19:46:04 +0000 Subject: [PATCH] Update call to ft8b. git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7885 ab8295b8-cf94-4d9e-aec4-7959e3be5d79 --- lib/fsk4hf/ft8apset.f90 | 1 + lib/fsk4hf/ft8b.f90 | 5 +++-- lib/ft8_decode.f90 | 6 +++--- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/lib/fsk4hf/ft8apset.f90 b/lib/fsk4hf/ft8apset.f90 index 6cf88aa92..ccd3108f5 100644 --- a/lib/fsk4hf/ft8apset.f90 +++ b/lib/fsk4hf/ft8apset.f90 @@ -14,6 +14,7 @@ subroutine ft8apset(mycall12,hiscall12,hisgrid6,apsym,iaptype) if(len_trim(hiscall).eq.0) then iaptype=1 hiscall="K9AN " ! dummy call + hisgrid="EN50" ! and dummy's grid else iaptype=2 hisgrid=hisgrid6(1:4) diff --git a/lib/fsk4hf/ft8b.f90 b/lib/fsk4hf/ft8b.f90 index f9c3c140e..d12d69682 100644 --- a/lib/fsk4hf/ft8b.f90 +++ b/lib/fsk4hf/ft8b.f90 @@ -113,9 +113,10 @@ subroutine ft8b(dd0,newdat,nfqso,ndepth,lsubtract,iaptype,icand,sync0,f1,xdt, apmag=4.0 ! nera=1 nera=3 + nap=0 + if(ndepth.eq.3) nap=2 -! do iap=0,3 - do iap=0,0 !### Temporary ### + do iap=0,nap !### Temporary ### do iera=1,nera llr=llr0 nblank=0 diff --git a/lib/ft8_decode.f90 b/lib/ft8_decode.f90 index f9ee1d90d..00ac284a9 100644 --- a/lib/ft8_decode.f90 +++ b/lib/ft8_decode.f90 @@ -47,7 +47,7 @@ contains 1001 format("000000_",i6.6) if(index(hisgrid6," ").eq.0) hisgrid6="EN50" - call ft8apset(mycall12,hiscall12,hisgrid6,apsym) + call ft8apset(mycall12,hiscall12,hisgrid6,apsym,iaptype) dd=iwave @@ -76,8 +76,8 @@ contains xdt=candidate(2,icand) nsnr0=min(99,nint(10.0*log10(sync) - 25.5)) !### empirical ### call timer('ft8b ',0) - call ft8b(dd,newdat,nfqso,ndepth,lsubtract,icand,sync,f1,xdt, & - apsym,nharderrors,dmin,nbadcrc,iap,ipass,iera,message,xsnr) + call ft8b(dd,newdat,nfqso,ndepth,lsubtract,iaptype,icand,sync,f1, & + xdt,apsym,nharderrors,dmin,nbadcrc,iap,ipass,iera,message,xsnr) nsnr=xsnr xdt=xdt-0.6 call timer('ft8b ',1)