Compiles on OPTI-745 under Win7.

New fftw library, compiled under Win7: used the file "go" in Msys directory 
/home/joe/fftw-3.2.2


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/map65@1757 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Joe Taylor 2010-01-15 20:29:35 +00:00
parent eda7d9e3cc
commit f3f547729f
3 changed files with 112 additions and 97 deletions

View File

@ -27,7 +27,7 @@ C The transform will be real and returned to the input array.
include 'fftw3.f'
save plan,nplan,nn,ns,nf,nl
if(nfft.lt.0) go to 999
if(nfft.lt.0 .or. ndim.lt.0) go to 999
nloc=loc(a)
do i=1,nplan
@ -44,7 +44,6 @@ C The transform will be real and returned to the input array.
C Planning: FFTW_ESTIMATE, FFTW_ESTIMATE_PATIENT, FFTW_MEASURE,
C FFTW_PATIENT, FFTW_EXHAUSTIVE
C NB: "EXHAUSTIVE" takes more or less forever, for long transforms.
npatience=1
nflags=FFTW_ESTIMATE
if(npatience.eq.1) nflags=FFTW_ESTIMATE_PATIENT
@ -60,15 +59,23 @@ C NB: "EXHAUSTIVE" takes more or less forever, for long transforms.
endif
call sleep_msec(0)
if(isign.eq.-1 .and. iform.eq.1) then
call sfftw_plan_dft_1d_(plan(i),nfft,a,a,
+ FFTW_FORWARD,nflags)
#ifdef CVF
call sfftw_plan_dft_1d_(plan(i),nfft,a,a,FFTW_FORWARD,nflags)
else if(isign.eq.1 .and. iform.eq.1) then
call sfftw_plan_dft_1d_(plan(i),nfft,a,a,
+ FFTW_BACKWARD,nflags)
call sfftw_plan_dft_1d_(plan(i),nfft,a,a,FFTW_BACKWARD,nflags)
else if(isign.eq.-1 .and. iform.eq.0) then
call sfftw_plan_dft_r2c_1d_(plan(i),nfft,a,a,nflags)
else if(isign.eq.1 .and. iform.eq.-1) then
call sfftw_plan_dft_c2r_1d_(plan(i),nfft,a,a,nflags)
#else
call sfftw_plan_dft_1d(plan(i),nfft,a,a,FFTW_FORWARD,nflags)
else if(isign.eq.1 .and. iform.eq.1) then
call sfftw_plan_dft_1d(plan(i),nfft,a,a,FFTW_BACKWARD,nflags)
else if(isign.eq.-1 .and. iform.eq.0) then
call sfftw_plan_dft_r2c_1d(plan(i),nfft,a,a,nflags)
else if(isign.eq.1 .and. iform.eq.-1) then
call sfftw_plan_dft_c2r_1d(plan(i),nfft,a,a,nflags)
#endif
else
stop 'Unsupported request in four2a'
endif
@ -84,12 +91,20 @@ C NB: "EXHAUSTIVE" takes more or less forever, for long transforms.
10 continue
call sleep_msec(0)
#ifdef CVF
call sfftw_execute_(plan(i))
#else
call sfftw_execute(plan(i))
#endif
call sleep_msec(0)
return
999 do i=1,nplan
#ifdef CVF
call sfftw_destroy_plan_(plan(i))
#else
call sfftw_destroy_plan(plan(i))
#endif
enddo
return

BIN
libfftw3f_win.a Normal file

Binary file not shown.

View File

@ -1,4 +1,4 @@
#--------------------------------------------------------------------- MAP65
#-------------------------------------------------------------------- MAP65
# $Date$ $Revision$
#
from Tkinter import *