diff --git a/parm/templates/template.LND.fd_ufs.yaml b/parm/templates/template.LND.fd_ufs.yaml
deleted file mode 100644
index edfca0be..00000000
--- a/parm/templates/template.LND.fd_ufs.yaml
+++ /dev/null
@@ -1,1266 +0,0 @@
-field_dictionary:
-  version_number: 0.0.0
-  institution: National ESPC, CSC & MCL Working Groups
-  source: automatically generated by the NUOPC Layer
-  description: Community-based dictionary for shared coupling fields
-  entries:
-    #
-    #-----------------------------------
-    # section: mediator calculation for atm/ocn flux calculation
-    #-----------------------------------
-    #
-    - standard_name: Faox_lat
-      alias: mean_laten_heat_flx_atm_into_ocn
-      canonical_units: W m-2
-      description: mediator calculation - atm/ocn surface latent heat flux
-    #
-    - standard_name: Faox_lwup
-      alias: mean_up_lw_flx_ocn
-      canonical_units: W m-2
-      description: mediator calculation - long wave radiation flux over the ocean
-    #
-    - standard_name: Faox_taux
-      alias: stress_on_air_ocn_zonal
-      canonical_units: N m-2
-      description: mediator calculation
-    #
-    - standard_name: Faox_tauy
-      alias: stress_on_air_ocn_merid
-      canonical_units: N m-2
-      description: mediator calculation
-    #
-    - standard_name: Foxx_lwnet
-      alias: mean_net_lw_flx
-      canonical_units: W m-2
-      description: mediator calculation - atm/ocn net longwave flux
-    #
-    - standard_name: Foxx_sen
-      canonical_units: W m-2
-      alias: mean_sensi_heat_flx
-      description: mediator calculation - atm/ocn surface sensible heat flux
-    #
-    - standard_name: Foxx_evap
-      canonical_units: kg m-2 s-1
-      alias: mean_evap_rate
-      description: mediator calculation - atm/ocn specific humidity flux
-    #
-    - standard_name: Faox_evap
-      canonical_units: kg m-2 s-1
-      description: mediator calculation - atm/ocn specific humidity flux
-    #-----------------------------------
-    # section: atmosphere export
-    #-----------------------------------
-    #
-    - standard_name: Faxa_bcph
-      canonical_units: kg m-2 s-1
-      description: atmosphere export
-    #
-    - standard_name: Faxa_ocph
-      canonical_units: kg m-2 s-1
-      description: atmosphere export
-    #
-    - standard_name: Faxa_dstdry
-      canonical_units: kg m-2 s-1
-      description: atmosphere export
-    #
-    - standard_name: Faxa_dstwet
-      canonical_units: kg m-2 s-1
-      description: atmosphere export
-    #
-    #-----------------------------------
-    # section: atmosphere export
-    #-----------------------------------
-    #
-    - standard_name: Faxa_swdn
-      alias: inst_down_sw_flx
-      canonical_units: W m-2
-      description: atmosphere export -  mean downward SW heat flux
-    #
-    - standard_name: Faxa_lwdn
-      alias: inst_down_lw_flx
-      canonical_units: W m-2
-      description: atmosphere export - mean downward LW heat flux
-    #
-    - standard_name: Faxa_rain
-      alias: inst_prec_rate
-      canonical_units: kg m-2 s-1
-      description: atmosphere export
-    #
-    - standard_name: Faxa_rainc
-      alias: inst_prec_rate_conv
-      canonical_units: kg m-2 s-1
-      description: atmosphere export
-    #
-    - standard_name: Faxa_rainl
-      alias: inst_prec_rate_large
-      canonical_units: kg m-2 s-1
-      description: atmosphere export
-    #
-    - standard_name: Faxa_snow
-      alias: inst_fprec_rate
-      canonical_units: kg m-2 s-1
-      description: atmosphere export
-    #
-    - standard_name: Faxa_snowc
-      alias: inst_fprec_rate_conv
-      canonical_units: kg m-2 s-1
-      description: atmosphere export
-    #
-    - standard_name: Faxa_snowl
-      alias: inst_fprec_rate_large
-      canonical_units: kg m-2 s-1
-      description: atmosphere export
-    #
-    - standard_name: Faxa_swnet
-      alias: inst_net_sw_flx
-      canonical_units: W m-2
-      description: atmosphere export
-    #
-    - standard_name: Faxa_swndf
-      alias: inst_down_sw_ir_dif_flx
-      canonical_units: W m-2
-      description: atmosphere export - mean surface downward nir diffuse flux
-    #
-    - standard_name: Faxa_swndr
-      alias: inst_down_sw_ir_dir_flx
-      canonical_units: W m-2
-      description: atmosphere export - mean surface downward nir direct flux
-    #
-    - standard_name: Faxa_swvdf
-      alias: inst_down_sw_vis_dif_flx
-      canonical_units: W m-2
-      description: atmosphere export - mean surface downward uv+vis diffuse flux
-    #
-    - standard_name: Faxa_swvdr
-      alias: inst_down_sw_vis_dir_flx
-      canonical_units: W m-2
-      description: atmosphere export - mean surface downward uv+visvdirect flux
-    #
-    - standard_name: Sa_dens
-      alias: air_density_height_lowest
-      canonical_units: kg m-3
-      description: atmosphere export- density at the lowest model layer
-    #
-    - standard_name: Sa_pbot
-      alias: inst_pres_height_lowest
-      canonical_units: Pa
-      description: atmosphere export - pressure at lowest model layer
-    #
-    - standard_name: Sa_prsl
-      alias: inst_pres_height_lowest_from_phys
-      canonical_units: Pa
-      description: atmosphere export - pressure at lowest model layer
-    #
-    - standard_name: Sa_pslv
-      alias: inst_pres_height_surface
-      canonical_units: Pa
-      description: atmosphere export - instantaneous pressure land and sea surface
-    #
-    - standard_name: Sa_ptem
-      canonical_units: K
-      description: atmosphere export - bottom layer potential temperature
-    #
-    - standard_name: Sa_shum
-      alias: inst_spec_humid_height_lowest
-      canonical_units: kg kg-1
-      description: atmosphere export - bottom layer specific humidity
-    #
-    - standard_name: Sa_qa
-      alias: inst_spec_humid_height_lowest_from_phys
-      canonical_units: kg kg-1
-      description: atmosphere export - bottom layer specific humidity
-    #
-    - standard_name: Sa_tbot
-      alias: inst_temp_height_lowest
-      canonical_units: K
-      description: atmosphere export - bottom layer temperature
-    #
-    - standard_name: Sa_tskn
-      alias: inst_temp_height_surface
-    - standard_name: Sa_tskn
-      alias: inst_temp_skin_temperature
-      canonical_units: K
-      description: atmosphere export - sea surface skin temperature
-    #
-    - standard_name: Sa_ta
-      alias: inst_temp_height_lowest_from_phys
-      canonical_units: K
-      description: atmosphere export - bottom layer temperature
-    #
-    - standard_name: Sa_u
-      alias: inst_zonal_wind_height_lowest
-      canonical_units: m s-1
-      description: atmosphere export - bottom layer zonal wind
-    #
-    - standard_name: Sa_v
-      alias: inst_merid_wind_height_lowest
-      canonical_units: m s-1
-      description: atmosphere export - bottom layer meridional wind
-    #
-    - standard_name: Sa_wspd
-      alias: inst_wind_speed_height_lowest
-      canonical_units: m s-1
-      description: atmosphere export - bottom layer wind speed
-    #
-    - standard_name: Sa_z
-      alias: inst_height_lowest
-      canonical_units: m
-      description: atmosphere export - bottom layer height
-    #
-    - standard_name: Sa_topo
-      alias: inst_surface_height
-      canonical_units: m
-      description: atmosphere export - topographic height
-    #
-    - standard_name: Faxa_taux
-      alias: inst_zonal_moment_flx
-    - standard_name: Faxa_taux
-      alias: inst_zonal_moment_flx_atm
-      canonical_units: N m-2
-      description: atmosphere export- zonal component of momentum flux
-    #
-    - standard_name: Faxa_tauy
-      alias: inst_merid_moment_flx
-    - standard_name: Faxa_tauy
-      alias: inst_merid_moment_flx_atm
-      canonical_units: N m-2
-      description: atmosphere export - meridional component of momentum flux
-    #
-    - standard_name: Faxa_lwnet
-      canonical_units: W m-2
-      alias: inst_net_lw_flx
-      description: atmosphere export - mean net longwave flux from atm
-    #
-    - standard_name: Faxa_sen
-      canonical_units: W m-2
-      alias: inst_sensi_heat_flx
-      description: atmosphere export - sensible heat flux
-    #
-    - standard_name: Faxa_evap
-      canonical_units: kg m-2 s-1
-      alias: inst_evap_rate
-      description: atmosphere export - latent heat flux conversion
-    #
-    - standard_name: Faxx_evap
-      canonical_units: kg m-2 s-1
-      description: atmosphere import
-    #
-    - standard_name: Faxa_lat
-      alias: inst_laten_heat_flx
-      canonical_units: W m-2
-      description: atmosphere export - latent heat flux
-    #
-    - standard_name: Faxx_lat
-      alias: mean_laten_heat_flx
-      canonical_units: W m-2
-      description: atmosphere import
-    #
-    - standard_name: Faxx_lwup
-      alias: mean_up_lw_flx
-      canonical_units: W m-2
-      description: atmosphere import - merged ocn/ice flux
-    #
-    - standard_name: Faxx_sen
-      alias: mean_sensi_heat_flx
-      canonical_units: W m-2
-      description: atmosphere import
-    #
-    - standard_name: Faxx_taux
-      alias: mean_zonal_moment_flx
-      canonical_units: N m-2
-      description: atmosphere import - zonal component of momentum flux
-    #
-    - standard_name: Faxx_tauy
-      alias: mean_merid_moment_flx
-      canonical_units: N m-2
-      description: atmosphere import - meridional component of momentum flux
-    #
-    - standard_name: Sa_ofrac
-      alias: openwater_frac_in_atm
-      canonical_units: 1
-      description: atm export to mediator - open water ocean fraction (varies with time)
-    #
-    - standard_name: Sa_u10m
-      alias: inst_zonal_wind_height10m
-      canonical_units: m s-1
-      description: atmosphere export - zonal wind height 10m
-    - standard_name: Sa_u10m
-      alias: eastward_wind_at_10m_height
-    #
-    - standard_name: Sa_v10m
-      alias: inst_merid_wind_height10m
-      canonical_units: m s-1
-      description: atmosphere export - meridional wind height 10m
-    - standard_name: Sa_v10m
-      alias: northward_wind_at_10m_height
-    #
-    - standard_name: Sa_wspd10m
-      alias: inst_wind_speed_height10m
-      canonical_units: m s-1
-      description: atmosphere export - wind speed height 10m
-    #
-    - standard_name: Sa_t2m
-      alias: inst_temp_height2m
-      canonical_units: K
-      description: atmosphere export - temperature height 2m
-    #
-    - standard_name: Sa_q2m
-      alias: inst_spec_humid_height2m
-      canonical_units: kg kg -1
-      description: atmosphere export - specifc humidity height 2m
-    #
-    - standard_name: canopy_moisture_storage
-      canonical_units: m
-      description: canopy moisture content
-    #
-    - standard_name: inst_aerodynamic_conductance
-      canonical_units: m
-      description: aerodynamic conductance
-    #
-    - standard_name: inst_canopy_resistance
-      canonical_units: s m-1
-      description: canopy aerodynamic resistance
-    #
-    - standard_name: leaf_area_index
-      canonical_units: 1
-      description: leaf area index
-    #
-    - standard_name: temperature_of_soil_layer
-      canonical_units: K
-      description: temperature in soil layer
-    #
-    - standard_name: height
-      canonical_units: m
-      description: orography
-    #
-    - standard_name: Sa_exner
-      alias: inst_exner_function_height_lowest
-      canonical_units: 1
-      description: dimensionless exner function at surface adjacent layer
-    #
-    - standard_name: Sa_ustar
-      alias: surface_friction_velocity
-      canonical_units: m s-1
-      description: surface friction velocity
-    #
-    #-----------------------------------
-    # section: sea-ice export
-    #-----------------------------------
-    #
-    - standard_name: Faii_evap
-      alias: evap_rate_atm_into_ice
-      canonical_units: kg m-2 s-1
-      description: sea-ice export
-    #
-    - standard_name: Faii_lat
-      alias: laten_heat_flx_atm_into_ice
-      canonical_units: W m-2
-      description: sea-ice export to atm - atm/ice latent heat flux
-    #
-    - standard_name: Faii_sen
-      alias: sensi_heat_flx_atm_into_ice
-      canonical_units: W m-2
-      description: sea-ice export to atm - atm/ice sensible heat flux
-    #
-    - standard_name: Faii_lwup
-      alias: lwup_flx_ice
-      canonical_units: W m-2
-      description: sea-ice export - outgoing logwave radiation
-    #
-    - standard_name: Faii_swnet
-      canonical_units: W m-2
-      description: sea-ice export to atm
-    #
-    - standard_name: Faii_taux
-      alias: stress_on_air_ice_zonal
-      canonical_units: N m-2
-      description: sea-ice export to atm - air ice zonal stress
-    #
-    - standard_name: Faii_tauy
-      alias: stress_on_air_ice_merid
-      canonical_units: N m-2
-      description: sea-ice export - air ice meridional stress
-    #
-    - standard_name: Fioi_bcphi
-      canonical_units: kg m-2 s-1
-      description: sea-ice export to ocean - hydrophilic black carbon flux to ocean
-    #
-    - standard_name: Fioi_bcpho
-      canonical_units: kg m-2 s-1
-      description: sea-ice export to ocean - hydrophobic black carbon flux to ocean
-    #
-    - standard_name: Fioi_flxdst
-      canonical_units: kg m-2 s-1
-      description: sea-ice export to ocean - dust aerosol flux to ocean
-    #
-    - standard_name: Fioi_melth
-      alias: net_heat_flx_to_ocn
-      canonical_units: W m-2
-      description: sea-ice export to ocean - net heat flux to ocean
-    #
-    - standard_name: Fioi_meltw
-      alias: mean_fresh_water_to_ocean_rate
-      canonical_units: kg m-2 s-1
-      description: sea-ice export to ocean - fresh water to ocean (h2o flux from melting)
-    #
-    - standard_name: Fioi_meltw_wiso
-      alias: mean_fresh_water_to_ocean_rate_wiso
-      canonical_units: kg m-2 s-1
-      description: sea-ice export to ocean - fresh water to ocean (h2o flux from melting) for 16O, 18O, HDO
-    #
-    - standard_name: Fioi_salt
-      alias: mean_salt_rate
-      canonical_units: kg m-2 s-1
-      description: sea-ice export to ocean - salt to ocean (salt flux from melting)
-    #
-    - standard_name: Fioi_swpen
-      alias: mean_sw_pen_to_ocn
-      canonical_units: W m-2
-      description: sea-ice export to ocean - flux of shortwave through ice to ocean
-    #
-    - standard_name: Fioi_swpen_vdr
-      alias: mean_sw_pen_to_ocn_vis_dir_flx
-      canonical_units: W m-2
-      description: sea-ice export to ocean - flux of vis dir shortwave through ice to ocean
-    #
-    - standard_name: Fioi_swpen_vdf
-      alias: mean_sw_pen_to_ocn_vis_dif_flx
-      canonical_units: W m-2
-      description: sea-ice export to ocean - flux of vif dir shortwave through ice to ocean
-    #
-    - standard_name: Fioi_swpen_idr
-      alias: mean_sw_pen_to_ocn_ir_dir_flx
-      canonical_units: W m-2
-      description: sea-ice export to ocean - flux of ir dir shortwave through ice to ocean
-    #
-    - standard_name: Fioi_swpen_idf
-      alias: mean_sw_pen_to_ocn_ir_dif_flx
-      canonical_units: W m-2
-      description: sea-ice export to ocean - flux of ir dif shortwave through ice to ocean
-    #
-    - standard_name: Fioi_taux
-      alias: stress_on_ocn_ice_zonal
-      canonical_units: N m-2
-      description: sea-ice export to ocean - ice ocean zonal stress
-    #
-    - standard_name: Fioi_tauy
-      alias: stress_on_ocn_ice_merid
-      canonical_units: N m-2
-      description: sea-ice export to ocean - ice ocean meridional stress
-    #
-    - standard_name: Si_anidf
-      alias: inst_ice_ir_dif_albedo
-      canonical_units: 1
-      description: sea-ice export to atm
-    #
-    - standard_name: Si_anidr
-      alias: inst_ice_ir_dir_albedo
-      canonical_units: 1
-      description: sea-ice export to atm
-    #
-    - standard_name: Si_avsdf
-      alias: inst_ice_vis_dif_albedo
-      canonical_units: 1
-      description: sea-ice export to atm
-    #
-    - standard_name: Si_avsdr
-      alias: inst_ice_vis_dir_albedo
-      canonical_units: 1
-      description: sea-ice export to atm
-    #
-    - standard_name: Si_ifrac
-      alias: ice_fraction
-      canonical_units: 1
-      description: sea-ice export to atm - ice fraction (varies with time)
-    #
-    - standard_name: Si_imask
-      alias: ice_mask
-      canonical_units: 1
-      description: sea-ice export - ice mask
-    #
-    - standard_name: Si_qref
-      canonical_units: kg kg-1
-      description: sea-ice export to atm
-    #
-    - standard_name: Si_t
-      alias: sea_ice_surface_temperature
-      canonical_units: K
-      description: sea-ice export
-    #
-    - standard_name: Si_tref
-      canonical_units: K
-      description: sea-ice export
-    #
-    - standard_name: Si_u10
-      canonical_units: m/s
-      description: sea-ice export
-    #
-    - standard_name: Si_vice
-      alias: sea_ice_volume
-      canonical_units: m
-      description: sea-ice export - volume of ice per unit area
-    #
-    - standard_name: Si_snowh
-      canonical_units: m
-      description: sea-ice export - surface_snow_water_equivalent
-    #
-    - standard_name: Si_vsno
-      alias: snow_volume_on_sea_ice
-      canonical_units: m
-      description: sea-ice export - volume of snow per unit area
-    #
-    - standard_name: Si_thick
-      canonical_units: m
-      description: sea-ice export - ice thickness
-    #
-    - standard_name: Si_floediam
-      canonical_units: m
-      description: sea-ice export - ice floe diameter
-    #
-    #-----------------------------------
-    # section: ocean export to mediator
-    #-----------------------------------
-    #
-    - standard_name: Fioo_q
-      alias: freezing_melting_potential
-      canonical_units: W m-2
-      description: ocean export
-    #
-    - standard_name: So_bldepth
-      alias: mixed_layer_depth
-      canonical_units: m
-      description: ocean export
-    #
-    - standard_name: So_h
-      alias: sea_surface_height_above_sea_level
-      canonical_units: m
-      description: ocean export
-    - standard_name: So_h
-      alias: seahgt
-    #
-    - standard_name: So_dhdx
-      alias: sea_surface_slope_zonal
-      canonical_units: m m-1
-      description: ocean export
-    #
-    - standard_name: So_dhdy
-      alias: sea_surface_slope_merid
-      canonical_units: m m-1
-      description: ocean export
-    #
-    - standard_name: So_duu10n
-      canonical_units: m2 s-2
-      description: ocean export
-    #
-    - standard_name: So_fswpen
-      canonical_units: 1
-      description: ocean export
-    #
-    - standard_name: So_ofrac
-      canonical_units: 1
-      description: ocean export
-    #
-    - standard_name: So_omask
-      alias: ocean_mask
-      canonical_units: 1
-      description: ocean export
-    #
-    - standard_name: So_qref
-      canonical_units: kg kg-1
-      description: ocean export
-    #
-    - standard_name: So_re
-      canonical_units: 1
-      description: ocean export
-    #
-    - standard_name: So_s
-      alias: s_surf
-      canonical_units: g kg-1
-      description: ocean export
-    #
-    - standard_name: So_ssq
-      canonical_units: kg kg-1
-      description: ocean export
-    #
-    - standard_name: So_t
-      alias: sea_surface_temperature
-      canonical_units: K
-      description: ocean export
-    #
-    - standard_name: So_tref
-      canonical_units: K
-      description: ocean export
-    #
-    - standard_name: So_u
-      alias: ocn_current_zonal
-      canonical_units: m s-1
-      description: ocean export
-    #
-    - standard_name: So_u10
-      canonical_units: m
-      description: ocean export
-    #
-    - standard_name: So_ustar
-      canonical_units: m s-1
-      description: ocean export
-    #
-    - standard_name: So_v
-      alias: ocn_current_merid
-      canonical_units: m s-1
-      description: ocean export
-    #
-    #-----------------------------------
-    # section: ocean import
-    #-----------------------------------
-    #
-    - standard_name: Foxx_hrain
-      canonical_units: W m-2
-      description: to ocn heat content of rain
-    #
-    - standard_name: Foxx_hsnow
-      canonical_units: W m-2
-      description: to ocn heat content of snow
-    #
-    - standard_name: Foxx_hevap
-      canonical_units: W m-2
-      description: to ocn heat content of evaporation
-    #
-    - standard_name: Foxx_hcond
-      canonical_units: W m-2
-      description: to ocn heat content of condensation
-    #
-    - standard_name: Foxx_hrofl
-      canonical_units: W m-2
-      description: to ocn heat content of liquid runoff
-    #
-    - standard_name: Foxx_hrofi
-      canonical_units: W m-2
-      description: to ocn heat content of ice runoff
-    #
-    - standard_name: Foxx_rofi
-      canonical_units: kg m-2 s-1
-      description: ocean import - water flux due to runoff (frozen)
-    #
-    - standard_name: Foxx_rofl
-      canonical_units: kg m-2 s-1
-      description: ocean import - water flux due to runoff (liquid)
-    #
-    - standard_name: Foxx_swnet
-      alias: mean_net_sw_flx
-      canonical_units: W m-2
-      description: ocean import - net shortwave radiation to ocean
-    #
-    - standard_name: Foxx_swnet_vdr
-      alias: mean_net_sw_vis_dir_flx
-      canonical_units: W m-2
-      description: ocean import - net shortwave visible direct radiation to ocean
-    #
-    - standard_name: Foxx_swnet_vdf
-      alias: mean_net_sw_vis_dif_flx
-      canonical_units: W m-2
-      description: ocean import - net shortwave visible diffuse radiation to ocean
-    #
-    - standard_name: Foxx_swnet_idr
-      alias: mean_net_sw_ir_dir_flx
-      canonical_units: W m-2
-      description: ocean import - net shortwave ir direct radiation to ocean
-    #
-    - standard_name: Foxx_swnet_idf
-      alias: mean_net_sw_ir_dif_flx
-      canonical_units: W m-2
-      description: ocean import - net shortwave ir diffuse radiation to ocean
-    #
-    - standard_name: Foxx_sen
-      alias: mean_sensi_heat_flx
-      canonical_units: W m-2
-      description: ocean import - sensible heat flux into ocean
-    #
-    - standard_name: Foxx_lat
-      canonical_units: W m-2
-      description: ocean import - latent heat flux into ocean
-    #
-    - standard_name: Foxx_taux
-      alias: mean_zonal_moment_flx
-      canonical_units: N m-2
-      description: ocean import - zonal surface stress to ocean
-    #
-    - standard_name: Foxx_tauy
-      alias: mean_merid_moment_flx
-      canonical_units: N m-2
-      description: ocean import - meridional surface stress to ocean
-    #
-    #-----------------------------------
-    # mediator fields
-    #-----------------------------------
-    #
-    - standard_name: cpl_scalars
-      canonical_units: unitless
-    #
-    - standard_name: frac
-      canonical_units: 1
-    #
-    - standard_name: mask
-      canonical_units: 1
-    #
-    #-----------------------------------
-    # fields to use fluxes from mediator
-    #-----------------------------------
-    #
-    - standard_name: Faox_lat
-      alias: laten_heat_flx_atm_into_ocn
-      canonical_units: W m-2
-      description: mediator export - atm/ocn surface latent heat flux
-    #
-    - standard_name: Faox_sen
-      alias: sensi_heat_flx_atm_into_ocn
-      canonical_units: W m-2
-      description: mediator export - atm/ocn surface sensible heat flux
-    #
-    - standard_name: Faox_lwup
-      alias: lwup_flx_ocn
-      canonical_units: W m-2
-      description: mediator export - long wave radiation flux over the ocean
-    #
-    - standard_name: Faox_taux
-      alias: stress_on_air_ocn_zonal
-      canonical_units: N m-2
-      description: mediator export
-    #
-    - standard_name: Faox_tauy
-      alias: stress_on_air_ocn_merid
-      canonical_units: N m-2
-      description: mediator export
-    #
-    #-----------------------------------
-    # section: atmosphere fields that need to be defined but are not used
-    #-----------------------------------
-    #
-    - standard_name: mean_prec_rate
-      canonical_units: kg m-2 s-1
-    - standard_name: mean_fprec_rate
-      canonical_units: kg m-2 s-1
-    - standard_name: mean_prec_rate_conv
-      canonical_units: kg m-2 s-1
-    - standard_name: mean_down_lw_flx
-      canonical_units: W m-2
-    - standard_name: inst_net_lw_flx
-      canonical_units: W m-2
-    - standard_name: mean_down_sw_flx
-      canonical_units: W m-2
-    - standard_name: mean_net_sw_flx
-      canonical_units: W m-2
-    - standard_name: inst_net_sw_ir_dir_flx
-      canonical_units: W m-2
-    - standard_name: inst_net_sw_ir_dif_flx
-      canonical_units: W m-2
-    - standard_name: inst_net_sw_vis_dir_flx
-      canonical_units: W m-2
-    - standard_name: inst_net_sw_vis_dif_flx
-      canonical_units: W m-2
-    - standard_name: mean_down_sw_ir_dif_flx
-      canonical_units: W m-2
-    - standard_name: mean_down_sw_ir_dir_flx
-      canonical_units: W m-2
-    - standard_name: mean_down_sw_vis_dif_flx
-      canonical_units: W m-2
-    - standard_name: mean_down_sw_vis_dir_flx
-      canonical_units: W m-2
-    - standard_name: inst_surface_height
-      canonical_units: m
-    - standard_name: mean_zonal_moment_flx_atm
-      canonical_units: N m-2
-    - standard_name: mean_merid_moment_flx_atm
-      canonical_units: N m-2
-    - standard_name: inst_zonal_moment_flx_atm
-      canonical_units: N m-2
-    - standard_name: inst_merid_moment_flx_atm
-      canonical_units: N m-2
-    - standard_name: inst_sensi_heat_flx
-      canonical_units: N m-2
-    - standard_name: inst_laten_heat_flx
-      canonical_units: N m-2
-    - standard_name: inst_evap_rate
-      canonical_units: kg m-2 s-1
-    - standard_name: inst_tracer_mass_frac
-      canonical_units: 1
-    - standard_name: inst_tracer_up_surface_flx
-      canonical_units: kg m-2 s-1
-    - standard_name: inst_tracer_down_surface_flx
-      canonical_units: kg m-2 s-1
-    - standard_name: inst_tracer_clmn_mass_dens
-      canonical_units: g m-2
-    - standard_name: inst_tracer_anth_biom_flx
-      canonical_units: ug m-2 s-1
-      description: atmosphere export
-    - standard_name: inst_pres_interface
-      canonical_units: Pa
-    - standard_name: inst_pres_levels
-      canonical_units: Pa
-    - standard_name: inst_geop_interface
-      canonical_units: tbd
-    - standard_name: inst_geop_levels
-      canonical_units: tbd
-    - standard_name: inst_temp_interface
-      canonical_units: K
-    - standard_name: inst_temp_levels
-      canonical_units: K
-    - standard_name: inst_zonal_wind_levels
-      canonical_units: m s-1
-    - standard_name: inst_merid_wind_levels
-      canonical_units: m s-1
-    - standard_name: inst_omega_levels
-      canonical_units: tbd
-    - standard_name: inst_tracer_mass_frac
-      canonical_units: 1
-    - standard_name: inst_soil_moisture_content
-      canonical_units: tbd
-    - standard_name: soil_type
-      canonical_units: tbd
-    - standard_name: inst_pbl_height
-      canonical_units: tbd
-    - standard_name: surface_cell_area
-      canonical_units: tbd
-    - standard_name: inst_convective_rainfall_amount
-      canonical_units: tbd
-    - standard_name: inst_spec_humid_conv_tendency_levels
-      canonical_units: tbd
-    - standard_name: inst_exchange_coefficient_heat_levels
-      canonical_units: tbd
-    - standard_name: inst_friction_velocity
-      canonical_units: tbd
-    - standard_name: inst_rainfall_amount
-      canonical_units: tbd
-    - standard_name: inst_land_sea_mask
-      canonical_units: tbd
-    - standard_name: inst_temp_height_surface
-      canonical_units: tbd
-    - standard_name: inst_up_sensi_heat_flx
-      canonical_units: tbd
-    - standard_name: inst_lwe_snow_thickness
-      canonical_units: tbd
-    - standard_name: vegetation_type
-      canonical_units: tbd
-    - standard_name: inst_vegetation_area_frac
-      canonical_units: tbd
-    - standard_name: inst_surface_roughness
-      canonical_units: tbd
-    - standard_name: inst_laten_heat_flx
-      canonical_units: W m-2
-    - standard_name: inst_sensi_heat_flx
-      canonical_units: W m-2
-    - standard_name: land_mask
-      canonical_units: 1
-    - standard_name: inst_cloud_frac_levels
-      canonical_units: 1
-    - standard_name: inst_ice_nonconv_tendency_levels
-      canonical_units: kg m-2 s-1
-    - standard_name: inst_liq_nonconv_tendency_levels
-      canonical_units: kg m-2 s-1
-    - standard_name: inst_surface_soil_wetness
-      canonical_units: 1
-    - standard_name: lake_fraction
-      canonical_units: 1
-    - standard_name: ice_fraction_in_atm
-      alias: sea_ice_area_fraction
-      canonical_units: 1
-    - standard_name: ocean_fraction
-      canonical_units: 1
-    - standard_name: surface_snow_area_fraction
-      canonical_units: 1
-    #
-    #-----------------------------------
-    # WW3 import
-    #-----------------------------------
-    #
-    - standard_name: sea_surface_height_above_sea_level
-      canonical_units: m
-      description: ww3 import
-    #
-    - standard_name: sea_surface_salinity
-      alias: s_surf
-      canonical_units: g kg-1
-      description: ww3 import
-    #
-    - standard_name: surface_eastward_sea_water_velocity
-      alias: ocn_current_zonal
-      canonical_units: m s-1
-      description: ww3 import
-    #
-    - standard_name: surface_northward_sea_water_velocity
-      alias: ocn_current_merid
-      canonical_units: m s-1
-      description: ww3 import
-    #
-    - standard_name: eastward_wind_at_10m_height
-      alias: inst_zonal_wind_height10m
-      canonical_units: m s-1
-      description: ww3 import
-    #
-    - standard_name: northward_wind_at_10m_height
-      alias: inst_merid_wind_height10m
-      canonical_units: m s-1
-      description: ww3 import
-    #
-    - standard_name: sea_ice_concentration
-      alias: ice_fraction
-      canonical_units: 1
-      description: ww3 import
-    #
-    #-----------------------------------
-    # WW3 export
-    #-----------------------------------
-    #
-    - standard_name: Sw_z0
-      alias: wave_z0_roughness_length
-      canonical_units: 1
-      description: ww3 export
-    - standard_name: Sw_z0
-      alias: z0rlen
-    #
-    - standard_name: Sw_pstokes_x
-      alias: eastward_partitioned_stokes_drift_current
-      canonical_units: m s-1
-      description: ww3 export partitioned drift components using ungridded dimension
-    #
-    - standard_name: Sw_pstokes_y
-      alias: northward_partitioned_stokes_drift_current
-      canonical_units: m s-1
-      description: ww3 export partitioned drift components using ungridded dimension
-    #
-    - standard_name: Sw_elevation_spectrum
-      alias: wave_elevation_spectrum
-      canonical_units: m2/s
-      description: wave elevation spectrum
-    #
-    # remaining fields are unused but required to be present
-    #
-    - standard_name: Sw_ch
-      alias: wave_induced_charnock_parameter
-      canonical_units: 1
-      description: ww3 export
-    - standard_name: Sw_ch
-      alias: charno
-    #
-    - standard_name: eastward_stokes_drift_current
-      alias: uscurr
-      canonical_units: m s-1
-      description: ww3 export spectrum of drift components
-    #
-    - standard_name: northward_stokes_drift_current
-      alias: vscurr
-      canonical_units: m s-1
-      description: ww3 export spectrum of drift components
-    #
-    - standard_name: Sw_ustokes
-      alias: eastward_surface_stokes_drift_current
-      canonical_units: m s-1
-      description: ww3 export surface drift components
-    - standard_name: Sw_ustokes
-      alias: ussx
-    #
-    - standard_name: Sw_vstokes
-      alias: northward_surface_stokes_drift_current
-      canonical_units: m s-1
-      description: ww3 export using surface drift components
-    - standard_name: Sw_vstokes
-      alias: ussy
-    #
-    - standard_name: Sw_wbcuru
-      alias: eastward_wave_bottom_current
-      canonical_units: m s-1
-      description: ww3 export
-    - standard_name: Sw_wbcuru
-      alias: wbcuru
-    #
-    - standard_name: Sw_wbcurv
-      alias: northward_wave_bottom_current
-      canonical_units: m s-1
-      description: ww3 export
-    - standard_name: Sw_wbcurv
-      alias: wbcurv
-    #
-    - standard_name: Sw_wbcurp
-      alias: wave_bottom_current_period
-      canonical_units: s
-      description: ww3 export
-    - standard_name: Sw_wbcurp
-      alias: wbcurp
-    #
-    - standard_name: Sw_wavsuu
-      alias: eastward_wave_radiation_stress
-      canonical_units: N m-1
-      description: ww3 export
-    - standard_name: Sw_wavsuu
-      alias: wavsuu
-    #
-    - standard_name: Sw_wavsuv
-      alias: eastward_northward_wave_radiation_stress
-      canonical_units: N m-1
-      description: ww3 export
-    - standard_name: Sw_wavsuv
-      alias: wavsuv
-    #
-    - standard_name: Sw_wavsvv
-      alias: northward_wave_radiation_stress
-      canonical_units: Pa
-      description: ww3 export
-    - standard_name: Sw_wavsvv
-      alias: wavsvv
-    #
-    - standard_name: Sw_ustokes1
-      alias: eastward_partitioned_stokes_drift_1
-      canonical_units: m s-1
-      description: ww3 export
-    - standard_name: Sw_ustokes1
-      alias: x1pstk
-    #
-    - standard_name: Sw_ustokes2
-      alias: eastward_partitioned_stokes_drift_2
-      canonical_units: m s-1
-      description: ww3 export
-    - standard_name: Sw_ustokes2
-      alias: x2pstk
-    #
-    - standard_name: Sw_ustokes3
-      alias: eastward_partitioned_stokes_drift_3
-      canonical_units: m s-1
-      description: ww3 export
-    - standard_name: Sw_ustokes3
-      alias: x3pstk
-    #
-    - standard_name: Sw_vstokes1
-      alias: northward_partitioned_stokes_drift_1
-      canonical_units: m s-1
-      description: ww3 export
-    - standard_name: Sw_vstokes1
-      alias: y1pstk
-    #
-    - standard_name: Sw_vstokes2
-      alias: northward_partitioned_stokes_drift_2
-      canonical_units: m s-1
-      description: ww3 export
-    - standard_name: Sw_vstokes2
-      alias: y2pstk
-    #
-    - standard_name: Sw_vstokes3
-      alias: northward_partitioned_stokes_drift_3
-      canonical_units: m s-1
-      description: ww3 export
-    - standard_name: Sw_vstokes3
-      alias: y3pstk
-    #
-    #-----------------------------------
-    # section: FV3 atm export/import to/from JEDI
-    #-----------------------------------
-    #
-    - standard_name: u
-      canonical_units: m s-1
-      alias: u_component_of_native_D_grid_wind
-    #
-    - standard_name: v
-      canonical_units: m s-1
-      alias: v_component_of_native_D_grid_wind
-    #
-    - standard_name: ua
-      canonical_units: m s-1
-      alias: eastward_wind
-    #
-    - standard_name: va
-      canonical_units: m s-1
-      alias: northward_wind
-    #
-    - standard_name: t
-      canonical_units: K
-      alias: air_temperature
-    #
-    - standard_name: delp
-      canonical_units: Pa
-      alias: air_pressure_thickness
-    #
-    - standard_name: ps
-      canonical_units: Pa
-      alias: surface_pressure
-    #
-    - standard_name: sphum
-      canonical_units: kg kg-1
-      alias: specific_humidity
-    #
-    - standard_name: ice_wat
-      canonical_units: kg kg-1
-      alias: cloud_liquid_ice
-    #
-    - standard_name: liq_wat
-      canonical_units: kg kg-1
-      alias: cloud_liquid_water
-    #
-    - standard_name: rainwat
-      canonical_units: kg kg-1
-      alias: rain_water
-    #
-    - standard_name: snowwat
-      canonical_units: kg kg-1
-      alias: snow_water
-    #
-    - standard_name: graupel
-      canonical_units: kg kg-1
-      alias: graupel
-    #
-    - standard_name: o3mr
-      canonical_units: kg kg-1
-      alias: ozone_mass_mixing_ratio
-    #
-    - standard_name: phis
-      canonical_units: m2 s-2
-      alias: sfc_geopotential_height_times_grav
-    #
-    - standard_name: u_srf
-      canonical_units: m s-1
-      alias: surface_eastward_wind
-    #
-    - standard_name: v_srf
-      canonical_units: m s-1
-      alias: surface_northward_wind
-    #
-    #
-    - standard_name: t2m
-      canonical_units: K
-      alias: surface_temperature
-    #
-    - standard_name: slmsk
-      canonical_units: flag
-      description: landmask sea/land/ice=0/1/2
-    #
-    - standard_name: weasd
-      canonical_units: mm
-      description: water equiv of acc snow depth over land and sea ice
-      alias: sheleg
-    #
-    - standard_name: tsea
-      canonical_units: K
-      description: surface skin temperature
-    #
-    - standard_name: vtype
-      canonical_units: index
-      description: vegetation type
-    #
-    - standard_name: stype
-      canonical_units: index
-      description: soil type
-    #
-    - standard_name: Sa_vfrac
-      canonical_units: frac
-      description: areal fractional cover of green vegetation
-    - standard_name: Sa_vfrac
-      alias: vfrac
-    #
-    - standard_name: stc
-      canonical_units: K
-      description: soil temperature content
-    #
-    - standard_name: smc
-      canonical_units: m3 m-3
-      description: soil moisture content
-    #
-    - standard_name: snwdph
-      canonical_units: mm
-      description: snow depth in mm
-    #
-    - standard_name: f10m
-      canonical_units: ratio
-      description: fm at 10m - Ratio of sigma level 1 wind and 10m wind
-    #
-    - standard_name: Sa_zorl
-      canonical_units: cm
-      description: composite surface roughness in cm
-    - standard_name: Sa_zorl
-      alias: zorl
-    #
-    - standard_name: t2m
-      canonical_units: K
-      description: two meter temperature
-    #
-    #-----------------------------------
-    # section: land export
-    #-----------------------------------
-    #
-    - standard_name: Sl_lfrac
-      alias: land_fraction
-      canonical_units: 1
-      description: land export
-    #
-    - standard_name: Sl_lfrin
-      canonical_units: 1
-      description: land export
-    #
-    - standard_name: Sl_t
-      canonical_units: K
-      description: land export
-    #
-    - standard_name: inst_tracer_diag_aod
-      canonical_units: 1
-      description: AOD
-    #
-    - standard_name: Sl_sfrac
-      alias: inst_snow_area_fraction_lnd
-      canonical_units: 1
-      description: land export
-    #
-    - standard_name: Sl_tref
-      alias: inst_temp_height2m_lnd
-      canonical_units: K
-      description: mediator export to glc - no levation classes
-    #
-    - standard_name: Sl_qref
-      alias: inst_spec_humid_height2m_lnd
-      canonical_units: kg kg-1
-      description: land export
-    #
-    - standard_name: Sl_q
-      alias: inst_spec_humid_lnd
-      canonical_units: kg kg-1
-      description: land export
-    #
-    - standard_name: Fall_lat
-      alias: inst_laten_heat_flx_lnd
-      canonical_units: kg kg-1 m s-1
-      description: land export to atm - atm/lnd latent heat flux
-    #
-    - standard_name: Fall_sen
-      alias: inst_sensi_heat_flx_lnd
-      canonical_units: K m s-1
-      description: land export to atm - atm/lnd sensible heat flux
-    #
-    - standard_name: Fall_evap
-      alias: inst_potential_laten_heat_flx_lnd
-      canonical_units: W m-2
-      description: land export
-    #
-    - standard_name: Fall_gflx
-      alias: inst_upward_heat_flux_lnd
-      canonical_units: W m-2
-      description: land export
-    #
-    - standard_name: Fall_roff
-      alias: inst_runoff_rate_lnd
-      canonical_units: kg m-2 s-1
-      description: land export
-    #
-    - standard_name: Fall_soff
-      alias: inst_subsurface_runoff_rate_lnd
-      canonical_units: kg m-2 s-1
-      description: land export
-    #
-    - standard_name: Sl_cmm
-      alias: inst_drag_wind_speed_for_momentum
-      canonical_units: m s-1
-      description: land export
-    #
-    - standard_name: Sl_chh
-      alias: inst_drag_mass_flux_for_heat_and_moisture
-      canonical_units: kg m-2 s-1
-      description: land export
-    #
-    - standard_name: Sl_zvfun
-      alias: inst_func_of_roughness_length_and_vfrac
-      canonical_units: 1
-      description: land export
diff --git a/parm/templates/template.ATML.fd_ufs.yaml b/parm/templates/template.fd_ufs.yaml
similarity index 100%
rename from parm/templates/template.ATML.fd_ufs.yaml
rename to parm/templates/template.fd_ufs.yaml
diff --git a/scripts/exlandda_forecast.sh b/scripts/exlandda_forecast.sh
index 0a644872..2e00df7c 100755
--- a/scripts/exlandda_forecast.sh
+++ b/scripts/exlandda_forecast.sh
@@ -49,7 +49,7 @@ FILEDATE=${YYYY}${MM}${DD}.${HH}0000
 
 # Copy input namelist data files
 cp -p "${PARMlandda}/templates/template.noahmptable.tbl" noahmptable.tbl
-cp -p "${PARMlandda}/templates/template.${APP}.fd_ufs.yaml" fd_ufs.yaml
+cp -p "${PARMlandda}/templates/template.fd_ufs.yaml" fd_ufs.yaml
 if [ "${APP}" = "LND" ]; then
   cp -p "${PARMlandda}/templates/template.${APP}.datm_in" datm_in
   cp -p "${PARMlandda}/templates/template.${APP}.datm.streams" datm.streams
diff --git a/sorc/test/parm/fd_ufs.yaml b/sorc/test/parm/fd_ufs.yaml
index edfca0be..34602a32 100644
--- a/sorc/test/parm/fd_ufs.yaml
+++ b/sorc/test/parm/fd_ufs.yaml
@@ -830,6 +830,8 @@ field_dictionary:
       canonical_units: tbd
     - standard_name: inst_rainfall_amount
       canonical_units: tbd
+    - standard_name: accumulated_lwe_thickness_of_precipitation_amount
+      canonical_units: tbd
     - standard_name: inst_land_sea_mask
       canonical_units: tbd
     - standard_name: inst_temp_height_surface
@@ -1264,3 +1266,18 @@ field_dictionary:
       alias: inst_func_of_roughness_length_and_vfrac
       canonical_units: 1
       description: land export
+    #
+    #-----------------------------------
+    # section: fire behavior
+    #-----------------------------------
+    #
+    - standard_name: hflx_fire
+      canonical_units: K m s-1
+      description: kinematic surface upward sensible heat flux of fire
+    #
+    - standard_name: evap_fire
+      canonical_units: Kg Kg-1 m s-1
+      description: kinematic surface upward latent heat flux of fire
+    #
+    - standard_name: smoke_fire
+      canonical_units: kg m-2
diff --git a/sorc/test/run_ufs_datm_lnd.sh b/sorc/test/run_ufs_datm_lnd.sh
index 8b695180..46f969f9 100755
--- a/sorc/test/run_ufs_datm_lnd.sh
+++ b/sorc/test/run_ufs_datm_lnd.sh
@@ -45,7 +45,7 @@ ln -nsf ${FIXlandda}/DATA_RESTART/ufs.cpld.cpl.r.2000-01-05-00000.nc RESTART/.
 ln -nsf ${FIXlandda}/DATA_RESTART/ufs.cpld.datm.r.2000-01-05-00000.nc .
 for itile in {1..6}
 do
-  ln -nsf ${FIXlandda}/DATA_RESTART/ufs_land_restart.2000-01-05_00-00-00.tile${itile}.nc RESTART/ufs.cpld.lnd.out.2000-01-05-00000.tile${itile}.nc
+  ln -nsf ${FIXlandda}/DATA_RESTART/ufs_land_restart.anal.2000-01-05_00-00-00.tile${itile}.nc RESTART/ufs.cpld.lnd.out.2000-01-05-00000.tile${itile}.nc
 done
 
 # Set INPUT directory
diff --git a/sorc/ufs_model.fd b/sorc/ufs_model.fd
index be4544ee..5324d642 160000
--- a/sorc/ufs_model.fd
+++ b/sorc/ufs_model.fd
@@ -1 +1 @@
-Subproject commit be4544ee28f8fad7bc2cdb207dc62f89c4aa2bb2
+Subproject commit 5324d642e2257ee659ab75c0fc404d3127b2d9f7