From 079927a8d8bac45aa367acc0923b6a6afb4be90a Mon Sep 17 00:00:00 2001
From: Joe Taylor <joe@princeton.edu>
Date: Mon, 12 Dec 2022 15:23:51 -0500
Subject: [PATCH] Compiler warnings...
---
q65w/libq65/decode0.f90 | 2 +-
q65w/libq65/filbig.f90 | 14 ++++++--------
q65w/libq65/ftnquit.f90 | 2 +-
q65w/libq65/q65c.f90 | 3 +--
q65w/libq65/q65wa.f90 | 2 +-
5 files changed, 10 insertions(+), 13 deletions(-)
diff --git a/q65w/libq65/decode0.f90 b/q65w/libq65/decode0.f90
index e15924c02..205924c86 100644
--- a/q65w/libq65/decode0.f90
+++ b/q65w/libq65/decode0.f90
@@ -1,4 +1,4 @@
-subroutine decode0(dd,ss,savg,nstandalone)
+subroutine decode0(dd,ss,savg)
use timer_module, only: timer
parameter (NSMAX=60*96000)
diff --git a/q65w/libq65/filbig.f90 b/q65w/libq65/filbig.f90
index 82c27ee83..415c9bb90 100644
--- a/q65w/libq65/filbig.f90
+++ b/q65w/libq65/filbig.f90
@@ -1,4 +1,4 @@
-subroutine filbig(dd,nmax,f0,newdat,nfsample,xpol,c4a,c4b,n4)
+subroutine filbig(dd,nmax,f0,newdat,nfsample,c4a,n4)
! Filter and downsample complex data stored in array dd(4,nmax).
! Output is downsampled from 96000 Hz to 1375.125 Hz.
@@ -6,14 +6,14 @@ subroutine filbig(dd,nmax,f0,newdat,nfsample,xpol,c4a,c4b,n4)
use timer_module, only: timer
parameter (MAXFFT1=5376000,MAXFFT2=77175)
real*4 dd(4,nmax) !Input data
- complex ca(MAXFFT1),cb(MAXFFT1) !FFTs of input
+ complex ca(MAXFFT1) !FFT of input
complex c4a(MAXFFT2) !Output data
real*8 df
real halfpulse(8) !Impulse response of filter (one sided)
complex cfilt(MAXFFT2) !Filter (complex; imag = 0)
real rfilt(MAXFFT2) !Filter (real)
integer*8 plan1,plan2,plan3,plan4,plan5
- logical first,xpol
+ logical first
include 'fftw3.f'
common/cacb/ca
equivalence (rfilt,cfilt)
@@ -41,9 +41,7 @@ subroutine filbig(dd,nmax,f0,newdat,nfsample,xpol,c4a,c4b,n4)
! Plan the FFTs just once
call timer('FFTplans ',0)
call sfftw_plan_dft_1d(plan1,nfft1,ca,ca,FFTW_BACKWARD,nflags)
- call sfftw_plan_dft_1d(plan2,nfft1,cb,cb,FFTW_BACKWARD,nflags)
call sfftw_plan_dft_1d(plan3,nfft2,c4a,c4a,FFTW_FORWARD,nflags)
- call sfftw_plan_dft_1d(plan4,nfft2,c4b,c4b,FFTW_FORWARD,nflags)
call sfftw_plan_dft_1d(plan5,nfft2,cfilt,cfilt,FFTW_BACKWARD,nflags)
call timer('FFTplans ',1)
@@ -70,7 +68,7 @@ subroutine filbig(dd,nmax,f0,newdat,nfsample,xpol,c4a,c4b,n4)
endif
! When new data comes along, we need to compute a new "big FFT"
-! If we just have a new f0, continue with the existing ca and cb.
+! If we just have a new f0, continue with the existing ca.
if(newdat.ne.0 .or. sum(abs(ca)).eq.0.0) then !### Test on ca should be unnecessary?
nz=min(nmax,nfft1)
@@ -90,11 +88,11 @@ subroutine filbig(dd,nmax,f0,newdat,nfsample,xpol,c4a,c4b,n4)
endif
! NB: f0 is the frequency at which we want our filter centered.
-! i0 is the bin number in ca and cb closest to f0.
+! i0 is the bin number in ca closest to f0.
i0=nint(f0/df) + 1
nh=nfft2/2
- do i=1,nh !Copy data into c4a and c4b,
+ do i=1,nh !Copy data into c4a
j=i0+i-1 !and apply the filter function
if(j.ge.1 .and. j.le.nfft1) then
c4a(i)=rfilt(i)*ca(j)
diff --git a/q65w/libq65/ftnquit.f90 b/q65w/libq65/ftnquit.f90
index b74e2b9e5..fe64fac29 100644
--- a/q65w/libq65/ftnquit.f90
+++ b/q65w/libq65/ftnquit.f90
@@ -2,7 +2,7 @@ subroutine ftnquit
! Destroy the FFTW plans
call four2a(a,-1,1,1,1)
- call filbig(id,-1,1,f0,newdat,nfsample,c4a,c4b,n4)
+ call filbig(id,-1,f0,newdat,nfsample,c4a,n4)
return
end subroutine ftnquit
diff --git a/q65w/libq65/q65c.f90 b/q65w/libq65/q65c.f90
index 13df3b68f..0ae531b06 100644
--- a/q65w/libq65/q65c.f90
+++ b/q65w/libq65/q65c.f90
@@ -44,9 +44,8 @@ subroutine q65c(itimer)
! first=.false.
npatience=1
- nstandalone=0
call timer('decode0 ',0)
- call decode0(dd,ss,savg,nstandalone)
+ call decode0(dd,ss,savg)
call timer('decode0 ',1)
return
diff --git a/q65w/libq65/q65wa.f90 b/q65w/libq65/q65wa.f90
index dd3194625..cd873b719 100644
--- a/q65w/libq65/q65wa.f90
+++ b/q65w/libq65/q65wa.f90
@@ -105,7 +105,7 @@ subroutine q65wa(dd,ss,savg,newdat,nutc,fcenter,ntol,nfa,nfb, &
jpz=1
call timer('filbig ',0)
- call filbig(dd,NSMAX,f0,newdat,nfsample,xpol,cx,cy,n5)
+ call filbig(dd,NSMAX,f0,newdat,nfsample,cx,n5)
call timer('filbig ',1)
! Do the wideband Q65 decode