From 9b4227f935ba270ae49d79abb2525ebd58197fc4 Mon Sep 17 00:00:00 2001 From: Joe Taylor Date: Sat, 24 Dec 2005 01:51:12 +0000 Subject: [PATCH] Fixed getfile for 16-bit reads in Win32. git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/WSJT/trunk@12 ab8295b8-cf94-4d9e-aec4-7959e3be5d79 --- decode3.f90 | 2 -- getfile.f90 | 2 ++ wsjt1.f | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/decode3.f90 b/decode3.f90 index 1634c6f90..ceb2f7c04 100644 --- a/decode3.f90 +++ b/decode3.f90 @@ -37,8 +37,6 @@ subroutine decode3(d2,jz,istart,filename) sum=sum+d2(i) enddo nave=nint(sum/jz) -! sq=0.d0 -! nsq=0 do i=1,jz d2(i)=d2(i)-nave d2d(i)=d2(i) diff --git a/getfile.f90 b/getfile.f90 index 8ce664b69..3f7578faa 100644 --- a/getfile.f90 +++ b/getfile.f90 @@ -41,6 +41,7 @@ subroutine getfile(fname,len) #ifdef Win32 open(10,file=fname,form='binary',status='old',err=998) read(10,end=998) hdr + #else call rfile2(fname,hdr,44+2*NDMAX,nr) #endif @@ -64,6 +65,7 @@ subroutine getfile(fname,len) if(ndata.gt.2*NDMAX) ndata=2*NDMAX #ifdef Win32 call rfile(10,d2c,ndata,ierr) + jzc=ndata/2 if(ierr.ne.0) go to 999 #else jzc=ndata/2 diff --git a/wsjt1.f b/wsjt1.f index c1ba99bcb..011a6cffc 100644 --- a/wsjt1.f +++ b/wsjt1.f @@ -140,6 +140,7 @@ sq=sq + (sum-avesq)**2 enddo rmspower=sqrt(sq/nz) + pick=.false. if(istart.gt.1) pick=.true. !This is a mouse-picked decoding if(.not.pick .and. (basevb.lt.-15.0 .or. basevb.gt.20.0)) goto 900