From 62a229f1c540d8ac1022731fbe611230f9c0826b Mon Sep 17 00:00:00 2001 From: Bill Somerville Date: Wed, 4 Feb 2015 16:33:45 +0000 Subject: [PATCH] Fix typo that disabled JT65 decoding in dual mode. 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 --- lib/decoder.f90 | 2 +- lib/timer.f90 | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/decoder.f90 b/lib/decoder.f90 index 1dafc7135..44aba257b 100644 --- a/lib/decoder.f90 +++ b/lib/decoder.f90 @@ -46,7 +46,7 @@ subroutine decoder(ss,id2) !$omp parallel sections num_threads(2) !$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 if(newdat.ne.0) dd(1:npts65)=id2(1:npts65) nf1=nfa diff --git a/lib/timer.f90 b/lib/timer.f90 index 046e2fc55..741467954 100644 --- a/lib/timer.f90 +++ b/lib/timer.f90 @@ -27,6 +27,9 @@ subroutine timer(dname,k) data limtrace/0/,lu/-1/ !$omp threadprivate(level,space,onlevel) + ! currently this module is broken if called from multiple threads + !$ return ! diable if usinh OpenMP + tname=dname !$ write(thread,'(i1)') omp_get_thread_num() !$ tname=trim(dname)//'('//thread//')' ! decorate name with thread number