diff --git a/lib/Makefile.MinGW b/lib/Makefile.MinGW
index f2678f296..cfd909493 100644
--- a/lib/Makefile.MinGW
+++ b/lib/Makefile.MinGW
@@ -39,7 +39,7 @@ libjt9.a: $(OBJS1)
ar cr libjt9.a $(OBJS1)
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
jt9.exe: $(OBJS2) libjt9.a
g++ -o jt9.exe $(OBJS2) $(LIBS2) libjt9.a ../libfftw3f_win.a \
diff --git a/lib/Makefile.linux b/lib/Makefile.linux
index 337414a29..086d310b0 100644
--- a/lib/Makefile.linux
+++ b/lib/Makefile.linux
@@ -1,7 +1,7 @@
CC = gcc
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
# Default rules
@@ -36,7 +36,7 @@ libjt9.a: $(OBJS1)
ar cr libjt9.a $(OBJS1)
ranlib libjt9.a
-OBJS2 = jt9.o jt9a.o jt9c.o
+OBJS2 = jt9.o jt9a.o jt9b.o jt9c.o
jt9: $(OBJS2) libjt9.a
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
$(FC) $(FFLAGS) -c redsync.f90
-jt9a.o: jt9a.F90
- $(FC) -DUNIX $(FFLAGS) -c jt9a.F90
-
ipcomm.o: ipcomm.cpp
g++ -c $(INCPATH) ipcomm.cpp
diff --git a/lib/chkss2.f90 b/lib/chkss2.f90
index 932e387c8..12b2a2e21 100644
--- a/lib/chkss2.f90
+++ b/lib/chkss2.f90
@@ -6,6 +6,7 @@ subroutine chkss2(ss2,freq,drift,schk)
include 'jt9sync.f90'
ave=sum(ss2)/(9*85)
+ if(freq+drift.eq.-999999.0) ave=0. !To silence compiler warning
s=ss2/ave-1.0
! call zplot9(s,freq,drift)
diff --git a/lib/deg2grid.f90 b/lib/deg2grid.f90
index 9ca3602f8..4fdc2af31 100644
--- a/lib/deg2grid.f90
+++ b/lib/deg2grid.f90
@@ -9,7 +9,7 @@ subroutine deg2grid(dlong0,dlat,grid)
if(dlong.gt.180.0) dlong=dlong-360.0
! 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
n2=(nlong-240*n1)/24 !2 degree square
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)
! 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
n2=(nlat-240*n1)/24 !1 degree square
n3=nlat-240*n1-24*n2 !2.5 minuts subsquare
diff --git a/lib/jt9.f90 b/lib/jt9.f90
index a82faf430..bc922eb47 100644
--- a/lib/jt9.f90
+++ b/lib/jt9.f90
@@ -101,8 +101,8 @@ program jt9
! Emit signal readyForFFT
ingain=0
call timer('symspec ',0)
- call symspec(k,ntrperiod,nsps,ingain,nb,nbslider,pxdb, &
- s,ccfred,df3,ihsym,nzap,slimit,lstrong,npts8)
+ call symspec(k,ntrperiod,nsps,ingain,pxdb,s,ccfred,df3, &
+ ihsym,nzap,slimit,lstrong,npts8)
call timer('symspec ',1)
nhsym0=nhsym
if(ihsym.ge.173) go to 10
diff --git a/lib/jt9a.F90 b/lib/jt9a.f90
similarity index 75%
rename from lib/jt9a.F90
rename to lib/jt9a.f90
index f4d4dc473..94f24fdcc 100644
--- a/lib/jt9a.F90
+++ b/lib/jt9a.f90
@@ -53,16 +53,3 @@ subroutine jt9a
999 return
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
diff --git a/lib/jt9c.f90 b/lib/jt9c.f90
index 45e4e158e..ada658be3 100644
--- a/lib/jt9c.f90
+++ b/lib/jt9c.f90
@@ -1,7 +1,6 @@
subroutine jt9c(ss,savg,c0,id2,nparams0)
parameter (NSMAX=22000)
- integer*1 detach_jt9
real*4 ss(184*NSMAX),savg(NSMAX)
complex c0(1800*1500)
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, &
kin,nzhsym,nsave,nagain,ndepth,nrxlog,nfsample,datetime
equivalence (nparams,nutc)
-
+
+ nutc=id2(1)+int(savg(1)) !Silence compiler warning
nparams=nparams0 !Copy parameters into common/npar/
call flush(6)
diff --git a/lib/packgrid.f90 b/lib/packgrid.f90
index 605ecf622..1cdb7313b 100644
--- a/lib/packgrid.f90
+++ b/lib/packgrid.f90
@@ -61,8 +61,8 @@ subroutine packgrid(grid,ng,text)
! OK, we have a properly formatted grid locator
40 call grid2deg(grid//'mm',dlong,dlat)
- long=dlong
- lat=dlat+ 90.0
+ long=int(dlong)
+ lat=int(dlat+ 90.0)
ng=((long+180)/2)*180 + lat
go to 900
diff --git a/lib/symspec.f90 b/lib/symspec.f90
index d88ecd931..a428fb0a4 100644
--- a/lib/symspec.f90
+++ b/lib/symspec.f90
@@ -1,5 +1,4 @@
-subroutine symspec(k,ntrperiod,nsps,ingain,nb,nbslider,pxdb,s,red, &
- df3,ihsym,npts8)
+subroutine symspec(k,ntrperiod,nsps,ingain,pxdb,s,red,df3,ihsym,npts8)
! Input:
! k pointer to the most recent new data
diff --git a/mainwindow.cpp b/mainwindow.cpp
index 898cb010e..9282be7b9 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -1,4 +1,4 @@
-//------------------------------------------------------------- MainWindow
+//-------------------------------------------------------------- MainWindow
#include "mainwindow.h"
#include "ui_mainwindow.h"
#include "devsetup.h"
@@ -563,8 +563,7 @@ void MainWindow::dataSink(int k)
nb=0;
if(m_NB) nb=1;
trmin=m_TRperiod/60;
- symspec_(&k, &trmin, &m_nsps, &m_inGain, &nb, &m_NBslider, &px, s, red,
- &df3, &ihsym, &npts8);
+ symspec_(&k,&trmin,&m_nsps,&m_inGain,&px,s,red,&df3,&ihsym,&npts8);
if(ihsym <=0) return;
QString t;
m_pctZap=nzap*100.0/m_nsps;