From 775a204a6898c0df080b5e1453652641fbf81bf0 Mon Sep 17 00:00:00 2001 From: Joe Taylor Date: Fri, 16 Jul 2021 09:37:37 -0400 Subject: [PATCH] Re-apply three good commits from before. --- map65/libm65/map65a.f90 | 9 +++------ map65/libm65/recvpkt.f90 | 2 +- map65/libm65/symspec.f90 | 2 +- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/map65/libm65/map65a.f90 b/map65/libm65/map65a.f90 index ee73004b9..8db456529 100644 --- a/map65/libm65/map65a.f90 +++ b/map65/libm65/map65a.f90 @@ -400,7 +400,7 @@ subroutine map65a(dd,ss,savg,newdat,nutc,fcenter,ntol,idphi,nfa,nfb, & close(16) endif call sec0(1,tsec0) - if(nhsym.eq.nhsym1 .and. tsec0.gt.3.0) go to 900 + if(nhsym.eq.nhsym1 .and. tsec0.gt.3.0) go to 700 if(nqd.eq.1 .and. nagain.eq.1) go to 900 if(nqd.eq.0 .and. bq65) then @@ -427,11 +427,8 @@ subroutine map65a(dd,ss,savg,newdat,nutc,fcenter,ntol,idphi,nfa,nfb, & ! Trim the list and produce a sorted index and sizes of groups. ! (Should trimlist remove all but best SNR for given UTC and message content?) - call trimlist(sig,km,ftol,indx,nsiz,nz) - - do i=1,km - done(i)=.false. - enddo +700 call trimlist(sig,km,ftol,indx,nsiz,nz) + done(1:km)=.false. j=0 ilatest=-1 do n=1,nz diff --git a/map65/libm65/recvpkt.f90 b/map65/libm65/recvpkt.f90 index 6b686a245..085b9c05e 100644 --- a/map65/libm65/recvpkt.f90 +++ b/map65/libm65/recvpkt.f90 @@ -11,7 +11,7 @@ subroutine recvpkt(nsam,nblock2,userx_no,k,buf4,buf8,buf16) integer*2 jd(4),kd(2),nblock2 real*4 xd(4),yd(2) real*8 fcenter - common/datcom/dd(4,5760000),ss(4,322,NFFT),savg(4,NFFT),fcenter,nutc,junk(36) + common/datcom/dd(4,5760000),ss(4,322,NFFT),savg(4,NFFT),fcenter,nutc,junk(38) equivalence (kd,d4) equivalence (jd,d8,yd) equivalence (xd,c16) diff --git a/map65/libm65/symspec.f90 b/map65/libm65/symspec.f90 index f7652ca06..2c21940f9 100644 --- a/map65/libm65/symspec.f90 +++ b/map65/libm65/symspec.f90 @@ -22,7 +22,7 @@ subroutine symspec(k,nxpol,ndiskdat,nb,nbslider,idphi,nfsample, & parameter (NFFT=32768) !Length of FFTs real*8 ts,hsym real*8 fcenter - common/datcom/dd(4,5760000),ss(4,322,NFFT),savg(4,NFFT),fcenter,nutc,junk(36) + common/datcom/dd(4,5760000),ss(4,322,NFFT),savg(4,NFFT),fcenter,nutc,junk(38) real*4 ssz5a(NFFT),w(NFFT),w2a(NFFT),w2b(NFFT) complex z,zfac complex zsumx,zsumy