From b79888348a8d2f30bc5537ac9995f9accceebeec Mon Sep 17 00:00:00 2001 From: Joe Taylor Date: Wed, 19 Apr 2017 20:06:46 +0000 Subject: [PATCH] Code cleanup. git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7642 ab8295b8-cf94-4d9e-aec4-7959e3be5d79 --- lib/fsk4hf/getfc1.f90 | 1 - lib/fsk4hf/mskhfsim.f90 | 17 +++-------------- 2 files changed, 3 insertions(+), 15 deletions(-) diff --git a/lib/fsk4hf/getfc1.f90 b/lib/fsk4hf/getfc1.f90 index df6e9bc64..aef97b774 100644 --- a/lib/fsk4hf/getfc1.f90 +++ b/lib/fsk4hf/getfc1.f90 @@ -54,6 +54,5 @@ subroutine getfc1(c,fc1) ! pnoise=(2500.0/df1)*base !Noise in 2500 Hz ! xsnrdb=db(psig/pnoise) - return end subroutine getfc1 diff --git a/lib/fsk4hf/mskhfsim.f90 b/lib/fsk4hf/mskhfsim.f90 index 8d64791b7..09092e372 100644 --- a/lib/fsk4hf/mskhfsim.f90 +++ b/lib/fsk4hf/mskhfsim.f90 @@ -125,11 +125,13 @@ program msksim a(2:5)=0. call twkfreq1(c,NZ,fs,a,c) !Mix c down by fc1+fc2 +! The following may not be necessary? ! z=sum(c(1680:2095)*cb13)/208.0 !Get phase from Barker 13 vector ! z0=z/abs(z) ! c=c*conjg(z0) !---------------------------------------------------------------- DT +! Not presently used: amax=0. jpk=0 do j=-20*NSPS,20*NSPS !Get jpk @@ -138,8 +140,6 @@ program msksim amax=abs(z) jpk=j endif -! write(53,1220) j,j*dt,z -!1220 format(i6,3f10.4) enddo xdt=jpk/fs @@ -165,19 +165,8 @@ program msksim if(niterations.lt.0 .or. count(msgbits.ne.decoded).gt.0 .or. & nbadcrc.ne.0) ifer=1 nfe=nfe+ifer -! write(58,1045) snrdb,nhard0,nhardsync0,niterations,nbadcrc,ifer, & -! nterms,fc1+fc2-f0,xdt -! if(ifer.eq.1) write(59,1045) snrdb,nhard0,nhardsync0,niterations, & -! nbadcrc,ifer,nterms,fc1+fc2-f0,xdt -!1045 format(f6.1,6i5,2f8.3) -! if(ifer.gt.0) then -! write(63,1046) iter,nhard0,nhardsync0 -!1046 format(/3i6) -! write(63,1047) ierror(1:117) -! write(63,1047) ierror(118:233) -!1047 format(70i1) -! endif enddo + fsigma=sqrt(sqf/iters) ber=float(nhard)/((NS+ND)*iters) fer=float(nfe)/iters