From 53c5d91db64b3fac15f149e93b816953e1ab4c68 Mon Sep 17 00:00:00 2001 From: Joe Taylor Date: Thu, 11 Sep 2008 16:10:55 +0000 Subject: [PATCH] More cleanup of compiler warning messages. git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/map65@1012 ab8295b8-cf94-4d9e-aec4-7959e3be5d79 --- getfile2.F90 | 3 --- map65.py | 2 +- map65a.F90 | 6 +----- savetf2.F90 | 11 ++++------- spec.f90 | 2 -- 5 files changed, 6 insertions(+), 18 deletions(-) diff --git a/getfile2.F90 b/getfile2.F90 index ad2ede349..4d2b17e3c 100644 --- a/getfile2.F90 +++ b/getfile2.F90 @@ -5,7 +5,6 @@ subroutine getfile2(fname,len) #endif character*(*) fname - character infile*15 real*8 sq include 'datcom.f90' @@ -52,9 +51,7 @@ subroutine getfile2(fname,len) read(filename(8:11),*) nutc ndiskdat=1 mousebutton=0 - go to 999 -998 ierr=1001 999 close(10) return end subroutine getfile2 diff --git a/map65.py b/map65.py index 7b5bdb029..b523c89c7 100644 --- a/map65.py +++ b/map65.py @@ -1,4 +1,4 @@ -#-------------------------------------------------------------------- MAP65 +#------------------------------------------------------------------ MAP65 # $Date$ $Revision$ # from Tkinter import * diff --git a/map65a.F90 b/map65a.F90 index 38eb7d4e3..49e42d2fb 100644 --- a/map65a.F90 +++ b/map65a.F90 @@ -9,7 +9,7 @@ subroutine map65a(newdat) real sig(MAXMSG,30) !Parameters of detected signals real a(5) character*22 msg(MAXMSG) - character*3 shmsg0(4),shmsg + character*3 shmsg0(4) integer indx(MAXMSG),nsiz(MAXMSG) logical done(MAXMSG) character decoded*22,blank*22 @@ -44,7 +44,6 @@ subroutine map65a(newdat) if(nutc.ne.nutc0) nfile=nfile+1 nutc0=nutc - nutcdata=nutc df=96000.0/NFFT !df = 96000/NFFT = 2.930 Hz ftol=0.020 !Frequency tolerance (kHz) foffset=0.001*(1270 + nfcal) @@ -117,7 +116,6 @@ subroutine map65a(newdat) syncshort,snr2,ipol2,dt2) ! ########################### Search for Shorthand Messages ################# - shmsg=' ' ! Is there a shorthand tone above threshold? thresh0=1.0 ! Use lower thresh0 at fQSO @@ -261,7 +259,6 @@ subroutine map65a(newdat) nsync2=nint(10.0*log10(sync2)) - 40 !### empirical ### if(decoded(1:4).eq.'RO ' .or. decoded(1:4).eq.'RRR ' .or. & decoded(1:4).eq.'73 ') nsync2=nsync2-6 - nw=0 !### Fix this! ### nwrite=nwrite+1 if(ndphi.eq.0) then write(11,1010) nkHz,ndf,npol,nutc,dt,nsync2,decoded,nkv,nqual @@ -331,7 +328,6 @@ subroutine map65a(newdat) nkv=sig(i,9) nqual=min(sig(i,10),10.0) ! rms0=sig(i,11) - nsavg=sig(i,12) !Was used for diagnostic ... do k=1,5 a(k)=sig(i,12+k) enddo diff --git a/savetf2.F90 b/savetf2.F90 index f7675913a..4206d2b10 100644 --- a/savetf2.F90 +++ b/savetf2.F90 @@ -15,9 +15,9 @@ subroutine savetf2(id,nsave,ntime,nutc,savedir) integer it(9),itt(8) if(nsave.eq.1) then +#ifdef CVF n2=ntime/60 n3=(n2-1)*60 -#ifdef CVF call gmtime(n3,it) it(5)=it(5)+1 #else @@ -43,14 +43,11 @@ subroutine savetf2(id,nsave,ntime,nutc,savedir) fname=savedir(1:iz)//fname #ifdef CVF open(17,file=fname,status='unknown',form='binary',err=998) +#else + open(17,file=fname,status='unknown',access='stream',err=998) +#endif write(17) id close(17) -#else - open(17,file=fname,status='unknown',form='unformatted', & - access='direct',recl=nbytes,err=998) - write(17,rec=1) id - close(17) -#endif else diff --git a/spec.f90 b/spec.f90 index 74546176e..a914effff 100644 --- a/spec.f90 +++ b/spec.f90 @@ -13,8 +13,6 @@ subroutine spec(brightness,contrast,ngain,nspeed,a,a2) logical first integer nstep(5) - integer b0,c0 - integer hist(0:1000) ! Could save memory by doing the averaging-by-7 (or 10?) of ss5 in symspec. include 'spcom.f90'