From 5854fdfe133a99e718ab8a3e43c35cb83524e5c2 Mon Sep 17 00:00:00 2001 From: Joe Taylor Date: Mon, 10 Sep 2012 18:20:34 +0000 Subject: [PATCH] Code for defining the FFTs in wisdom?.bat. git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/map65@2570 ab8295b8-cf94-4d9e-aec4-7959e3be5d79 --- libm65/four2a.f90 | 12 +++++++++++- mainwindow.cpp | 2 +- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/libm65/four2a.f90 b/libm65/four2a.f90 index 01a4605f9..9cad07bb0 100644 --- a/libm65/four2a.f90 +++ b/libm65/four2a.f90 @@ -22,6 +22,7 @@ subroutine four2a(a,nfft,ndim,isign,iform) complex aa(NSMALL) integer nn(NPMAX),ns(NPMAX),nf(NPMAX),nl(NPMAX) integer*8 plan(NPMAX) !Actually should be i*8, but no matter +! character cfftw*12 data nplan/0/,npatience/1/ include 'fftw3.f' save plan,nplan,nn,ns,nf,nl @@ -41,6 +42,16 @@ subroutine four2a(a,nfft,ndim,isign,iform) nf(i)=iform nl(i)=nloc +! cfftw(1:2)='ci' +! if(nf(i).ne.1) cfftw(1:2)='ri' +! cfftw(3:3)='f' +! if(ns(i).eq.1) cfftw(3:3)='b' +! write(cfftw(4:),*) nn(i) +! cfftw=cfftw(1:3)//cfftw(5:) +! write(13,3999) i,nn(i),ns(i),nf(i),cfftw +!3999 format(4i10,2x,a12) +! flush(13) + ! Planning: FFTW_ESTIMATE, FFTW_ESTIMATE_PATIENT, FFTW_MEASURE, ! FFTW_PATIENT, FFTW_EXHAUSTIVE nflags=FFTW_ESTIMATE @@ -84,6 +95,5 @@ subroutine four2a(a,nfft,ndim,isign,iform) ! The test is only to silence a compiler warning: if(ndim.ne.-999) call sfftw_destroy_plan(plan(i)) enddo - return end subroutine four2a diff --git a/mainwindow.cpp b/mainwindow.cpp index 3a3c274f5..d87c8d1c8 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -26,7 +26,7 @@ BandMap* g_pBandMap = NULL; QSharedMemory mem_m65("mem_m65"); QString rev="$Rev$"; -QString Program_Title_Version=" MAP65 v2.3.0, r" + rev.mid(6,4) + +QString Program_Title_Version=" MAP65 v2.4.0, r" + rev.mid(6,4) + " by K1JT"; extern const int RxDataFrequency = 96000;