Commit Graph

297 Commits

Author SHA1 Message Date
Joe Taylor
647f809c97 Made a start at implementing an option to use multi-threaded FFTs.
New command-line option for jt9: [-m nthreads].  Default is nthreads=1.
Also refactored a loop in filbig.f90 that was taking far too much
time.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4916 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-01-30 21:28:10 +00:00
Joe Taylor
2ca414ac9d Allow use on nonthreading model by setting nthreads=0.
Require at least 10 iterations.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4915 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-01-30 01:45:37 +00:00
Joe Taylor
2557fa39f2 More minor cleanup.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4914 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-01-29 20:50:05 +00:00
Joe Taylor
88eb165e4c Set compiler flags.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4913 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-01-29 19:17:56 +00:00
Joe Taylor
518dd76c6b Clean up compiler warnings.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4912 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-01-29 19:16:37 +00:00
Joe Taylor
508594428a Another tweak.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4911 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-01-29 18:49:40 +00:00
Joe Taylor
7965d607c2 Remove diagnostic print.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4910 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-01-29 18:46:46 +00:00
Joe Taylor
0f0d63a714 Minor tweaks.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4909 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-01-29 18:38:51 +00:00
Joe Taylor
ec3fd43b8e More testing of FFTW performance...
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4908 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-01-29 18:29:41 +00:00
Joe Taylor
bba2757545 Testing some newer FFTW features.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4907 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-01-28 12:52:24 +00:00
Joe Taylor
7d02ab0e10 Add nfft.out (output from chkfft, on a Dell laptop).
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4848 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-12-22 14:06:40 +00:00
Joe Taylor
b9d5ebbb31 Some final(?) tweaks and additions to the chkfft mini-package.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4838 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-12-18 21:06:21 +00:00
Joe Taylor
ccba704126 A few more tweaks, and add the file nfft.dat of efficient FFT lengths.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4837 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-12-18 20:53:16 +00:00
Joe Taylor
01d0b747bc Several tweaks to chkfft.f90. Add descriptive file chkfft.txt.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4836 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-12-18 20:34:06 +00:00
Joe Taylor
20dd76d5d9 Add chkfft.f90; more thorough comments in four2a.f90.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4835 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-12-18 16:41:18 +00:00
Bill Somerville
935bacd2df Take advantage of the new KVASD v1.12
Pass the  temporary directory to  jt9 and use  it to give  the correct
paths  to  temporary files.  Also  jt9  passes  the absolute  path  to
kvasd.dat in the temporary directory to kvasd.

Clear out all the annoying cruft that has accumulated due to having to
run with $CWD as the temporary directory.

Use QStandardPaths  to find the  writable data directory  where needed
rather than passing it around  between objects. This now works because
the $CWD hasn't been changed.

Do away with the CMake option WSJT_STANDARD_FILE_LOCATIONS as it is no
longer needed.

Fix astro status file azel.dat formatting.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4732 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-12-03 00:06:54 +00:00
Joe Taylor
5c5283552a Update the linux Makefile for qmake/make builds.
Minor correction for wsjtx man page.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4635 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-11-24 14:54:47 +00:00
Joe Taylor
2f9fde0853 Add wisdom for the FFTs done by symspec_(), wsjtx[.exe].
Also complete the wrapper code in wisdom.c.
TBD: should be possible to use fftw3f.f03 instead of the ad hoc wisdom.c.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4617 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-11-21 15:17:22 +00:00
Joe Taylor
7223a29788 Decode from disk sets npatience = 2.
This means that the first decode from a saved data file will be slow,
but the saved wisdom for the decoded mode(s) will be better than
for the default npatience = 1.  All subsequent decodes in the same 
mode(s) will take advantage of the newly saved wisdom.



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4616 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-11-21 01:40:24 +00:00
Joe Taylor
eb45744177 Try a home-made wrapper for fftwf_export_wisdom_to_filename().
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4614 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-11-21 00:44:50 +00:00
Joe Taylor
175f1913b4 FFTW wisdom is now built into jt9[.exe].
New optional argument to jt9: -w patience
Default is patience = 1

Example timing measurements for 130610_2343.wav:

patience  plan   execute
          (s)      (s)
-----------------------------------------------
   0      0.01     1.25  FFTW_ESTIMATE
   1      0.69     1.25  FFTW_ESTIMATE_PATIENT
   2     16.97     1.15  FFTW_MEASURE
   3    390.88     1.15  FFTW_PATIENT

Conclusions, consistent with expectation based on past experience
with similar FFTs:
  - First decode (in each mode) with patience = 2 is slow.
  - Speed advantage of patience = 2 is small but measurable.
  - No measurable advantage in using patience > 2.

Present mainwindow.cpp has "-w 1" hard-wired.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4610 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-11-20 18:48:53 +00:00
Joe Taylor
11487c69fa Correct the logic for negative-frequency index into new ca array.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4609 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-11-19 20:17:15 +00:00
Joe Taylor
875dd0724b Several decoder optimizations, including implementation of FFTW wisdom.
Notes:
1. Equivalents of wisdom1.bat will be needed for *nix and OS X.  (The
   version now added to the source .../lib directory is an example only.)
2. Installers should offer to run the wisdom1[.bat] script at installation
   time.
3. wisdom1[.bat] and fftwf-wisdom[.exe] must be installed in .../bin directory 



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4607 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-11-19 17:23:57 +00:00
Joe Taylor
d9bc8f5dff Optimizations of JT9 and JT65 decoders; change clock in timer routine.
Both decoders now have slightly better performance and faster
execution.  The rare "duplicate decodes" in JT9 were eliminated.
On Windows, at least, calls to f90 routine system_clock() do not
provide correct wall time increments.  Changed to using secnds()
instead.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4571 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-10-30 19:29:16 +00:00
Joe Taylor
d9054d667c Adding programmer comments to decoding routines.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4558 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-10-24 21:43:43 +00:00
Bill Somerville
2f21733ea8 Added new library source
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4553 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-10-21 14:21:24 +00:00
Bill Somerville
4fc1ba02d2 Make/qmake tweaks
The lib/Makefile.MinGW makefile  has been enhanced to link  to the DLL
version of fftw3  which is the normal version of  the library that you
get with the Windows installer.

The library is  located by passing the FFTW3_DIR variable  on the make
command line. For example on my system:

	$ # In a MinGW console
	$ cd ~/src/wsjtx/lib
	$ make QT_DIR=/c/Tools/Qt/5.2.1/mingw48_32 \
	>  FFTW3_DIR=/c/Tools/fftw-3.3.3-dll32-2

Similarly with the qmake project:

	$ # In a Qt MinGW 32-bit console
	$ cd ~/src/wsjtx
	$ qmake \
	>  HAMLIB_DIR=c:/test-install/hamlib/mingw48_32 \
	>  FFTW3_DIR=c:/Tools/fftw-3.3.3-dll32-2
	$ mingw32-make



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4551 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-10-21 13:47:19 +00:00
Bill Somerville
9a2e0fad22 Tidy up unused files and move platform specific files
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4549 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-10-20 18:01:21 +00:00
Joe Taylor
51e4dbb1c6 Remove two unused routines. Remove declaration of unused variable.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4544 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-10-20 13:04:29 +00:00
Joe Taylor
1deb0e9fbc Remove a bad test message from jt9code.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4540 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-10-19 12:29:45 +00:00
Joe Taylor
c3258d9e3e Update the "Usage" messages for jt65code and jt9code.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4537 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-10-19 01:31:17 +00:00
Joe Taylor
44fe8b02a2 Build a list of test messages into jt9code and jt65code.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4536 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-10-19 01:29:30 +00:00
Joe Taylor
fdb12a76fa Minor tweak to the new output format for jt9code and jt65code.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4535 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-10-19 01:04:58 +00:00
Joe Taylor
0e52f8eb5c Forgot to commit a new utility function.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4534 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-10-19 00:57:29 +00:00
Joe Taylor
e4927efd62 Improve the way messages with compound calls are automatically generated.
Routine packmsg now tries the shortlist (Type 1 prefix or suffix) first.
Then it tries to to make a valid message using a Type 2 prefix or suffix.
If both fail, it packs the first 13 characters as a free-text message.

The GUI now generates the most useful messages with compound callsigns
of all valid types.



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4533 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-10-19 00:56:41 +00:00
Joe Taylor
ef3eb77f7f Use CPU_TIME() rather than SYSTEM_CLOCK() in timer.
SYSTEM_CLOCK() did not work as well, in the Windows Release build.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4525 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-10-17 18:38:06 +00:00
Joe Taylor
cade885d88 Fix a bug that can appear when unpacking compound callsigns.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4343 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-09-22 14:31:08 +00:00
Joe Taylor
e39f6dfc15 Resurrect jt9sim, in case we need it.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4305 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-09-11 15:32:22 +00:00
Joe Taylor
6e4abe317d More work needed...
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4301 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-09-11 00:29:50 +00:00
Joe Taylor
6e8dc0925a Save a temporary test program.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4300 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-09-11 00:07:49 +00:00
Joe Taylor
05b7c4680b Tweak the JT65 decoder so that it accepts DT down to -3.3 s.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4225 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-07-31 17:22:51 +00:00
Joe Taylor
1093e07994 Always allow JT65 decoding above the blue line, when in JT9+JT65 mode.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4198 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-07-09 12:58:12 +00:00
Bill Somerville
a1daf7afff Open decoded.txt in append mode when redoing a decode pass.
Before the subsequent decodes on a period (nagain/=0) were truncating
the file and confusing JTAlert.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4047 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-04-20 02:44:47 +00:00
Bill Somerville
a39c45f8f4 Work around what appears to be a gcc 4.9.0 defect.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4036 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-04-16 16:43:52 +00:00
Bill Somerville
be301a0529 Legacy makefile maintenance.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4020 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-04-13 18:49:09 +00:00
Bill Somerville
5f53ce0dd2 Squashed yet more compiler warnings.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3980 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-04-03 20:17:08 +00:00
Bill Somerville
25d0429b36 Squashed some compiler warnings.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3978 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-04-03 19:44:34 +00:00
Bill Somerville
025bfe52d6 Added recource file to qmake project file.
Made 'lib' makefiles a bit more portable.



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3976 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-04-02 17:37:18 +00:00
Bill Somerville
9763127789 Add new sources to lib Makefiles.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3971 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-03-31 03:11:16 +00:00
Joe Taylor
76e6f8acad New Makefile.jtsdk allows easy building of jt9.exe from command line.
(Many changes still needed to wsjtx.pro, in order to build from
within QtCreator.)


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3945 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-03-28 18:54:11 +00:00