diff --git a/FV3 b/FV3
index db7ac624ea..a261378c57 160000
--- a/FV3
+++ b/FV3
@@ -1 +1 @@
-Subproject commit db7ac624eab55a358f66dd4dd66c6a9760e53cfe
+Subproject commit a261378c5738540ca35bdd706d4823fb82c1128e
diff --git a/parm/ccpp_c96_HAFS_v0_hwrf.nml.IN b/parm/ccpp_c96_HAFS_v0_hwrf.nml.IN
new file mode 100644
index 0000000000..4712ff8f38
--- /dev/null
+++ b/parm/ccpp_c96_HAFS_v0_hwrf.nml.IN
@@ -0,0 +1,337 @@
+&amip_interp_nml
+  interp_oi_sst = .true.
+  use_ncep_sst = .true.
+  use_ncep_ice = .false.
+  no_anom_sst = .false.
+  data_set = 'reynolds_oi'
+  date_out_of_range = 'climo'
+/
+
+&atmos_model_nml
+  blocksize = 32
+  chksum_debug = .false.
+  dycore_only = .false.
+  fdiag = 1
+  fhmax = 384
+  fhout = 3
+  fhmaxhf = 120
+  fhouthf = 1
+  ccpp_suite = '@[CCPP_SUITE]'
+/
+
+&diag_manager_nml
+  prepend_date = .false.
+/
+
+&fms_io_nml
+  checksum_required = .false.
+  max_files_r = 100
+  max_files_w = 100
+/
+
+&fms_nml
+  clock_grain = 'ROUTINE'
+  domains_stack_size = 3000000
+  print_memory_usage = .false.
+/
+
+&fv_grid_nml
+  grid_file = 'INPUT/grid_spec.nc'
+/
+
+&fv_core_nml
+  layout = 3,8
+  io_layout = 1,1
+  npx = 97
+  npy = 97
+  ntiles = 6
+  npz = 64
+  grid_type = -1
+  make_nh = .false.
+  fv_debug = .false.
+  range_warn = .false.
+  reset_eta = .false.
+  n_sponge = 10
+  nudge_qv = .true.
+  nudge_dz = .false.
+  tau = 10.
+  rf_cutoff = 7.5e2
+  d2_bg_k1 = 0.15
+  d2_bg_k2 = 0.02
+  kord_tm = -9
+  kord_mt = 9
+  kord_wz = 9
+  kord_tr = 9
+  hydrostatic = .false.
+  phys_hydrostatic = .false.
+  use_hydro_pressure = .false.
+  beta = 0.
+  a_imp = 1.
+  p_fac = 0.1
+  k_split = 2
+  n_split = 6
+  nwat = 4
+  na_init = 0
+  d_ext = 0.
+  dnats = 1
+  fv_sg_adj = 450
+  d2_bg = 0.
+  nord = 2
+  dddmp = 0.1
+  d4_bg = 0.12
+  vtdm4 = 0.02
+  delt_max = 0.002
+  ke_bg = 0.
+  do_vort_damp = .true.
+  external_ic = .true.
+  external_eta = .true.
+  gfs_phil = .false.
+  nggps_ic = .true.
+  mountain = .false.
+  ncep_ic = .false.
+  d_con = 1.
+  hord_mt = 5
+  hord_vt = 5
+  hord_tm = 5
+  hord_dp = -5
+  hord_tr = 8
+  adjust_dry_mass = .false.
+  consv_te = 1.
+  do_sat_adj = .false.
+  consv_am = .false.
+  fill = .true.
+  dwind_2d = .false.
+  print_freq = 6
+  warm_start = .false.
+  no_dycore = .false.
+  z_tracer = .true.
+  agrid_vel_rst = .true.
+  read_increment = .false.
+  res_latlon_dynamics = ""
+/
+
+&external_ic_nml
+  filtered_terrain = .true.
+  levp = 65
+  gfs_dwinds = .true.
+  checker_tr = .false.
+  nt_checker = 0
+/
+
+&gfs_physics_nml
+  fhzero         = 3.
+  ldiag3d        = .false.
+  fhcyc          = 0
+  nst_anl        = .true.
+  use_ufo        = .true.
+  pre_rad        = .false.
+  ncld           = 5
+  imp_physics    = 15        ! HWRF F-A
+  spec_adv       = .true.    ! HWRF F-A
+  RHGRD          = 0.98      ! HWRF F-A
+  icloud         = 3         ! HWRF RRTMG
+  iovr_lw        = 4         ! HWRF RRTMG
+  iovr_sw        = 4         ! HWRF RRTMG
+  hwrf_samfdeep  = .true.     ! HWRF SASdeep
+  hwrf_samfshal  = .true.     ! HWRF SASshal
+  asolfac_deep   = 0.89       ! HWRF SASdeep; GFS SAS:0.958
+  asolfac_shal   = 0.89       ! HWRF SASdeep; GFS SAS:0.958
+  hurr_pbl       = .T.        ! HWRF moninedmf
+  moninq_fac     = -1.0       !HWRF moninedmf
+  lradar         = @[LRADAR]
+  pdfcld         = .false.
+  fhswr          = 3600.
+  fhlwr          = 3600.
+  ialb           = 1
+  iems           = 1
+  IAER           = 111
+  ico2           = 2
+  isubc_sw       = 2
+  isubc_lw       = 2
+  isol           = 2
+  lwhtr          = .true.
+  swhtr          = .true.
+  cnvgwd         = .true.     !true ->no gwdc
+  shal_cnv       = .true.
+  cal_pre        = .false.
+  redrag         = .true.
+  dspheat        = .true.
+  hybedmf        = @[HYBEDMF]
+  satmedmf       = @[SATMEDMF]
+  lheatstrg      = @[LHEATSTRG]
+  random_clds    = .false.
+  trans_trac     = .true.
+  cnvcld         = .true.
+  imfshalcnv     = 2
+  imfdeepcnv     = 2
+  cdmbgwd        = 3.5, 0.25       ! NCEP default
+  prslrd0        = 0.
+  ivegsrc        = 1
+  isot           = 1
+  lsm            = @[LSM]          !HWRF set to 4
+  sfc_z0_type    = @[SFC_Z0_TYPE]  !HWRF set to 4
+  iopt_dveg      = 2
+  iopt_crs       = 1
+  iopt_btr       = 1
+  iopt_run       = 1
+  iopt_sfc       = 1
+  iopt_frz       = 1
+  iopt_inf       = 1
+  iopt_rad       = 1
+  iopt_alb       = 2
+  iopt_snf       = 4
+  iopt_tbot      = 2
+  iopt_stc       = 1
+  debug          = .false.
+  oz_phys        = .F.
+  oz_phys_2015   = .T.
+  h2o_phys       = .true.
+  nstf_name      = 2,1,0,0,0
+  cplflx         = .F.
+  iau_delthrs    = 6
+  iaufhrs        = 30
+  iau_inc_files  = @[IAU_INC_FILES]
+  do_sppt        = @[DO_SPPT]
+  do_shum        = @[DO_SHUM]
+  do_skeb        = @[DO_SKEB]
+  do_sfcperts    = @[DO_SFCPERTS]
+/
+
+&gfdl_cloud_microphysics_nml
+  sedi_transport = .true.
+  do_sedi_heat = .false.
+  rad_snow = .true.
+  rad_graupel = .true.
+  rad_rain = .true.
+  const_vi = .F.
+  const_vs = .F.
+  const_vg = .F.
+  const_vr = .F.
+  vi_max = 1.
+  vs_max = 2.
+  vg_max = 12.
+  vr_max = 12.
+  qi_lim = 1.
+  prog_ccn = .false.
+  do_qa = .true.
+  fast_sat_adj = .true.
+  tau_l2v = 225.
+  tau_v2l = 150.
+  tau_g2v = 900.
+  rthresh = 10.e-6  ! This is a key parameter for cloud water
+  dw_land  = 0.16
+  dw_ocean = 0.10
+  ql_gen = 1.0e-3
+  ql_mlt = 1.0e-3
+  qi0_crt = 8.0E-5
+  qs0_crt = 1.0e-3
+  tau_i2s = 1000.
+  c_psaci = 0.05
+  c_pgacs = 0.01
+  rh_inc = 0.30
+  rh_inr = 0.30
+  rh_ins = 0.30
+  ccn_l = 300.
+  ccn_o = 100.
+  c_paut = 0.5
+  c_cracw = 0.8
+  use_ppm = .false.
+  use_ccn = .true.
+  mono_prof = .true.
+  z_slope_liq  = .true.
+  z_slope_ice  = .true.
+  de_ice = .false.
+  fix_negative = .true.
+  icloud_f = 1
+  mp_time = 150.
+/
+
+&interpolator_nml
+  interp_method = 'conserve_great_circle'
+/
+
+&namsfc
+  FNGLAC   = 'global_glacier.2x2.grb'
+  FNMXIC   = 'global_maxice.2x2.grb'
+  FNTSFC   = 'RTGSST.1982.2012.monthly.clim.grb'
+  FNSNOC   = 'global_snoclim.1.875.grb'
+  FNZORC   = 'igbp'
+  FNALBC   = 'global_snowfree_albedo.bosu.t126.384.190.rg.grb'
+  FNALBC2  = 'global_albedo4.1x1.grb'
+  FNAISC   = 'CFSR.SEAICE.1982.2012.monthly.clim.grb'
+  FNTG3C   = 'global_tg3clim.2.6x1.5.grb'
+  FNVEGC   = 'global_vegfrac.0.144.decpercent.grb'
+  FNVETC   = 'global_vegtype.igbp.t126.384.190.rg.grb'
+  FNSOTC   = 'global_soiltype.statsgo.t126.384.190.rg.grb'
+  FNSMCC   = 'global_soilmgldas.t126.384.190.grb'
+  FNMSKH   = 'seaice_newland.grb'
+  FNTSFA   = ''
+  FNACNA   = ''
+  FNSNOA   = ''
+  FNVMNC   = 'global_shdmin.0.144x0.144.grb'
+  FNVMXC   = 'global_shdmax.0.144x0.144.grb'
+  FNSLPC   = 'global_slope.1x1.grb'
+  FNABSC   = 'global_mxsnoalb.uariz.t126.384.190.rg.grb'
+  LDEBUG   = .false.
+  FSMCL(2) = 99999
+  FSMCL(3) = 99999
+  FSMCL(4) = 99999
+  LANDICE  = .true.
+  FTSFS    = 90
+  FAISL    = 99999
+  FAISS    = 99999
+  FSNOL    = 99999
+  FSNOS    = 99999
+  FSICL    = 99999
+  FSICS    = 99999
+  FTSFL    = 99999
+  FVETL    = 99999
+  FSOTL    = 99999
+  FvmnL    = 99999
+  FvmxL    = 99999
+  FSLPL    = 99999
+  FABSL    = 99999
+/
+
+&nam_stochy
+  ntrunc = 766
+  lon_s = 1536
+  lat_s = 768
+  skeb = 0.3
+  iseed_skeb = 2019102712451
+  iseed_shum = 2019102712452
+  iseed_sppt = 2019102712453
+  skeb_tau = 21600.
+  skeb_lscale = 500000.
+  skebnorm = 0
+  skeb_npass = 30
+  skeb_vdof = 5
+  shum = 0.005
+  shum_tau = 21600.
+  shum_lscale = 500000.
+  sppt = 0.5
+  sppt_tau = 21600.
+  sppt_lscale = 500000.
+  sppt_logit = .true.
+  sppt_sfclimit = .true.
+  use_zmtnblck = .true.
+/
+
+&nam_sfcperts
+/
+
+&cires_ugwp_nml
+  knob_ugwp_solver  = 2
+  knob_ugwp_source  = 1,1,0,0
+  knob_ugwp_wvspec  = 1,25,25,25
+  knob_ugwp_azdir   = 2,4,4,4
+  knob_ugwp_stoch   = 0,0,0,0
+  knob_ugwp_effac   = 1,1,1,1
+  knob_ugwp_doaxyz  = 1
+  knob_ugwp_doheat  = 1
+  knob_ugwp_dokdis  = 1
+  knob_ugwp_ndx4lh  = 1
+  knob_ugwp_version = 0
+  launch_level      = 25
+/
+
diff --git a/parm/ccpp_v15p2_c96_HWRF_LSM.nml.IN b/parm/ccpp_v15p2_c96_HWRF_LSM.nml.IN
new file mode 100644
index 0000000000..3de62cb5eb
--- /dev/null
+++ b/parm/ccpp_v15p2_c96_HWRF_LSM.nml.IN
@@ -0,0 +1,310 @@
+&amip_interp_nml
+  interp_oi_sst = .true.
+  use_ncep_sst = .true.
+  use_ncep_ice = .false.
+  no_anom_sst = .false.
+  data_set = 'reynolds_oi'
+  date_out_of_range = 'climo'
+/
+
+&atmos_model_nml
+  blocksize = 32
+  chksum_debug = .false.
+  dycore_only = .false.
+  fdiag = 1
+  fhmax = 384
+  fhout = 3
+  fhmaxhf = 120
+  fhouthf = 1
+  ccpp_suite = '@[CCPP_SUITE]'
+/
+
+&diag_manager_nml
+  prepend_date = .false.
+/
+
+&fms_io_nml
+  checksum_required = .false.
+  max_files_r = 100
+  max_files_w = 100
+/
+
+&fms_nml
+  clock_grain = 'ROUTINE'
+  domains_stack_size = 3000000
+  print_memory_usage = .false.
+/
+
+&fv_core_nml
+  layout = 3,8
+  io_layout = 1,1
+  npx = 97
+  npy = 97
+  ntiles = 6
+  npz = 64
+  grid_type = -1
+  make_nh = .false.
+  fv_debug = .false.
+  range_warn = .false.
+  reset_eta = .false.
+  n_sponge = 10
+  nudge_qv = .true.
+  nudge_dz = .false.
+  tau = 10.
+  rf_cutoff = 7.5e2
+  d2_bg_k1 = 0.15
+  d2_bg_k2 = 0.02
+  kord_tm = -9
+  kord_mt = 9
+  kord_wz = 9
+  kord_tr = 9
+  hydrostatic = .false.
+  phys_hydrostatic = .false.
+  use_hydro_pressure = .false.
+  beta = 0.
+  a_imp = 1.
+  p_fac = 0.1
+  k_split = 2
+  n_split = 6
+  nwat = 6
+  na_init = 0
+  d_ext = 0.
+  dnats = 1
+  fv_sg_adj = 450
+  d2_bg = 0.
+  nord = 2
+  dddmp = 0.1
+  d4_bg = 0.12
+  vtdm4 = 0.02
+  delt_max = 0.002
+  ke_bg = 0.
+  do_vort_damp = .true.
+  external_ic = .true.
+  external_eta = .true.
+  gfs_phil = .false.
+  nggps_ic = .true.
+  mountain = .false.
+  ncep_ic = .false.
+  d_con = 1.
+  hord_mt = 5
+  hord_vt = 5
+  hord_tm = 5
+  hord_dp = -5
+  hord_tr = 8
+  adjust_dry_mass = .false.
+  consv_te = 1.
+  do_sat_adj = .true.
+  consv_am = .false.
+  fill = .true.
+  dwind_2d = .false.
+  print_freq = 6
+  warm_start = .false.
+  no_dycore = .false.
+  z_tracer = .true.
+  agrid_vel_rst = .true.
+  read_increment = .false.
+  res_latlon_dynamics = ""
+/
+
+&external_ic_nml
+  filtered_terrain = .true.
+  levp = 65
+  gfs_dwinds = .true.
+  checker_tr = .false.
+  nt_checker = 0
+/
+
+&gfs_physics_nml
+  fhzero       = 6
+  h2o_phys     = .true.
+  ldiag3d      = .false.
+  fhcyc        = 0.
+  use_ufo      = .true.
+  pre_rad      = .false.
+  ncld         = 5
+  imp_physics  = 11
+  pdfcld       = .false.
+  fhswr        = 3600.
+  fhlwr        = 3600.
+  ialb         = 1
+  iems         = 1
+  iaer         = 111
+  ico2         = 2
+  isubc_sw     = 2
+  isubc_lw     = 2
+  isol         = 2
+  lwhtr        = .true.
+  swhtr        = .true.
+  cnvgwd       = .true.
+  shal_cnv     = .true.
+  cal_pre      = .false.
+  redrag       = .true.
+  dspheat      = .true.
+  hybedmf      = .true.
+  random_clds  = .false.
+  trans_trac   = .true.
+  cnvcld       = .true.
+  imfshalcnv   = 2
+  imfdeepcnv   = 2
+  cdmbgwd      = 3.5,0.25
+  prslrd0      = 0.
+  ivegsrc      = 1
+  isot         = 1
+  lsm          = @[LSM]
+  debug        = .false.
+  oz_phys      = .F.
+  oz_phys_2015 = .T.
+  nstf_name    = 2,1,0,0,0
+  nst_anl      = .true.
+  psautco      = 0.0008,0.0005
+  prautco      = 0.00015,0.00015
+  lgfdlmprad   = .true.
+  effr_in      = .true.
+  do_sppt      = .true.
+  do_shum      = .true.
+  do_skeb      = .true.
+  do_sfcperts  = .false.
+/
+
+&gfdl_cloud_microphysics_nml
+  sedi_transport = .true.
+  do_sedi_heat = .false.
+  rad_snow = .true.
+  rad_graupel = .true.
+  rad_rain = .true.
+  const_vi = .F.
+  const_vs = .F.
+  const_vg = .F.
+  const_vr = .F.
+  vi_max = 1.
+  vs_max = 2.
+  vg_max = 12.
+  vr_max = 12.
+  qi_lim = 1.
+  prog_ccn = .false.
+  do_qa = .true.
+  fast_sat_adj = .true.
+  tau_l2v = 225.
+  tau_v2l = 150.
+  tau_g2v = 900.
+  rthresh = 10.e-6  ! This is a key parameter for cloud water
+  dw_land  = 0.16
+  dw_ocean = 0.10
+  ql_gen = 1.0e-3
+  ql_mlt = 1.0e-3
+  qi0_crt = 8.0E-5
+  qs0_crt = 1.0e-3
+  tau_i2s = 1000.
+  c_psaci = 0.05
+  c_pgacs = 0.01
+  rh_inc = 0.30
+  rh_inr = 0.30
+  rh_ins = 0.30
+  ccn_l = 300.
+  ccn_o = 100.
+  c_paut = 0.5
+  c_cracw = 0.8
+  use_ppm = .false.
+  use_ccn = .true.
+  mono_prof = .true.
+  z_slope_liq  = .true.
+  z_slope_ice  = .true.
+  de_ice = .false.
+  fix_negative = .true.
+  icloud_f = 1
+  mp_time = 150.
+/
+
+&interpolator_nml
+  interp_method = 'conserve_great_circle'
+/
+
+&namsfc
+  FNGLAC   = 'global_glacier.2x2.grb'
+  FNMXIC   = 'global_maxice.2x2.grb'
+  FNTSFC   = 'RTGSST.1982.2012.monthly.clim.grb'
+  FNSNOC   = 'global_snoclim.1.875.grb'
+  FNZORC   = 'igbp'
+  FNALBC   = 'global_snowfree_albedo.bosu.t126.384.190.rg.grb'
+  FNALBC2  = 'global_albedo4.1x1.grb'
+  FNAISC   = 'CFSR.SEAICE.1982.2012.monthly.clim.grb'
+  FNTG3C   = 'global_tg3clim.2.6x1.5.grb'
+  FNVEGC   = 'global_vegfrac.0.144.decpercent.grb'
+  FNVETC   = 'global_vegtype.igbp.t126.384.190.rg.grb'
+  FNSOTC   = 'global_soiltype.statsgo.t126.384.190.rg.grb'
+  FNSMCC   = 'global_soilmgldas.t126.384.190.grb'
+  FNMSKH   = 'seaice_newland.grb'
+  FNTSFA   = ''
+  FNACNA   = ''
+  FNSNOA   = ''
+  FNVMNC   = 'global_shdmin.0.144x0.144.grb'
+  FNVMXC   = 'global_shdmax.0.144x0.144.grb'
+  FNSLPC   = 'global_slope.1x1.grb'
+  FNABSC   = 'global_mxsnoalb.uariz.t126.384.190.rg.grb'
+  LDEBUG   = .false.
+  FSMCL(2) = 99999
+  FSMCL(3) = 99999
+  FSMCL(4) = 99999
+  LANDICE  = .true.
+  FTSFS    = 90
+  FAISL    = 99999
+  FAISS    = 99999
+  FSNOL    = 99999
+  FSNOS    = 99999
+  FSICL    = 99999
+  FSICS    = 99999
+  FTSFL    = 99999
+  FVETL    = 99999
+  FSOTL    = 99999
+  FvmnL    = 99999
+  FvmxL    = 99999
+  FSLPL    = 99999
+  FABSL    = 99999
+/
+
+&fv_grid_nml
+  grid_file = 'INPUT/grid_spec.nc'
+/
+
+&nam_stochy
+  ntrunc = 766
+  lon_s = 1536
+  lat_s = 768
+  skeb = 0.3
+  iseed_skeb = 2019102712451
+  iseed_shum = 2019102712452
+  iseed_sppt = 2019102712453
+  skeb_tau = 21600.
+  skeb_lscale = 500000.
+  skebnorm = 0
+  skeb_npass = 30
+  skeb_vdof = 5
+  shum = 0.005
+  shum_tau = 21600.
+  shum_lscale = 500000.
+  sppt = 0.5
+  sppt_tau = 21600.
+  sppt_lscale = 500000.
+  sppt_logit = .true.
+  sppt_sfclimit = .true.
+  use_zmtnblck = .true.
+/
+
+&nam_sfcperts
+/
+
+&cires_ugwp_nml
+  knob_ugwp_solver  = 2
+  knob_ugwp_source  = 1,1,0,0
+  knob_ugwp_wvspec  = 1,25,25,25
+  knob_ugwp_azdir   = 2,4,4,4
+  knob_ugwp_stoch   = 0,0,0,0
+  knob_ugwp_effac   = 1,1,1,1
+  knob_ugwp_doaxyz  = 1
+  knob_ugwp_doheat  = 1
+  knob_ugwp_dokdis  = 1
+  knob_ugwp_ndx4lh  = 1
+  knob_ugwp_version = 0
+  launch_level      = 25
+/
+
diff --git a/parm/ccpp_v15p2_c96_HWRF_LSM_SL.nml.IN b/parm/ccpp_v15p2_c96_HWRF_LSM_SL.nml.IN
new file mode 100644
index 0000000000..338d859971
--- /dev/null
+++ b/parm/ccpp_v15p2_c96_HWRF_LSM_SL.nml.IN
@@ -0,0 +1,311 @@
+&amip_interp_nml
+  interp_oi_sst = .true.
+  use_ncep_sst = .true.
+  use_ncep_ice = .false.
+  no_anom_sst = .false.
+  data_set = 'reynolds_oi'
+  date_out_of_range = 'climo'
+/
+
+&atmos_model_nml
+  blocksize = 32
+  chksum_debug = .false.
+  dycore_only = .false.
+  fdiag = 1
+  fhmax = 384
+  fhout = 3
+  fhmaxhf = 120
+  fhouthf = 1
+  ccpp_suite = '@[CCPP_SUITE]'
+/
+
+&diag_manager_nml
+  prepend_date = .false.
+/
+
+&fms_io_nml
+  checksum_required = .false.
+  max_files_r = 100
+  max_files_w = 100
+/
+
+&fms_nml
+  clock_grain = 'ROUTINE'
+  domains_stack_size = 3000000
+  print_memory_usage = .false.
+/
+
+&fv_core_nml
+  layout = 3,8
+  io_layout = 1,1
+  npx = 97
+  npy = 97
+  ntiles = 6
+  npz = 64
+  grid_type = -1
+  make_nh = .false.
+  fv_debug = .false.
+  range_warn = .false.
+  reset_eta = .false.
+  n_sponge = 10
+  nudge_qv = .true.
+  nudge_dz = .false.
+  tau = 10.
+  rf_cutoff = 7.5e2
+  d2_bg_k1 = 0.15
+  d2_bg_k2 = 0.02
+  kord_tm = -9
+  kord_mt = 9
+  kord_wz = 9
+  kord_tr = 9
+  hydrostatic = .false.
+  phys_hydrostatic = .false.
+  use_hydro_pressure = .false.
+  beta = 0.
+  a_imp = 1.
+  p_fac = 0.1
+  k_split = 2
+  n_split = 6
+  nwat = 6
+  na_init = 0
+  d_ext = 0.
+  dnats = 1
+  fv_sg_adj = 450
+  d2_bg = 0.
+  nord = 2
+  dddmp = 0.1
+  d4_bg = 0.12
+  vtdm4 = 0.02
+  delt_max = 0.002
+  ke_bg = 0.
+  do_vort_damp = .true.
+  external_ic = .true.
+  external_eta = .true.
+  gfs_phil = .false.
+  nggps_ic = .true.
+  mountain = .false.
+  ncep_ic = .false.
+  d_con = 1.
+  hord_mt = 5
+  hord_vt = 5
+  hord_tm = 5
+  hord_dp = -5
+  hord_tr = 8
+  adjust_dry_mass = .false.
+  consv_te = 1.
+  do_sat_adj = .true.
+  consv_am = .false.
+  fill = .true.
+  dwind_2d = .false.
+  print_freq = 6
+  warm_start = .false.
+  no_dycore = .false.
+  z_tracer = .true.
+  agrid_vel_rst = .true.
+  read_increment = .false.
+  res_latlon_dynamics = ""
+/
+
+&external_ic_nml
+  filtered_terrain = .true.
+  levp = 65
+  gfs_dwinds = .true.
+  checker_tr = .false.
+  nt_checker = 0
+/
+
+&gfs_physics_nml
+  fhzero       = 6
+  h2o_phys     = .true.
+  ldiag3d      = .false.
+  fhcyc        = 0.
+  use_ufo      = .true.
+  pre_rad      = .false.
+  ncld         = 5
+  imp_physics  = 11
+  pdfcld       = .false.
+  fhswr        = 3600.
+  fhlwr        = 3600.
+  ialb         = 1
+  iems         = 1
+  iaer         = 111
+  ico2         = 2
+  isubc_sw     = 2
+  isubc_lw     = 2
+  isol         = 2
+  lwhtr        = .true.
+  swhtr        = .true.
+  cnvgwd       = .true.
+  shal_cnv     = .true.
+  cal_pre      = .false.
+  redrag       = .true.
+  dspheat      = .true.
+  hybedmf      = .true.
+  random_clds  = .false.
+  trans_trac   = .true.
+  cnvcld       = .true.
+  imfshalcnv   = 2
+  imfdeepcnv   = 2
+  cdmbgwd      = 3.5,0.25
+  prslrd0      = 0.
+  ivegsrc      = 1
+  isot         = 1
+  lsm          = @[LSM]
+  debug        = .false.
+  oz_phys      = .F.
+  oz_phys_2015 = .T.
+  nstf_name    = 2,1,0,0,0
+  nst_anl      = .true.
+  psautco      = 0.0008,0.0005
+  prautco      = 0.00015,0.00015
+  lgfdlmprad   = .true.
+  effr_in      = .true.
+  do_sppt      = .true.
+  do_shum      = .true.
+  do_skeb      = .true.
+  do_sfcperts  = .false.
+  sfc_z0_type  = @[SFC_Z0_TYPE]
+/
+
+&gfdl_cloud_microphysics_nml
+  sedi_transport = .true.
+  do_sedi_heat = .false.
+  rad_snow = .true.
+  rad_graupel = .true.
+  rad_rain = .true.
+  const_vi = .F.
+  const_vs = .F.
+  const_vg = .F.
+  const_vr = .F.
+  vi_max = 1.
+  vs_max = 2.
+  vg_max = 12.
+  vr_max = 12.
+  qi_lim = 1.
+  prog_ccn = .false.
+  do_qa = .true.
+  fast_sat_adj = .true.
+  tau_l2v = 225.
+  tau_v2l = 150.
+  tau_g2v = 900.
+  rthresh = 10.e-6  ! This is a key parameter for cloud water
+  dw_land  = 0.16
+  dw_ocean = 0.10
+  ql_gen = 1.0e-3
+  ql_mlt = 1.0e-3
+  qi0_crt = 8.0E-5
+  qs0_crt = 1.0e-3
+  tau_i2s = 1000.
+  c_psaci = 0.05
+  c_pgacs = 0.01
+  rh_inc = 0.30
+  rh_inr = 0.30
+  rh_ins = 0.30
+  ccn_l = 300.
+  ccn_o = 100.
+  c_paut = 0.5
+  c_cracw = 0.8
+  use_ppm = .false.
+  use_ccn = .true.
+  mono_prof = .true.
+  z_slope_liq  = .true.
+  z_slope_ice  = .true.
+  de_ice = .false.
+  fix_negative = .true.
+  icloud_f = 1
+  mp_time = 150.
+/
+
+&interpolator_nml
+  interp_method = 'conserve_great_circle'
+/
+
+&namsfc
+  FNGLAC   = 'global_glacier.2x2.grb'
+  FNMXIC   = 'global_maxice.2x2.grb'
+  FNTSFC   = 'RTGSST.1982.2012.monthly.clim.grb'
+  FNSNOC   = 'global_snoclim.1.875.grb'
+  FNZORC   = 'igbp'
+  FNALBC   = 'global_snowfree_albedo.bosu.t126.384.190.rg.grb'
+  FNALBC2  = 'global_albedo4.1x1.grb'
+  FNAISC   = 'CFSR.SEAICE.1982.2012.monthly.clim.grb'
+  FNTG3C   = 'global_tg3clim.2.6x1.5.grb'
+  FNVEGC   = 'global_vegfrac.0.144.decpercent.grb'
+  FNVETC   = 'global_vegtype.igbp.t126.384.190.rg.grb'
+  FNSOTC   = 'global_soiltype.statsgo.t126.384.190.rg.grb'
+  FNSMCC   = 'global_soilmgldas.t126.384.190.grb'
+  FNMSKH   = 'seaice_newland.grb'
+  FNTSFA   = ''
+  FNACNA   = ''
+  FNSNOA   = ''
+  FNVMNC   = 'global_shdmin.0.144x0.144.grb'
+  FNVMXC   = 'global_shdmax.0.144x0.144.grb'
+  FNSLPC   = 'global_slope.1x1.grb'
+  FNABSC   = 'global_mxsnoalb.uariz.t126.384.190.rg.grb'
+  LDEBUG   = .false.
+  FSMCL(2) = 99999
+  FSMCL(3) = 99999
+  FSMCL(4) = 99999
+  LANDICE  = .true.
+  FTSFS    = 90
+  FAISL    = 99999
+  FAISS    = 99999
+  FSNOL    = 99999
+  FSNOS    = 99999
+  FSICL    = 99999
+  FSICS    = 99999
+  FTSFL    = 99999
+  FVETL    = 99999
+  FSOTL    = 99999
+  FvmnL    = 99999
+  FvmxL    = 99999
+  FSLPL    = 99999
+  FABSL    = 99999
+/
+
+&fv_grid_nml
+  grid_file = 'INPUT/grid_spec.nc'
+/
+
+&nam_stochy
+  ntrunc = 766
+  lon_s = 1536
+  lat_s = 768
+  skeb = 0.3
+  iseed_skeb = 2019102712451
+  iseed_shum = 2019102712452
+  iseed_sppt = 2019102712453
+  skeb_tau = 21600.
+  skeb_lscale = 500000.
+  skebnorm = 0
+  skeb_npass = 30
+  skeb_vdof = 5
+  shum = 0.005
+  shum_tau = 21600.
+  shum_lscale = 500000.
+  sppt = 0.5
+  sppt_tau = 21600.
+  sppt_lscale = 500000.
+  sppt_logit = .true.
+  sppt_sfclimit = .true.
+  use_zmtnblck = .true.
+/
+
+&nam_sfcperts
+/
+
+&cires_ugwp_nml
+  knob_ugwp_solver  = 2
+  knob_ugwp_source  = 1,1,0,0
+  knob_ugwp_wvspec  = 1,25,25,25
+  knob_ugwp_azdir   = 2,4,4,4
+  knob_ugwp_stoch   = 0,0,0,0
+  knob_ugwp_effac   = 1,1,1,1
+  knob_ugwp_doaxyz  = 1
+  knob_ugwp_doheat  = 1
+  knob_ugwp_dokdis  = 1
+  knob_ugwp_ndx4lh  = 1
+  knob_ugwp_version = 0
+  launch_level      = 25
+/
+
diff --git a/parm/ccpp_v15p2_c96_HWRF_SL.nml.IN b/parm/ccpp_v15p2_c96_HWRF_SL.nml.IN
new file mode 100644
index 0000000000..6d6beabaa3
--- /dev/null
+++ b/parm/ccpp_v15p2_c96_HWRF_SL.nml.IN
@@ -0,0 +1,310 @@
+&amip_interp_nml
+  interp_oi_sst = .true.
+  use_ncep_sst = .true.
+  use_ncep_ice = .false.
+  no_anom_sst = .false.
+  data_set = 'reynolds_oi'
+  date_out_of_range = 'climo'
+/
+
+&atmos_model_nml
+  blocksize = 32
+  chksum_debug = .false.
+  dycore_only = .false.
+  fdiag = 1
+  fhmax = 384
+  fhout = 3
+  fhmaxhf = 120
+  fhouthf = 1
+  ccpp_suite = '@[CCPP_SUITE]'
+/
+
+&diag_manager_nml
+  prepend_date = .false.
+/
+
+&fms_io_nml
+  checksum_required = .false.
+  max_files_r = 100
+  max_files_w = 100
+/
+
+&fms_nml
+  clock_grain = 'ROUTINE'
+  domains_stack_size = 3000000
+  print_memory_usage = .false.
+/
+
+&fv_core_nml
+  layout = 3,8
+  io_layout = 1,1
+  npx = 97
+  npy = 97
+  ntiles = 6
+  npz = 64
+  grid_type = -1
+  make_nh = .false.
+  fv_debug = .false.
+  range_warn = .false.
+  reset_eta = .false.
+  n_sponge = 10
+  nudge_qv = .true.
+  nudge_dz = .false.
+  tau = 10.
+  rf_cutoff = 7.5e2
+  d2_bg_k1 = 0.15
+  d2_bg_k2 = 0.02
+  kord_tm = -9
+  kord_mt = 9
+  kord_wz = 9
+  kord_tr = 9
+  hydrostatic = .false.
+  phys_hydrostatic = .false.
+  use_hydro_pressure = .false.
+  beta = 0.
+  a_imp = 1.
+  p_fac = 0.1
+  k_split = 2
+  n_split = 6
+  nwat = 6
+  na_init = 0
+  d_ext = 0.
+  dnats = 1
+  fv_sg_adj = 450
+  d2_bg = 0.
+  nord = 2
+  dddmp = 0.1
+  d4_bg = 0.12
+  vtdm4 = 0.02
+  delt_max = 0.002
+  ke_bg = 0.
+  do_vort_damp = .true.
+  external_ic = .true.
+  external_eta = .true.
+  gfs_phil = .false.
+  nggps_ic = .true.
+  mountain = .false.
+  ncep_ic = .false.
+  d_con = 1.
+  hord_mt = 5
+  hord_vt = 5
+  hord_tm = 5
+  hord_dp = -5
+  hord_tr = 8
+  adjust_dry_mass = .false.
+  consv_te = 1.
+  do_sat_adj = .true.
+  consv_am = .false.
+  fill = .true.
+  dwind_2d = .false.
+  print_freq = 6
+  warm_start = .false.
+  no_dycore = .false.
+  z_tracer = .true.
+  agrid_vel_rst = .true.
+  read_increment = .false.
+  res_latlon_dynamics = ""
+/
+
+&external_ic_nml
+  filtered_terrain = .true.
+  levp = 65
+  gfs_dwinds = .true.
+  checker_tr = .false.
+  nt_checker = 0
+/
+
+&gfs_physics_nml
+  fhzero       = 6
+  h2o_phys     = .true.
+  ldiag3d      = .false.
+  fhcyc        = 24
+  use_ufo      = .true.
+  pre_rad      = .false.
+  ncld         = 5
+  imp_physics  = 11
+  pdfcld       = .false.
+  fhswr        = 3600.
+  fhlwr        = 3600.
+  ialb         = 1
+  iems         = 1
+  iaer         = 111
+  ico2         = 2
+  isubc_sw     = 2
+  isubc_lw     = 2
+  isol         = 2
+  lwhtr        = .true.
+  swhtr        = .true.
+  cnvgwd       = .true.
+  shal_cnv     = .true.
+  cal_pre      = .false.
+  redrag       = .true.
+  dspheat      = .true.
+  hybedmf      = .true.
+  random_clds  = .false.
+  trans_trac   = .true.
+  cnvcld       = .true.
+  imfshalcnv   = 2
+  imfdeepcnv   = 2
+  cdmbgwd      = 3.5,0.25
+  prslrd0      = 0.
+  ivegsrc      = 1
+  isot         = 1
+  debug        = .false.
+  oz_phys      = .F.
+  oz_phys_2015 = .T.
+  nstf_name    = 2,1,0,0,0
+  nst_anl      = .true.
+  psautco      = 0.0008,0.0005
+  prautco      = 0.00015,0.00015
+  lgfdlmprad   = .true.
+  effr_in      = .true.
+  do_sppt      = .true.
+  do_shum      = .true.
+  do_skeb      = .true.
+  do_sfcperts  = .false.
+  sfc_z0_type  = @[SFC_Z0_TYPE]
+/
+
+&gfdl_cloud_microphysics_nml
+  sedi_transport = .true.
+  do_sedi_heat = .false.
+  rad_snow = .true.
+  rad_graupel = .true.
+  rad_rain = .true.
+  const_vi = .F.
+  const_vs = .F.
+  const_vg = .F.
+  const_vr = .F.
+  vi_max = 1.
+  vs_max = 2.
+  vg_max = 12.
+  vr_max = 12.
+  qi_lim = 1.
+  prog_ccn = .false.
+  do_qa = .true.
+  fast_sat_adj = .true.
+  tau_l2v = 225.
+  tau_v2l = 150.
+  tau_g2v = 900.
+  rthresh = 10.e-6  ! This is a key parameter for cloud water
+  dw_land  = 0.16
+  dw_ocean = 0.10
+  ql_gen = 1.0e-3
+  ql_mlt = 1.0e-3
+  qi0_crt = 8.0E-5
+  qs0_crt = 1.0e-3
+  tau_i2s = 1000.
+  c_psaci = 0.05
+  c_pgacs = 0.01
+  rh_inc = 0.30
+  rh_inr = 0.30
+  rh_ins = 0.30
+  ccn_l = 300.
+  ccn_o = 100.
+  c_paut = 0.5
+  c_cracw = 0.8
+  use_ppm = .false.
+  use_ccn = .true.
+  mono_prof = .true.
+  z_slope_liq  = .true.
+  z_slope_ice  = .true.
+  de_ice = .false.
+  fix_negative = .true.
+  icloud_f = 1
+  mp_time = 150.
+/
+
+&interpolator_nml
+  interp_method = 'conserve_great_circle'
+/
+
+&namsfc
+  FNGLAC   = 'global_glacier.2x2.grb'
+  FNMXIC   = 'global_maxice.2x2.grb'
+  FNTSFC   = 'RTGSST.1982.2012.monthly.clim.grb'
+  FNSNOC   = 'global_snoclim.1.875.grb'
+  FNZORC   = 'igbp'
+  FNALBC   = 'global_snowfree_albedo.bosu.t126.384.190.rg.grb'
+  FNALBC2  = 'global_albedo4.1x1.grb'
+  FNAISC   = 'CFSR.SEAICE.1982.2012.monthly.clim.grb'
+  FNTG3C   = 'global_tg3clim.2.6x1.5.grb'
+  FNVEGC   = 'global_vegfrac.0.144.decpercent.grb'
+  FNVETC   = 'global_vegtype.igbp.t126.384.190.rg.grb'
+  FNSOTC   = 'global_soiltype.statsgo.t126.384.190.rg.grb'
+  FNSMCC   = 'global_soilmgldas.t126.384.190.grb'
+  FNMSKH   = 'seaice_newland.grb'
+  FNTSFA   = ''
+  FNACNA   = ''
+  FNSNOA   = ''
+  FNVMNC   = 'global_shdmin.0.144x0.144.grb'
+  FNVMXC   = 'global_shdmax.0.144x0.144.grb'
+  FNSLPC   = 'global_slope.1x1.grb'
+  FNABSC   = 'global_mxsnoalb.uariz.t126.384.190.rg.grb'
+  LDEBUG   = .false.
+  FSMCL(2) = 99999
+  FSMCL(3) = 99999
+  FSMCL(4) = 99999
+  LANDICE  = .true.
+  FTSFS    = 90
+  FAISL    = 99999
+  FAISS    = 99999
+  FSNOL    = 99999
+  FSNOS    = 99999
+  FSICL    = 99999
+  FSICS    = 99999
+  FTSFL    = 99999
+  FVETL    = 99999
+  FSOTL    = 99999
+  FvmnL    = 99999
+  FvmxL    = 99999
+  FSLPL    = 99999
+  FABSL    = 99999
+/
+
+&fv_grid_nml
+  grid_file = 'INPUT/grid_spec.nc'
+/
+
+&nam_stochy
+  ntrunc = 766
+  lon_s = 1536
+  lat_s = 768
+  skeb = 0.3
+  iseed_skeb = 2019102712451
+  iseed_shum = 2019102712452
+  iseed_sppt = 2019102712453
+  skeb_tau = 21600.
+  skeb_lscale = 500000.
+  skebnorm = 0
+  skeb_npass = 30
+  skeb_vdof = 5
+  shum = 0.005
+  shum_tau = 21600.
+  shum_lscale = 500000.
+  sppt = 0.5
+  sppt_tau = 21600.
+  sppt_lscale = 500000.
+  sppt_logit = .true.
+  sppt_sfclimit = .true.
+  use_zmtnblck = .true.
+/
+
+&nam_sfcperts
+/
+
+&cires_ugwp_nml
+  knob_ugwp_solver  = 2
+  knob_ugwp_source  = 1,1,0,0
+  knob_ugwp_wvspec  = 1,25,25,25
+  knob_ugwp_azdir   = 2,4,4,4
+  knob_ugwp_stoch   = 0,0,0,0
+  knob_ugwp_effac   = 1,1,1,1
+  knob_ugwp_doaxyz  = 1
+  knob_ugwp_doheat  = 1
+  knob_ugwp_dokdis  = 1
+  knob_ugwp_ndx4lh  = 1
+  knob_ugwp_version = 0
+  launch_level      = 25
+/
+
diff --git a/tests/fv3_conf/ccpp_HAFS_v0_hwrf_run.IN b/tests/fv3_conf/ccpp_HAFS_v0_hwrf_run.IN
new file mode 100644
index 0000000000..a6880cc739
--- /dev/null
+++ b/tests/fv3_conf/ccpp_HAFS_v0_hwrf_run.IN
@@ -0,0 +1,34 @@
+rm -fr INPUT RESTART
+if [ $WARM_START = .F. ]; then
+  cp -r @[RTPWD]/FV3_input_data/INPUT .
+  mkdir RESTART
+else
+  mkdir INPUT RESTART
+  cp -r @[RTPWD]/FV3_input_data/RESTART/* ./INPUT
+fi
+
+cp    @[RTPWD]/FV3_input_data/INPUT/aerosol.dat .
+cp    @[RTPWD]/FV3_input_data/INPUT/co2historicaldata_201*.txt .
+cp    @[RTPWD]/FV3_input_data/INPUT/sfc_emissivity_idx.txt .
+cp    @[RTPWD]/FV3_input_data/INPUT/solarconstant_noaa_an.txt .
+cp    @[RTPWD]/FV3_input_data/ozprdlos_2015_new_sbuvO3_tclm15_nuchem.f77 ./global_o3prdlos.f77
+cp    @[RTPWD]/FV3_input_data/global_h2o_pltc.f77 ./global_h2oprdlos.f77
+cp    @[RTPWD]/FV3_input_data/*grb .
+cp    @[RTPWD]/FV3_input_data/*_table .
+cp    @[RTPWD]/FV3_input_data/*configure .
+cp    @[RTPWD]/FV3_input_data_hafs/GENPARM.TBL .
+cp    @[RTPWD]/FV3_input_data_hafs/SOILPARM.TBL .
+cp    @[RTPWD]/FV3_input_data_hafs/VEGPARM.TBL .
+
+# Copy diag table for HWRF RRTMG or GFS RRTMG
+if [ $IOVR_LW = 4 ] && [ $IOVR_SW = 4 ]; then
+    cp @[RTPWD]/FV3_input_data_hafs/diag_table_FA_HWRF diag_table
+else
+    cp @[RTPWD]/FV3_input_data_hafs/diag_table_FA diag_table
+fi
+# Copy field table for Ferrier-Aligo MP
+cp @[RTPWD]/FV3_input_data_hafs/field_table_FA_nwat4 field_table
+
+cp @[RTPWD]/FV3_input_data/DETAMPNEW_DATA* .
+
+cp ${PATHRT}/../FV3/ccpp/suites/suite_${CCPP_SUITE}.xml suite_${CCPP_SUITE}.xml
diff --git a/tests/fv3_conf/ccpp_gfs_v15_HWRF_LSM_run.IN b/tests/fv3_conf/ccpp_gfs_v15_HWRF_LSM_run.IN
new file mode 100644
index 0000000000..252a1098b0
--- /dev/null
+++ b/tests/fv3_conf/ccpp_gfs_v15_HWRF_LSM_run.IN
@@ -0,0 +1,24 @@
+rm -fr INPUT RESTART
+if [ $WARM_START = .F. ]; then
+  cp -r @[RTPWD]/FV3_input_data/INPUT .
+  mkdir RESTART
+else
+  mkdir INPUT RESTART
+  cp -r @[RTPWD]/FV3_input_data/RESTART/* ./INPUT
+fi
+cp    @[RTPWD]/FV3_input_data/INPUT/aerosol.dat .
+cp    @[RTPWD]/FV3_input_data/INPUT/co2historicaldata_201*.txt .
+cp    @[RTPWD]/FV3_input_data/INPUT/sfc_emissivity_idx.txt .
+cp    @[RTPWD]/FV3_input_data/INPUT/solarconstant_noaa_an.txt .
+cp    @[RTPWD]/FV3_input_data/ozprdlos_2015_new_sbuvO3_tclm15_nuchem.f77 ./global_o3prdlos.f77
+cp    @[RTPWD]/FV3_input_data/global_h2o_pltc.f77 ./global_h2oprdlos.f77
+cp    @[RTPWD]/FV3_input_data/*grb .
+cp    @[RTPWD]/FV3_input_data/*_table .
+cp    @[RTPWD]/FV3_input_data/diag_table_gfdlmp diag_table
+cp    @[RTPWD]/FV3_input_data/field_table_gfdlmp field_table
+cp    @[RTPWD]/FV3_input_data/*configure .
+cp    @[RTPWD]/FV3_input_data_hafs/GENPARM.TBL .
+cp    @[RTPWD]/FV3_input_data_hafs/SOILPARM.TBL .
+cp    @[RTPWD]/FV3_input_data_hafs/VEGPARM.TBL .
+
+cp ${PATHRT}/../FV3/ccpp/suites/suite_${CCPP_SUITE}.xml suite_${CCPP_SUITE}.xml
diff --git a/tests/rt.conf b/tests/rt.conf
index e424df99a7..cf6c4b08d7 100644
--- a/tests/rt.conf
+++ b/tests/rt.conf
@@ -267,11 +267,15 @@ RUN     | fv3_ccpp_gfdlmprad_32bit_post
 RUN     | fv3_ccpp_cpt                                                                                                                   | standard    |                |             |
 RUN     | fv3_ccpp_gsd                                                                                                                   | standard    |                | fv3         |
 
-COMPILE | REPRO=Y CCPP=Y STATIC=Y SUITES=FV3_HAFS_ferhires,FV3_HAFS_FA_HWRF_RRTMG                                                        | standard    | hera.intel     | fv3         |
+COMPILE | REPRO=Y CCPP=Y SUITES=FV3_HAFS_ferhires,FV3_HAFS_FA_HWRF_RRTMG,FV3_GFS_v15p2_HWRF_LSM,FV3_GFS_v15p2_HWRF_SL,FV3_GFS_v15p2_HWRF_LSM_SL,HAFS_v0_hwrf | standard    | hera.intel     | fv3         |
 
 RUN     | fv3_ccpp_regional_c768_FA                                                                                                      | standard    | hera.intel     | fv3         |
 RUN     | fv3_ccpp_regional_c768_HWRF_PBL                                                                                                | standard    | hera.intel     | fv3         |
 RUN     | fv3_ccpp_regional_c768_FA_HWRF_RRTMG                                                                                           | standard    | hera.intel     | fv3         |
+RUN     | fv3_ccpp_gfs_v15p2_HWRF_LSM                                                                                                    | standard    | hera.intel     | fv3         |
+RUN     | fv3_ccpp_gfs_v15p2_HWRF_SL                                                                                                     | standard    | hera.intel     | fv3         |
+RUN     | fv3_ccpp_gfs_v15p2_HWRF_LSM_SL                                                                                                 | standard    | hera.intel     | fv3         |
+RUN     | fv3_ccpp_HAFS_v0_hwrf                                                                                                          | standard    | hera.intel     | fv3         |
 
 #######################################################################################################################################################################################
 # CCPP PROD tests                                                                                                                                                                     #
@@ -393,11 +397,15 @@ RUN     | fv3_ccpp_gsd
 RUN     | fv3_ccpp_thompson                                                                                                              | standard    |                | fv3         |
 RUN     | fv3_ccpp_thompson_no_aero                                                                                                      | standard    |                | fv3         |
 
-COMPILE | CCPP=Y STATIC=Y SUITES=FV3_HAFS_ferhires,FV3_HAFS_FA_HWRF_RRTMG                                                                | standard    | hera.intel     | fv3         |
+COMPILE | CCPP=Y SUITES=FV3_HAFS_ferhires,FV3_HAFS_FA_HWRF_RRTMG,FV3_GFS_v15p2_HWRF_LSM,FV3_GFS_v15p2_HWRF_SL,FV3_GFS_v15p2_HWRF_LSM_SL,HAFS_v0_hwrf | standard    | hera.intel     | fv3         |
 
 RUN     | fv3_ccpp_regional_c768_FA                                                                                                      | standard    | hera.intel     | fv3         |
 RUN     | fv3_ccpp_regional_c768_HWRF_PBL                                                                                                | standard    | hera.intel     | fv3         |
 RUN     | fv3_ccpp_regional_c768_FA_HWRF_RRTMG                                                                                           | standard    | hera.intel     | fv3         |
+RUN     | fv3_ccpp_gfs_v15p2_HWRF_LSM                                                                                                    | standard    | hera.intel     | fv3         |
+RUN     | fv3_ccpp_gfs_v15p2_HWRF_SL                                                                                                     | standard    | hera.intel     | fv3         |
+RUN     | fv3_ccpp_gfs_v15p2_HWRF_LSM_SL                                                                                                 | standard    | hera.intel     | fv3         |
+RUN     | fv3_ccpp_HAFS_v0_hwrf                                                                                                          | standard    | hera.intel     | fv3         |
 
 #######################################################################################################################################################################################
 # CCPP PROD tests                                                                                                                                                                     #
diff --git a/tests/rt.sh b/tests/rt.sh
index a047483d35..0b8ff3af79 100755
--- a/tests/rt.sh
+++ b/tests/rt.sh
@@ -386,9 +386,9 @@ while getopts ":cfsl:mkreh" opt; do
 done
 
 if [[ $MACHINE_ID = hera.* ]] || [[ $MACHINE_ID = orion.* ]] || [[ $MACHINE_ID = cheyenne.* ]]; then
-  RTPWD=${RTPWD:-$DISKNM/NEMSfv3gfs/hwrf-physics-20200514/${COMPILER^^}}
+  RTPWD=${RTPWD:-$DISKNM/NEMSfv3gfs/hwrf-physics-20200528/${COMPILER^^}}
 else
-  RTPWD=${RTPWD:-$DISKNM/NEMSfv3gfs/hwrf-physics-20200514}
+  RTPWD=${RTPWD:-$DISKNM/NEMSfv3gfs/hwrf-physics-20200528}
 fi
 
 shift $((OPTIND-1))
diff --git a/tests/rt_gnu.conf b/tests/rt_gnu.conf
index fe5c2a4a74..52c4b2cef8 100644
--- a/tests/rt_gnu.conf
+++ b/tests/rt_gnu.conf
@@ -6,12 +6,19 @@ COMPILE | REPRO=Y CCPP=Y SUITES=FV3_GFS_2017_gfdlmp
 RUN     | fv3_ccpp_gfdlmp                                                                                                                | standard    | cheyenne.gnu   | fv3         |
 
 # Turn off for now - either running too long or crashing with GNU 9.1.0 on Cheyenne
-#COMPILE | REPRO=Y CCPP=Y STATIC=Y SUITES=FV3_HAFS_ferhires,FV3_HAFS_FA_HWRF_RRTMG                                                        | standard    | cheyenne.gnu   | fv3         |
+#COMPILE | REPRO=Y CCPP=Y SUITES=FV3_HAFS_ferhires,FV3_HAFS_FA_HWRF_RRTMG                                                                 | standard    | cheyenne.gnu   | fv3         |
 #
 #RUN     | fv3_ccpp_regional_c768_FA                                                                                                      | standard    | cheyenne.gnu   | fv3         |
 #RUN     | fv3_ccpp_regional_c768_HWRF_PBL                                                                                                | standard    | cheyenne.gnu   | fv3         |
 #RUN     | fv3_ccpp_regional_c768_FA_HWRF_RRTMG                                                                                           | standard    | cheyenne.gnu   | fv3         |
 
+COMPILE | REPRO=Y CCPP=Y SUITES=FV3_GFS_v15p2_HWRF_LSM,FV3_GFS_v15p2_HWRF_SL,FV3_GFS_v15p2_HWRF_LSM_SL,HAFS_v0_hwrf                      | standard    | cheyenne.gnu   | fv3         |
+
+RUN     | fv3_ccpp_gfs_v15p2_HWRF_LSM                                                                                                    | standard    | cheyenne.gnu   | fv3         |
+RUN     | fv3_ccpp_gfs_v15p2_HWRF_SL                                                                                                     | standard    | cheyenne.gnu   | fv3         |
+RUN     | fv3_ccpp_gfs_v15p2_HWRF_LSM_SL                                                                                                 | standard    | cheyenne.gnu   | fv3         |
+RUN     | fv3_ccpp_HAFS_v0_hwrf                                                                                                          | standard    | cheyenne.gnu   | fv3         |
+
 #######################################################################################################################################################################################
 # CCPP PROD tests                                                                                                                                                                     #
 #######################################################################################################################################################################################
@@ -29,12 +36,19 @@ RUN     | fv3_ccpp_gfs_v16beta
 RUN     | fv3_ccpp_rrtmgp                                                                                                                | standard    | cheyenne.gnu   | fv3         |
 
 # Turn off for now - either running too long or crashing with GNU 9.1.0 on Cheyenne
-#COMPILE | CCPP=Y STATIC=Y SUITES=FV3_HAFS_ferhires,FV3_HAFS_FA_HWRF_RRTMG                                                                | standard    | cheyenne.gnu   | fv3         |
+#COMPILE | CCPP=Y SUITES=FV3_HAFS_ferhires,FV3_HAFS_FA_HWRF_RRTMG                                                                         | standard    | cheyenne.gnu   | fv3         |
 #
 #RUN     | fv3_ccpp_regional_c768_FA                                                                                                      | standard    | cheyenne.gnu   | fv3         |
 #RUN     | fv3_ccpp_regional_c768_HWRF_PBL                                                                                                | standard    | cheyenne.gnu   | fv3         |
 #RUN     | fv3_ccpp_regional_c768_FA_HWRF_RRTMG                                                                                           | standard    | cheyenne.gnu   | fv3         |
 
+COMPILE | CCPP=Y SUITES=FV3_GFS_v15p2_HWRF_LSM,FV3_GFS_v15p2_HWRF_SL,FV3_GFS_v15p2_HWRF_LSM_SL,HAFS_v0_hwrf                              | standard    | cheyenne.gnu   | fv3         |
+
+RUN     | fv3_ccpp_gfs_v15p2_HWRF_LSM                                                                                                    | standard    | cheyenne.gnu   | fv3         |
+RUN     | fv3_ccpp_gfs_v15p2_HWRF_SL                                                                                                     | standard    | cheyenne.gnu   | fv3         |
+RUN     | fv3_ccpp_gfs_v15p2_HWRF_LSM_SL                                                                                                 | standard    | cheyenne.gnu   | fv3         |
+RUN     | fv3_ccpp_HAFS_v0_hwrf                                                                                                          | standard    | cheyenne.gnu   | fv3         |
+
 #######################################################################################################################################################################################
 # CCPP DEBUG tests                                                                                                                                                                     #
 #######################################################################################################################################################################################
diff --git a/tests/rt_intel.conf b/tests/rt_intel.conf
index 2f31b7d617..667fe94f24 100644
--- a/tests/rt_intel.conf
+++ b/tests/rt_intel.conf
@@ -2,7 +2,7 @@
 # CCPP PROD tests                                                                                                                                                                     #
 #######################################################################################################################################################################################
 
-COMPILE | CCPP=Y STATIC=Y SUITES=FV3_GFS_2017                                                                                            | standard    | cheyenne.intel | fv3         |
+COMPILE | CCPP=Y SUITES=FV3_GFS_2017                                                                                                     | standard    | cheyenne.intel | fv3         |
 RUN     | fv3_ccpp_control                                                                                                               | standard    | cheyenne.intel | fv3         |
 RUN     | fv3_ccpp_decomp                                                                                                                | standard    | cheyenne.intel |             |
 RUN     | fv3_ccpp_2threads                                                                                                              | standard    | cheyenne.intel |             |
@@ -16,7 +16,7 @@ RUN     | fv3_ccpp_stochy
 RUN     | fv3_ccpp_iau                                                                                                                   | standard    | cheyenne.intel | fv3         |
 
 # WW3 not yet working on Cheyenne
-#COMPILE | CCPP=Y STATIC=Y SUITES=FV3_GFS_2017,FV3_GFS_2017_gfdlmp WW3=Y                                                                  | standard    | cheyenne.intel | fv3         |
+#COMPILE | CCPP=Y SUITES=FV3_GFS_2017,FV3_GFS_2017_gfdlmp WW3=Y                                                                           | standard    | cheyenne.intel | fv3         |
 #RUN     | fv3_ccpp_gfdlmprad                                                                                                             | standard    | cheyenne.intel | fv3         |
 #RUN     | fv3_ccpp_wrtGauss_nemsio_c768                                                                                                  | standard    | cheyenne.intel | fv3         |
 
@@ -24,12 +24,12 @@ RUN     | fv3_ccpp_iau
 APPBUILD| CCPP                                                                                                                           | standard    | cheyenne.intel |             |
 RUN     | fv3_ccpp_appbuild                                                                                                              | standard    | cheyenne.intel |             |
 
-COMPILE | CCPP=Y STATIC=Y SUITES=FV3_GFS_2017,FV3_GFS_2017_stretched 32BIT=Y                                                             | standard    | cheyenne.intel | fv3         |
+COMPILE | CCPP=Y SUITES=FV3_GFS_2017,FV3_GFS_2017_stretched 32BIT=Y                                                                      | standard    | cheyenne.intel | fv3         |
 RUN     | fv3_ccpp_control_32bit                                                                                                         | standard    | cheyenne.intel | fv3         |
 RUN     | fv3_ccpp_stretched                                                                                                             | standard    | cheyenne.intel | fv3         |
 RUN     | fv3_ccpp_stretched_nest                                                                                                        | standard    | cheyenne.intel | fv3         |
 
-COMPILE | CCPP=Y STATIC=Y SUITES=FV3_GFS_2017_gfdlmp_regional,FV3_GFS_2017_gfdlmp_regional_c768 32BIT=Y                                  | standard    | cheyenne.intel | fv3         |
+COMPILE | CCPP=Y SUITES=FV3_GFS_2017_gfdlmp_regional,FV3_GFS_2017_gfdlmp_regional_c768 32BIT=Y                                           | standard    | cheyenne.intel | fv3         |
 RUN     | fv3_ccpp_regional_control                                                                                                      | standard    | cheyenne.intel | fv3         |
 RUN     | fv3_ccpp_regional_restart                                                                                                      | standard    | cheyenne.intel | fv3         | fv3_ccpp_regional_control
 RUN     | fv3_ccpp_regional_quilt                                                                                                        | standard    | cheyenne.intel | fv3         |
@@ -37,44 +37,51 @@ RUN     | fv3_ccpp_regional_quilt
 # for surface pressure, out of range warnings and all other sorts of errors
 #RUN     | fv3_ccpp_regional_c768                                                                                                         | standard    | cheyenne.intel | fv3         |
 
-COMPILE | CCPP=Y STATIC=Y SUITES=FV3_GFS_2017,FV3_GFS_2017_stretched 32BIT=Y DEBUG=Y                                                     | standard    | cheyenne.intel | fv3         |
+COMPILE | CCPP=Y SUITES=FV3_GFS_2017,FV3_GFS_2017_stretched 32BIT=Y DEBUG=Y                                                              | standard    | cheyenne.intel | fv3         |
 RUN     | fv3_ccpp_control_debug                                                                                                         | standard    | cheyenne.intel | fv3         |
 RUN     | fv3_ccpp_stretched_nest_debug                                                                                                  | standard    | cheyenne.intel | fv3         |
 
-COMPILE | CCPP=Y STATIC=Y SUITES=FV3_GFS_2017_gfdlmp,FV3_GFS_2017_gfdlmp_noahmp                                                          | standard    | cheyenne.intel | fv3         |
+COMPILE | CCPP=Y SUITES=FV3_GFS_2017_gfdlmp,FV3_GFS_2017_gfdlmp_noahmp                                                                   | standard    | cheyenne.intel | fv3         |
 RUN     | fv3_ccpp_gfdlmp                                                                                                                | standard    | cheyenne.intel | fv3         |
 RUN     | fv3_ccpp_gfdlmprad_gwd                                                                                                         | standard    | cheyenne.intel | fv3         |
 RUN     | fv3_ccpp_gfdlmprad_noahmp                                                                                                      | standard    | cheyenne.intel | fv3         |
 
-COMPILE | CCPP=Y STATIC=Y SUITES=FV3_GFS_2017_csawmgshoc,FV3_GFS_2017_csawmg,FV3_GFS_2017_satmedmf                                       | standard    | cheyenne.intel | fv3         |
+COMPILE | CCPP=Y SUITES=FV3_GFS_2017_csawmgshoc,FV3_GFS_2017_csawmg,FV3_GFS_2017_satmedmf                                                | standard    | cheyenne.intel | fv3         |
 #RUN     | fv3_ccpp_csawmgshoc                                                                                                            | standard    | cheyenne.intel | fv3         |
 #RUN     | fv3_ccpp_csawmg3shoc127                                                                                                        | standard    | cheyenne.intel | fv3         |
 RUN     | fv3_ccpp_csawmg                                                                                                                | standard    | cheyenne.intel | fv3         |
 RUN     | fv3_ccpp_satmedmf                                                                                                              | standard    | cheyenne.intel | fv3         |
 
-COMPILE | CCPP=Y STATIC=Y SUITES=FV3_GFS_2017_gfdlmp,FV3_CPT_v0,FV3_GSD_v0 32BIT=Y                                                       | standard    | cheyenne.intel | fv3         |
+COMPILE | CCPP=Y SUITES=FV3_GFS_2017_gfdlmp,FV3_CPT_v0,FV3_GSD_v0 32BIT=Y                                                                | standard    | cheyenne.intel | fv3         |
 RUN     | fv3_ccpp_gfdlmp_32bit                                                                                                          | standard    | cheyenne.intel | fv3         |
 # inline post not yet working on Cheyenne
 #RUN     | fv3_ccpp_gfdlmprad_32bit_post                                                                                                  | standard    | cheyenne.intel | fv3         |
 RUN     | fv3_ccpp_cpt                                                                                                                   | standard    | cheyenne.intel | fv3         |
 RUN     | fv3_ccpp_gsd                                                                                                                   | standard    | cheyenne.intel | fv3         |
 
-COMPILE | CCPP=Y STATIC=Y SUITES=FV3_HAFS_ferhires,FV3_HAFS_FA_HWRF_RRTMG                                                                | standard    | cheyenne.intel | fv3         |
+COMPILE | CCPP=Y SUITES=FV3_HAFS_ferhires,FV3_HAFS_FA_HWRF_RRTMG                                                                         | standard    | cheyenne.intel | fv3         |
 
 RUN     | fv3_ccpp_regional_c768_FA                                                                                                      | standard    | cheyenne.intel | fv3         |
 RUN     | fv3_ccpp_regional_c768_HWRF_PBL                                                                                                | standard    | cheyenne.intel | fv3         |
 RUN     | fv3_ccpp_regional_c768_FA_HWRF_RRTMG                                                                                           | standard    | cheyenne.intel | fv3         |
 
+COMPILE | CCPP=Y SUITES=FV3_GFS_v15p2_HWRF_LSM,FV3_GFS_v15p2_HWRF_SL,FV3_GFS_v15p2_HWRF_LSM_SL,HAFS_v0_hwrf                              | standard    | cheyenne.intel | fv3         |
+
+RUN     | fv3_ccpp_gfs_v15p2_HWRF_LSM                                                                                                    | standard    | cheyenne.intel | fv3         |
+RUN     | fv3_ccpp_gfs_v15p2_HWRF_SL                                                                                                     | standard    | cheyenne.intel | fv3         |
+RUN     | fv3_ccpp_gfs_v15p2_HWRF_LSM_SL                                                                                                 | standard    | cheyenne.intel | fv3         |
+RUN     | fv3_ccpp_HAFS_v0_hwrf                                                                                                          | standard    | cheyenne.intel | fv3         |
+
 #######################################################################################################################################################################################
 # CCPP DEBUG tests                                                                                                                                                                     #
 #######################################################################################################################################################################################
 
-COMPILE | CCPP=Y STATIC=Y SUITES=FV3_GFS_v15p2,FV3_GFS_v16beta DEBUG=Y                                                                   | standard    | cheyenne.intel | fv3         |
+COMPILE | CCPP=Y SUITES=FV3_GFS_v15p2,FV3_GFS_v16beta DEBUG=Y                                                                            | standard    | cheyenne.intel | fv3         |
 
 RUN     | fv3_ccpp_gfs_v15p2_debug                                                                                                       | standard    | cheyenne.intel | fv3         |
 RUN     | fv3_ccpp_gfs_v16beta_debug                                                                                                     | standard    | cheyenne.intel | fv3         |
 
-COMPILE | CCPP=Y STATIC=Y SUITES=FV3_GSD_v0,FV3_GFS_v15_thompson 32BIT=Y DEBUG=Y                                                         | standard    | cheyenne.intel | fv3         |
+COMPILE | CCPP=Y SUITES=FV3_GSD_v0,FV3_GFS_v15_thompson 32BIT=Y DEBUG=Y                                                                  | standard    | cheyenne.intel | fv3         |
 
 RUN     | fv3_ccpp_gsd_debug                                                                                                             | standard    | cheyenne.intel | fv3         |
 RUN     | fv3_ccpp_thompson_debug                                                                                                        | standard    | cheyenne.intel | fv3         |
@@ -84,13 +91,20 @@ RUN     | fv3_ccpp_thompson_no_aero_debug
 # CCPP REPRO tests                                                                                                                                                                    #
 #######################################################################################################################################################################################
 
-COMPILE | CCPP=Y STATIC=Y SUITES=FV3_GFS_v15p2,FV3_GFS_v16beta REPRO=Y                                                                   | standard    | cheyenne.intel | fv3         |
+COMPILE | CCPP=Y SUITES=FV3_GFS_v15p2,FV3_GFS_v16beta REPRO=Y                                                                            | standard    | cheyenne.intel | fv3         |
 
 RUN     | fv3_ccpp_gfs_v15p2                                                                                                             | standard    | cheyenne.intel | fv3         |
 RUN     | fv3_ccpp_gfs_v16beta                                                                                                           | standard    | cheyenne.intel | fv3         |
 
-COMPILE | REPRO=Y CCPP=Y STATIC=Y SUITES=FV3_HAFS_ferhires,FV3_HAFS_FA_HWRF_RRTMG                                                        | standard    | cheyenne.intel | fv3         |
+COMPILE | REPRO=Y CCPP=Y SUITES=FV3_HAFS_ferhires,FV3_HAFS_FA_HWRF_RRTMG                                                                 | standard    | cheyenne.intel | fv3         |
 
 RUN     | fv3_ccpp_regional_c768_FA                                                                                                      | standard    | cheyenne.intel | fv3         |
 RUN     | fv3_ccpp_regional_c768_HWRF_PBL                                                                                                | standard    | cheyenne.intel | fv3         |
 RUN     | fv3_ccpp_regional_c768_FA_HWRF_RRTMG                                                                                           | standard    | cheyenne.intel | fv3         |
+
+COMPILE | REPRO=Y CCPP=Y SUITES=FV3_GFS_v15p2_HWRF_LSM,FV3_GFS_v15p2_HWRF_SL,FV3_GFS_v15p2_HWRF_LSM_SL,HAFS_v0_hwrf                      | standard    | cheyenne.intel | fv3         |
+
+RUN     | fv3_ccpp_gfs_v15p2_HWRF_LSM                                                                                                    | standard    | cheyenne.intel | fv3         |
+RUN     | fv3_ccpp_gfs_v15p2_HWRF_SL                                                                                                     | standard    | cheyenne.intel | fv3         |
+RUN     | fv3_ccpp_gfs_v15p2_HWRF_LSM_SL                                                                                                 | standard    | cheyenne.intel | fv3         |
+RUN     | fv3_ccpp_HAFS_v0_hwrf                                                                                                          | standard    | cheyenne.intel | fv3         |
diff --git a/tests/tests/fv3_ccpp_HAFS_v0_hwrf b/tests/tests/fv3_ccpp_HAFS_v0_hwrf
new file mode 100644
index 0000000000..a090321ec8
--- /dev/null
+++ b/tests/tests/fv3_ccpp_HAFS_v0_hwrf
@@ -0,0 +1,110 @@
+###############################################################################
+#
+#  FV3 CCPP HAFS v0 HWRF compiled with 32-bit dynamics test
+#
+###############################################################################
+
+export TEST_DESCR="Compare HAFS 32bit CCPP HWRF suite results with previous trunk version"
+
+export CNTL_DIR=HAFS_v0_HWRF
+
+export LIST_FILES="atmos_4xdaily.tile1.nc \
+                   atmos_4xdaily.tile2.nc \
+                   atmos_4xdaily.tile3.nc \
+                   atmos_4xdaily.tile4.nc \
+                   atmos_4xdaily.tile5.nc \
+                   atmos_4xdaily.tile6.nc \
+                   phyf000.tile1.nc \
+                   phyf000.tile2.nc \
+                   phyf000.tile3.nc \
+                   phyf000.tile4.nc \
+                   phyf000.tile5.nc \
+                   phyf000.tile6.nc \
+                   phyf024.tile1.nc \
+                   phyf024.tile2.nc \
+                   phyf024.tile3.nc \
+                   phyf024.tile4.nc \
+                   phyf024.tile5.nc \
+                   phyf024.tile6.nc \
+                   dynf000.tile1.nc \
+                   dynf000.tile2.nc \
+                   dynf000.tile3.nc \
+                   dynf000.tile4.nc \
+                   dynf000.tile5.nc \
+                   dynf000.tile6.nc \
+                   dynf024.tile1.nc \
+                   dynf024.tile2.nc \
+                   dynf024.tile3.nc \
+                   dynf024.tile4.nc \
+                   dynf024.tile5.nc \
+                   dynf024.tile6.nc \
+                   RESTART/coupler.res \
+                   RESTART/fv_core.res.nc \
+                   RESTART/fv_core.res.tile1.nc \
+                   RESTART/fv_core.res.tile2.nc \
+                   RESTART/fv_core.res.tile3.nc \
+                   RESTART/fv_core.res.tile4.nc \
+                   RESTART/fv_core.res.tile5.nc \
+                   RESTART/fv_core.res.tile6.nc \
+                   RESTART/fv_srf_wnd.res.tile1.nc \
+                   RESTART/fv_srf_wnd.res.tile2.nc \
+                   RESTART/fv_srf_wnd.res.tile3.nc \
+                   RESTART/fv_srf_wnd.res.tile4.nc \
+                   RESTART/fv_srf_wnd.res.tile5.nc \
+                   RESTART/fv_srf_wnd.res.tile6.nc \
+                   RESTART/fv_tracer.res.tile1.nc \
+                   RESTART/fv_tracer.res.tile2.nc \
+                   RESTART/fv_tracer.res.tile3.nc \
+                   RESTART/fv_tracer.res.tile4.nc \
+                   RESTART/fv_tracer.res.tile5.nc \
+                   RESTART/fv_tracer.res.tile6.nc \
+                   RESTART/sfc_data.tile1.nc \
+                   RESTART/sfc_data.tile2.nc \
+                   RESTART/sfc_data.tile3.nc \
+                   RESTART/sfc_data.tile4.nc \
+                   RESTART/sfc_data.tile5.nc \
+                   RESTART/sfc_data.tile6.nc \
+                   RESTART/phy_data.tile1.nc \
+                   RESTART/phy_data.tile2.nc \
+                   RESTART/phy_data.tile3.nc \
+                   RESTART/phy_data.tile4.nc \
+                   RESTART/phy_data.tile5.nc \
+                   RESTART/phy_data.tile6.nc"
+
+
+export_fv3
+export NODES=$(expr $TASKS / $TPN + 1)
+
+DT_ATMOS="600"
+
+export FV3_RUN=ccpp_HAFS_v0_hwrf_run.IN
+export CCPP_SUITE=HAFS_v0_hwrf
+export CCPP_LIB_DIR=ccpp/lib
+export INPUT_NML=ccpp_c96_HAFS_v0_hwrf.nml.IN
+
+export OZ_PHYS_OLD=.F.
+export OZ_PHYS_NEW=.T.
+
+#F-A microphysics
+export LRADAR=.T.
+
+#hurricane options for hybrid EDMF
+export HURR_PBL=.T.
+export MONINQFAC=-1.0
+
+#HWRF options for RRTMG
+export ICLOUD=3
+export IOVR_LW=4
+export IOVR_SW=4
+
+#HWRF NOAH LSM
+export LSM=4
+
+#HWRF GFDL surface layer
+export SFC_Z0_TYPE=4
+
+#HWRF options for SAS
+export HWRF_SAMFDEEP=.T.
+export HWRF_SAMFSHAL=.T.
+
+RUN_SCRIPT=rt_fv3.sh
diff --git a/tests/tests/fv3_ccpp_gfs_v15p2_HWRF_LSM b/tests/tests/fv3_ccpp_gfs_v15p2_HWRF_LSM
new file mode 100644
index 0000000000..96b5a725f3
--- /dev/null
+++ b/tests/tests/fv3_ccpp_gfs_v15p2_HWRF_LSM
@@ -0,0 +1,87 @@
+###############################################################################
+#
+#  FV3 CCPP GFS v15.2 compiled with 32-bit dynamics test
+#
+###############################################################################
+
+export TEST_DESCR="Compare FV3 32bit CCPP GFS v15.2 with HWRF NOAH results with previous trunk version"
+
+export CNTL_DIR=fv3_gfs_v15p2_HWRF_LSM
+
+export LIST_FILES="atmos_4xdaily.tile1.nc \
+                   atmos_4xdaily.tile2.nc \
+                   atmos_4xdaily.tile3.nc \
+                   atmos_4xdaily.tile4.nc \
+                   atmos_4xdaily.tile5.nc \
+                   atmos_4xdaily.tile6.nc \
+                   phyf000.tile1.nc \
+                   phyf000.tile2.nc \
+                   phyf000.tile3.nc \
+                   phyf000.tile4.nc \
+                   phyf000.tile5.nc \
+                   phyf000.tile6.nc \
+                   phyf024.tile1.nc \
+                   phyf024.tile2.nc \
+                   phyf024.tile3.nc \
+                   phyf024.tile4.nc \
+                   phyf024.tile5.nc \
+                   phyf024.tile6.nc \
+                   dynf000.tile1.nc \
+                   dynf000.tile2.nc \
+                   dynf000.tile3.nc \
+                   dynf000.tile4.nc \
+                   dynf000.tile5.nc \
+                   dynf000.tile6.nc \
+                   dynf024.tile1.nc \
+                   dynf024.tile2.nc \
+                   dynf024.tile3.nc \
+                   dynf024.tile4.nc \
+                   dynf024.tile5.nc \
+                   dynf024.tile6.nc \
+                   RESTART/coupler.res \
+                   RESTART/fv_core.res.nc \
+                   RESTART/fv_core.res.tile1.nc \
+                   RESTART/fv_core.res.tile2.nc \
+                   RESTART/fv_core.res.tile3.nc \
+                   RESTART/fv_core.res.tile4.nc \
+                   RESTART/fv_core.res.tile5.nc \
+                   RESTART/fv_core.res.tile6.nc \
+                   RESTART/fv_srf_wnd.res.tile1.nc \
+                   RESTART/fv_srf_wnd.res.tile2.nc \
+                   RESTART/fv_srf_wnd.res.tile3.nc \
+                   RESTART/fv_srf_wnd.res.tile4.nc \
+                   RESTART/fv_srf_wnd.res.tile5.nc \
+                   RESTART/fv_srf_wnd.res.tile6.nc \
+                   RESTART/fv_tracer.res.tile1.nc \
+                   RESTART/fv_tracer.res.tile2.nc \
+                   RESTART/fv_tracer.res.tile3.nc \
+                   RESTART/fv_tracer.res.tile4.nc \
+                   RESTART/fv_tracer.res.tile5.nc \
+                   RESTART/fv_tracer.res.tile6.nc \
+                   RESTART/sfc_data.tile1.nc \
+                   RESTART/sfc_data.tile2.nc \
+                   RESTART/sfc_data.tile3.nc \
+                   RESTART/sfc_data.tile4.nc \
+                   RESTART/sfc_data.tile5.nc \
+                   RESTART/sfc_data.tile6.nc \
+                   RESTART/phy_data.tile1.nc \
+                   RESTART/phy_data.tile2.nc \
+                   RESTART/phy_data.tile3.nc \
+                   RESTART/phy_data.tile4.nc \
+                   RESTART/phy_data.tile5.nc \
+                   RESTART/phy_data.tile6.nc"
+
+
+export_fv3
+export NODES=$(expr $TASKS / $TPN + 1)
+
+DT_ATMOS="1200"
+
+export FV3_RUN=ccpp_gfs_v15_HWRF_LSM_run.IN
+export CCPP_SUITE=FV3_GFS_v15p2_HWRF_LSM
+export CCPP_LIB_DIR=ccpp/lib
+export INPUT_NML=ccpp_v15p2_c96_HWRF_LSM.nml.IN
+
+export LSM=4
+
+RUN_SCRIPT=rt_fv3.sh
diff --git a/tests/tests/fv3_ccpp_gfs_v15p2_HWRF_LSM_SL b/tests/tests/fv3_ccpp_gfs_v15p2_HWRF_LSM_SL
new file mode 100644
index 0000000000..bf7ed6099d
--- /dev/null
+++ b/tests/tests/fv3_ccpp_gfs_v15p2_HWRF_LSM_SL
@@ -0,0 +1,88 @@
+###############################################################################
+#
+#  FV3 CCPP GFS v15.2 compiled with 32-bit dynamics test
+#
+###############################################################################
+
+export TEST_DESCR="Compare FV3 32bit CCPP GFS v15.2 with HWRF NOAH and GFDL sfc layer results with previous trunk version"
+
+export CNTL_DIR=fv3_gfs_v15p2_HWRF_LSM_SL
+
+export LIST_FILES="atmos_4xdaily.tile1.nc \
+                   atmos_4xdaily.tile2.nc \
+                   atmos_4xdaily.tile3.nc \
+                   atmos_4xdaily.tile4.nc \
+                   atmos_4xdaily.tile5.nc \
+                   atmos_4xdaily.tile6.nc \
+                   phyf000.tile1.nc \
+                   phyf000.tile2.nc \
+                   phyf000.tile3.nc \
+                   phyf000.tile4.nc \
+                   phyf000.tile5.nc \
+                   phyf000.tile6.nc \
+                   phyf024.tile1.nc \
+                   phyf024.tile2.nc \
+                   phyf024.tile3.nc \
+                   phyf024.tile4.nc \
+                   phyf024.tile5.nc \
+                   phyf024.tile6.nc \
+                   dynf000.tile1.nc \
+                   dynf000.tile2.nc \
+                   dynf000.tile3.nc \
+                   dynf000.tile4.nc \
+                   dynf000.tile5.nc \
+                   dynf000.tile6.nc \
+                   dynf024.tile1.nc \
+                   dynf024.tile2.nc \
+                   dynf024.tile3.nc \
+                   dynf024.tile4.nc \
+                   dynf024.tile5.nc \
+                   dynf024.tile6.nc \
+                   RESTART/coupler.res \
+                   RESTART/fv_core.res.nc \
+                   RESTART/fv_core.res.tile1.nc \
+                   RESTART/fv_core.res.tile2.nc \
+                   RESTART/fv_core.res.tile3.nc \
+                   RESTART/fv_core.res.tile4.nc \
+                   RESTART/fv_core.res.tile5.nc \
+                   RESTART/fv_core.res.tile6.nc \
+                   RESTART/fv_srf_wnd.res.tile1.nc \
+                   RESTART/fv_srf_wnd.res.tile2.nc \
+                   RESTART/fv_srf_wnd.res.tile3.nc \
+                   RESTART/fv_srf_wnd.res.tile4.nc \
+                   RESTART/fv_srf_wnd.res.tile5.nc \
+                   RESTART/fv_srf_wnd.res.tile6.nc \
+                   RESTART/fv_tracer.res.tile1.nc \
+                   RESTART/fv_tracer.res.tile2.nc \
+                   RESTART/fv_tracer.res.tile3.nc \
+                   RESTART/fv_tracer.res.tile4.nc \
+                   RESTART/fv_tracer.res.tile5.nc \
+                   RESTART/fv_tracer.res.tile6.nc \
+                   RESTART/sfc_data.tile1.nc \
+                   RESTART/sfc_data.tile2.nc \
+                   RESTART/sfc_data.tile3.nc \
+                   RESTART/sfc_data.tile4.nc \
+                   RESTART/sfc_data.tile5.nc \
+                   RESTART/sfc_data.tile6.nc \
+                   RESTART/phy_data.tile1.nc \
+                   RESTART/phy_data.tile2.nc \
+                   RESTART/phy_data.tile3.nc \
+                   RESTART/phy_data.tile4.nc \
+                   RESTART/phy_data.tile5.nc \
+                   RESTART/phy_data.tile6.nc"
+
+
+export_fv3
+export NODES=$(expr $TASKS / $TPN + 1)
+
+DT_ATMOS="1200"
+
+export FV3_RUN=ccpp_gfs_v15_HWRF_LSM_run.IN
+export CCPP_SUITE=FV3_GFS_v15p2_HWRF_LSM_SL
+export CCPP_LIB_DIR=ccpp/lib
+export INPUT_NML=ccpp_v15p2_c96_HWRF_LSM_SL.nml.IN
+
+export LSM=4
+export SFC_Z0_TYPE=4
+
+RUN_SCRIPT=rt_fv3.sh
diff --git a/tests/tests/fv3_ccpp_gfs_v15p2_HWRF_SL b/tests/tests/fv3_ccpp_gfs_v15p2_HWRF_SL
new file mode 100644
index 0000000000..ee42b0a9aa
--- /dev/null
+++ b/tests/tests/fv3_ccpp_gfs_v15p2_HWRF_SL
@@ -0,0 +1,87 @@
+###############################################################################
+#
+#  FV3 CCPP GFS v15.2 compiled with 32-bit dynamics test
+#
+###############################################################################
+
+export TEST_DESCR="Compare FV3 32bit CCPP GFS v15.2 using GFDL surface layer results with previous trunk version"
+
+export CNTL_DIR=fv3_gfs_v15p2_HWRF_SL
+
+export LIST_FILES="atmos_4xdaily.tile1.nc \
+                   atmos_4xdaily.tile2.nc \
+                   atmos_4xdaily.tile3.nc \
+                   atmos_4xdaily.tile4.nc \
+                   atmos_4xdaily.tile5.nc \
+                   atmos_4xdaily.tile6.nc \
+                   phyf000.tile1.nc \
+                   phyf000.tile2.nc \
+                   phyf000.tile3.nc \
+                   phyf000.tile4.nc \
+                   phyf000.tile5.nc \
+                   phyf000.tile6.nc \
+                   phyf024.tile1.nc \
+                   phyf024.tile2.nc \
+                   phyf024.tile3.nc \
+                   phyf024.tile4.nc \
+                   phyf024.tile5.nc \
+                   phyf024.tile6.nc \
+                   dynf000.tile1.nc \
+                   dynf000.tile2.nc \
+                   dynf000.tile3.nc \
+                   dynf000.tile4.nc \
+                   dynf000.tile5.nc \
+                   dynf000.tile6.nc \
+                   dynf024.tile1.nc \
+                   dynf024.tile2.nc \
+                   dynf024.tile3.nc \
+                   dynf024.tile4.nc \
+                   dynf024.tile5.nc \
+                   dynf024.tile6.nc \
+                   RESTART/coupler.res \
+                   RESTART/fv_core.res.nc \
+                   RESTART/fv_core.res.tile1.nc \
+                   RESTART/fv_core.res.tile2.nc \
+                   RESTART/fv_core.res.tile3.nc \
+                   RESTART/fv_core.res.tile4.nc \
+                   RESTART/fv_core.res.tile5.nc \
+                   RESTART/fv_core.res.tile6.nc \
+                   RESTART/fv_srf_wnd.res.tile1.nc \
+                   RESTART/fv_srf_wnd.res.tile2.nc \
+                   RESTART/fv_srf_wnd.res.tile3.nc \
+                   RESTART/fv_srf_wnd.res.tile4.nc \
+                   RESTART/fv_srf_wnd.res.tile5.nc \
+                   RESTART/fv_srf_wnd.res.tile6.nc \
+                   RESTART/fv_tracer.res.tile1.nc \
+                   RESTART/fv_tracer.res.tile2.nc \
+                   RESTART/fv_tracer.res.tile3.nc \
+                   RESTART/fv_tracer.res.tile4.nc \
+                   RESTART/fv_tracer.res.tile5.nc \
+                   RESTART/fv_tracer.res.tile6.nc \
+                   RESTART/sfc_data.tile1.nc \
+                   RESTART/sfc_data.tile2.nc \
+                   RESTART/sfc_data.tile3.nc \
+                   RESTART/sfc_data.tile4.nc \
+                   RESTART/sfc_data.tile5.nc \
+                   RESTART/sfc_data.tile6.nc \
+                   RESTART/phy_data.tile1.nc \
+                   RESTART/phy_data.tile2.nc \
+                   RESTART/phy_data.tile3.nc \
+                   RESTART/phy_data.tile4.nc \
+                   RESTART/phy_data.tile5.nc \
+                   RESTART/phy_data.tile6.nc"
+
+
+export_fv3
+export NODES=$(expr $TASKS / $TPN + 1)
+
+DT_ATMOS="1200"
+
+export FV3_RUN=ccpp_gfs_v15_run.IN
+export CCPP_SUITE=FV3_GFS_v15p2_HWRF_SL
+export CCPP_LIB_DIR=ccpp/lib
+export INPUT_NML=ccpp_v15p2_c96_HWRF_SL.nml.IN
+
+export SFC_Z0_TYPE=4
+
+RUN_SCRIPT=rt_fv3.sh