diff --git a/q65w/libm65/CMakeLists.txt b/q65w/libm65/CMakeLists.txt index 7779289ab..c39385b1f 100644 --- a/q65w/libm65/CMakeLists.txt +++ b/q65w/libm65/CMakeLists.txt @@ -20,8 +20,6 @@ set (libm65_FSRCS ftnquit.f90 q65b.f90 geocentric.f90 - getpfx1.f90 - getpfx2.f90 graycode.f90 grid2deg.f90 grid2k.f90 @@ -29,14 +27,11 @@ set (libm65_FSRCS interleave63.f90 iqcal.f90 iqfix.f90 - k2grid.f90 lorentzian.f90 m65c.f90 map65a.f90 moon2.f90 moondop.f90 - nchar.f90 - pfxdump.f90 recvpkt.f90 rfile3a.f90 s3avg.f90 diff --git a/q65w/libm65/astro.f90 b/q65w/libm65/astro.f90 index d34819cc6..cf59bf27f 100644 --- a/q65w/libm65/astro.f90 +++ b/q65w/libm65/astro.f90 @@ -43,7 +43,7 @@ subroutine astro(nyear,month,nday,uth,nfreq,Mygrid,NStation,MoonDX, & if(nfreq.eq.2) freq=1.8e6 if(nfreq.eq.4) freq=3.5e6 - call MoonDop(nyear,month,nday,uth,lon,lat,RAMoon,DecMoon,LST,HA, & + call moondop(nyear,month,nday,uth,lon,lat,RAMoon,DecMoon,LST,HA, & AzMoon,ElMoon,vr,dist) ! Compute spatial polarization offset diff --git a/q65w/libm65/ftninit.f90 b/q65w/libm65/ftninit.f90 index c25c04f57..2741d662c 100644 --- a/q65w/libm65/ftninit.f90 +++ b/q65w/libm65/ftninit.f90 @@ -15,7 +15,6 @@ subroutine ftninit appd='.' addpfx=' ' - call pfxdump(appd//'/prefixes.txt') open(12,file=appd//'/q65w_decodes.txt',status='unknown') open(17,file=appd//'/red.dat',status='unknown') open(19,file=appd//'/livecq.txt',status='unknown') diff --git a/q65w/libm65/getpfx1.f90 b/q65w/libm65/getpfx1.f90 deleted file mode 100644 index 40fcc369c..000000000 --- a/q65w/libm65/getpfx1.f90 +++ /dev/null @@ -1,96 +0,0 @@ -subroutine getpfx1(callsign,k,nv2) - - character*12 callsign0,callsign,lof,rof - character*8 c - character addpfx*8,tpfx*4,tsfx*3 - logical ispfx,issfx,invalid - common/pfxcom/addpfx - include 'pfx.f90' - - callsign0=callsign - nv2=0 - iz=index(callsign,' ') - 1 - if(iz.lt.0) iz=12 - islash=index(callsign(1:iz),'/') - k=0 - c=' ' - if(islash.gt.0 .and. islash.le.(iz-4)) then -! Add-on prefix - c=callsign(1:islash-1) - callsign=callsign(islash+1:iz) - do i=1,NZ - if(pfx(i)(1:4).eq.c) then - k=i - go to 10 - endif - enddo - if(addpfx.eq.c) then - k=449 - go to 10 - endif - - else if(islash.eq.(iz-1)) then -! Add-on suffix - c=callsign(islash+1:iz) - callsign=callsign(1:islash-1) - do i=1,NZ2 - if(sfx(i).eq.c(1:1)) then - k=400+i - go to 10 - endif - enddo - endif - -10 if(islash.ne.0 .and.k.eq.0) then -! Original JT65 would force this compound callsign to be treated as -! plain text. In JT65v2, we will encode the prefix or suffix into nc1. -! The task here is to compute the proper value of k. - lof=callsign0(:islash-1) - rof=callsign0(islash+1:) - llof=len_trim(lof) - lrof=len_trim(rof) - ispfx=(llof.gt.0 .and. llof.le.4) - issfx=(lrof.gt.0 .and. lrof.le.3) - invalid=.not.(ispfx.or.issfx) - if(ispfx.and.issfx) then - if(llof.lt.3) issfx=.false. - if(lrof.lt.3) ispfx=.false. - if(ispfx.and.issfx) then - i=ichar(callsign0(islash-1:islash-1)) - if(i.ge.ichar('0') .and. i.le.ichar('9')) then - issfx=.false. - else - ispfx=.false. - endif - endif - endif - - if(invalid) then - k=-1 - else - if(ispfx) then - tpfx=lof(1:4) - k=nchar(tpfx(1:1)) - k=37*k + nchar(tpfx(2:2)) - k=37*k + nchar(tpfx(3:3)) - k=37*k + nchar(tpfx(4:4)) - nv2=1 - i=index(callsign0,'/') - callsign=callsign0(:i-1) - callsign=callsign0(i+1:) - endif - if(issfx) then - tsfx=rof(1:3) - k=nchar(tsfx(1:1)) - k=37*k + nchar(tsfx(2:2)) - k=37*k + nchar(tsfx(3:3)) - nv2=2 - i=index(callsign0,'/') - callsign=callsign0(:i-1) - endif - endif - endif - - return -end subroutine getpfx1 - diff --git a/q65w/libm65/getpfx2.f90 b/q65w/libm65/getpfx2.f90 deleted file mode 100644 index d747e7f29..000000000 --- a/q65w/libm65/getpfx2.f90 +++ /dev/null @@ -1,24 +0,0 @@ -subroutine getpfx2(k0,callsign) - - character callsign*12 - include 'pfx.f90' - character addpfx*8 - common/pfxcom/addpfx - - k=k0 - if(k.gt.450) k=k-450 - if(k.ge.1 .and. k.le.NZ) then - iz=index(pfx(k),' ') - 1 - callsign=pfx(k)(1:iz)//'/'//callsign - else if(k.ge.401 .and. k.le.400+NZ2) then - iz=index(callsign,' ') - 1 - callsign=callsign(1:iz)//'/'//sfx(k-400) - else if(k.eq.449) then - iz=index(addpfx,' ') - 1 - if(iz.lt.1) iz=8 - callsign=addpfx(1:iz)//'/'//callsign - endif - - return -end subroutine getpfx2 - diff --git a/q65w/libm65/k2grid.f90 b/q65w/libm65/k2grid.f90 deleted file mode 100644 index aa7631579..000000000 --- a/q65w/libm65/k2grid.f90 +++ /dev/null @@ -1,12 +0,0 @@ -subroutine k2grid(k,grid) - character grid*6 - - nlong=2*mod((k-1)/5,90)-179 - if(k.gt.450) nlong=nlong+180 - nlat=mod(k-1,5)+ 85 - dlat=nlat - dlong=nlong - call deg2grid(dlong,dlat,grid) - - return -end subroutine k2grid diff --git a/q65w/libm65/nchar.f90 b/q65w/libm65/nchar.f90 deleted file mode 100644 index 21593bd13..000000000 --- a/q65w/libm65/nchar.f90 +++ /dev/null @@ -1,23 +0,0 @@ -function nchar(c) - -! Convert ascii number, letter, or space to 0-36 for callsign packing. - - character c*1 - - n=0 !Silence compiler warning - if(c.ge.'0' .and. c.le.'9') then - n=ichar(c)-ichar('0') - else if(c.ge.'A' .and. c.le.'Z') then - n=ichar(c)-ichar('A') + 10 - else if(c.ge.'a' .and. c.le.'z') then - n=ichar(c)-ichar('a') + 10 - else if(c.ge.' ') then - n=36 - else - Print*,'Invalid character in callsign ',c,' ',ichar(c) - call exit(1) - endif - nchar=n - - return -end function nchar diff --git a/q65w/libm65/pfxdump.f90 b/q65w/libm65/pfxdump.f90 deleted file mode 100644 index 7587dbf72..000000000 --- a/q65w/libm65/pfxdump.f90 +++ /dev/null @@ -1,13 +0,0 @@ -subroutine pfxdump(fname) - character*(*) fname - include 'pfx.f90' - - open(11,file=fname,status='unknown') - write(11,1001) sfx -1001 format('Supported Suffixes:'/(11('/',a1,2x))) - write(11,1002) pfx -1002 format(/'Supported Add-On DXCC Prefixes:'/(15(a5,1x))) - close(11) - - return -end subroutine pfxdump