From 1eb63b6f84be1233d3296c0e6404f0824215e378 Mon Sep 17 00:00:00 2001 From: Joe Taylor Date: Thu, 19 Mar 2020 11:19:44 -0400 Subject: [PATCH] Silence compiler warnings. --- lib/fano232.f90 | 2 +- lib/fil3.f90 | 2 +- lib/fil3c.f90 | 2 +- lib/fil6521.f90 | 2 +- lib/filbig.f90 | 11 +++++------ 5 files changed, 9 insertions(+), 10 deletions(-) diff --git a/lib/fano232.f90 b/lib/fano232.f90 index 5ba95d46c..8888624c4 100644 --- a/lib/fano232.f90 +++ b/lib/fano232.f90 @@ -6,7 +6,7 @@ subroutine fano232(symbol,nbits,mettab,ndelta,maxcycles,dat, & ! written by Phil Karn, KA9Q. parameter (MAXBITS=103) - parameter (MAXBYTES=(MAXBITS+7)/8) + parameter (MAXBYTES=13) !(MAXBITS+7)/8 integer*1 symbol(0:2*MAXBITS-1) !Soft symbols (as unsigned i*1) integer*1 dat(MAXBYTES) !Decoded user data, 8 bits per byte integer mettab(-128:127,0:1) !Metric table diff --git a/lib/fil3.f90 b/lib/fil3.f90 index 0d660610f..4a90c7792 100644 --- a/lib/fil3.f90 +++ b/lib/fil3.f90 @@ -18,7 +18,7 @@ subroutine fil3(x1,n1,c2,n2) ! of 1500 Hz output samples. parameter (NTAPS=113) - parameter (NH=NTAPS/2) + parameter (NH=56) !NTAPS/2 parameter (NDOWN=8) !Downsample ratio = 1/8 real x1(n1) complex z diff --git a/lib/fil3c.f90 b/lib/fil3c.f90 index 6000253f8..0b4a85f1f 100644 --- a/lib/fil3c.f90 +++ b/lib/fil3c.f90 @@ -15,7 +15,7 @@ subroutine fil3c(c1,n1,c2,n2) ! of 1500 Hz output samples. parameter (NTAPS=113) - parameter (NH=NTAPS/2) + parameter (NH=56) !NTAPS/2 parameter (NDOWN=8) !Downsample ratio = 1/8 complex c1(n1) complex c2(n1/NDOWN) diff --git a/lib/fil6521.f90 b/lib/fil6521.f90 index ef4b5435f..0bd7ae72b 100644 --- a/lib/fil6521.f90 +++ b/lib/fil6521.f90 @@ -13,7 +13,7 @@ subroutine fil6521(c1,n1,c2,n2) ! fout (Hz) 344.531 Output sample rate parameter (NTAPS=21) - parameter (NH=NTAPS/2) + parameter (NH=10) !NTAPS/2 parameter (NDOWN=4) !Downsample ratio = 1/4 complex c1(n1) complex c2(n1/NDOWN) diff --git a/lib/filbig.f90 b/lib/filbig.f90 index 26a5edf52..b1d026f2e 100644 --- a/lib/filbig.f90 +++ b/lib/filbig.f90 @@ -8,7 +8,7 @@ subroutine filbig(dd,npts,f0,newdat,c4a,n4,sq0) use timer_module, only: timer parameter (NSZ=3413) - parameter (NFFT1=672000,NFFT2=77175) + parameter (NFFT1=672000,NFFT2=77175,NH2=38587) parameter (NZ2=1000) real*4 dd(npts) !Input data real*4 rca(NFFT1) @@ -59,7 +59,7 @@ subroutine filbig(dd,npts,f0,newdat,c4a,n4,sq0) enddo call fftwf_execute_dft(plan3,cfilt,cfilt) - base=real(cfilt(nfft2/2+1)) + base=real(cfilt(NH2+1)) do i=1,nfft2 rfilt(i)=real(cfilt(i))-base enddo @@ -93,8 +93,7 @@ subroutine filbig(dd,npts,f0,newdat,c4a,n4,sq0) ! i0 is the bin number in ca closest to f0. call timer('loops ',0) i0=nint(f0/df) + 1 - nh=nfft2/2 - do i=1,nh !Copy data into c4a and apply + do i=1,NH2 !Copy data into c4a and apply j=i0+i-1 !the filter function if(j.ge.1 .and. j.le.nfft1/2+1) then c4a(i)=rfilt(i)*ca(j) @@ -102,7 +101,7 @@ subroutine filbig(dd,npts,f0,newdat,c4a,n4,sq0) c4a(i)=0. endif enddo - do i=nh+1,nfft2 + do i=NH2+1,nfft2 j=i0+i-1-nfft2 ! if(j.lt.1) j=j+nfft1 !nfft1 was nfft2 if(j.ge.1) then @@ -112,7 +111,7 @@ subroutine filbig(dd,npts,f0,newdat,c4a,n4,sq0) endif enddo - nadd=nfft2/NZ2 + nadd=77 !nfft2/NZ2=77 i=0 do j=1,NZ2 s(j)=0.