From e3921407bd29ec0e841baa485d1d5c7a4513ff03 Mon Sep 17 00:00:00 2001 From: Joe Taylor Date: Thu, 23 May 2013 12:45:33 +0000 Subject: [PATCH] 1. Forgot to add the code for jt9c.f90, which was separated from jt9a.F90 in order to suppress a compiler warning. 2. Updated Makefile.linux. git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3300 ab8295b8-cf94-4d9e-aec4-7959e3be5d79 --- lib/Makefile.linux | 2 +- lib/jt9c.f90 | 21 +++++++++++++++++++++ mainwindow.cpp | 2 +- 3 files changed, 23 insertions(+), 2 deletions(-) create mode 100644 lib/jt9c.f90 diff --git a/lib/Makefile.linux b/lib/Makefile.linux index b2d127763..337414a29 100644 --- a/lib/Makefile.linux +++ b/lib/Makefile.linux @@ -36,7 +36,7 @@ libjt9.a: $(OBJS1) ar cr libjt9.a $(OBJS1) ranlib libjt9.a -OBJS2 = jt9.o jt9a.o +OBJS2 = jt9.o jt9a.o jt9c.o jt9: $(OBJS2) libjt9.a g++ -o jt9 $(OBJS2) libjt9.a -lfftw3f -lgfortran -lQtCore diff --git a/lib/jt9c.f90 b/lib/jt9c.f90 new file mode 100644 index 000000000..45e4e158e --- /dev/null +++ b/lib/jt9c.f90 @@ -0,0 +1,21 @@ +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) + + integer nparams0(21),nparams(21) + character*20 datetime + common/npar/nutc,ndiskdat,ntrperiod,nfqso,newdat,npts8,nfa,nfb,ntol, & + kin,nzhsym,nsave,nagain,ndepth,nrxlog,nfsample,datetime + equivalence (nparams,nutc) + + nparams=nparams0 !Copy parameters into common/npar/ + + call flush(6) + if(sum(nparams).ne.0) call decoder(ss,c0,0) + + return +end subroutine jt9c diff --git a/mainwindow.cpp b/mainwindow.cpp index 291882563..898cb010e 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -1,4 +1,4 @@ -//-------------------------------------------------------------- MainWindow +//------------------------------------------------------------- MainWindow #include "mainwindow.h" #include "ui_mainwindow.h" #include "devsetup.h"