w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2025-11-03 21:40:52 -05:00
Code Issues Packages Projects Releases Wiki Activity
WSJT-X/lib/softsym.f90

55 lines
1.4 KiB
Fortran
Raw Normal View History

Merging code for v1.1 back into the main wsjtx branch. git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3462 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-07-08 13:17:22 +00:00
subroutine softsym(id2,npts8,nsps8,newdat,fpk,syncpk,snrdb,xdt, &
Further improvements to JT9 decoder. Better AFC (wider range of possible drifts; more accurate DT alignment). Better definition of metric tables used by Fano decoder. Zero-centeres soft symbols, instead of offset +128. Tuned several empirical parameters. git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@5004 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-03-04 17:07:15 +00:00
freq,drift,a3,schk,i1SoftSymbols)
Refactor the test9 routine into downsam9, peakdt9, symspec2, ... git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@2775 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2012-11-27 15:38:03 +00:00
Further code cleanup. git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3199 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-04-22 15:43:02 +00:00
! Compute the soft symbols
Make Fortran profiling timer function a callback with a default null implementation Groundwork for calling the decoders directly from C/C++ threads. To access the timer module timer_module must now be used. Instrumented code need only use the module function 'timer' which is now a procedure pointer that is guaranteed to be associated (unless null() is assigned to it, which should not be done). The default behaviour of 'timer' is to do nothing. If a Fortran program wishes to profile code it should now use the timer_impl module which contains a default timer implementation. The main program should call 'init_timer([filename])' before using 'timer' or calling routines that are instrumented. If 'init_timer([filename])'. If it is called then an optional file name may be provided with 'timer.out' being used as a default. The procedure 'fini_timer()' may be called to close the file. The default timer implementation is thread safe if used with OpenMP multi-threaded code so long as the OpenMP thread team is given the copyin(/timer_private/) attribute for correct operation. The common block /timer_private/ should be included for OpenMP use by including the file 'timer_common.inc'. The module 'lib/timer_C_wrapper.f90' provides a Fortran wrapper along with 'init' and 'fini' subroutines which allow a C/C++ application to call timer instrumented Fortran code and for it to receive callbacks of 'timer()' subroutine invocations. No C/C++ timer implementation is provided at this stage. git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6320 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-12-27 15:40:57 +00:00
use timer_module, only: timer
Reintegrate Joe's experimental VHF & up features As at ^/branches/wsjtx_exp@5271 git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@5272 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-04-22 17:48:03 +00:00
parameter (NZ2=1512,NZ3=1360)
Restructuring in preparation for direct decoder invocation from wsjtx Re-factor the JT4, JT65 and JT9 decoders as Fortran modules using type bound procedures, the decoder types implement a callback procedure such that he client of the decoder can interpret the decode results as they need. The JT4 decoder has a second callback that delivers message averaging status. Also the previously separate source files lib/jt4a.f90 and lib/avg4.f90 have been merged into lib/jt4_decode.f90 as private type bound procedures of the new jt4_decoder type. Re-factored the lib/decoder.f90 subroutine to utilize the new decoder types. Added local procedures to process decodes and averaging results including the necessary OpenMP synchronization directives for parallel JT9+JT65 decoding. Added the jt65_test module which is a basic test harness for JT65 decoding. Re-factored the jt65 utility to utilize the new jt65_test module. Changed a few integers to logical variables where their meaning is clearly binary. git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6324 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-12-29 23:52:55 +00:00
logical, intent(inout) :: newdat
Reintegrate Joe's experimental VHF & up features As at ^/branches/wsjtx_exp@5271 git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@5272 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-04-22 17:48:03 +00:00
complex c2(0:NZ2-1)
complex c3(0:NZ3-1)
complex c5(0:NZ3-1)
General code clean-up to eliminate compiler warnings. git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3198 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-04-22 15:08:20 +00:00
real a(3)
Refactor the test9 routine into downsam9, peakdt9, symspec2, ... git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@2775 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2012-11-27 15:38:03 +00:00
integer*1 i1SoftSymbolsScrambled(207)
integer*1 i1SoftSymbols(207)
include 'jt9sync.f90'
nspsd=16
ndown=nsps8/nspsd
Further code cleanup. git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3199 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-04-22 15:43:02 +00:00
! Mix, low-pass filter, and downsample to 16 samples per symbol
Add calls to timer(). git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3470 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-07-09 16:22:25 +00:00
call timer('downsam9',0)
Reintegrate Joe's experimental VHF & up features As at ^/branches/wsjtx_exp@5271 git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@5272 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-04-22 17:48:03 +00:00
call downsam9(id2,npts8,nsps8,newdat,nspsd,fpk,c2)
Add calls to timer(). git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3470 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-07-09 16:22:25 +00:00
call timer('downsam9',1)
Refactor the test9 routine into downsam9, peakdt9, symspec2, ... git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@2775 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2012-11-27 15:38:03 +00:00
Reintegrate Joe's experimental VHF & up features As at ^/branches/wsjtx_exp@5271 git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@5272 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-04-22 17:48:03 +00:00
call peakdt9(c2,nsps8,nspsd,c3,xdt) !Find DT
Refactor the test9 routine into downsam9, peakdt9, symspec2, ... git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@2775 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2012-11-27 15:38:03 +00:00
fsample=1500.0/ndown
a=0.
Add calls to timer(). git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3470 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-07-09 16:22:25 +00:00
call timer('afc9 ',0)
Commit several tentative attempts (now commented out) addressing a possible JT9 decoding issue. git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6366 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-01-08 20:55:17 +00:00
call afc9(c3,nz3,fsample,a,syncpk) !Find deltaF, fDot, extra DT
Add calls to timer(). git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3470 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-07-09 16:22:25 +00:00
call timer('afc9 ',1)
Added routine "chkss2" to test sync vector for sanity before attenpting Fano decode. git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3270 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-05-15 15:17:36 +00:00
freq=fpk - a(1)
drift=-2.0*a(2)
Commit several tentative attempts (now commented out) addressing a possible JT9 decoding issue. git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6366 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-01-08 20:55:17 +00:00
! write(*,3301) fpk,freq,a
!3301 format(2f9.3,3f10.4)
Further improvements to JT9 decoder. Better AFC (wider range of possible drifts; more accurate DT alignment). Better definition of metric tables used by Fano decoder. Zero-centeres soft symbols, instead of offset +128. Tuned several empirical parameters. git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@5004 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-03-04 17:07:15 +00:00
a3=a(3)
a(3)=0.
Refactor the test9 routine into downsam9, peakdt9, symspec2, ... git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@2775 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2012-11-27 15:38:03 +00:00
Add calls to timer(). git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3470 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-07-09 16:22:25 +00:00
call timer('twkfreq ',0)
Merging code for v1.1 back into the main wsjtx branch. git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3462 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-07-08 13:17:22 +00:00
call twkfreq(c3,c5,nz3,fsample,a) !Correct for delta f, f1, f2 ==> a(1:3)
Add calls to timer(). git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3470 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-07-09 16:22:25 +00:00
call timer('twkfreq ',1)
Refactor the test9 routine into downsam9, peakdt9, symspec2, ... git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@2775 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2012-11-27 15:38:03 +00:00
Further code cleanup. git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3199 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-04-22 15:43:02 +00:00
! Compute soft symbols (in scrambled order)
Add calls to timer(). git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3470 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-07-09 16:22:25 +00:00
call timer('symspec2',0)
Added routine "chkss2" to test sync vector for sanity before attenpting Fano decode. git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3270 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-05-15 15:17:36 +00:00
call symspec2(c5,nz3,nsps8,nspsd,fsample,freq,drift,snrdb,schk, &
i1SoftSymbolsScrambled)
Add calls to timer(). git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3470 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-07-09 16:22:25 +00:00
call timer('symspec2',1)
Refactor the test9 routine into downsam9, peakdt9, symspec2, ... git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@2775 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2012-11-27 15:38:03 +00:00
Further code cleanup. git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3199 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-04-22 15:43:02 +00:00
! Remove interleaving
Refactor the test9 routine into downsam9, peakdt9, symspec2, ... git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@2775 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2012-11-27 15:38:03 +00:00
call interleave9(i1SoftSymbolsScrambled,-1,i1SoftSymbols)
1. De-activate submodes JT9-5, JT9-10, and JT9-30. (This makes the shared memory region smaller by some 150 MB.) 2. Some code cleanup (removing unused lstrong, etc.)... git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3283 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-05-20 14:09:02 +00:00
return
Further code cleanup. git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3199 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-04-22 15:43:02 +00:00
end subroutine softsym
Reference in New Issue Copy Permalink