From 0d535f24fb961515d7dc4cc73101d626aee72fa8 Mon Sep 17 00:00:00 2001
From: Joe Taylor <joe@princeton.edu>
Date: Thu, 12 Mar 2020 14:31:02 -0400
Subject: [PATCH] Move the AA and CC diagnostic writes from jt9a() to
 decoder().  Add ndecodes to BB and CC.

---
 lib/decoder.f90    | 17 +++++++++++++++++
 lib/ft8_decode.f90 |  4 ++--
 lib/jt9a.f90       | 18 +-----------------
 3 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/lib/decoder.f90 b/lib/decoder.f90
index f8c236cd0..2a5a24b29 100644
--- a/lib/decoder.f90
+++ b/lib/decoder.f90
@@ -35,6 +35,7 @@ subroutine multimode_decoder(ss,id2,params,nfsample)
   real ss(184,NSMAX)
   logical baddata,newdat65,newdat9,single_decode,bVHF,bad0,newdat,ex
   integer*2 id2(NTMAX*12000)
+  integer itime(8)
   type(params_block) :: params
   real*4 dd(NTMAX*12000)
   character(len=20) :: datetime
@@ -87,6 +88,15 @@ subroutine multimode_decoder(ss,id2,params,nfsample)
   if(params%nmode.eq.8) then
 ! We're in FT8 mode
 
+     call date_and_time(values=itime)
+     tsec=mod(itime(7)+0.001*itime(8),15.0)
+     if(tsec.lt.9.0) tsec=tsec+15.0
+     if(params%nzhsym.eq.41) write(71,3001) '        '
+     write(71,3001) 'AA Start',params%nzhsym,nint(ss(1,1)),           &
+          params%nutc,tsec
+3001 format(a8,2i6,i8,f8.3,i6)
+     flush(71)
+
      if(ncontest.eq.6) then
 ! Fox mode: initialize and open houndcallers.txt     
         inquire(file=trim(temp_dir)//'/houndcallers.txt',exist=ex)
@@ -291,6 +301,13 @@ subroutine multimode_decoder(ss,id2,params,nfsample)
   close(13)
   if(ncontest.eq.6) close(19)
   if(params%nmode.eq.4 .or. params%nmode.eq.65) close(14)
+  
+  call date_and_time(values=itime)
+  tsec=mod(itime(7)+0.001*itime(8),15.0)
+  if(tsec.lt.9.0) tsec=tsec+15.0
+  write(71,3001) 'CC Done ',params%nzhsym,nint(ss(1,1)),                &
+       params%nutc,tsec,ndecoded
+  flush(71)
 
   return
 
diff --git a/lib/ft8_decode.f90 b/lib/ft8_decode.f90
index cc3101ef3..fd3846db7 100644
--- a/lib/ft8_decode.f90
+++ b/lib/ft8_decode.f90
@@ -181,8 +181,8 @@ contains
 700 call date_and_time(values=itime)
    tsec=mod(itime(7)+0.001*itime(8),15.0)
    if(tsec.lt.9.0) tsec=tsec+15.0
-   write(71,3001) 'BB Bail ',nzhsym,nint(ss0),nutc,tsec
-3001 format(a8,2i6,i8,f8.3)
+   write(71,3001) 'BB Bail ',nzhsym,nint(ss0),nutc,tsec,ndecodes
+3001 format(a8,2i6,i8,f8.3,i6)
    flush(71)
    
 800 ndec_early=0
diff --git a/lib/jt9a.f90 b/lib/jt9a.f90
index 1b9dca97f..3ca567b81 100644
--- a/lib/jt9a.f90
+++ b/lib/jt9a.f90
@@ -62,16 +62,7 @@ subroutine jt9a()
      go to 999
   endif
   call c_f_pointer(address_jt9(),shared_data)
-  local_params=shared_data%params !save a copy because wsjtx carries on accessing
-  call date_and_time(values=itime)
-  tsec=mod(itime(7)+0.001*itime(8),15.0)
-  if(tsec.lt.9.0) tsec=tsec+15.0
-  if(local_params%nzhsym.eq.41) write(71,3001) '        '
-  write(71,3001) 'AA Start',local_params%nzhsym,nint(shared_data%ss(1,1)), &
-       local_params%nutc,tsec
-3001 format(a8,2i6,i8,f8.3)
-  flush(71)
-  
+  local_params=shared_data%params !save a copy because wsjtx carries on accessing  
   call flush(6)
   call timer('decoder ',0)
   if(local_params%nmode.eq.8 .and. local_params%ndiskdat) then
@@ -92,13 +83,6 @@ subroutine jt9a()
   call multimode_decoder(shared_data%ss,shared_data%id2,local_params,12000)
   call timer('decoder ',1)
 
-  call date_and_time(values=itime)
-  tsec=mod(itime(7)+0.001*itime(8),15.0)
-  if(tsec.lt.9.0) tsec=tsec+15.0
-  write(71,3001) 'CC Done ',local_params%nzhsym,nint(shared_data%ss(1,1)), &
-       local_params%nutc,tsec
-  flush(71)
-
 ! Wait here until GUI routine decodeDone() has re-created the .lock file
 100 inquire(file=trim(temp_dir)//'/.lock',exist=fileExists)
   if(fileExists) go to 10