From f3b6a06c96a4a6843e7a02aeb02423766d164975 Mon Sep 17 00:00:00 2001 From: Joe Taylor Date: Thu, 22 Apr 2021 14:56:57 -0400 Subject: [PATCH] Remove dependence on wsjtx_dir.txt -- we don't need it now. --- map65/libm65/gen_q65_wave.f90 | 12 +++--------- map65/libm65/q65b.f90 | 13 +++---------- 2 files changed, 6 insertions(+), 19 deletions(-) diff --git a/map65/libm65/gen_q65_wave.f90 b/map65/libm65/gen_q65_wave.f90 index a3a4327f1..30b40579b 100644 --- a/map65/libm65/gen_q65_wave.f90 +++ b/map65/libm65/gen_q65_wave.f90 @@ -13,18 +13,11 @@ subroutine gen_q65_wave(msg,ntxfreq,mode65,msgsent,iwave,nwave) integer itone(85) integer*2 iwave(NMAX) integer icos7(0:6) - logical first data icos7/2,5,6,0,4,1,3/ !Defines a 7x7 Costas array - data twopi/6.283185307179586476d0/,first/.true./ + data twopi/6.283185307179586476d0/ save - if(first) then - open(9,file='wsjtx_dir.txt',status='old') - read(9,*) wsjtx_dir - close(9) - first=.false. - endif - + wsjtx_dir='.\' msgsent=msg ! 1 2 3 4 5 ! 12345678901234567890123456789012345678901234567890123456789012345 @@ -41,6 +34,7 @@ subroutine gen_q65_wave(msg,ntxfreq,mode65,msgsent,iwave,nwave) enddo read(9,1002) itone 1002 format(20i3) + close(9) ! Set up necessary constants nsym=85 diff --git a/map65/libm65/q65b.f90 b/map65/libm65/q65b.f90 index eb163ec54..19c21bba2 100644 --- a/map65/libm65/q65b.f90 +++ b/map65/libm65/q65b.f90 @@ -9,7 +9,7 @@ subroutine q65b(nutc,fcenter,nfcal,nfsample,ikhz,mousedf,ntol,xpol, & integer*2 iwave(60*12000) complex ca(MAXFFT1),cb(MAXFFT1) !FFTs of raw x,y data complex cx(0:MAXFFT2-1),cy(0:MAXFFT2-1),cz(0:MAXFFT2) - logical xpol,first + logical xpol real*8 fcenter character*12 mycall0,hiscall0 character*12 mycall,hiscall @@ -22,16 +22,9 @@ subroutine q65b(nutc,fcenter,nfcal,nfsample,ikhz,mousedf,ntol,xpol, & character*15 fname character*80 wsjtx_dir common/cacb/ca,cb - data first/.true./ save - - if(first) then - open(9,file='wsjtx_dir.txt',status='old') - read(9,'(a)') wsjtx_dir - close(9) - first=.false. - endif - + wsjtx_dir='.\' + mycall='K1JT' hiscall='IV3NWV' grid4='AA00'