From 435c132bac517e6c1ec574eee530c53855d4d4c0 Mon Sep 17 00:00:00 2001
From: Joe Taylor <k1jt@arrl.org>
Date: Fri, 30 Sep 2016 16:52:16 +0000
Subject: [PATCH] Simplify the multi-threading code in msk144sync().

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7127 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
---
 lib/msk144sync.f90 | 42 +++++++++++++++++++-----------------------
 1 file changed, 19 insertions(+), 23 deletions(-)

diff --git a/lib/msk144sync.f90 b/lib/msk144sync.f90
index f8069d808..c8500e796 100644
--- a/lib/msk144sync.f90
+++ b/lib/msk144sync.f90
@@ -54,32 +54,28 @@ subroutine msk144sync(cdat,nframes,ntol,delf,navmask,npeaks,fc,fest,   &
   endif
 
   nfreqs=2*nint(ntol/delf) + 1
-  if(nfreqs.lt.0) then
-     nthreads=1
-     if2=nint(ntol/delf)
-     if1=-if2
-     call msk144_freq_search(cdat,fc,if1,if2,delf,nframes,navmask,cb,    &
-          xmax,bestf,c,xcc)
-     fest=fc+bestf
-  else
-     xm=0.0
-     bf=0.0
-     nthreads=min(4,OMP_GET_MAX_THREADS())
-     nstep=nfreqs/nthreads
-     call OMP_SET_NUM_THREADS(nthreads)
+  xm=0.0
+  bf=0.0
+  nthreads=min(8,OMP_GET_MAX_THREADS())
+  nstep=nfreqs/nthreads
+  call OMP_SET_NUM_THREADS(nthreads)
+
 !$OMP PARALLEL PRIVATE(id,if1,if2)
-     id=OMP_GET_THREAD_NUM() + 1            !Thread id = 1,2,...
-     if1=-nint(ntol/delf) + (id-1)*nstep
-     if2=if1+nstep-1
-     if(id.eq.nthreads) if2=nint(ntol/delf)
-     call msk144_freq_search(cdat,fc,if1,if2,delf,nframes,navmask,cb,    &
-          xm(id),bf(id),cs(1,id),xccs(1,id))
+  id=OMP_GET_THREAD_NUM() + 1            !Thread id = 1,2,...
+  if1=-nint(ntol/delf) + (id-1)*nstep
+  if2=if1+nstep-1
+  if(id.eq.nthreads) if2=nint(ntol/delf)
+  call msk144_freq_search(cdat,fc,if1,if2,delf,nframes,navmask,cb,    &
+       xm(id),bf(id),cs(1,id),xccs(1,id))
+!  write(73,3002) id,if1,if2,nfreqs,nthreads,bf(id),xm(id)
+!3002 format(5i5,2f10.3)
 !$OMP END PARALLEL
 
-     xmax=xm(1)
-     fest=fc+bf(1)
-     c=cs(1:NSPM,1)
-     xcc=xccs(0:NSPM-1,1)
+  xmax=xm(1)
+  fest=fc+bf(1)
+  c=cs(1:NSPM,1)
+  xcc=xccs(0:NSPM-1,1)
+  if(nthreads.gt.1) then
      do i=2,nthreads
         if(xm(i).gt.xmax) then
            xmax=xm(i)