From 37e5489080e57f33a5aa78075f3d38f1535ac9dd Mon Sep 17 00:00:00 2001 From: Joe Taylor Date: Thu, 22 Oct 2020 19:07:21 -0400 Subject: [PATCH] QRA65 submodes A-E now basically OK for 15, 30, 60, 120 s sequences; 300 s is NG. --- lib/qra65_decode.f90 | 3 ++- lib/spec64.f90 | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/lib/qra65_decode.f90 b/lib/qra65_decode.f90 index 4762e8419..6c6cf29ae 100644 --- a/lib/qra65_decode.f90 +++ b/lib/qra65_decode.f90 @@ -120,7 +120,8 @@ contains irc=-1 if(snr1.ge.2.5) then - jpk0=(xdt+1.0)*6000 !### + jpk0=(xdt+1.0)*6000 !### + if(ntrperiod.le.30) jpk0=(xdt+0.5)*6000 !### if(jpk0.lt.0) jpk0=0 fac=1.0/32767.0 dd=fac*iwave diff --git a/lib/spec64.f90 b/lib/spec64.f90 index b6cc10c34..9a62434ee 100644 --- a/lib/spec64.f90 +++ b/lib/spec64.f90 @@ -1,7 +1,8 @@ subroutine spec64(c0,nsps,mode,mode64,jpk,s3,LL,NN) - parameter (MAXFFT=3840) - complex c0(0:360000) !Complex spectrum of dd() + parameter (MAXFFT=20736) +!### Fix this: + complex c0(0:1800000-1) !Complex spectrum of dd() complex cs(0:MAXFFT-1) !Complex symbol spectrum real s3(LL,NN) !Synchronized symbol spectra real xbase0(LL),xbase(LL) @@ -76,7 +77,6 @@ subroutine spec64(c0,nsps,mode,mode64,jpk,s3,LL,NN) ! write(72,3072) j,m,m/2,m/4,m/8 !3072 format(5i8) ! enddo -! if(nfft.ne.-999) stop return end subroutine spec64