From 01cc08574658a437b9cb02b3daa8578a1859edc3 Mon Sep 17 00:00:00 2001 From: Joe Taylor Date: Thu, 5 Jul 2007 16:08:20 +0000 Subject: [PATCH] Removed map65a0.f90, not used. Corrected the "open(23" statement in map65a, updated Makefiles. git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/map65@472 ab8295b8-cf94-4d9e-aec4-7959e3be5d79 --- Makefile.in | 7 +++---- Makefile.win | 7 +++---- map65.py | 2 +- map65a.f90 => map65a.F90 | 7 ++++++- 4 files changed, 13 insertions(+), 10 deletions(-) rename map65a.f90 => map65a.F90 (95%) diff --git a/Makefile.in b/Makefile.in index 25ffe0405..3ffe8a91c 100644 --- a/Makefile.in +++ b/Makefile.in @@ -40,13 +40,12 @@ all: Audio.so plrs plrr OBJS2C = init_rs.o encode_rs.o decode_rs.o plrr_subs.o loc.o deep65.o -F2PYONLY = ftn_init ftn_quit audio_init getfile azdist0 astro0 \ - spec map65a0 +F2PYONLY = ftn_init ftn_quit audio_init getfile azdist0 astro0 spec 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 \ + runqqq.F90 fivehz.F90 flushqqq.F90 \ + rfile.f90 rfile3a.f90 spec.f90 map65a.F90 display.F90 \ getfile.F90 getfile2.F90 recvpkt.F90 savetf2.F90 \ symspec.f90 sec_midn.F90 diff --git a/Makefile.win b/Makefile.win index aa5a41f73..856323d1a 100644 --- a/Makefile.win +++ b/Makefile.win @@ -11,13 +11,12 @@ all: MAP65.EXE OBJS2C = init_rs.o encode_rs.o decode_rs.o jtaudio.o plrr_subs.o -F2PYONLY = ftn_init ftn_quit audio_init getfile azdist0 astro0 \ - spec map65a0 +F2PYONLY = ftn_init ftn_quit audio_init getfile azdist0 astro0 spec SRCS2F90 = a2d.f90 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 \ + runqqq.f90 fivehz.f90 flushqqq.f90 \ + rfile.f90 rfile3a.f90 spec.f90 map65a.F90 display.F90 \ getfile.f90 getfile2.f90 recvpkt.f90 savetf2.F90 \ symspec.f90 sec_midn.F90 diff --git a/map65.py b/map65.py index ed9f685ae..8b0e8faad 100644 --- a/map65.py +++ b/map65.py @@ -1,4 +1,4 @@ -#-------------------------------------------------------------------- MAP65 +#--------------------------------------------------------------------- MAP65 # $Date$ $Revision$ # from Tkinter import * diff --git a/map65a.f90 b/map65a.F90 similarity index 95% rename from map65a.f90 rename to map65a.F90 index 43e12828e..90dd8b542 100644 --- a/map65a.f90 +++ b/map65a.F90 @@ -34,10 +34,15 @@ subroutine map65a(newdat) nrw26=0 endif +#ifdef Win32 + open(23,file='CALL3.TXT',status='unknown',share='denynone') +#else + open(23,file='CALL3.TXT',status='unknown') +#endif + if(nutc.ne.nutc0) nfile=nfile+1 nutc0=nutc nutcdata=nutc - open(23,file='CALL3.TXT',status='old') df=96000.0/NFFT !df = 96000/NFFT = 2.930 Hz ftol=0.020 !Frequency tolerance (kHz)