From 9765c2970eb505037e07e0afe6ee68812c28145d Mon Sep 17 00:00:00 2001 From: Steven Franke Date: Sat, 9 Jan 2016 15:01:41 +0000 Subject: [PATCH] Allow ndepth to be passed into jt65_test from jt65 command line program. git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6372 ab8295b8-cf94-4d9e-aec4-7959e3be5d79 --- lib/jt65.f90 | 5 +++-- lib/jt65_test.f90 | 6 +++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/lib/jt65.f90 b/lib/jt65.f90 index ca1a84038..40b6c4c60 100644 --- a/lib/jt65.f90 +++ b/lib/jt65.f90 @@ -31,7 +31,7 @@ program jt65 option ('single-signal-mode',.false.,'s','decode at signal frequency only','') ] naggressive=0 - nfqso=1270 + nfqso=1500 ntrials=10000 nexp_decoded=0 ntol=1000 @@ -39,6 +39,7 @@ program jt65 nlow=200 nhigh=4000 n2pass=2 + ndepth=5 do call getopt('a:f:hn:rc:x:g:X:s',long_options,c,optarg,narglen,nstat,noffset,nremain,.true.) @@ -108,7 +109,7 @@ program jt65 dd(1:npts)=id2(1:npts) dd(npts+1:)=0. call test(dd,nutc,nfa,nfb,nfqso,ntol,nsubmode, & - n2pass,nrobust,ntrials,naggressive, & + n2pass,nrobust,ntrials,naggressive,ndepth, & mycall,hiscall,hisgrid,nexp_decoded) enddo diff --git a/lib/jt65_test.f90 b/lib/jt65_test.f90 index c12c2aec3..c54a2eaca 100644 --- a/lib/jt65_test.f90 +++ b/lib/jt65_test.f90 @@ -10,7 +10,7 @@ module jt65_test contains subroutine test (dd,nutc,nflow,nfhigh,nfqso,ntol,nsubmode,n2pass,nrobust & - ,ntrials,naggressive,mycall,hiscall,hisgrid,nexp_decode) + ,ntrials,naggressive,ndepth,mycall,hiscall,hisgrid,nexp_decode) use timer_module, only: timer use jt65_decode implicit none @@ -18,7 +18,7 @@ contains include 'constants.f90' real, intent(in) :: dd(NZMAX) integer, intent(in) :: nutc, nflow, nfhigh, nfqso, ntol, nsubmode, n2pass & - , ntrials, naggressive, nexp_decode + , ntrials, naggressive, ndepth, nexp_decode logical, intent(in) :: nrobust character(len=12), intent(in) :: mycall, hiscall character(len=6), intent(in) :: hisgrid @@ -28,7 +28,7 @@ contains call my_decoder%decode(my_callback,dd,npts=52*12000,newdat=.true.,nutc=nutc,nf1=nflow,nf2=nfhigh & ,nfqso=nfqso,ntol=ntol,nsubmode=nsubmode, minsync=0,nagain=.false. & ,n2pass=n2pass,nrobust=nrobust,ntrials=ntrials,naggressive=naggressive & - ,ndepth=0,mycall=mycall,hiscall=hiscall,hisgrid=hisgrid & + ,ndepth=ndepth,mycall=mycall,hiscall=hiscall,hisgrid=hisgrid & ,nexp_decode=nexp_decode) call timer('jt65a ',1) end subroutine test