Eliminate all compiler warnings from gfortran, in Ubuntu 12.04.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3301 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Joe Taylor 2013-05-23 13:33:29 +00:00
parent e3921407bd
commit f95ab994c0
10 changed files with 15 additions and 32 deletions

View File

@ -39,7 +39,7 @@ libjt9.a: $(OBJS1)
ar cr libjt9.a $(OBJS1) ar cr libjt9.a $(OBJS1)
ranlib libjt9.a ranlib libjt9.a
OBJS2 = jt9.o jt9a.o jt9c.o ipcomm.o sec_midn.o cutil.o OBJS2 = jt9.o jt9a.o jt9b.o jt9c.o ipcomm.o sec_midn.o cutil.o
LIBS2 = -L'c:/QtSDK/Desktop/Qt/4.7.4/mingw/lib' -lQtCore4 LIBS2 = -L'c:/QtSDK/Desktop/Qt/4.7.4/mingw/lib' -lQtCore4
jt9.exe: $(OBJS2) libjt9.a jt9.exe: $(OBJS2) libjt9.a
g++ -o jt9.exe $(OBJS2) $(LIBS2) libjt9.a ../libfftw3f_win.a \ g++ -o jt9.exe $(OBJS2) $(LIBS2) libjt9.a ../libfftw3f_win.a \

View File

@ -1,7 +1,7 @@
CC = gcc CC = gcc
FC = gfortran FC = gfortran
FFLAGS = -O2 -fbounds-check -Wall -fno-second-underscore FFLAGS = -O2 -fbounds-check -Wall -Wno-conversion -fno-second-underscore
CFLAGS = -I. -fbounds-check -mno-stack-arg-probe CFLAGS = -I. -fbounds-check -mno-stack-arg-probe
# Default rules # Default rules
@ -36,7 +36,7 @@ libjt9.a: $(OBJS1)
ar cr libjt9.a $(OBJS1) ar cr libjt9.a $(OBJS1)
ranlib libjt9.a ranlib libjt9.a
OBJS2 = jt9.o jt9a.o jt9c.o OBJS2 = jt9.o jt9a.o jt9b.o jt9c.o
jt9: $(OBJS2) libjt9.a jt9: $(OBJS2) libjt9.a
g++ -o jt9 $(OBJS2) libjt9.a -lfftw3f -lgfortran -lQtCore g++ -o jt9 $(OBJS2) libjt9.a -lfftw3f -lgfortran -lQtCore
@ -78,9 +78,6 @@ genjt9.o: genjt9.f90 jt9sync.f90
redsync.o: redsync.f90 jt9sync.f90 redsync.o: redsync.f90 jt9sync.f90
$(FC) $(FFLAGS) -c redsync.f90 $(FC) $(FFLAGS) -c redsync.f90
jt9a.o: jt9a.F90
$(FC) -DUNIX $(FFLAGS) -c jt9a.F90
ipcomm.o: ipcomm.cpp ipcomm.o: ipcomm.cpp
g++ -c $(INCPATH) ipcomm.cpp g++ -c $(INCPATH) ipcomm.cpp

View File

@ -6,6 +6,7 @@ subroutine chkss2(ss2,freq,drift,schk)
include 'jt9sync.f90' include 'jt9sync.f90'
ave=sum(ss2)/(9*85) ave=sum(ss2)/(9*85)
if(freq+drift.eq.-999999.0) ave=0. !To silence compiler warning
s=ss2/ave-1.0 s=ss2/ave-1.0
! call zplot9(s,freq,drift) ! call zplot9(s,freq,drift)

View File

@ -9,7 +9,7 @@ subroutine deg2grid(dlong0,dlat,grid)
if(dlong.gt.180.0) dlong=dlong-360.0 if(dlong.gt.180.0) dlong=dlong-360.0
! Convert to units of 5 min of longitude, working east from 180 deg. ! Convert to units of 5 min of longitude, working east from 180 deg.
nlong=60.0*(180.0-dlong)/5.0 nlong=int(60.0*(180.0-dlong)/5.0)
n1=nlong/240 !20-degree field n1=nlong/240 !20-degree field
n2=(nlong-240*n1)/24 !2 degree square n2=(nlong-240*n1)/24 !2 degree square
n3=nlong-240*n1-24*n2 !5 minute subsquare n3=nlong-240*n1-24*n2 !5 minute subsquare
@ -18,7 +18,7 @@ subroutine deg2grid(dlong0,dlat,grid)
grid(5:5)=char(ichar('a')+n3) grid(5:5)=char(ichar('a')+n3)
! Convert to units of 2.5 min of latitude, working north from -90 deg. ! Convert to units of 2.5 min of latitude, working north from -90 deg.
nlat=60.0*(dlat+90)/2.5 nlat=int(60.0*(dlat+90)/2.5)
n1=nlat/240 !10-degree field n1=nlat/240 !10-degree field
n2=(nlat-240*n1)/24 !1 degree square n2=(nlat-240*n1)/24 !1 degree square
n3=nlat-240*n1-24*n2 !2.5 minuts subsquare n3=nlat-240*n1-24*n2 !2.5 minuts subsquare

View File

@ -101,8 +101,8 @@ program jt9
! Emit signal readyForFFT ! Emit signal readyForFFT
ingain=0 ingain=0
call timer('symspec ',0) call timer('symspec ',0)
call symspec(k,ntrperiod,nsps,ingain,nb,nbslider,pxdb, & call symspec(k,ntrperiod,nsps,ingain,pxdb,s,ccfred,df3, &
s,ccfred,df3,ihsym,nzap,slimit,lstrong,npts8) ihsym,nzap,slimit,lstrong,npts8)
call timer('symspec ',1) call timer('symspec ',1)
nhsym0=nhsym nhsym0=nhsym
if(ihsym.ge.173) go to 10 if(ihsym.ge.173) go to 10

View File

@ -53,16 +53,3 @@ subroutine jt9a
999 return 999 return
end subroutine jt9a end subroutine jt9a
subroutine jt9b(jt9com,nbytes)
parameter (NTMAX=120)
parameter (NSMAX=1365)
integer*1 jt9com(0:nbytes-1)
kss=0
ksavg=kss + 4*184*NSMAX
kc0=ksavg + 4*NSMAX
kid2=kc0 + 2*4*NTMAX*1500
knutc=kid2 + 2*NTMAX*12000
call jt9c(jt9com(kss),jt9com(ksavg),jt9com(kc0),jt9com(kid2),jt9com(knutc))
return
end subroutine jt9b

View File

@ -1,7 +1,6 @@
subroutine jt9c(ss,savg,c0,id2,nparams0) subroutine jt9c(ss,savg,c0,id2,nparams0)
parameter (NSMAX=22000) parameter (NSMAX=22000)
integer*1 detach_jt9
real*4 ss(184*NSMAX),savg(NSMAX) real*4 ss(184*NSMAX),savg(NSMAX)
complex c0(1800*1500) complex c0(1800*1500)
integer*2 id2(1800*12000) integer*2 id2(1800*12000)
@ -11,7 +10,8 @@ subroutine jt9c(ss,savg,c0,id2,nparams0)
common/npar/nutc,ndiskdat,ntrperiod,nfqso,newdat,npts8,nfa,nfb,ntol, & common/npar/nutc,ndiskdat,ntrperiod,nfqso,newdat,npts8,nfa,nfb,ntol, &
kin,nzhsym,nsave,nagain,ndepth,nrxlog,nfsample,datetime kin,nzhsym,nsave,nagain,ndepth,nrxlog,nfsample,datetime
equivalence (nparams,nutc) equivalence (nparams,nutc)
nutc=id2(1)+int(savg(1)) !Silence compiler warning
nparams=nparams0 !Copy parameters into common/npar/ nparams=nparams0 !Copy parameters into common/npar/
call flush(6) call flush(6)

View File

@ -61,8 +61,8 @@ subroutine packgrid(grid,ng,text)
! OK, we have a properly formatted grid locator ! OK, we have a properly formatted grid locator
40 call grid2deg(grid//'mm',dlong,dlat) 40 call grid2deg(grid//'mm',dlong,dlat)
long=dlong long=int(dlong)
lat=dlat+ 90.0 lat=int(dlat+ 90.0)
ng=((long+180)/2)*180 + lat ng=((long+180)/2)*180 + lat
go to 900 go to 900

View File

@ -1,5 +1,4 @@
subroutine symspec(k,ntrperiod,nsps,ingain,nb,nbslider,pxdb,s,red, & subroutine symspec(k,ntrperiod,nsps,ingain,pxdb,s,red,df3,ihsym,npts8)
df3,ihsym,npts8)
! Input: ! Input:
! k pointer to the most recent new data ! k pointer to the most recent new data

View File

@ -1,4 +1,4 @@
//------------------------------------------------------------- MainWindow //-------------------------------------------------------------- MainWindow
#include "mainwindow.h" #include "mainwindow.h"
#include "ui_mainwindow.h" #include "ui_mainwindow.h"
#include "devsetup.h" #include "devsetup.h"
@ -563,8 +563,7 @@ void MainWindow::dataSink(int k)
nb=0; nb=0;
if(m_NB) nb=1; if(m_NB) nb=1;
trmin=m_TRperiod/60; trmin=m_TRperiod/60;
symspec_(&k, &trmin, &m_nsps, &m_inGain, &nb, &m_NBslider, &px, s, red, symspec_(&k,&trmin,&m_nsps,&m_inGain,&px,s,red,&df3,&ihsym,&npts8);
&df3, &ihsym, &npts8);
if(ihsym <=0) return; if(ihsym <=0) return;
QString t; QString t;
m_pctZap=nzap*100.0/m_nsps; m_pctZap=nzap*100.0/m_nsps;