w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2024-12-23 19:25:37 -05:00
Code Issues Packages Projects Releases Wiki Activity

Replace all "common/test00?" with "use jt65_mod", etc.

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6515 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Joe Taylor 2016-03-10 14:25:22 +00:00
parent 8b2a665138
commit 04e765c605
6 changed files with 36 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@ -356,6 +356,7 @@ set (wsjt_FSRCS
lib/jt4.f90
lib/jt4_decode.f90
lib/jt65_decode.f90
lib/jt65_mod.f90
lib/jt9_decode.f90
lib/jt9fano.f90
lib/jtmsk_decode.f90

2
lib/decode65a.f90
View File

@ -4,6 +4,7 @@ subroutine decode65a(dd,npts,newdat,nqd,f0,nflip,mode65,ntrials, &
! Apply AFC corrections to a candidate JT65 signal, then decode it.
use jt65_mod
use timer_module, only: timer
parameter (NMAX=60*12000) !Samples per 60 s
@ -17,7 +18,6 @@ subroutine decode65a(dd,npts,newdat,nqd,f0,nflip,mode65,ntrials, &
logical first
character decoded*22,decoded_best*22
character mycall*12,hiscall*12,hisgrid*6
common/test002/s1(-255:256,126)
data first/.true./,jjjmin/1000/,jjjmax/-1000/
data nhz0/-9999999/
save

2
lib/decoder.f90
View File

@ -239,7 +239,7 @@ contains
ctail(2:2)=c(nsum+1:nsum+1)
if(nsubmode.gt.0) ctail(3:3)=c(nsmo+1:nsmo+1)
endif
write(*,1010) utc,snr,dt,freq,'*',decoded,ctail
write(*,1010) utc,snr,dt,freq,'#',decoded,ctail
1010 format(i4.4,i4,f5.1,i5,1x,a1,1x,a22,a3)
endif

6
lib/extract.f90
View File

@ -15,6 +15,7 @@ subroutine extract(s3,nadd,mode65,ntrials,naggressive,ndepth,mycall_12, &
use prog_args !shm_key, exe_dir, data_dir
use packjt
use jt65_mod
use timer_module, only: timer
real s3(64,63)
@ -24,11 +25,8 @@ subroutine extract(s3,nadd,mode65,ntrials,naggressive,ndepth,mycall_12, &
integer dat4(12)
integer mrsym(63),mr2sym(63),mrprob(63),mr2prob(63)
integer correct(63),tmp(63)
integer param(0:9)
logical ltext
common/chansyms65/correct
common/test000/param !### TEST ONLY ###
common/test001/s3a(64,63),mrs(63),mrs2(63) !### TEST ONLY ###
save
mycall=mycall_12(1:6)
@ -135,9 +133,9 @@ end subroutine extract
subroutine getpp(workdat,p)
use jt65_mod
integer workdat(63)
integer a(63)
common/test001/s3a(64,63),mrs(63),mrs2(63)
a(1:63)=workdat(63:1:-1)
call interleave63(a,1)

28
lib/jt65_decode.f90
View File

@ -44,6 +44,7 @@ contains
! Process dd0() data to find and decode JT65 signals.
use jt65_mod
use timer_module, only: timer
include 'constants.f90'
@ -82,8 +83,6 @@ contains
real r0(0:11)
common/decstats/ntry65a,ntry65b,n65a,n65b,num9,numfano
common/steve/thresh0
common/test000/ncandidates,nhard_min,nsoft_min,nera_best,nrtt1000, &
ntotal_min,ntry,nq1000,npp1,nsmo !### TEST ONLY ###
! 0 1 2 3 4 5 6 7 8 9 10 11
data h0/41,42,43,43,44,45,46,47,48,48,49,49/
@ -94,6 +93,17 @@ contains
data nutc0/-999/,nfreq0/-999/,nsave/0/
save
! ncandidates=param(0)
nhard_min=param(1)
! nsoft_min=param(2)
! nera_best=param(3)
nrtt1000=param(4)
ntotal_min=param(5)
! ntry=param(6)
! nq1000=param(7)
! npp1=param(8)
nsmo=param(9)
this%callback => callback
first_time=newdat
robust=nrobust
@ -263,6 +273,7 @@ contains
! Decodes averaged JT65 data
use jt65_mod
parameter (MAXAVE=64)
character*22 avemsg,deepave,deepbest
character mycall*12,hiscall*12,hisgrid*6
@ -273,13 +284,14 @@ contains
integer nfsave(MAXAVE)
integer listutc(10)
integer nflipsave(MAXAVE)
real s1b(-255:256,126)
real s1save(-255:256,126,MAXAVE)
real s3save(64,63,MAXAVE)
real s3b(64,63)
real dtsave(MAXAVE)
real syncsave(MAXAVE)
logical first
data first/.true./
common/test001/s3a(64,63)
save
if(first .or. (nclearave.eq.1)) then
@ -287,6 +299,8 @@ contains
nfsave=0
dtdiff=0.2
first=.false.
! s3a=0.
nsave=1 !### ???
endif
nclearave=0
@ -300,15 +314,16 @@ contains
dtsave(nsave)=dtxx
nfsave(nsave)=nfreq
nflipsave(nsave)=nflip
s1save(-255:256,1:126,nsave)=s1
s3save(1:64,1:63,nsave)=s3a
10 sym=0.
syncsum=0.
10 syncsum=0.
dtsum=0.
nfsum=0
nsum=0
s3b=0.
do i=1,64
do i=1,64 !Consider all saved spectra
cused(i)='.'
if(iutc(i).lt.0) cycle
if(mod(iutc(i),2).ne.mod(nutc,2)) cycle !Use only same (odd/even) seq
@ -329,7 +344,6 @@ contains
dtave=0.
fave=0.
if(nsum.gt.0) then
sym=sym/nsum
syncave=syncsum/nsum
dtave=dtsum/nsum
fave=float(nfsum)/nsum

10
lib/jt65_mod.f90 Normal file
View File

@ -0,0 +1,10 @@
module jt65_mod
integer param(0:9)
integer mrs(63)
integer mrs2(63)
real s1(-255:256,126)
real s3a(64,63)
end module jt65_mod