Changes to compile on K1JT machine, Kubuntu 6.06.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/map65@407 ab8295b8-cf94-4d9e-aec4-7959e3be5d79

Makefile.in

@@ -38,7 +38,7 @@ F2PY	= @F2PY@
 ###
 all:    Audio.so
 
-OBJS2C   = init_rs.o encode_rs.o decode_rs.o plrr_subs.o
+OBJS2C   = init_rs.o encode_rs.o decode_rs.o plrr_subs.o loc.o
 
 F2PYONLY = ftn_init ftn_quit audio_init getfile azdist0 astro0 \
 	spec map65a0

fil659.f

@@ -48,9 +48,9 @@ C  Loop over all output samples
          do j=-NH,NH
             w=w*wstep
             if(j.eq.3-NH) w0=w
-            z=a(j)*cmplx(float(id(1,j+k)),float(id(2,j+k)))*w
+            z=a(j)*cmplx(float(int(id(1,j+k))),float(int(id(2,j+k))))*w
             c2a(i)=c2a(i) + z
-            z=a(j)*cmplx(float(id(3,j+k)),float(id(4,j+k)))*w
+            z=a(j)*cmplx(float(int(id(3,j+k))),float(int(id(4,j+k))))*w
             c2b(i)=c2b(i) + z
          enddo
       enddo

filbig.f

@@ -65,8 +65,8 @@ C  If we just have a new f0, continue with the existing ca and cb.
       if(newdat.ne.0) then
          nz=min(nmax,NFFT1)
          do i=1,nz
-            ca(i)=cmplx(float(id(1,i)),float(id(2,i)))
+            ca(i)=cmplx(float(int(id(1,i))),float(int(id(2,i))))
-            cb(i)=cmplx(float(id(3,i)),float(id(4,i)))
+            cb(i)=cmplx(float(int(id(3,i))),float(int(id(4,i))))
          enddo
          if(nmax.lt.NFFT1) then
             do i=nmax+1,NFFT1

map65a.f90

@@ -56,7 +56,7 @@ subroutine map65a
 !  nflip=-1                     !May need to try both +/- 1
 !  ip0=4                       !Try all four?
 
-  open(23,file='CALL3.TXT',status='unknown')
+!  open(23,file='CALL3.TXT',status='old')
 
   df=96000.0/NFFT                    !df = 96000/NFFT = 2.930 Hz
   fa=0.0

plrs.f90

@@ -15,22 +15,27 @@ program plrs
   integer fd
   integer open,read,close
   integer nm(11)
-  character*8 fname
+  character*8 fname,arg
+  logical fast
   real*8 center_freq,dmsec,dtmspacket,tmsec
   common/plrscom/center_freq,msec2,fsample,iptr,nblock,userx_no,iusb,buf8(174)
 !                     8        4      4      4    2       1       1    1392
   data nm/45,46,48,50,52,54,55,56,57,58,59/
-  data nblock/0/
+  data nblock/0/,fast/.false./
 
   nargs=iargc()
-  if(nargs.ne.1) then
+  if(nargs.ne.1 .and. nargs.ne.2) then
-     print*,'Usage: plrs <iters>'
+     print*,'Usage: plrs [-f] <iters>'
      go to 999
   endif
+  call getarg(1,arg)
+  if(arg(1:2).eq.'-f') then
+     fast=.true.
+     call getarg(2,arg)
+  endif
+  read(arg,*) iters
 
   fname="all.tf2"//char(0)
-  iters=1
-
   userx_no=0
   iusb=1
   center_freq=144.125d0
@@ -73,7 +78,7 @@ program plrs
               nsec=time()-nsec0
               nwait=msec-1000*nsec
 !  Pace the data at close to its real-time rate
-              if(nwait.gt.0) call usleep(nwait*1000)
+              if(nwait.gt.0 .and. .not.fast) call usleep(nwait*1000)
            endif
            ns=mod(msec2/1000,60)
            if(ns.ne.ns0) write(*,1010) npkt,ns,0.001*msec2,nwait

recvpkt.F90

@@ -33,7 +33,7 @@ subroutine recvpkt(iarg)
 10 call recv_pkt(center_freq)
   lost=nblock-nblock0-1
   if(lost.ne.0 .and. .not.first) then
-     print*,'Lost packets?',nblock,nblock0,lost
+!     print*,'Lost packets?',nblock,nblock0,lost
      nlost=nlost + lost
      do i=1,174*lost
         k=k+1