From 2b015a18232f4a3b6ba357c5802946d844cfd041 Mon Sep 17 00:00:00 2001 From: Joe Taylor Date: Thu, 11 Sep 2008 20:05:58 +0000 Subject: [PATCH] Fix Makefile.MinGW. Fix error computing signal level in getfile2.F90. git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/map65@1015 ab8295b8-cf94-4d9e-aec4-7959e3be5d79 --- Makefile.MinGW | 2 +- ftn_init.F90 | 2 +- getfile2.F90 | 7 +++---- map65.py | 2 +- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/Makefile.MinGW b/Makefile.MinGW index 3fc89c3a7..2a17a8bb6 100644 --- a/Makefile.MinGW +++ b/Makefile.MinGW @@ -3,7 +3,7 @@ CC = /mingw/bin/gcc FC = g95 CFLAGS = -I. -fPIC -FFLAGS = -Wall -Wno-precisiion-loss -fbounds-check -fPIC +FFLAGS = -Wall -Wno-precision-loss -fbounds-check -fPIC .f.o: ${FC} ${CPPFLAGS} ${FFLAGS} -c -o ${<:.f=.o} $< diff --git a/ftn_init.F90 b/ftn_init.F90 index e6a3e05fe..8694650f1 100644 --- a/ftn_init.F90 +++ b/ftn_init.F90 @@ -1,6 +1,6 @@ ! Fortran logical units used in WSJT6 ! -! 10 +! 10 binary input data, *.tf2 files ! 11 decoded.txt ! 12 decoded.ave ! 13 tsky.dat diff --git a/getfile2.F90 b/getfile2.F90 index 4d2b17e3c..3b25f8e36 100644 --- a/getfile2.F90 +++ b/getfile2.F90 @@ -43,8 +43,8 @@ subroutine getfile2(fname,len) ka=0.1*NSMAX kb=0.8*NSMAX do k=ka,kb - sq=sq + float(int(id(1,k,1)))**2 + float(int(id(1,k,1)))**2 + & - float(int(id(1,k,1)))**2 + float(int(id(1,k,1)))**2 + sq=sq + float(int(id(1,k,1)))**2 + float(int(id(2,k,1)))**2 + & + float(int(id(3,k,1)))**2 + float(int(id(4,k,1)))**2 enddo sqave=174*sq/(kb-ka+1) rxnoise=10.0*log10(sqave) - 48.0 @@ -52,6 +52,5 @@ subroutine getfile2(fname,len) ndiskdat=1 mousebutton=0 -999 close(10) - return +999 return end subroutine getfile2 diff --git a/map65.py b/map65.py index 87e2f99f7..7b5bdb029 100644 --- a/map65.py +++ b/map65.py @@ -1,4 +1,4 @@ -#------------------------------------------------------------------- MAP65 +#-------------------------------------------------------------------- MAP65 # $Date$ $Revision$ # from Tkinter import *