Reintegrate merge from wsjtx_exp branch.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6122 ab8295b8-cf94-4d9e-aec4-7959e3be5d79

lib/decoder.f90

@@ -13,13 +13,21 @@ subroutine decoder(ss,id2,nfsample)
        ntol,kin,nzhsym,nsubmode,nagain,ndepth,ntxmode,nmode,minw,nclearave,  &
        minsync,emedelay,dttol,nlist,listutc(10),datetime,mycall,mygrid,      &
        hiscall,hisgrid
-
   common/tracer/limtrace,lu
   integer onlevel(0:10)
   common/tracer_priv/level,onlevel
-  !$omp threadprivate(/tracer_priv/)
+!$omp threadprivate(/tracer_priv/)
   save
 
+  n2pass=ndepth/100000
+  ndepth=ndepth-n2pass*100000
+  n=ndepth/1000
+  if(mod(n,2).eq.0) ntrials=10**(n/2)
+  if(mod(n,2).eq.1) ntrials=3*10**(n/2)
+  if(n.eq.0) ntrials=0
+  naggressive=(ndepth - (n*1000))/10
+  ndepth=mod(ndepth,10)
+
   rms=sqrt(dot_product(float(id2(300000:310000)),                            &
                        float(id2(300000:310000)))/10000.0)
   if(rms.lt.2.0) go to 800 
@@ -55,7 +63,7 @@ subroutine decoder(ss,id2,nfsample)
      go to 800
   endif
 
-  ntol65=20
+  ntol65=ntol              !### is this OK? ###
   newdat65=newdat
   newdat9=newdat
 
@@ -70,7 +78,7 @@ subroutine decoder(ss,id2,nfsample)
      nf2=nfb
      call timer('jt65a   ',0)
      call jt65a(dd,npts65,newdat65,nutc,nf1,nf2,nfqso,ntol65,nsubmode,      &
-          nagain,ndecoded)
+          minsync,nagain,n2pass,ntrials,naggressive,ndepth,ndecoded)
      call timer('jt65a   ',1)
 
   else if(nmode.eq.9 .or. (nmode.eq.(65+9) .and. ntxmode.eq.9)) then
@@ -89,7 +97,7 @@ subroutine decoder(ss,id2,nfsample)
         nf2=nfb
         call timer('jt65a   ',0)
         call jt65a(dd,npts65,newdat65,nutc,nf1,nf2,nfqso,ntol65,nsubmode,   &
-             nagain,ndecoded)
+             minsync,nagain,n2pass,ntrials,naggressive,ndepth,ndecoded)
         call timer('jt65a   ',1)
      else
         call timer('decjt9  ',0)