From 1d159a18c7615e0c7d44a9391a6fb45892df5e09 Mon Sep 17 00:00:00 2001 From: Joe Taylor Date: Fri, 21 Feb 2020 13:36:49 -0500 Subject: [PATCH] More cleanup to satisfy fussy gcc 10 compiler. --- lib/extract.f90 | 2 +- lib/lpf1.f90 | 2 +- lib/refspectrum.f90 | 6 +++--- lib/timf2.f90 | 2 +- lib/wav11.f90 | 2 +- lib/wav12.f90 | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/lib/extract.f90 b/lib/extract.f90 index d1a483d35..78da285f7 100644 --- a/lib/extract.f90 +++ b/lib/extract.f90 @@ -209,7 +209,7 @@ subroutine extract(s3,nadd,mode65,ntrials,naggressive,ndepth,nflip, & tmp(i)=correct(64-i) enddo correct(1:63)=tmp(1:63) - call interleave63(correct,63,1) + call interleave63(correct,1) call graycode65(correct,63,1) call unpackmsg(dat4,decoded) !Unpack the user message ncount=0 diff --git a/lib/lpf1.f90 b/lib/lpf1.f90 index f2bb2377c..a620e9a55 100644 --- a/lib/lpf1.f90 +++ b/lib/lpf1.f90 @@ -11,7 +11,7 @@ subroutine lpf1(dd,jz,dat,jz2) fac=1.0/float(NFFT1) x(1:jz)=fac*dd(1:jz) x(jz+1:NFFT1)=0.0 - call four2a(x,NFFT1,1,-1,0) !Forwarxd FFT, r2c + call four2a(cx,NFFT1,1,-1,0) !Forwarxd FFT, r2c cx(NFFT2/2:)=0.0 ! df=11025.0/NFFT1 diff --git a/lib/refspectrum.f90 b/lib/refspectrum.f90 index bc5bede33..fdd302ae5 100644 --- a/lib/refspectrum.f90 +++ b/lib/refspectrum.f90 @@ -40,7 +40,7 @@ subroutine refspectrum(id2,bclear,brefspec,buseref,fname) if(brefspec) then x(0:NH-1)=0.001*id2(1:NH) x(NH:NFFT-1)=0.0 - call four2a(x,NFFT,1,-1,0) !r2c FFT + call four2a(cx,NFFT,1,-1,0) !r2c FFT do i=1,NH s(i)=s(i) + real(cx(i))**2 + aimag(cx(i))**2 @@ -134,7 +134,7 @@ subroutine refspectrum(id2,bclear,brefspec,buseref,fname) ! Make the filter causal for overlap and add. cx(0)=0.0 cx(1:NH)=fil(1:NH)/NFFT - call four2a(x,NFFT,1,1,-1) + call four2a(cx,NFFT,1,1,-1) x=cshift(x,-400) x(800:NH)=0.0 call four2a(cx,NFFT,1,-1,0) @@ -146,7 +146,7 @@ subroutine refspectrum(id2,bclear,brefspec,buseref,fname) x(0:NH-1)=id2(1:NH) x(NH:NFFT-1)=0.0 x=x/NFFT - call four2a(x,NFFT,1,-1,0) + call four2a(cx,NFFT,1,-1,0) cx=cfil*cx call four2a(cx,NFFT,1,1,-1) x(0:NH-1)=x(0:NH-1)+xs diff --git a/lib/timf2.f90 b/lib/timf2.f90 index 07f509831..bec391e2e 100644 --- a/lib/timf2.f90 +++ b/lib/timf2.f90 @@ -59,7 +59,7 @@ subroutine timf2(x0,k,nfft,nwindow,nb,peaklimit,x1, & x(0:nfft-1)=x0 if(nwindow.eq.2) x(0:nfft-1)=w(0:nfft-1)*x(0:nfft-1) - call four2a(x,nfft,1,-1,0) !First forward FFT, r2c + call four2a(cx,nfft,1,-1,0) !First forward FFT, r2c cxt(0:nh)=cx(0:nh) ! Identify frequencies with strong signals. diff --git a/lib/wav11.f90 b/lib/wav11.f90 index 3bba0bf8a..219b7880a 100644 --- a/lib/wav11.f90 +++ b/lib/wav11.f90 @@ -14,7 +14,7 @@ subroutine wav11(d2,npts,dd) jz=min(NZ12,npts) x(1:jz)=d2(1:jz) x(jz+1:)=0.0 - call four2a(x,nfft1,1,-1,0) !Forward FFT, r2c + call four2a(cx,nfft1,1,-1,0) !Forward FFT, r2c df=12000.0/NFFT1 ia=5000.0/df cx(ia:)=0.0 diff --git a/lib/wav12.f90 b/lib/wav12.f90 index 31fe1d599..ff655436a 100644 --- a/lib/wav12.f90 +++ b/lib/wav12.f90 @@ -34,7 +34,7 @@ subroutine wav12(d2,d1,npts,nbitsam2) x(1:jz)=d2(1:jz) x(jz+1:)=0.0 - call four2a(x,nfft1,1,-1,0) !Forwarxd FFT, r2c + call four2a(cx,nfft1,1,-1,0) !Forwarxd FFT, r2c cx(nfft1/2:)=0.0 call four2a(cx,nfft2,1,1,-1) !Inverse FFT, c2r