mirror of https://github.com/saitohirga/WSJT-X.git
A few steps further toward use of datadir, tempdir.
This commit is contained in:
parent
00c9fb10e1
commit
189a0a35ab
|
@ -8,6 +8,7 @@ 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*80 cwd
|
||||||
character*200 datadir0,tempdir0,datadir,tempdir
|
character*200 datadir0,tempdir0,datadir,tempdir
|
||||||
common/osdir/datadir,tempdir
|
common/osdir/datadir,tempdir
|
||||||
common/npar/fcenter,nutc,idphi,mousedf,mousefqso,nagain, &
|
common/npar/fcenter,nutc,idphi,mousedf,mousefqso,nagain, &
|
||||||
|
@ -22,6 +23,11 @@ subroutine decode0(dd,ss,savg,nstandalone)
|
||||||
datadir="'"//trim(datadir0)//"'"
|
datadir="'"//trim(datadir0)//"'"
|
||||||
tempdir="'"//trim(tempdir0)//"'"
|
tempdir="'"//trim(tempdir0)//"'"
|
||||||
|
|
||||||
|
!###
|
||||||
|
call getcwd(cwd)
|
||||||
|
call ftninit(trim(cwd))
|
||||||
|
!###
|
||||||
|
|
||||||
call timer('decode0 ',0)
|
call timer('decode0 ',0)
|
||||||
if(newdat.ne.0) then
|
if(newdat.ne.0) then
|
||||||
nz=52*96000
|
nz=52*96000
|
||||||
|
|
|
@ -1,33 +1,42 @@
|
||||||
! Fortran logical units used in WSJT6
|
! Fortran logical units used in WSJT6
|
||||||
!
|
!
|
||||||
|
! 9
|
||||||
! 10 binary input data, *.tf2 files
|
! 10 binary input data, *.tf2 files
|
||||||
! 11 prefixes.txt
|
! 11 temp prefixes.txt
|
||||||
! 12 timer.out
|
! 12 data timer.out
|
||||||
! 13 map65.log
|
! 13 data map65.log
|
||||||
! 14
|
! 14
|
||||||
! 15
|
! 15
|
||||||
! 16
|
! 16
|
||||||
! 17 saved *.tf2 files
|
! 17 data/save saved *.tf2 files
|
||||||
! 18 test file to be transmitted (wsjtgen.f90)
|
! 18 data test file to be transmitted (wsjtgen.f90)
|
||||||
! 19 livecq.txt
|
! 19 data livecq.txt
|
||||||
! 20
|
! 20
|
||||||
! 21 map65_rx.log
|
! 21 data map65_rx.log
|
||||||
! 22
|
! 22
|
||||||
! 23 CALL3.TXT
|
! 23 data CALL3.TXT
|
||||||
! 24
|
! 24
|
||||||
! 25
|
! 25
|
||||||
! 26 tmp26.txt
|
! 26 temp tmp26.txt
|
||||||
! 27
|
! 27
|
||||||
! 28 fftw_wisdom.dat
|
! 28 data fftw_wisdom.dat
|
||||||
|
! 77 temp deep65
|
||||||
!------------------------------------------------ ftn_init
|
!------------------------------------------------ ftn_init
|
||||||
|
!subroutine ftninit(datadir,tempdir)
|
||||||
subroutine ftninit(appd)
|
subroutine ftninit(appd)
|
||||||
|
|
||||||
character*(*) appd
|
character*(*) appd
|
||||||
character firstline*30
|
character firstline*30
|
||||||
character addpfx*8
|
character addpfx*8
|
||||||
integer junk(256)
|
integer junk(256)
|
||||||
|
character*200 datadir,tempdir
|
||||||
|
common/osdir/datadir,tempdir
|
||||||
common/pfxcom/addpfx
|
common/pfxcom/addpfx
|
||||||
|
|
||||||
|
write(62,*) 'datadir: ',trim(datadir)
|
||||||
|
write(62,*) 'tempdir: ',trim(tempdir)
|
||||||
|
write(62,*) 'appd: ',appd
|
||||||
|
|
||||||
addpfx=' '
|
addpfx=' '
|
||||||
call pfxdump(appd//'/prefixes.txt')
|
call pfxdump(appd//'/prefixes.txt')
|
||||||
open(12,file=appd//'/timer_map65.out',status='unknown',err=920)
|
open(12,file=appd//'/timer_map65.out',status='unknown',err=920)
|
||||||
|
|
|
@ -83,7 +83,7 @@ program m65
|
||||||
mousefqso=70
|
mousefqso=70
|
||||||
endif
|
endif
|
||||||
|
|
||||||
call ftninit('.')
|
! call ftninit('.')
|
||||||
|
|
||||||
do ifile=ifile1,nargs
|
do ifile=ifile1,nargs
|
||||||
call getarg(ifile,infile)
|
call getarg(ifile,infile)
|
||||||
|
|
|
@ -9,15 +9,14 @@ subroutine m65a
|
||||||
integer*1 attach_m65,lock_m65,unlock_m65
|
integer*1 attach_m65,lock_m65,unlock_m65
|
||||||
integer size_m65
|
integer size_m65
|
||||||
integer*1, pointer :: p_m65
|
integer*1, pointer :: p_m65
|
||||||
character*80 cwd
|
|
||||||
logical fileExists
|
logical fileExists
|
||||||
|
character*80 cwd
|
||||||
common/tracer/limtrace,lu
|
common/tracer/limtrace,lu
|
||||||
|
|
||||||
call getcwd(cwd)
|
|
||||||
call ftninit(trim(cwd))
|
|
||||||
limtrace=0
|
limtrace=0
|
||||||
lu=12
|
lu=12
|
||||||
i1=attach_m65()
|
i1=attach_m65()
|
||||||
|
call getcwd(cwd)
|
||||||
|
|
||||||
10 inquire(file=trim(cwd)//'/.lock',exist=fileExists)
|
10 inquire(file=trim(cwd)//'/.lock',exist=fileExists)
|
||||||
if(fileExists) then
|
if(fileExists) then
|
||||||
|
|
Loading…
Reference in New Issue