w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2025-06-25 06:35:17 -04:00
Code Issues Packages Projects Releases Wiki Activity

Compiler warnings...

Browse Source
This commit is contained in:
Joe Taylor 2022-12-12 15:23:51 -05:00
parent 173aab72e7
commit 079927a8d8
5 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
q65w/libq65/decode0.f90
View File

@ -1,4 +1,4 @@
subroutine decode0(dd,ss,savg,nstandalone) subroutine decode0(dd,ss,savg)
use timer_module, only: timer use timer_module, only: timer
parameter (NSMAX=60*96000) parameter (NSMAX=60*96000)

14
q65w/libq65/filbig.f90
View File

@ -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). ! Filter and downsample complex data stored in array dd(4,nmax).
! Output is downsampled from 96000 Hz to 1375.125 Hz. ! 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 use timer_module, only: timer
parameter (MAXFFT1=5376000,MAXFFT2=77175) parameter (MAXFFT1=5376000,MAXFFT2=77175)
real*4 dd(4,nmax) !Input data 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 complex c4a(MAXFFT2) !Output data
real*8 df real*8 df
real halfpulse(8) !Impulse response of filter (one sided) real halfpulse(8) !Impulse response of filter (one sided)
complex cfilt(MAXFFT2) !Filter (complex; imag = 0) complex cfilt(MAXFFT2) !Filter (complex; imag = 0)
real rfilt(MAXFFT2) !Filter (real) real rfilt(MAXFFT2) !Filter (real)
integer*8 plan1,plan2,plan3,plan4,plan5 integer*8 plan1,plan2,plan3,plan4,plan5
logical first,xpol logical first
include 'fftw3.f' include 'fftw3.f'
common/cacb/ca common/cacb/ca
equivalence (rfilt,cfilt) equivalence (rfilt,cfilt)
@ -41,9 +41,7 @@ subroutine filbig(dd,nmax,f0,newdat,nfsample,xpol,c4a,c4b,n4)
! Plan the FFTs just once ! Plan the FFTs just once
call timer('FFTplans ',0) call timer('FFTplans ',0)
call sfftw_plan_dft_1d(plan1,nfft1,ca,ca,FFTW_BACKWARD,nflags) 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(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 sfftw_plan_dft_1d(plan5,nfft2,cfilt,cfilt,FFTW_BACKWARD,nflags)
call timer('FFTplans ',1) call timer('FFTplans ',1)
@ -70,7 +68,7 @@ subroutine filbig(dd,nmax,f0,newdat,nfsample,xpol,c4a,c4b,n4)
endif endif
! When new data comes along, we need to compute a new "big FFT" ! 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? if(newdat.ne.0 .or. sum(abs(ca)).eq.0.0) then !### Test on ca should be unnecessary?
nz=min(nmax,nfft1) nz=min(nmax,nfft1)
@ -90,11 +88,11 @@ subroutine filbig(dd,nmax,f0,newdat,nfsample,xpol,c4a,c4b,n4)
endif endif
! NB: f0 is the frequency at which we want our filter centered. ! 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 i0=nint(f0/df) + 1
nh=nfft2/2 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 j=i0+i-1 !and apply the filter function
if(j.ge.1 .and. j.le.nfft1) then if(j.ge.1 .and. j.le.nfft1) then
c4a(i)=rfilt(i)*ca(j) c4a(i)=rfilt(i)*ca(j)

2
q65w/libq65/ftnquit.f90
View File

@ -2,7 +2,7 @@ subroutine ftnquit
! Destroy the FFTW plans ! Destroy the FFTW plans
call four2a(a,-1,1,1,1) 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 return
end subroutine ftnquit end subroutine ftnquit

3
q65w/libq65/q65c.f90
View File

@ -44,9 +44,8 @@ subroutine q65c(itimer)
! first=.false. ! first=.false.
npatience=1 npatience=1
nstandalone=0
call timer('decode0 ',0) call timer('decode0 ',0)
call decode0(dd,ss,savg,nstandalone) call decode0(dd,ss,savg)
call timer('decode0 ',1) call timer('decode0 ',1)
return return

2
q65w/libq65/q65wa.f90
View File

@ -105,7 +105,7 @@ subroutine q65wa(dd,ss,savg,newdat,nutc,fcenter,ntol,nfa,nfb, &
jpz=1 jpz=1
call timer('filbig ',0) 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) call timer('filbig ',1)
! Do the wideband Q65 decode ! Do the wideband Q65 decode