Clean up the HAFS related dual-resolution and EnKF changes to prepare…

… the pull request branch.

src/enkf/enkf_main.f90

@@ -76,7 +76,7 @@ program enkf_main
  ! reads namelist parameters.
  use params, only : read_namelist,cleanup_namelist,letkf_flag,readin_localization,lupd_satbiasc,&
                     numiter, nanals, lupd_obspace_serial, write_spread_diag,   &
-                    lobsdiag_forenkf, ldo_enscalc_option, netcdf_diag, efsoi_cycling, ntasks_io
+                    lobsdiag_forenkf, netcdf_diag, efsoi_cycling, ntasks_io
  ! mpi functions and variables.
  use mpisetup, only:  mpi_initialize, mpi_initialize_io, mpi_cleanup, nproc, &
                        mpi_wtime
@@ -154,7 +154,7 @@ program enkf_main
 
  ! read obs, initial screening.
  t1 = mpi_wtime()
- if(ldo_enscalc_option==0)  call readobs()  
+ call readobs()
  t2 = mpi_wtime()
  if (nproc == 0) print *,'time in read_obs =',t2-t1,'on proc',nproc
 
@@ -167,12 +167,10 @@ program enkf_main
  endif
 
  ! print innovation statistics for prior on root task.
- if(ldo_enscalc_option==0) then
  if (nproc == 0) then
     print *,'innovation statistics for prior:'
     call print_innovstats(obfit_prior, obsprd_prior)
  end if
- end if
 
  ! read state/control vector info from anavinfo
  call init_controlvec()
@@ -206,7 +204,6 @@ program enkf_main
 
  t1 = mpi_wtime()
  ! state and bias correction coefficient update iteration.
- if(ldo_enscalc_option ==0 ) then
  if(letkf_flag) then
     ! do ob space update using serial filter if desired
     if (lupd_obspace_serial) call enkf_update()
@@ -260,7 +257,6 @@ program enkf_main
  call obsmod_cleanup()
 
  t1 = mpi_wtime()
- end if ! ldo_enscalc_option
  call gather_chunks()
  t2 = mpi_wtime()
  if (nproc == 0) print *,'time in gather_chunks =',t2-t1,'on proc',nproc

src/enkf/gridinfo_fv3reg.f90

@@ -72,10 +72,10 @@ module gridinfo
 integer(i_kind),public :: npts
 integer(i_kind),public :: ntrunc
 ! supported variable names in anavinfo
-character(len=max_varname_length),public, dimension(17) :: &
+character(len=max_varname_length),public, dimension(16) :: &
   vars3d_supported = [character(len=max_varname_length) :: &
-    'u', 'v', 'w', 't', 'q', 'oz', 'cw', 'tsen', 'prse', 'delp', &
-    'ql', 'qi', 'qr', 'qs', 'qg', 'qnr', 'dbz']
+    'u', 'v', 'w', 't', 'q', 'oz', 'cw', 'tsen', 'prse', &
+    'ql', 'qi', 'qr', 'qs', 'qg', 'qnr','dbz']
 character(len=max_varname_length),public, dimension(3) :: &
   vars2d_supported = [character(len=max_varname_length) :: &
     'ps', 'pst', 'sst']