mirror of
https://github.com/saitohirga/WSJT-X.git
synced 2025-08-04 07:02:27 -04:00
BugFix: Rearrange code in decoder.f90, only Fox needs to open houndcallers.txt.
This commit is contained in:
parent
2f96a3ba9c
commit
35ea5f5761
@ -67,20 +67,6 @@ subroutine multimode_decoder(ss,id2,params,nfsample)
|
|||||||
else
|
else
|
||||||
open(13,file=trim(temp_dir)//'/decoded.txt',status='unknown',iostat=ios)
|
open(13,file=trim(temp_dir)//'/decoded.txt',status='unknown',iostat=ios)
|
||||||
endif
|
endif
|
||||||
if(params%nmode.eq.8) then
|
|
||||||
inquire(file=trim(temp_dir)//'/houndcallers.txt',exist=ex)
|
|
||||||
if(.not.ex) then
|
|
||||||
c2fox=' '
|
|
||||||
g2fox=' '
|
|
||||||
nsnrfox=-99
|
|
||||||
nfreqfox=-99
|
|
||||||
n30z=0
|
|
||||||
nwrap=0
|
|
||||||
nfox=0
|
|
||||||
endif
|
|
||||||
open(19,file=trim(temp_dir)//'/houndcallers.txt',status='unknown')
|
|
||||||
endif
|
|
||||||
|
|
||||||
if(ios.ne.0) then
|
if(ios.ne.0) then
|
||||||
nfail=nfail+1
|
nfail=nfail+1
|
||||||
if(nfail.le.3) then
|
if(nfail.le.3) then
|
||||||
@ -91,6 +77,22 @@ subroutine multimode_decoder(ss,id2,params,nfsample)
|
|||||||
|
|
||||||
if(params%nmode.eq.8) then
|
if(params%nmode.eq.8) then
|
||||||
! We're in FT8 mode
|
! We're in FT8 mode
|
||||||
|
|
||||||
|
if(ncontest.eq.5) then
|
||||||
|
! Fox mode: initialize and open houndcallers.txt
|
||||||
|
inquire(file=trim(temp_dir)//'/houndcallers.txt',exist=ex)
|
||||||
|
if(.not.ex) then
|
||||||
|
c2fox=' '
|
||||||
|
g2fox=' '
|
||||||
|
nsnrfox=-99
|
||||||
|
nfreqfox=-99
|
||||||
|
n30z=0
|
||||||
|
nwrap=0
|
||||||
|
nfox=0
|
||||||
|
endif
|
||||||
|
open(19,file=trim(temp_dir)//'/houndcallers.txt',status='unknown')
|
||||||
|
endif
|
||||||
|
|
||||||
call timer('decft8 ',0)
|
call timer('decft8 ',0)
|
||||||
newdat=params%newdat
|
newdat=params%newdat
|
||||||
ncontest=iand(params%nexp_decode,7)
|
ncontest=iand(params%nexp_decode,7)
|
||||||
@ -106,33 +108,37 @@ subroutine multimode_decoder(ss,id2,params,nfsample)
|
|||||||
n30max=maxval(n30fox(1:nfox))
|
n30max=maxval(n30fox(1:nfox))
|
||||||
endif
|
endif
|
||||||
j=0
|
j=0
|
||||||
rewind 19
|
|
||||||
if(nfox.eq.0) then
|
if(ncontest.eq.5) then
|
||||||
endfile 19
|
! Fox mode: save decoded Hound calls for possible selection by FoxOp
|
||||||
rewind 19
|
rewind 19
|
||||||
else
|
if(nfox.eq.0) then
|
||||||
do i=1,nfox
|
endfile 19
|
||||||
n=n30fox(i)
|
rewind 19
|
||||||
if(n30max-n30fox(i).le.4) then
|
else
|
||||||
j=j+1
|
do i=1,nfox
|
||||||
c2fox(j)=c2fox(i)
|
n=n30fox(i)
|
||||||
g2fox(j)=g2fox(i)
|
if(n30max-n30fox(i).le.4) then
|
||||||
nsnrfox(j)=nsnrfox(i)
|
j=j+1
|
||||||
nfreqfox(j)=nfreqfox(i)
|
c2fox(j)=c2fox(i)
|
||||||
n30fox(j)=n
|
g2fox(j)=g2fox(i)
|
||||||
m=n30max-n
|
nsnrfox(j)=nsnrfox(i)
|
||||||
if(len(trim(g2fox(j))).eq.4) then
|
nfreqfox(j)=nfreqfox(i)
|
||||||
call azdist(mygrid,g2fox(j),0.d0,nAz,nEl,nDmiles,nDkm, &
|
n30fox(j)=n
|
||||||
nHotAz,nHotABetter)
|
m=n30max-n
|
||||||
else
|
if(len(trim(g2fox(j))).eq.4) then
|
||||||
nDkm=9999
|
call azdist(mygrid,g2fox(j),0.d0,nAz,nEl,nDmiles,nDkm, &
|
||||||
|
nHotAz,nHotABetter)
|
||||||
|
else
|
||||||
|
nDkm=9999
|
||||||
|
endif
|
||||||
|
write(19,1004) c2fox(j),g2fox(j),nsnrfox(j),nfreqfox(j),nDkm,m
|
||||||
|
1004 format(a12,1x,a4,i5,i6,i7,i3)
|
||||||
endif
|
endif
|
||||||
write(19,1004) c2fox(j),g2fox(j),nsnrfox(j),nfreqfox(j),nDkm,m
|
enddo
|
||||||
1004 format(a12,1x,a4,i5,i6,i7,i3)
|
nfox=j
|
||||||
endif
|
flush(19)
|
||||||
enddo
|
endif
|
||||||
nfox=j
|
|
||||||
flush(19)
|
|
||||||
endif
|
endif
|
||||||
go to 800
|
go to 800
|
||||||
endif
|
endif
|
||||||
|
Loading…
x
Reference in New Issue
Block a user