diff --git a/ush/templates/input.nml.FV3_GFS_2017_gfdlmp b/ush/templates/input.nml.FV3_GFS_2017_gfdlmp
index 8fbbe6b8a..ea5e14aa7 100644
--- a/ush/templates/input.nml.FV3_GFS_2017_gfdlmp
+++ b/ush/templates/input.nml.FV3_GFS_2017_gfdlmp
@@ -1,298 +1,298 @@
 &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',
+     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 = <blocksize>
-       chksum_debug = .false.
-       dycore_only = .false.
-       fdiag = 1
-       ccpp_suite = 'FV3_GFS_2017_gfdlmp'
-       avg_max_length = 3600.
+     blocksize = <blocksize>
+     chksum_debug = .false.
+     dycore_only = .false.
+     fdiag = 1
+     ccpp_suite = <ccpp_phys_suite>
+     avg_max_length = 3600.
 /
 
 &diag_manager_nml
-       prepend_date = .false.
+     prepend_date = .false.
 /
 
 &fms_io_nml
-       checksum_required   = .false.
-       max_files_r = 100,
-       max_files_w = 100,
+     checksum_required   = .false.
+     max_files_r = 100,
+     max_files_w = 100,
 /
 
 &fms_nml
-       clock_grain = 'ROUTINE',
-       domains_stack_size = 1800200,
-       print_memory_usage = .false.
+     clock_grain = 'ROUTINE',
+     domains_stack_size = 1800200,
+     print_memory_usage = .false.
 /
 
 &fv_grid_nml
-       grid_file = 'INPUT/grid_spec.nc'
+     grid_file = 'INPUT/grid_spec.nc'
 /
 
 &fv_core_nml
-       layout   = <layout_x>,<layout_y>
-       io_layout = 1,1
-       npx      = <npx>
-       npy      = <npy>
-       ntiles   = 1,
-       npz    = 64
-!       grid_type = -1
-       make_nh = .T.
-       fv_debug = .F.
-       range_warn = .F.
-       reset_eta = .F.
-       n_sponge = 24
-       nudge_qv = .F.
-       tau = 5.
-       rf_cutoff = 20.e2
-       d2_bg_k1 = 0.20
-       d2_bg_k2 = 0.04
-       kord_tm = -11
-       kord_mt =  11
-       kord_wz =  11
-       kord_tr =  11
-       hydrostatic = .F.
-       phys_hydrostatic = .F.
-       use_hydro_pressure = .F.
-       beta = 0.
-       a_imp = 1.
-       p_fac = 0.1
-       k_split  = 6
-       n_split  = 6
-       nwat = 6
-       na_init = 1
-       d_ext = 0.0
-       dnats = 1
-       fv_sg_adj = 300
-       d2_bg = 0.
-       nord =  2
-       dddmp = 0.1
-       d4_bg = 0.15
-       vtdm4 = 0.075
-       delt_max = 0.008
-       ke_bg = 0.
-       do_vort_damp = .true.
-       external_ic = .T.
-       external_eta = .T.
-       gfs_phil = .false.
-       nggps_ic = .T.
-       mountain = .F.
-       ncep_ic = .F.
-       d_con = 1.0
-       hord_mt = 6
-       hord_vt = 6
-       hord_tm = 6
-       hord_dp = -6
-       hord_tr = 8
-       adjust_dry_mass = .F.
-       consv_te = 0.
-       do_sat_adj = .T.
-       consv_am = .F.
-       fill = .T.
-       dwind_2d = .F.
-       print_freq = 6
-       warm_start = .F.
-       no_dycore = .false.
-       z_tracer = .T.
-       read_increment = .F.
-       res_latlon_dynamics = "fv3_increment.nc"
-       do_schmidt = .true.
-       target_lat = <target_lat>
-       target_lon = <target_lon>
-       stretch_fac = <stretch_fac>
-       regional = .true.
-       bc_update_interval = <bc_update_interval>
-       agrid_vel_rst = .false.
-       full_zs_filter = .F. !unreleased feature
-!!       nord_zs_filter = 4
-       n_zs_filter = 0 ! safety
+     layout   = <layout_x>,<layout_y>
+     io_layout = 1,1
+     npx      = <npx>
+     npy      = <npy>
+     ntiles   = 1,
+     npz    = 64
+!     grid_type = -1
+     make_nh = .T.
+     fv_debug = .F.
+     range_warn = .F.
+     reset_eta = .F.
+     n_sponge = 24
+     nudge_qv = .F.
+     tau = 5.
+     rf_cutoff = 20.e2
+     d2_bg_k1 = 0.20
+     d2_bg_k2 = 0.04
+     kord_tm = -11
+     kord_mt =  11
+     kord_wz =  11
+     kord_tr =  11
+     hydrostatic = .F.
+     phys_hydrostatic = .F.
+     use_hydro_pressure = .F.
+     beta = 0.
+     a_imp = 1.
+     p_fac = 0.1
+     k_split  = 6
+     n_split  = 6
+     nwat = 6
+     na_init = 1
+     d_ext = 0.0
+     dnats = 1
+     fv_sg_adj = 300
+     d2_bg = 0.
+     nord =  2
+     dddmp = 0.1
+     d4_bg = 0.15
+     vtdm4 = 0.075
+     delt_max = 0.008
+     ke_bg = 0.
+     do_vort_damp = .true.
+     external_ic = .T.
+     external_eta = .T.
+     gfs_phil = .false.
+     nggps_ic = .T.
+     mountain = .F.
+     ncep_ic = .F.
+     d_con = 1.0
+     hord_mt = 6
+     hord_vt = 6
+     hord_tm = 6
+     hord_dp = -6
+     hord_tr = 8
+     adjust_dry_mass = .F.
+     consv_te = 0.
+     do_sat_adj = .T.
+     consv_am = .F.
+     fill = .T.
+     dwind_2d = .F.
+     print_freq = 6
+     warm_start = .F.
+     no_dycore = .false.
+     z_tracer = .T.
+     read_increment = .F.
+     res_latlon_dynamics = "fv3_increment.nc"
+     do_schmidt = .true.
+     target_lat = <target_lat>
+     target_lon = <target_lon>
+     stretch_fac = <stretch_fac>
+     regional = .true.
+     bc_update_interval = <bc_update_interval>
+     agrid_vel_rst = .false.
+     full_zs_filter = .F. !unreleased feature
+!     nord_zs_filter = 4
+     n_zs_filter = 0 ! safety
 /
 
 &surf_map_nml
-       zero_ocean = .F.
-       cd4 = 0.12
-       cd2 = -1
-       n_del2_strong = 0
-       n_del2_weak = 2
-       n_del4 = 1
-       max_slope = 0.4
-       peak_fac = 1.
+     zero_ocean = .F.
+     cd4 = 0.12
+     cd2 = -1
+     n_del2_strong = 0
+     n_del2_weak = 2
+     n_del4 = 1
+     max_slope = 0.4
+     peak_fac = 1.
 /
 
-&external_ic_nml 
-       filtered_terrain = .true.
-       levp = 65
-       gfs_dwinds = .true.
-       checker_tr = .F.
-       nt_checker = 0
+&external_ic_nml
+     filtered_terrain = .true.
+     levp = 65
+     gfs_dwinds = .true.
+     checker_tr = .F.
+     nt_checker = 0
 /
 
 &gfs_physics_nml
-       fhzero         = 1.
-       ldiag3d        = .false.
-       lradar         = .true.
-       avg_max_length = 3600.
-       h2o_phys       = .true.
-       fhcyc          = 24.
-       nst_anl        = .true.
-       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         = .false.
-       cal_pre        = .false.
-       redrag         = .true.
-       dspheat        = .true.
-       hybedmf        = .true.
-       random_clds    = .false.
-       trans_trac     = .true.
-       cnvcld         = .false.
-       imfshalcnv     = 2
-       imfdeepcnv     = 2
-       cdmbgwd        = 3.5, 0.01       ! NCEP default
-       prslrd0        = 0.
-       ivegsrc        = 1
-       isot           = 1
-       debug          = .false.
-       oz_phys        = .true.
-       oz_phys_2015   = .false.
-       nstf_name      = 2,1,1,0,5
-       iau_delthrs    = 6
-       iaufhrs        = 30
-       iau_inc_files  = ''
-       shal_cnv = .false. !Shallow convection
-       do_deep = .false.
-       lgfdlmprad = .true.
-       effr_in = .true.
+     fhzero         = 1.
+     ldiag3d        = .false.
+     lradar         = .true.
+     avg_max_length = 3600.
+     h2o_phys       = .true.
+     fhcyc          = 24.
+     nst_anl        = .true.
+     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         = .false.
+     cal_pre        = .false.
+     redrag         = .true.
+     dspheat        = .true.
+     hybedmf        = .true.
+     random_clds    = .false.
+     trans_trac     = .true.
+     cnvcld         = .false.
+     imfshalcnv     = 2
+     imfdeepcnv     = 2
+     cdmbgwd        = 3.5, 0.01       ! NCEP default
+     prslrd0        = 0.
+     ivegsrc        = 1
+     isot           = 1
+     debug          = .false.
+     oz_phys        = .true.
+     oz_phys_2015   = .false.
+     nstf_name      = 2,1,1,0,5
+     iau_delthrs    = 6
+     iaufhrs        = 30
+     iau_inc_files  = ''
+     shal_cnv = .false. !Shallow convection
+     do_deep = .false.
+     lgfdlmprad = .true.
+     effr_in = .true.
 /
 
 &gfdl_cloud_microphysics_nml
-       sedi_transport = .false.
-       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 = 180.
-       tau_v2l = 90.
-       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 = 90.
+     sedi_transport = .false.
+     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 = 180.
+     tau_v2l = 90.
+     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 = 90.
 /
 
 &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
+     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
 /
 
 &interpolator_nml
-       interp_method = 'conserve_great_circle'
+     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   =.true.,
-       FSMCL(2) = 99999
-       FSMCL(3) = 99999
-       FSMCL(4) = 99999
-       FTSFS    = 90
-       FAISS    = 99999
-       FSNOL    = 99999
-       FSICL    = 99999
-       FTSFL    = 99999,
-       FAISL    = 99999,
-       FVETL    = 99999,
-       FSOTL    = 99999,
-       FvmnL    = 99999,
-       FvmxL    = 99999,
-       FSLPL    = 99999,
-       FABSL    = 99999,
-       FSNOS    = 99999,
-       FSICS    = 99999,
+     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   =.true.,
+     FSMCL(2) = 99999
+     FSMCL(3) = 99999
+     FSMCL(4) = 99999
+     FTSFS    = 90
+     FAISS    = 99999
+     FSNOL    = 99999
+     FSICL    = 99999
+     FTSFL    = 99999,
+     FAISL    = 99999,
+     FVETL    = 99999,
+     FSOTL    = 99999,
+     FvmnL    = 99999,
+     FvmxL    = 99999,
+     FSLPL    = 99999,
+     FABSL    = 99999,
+     FSNOS    = 99999,
+     FSICS    = 99999,
 /
 
 &nam_stochy
diff --git a/ush/templates/input.nml.FV3_GSD_SAR b/ush/templates/input.nml.FV3_GSD_SAR
index 11689577b..642dcf4dd 100644
--- a/ush/templates/input.nml.FV3_GSD_SAR
+++ b/ush/templates/input.nml.FV3_GSD_SAR
@@ -36,13 +36,13 @@
 /
 
 &fv_core_nml
-     layout   =  <layout_x>,<layout_y>
+     layout   = <layout_x>,<layout_y>
      io_layout = 1,1
      npx      = <npx>
      npy      = <npy>
      ntiles   = 1,
      npz    = 64
-     !grid_type = -1
+!     grid_type = -1
      make_nh = .T.
      fv_debug = .T.
      range_warn = .T.
@@ -102,18 +102,13 @@
      z_tracer = .T.
      read_increment = .F.
      res_latlon_dynamics = "fv3_increment.nc"
-
      do_schmidt = .true.
      target_lat = <target_lat>
      target_lon = <target_lon>
      stretch_fac = <stretch_fac>
-!     nord_zs_filter = 4
-     n_zs_filter = 0
      regional = .true.
      bc_update_interval = <bc_update_interval>
-
      full_zs_filter = .F. !unreleased feature
-
      nord_zs_filter = 4
      n_zs_filter = 0 ! safety
 /
@@ -274,6 +269,7 @@
      FABSL    = 99999,
      FSNOS    = 99999,
      FSICS    = 99999,
+/
 
 &nam_stochy
      lon_s=768,
@@ -297,6 +293,7 @@
      ISEED_SKEB=2,
      ISEED_SPPT=3,
 /
+
 &nam_sfcperts
      NSFCPERT=6,
      PERTZ0=-999.,
diff --git a/ush/templates/input.nml.FV3_GSD_v0 b/ush/templates/input.nml.FV3_GSD_v0
index 4ba9a2c5c..a2459e97b 100644
--- a/ush/templates/input.nml.FV3_GSD_v0
+++ b/ush/templates/input.nml.FV3_GSD_v0
@@ -36,13 +36,13 @@
 /
 
 &fv_core_nml
-     layout   =  <layout_x>,<layout_y>
+     layout   = <layout_x>,<layout_y>
      io_layout = 1,1
      npx      = <npx>
      npy      = <npy>
      ntiles   = 1,
      npz    = 64
-     !grid_type = -1
+!     grid_type = -1
      make_nh = .T.
      fv_debug = .T.
      range_warn = .T.
@@ -102,18 +102,13 @@
      z_tracer = .T.
      read_increment = .F.
      res_latlon_dynamics = "fv3_increment.nc"
-
      do_schmidt = .true.
      target_lat = <target_lat>
      target_lon = <target_lon>
      stretch_fac = <stretch_fac>
-!     nord_zs_filter = 4
-     n_zs_filter = 0
      regional = .true.
      bc_update_interval = <bc_update_interval>
-
      full_zs_filter = .F. !unreleased feature
-
      nord_zs_filter = 4
      n_zs_filter = 0 ! safety
 /