w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2024-11-16 09:01:59 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix typo that disabled JT65 decoding in dual mode.

Browse Source 
Disable timer.out generation in OpenMP builds as it is broken.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4931 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Bill Somerville 2015-02-04 16:33:45 +00:00
parent a7c4d1001f
commit 36ad50735b
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/decoder.f90
View File

@ -46,7 +46,7 @@ subroutine decoder(ss,id2)
!$omp parallel sections num_threads(2) !$omp parallel sections num_threads(2)
!$omp section !$omp section
if(nmode.eq.65 .or. (nmode.gt.65+9 .and. ntxmode.eq.65)) then if(nmode.eq.65 .or. (nmode.gt.65 .and. ntxmode.eq.65)) then
! We're decoding JT65 or should do this mode first ! We're decoding JT65 or should do this mode first
if(newdat.ne.0) dd(1:npts65)=id2(1:npts65) if(newdat.ne.0) dd(1:npts65)=id2(1:npts65)
nf1=nfa nf1=nfa

3
lib/timer.f90
View File

@ -27,6 +27,9 @@ subroutine timer(dname,k)
data limtrace/0/,lu/-1/ data limtrace/0/,lu/-1/
!$omp threadprivate(level,space,onlevel) !$omp threadprivate(level,space,onlevel)
! currently this module is broken if called from multiple threads
!$ return ! diable if usinh OpenMP
tname=dname tname=dname
!$ write(thread,'(i1)') omp_get_thread_num() !$ write(thread,'(i1)') omp_get_thread_num()
!$ tname=trim(dname)//'('//thread//')' ! decorate name with thread number !$ tname=trim(dname)//'('//thread//')' ! decorate name with thread number