mirror of
https://github.com/saitohirga/WSJT-X.git
synced 2025-05-29 04:42:28 -04:00
Fix problem with gfortan not understanding:
complex c2(*) Replace it with complex c2(n2) and pass n2 as a parameter instead. Fix a missing -fPIC git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@298 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
parent
218bcee0ab
commit
532a93e7e3
2
fil651.f
2
fil651.f
@ -16,7 +16,7 @@ C fout = 2706.25 Hz
|
|||||||
parameter (NDOWN=2) !Downsample ratio
|
parameter (NDOWN=2) !Downsample ratio
|
||||||
|
|
||||||
real d(n1)
|
real d(n1)
|
||||||
complex c(*)
|
complex c(n2)
|
||||||
|
|
||||||
complex ck(-NH:NH)
|
complex ck(-NH:NH)
|
||||||
data ck/
|
data ck/
|
||||||
|
2
fil652.f
2
fil652.f
@ -14,7 +14,7 @@ C fout = 1378.125 Hz
|
|||||||
parameter (NH=NTAPS/2)
|
parameter (NH=NTAPS/2)
|
||||||
parameter (NDOWN=2) !Downsample ratio
|
parameter (NDOWN=2) !Downsample ratio
|
||||||
complex c1(n1)
|
complex c1(n1)
|
||||||
complex c2(*)
|
complex c2(n2)
|
||||||
|
|
||||||
C Filter coefficients:
|
C Filter coefficients:
|
||||||
real a(-NH:NH)
|
real a(-NH:NH)
|
||||||
|
2
fil653.f
2
fil653.f
@ -15,7 +15,7 @@ C BW = 200 Hz
|
|||||||
parameter (NH=NTAPS/2)
|
parameter (NH=NTAPS/2)
|
||||||
parameter (NDOWN=4) !Downsample ratio
|
parameter (NDOWN=4) !Downsample ratio
|
||||||
complex c1(n1)
|
complex c1(n1)
|
||||||
complex c2(*)
|
complex c2(n2)
|
||||||
|
|
||||||
C Filter coefficients:
|
C Filter coefficients:
|
||||||
real a(-NH:NH)
|
real a(-NH:NH)
|
||||||
|
@ -22,6 +22,7 @@ C compute ftrack.
|
|||||||
twopi=8*datan(1.d0)
|
twopi=8*datan(1.d0)
|
||||||
fsyncset=-300.d0
|
fsyncset=-300.d0
|
||||||
dt=2.d0/11025.d0 !Input dt (WSJT has downsampled by 2)
|
dt=2.d0/11025.d0 !Input dt (WSJT has downsampled by 2)
|
||||||
|
n2 = NMAX/2
|
||||||
call fil651(dat,jz,c2,n2) !Filter and complex mix; rate 1/2
|
call fil651(dat,jz,c2,n2) !Filter and complex mix; rate 1/2
|
||||||
dt=2.d0*dt !We're now downsampled by 4
|
dt=2.d0*dt !We're now downsampled by 4
|
||||||
|
|
||||||
@ -32,6 +33,7 @@ C compute ftrack.
|
|||||||
c2(i)=c2(i) * cmplx(cos(pha),-sin(pha))
|
c2(i)=c2(i) * cmplx(cos(pha),-sin(pha))
|
||||||
enddo
|
enddo
|
||||||
|
|
||||||
|
n3 = NMAX/4
|
||||||
call fil652(c2,n2,c3,n3) !Low-pass at +/- 500 Hz; rate 1/2
|
call fil652(c2,n2,c3,n3) !Low-pass at +/- 500 Hz; rate 1/2
|
||||||
dt=2.d0*dt !Down by 8
|
dt=2.d0*dt !Down by 8
|
||||||
|
|
||||||
@ -42,9 +44,11 @@ C compute ftrack.
|
|||||||
c3(i)=c3(i) * cmplx(cos(pha),-sin(pha))
|
c3(i)=c3(i) * cmplx(cos(pha),-sin(pha))
|
||||||
enddo
|
enddo
|
||||||
|
|
||||||
|
n4 = NMAX/16
|
||||||
call fil653(c3,n3,c4,n4) !Low-pass at +/- 100 Hz; rate 1/4
|
call fil653(c3,n3,c4,n4) !Low-pass at +/- 100 Hz; rate 1/4
|
||||||
dt=4.d0*dt !Down by 32
|
dt=4.d0*dt !Down by 32
|
||||||
|
|
||||||
|
n5 = NMAX/64
|
||||||
call fil653(c4,n4,c5,n5) !Low-pass at +/- 25 Hz; rate 1/4
|
call fil653(c4,n4,c5,n5) !Low-pass at +/- 25 Hz; rate 1/4
|
||||||
dt=4.d0*dt !Down by 128
|
dt=4.d0*dt !Down by 128
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user