diff --git a/lib/hspec.f90 b/lib/hspec.f90 index b30f4a093..216f2ddf6 100644 --- a/lib/hspec.f90 +++ b/lib/hspec.f90 @@ -19,9 +19,10 @@ subroutine hspec(id2,k,nutc0,ntrpdepth,nrxfreq,ntol,bmsk144, & ! jh index of most recent data in green(), s() parameter (JZ=703) - character*80 line1 + character*(*) line1 + character*80 line0 character*(*) datadir - character*12 mycall,hiscall + character*(*) mycall,hiscall integer*2 id2(0:120*12000-1) logical*1 bmsk144,bshmsg,btrain,bswl real green(0:JZ-1) @@ -96,7 +97,12 @@ subroutine hspec(id2,k,nutc0,ntrpdepth,nrxfreq,ntol,bmsk144, & tt2=sum(float(abs(id2(k0:k0+3583)))) if(tt1.ne.0.0 .and. tt2.ne.0) then call mskrtd(id2(k-7168+1:k),nutc0,tsec,ntol,nrxfreq,ndepth, & - mycall,hiscall,bshmsg,btrain,pcoeffs,bswl,datadir,line1) + mycall,hiscall,bshmsg,btrain,pcoeffs,bswl,datadir,line0) + if(line0(1:1).eq.char(0)) then + line1(1:1)=char(0) + else + line1(1:62)=line0(1:62) + endif endif endif endif diff --git a/lib/mskrtd.f90 b/lib/mskrtd.f90 index b2a5cbb8a..d79165639 100644 --- a/lib/mskrtd.f90 +++ b/lib/mskrtd.f90 @@ -16,8 +16,8 @@ subroutine mskrtd(id2,nutc0,tsec,ntol,nrxfreq,ndepth,mycall,hiscall, & character*4 decsym !"&" for mskspd or "^" for long averages character*37 msgreceived !Decoded message character*37 msglast,msglastswl !Used for dupechecking - character*80 line !Formatted line with UTC dB T Freq Msg - character*12 mycall,hiscall + character*(*) line !Formatted line with UTC dB T Freq Msg + character*(*) mycall,hiscall character*37 recent_shmsgs(NSHMEM) character*(*) datadir @@ -70,8 +70,12 @@ subroutine mskrtd(id2,nutc0,tsec,ntol,nrxfreq,ndepth,mycall,hiscall, & msglastswl=' ' nsnrlast=-99 nsnrlastswl=-99 - mycall13=mycall//' ' - dxcall13=hiscall//' ' +! mycall13=mycall//' ' +! dxcall13=hiscall//' ' + mycall13=' ' + dxcall13=' ' + mycall13(1:12)=mycall + dxcall13(1:12)=hiscall first=.false. endif @@ -90,7 +94,7 @@ subroutine mskrtd(id2,nutc0,tsec,ntol,nrxfreq,ndepth,mycall,hiscall, & endif tframe=float(NSPM)/12000.0 - line=char(0) + line(1:1)=char(0) msgreceived=' ' max_iterations=10 niterations=0