From abd6ef6f77632c9510584b36024908132f9217ca Mon Sep 17 00:00:00 2001 From: Joe Taylor Date: Thu, 28 Jun 2007 00:44:19 +0000 Subject: [PATCH] Fixed several gfortran complaints. Brought Makefile.in up to date. git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/map65@426 ab8295b8-cf94-4d9e-aec4-7959e3be5d79 --- Makefile.in | 2 +- getfile2.F90 | 6 ++++-- recvpkt.F90 | 4 ++-- savetf2.F90 | 4 ++-- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/Makefile.in b/Makefile.in index 3e736646e..397b4e691 100644 --- a/Makefile.in +++ b/Makefile.in @@ -47,7 +47,7 @@ SRCS2F90 = astro0.F90 audio_init.F90 azdist0.f90 \ decode1.F90 ftn_init.F90 ftn_quit.f90 wsjtgen.F90 \ runqqq.F90 fivehz.F90 flushqqq.F90 map65a0.f90 \ rfile.f90 rfile3a.f90 spec.f90 map65a.f90 display.F90 \ - getfile.F90 getfile2.F90 recvpkt.F90 + getfile.F90 getfile2.F90 recvpkt.F90 savetf2.F90 SRCS2F77 = indexx.f gen65.f chkmsg.f \ gentone.f gencwid.f set.f db.f pctile.f sort.f ssort.f \ diff --git a/getfile2.F90 b/getfile2.F90 index 726e76172..2fba25ea1 100644 --- a/getfile2.F90 +++ b/getfile2.F90 @@ -49,8 +49,10 @@ subroutine getfile2(fname,len) #endif - read(filename(8:11),*) nutc - ndiskdat=1 + read(filename(8:11),*,err=996,end=996) nutc + go to 997 +996 print*,'Error reading UTC: ',filename,nutc +997 ndiskdat=1 ndecoding=4 mousebutton=0 go to 999 diff --git a/recvpkt.F90 b/recvpkt.F90 index 1583bdb0d..dac5b7fa0 100644 --- a/recvpkt.F90 +++ b/recvpkt.F90 @@ -65,8 +65,8 @@ subroutine recvpkt(iarg) do i=1,174 k=k+1 d8(k)=buf8(i) - sq=sq + float(id(1,k,1))**2 + float(id(1,k,1))**2 + & - float(id(1,k,1))**2 + float(id(1,k,1))**2 + sq=sq + float(int(id(1,k,1)))**2 + float(int(id(1,k,1)))**2 + & + float(int(id(1,k,1)))**2 + float(int(id(1,k,1)))**2 enddo sqave=sqave + u*(sq-sqave) rxnoise=10.0*log10(sqave) - 48.0 diff --git a/savetf2.F90 b/savetf2.F90 index 46acd1df8..d8082e79a 100644 --- a/savetf2.F90 +++ b/savetf2.F90 @@ -16,8 +16,8 @@ subroutine savetf2(id,nsave,nutc) do i=1,NPKTS s=0. do n=1,NSPP - s=s + float(id(1,i))**2 + float(id(2,i))**2 + float(id(3,i))**2 + & - float(id(4,i))**2 + s=s + float(int(id(1,i)))**2 + float(int(id(2,i)))**2 + & + float(int(id(3,i)))**2 + float(int(id(4,i)))**2 enddo ss(i)=fac*s t=t+dt