Clean up js8d to jd8e to make it clear the difference

lib/decoder.f90

@@ -6,7 +6,7 @@ subroutine multimode_decoder(ss,id2,params,nfsample)
   use ft8_decode
   use js8b_decode
   use js8c_decode
-  use js8d_decode
+  use js8e_decode
 
   include 'jt9com.f90'
   include 'timer_common.inc'
@@ -23,9 +23,9 @@ subroutine multimode_decoder(ss,id2,params,nfsample)
      integer :: decoded
   end type counting_js8c_decoder
 
-  type, extends(js8d_decoder) :: counting_js8d_decoder
+  type, extends(js8e_decoder) :: counting_js8e_decoder
      integer :: decoded
-  end type counting_js8d_decoder
+  end type counting_js8e_decoder
 
   real ss(184,NSMAX)
   logical baddata,newdat65,newdat9,single_decode,bVHF,bad0,newdat,trydecode
@@ -39,7 +39,7 @@ subroutine multimode_decoder(ss,id2,params,nfsample)
   type(counting_ft8_decoder)  :: my_js8a
   type(counting_js8b_decoder) :: my_js8b
   type(counting_js8c_decoder) :: my_js8c
-  type(counting_js8d_decoder) :: my_js8d
+  type(counting_js8e_decoder) :: my_js8e
 
   !cast C character arrays to Fortran character strings
   datetime=transfer(params%datetime, datetime)
@@ -52,7 +52,7 @@ subroutine multimode_decoder(ss,id2,params,nfsample)
   my_js8a%decoded = 0
   my_js8b%decoded = 0
   my_js8c%decoded = 0
-  my_js8d%decoded = 0
+  my_js8e%decoded = 0
 
   single_decode=iand(params%nexp_decode,32).ne.0
   bVHF=iand(params%nexp_decode,64).ne.0
@@ -82,23 +82,23 @@ subroutine multimode_decoder(ss,id2,params,nfsample)
   trydecode=.false.
 
   if(params%nmode.eq.8 .and. (params%nsubmode.eq.4 .or. iand(params%nsubmodes, 8).eq.8)) then
-! We're in JS8 mode D
-     call timer('decjs8d ',0)
+! We're in JS8 mode E
+     call timer('decjs8e ',0)
      newdat=params%newdat
      trydecode=.true.
 
      ! copy the relevant frames for decoding
-     pos = params%kposD
-     sz = params%kszD
+     pos = params%kposE
+     sz = params%kszE
      id0=0
      id0(1:sz+1)=id2(pos+1:pos+sz+1)
      
-     call my_js8d%decode(js8d_decoded,id0,params%nQSOProgress,params%nfqso,    &
+     call my_js8e%decode(js8e_decoded,id0,params%nQSOProgress,params%nfqso,    &
           params%nftx,newdat,params%nutc,params%nfa,params%nfb,              &
           params%nexp_decode,params%ndepth,logical(params%nagain),           &
           logical(params%lft8apon),logical(params%lapcqonly),params%napwid,  &
           mycall,mygrid,hiscall,hisgrid)
-     call timer('decjs8d ',1)
+     call timer('decjs8e ',1)
   endif
 
   if(params%nmode.eq.8 .and. (params%nsubmode.eq.2 .or. iand(params%nsubmodes, 4).eq.4)) then
@@ -202,7 +202,7 @@ subroutine multimode_decoder(ss,id2,params,nfsample)
 
 !$call omp_set_dynamic(.true.)
 
-800 ndecoded = my_js8a%decoded + my_js8b%decoded + my_js8c%decoded + my_js8d%decoded
+800 ndecoded = my_js8a%decoded + my_js8b%decoded + my_js8c%decoded + my_js8e%decoded
   write(*,1010) nsynced,ndecoded
 1010 format('<DecodeFinished>',2i4)
   call flush(6)
@@ -260,7 +260,7 @@ contains
     if(submode.eq.0) m=' A '
     if(submode.eq.1) m=' B '
     if(submode.eq.2) m=' C '
-    if(submode.eq.3) m=' D '
+    if(submode.eq.4) m=' E '
 
 
     i0=index(decoded0,';')
@@ -317,9 +317,11 @@ contains
     character(len=37), intent(in) :: decoded
     integer, intent(in) :: nap 
     real, intent(in) :: qual 
+    integer :: submode
     save
 
-    call js8_decoded(sync, snr, dt, freq, decoded, nap, qual, 0)
+    submode=0
+    call js8_decoded(sync, snr, dt, freq, decoded, nap, qual, submode)
 
     select type(this)
     type is (counting_ft8_decoder)
@@ -341,9 +343,11 @@ contains
     character(len=37), intent(in) :: decoded
     integer, intent(in) :: nap 
     real, intent(in) :: qual 
+    integer :: submode
     save
     
-    call js8_decoded(sync, snr, dt, freq, decoded, nap, qual, 1)
+    submode=1
+    call js8_decoded(sync, snr, dt, freq, decoded, nap, qual, submode)
 
     select type(this)
     type is (counting_js8b_decoder)
@@ -365,9 +369,11 @@ contains
     character(len=37), intent(in) :: decoded
     integer, intent(in) :: nap 
     real, intent(in) :: qual 
+    integer :: submode
     save
 
-    call js8_decoded(sync, snr, dt, freq, decoded, nap, qual, 2)
+    submode=2
+    call js8_decoded(sync, snr, dt, freq, decoded, nap, qual, submode)
 
     select type(this)
     type is (counting_js8c_decoder)
@@ -377,11 +383,11 @@ contains
     return
   end subroutine js8c_decoded
 
-  subroutine js8d_decoded (this,sync,snr,dt,freq,decoded,nap,qual)
-    use js8d_decode
+  subroutine js8e_decoded (this,sync,snr,dt,freq,decoded,nap,qual)
+    use js8e_decode
     implicit none
 
-    class(js8d_decoder), intent(inout) :: this
+    class(js8e_decoder), intent(inout) :: this
     real, intent(in) :: sync
     integer, intent(in) :: snr
     real, intent(in) :: dt
@@ -389,16 +395,18 @@ contains
     character(len=37), intent(in) :: decoded
     integer, intent(in) :: nap 
     real, intent(in) :: qual 
+    integer :: submode
     save
 
-    call js8_decoded(sync, snr, dt, freq, decoded, nap, qual, 3)
+    submode=4
+    call js8_decoded(sync, snr, dt, freq, decoded, nap, qual, submode)
 
     select type(this)
-    type is (counting_js8d_decoder)
+    type is (counting_js8e_decoder)
        this%decoded = this%decoded + 1
     end select
 
     return
-  end subroutine js8d_decoded
+  end subroutine js8e_decoded
 
 end subroutine multimode_decoder

lib/js8/ldpcsim174js8e.f90

@@ -4,7 +4,7 @@ use crc
 use packjt
 
 include 'js8_params.f90'
-include 'js8d_params.f90'
+include 'js8e_params.f90'
 
 character*22 msg,msgsent,msgreceived
 character*8 arg

lib/js8e_decode.f90

@@ -1,16 +1,16 @@
-module js8d_decode
+module js8e_decode
 
-  type :: js8d_decoder
-     procedure(js8d_decode_callback), pointer :: callback
+  type :: js8e_decoder
+     procedure(js8e_decode_callback), pointer :: callback
    contains
      procedure :: decode
-  end type js8d_decoder
+  end type js8e_decoder
 
   abstract interface
-     subroutine js8d_decode_callback (this,sync,snr,dt,freq,decoded,nap,qual)
-       import js8d_decoder
+     subroutine js8e_decode_callback (this,sync,snr,dt,freq,decoded,nap,qual)
+       import js8e_decoder
        implicit none
-       class(js8d_decoder), intent(inout) :: this
+       class(js8e_decoder), intent(inout) :: this
        real, intent(in) :: sync
        integer, intent(in) :: snr
        real, intent(in) :: dt
@@ -18,7 +18,7 @@ module js8d_decode
        character(len=37), intent(in) :: decoded
        integer, intent(in) :: nap 
        real, intent(in) :: qual 
-     end subroutine js8d_decode_callback
+     end subroutine js8e_decode_callback
   end interface
 
 contains
@@ -29,10 +29,10 @@ contains
 !    use wavhdr
     use timer_module, only: timer
 !    type(hdr) h
-    use js8d_module
+    use js8e_module
 
-    class(js8d_decoder), intent(inout) :: this
-    procedure(js8d_decode_callback) :: callback
+    class(js8e_decoder), intent(inout) :: this
+    procedure(js8e_decode_callback) :: callback
     real s(NH1,NHSYM)
     real sbase(NH1)
     real candidate(3,200)
@@ -153,4 +153,4 @@ contains
   return
   end subroutine decode
 
-end module js8d_decode
+end module js8e_decode

lib/js8e_module.f90

@@ -1,6 +1,6 @@
-module js8d_module
+module js8e_module
     include 'js8/js8_params.f90'
-    include 'js8/js8d_params.f90'
+    include 'js8/js8e_params.f90'
 
 contains
     include 'js8/baselinejs8.f90'
@@ -10,4 +10,4 @@ contains
     include 'js8/genjs8refsig.f90'
     include 'js8/subtractjs8.f90'
     include 'js8/js8dec.f90'
-end module js8d_module
+end module js8e_module

lib/jt9.f90

@@ -290,7 +290,7 @@ program jt9
      shared_data%params%kszA=NMAX-1
      shared_data%params%kszB=NMAX-1
      shared_data%params%kszC=NMAX-1
-     shared_data%params%kszD=NMAX-1
+     shared_data%params%kszE=NMAX-1
      call multimode_decoder(shared_data%ss,shared_data%id2,shared_data%params,nfsample)
   enddo
 

lib/jt9com.f90

@@ -22,11 +22,11 @@
      integer(c_int) :: kposA
      integer(c_int) :: kposB
      integer(c_int) :: kposC
-     integer(c_int) :: kposD
+     integer(c_int) :: kposE
      integer(c_int) :: kszA
      integer(c_int) :: kszB
      integer(c_int) :: kszC
-     integer(c_int) :: kszD
+     integer(c_int) :: kszE
      integer(c_int) :: nzhsym
      integer(c_int) :: nsubmode
      integer(c_int) :: nsubmodes