w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2024-11-29 07:39:43 -05:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Working toward proper usage of OS-independent datadir and tempdir."

Browse Source 
This reverts commit 00c9fb10e1.
This commit is contained in:
Joe Taylor 2021-04-20 12:46:00 -04:00
parent 9bc9899b18
commit 4979336622
3 changed files with 11 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
map65/libm65/decode0.f90
View File

@ -8,20 +8,15 @@ subroutine decode0(dd,ss,savg,nstandalone)
integer hist(0:32768) integer hist(0:32768)
character mycall*12,hiscall*12,mygrid*6,hisgrid*6,datetime*20 character mycall*12,hiscall*12,mygrid*6,hisgrid*6,datetime*20
character mycall0*12,hiscall0*12,hisgrid0*6 character mycall0*12,hiscall0*12,hisgrid0*6
character*200 datadir0,tempdir0,datadir,tempdir character*300 datadir,tempdir
common/osdir/datadir,tempdir
common/npar/fcenter,nutc,idphi,mousedf,mousefqso,nagain, & common/npar/fcenter,nutc,idphi,mousedf,mousefqso,nagain, &
ndepth,ndiskdat,neme,newdat,nfa,nfb,nfcal,nfshift, & ndepth,ndiskdat,neme,newdat,nfa,nfb,nfcal,nfshift, &
mcall3,nkeep,ntol,nxant,nrxlog,nfsample,nxpol,nmode, & mcall3,nkeep,ntol,nxant,nrxlog,nfsample,nxpol,nmode, &
nfast,nsave,mycall,mygrid,hiscall,hisgrid,datetime, & nfast,nsave,mycall,mygrid,hiscall,hisgrid,datetime,datadir,tempdir
datadir0,tempdir0
common/tracer/ limtrace,lu common/tracer/ limtrace,lu
data neme0/-99/,mcall3b/1/ data neme0/-99/,mcall3b/1/
save save
datadir="'"//trim(datadir0)//"'"
tempdir="'"//trim(tempdir0)//"'"
call timer('decode0 ',0) call timer('decode0 ',0)
if(newdat.ne.0) then if(newdat.ne.0) then
nz=52*96000 nz=52*96000

5
map65/libm65/m65.f90
View File

@ -13,14 +13,13 @@ program m65
common/tracer/limtrace,lu common/tracer/limtrace,lu
real*8 fc0,fcenter real*8 fc0,fcenter
character*80 arg,infile character*80 arg,infile
character*200 datadir0,tempdir0 character*300 datadir,tempdir
character mycall*12,hiscall*12,mygrid*6,hisgrid*6,datetime*20 character mycall*12,hiscall*12,mygrid*6,hisgrid*6,datetime*20
common/datcom/dd(4,5760000),ss(4,322,NFFT),savg(4,NFFT),fc0,nutc0,junk(36) common/datcom/dd(4,5760000),ss(4,322,NFFT),savg(4,NFFT),fc0,nutc0,junk(36)
common/npar/fcenter,nutc,idphi,mousedf,mousefqso,nagain, & common/npar/fcenter,nutc,idphi,mousedf,mousefqso,nagain, &
ndepth,ndiskdat,neme,newdat,nfa,nfb,nfcal,nfshift, & ndepth,ndiskdat,neme,newdat,nfa,nfb,nfcal,nfshift, &
mcall3,nkeep,ntol,nxant,nrxlog,nfsample,nxpol,nmode, & mcall3,nkeep,ntol,nxant,nrxlog,nfsample,nxpol,nmode, &
nfast,nsave,mycall,mygrid,hiscall,hisgrid,datetime, & nfast,nsave,mycall,mygrid,hiscall,hisgrid,datetime,datadir,tempdir
datadir0,tempdir0
nargs=iargc() nargs=iargc()
if(nargs.ne.1 .and. nargs.lt.5) then if(nargs.ne.1 .and. nargs.lt.5) then

15
map65/libm65/m65a.f90
View File

@ -63,17 +63,16 @@ subroutine m65c(dd,ss,savg,nparams0)
integer*1 detach_m65 integer*1 detach_m65
real*4 dd(4,5760000),ss(4,322,32768),savg(4,32768) real*4 dd(4,5760000),ss(4,322,32768),savg(4,32768)
real*8 fcenter real*8 fcenter
integer nparams0(139),nparams(139) integer nparams0(189),nparams(189)
character*12 mycall,hiscall character*12 mycall,hiscall
character*6 mygrid,hisgrid character*6 mygrid,hisgrid
character*20 datetime character*20 datetime
character*200 datadir0,tempdir0 character*300 datadir,tempdir
character*1 c0 character*1 c0
common/npar/fcenter,nutc,idphi,mousedf,mousefqso,nagain, & common/npar/fcenter,nutc,idphi,mousedf,mousefqso,nagain, &
ndepth,ndiskdat,neme,newdat,nfa,nfb,nfcal,nfshift, & ndepth,ndiskdat,neme,newdat,nfa,nfb,nfcal,nfshift, &
mcall3,nkeep,ntol,nxant,nrxlog,nfsample,nxpol,nmode, & mcall3,nkeep,ntol,nxant,nrxlog,nfsample,nxpol,nmode, &
nfast,nsave,mycall,mygrid,hiscall,hisgrid,datetime, & nfast,nsave,mycall,mygrid,hiscall,hisgrid,datetime,datadir,tempdir
datadir0,tempdir0
equivalence (nparams,fcenter) equivalence (nparams,fcenter)
nparams=nparams0 !Copy parameters into common/npar/ nparams=nparams0 !Copy parameters into common/npar/
@ -93,11 +92,11 @@ subroutine m65c(dd,ss,savg,nparams0)
i0=index(datetime,c0) i0=index(datetime,c0)
if(i0.gt.0) datetime=datetime(1:i0-1) if(i0.gt.0) datetime=datetime(1:i0-1)
i0=index(datadir0,c0) i0=index(datadir,c0)
if(i0.gt.0) datadir0=datadir0(1:i0-1) if(i0.gt.0) datadir=datadir(1:i0-1)
i0=index(tempdir0,c0) i0=index(tempdir,c0)
if(i0.gt.0) tempdir0=tempdir0(1:i0-1) if(i0.gt.0) tempdir=tempdir(1:i0-1)
if(iand(nrxlog,1).ne.0) then if(iand(nrxlog,1).ne.0) then
write(21,1000) datetime(:17) write(21,1000) datetime(:17)