w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2025-09-03 21:57:48 -04:00
Code Issues Packages Projects Releases Wiki Activity

Adjust the jt9 decoder to do the right decodes in parallel

Browse Source 
Also limit the required threads for parallel decoding to 2.

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

56
lib/decoder.f90
View File

@ -2,10 +2,16 @@ subroutine decoder(ss,id2)
use prog_args use prog_args
!$ interface
!$ subroutine omp_set_dynamic (flag)
!$ logical flag
!$ end subroutine omp_set_dynamic
!$ end interface
include 'constants.f90' include 'constants.f90'
real ss(184,NSMAX) real ss(184,NSMAX)
character*20 datetime character*20 datetime
logical done65,baddata logical baddata
integer*2 id2(NTMAX*12000) integer*2 id2(NTMAX*12000)
real*4 dd(NTMAX*12000) real*4 dd(NTMAX*12000)
common/npar/nutc,ndiskdat,ntrperiod,nfqso,newdat,npts8,nfa,nfsplit,nfb, & common/npar/nutc,ndiskdat,ntrperiod,nfqso,newdat,npts8,nfa,nfsplit,nfb, &
@ -35,36 +41,42 @@ subroutine decoder(ss,id2)
endif endif
ntol65=20 ntol65=20
done65=.false.
if((nmode.eq.65 .or. nmode.eq.65+9) .and. ntxmode.eq.65) then !$ call omp_set_dynamic(.true.)
! We're decoding JT65, and should do this mode first !$omp parallel sections num_threads(2)
!$omp section
if(nmode.eq.65 .or. (nmode.gt.65+9 .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) if(newdat.ne.0) dd(1:npts65)=id2(1:npts65)
nf1=nfa nf1=nfa
nf2=nfb nf2=nfb
call timer('jt65a ',0) call timer('jt65a ',0)
call jt65a(dd,npts65,newdat,nutc,nf1,nf2,nfqso,ntol65,nagain,ndecoded) call jt65a(dd,npts65,newdat,nutc,nf1,nf2,nfqso,ntol65,nagain,ndecoded)
call timer('jt65a ',1) call timer('jt65a ',1)
done65=.true. else
! We're decoding JT9 or should do this mode first
call timer('decjt9 ',0)
call decjt9(ss,id2,nutc,nfqso,newdat,npts8,nfa,nfsplit,nfb,ntol,nzhsym, &
nagain,ndepth,nmode)
call timer('decjt9 ',1)
endif endif
if(nmode.eq.65) go to 800
!$omp parallel sections
!$omp section !$omp section
call timer('decjt9 ',0) if(nmode.gt.65) then ! do the other mode in dual mode
call decjt9(ss,id2,nutc,nfqso,newdat,npts8,nfa,nfsplit,nfb,ntol,nzhsym, & if (ntxmode.eq.9) then
nagain,ndepth,nmode) if(newdat.ne.0) dd(1:npts65)=id2(1:npts65)
call timer('decjt9 ',1) nf1=nfa
nf2=nfb
!$omp section call timer('jt65a ',0)
if(nmode.ge.65 .and. (.not.done65)) then call jt65a(dd,npts65,newdat,nutc,nf1,nf2,nfqso,ntol65,nagain,ndecoded)
if(newdat.ne.0) dd(1:npts65)=id2(1:npts65) call timer('jt65a ',1)
nf1=nfa else
nf2=nfb call timer('decjt9 ',0)
call timer('jt65a ',0) call decjt9(ss,id2,nutc,nfqso,newdat,npts8,nfa,nfsplit,nfb,ntol,nzhsym, &
call jt65a(dd,npts65,newdat,nutc,nf1,nf2,nfqso,ntol65,nagain,ndecoded) nagain,ndepth,nmode)
call timer('jt65a ',1) call timer('decjt9 ',1)
end if
endif endif
!$omp end parallel sections !$omp end parallel sections