diff --git a/doc/NamesNotInDictionary.txt b/doc/NamesNotInDictionary.txt
index 7fa9050e..fd11ee07 100644
--- a/doc/NamesNotInDictionary.txt
+++ b/doc/NamesNotInDictionary.txt
@@ -1,55 +1,73 @@
 
 #######################
 Date/time of when script was run:
-2025-01-23 13:25:42.976291
+2025-02-13 20:35:20.393146
 #######################
 
 Non-dictionary standard names found in the following metadata files:
 
 --------------------------
 
-/glade/u/home/cacraig/cam_sima_zm4/src/physics/ncar_ccpp/test/test_schemes/initialize_constituents.meta
+atmospheric_physics/schemes/sima_diagnostics/zm_evap_tendency_diagnostics.meta
 
-    - dynamic_constituents_for_initialize_constituents
+    - tendency_of_dry_air_enthalpy_at_constant_pressure_due_to_evaporation_and_melting_of_frozen_precipitation_due_to_deep_convection
+    - tendency_of_dry_air_enthalpy_at_constant_pressure_due_to_frozen_precipitation_production_due_to_deep_convection
+    - tendency_of_water_vapor_mixing_ratio_wrt_moist_air_and_condensed_water
 
 --------------------------
 
-/glade/u/home/cacraig/cam_sima_zm4/src/physics/ncar_ccpp/schemes/sima_diagnostics/zm_diagnostics.meta
+atmospheric_physics/schemes/sima_diagnostics/check_energy_gmean_diagnostics.meta
 
-    - atmosphere_convective_mass_flux_due_to_deep_convection
-    - atmosphere_downdraft_convective_mass_flux_for_deep_convection_for_convective_columns
-    - atmosphere_updraft_convective_mass_flux_for_deep_convection_for_convective_columns
-    - detrainment_of_cloud_liquid_due_to_deep_convection
-    - frozen_precipitation_flux_at_interface_due_to_deep_convection
-    - horizontal_index_of_convective_columns_for_deep_convection_for_convective_columns
-    - in_cloud_eastward_wind_in_downdraft_due_to_deep_convection
-    - in_cloud_eastward_wind_in_updraft_due_to_deep_convection
-    - in_cloud_northward_wind_in_downdraft_due_to_deep_convection
-    - in_cloud_northward_wind_in_updraft_due_to_deep_convection
-    - lwe_precipitation_rate_at_surface_due_to_deep_convection
-    - precipitation_flux_at_interface_due_to_deep_convection
+    - flag_for_energy_global_means_output
+    - global_mean_heating_rate_correction_for_energy_conservation
+    - global_mean_vertically_integrated_total_energy_using_dycore_energy_formula_at_end_of_physics_timestep
+    - global_mean_vertically_integrated_total_energy_using_dycore_energy_formula_at_start_of_physics_timestep
+
+--------------------------
+
+atmospheric_physics/schemes/sima_diagnostics/zm_tendency_diagnostics.meta
+
+    - ccpp_constituent_tendencies
+
+--------------------------
+
+atmospheric_physics/schemes/sima_diagnostics/check_energy_diagnostics.meta
+
+    - cumulative_total_energy_boundary_flux_using_physics_energy_formula
+    - cumulative_total_water_boundary_flux
+    - ratio_of_specific_heat_of_air_used_in_physics_energy_formula_to_specific_heat_of_air_used_in_dycore_energy_formula
+    - specific_heat_of_air_used_in_dycore
+    - vertically_integrated_total_energy_using_physics_energy_formula
+    - vertically_integrated_total_water
+
+--------------------------
+
+atmospheric_physics/schemes/sima_diagnostics/sima_state_diagnostics.meta
+
+    - air_pressure_at_interface
+    - air_pressure_of_dry_air_at_interface
+    - ln_air_pressure_at_interface
+    - ln_air_pressure_of_dry_air_at_interface
     - surface_air_pressure
-    - tendency_of_eastward_wind_due_to_zhang_mcfarlane_deep_convective_downdraft_pressure_gradient_term
-    - tendency_of_eastward_wind_due_to_zhang_mcfarlane_deep_convective_updraft_pressure_gradient_term
-    - tendency_of_frozen_precipitation_wrt_moist_air_and_condensed_water_due_to_deep_convection
-    - tendency_of_northward_wind_due_to_zhang_mcfarlane_deep_convective_downdraft_pressure_gradient_term
-    - tendency_of_northward_wind_due_to_zhang_mcfarlane_deep_convective_updraft_pressure_gradient_term
-    - tendency_of_precipitation_wrt_moist_air_and_condensed_water_due_to_deep_convection
-    - vertical_index_at_top_of_deep_convection_for_convective_columns
-    - vertical_index_of_deep_convection_launch_level_for_convective_columns
-    - zhang_mcfarlane_convective_available_potential_energy
 
 --------------------------
 
-/glade/u/home/cacraig/cam_sima_zm4/src/physics/ncar_ccpp/schemes/sima_diagnostics/zm_evap_tendency_diagnostics.meta
+atmospheric_physics/schemes/sima_diagnostics/zm_convr_tendency_diagnostics.meta
 
-    - tendency_of_dry_air_enthalpy_at_constant_pressure_due_to_evaporation_and_melting_of_frozen_precipitation_due_to_deep_convection
-    - tendency_of_dry_air_enthalpy_at_constant_pressure_due_to_frozen_precipitation_production_due_to_deep_convection
     - tendency_of_water_vapor_mixing_ratio_wrt_moist_air_and_condensed_water
 
 --------------------------
 
-/glade/u/home/cacraig/cam_sima_zm4/src/physics/ncar_ccpp/schemes/sima_diagnostics/tropopause_diagnostics.meta
+atmospheric_physics/schemes/sima_diagnostics/check_energy_fix_diagnostics.meta
+
+    - net_sensible_heat_flux_through_top_and_bottom_of_atmosphere_column
+    - vertically_integrated_total_energy_using_dycore_energy_formula
+    - vertically_integrated_total_energy_using_dycore_energy_formula_at_end_of_physics_timestep
+    - vertically_integrated_total_energy_using_dycore_energy_formula_at_start_of_physics_timestep
+
+--------------------------
+
+atmospheric_physics/schemes/sima_diagnostics/tropopause_diagnostics.meta
 
     - tropopause_air_pressure
     - tropopause_air_pressure_from_climatological_method
@@ -77,52 +95,92 @@ Non-dictionary standard names found in the following metadata files:
 
 --------------------------
 
-/glade/u/home/cacraig/cam_sima_zm4/src/physics/ncar_ccpp/schemes/sima_diagnostics/sima_state_diagnostics.meta
+atmospheric_physics/schemes/sima_diagnostics/zm_diagnostics.meta
 
-    - air_pressure_at_interface
-    - air_pressure_of_dry_air_at_interface
-    - geopotential_height_wrt_surface_at_interface
-    - ln_air_pressure_at_interface
-    - ln_air_pressure_of_dry_air_at_interface
+    - atmosphere_convective_mass_flux_due_to_deep_convection
+    - atmosphere_downdraft_convective_mass_flux_for_deep_convection_for_convective_columns
+    - atmosphere_updraft_convective_mass_flux_for_deep_convection_for_convective_columns
+    - detrainment_of_cloud_liquid_due_to_deep_convection
+    - frozen_precipitation_flux_at_interface_due_to_deep_convection
+    - horizontal_index_of_convective_columns_for_deep_convection_for_convective_columns
+    - in_cloud_eastward_wind_in_downdraft_due_to_deep_convection
+    - in_cloud_eastward_wind_in_updraft_due_to_deep_convection
+    - in_cloud_northward_wind_in_downdraft_due_to_deep_convection
+    - in_cloud_northward_wind_in_updraft_due_to_deep_convection
+    - lwe_precipitation_rate_at_surface_due_to_deep_convection
+    - precipitation_flux_at_interface_due_to_deep_convection
     - surface_air_pressure
+    - tendency_of_eastward_wind_due_to_zhang_mcfarlane_deep_convective_downdraft_pressure_gradient_term
+    - tendency_of_eastward_wind_due_to_zhang_mcfarlane_deep_convective_updraft_pressure_gradient_term
+    - tendency_of_frozen_precipitation_wrt_moist_air_and_condensed_water_due_to_deep_convection
+    - tendency_of_northward_wind_due_to_zhang_mcfarlane_deep_convective_downdraft_pressure_gradient_term
+    - tendency_of_northward_wind_due_to_zhang_mcfarlane_deep_convective_updraft_pressure_gradient_term
+    - tendency_of_precipitation_wrt_moist_air_and_condensed_water_due_to_deep_convection
+    - vertical_index_at_top_of_deep_convection_for_convective_columns
+    - vertical_index_of_deep_convection_launch_level_for_convective_columns
+    - zhang_mcfarlane_convective_available_potential_energy
 
 --------------------------
 
-/glade/u/home/cacraig/cam_sima_zm4/src/physics/ncar_ccpp/schemes/sima_diagnostics/zm_tendency_diagnostics.meta
+atmospheric_physics/schemes/tj2016/tj2016_precip.meta
 
-    - ccpp_constituent_tendencies
+    - gas_constant_of_water_vapor
+    - lwe_large_scale_precipitation_rate_at_surface
+    - ratio_of_water_vapor_to_dry_air_molecular_weights
+    - sum_of_sigma_pressure_hybrid_coordinate_a_coefficient_and_sigma_pressure_hybrid_coordinate_b_coefficient
 
 --------------------------
 
-/glade/u/home/cacraig/cam_sima_zm4/src/physics/ncar_ccpp/schemes/sima_diagnostics/zm_convr_tendency_diagnostics.meta
+atmospheric_physics/schemes/tj2016/tj2016_sfc_pbl_hs.meta
 
-    - tendency_of_water_vapor_mixing_ratio_wrt_moist_air_and_condensed_water
+    - air_pressure_at_interface
+    - eddy_heat_diffusivity
+    - eddy_momentum_diffusivity
+    - gas_constant_of_water_vapor
+    - ln_air_pressure_at_interface
+    - pi_constant
+    - ratio_of_water_vapor_to_dry_air_molecular_weights
+    - sum_of_sigma_pressure_hybrid_coordinate_a_coefficient_and_sigma_pressure_hybrid_coordinate_b_coefficient
+    - surface_air_pressure
+    - surface_eastward_wind_stress
+    - surface_evaporation_rate
+    - surface_northward_wind_stress
+    - surface_upward_sensible_heat_flux
+    - tendency_of_air_temperature_due_to_diabatic_heating
+    - tendency_of_air_temperature_due_to_vertical_diffusion
+    - tendency_of_water_vapor_mixing_ratio_wrt_moist_air_and_condensed_water_due_to_vertical_diffusion
 
 --------------------------
 
-/glade/u/home/cacraig/cam_sima_zm4/src/physics/ncar_ccpp/schemes/sima_diagnostics/check_energy_gmean_diagnostics.meta
+atmospheric_physics/schemes/cloud_fraction/cloud_fraction_fice.meta
 
-    - flag_for_energy_global_means_output
-    - global_mean_heating_rate_correction_for_energy_conservation
-    - global_mean_vertically_integrated_total_energy_at_end_of_physics_timestep
-    - global_mean_vertically_integrated_total_energy_using_dycore_energy_formula_at_start_of_physics_timestep
+    - freezing_point_of_water
+    - mass_fraction_of_ice_content_within_stratiform_cloud
+    - mass_fraction_of_snow_content_within_stratiform_cloud
+    - vertical_layer_index_of_troposphere_cloud_top
 
 --------------------------
 
-/glade/u/home/cacraig/cam_sima_zm4/src/physics/ncar_ccpp/schemes/sima_diagnostics/check_energy_diagnostics.meta
+atmospheric_physics/schemes/dry_adiabatic_adjust/dadadj.meta
 
-    - cumulative_total_energy_boundary_flux_using_physics_energy_formula
-    - cumulative_total_water_boundary_flux
-    - ratio_of_specific_heat_of_air_used_in_physics_energy_formula_to_specific_heat_of_air_used_in_dycore_energy_formula
-    - specific_heat_of_air_used_in_dycore
-    - vertically_integrated_total_energy_at_end_of_physics_timestep
-    - vertically_integrated_total_energy_using_dycore_energy_formula
-    - vertically_integrated_total_energy_using_physics_energy_formula
-    - vertically_integrated_total_water
+    - air_pressure_at_interface
+    - binary_indicator_for_dry_adiabatic_adjusted_grid_cell
+    - number_of_iterations_for_dry_adiabatic_adjustment_algorithm_convergence
+    - number_of_vertical_levels_from_model_top_where_dry_adiabatic_adjustment_occurs
+    - tendency_of_water_vapor_mixing_ratio_wrt_moist_air_and_condensed_water
+
+--------------------------
+
+atmospheric_physics/schemes/zhang_mcfarlane/set_deep_conv_fluxes_to_general.meta
+
+    - lwe_precipitation_rate_at_surface_due_to_convection
+    - lwe_precipitation_rate_at_surface_due_to_deep_convection
+    - tendency_of_precipitation_wrt_moist_air_and_condensed_water_due_to_convection_excluding_subcloud_evaporation
+    - tendency_of_precipitation_wrt_moist_air_and_condensed_water_due_to_deep_convection_excluding_subcloud_evaporation
 
 --------------------------
 
-/glade/u/home/cacraig/cam_sima_zm4/src/physics/ncar_ccpp/schemes/zhang_mcfarlane/zm_conv_momtran.meta
+atmospheric_physics/schemes/zhang_mcfarlane/zm_conv_momtran.meta
 
     - atmosphere_detrainment_convective_mass_flux_for_deep_convection_for_convective_columns
     - atmosphere_downdraft_convective_mass_flux_for_deep_convection_for_convective_columns
@@ -151,16 +209,7 @@ Non-dictionary standard names found in the following metadata files:
 
 --------------------------
 
-/glade/u/home/cacraig/cam_sima_zm4/src/physics/ncar_ccpp/schemes/zhang_mcfarlane/set_deep_conv_fluxes_to_general.meta
-
-    - lwe_precipitation_rate_at_surface_due_to_convection
-    - lwe_precipitation_rate_at_surface_due_to_deep_convection
-    - tendency_of_precipitation_wrt_moist_air_and_condensed_water_due_to_convection_excluding_subcloud_evaporation
-    - tendency_of_precipitation_wrt_moist_air_and_condensed_water_due_to_deep_convection_excluding_subcloud_evaporation
-
---------------------------
-
-/glade/u/home/cacraig/cam_sima_zm4/src/physics/ncar_ccpp/schemes/zhang_mcfarlane/zm_conv_evap.meta
+atmospheric_physics/schemes/zhang_mcfarlane/zm_conv_evap.meta
 
     - cloud_area_fraction
     - freezing_point_of_water
@@ -181,49 +230,7 @@ Non-dictionary standard names found in the following metadata files:
 
 --------------------------
 
-/glade/u/home/cacraig/cam_sima_zm4/src/physics/ncar_ccpp/schemes/zhang_mcfarlane/set_general_conv_fluxes_to_deep.meta
-
-    - frozen_precipitation_flux_at_interface_due_to_convection
-    - frozen_precipitation_flux_at_interface_due_to_deep_convection
-    - lwe_frozen_precipitation_rate_at_surface_due_to_convection
-    - lwe_frozen_precipitation_rate_at_surface_due_to_deep_convection
-    - lwe_precipitation_rate_at_surface_due_to_convection
-    - lwe_precipitation_rate_at_surface_due_to_deep_convection
-    - precipitation_flux_at_interface_due_to_convection
-    - precipitation_flux_at_interface_due_to_deep_convection
-    - tendency_of_dry_air_enthalpy_at_constant_pressure_due_to_evaporation_and_melting_of_frozen_precipitation_due_to_convection
-    - tendency_of_dry_air_enthalpy_at_constant_pressure_due_to_evaporation_and_melting_of_frozen_precipitation_due_to_deep_convection
-    - tendency_of_dry_air_enthalpy_at_constant_pressure_due_to_frozen_precipitation_production_due_to_convection
-    - tendency_of_dry_air_enthalpy_at_constant_pressure_due_to_frozen_precipitation_production_due_to_deep_convection
-    - tendency_of_frozen_precipitation_wrt_moist_air_and_condensed_water_due_to_convection
-    - tendency_of_frozen_precipitation_wrt_moist_air_and_condensed_water_due_to_deep_convection
-    - tendency_of_precipitation_wrt_moist_air_and_condensed_water_due_to_convection
-    - tendency_of_precipitation_wrt_moist_air_and_condensed_water_due_to_deep_convection
-
---------------------------
-
-/glade/u/home/cacraig/cam_sima_zm4/src/physics/ncar_ccpp/schemes/zhang_mcfarlane/zm_conv_convtran.meta
-
-    - atmosphere_detrainment_convective_mass_flux_for_deep_convection_for_convective_columns
-    - atmosphere_downdraft_convective_mass_flux_for_deep_convection_for_convective_columns
-    - atmosphere_downdraft_entrainment_convective_mass_flux_for_deep_convection_for_convective_columns
-    - atmosphere_updraft_convective_mass_flux_for_deep_convection_for_convective_columns
-    - atmosphere_updraft_entrainment_convective_mass_flux_for_deep_convection_for_convective_columns
-    - ccpp_constituent_tendencies
-    - current_timestep_number
-    - flag_for_tracer_transport_by_zhang_mcfarlane_deep_scheme
-    - fraction_of_water_insoluble_convectively_transported_species
-    - horizontal_index_of_convective_columns_for_deep_convection_for_convective_columns
-    - index_of_first_column_of_gathered_deep_convection_arrays
-    - index_of_last_column_of_gathered_deep_convection_arrays
-    - pressure_thickness_for_deep_convection_for_convective_columns
-    - pressure_thickness_for_subcloud_layer_for_deep_convection_for_convective_columns
-    - vertical_index_at_top_of_deep_convection_for_convective_columns
-    - vertical_index_of_deep_convection_launch_level_for_convective_columns
-
---------------------------
-
-/glade/u/home/cacraig/cam_sima_zm4/src/physics/ncar_ccpp/schemes/zhang_mcfarlane/zm_convr.meta
+atmospheric_physics/schemes/zhang_mcfarlane/zm_convr.meta
 
     - air_pressure_at_interface
     - atmosphere_convective_mass_flux_due_to_deep_convection
@@ -245,7 +252,6 @@ Non-dictionary standard names found in the following metadata files:
     - flag_for_well_mixed_pbl_parcel_property_for_zhang_mcfarlane_deep_convection_scheme
     - freezing_point_of_water
     - gas_constant_of_water_vapor
-    - geopotential_height_wrt_surface_at_interface
     - horizontal_index_of_convective_columns_for_deep_convection_for_convective_columns
     - in_cloud_water_vapor_mixing_ratio_wrt_moist_air_and_condensed_water_due_to_deep_convection
     - index_of_last_column_of_gathered_deep_convection_arrays
@@ -274,32 +280,69 @@ Non-dictionary standard names found in the following metadata files:
 
 --------------------------
 
-/glade/u/home/cacraig/cam_sima_zm4/src/physics/ncar_ccpp/schemes/cloud_fraction/cloud_fraction_fice.meta
+atmospheric_physics/schemes/zhang_mcfarlane/set_general_conv_fluxes_to_deep.meta
 
-    - freezing_point_of_water
-    - mass_fraction_of_ice_content_within_stratiform_cloud
-    - mass_fraction_of_snow_content_within_stratiform_cloud
-    - vertical_layer_index_of_troposphere_cloud_top
+    - frozen_precipitation_flux_at_interface_due_to_convection
+    - frozen_precipitation_flux_at_interface_due_to_deep_convection
+    - lwe_frozen_precipitation_rate_at_surface_due_to_convection
+    - lwe_frozen_precipitation_rate_at_surface_due_to_deep_convection
+    - lwe_precipitation_rate_at_surface_due_to_convection
+    - lwe_precipitation_rate_at_surface_due_to_deep_convection
+    - precipitation_flux_at_interface_due_to_convection
+    - precipitation_flux_at_interface_due_to_deep_convection
+    - tendency_of_dry_air_enthalpy_at_constant_pressure_due_to_evaporation_and_melting_of_frozen_precipitation_due_to_convection
+    - tendency_of_dry_air_enthalpy_at_constant_pressure_due_to_evaporation_and_melting_of_frozen_precipitation_due_to_deep_convection
+    - tendency_of_dry_air_enthalpy_at_constant_pressure_due_to_frozen_precipitation_production_due_to_convection
+    - tendency_of_dry_air_enthalpy_at_constant_pressure_due_to_frozen_precipitation_production_due_to_deep_convection
+    - tendency_of_frozen_precipitation_wrt_moist_air_and_condensed_water_due_to_convection
+    - tendency_of_frozen_precipitation_wrt_moist_air_and_condensed_water_due_to_deep_convection
+    - tendency_of_precipitation_wrt_moist_air_and_condensed_water_due_to_convection
+    - tendency_of_precipitation_wrt_moist_air_and_condensed_water_due_to_deep_convection
 
 --------------------------
 
-/glade/u/home/cacraig/cam_sima_zm4/src/physics/ncar_ccpp/schemes/check_energy/dycore_energy_consistency_adjust.meta
+atmospheric_physics/schemes/zhang_mcfarlane/zm_conv_convtran.meta
 
-    - flag_for_dycore_energy_consistency_adjustment
-    - ratio_of_specific_heat_of_air_used_in_physics_energy_formula_to_specific_heat_of_air_used_in_dycore_energy_formula
+    - atmosphere_detrainment_convective_mass_flux_for_deep_convection_for_convective_columns
+    - atmosphere_downdraft_convective_mass_flux_for_deep_convection_for_convective_columns
+    - atmosphere_downdraft_entrainment_convective_mass_flux_for_deep_convection_for_convective_columns
+    - atmosphere_updraft_convective_mass_flux_for_deep_convection_for_convective_columns
+    - atmosphere_updraft_entrainment_convective_mass_flux_for_deep_convection_for_convective_columns
+    - ccpp_constituent_tendencies
+    - current_timestep_number
+    - flag_for_tracer_transport_by_zhang_mcfarlane_deep_scheme
+    - fraction_of_water_insoluble_convectively_transported_species
+    - horizontal_index_of_convective_columns_for_deep_convection_for_convective_columns
+    - index_of_first_column_of_gathered_deep_convection_arrays
+    - index_of_last_column_of_gathered_deep_convection_arrays
+    - pressure_thickness_for_deep_convection_for_convective_columns
+    - pressure_thickness_for_subcloud_layer_for_deep_convection_for_convective_columns
+    - vertical_index_at_top_of_deep_convection_for_convective_columns
+    - vertical_index_of_deep_convection_launch_level_for_convective_columns
 
 --------------------------
 
-/glade/u/home/cacraig/cam_sima_zm4/src/physics/ncar_ccpp/schemes/check_energy/check_energy_zero_fluxes.meta
+atmospheric_physics/schemes/utilities/geopotential_temp.meta
 
-    - net_liquid_and_lwe_ice_fluxes_through_top_and_bottom_of_atmosphere_column
-    - net_lwe_ice_fluxes_through_top_and_bottom_of_atmosphere_column
-    - net_sensible_heat_flux_through_top_and_bottom_of_atmosphere_column
-    - net_water_vapor_fluxes_through_top_and_bottom_of_atmosphere_column
+    - air_pressure_at_interface
+    - ln_air_pressure_at_interface
 
 --------------------------
 
-/glade/u/home/cacraig/cam_sima_zm4/src/physics/ncar_ccpp/schemes/check_energy/check_energy_chng.meta
+atmospheric_physics/schemes/utilities/physics_tendency_updaters.meta
+
+    - ccpp_constituent_tendencies
+
+--------------------------
+
+atmospheric_physics/schemes/check_energy/check_energy_save_teout.meta
+
+    - vertically_integrated_total_energy_using_dycore_energy_formula
+    - vertically_integrated_total_energy_using_dycore_energy_formula_at_end_of_physics_timestep
+
+--------------------------
+
+atmospheric_physics/schemes/check_energy/check_energy_chng.meta
 
     - air_pressure_of_dry_air_at_interface
     - air_temperature_at_start_of_physics_timestep
@@ -317,8 +360,8 @@ Non-dictionary standard names found in the following metadata files:
     - specific_heat_of_air_used_in_dycore
     - total_energy_formula_for_dycore
     - total_energy_formula_for_physics
-    - vertically_integrated_total_energy_at_end_of_physics_timestep
     - vertically_integrated_total_energy_using_dycore_energy_formula
+    - vertically_integrated_total_energy_using_dycore_energy_formula_at_end_of_physics_timestep
     - vertically_integrated_total_energy_using_dycore_energy_formula_at_start_of_physics_timestep
     - vertically_integrated_total_energy_using_physics_energy_formula
     - vertically_integrated_total_energy_using_physics_energy_formula_at_start_of_physics_timestep
@@ -327,116 +370,56 @@ Non-dictionary standard names found in the following metadata files:
 
 --------------------------
 
-/glade/u/home/cacraig/cam_sima_zm4/src/physics/ncar_ccpp/schemes/check_energy/check_energy_fix.meta
+atmospheric_physics/schemes/check_energy/check_energy_zero_fluxes.meta
 
-    - air_pressure_at_interface
-    - global_mean_heating_rate_correction_for_energy_conservation
+    - net_liquid_and_lwe_ice_fluxes_through_top_and_bottom_of_atmosphere_column
+    - net_lwe_ice_fluxes_through_top_and_bottom_of_atmosphere_column
     - net_sensible_heat_flux_through_top_and_bottom_of_atmosphere_column
+    - net_water_vapor_fluxes_through_top_and_bottom_of_atmosphere_column
 
 --------------------------
 
-/glade/u/home/cacraig/cam_sima_zm4/src/physics/ncar_ccpp/schemes/check_energy/check_energy_save_teout.meta
+atmospheric_physics/schemes/check_energy/dycore_energy_consistency_adjust.meta
 
-    - vertically_integrated_total_energy_at_end_of_physics_timestep
-    - vertically_integrated_total_energy_using_dycore_energy_formula
+    - flag_for_dycore_energy_consistency_adjustment
+    - ratio_of_specific_heat_of_air_used_in_physics_energy_formula_to_specific_heat_of_air_used_in_dycore_energy_formula
 
 --------------------------
 
-/glade/u/home/cacraig/cam_sima_zm4/src/physics/ncar_ccpp/schemes/check_energy/check_energy_scaling.meta
+atmospheric_physics/schemes/check_energy/check_energy_scaling.meta
 
     - ratio_of_specific_heat_of_air_used_in_physics_energy_formula_to_specific_heat_of_air_used_in_dycore_energy_formula
     - specific_heat_of_air_used_in_dycore
 
 --------------------------
 
-/glade/u/home/cacraig/cam_sima_zm4/src/physics/ncar_ccpp/schemes/check_energy/check_energy_gmean/check_energy_gmean.meta
+atmospheric_physics/schemes/check_energy/check_energy_fix.meta
 
     - air_pressure_at_interface
-    - global_mean_air_pressure_at_top_of_atmosphere_model
     - global_mean_heating_rate_correction_for_energy_conservation
-    - global_mean_surface_air_pressure
-    - global_mean_total_energy_correction_for_energy_conservation
-    - global_mean_vertically_integrated_total_energy_at_end_of_physics_timestep
-    - global_mean_vertically_integrated_total_energy_using_dycore_energy_formula_at_start_of_physics_timestep
-    - vertically_integrated_total_energy_at_end_of_physics_timestep
-    - vertically_integrated_total_energy_using_dycore_energy_formula_at_start_of_physics_timestep
-
---------------------------
-
-/glade/u/home/cacraig/cam_sima_zm4/src/physics/ncar_ccpp/schemes/tj2016/tj2016_sfc_pbl_hs.meta
-
-    - air_pressure_at_interface
-    - eddy_heat_diffusivity
-    - eddy_momentum_diffusivity
-    - gas_constant_of_water_vapor
-    - ln_air_pressure_at_interface
-    - pi_constant
-    - ratio_of_water_vapor_to_dry_air_molecular_weights
-    - sum_of_sigma_pressure_hybrid_coordinate_a_coefficient_and_sigma_pressure_hybrid_coordinate_b_coefficient
-    - surface_air_pressure
-    - surface_eastward_wind_stress
-    - surface_evaporation_rate
-    - surface_northward_wind_stress
-    - surface_upward_sensible_heat_flux
-    - tendency_of_air_temperature_due_to_diabatic_heating
-    - tendency_of_air_temperature_due_to_vertical_diffusion
-    - tendency_of_water_vapor_mixing_ratio_wrt_moist_air_and_condensed_water_due_to_vertical_diffusion
-
---------------------------
-
-/glade/u/home/cacraig/cam_sima_zm4/src/physics/ncar_ccpp/schemes/tj2016/tj2016_precip.meta
-
-    - gas_constant_of_water_vapor
-    - lwe_large_scale_precipitation_rate_at_surface
-    - ratio_of_water_vapor_to_dry_air_molecular_weights
-    - sum_of_sigma_pressure_hybrid_coordinate_a_coefficient_and_sigma_pressure_hybrid_coordinate_b_coefficient
-
---------------------------
-
-/glade/u/home/cacraig/cam_sima_zm4/src/physics/ncar_ccpp/schemes/musica/musica_ccpp.meta
-
-    - blackbody_temperature_at_surface
-    - cloud_area_fraction
-    - dynamic_constituents_for_musica_ccpp
-    - earth_sun_distance
-    - extraterrestrial_radiation_flux
-    - geopotential_height_wrt_surface_at_interface
-    - photolysis_wavelength_grid_interfaces
-    - solar_zenith_angle
-    - surface_albedo_due_to_UV_and_VIS_direct
-
---------------------------
-
-/glade/u/home/cacraig/cam_sima_zm4/src/physics/ncar_ccpp/schemes/dry_adiabatic_adjust/dadadj.meta
-
-    - air_pressure_at_interface
-    - binary_indicator_for_dry_adiabatic_adjusted_grid_cell
-    - number_of_iterations_for_dry_adiabatic_adjustment_algorithm_convergence
-    - number_of_vertical_levels_from_model_top_where_dry_adiabatic_adjustment_occurs
-    - tendency_of_water_vapor_mixing_ratio_wrt_moist_air_and_condensed_water
-
---------------------------
-
-/glade/u/home/cacraig/cam_sima_zm4/src/physics/ncar_ccpp/schemes/utilities/physics_tendency_updaters.meta
-
-    - ccpp_constituent_tendencies
+    - net_sensible_heat_flux_through_top_and_bottom_of_atmosphere_column
 
 --------------------------
 
-/glade/u/home/cacraig/cam_sima_zm4/src/physics/ncar_ccpp/schemes/utilities/geopotential_temp.meta
+atmospheric_physics/schemes/check_energy/check_energy_gmean/check_energy_gmean.meta
 
     - air_pressure_at_interface
-    - geopotential_height_wrt_surface_at_interface
-    - ln_air_pressure_at_interface
+    - global_mean_air_pressure_at_top_of_atmosphere_model
+    - global_mean_heating_rate_correction_for_energy_conservation
+    - global_mean_surface_air_pressure
+    - global_mean_total_energy_correction_for_energy_conservation
+    - global_mean_vertically_integrated_total_energy_using_dycore_energy_formula_at_end_of_physics_timestep
+    - global_mean_vertically_integrated_total_energy_using_dycore_energy_formula_at_start_of_physics_timestep
+    - vertically_integrated_total_energy_using_dycore_energy_formula_at_end_of_physics_timestep
+    - vertically_integrated_total_energy_using_dycore_energy_formula_at_start_of_physics_timestep
 
 --------------------------
 
-/glade/u/home/cacraig/cam_sima_zm4/src/physics/ncar_ccpp/schemes/tropopause_find/tropopause_find.meta
+atmospheric_physics/schemes/tropopause_find/tropopause_find.meta
 
     - air_pressure_at_interface
     - fill_value_for_diagnostic_output
     - fractional_calendar_days_on_end_of_current_timestep
-    - geopotential_height_wrt_surface_at_interface
     - pi_constant
     - ratio_of_dry_air_gas_constant_to_specific_heat_of_dry_air_at_constant_pressure
     - tropopause_air_pressure
@@ -469,4 +452,23 @@ Non-dictionary standard names found in the following metadata files:
     - vertical_layer_index_lower_bound_from_hybrid_stobie_linoz_with_climatological_backup_method_for_linearized_ozone_chemistry
     - vertical_layer_index_lower_bound_from_hybrid_stobie_linoz_with_climatological_backup_method_for_stratospheric_chemistry
 
+--------------------------
+
+atmospheric_physics/schemes/musica/musica_ccpp.meta
+
+    - blackbody_temperature_at_surface
+    - cloud_area_fraction
+    - dynamic_constituents_for_musica_ccpp
+    - earth_sun_distance
+    - extraterrestrial_radiation_flux
+    - photolysis_wavelength_grid_interfaces
+    - solar_zenith_angle
+    - surface_albedo_due_to_UV_and_VIS_direct
+
+--------------------------
+
+atmospheric_physics/test/test_schemes/initialize_constituents.meta
+
+    - dynamic_constituents_for_initialize_constituents
+
 #######################
diff --git a/schemes/check_energy/check_energy_chng.meta b/schemes/check_energy/check_energy_chng.meta
index f69792df..d673c9a1 100644
--- a/schemes/check_energy/check_energy_chng.meta
+++ b/schemes/check_energy/check_energy_chng.meta
@@ -168,7 +168,7 @@
   dimensions = ()
   intent = out
 [ teout ]
-  standard_name = vertically_integrated_total_energy_at_end_of_physics_timestep
+  standard_name = vertically_integrated_total_energy_using_dycore_energy_formula_at_end_of_physics_timestep
   units = J m-2
   type = real | kind = kind_phys
   dimensions = (horizontal_dimension)
diff --git a/schemes/check_energy/check_energy_gmean/check_energy_gmean.meta b/schemes/check_energy/check_energy_gmean/check_energy_gmean.meta
index 9aa7b57d..9567f6ee 100644
--- a/schemes/check_energy/check_energy_gmean/check_energy_gmean.meta
+++ b/schemes/check_energy/check_energy_gmean/check_energy_gmean.meta
@@ -43,7 +43,7 @@
   dimensions = (horizontal_loop_extent)
   intent = in
 [ teout ]
-  standard_name = vertically_integrated_total_energy_at_end_of_physics_timestep
+  standard_name = vertically_integrated_total_energy_using_dycore_energy_formula_at_end_of_physics_timestep
   units = J m-2
   type = real | kind = kind_phys
   dimensions = (horizontal_loop_extent)
@@ -67,7 +67,7 @@
   dimensions = ()
   intent = out
 [ teout_glob ]
-  standard_name = global_mean_vertically_integrated_total_energy_at_end_of_physics_timestep
+  standard_name = global_mean_vertically_integrated_total_energy_using_dycore_energy_formula_at_end_of_physics_timestep
   units = J m-2
   type = real | kind = kind_phys
   dimensions = ()
diff --git a/schemes/check_energy/check_energy_save_teout.meta b/schemes/check_energy/check_energy_save_teout.meta
index d587b6f7..afababc3 100644
--- a/schemes/check_energy/check_energy_save_teout.meta
+++ b/schemes/check_energy/check_energy_save_teout.meta
@@ -18,7 +18,7 @@
   dimensions = (horizontal_loop_extent)
   intent = in
 [ teout ]
-  standard_name = vertically_integrated_total_energy_at_end_of_physics_timestep
+  standard_name = vertically_integrated_total_energy_using_dycore_energy_formula_at_end_of_physics_timestep
   units = J m-2
   type = real | kind = kind_phys
   dimensions = (horizontal_loop_extent)
diff --git a/schemes/sima_diagnostics/check_energy_diagnostics.F90 b/schemes/sima_diagnostics/check_energy_diagnostics.F90
index be52eb8d..5682bcae 100644
--- a/schemes/sima_diagnostics/check_energy_diagnostics.F90
+++ b/schemes/sima_diagnostics/check_energy_diagnostics.F90
@@ -31,22 +31,19 @@ subroutine check_energy_diagnostics_init(errmsg, errflg)
       call history_add_field('scaling_dycore', 'ratio_of_specific_heat_of_air_used_in_physics_energy_formula_to_specific_heat_of_air_used_in_dycore_energy_formula', 'lev', 'inst', '1')
 
       call history_add_field('te_cur_phys', 'vertically_integrated_total_energy_using_physics_energy_formula', horiz_only, 'inst', 'J m-2')
-      call history_add_field('te_cur_dyn', 'vertically_integrated_total_energy_using_dycore_energy_formula', horiz_only, 'inst', 'J m-2')
       call history_add_field('tw_cur', 'vertically_integrated_total_water', horiz_only, 'inst', 'kg m-2')
 
       call history_add_field('tend_te_tnd', 'cumulative_total_energy_boundary_flux_using_physics_energy_formula', horiz_only, 'inst', 'J m-2 s-1')
       call history_add_field('tend_tw_tnd', 'cumulative_total_water_boundary_flux', horiz_only, 'inst', 'kg m-2 s-1')
 
-      call history_add_field('teout', 'vertically_integrated_total_energy_at_end_of_physics_timestep', horiz_only, 'inst', 'J m-2')
-
    end subroutine check_energy_diagnostics_init
 
    !> \section arg_table_check_energy_diagnostics_run  Argument Table
    !! \htmlinclude check_energy_diagnostics_run.html
    subroutine check_energy_diagnostics_run( &
       cp_or_cv_dycore, scaling_dycore, &
-      te_cur_phys, te_cur_dyn, tw_cur, &
-      tend_te_tnd, tend_tw_tnd, teout, &
+      te_cur_phys, tw_cur, &
+      tend_te_tnd, tend_tw_tnd, &
       errmsg, errflg)
 
       use cam_history, only: history_out_field
@@ -57,11 +54,9 @@ subroutine check_energy_diagnostics_run( &
       real(kind_phys), intent(in) :: cp_or_cv_dycore(:,:)
       real(kind_phys), intent(in) :: scaling_dycore(:,:)
       real(kind_phys), intent(in) :: te_cur_phys(:)
-      real(kind_phys), intent(in) :: te_cur_dyn(:)
       real(kind_phys), intent(in) :: tw_cur(:)
       real(kind_phys), intent(in) :: tend_te_tnd(:)
       real(kind_phys), intent(in) :: tend_tw_tnd(:)
-      real(kind_phys), intent(in) :: teout(:)
 
 
       ! CCPP error handling variables
@@ -75,11 +70,9 @@ subroutine check_energy_diagnostics_run( &
       call history_out_field('cp_or_cv_dycore', cp_or_cv_dycore)
       call history_out_field('scaling_dycore', scaling_dycore)
       call history_out_field('te_cur_phys', te_cur_phys)
-      call history_out_field('te_cur_dyn', te_cur_dyn)
       call history_out_field('tw_cur', tw_cur)
       call history_out_field('tend_te_tnd', tend_te_tnd)
       call history_out_field('tend_tw_tnd', tend_tw_tnd)
-      call history_out_field('teout', teout)
 
    end subroutine check_energy_diagnostics_run
 
diff --git a/schemes/sima_diagnostics/check_energy_diagnostics.meta b/schemes/sima_diagnostics/check_energy_diagnostics.meta
index cd5e1532..342ab1f2 100644
--- a/schemes/sima_diagnostics/check_energy_diagnostics.meta
+++ b/schemes/sima_diagnostics/check_energy_diagnostics.meta
@@ -39,12 +39,6 @@
   type = real | kind = kind_phys
   dimensions = (horizontal_loop_extent)
   intent = in
-[ te_cur_dyn ]
-  standard_name = vertically_integrated_total_energy_using_dycore_energy_formula
-  units = J m-2
-  type = real | kind = kind_phys
-  dimensions = (horizontal_loop_extent)
-  intent = in
 [ tw_cur ]
   standard_name = vertically_integrated_total_water
   units = kg m-2
@@ -63,12 +57,6 @@
   type = real | kind = kind_phys
   dimensions = (horizontal_loop_extent)
   intent = in
-[ teout ]
-  standard_name = vertically_integrated_total_energy_at_end_of_physics_timestep
-  units = J m-2
-  type = real | kind = kind_phys
-  dimensions = (horizontal_loop_extent)
-  intent = in
 [ errmsg ]
   standard_name = ccpp_error_message
   units = none
diff --git a/schemes/sima_diagnostics/check_energy_fix_diagnostics.F90 b/schemes/sima_diagnostics/check_energy_fix_diagnostics.F90
new file mode 100644
index 00000000..12074a53
--- /dev/null
+++ b/schemes/sima_diagnostics/check_energy_fix_diagnostics.F90
@@ -0,0 +1,73 @@
+! Diagnostic scheme for check_energy_fix
+! This module includes diagnostics that have to be output
+! right after the energy fixer has been ran and check_energy_chng has updated energy state
+! (before the fluxes for check_energy_chng are zeroed out)
+module check_energy_fix_diagnostics
+   use ccpp_kinds, only: kind_phys
+
+   implicit none
+   private
+   save
+
+   public :: check_energy_fix_diagnostics_init
+   public :: check_energy_fix_diagnostics_run
+
+contains
+
+   !> \section arg_table_check_energy_fix_diagnostics_init  Argument Table
+   !! \htmlinclude check_energy_fix_diagnostics_init.html
+   subroutine check_energy_fix_diagnostics_init(errmsg, errflg)
+      use cam_history,         only: history_add_field
+      use cam_history_support, only: horiz_only
+
+      character(len=512), intent(out) :: errmsg
+      integer,            intent(out) :: errflg
+
+      ! Local variables:
+
+      errmsg = ''
+      errflg = 0
+
+      ! History add field calls
+      call history_add_field('TEINP', 'vertically_integrated_total_energy_using_dycore_energy_formula_at_start_of_physics_timestep', horiz_only, 'inst', 'J m-2')
+      call history_add_field('TEFIX', 'vertically_integrated_total_energy_using_dycore_energy_formula', horiz_only, 'inst', 'J m-2')
+      call history_add_field('TEOUT', 'vertically_integrated_total_energy_using_dycore_energy_formula_at_end_of_physics_timestep', horiz_only, 'inst', 'J m-2')
+      call history_add_field('EFIX', 'net_sensible_heat_flux_through_top_and_bottom_of_atmosphere_column_from_global_total_energy_correction', horiz_only, 'inst', 'J m-2')
+
+   end subroutine check_energy_fix_diagnostics_init
+
+   !> \section arg_table_check_energy_fix_diagnostics_run  Argument Table
+   !! \htmlinclude check_energy_diagnostics_run.html
+   subroutine check_energy_fix_diagnostics_run( &
+      te_ini_dyn, te_cur_dyn, &
+      teout, &
+      eshflx, &
+      errmsg, errflg)
+
+      use cam_history, only: history_out_field
+      !------------------------------------------------
+      !   Input / output parameters
+      !------------------------------------------------
+      ! State variables
+      real(kind_phys), intent(in) :: te_ini_dyn(:)
+      real(kind_phys), intent(in) :: te_cur_dyn(:)
+      real(kind_phys), intent(in) :: teout(:)
+      real(kind_phys), intent(in) :: eshflx(:)
+
+
+      ! CCPP error handling variables
+      character(len=512), intent(out) :: errmsg
+      integer,            intent(out) :: errflg
+
+      errmsg = ''
+      errflg = 0
+
+      ! History out field calls
+      call history_out_field('TEINP', te_ini_dyn)
+      call history_out_field('TEOUT', teout)
+      call history_out_field('TEFIX', te_cur_dyn)
+      call history_out_field('EFIX',  eshflx)
+
+   end subroutine check_energy_fix_diagnostics_run
+
+end module check_energy_fix_diagnostics
diff --git a/schemes/sima_diagnostics/check_energy_fix_diagnostics.meta b/schemes/sima_diagnostics/check_energy_fix_diagnostics.meta
new file mode 100644
index 00000000..c5811a27
--- /dev/null
+++ b/schemes/sima_diagnostics/check_energy_fix_diagnostics.meta
@@ -0,0 +1,59 @@
+[ccpp-table-properties]
+  name = check_energy_fix_diagnostics
+  type = scheme
+
+[ccpp-arg-table]
+  name  = check_energy_fix_diagnostics_init
+  type  = scheme
+[ errmsg ]
+  standard_name = ccpp_error_message
+  units = none
+  type = character | kind = len=512
+  dimensions = ()
+  intent = out
+[ errflg ]
+  standard_name = ccpp_error_code
+  units = 1
+  type = integer
+  dimensions = ()
+  intent = out
+
+[ccpp-arg-table]
+  name  = check_energy_fix_diagnostics_run
+  type  = scheme
+[ te_ini_dyn ]
+  standard_name = vertically_integrated_total_energy_using_dycore_energy_formula_at_start_of_physics_timestep
+  units = J m-2
+  type = real | kind = kind_phys
+  dimensions = (horizontal_dimension)
+  intent = in
+[ te_cur_dyn ]
+  standard_name = vertically_integrated_total_energy_using_dycore_energy_formula
+  units = J m-2
+  type = real | kind = kind_phys
+  dimensions = (horizontal_loop_extent)
+  intent = in
+[ teout ]
+  standard_name = vertically_integrated_total_energy_using_dycore_energy_formula_at_end_of_physics_timestep
+  units = J m-2
+  type = real | kind = kind_phys
+  dimensions = (horizontal_loop_extent)
+  intent = in
+[ eshflx ]
+  standard_name = net_sensible_heat_flux_through_top_and_bottom_of_atmosphere_column
+  units = W m-2
+  type = real | kind = kind_phys
+  dimensions = (horizontal_loop_extent)
+  intent = in
+[ errmsg ]
+  standard_name = ccpp_error_message
+  units = none
+  type = character | kind = len=512
+  dimensions = ()
+  intent = out
+[ errflg ]
+  standard_name = ccpp_error_code
+  units = 1
+  type = integer
+  dimensions = ()
+  intent = out
diff --git a/schemes/sima_diagnostics/check_energy_gmean_diagnostics.meta b/schemes/sima_diagnostics/check_energy_gmean_diagnostics.meta
index 7eff0709..af1f5c79 100644
--- a/schemes/sima_diagnostics/check_energy_gmean_diagnostics.meta
+++ b/schemes/sima_diagnostics/check_energy_gmean_diagnostics.meta
@@ -34,7 +34,7 @@
   dimensions = ()
   intent = in
 [ teout_glob ]
-  standard_name = global_mean_vertically_integrated_total_energy_at_end_of_physics_timestep
+  standard_name = global_mean_vertically_integrated_total_energy_using_dycore_energy_formula_at_end_of_physics_timestep
   units = J m-2
   type = real | kind = kind_phys
   dimensions = ()
diff --git a/suites/suite_adiabatic.xml b/suites/suite_adiabatic.xml
index eda9d892..ae4af827 100644
--- a/suites/suite_adiabatic.xml
+++ b/suites/suite_adiabatic.xml
@@ -7,15 +7,19 @@
     <!-- After gmean, output global mean energy diagnostics -->
     <scheme>check_energy_gmean_diagnostics</scheme>
 
-    <!-- Add global mean energy difference as heating (diff between gmean and save_teout) -->
+    <!--
+      Global energy fixer (check_energy_fix)
+      Add global mean energy difference as heating (diff between gmean and save_teout)
+    -->
     <scheme>check_energy_zero_fluxes</scheme>
     <scheme>check_energy_fix</scheme>
     <scheme>apply_heating_rate</scheme>
     <scheme>geopotential_temp</scheme>
-
-    <!-- Check that energy and water change matches the boundary fluxes -->
+    <!-- Check that energy and water change matches the boundary fluxes, update global energy -->
     <scheme>check_energy_scaling</scheme>
     <scheme>check_energy_chng</scheme>
+    <!-- Global energy fixer diagnostics (must run after check_energy_chng which updates global energies, but before zero_fluxes zeroes out boundary fluxes from energy fixer) -->
+    <scheme>check_energy_fix_diagnostics</scheme>
 
     <!-- Save current total energy from dycore for energy fixer in time step. This requires te_cur to be updated from check_energy_chng first. -->
     <scheme>check_energy_save_teout</scheme>
diff --git a/suites/suite_cam4.xml b/suites/suite_cam4.xml
deleted file mode 100644
index c7832514..00000000
--- a/suites/suite_cam4.xml
+++ /dev/null
@@ -1,202 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<suite name="cam4" version="1.0">
-  <group name="physics_bc">
-    <!--cam4:  deep=ZM, shallow=Hack, macrop=RK, microp=RK, radiation=CAMRT, chem=none -->
-    <time_split>
-      <scheme>physics_state_check</scheme> <!-- Only if state_debug_checks is True. This scheme only looks for infs/nans, and kills the model if found. -->
-      <!-- Negative moisture/tracer check -->
-      <!-- **************************** -->
-      <scheme>qneg3</scheme>             <!-- This scheme modifies the state directly.  Combine with state check? -->
-      <!-- **************************** -->
-      <scheme>physics_state_check</scheme> <!-- Only if state_debug_checks is True. This scheme only looks for infs/nans, and kills the model if found. -->
-      <scheme>diag_state_b4_phys_write</scheme> <!-- Diagnostics -->
-      <!-- energy and momentum fixer -->
-      <!-- **************************** -->
-      <scheme>calc_te_and_aam_budgets</scheme>           <!-- Managed by host model? Diagnostic output suffix = 'pBF' -->
-      <scheme>check_energy_fix</scheme>                  <!-- Only matters if dycore is FV (called "LR" in physics) or SE -->
-      <scheme>check_energy_cam_update_pre_chng</scheme>  <!-- Placeholder for CAM updates and diagnostic output calculations before "chng" call. -->
-      <scheme>check_energy_chng</scheme>                 <!-- Global integral checker required for certain diagnostic outputs -->
-      <scheme>check_energy_cam_update_post_chng</scheme> <!-- Placeholder for CAM updates and diagnostic output calculations after "chng" call. -->
-      <scheme>calc_te_and_aam_budgets</scheme>           <!-- Managed by host model? Diagnostic output suffix = 'pBP' -->
-      <!-- **************************** -->
-      <scheme>diag_conv_tend_ini</scheme>      <!-- Initalizes convective-scheme diagnostic outputs -->
-      <scheme>calc_dtcore</scheme>             <!-- diagnostic calculation.  Could likely be included in energy fixer scheme. -->
-      <!-- Dry adiabatic adjustment  -->
-      <!-- **************************** -->
-      <!-- Technically only needs temperature and humidity as inputs -->
-      <scheme>dadadj_calc_update</scheme>      <!-- Actual dry adiabatic adjustment scheme, with placeholders for CAM updates calculations -->
-      <!-- **************************** -->
-      <!-- Zhang-Macfarlane deep convection scheme -->
-      <!-- **************************** -->
-      <!-- Is ZM microphysics going to be supported? -->
-      <!-- Is initalization scheme required (it depends on numerous physics settings? -->
-      <scheme>zm_convr</scheme>                 <!-- Actual deep convection routine -->
-      <scheme>zm_convr_cam_update</scheme>      <!-- Placeholder for CAM updates and diagnostic output calculations -->
-      <scheme>zm_conv_evap</scheme>             <!-- Actual ZM rain evaporation scheme -->
-      <scheme>zm_conv_evap_cam_update</scheme>  <!-- Placeholder for CAM updates and diagnostic output calculations -->
-      <scheme>momtran</scheme>                  <!-- Actual ZM momentum transport scheme -->
-      <scheme>momtran_cam_update</scheme>       <!-- Placeholder for CAM updates and diagnostic output calculations -->
-      <scheme>convtran</scheme>                 <!-- Actual ZM convective transport scheme -->
-      <scheme>convtran_cam_update</scheme>      <!-- Placeholder for CAM updates and diagnostic output calculations -->
-      <!-- **************************** -->
-      <scheme>check_energy_chng</scheme>        <!-- Global integral checker required for certain diagnostic outputs -->
-      <!-- Hack shallow convection scheme -->
-      <!-- **************************** -->
-      <scheme>cmfmca</scheme>                   <!-- Actual shallow convective scheme -->
-      <scheme>cmfmca_cam_update</scheme>        <!-- Placeholder for CAM updates and diagnostic output calculations -->
-      <scheme>zm_conv_evap</scheme>             <!-- Actual ZM rain evaporation scheme -->
-      <scheme>zm_conv_evap_cam_update</scheme>  <!-- Placeholder for CAM updates and diagnostic output calculations -->
-      <!-- **************************** -->
-      <scheme>check_energy_chng</scheme>        <!-- Global integral checker required for certain diagnostic outputs -->
-      <scheme>check_tracers_chng</scheme>       <!-- Global tracer mass checker that kills model if error is large enough. -->
-      <scheme>sslt_rebin_adv</scheme>           <!--Only matters if certain sea salt species are present in chemistry package-->
-      <!-- Rasch-Kristjansson stratiform cloud scheme -->
-      <!-- **************************** -->
-      <scheme>tropopause_find</scheme>                <!-- Calculate tropopause height, but only if do_psrhmin is True -->
-      <scheme>cld_sediment_vel</scheme>               <!-- Calculate cloud liquid and ice sedimentation velocities -->
-      <scheme>cld_sediment_tend</scheme>              <!-- Calculate tendencies produced by cloud sedimentation -->
-      <scheme>rk_sed_cam_update</scheme>              <!-- Placeholder for CAM updates and diagnostic output calculations -->
-      <scheme>add_conv_detrain_rliq</scheme>          <!-- Add convectively-detrained cloud liquid to environment, and reserved liquid back to precipitaton (managed by host model?) -->
-      <scheme>cldfrc</scheme>                         <!-- Calculate cloud fraction -->
-      <scheme>cldfrc_rh2</scheme>                     <!-- Calculate cloud fraction with perturbed RH (is there a better way to do this, e.g. subcycle?) -->
-      <scheme>rhdfda_calc</scheme>                    <!-- Calculate "rhdfda", or the derivative d(RH)/da -->
-      <scheme>cldfrc_fice</scheme>                    <!-- Calculate ice cloud fraction -->
-      <scheme>strat_cond_repartition</scheme>         <!-- Re-partition stratiform cloud ice and cloud liquid, and calculate relevant heating rates -->
-      <scheme>pcond</scheme>                          <!-- Actual RK macro/micro-physics scheme -->
-      <scheme>rk_pcond_cam_update</scheme>            <!-- Placeholder for CAM updates and diagnostic output calculations -->
-      <scheme>cldfrc</scheme>                         <!-- Calculate cloud fraction -->
-      <scheme>cldfrc_diag_output</scheme>             <!-- Calculate cloud fraction diagnostics and output them to history file -->
-      <scheme>cldefr</scheme>                         <!-- Calculate cloud liquid and ice particle effective radii, and output to history file/host model -->
-      <!-- **************************** -->
-      <scheme>convtran</scheme>                       <!-- Actual ZM convective transport scheme, for constituents in cnst_is_convtran2 -->
-      <scheme>check_tracers_chng</scheme>             <!-- Global tracer mass checker that kills model if error is large enough. -->
-      <scheme>diag_phys_writeout</scheme>             <!-- Calculate generic atmospheric physics diagnostics and output them to history file -->
-      <scheme>diag_conv</scheme>                      <!-- Calculate generic precipitation and convection diagnostics and output them to history file -->
-      <scheme>cloud_diagnostics_calc</scheme>         <!-- Calculate generic cloud diagnostics and output them to history file -->
-      <!-- CAM-RT radiation scheme -->
-      <!-- **************************** -->
-      <scheme>calc_solar_zenith_ang</scheme>          <!-- Calculate the solar zenith angle for the given time step -->
-      <scheme>group_day_night</scheme>                <!-- Determine which columns are in the day-side, vs night-side -->
-      <scheme>calc_col_mean_co2</scheme>              <!-- Calculate column mean CO2 values -->
-      <scheme>eccf_calc</scheme>                      <!-- Calculate "earth sun distance factor". -->
-      <scheme>tropopause_find</scheme>                <!-- Calculate tropopause height -->
-      <scheme>calc_col_mean_o2</scheme>               <!-- Calculate column mean O2 values -->
-      <scheme>aer_rad_props_sw</scheme>               <!-- Gather/calculate aerosol shortwave optical properties -->
-      <scheme>radcswmx</scheme>                       <!-- Actual CAM-RT shortwave radiation parameterization -->
-      <scheme>rad_sw_diag_output</scheme>             <!-- Calculate shortwave diagnostic variables, and output them to history file -->
-      <scheme>aer_rad_props_lw</scheme>               <!-- Gather/calculate aerosol longwave optical properties -->
-      <scheme>radclwmx</scheme>                       <!-- Actual CAM-RT longwave radiation parameterization -->
-      <scheme>rad_lw_diag_output</scheme>             <!-- Calculate longwave diagnostic variables, and output them to history file -->
-      <scheme>cloud_cover_diags_output</scheme>       <!-- Calculate cloud cover diagnostic variables, and output them to history file -->
-      <scheme>rad_qdp_q_calc</scheme>                 <!-- Convert Q*dp to Q (potentially managed by registry/framework?) -->
-      <scheme>rad_data_write</scheme>                 <!-- Calculate additional radiation diagnostics, and output them to history file -->
-      <scheme>radheat_tend</scheme>                   <!-- Calculate net radiative heating tendencies -->
-      <scheme>radheat_diag_output</scheme>            <!-- Calculate radiative heating diagnostic variables, and output them to history file -->
-      <scheme>rad_q_qdp_calc</scheme>                 <!-- Convert Q to Q*dp (potentially managed by registry/framework?) -->
-      <scheme>set_srf_net_sw</scheme>                 <!-- Add net shortwave surface flux to host model surface fluxes -->
-      <!-- **************************** -->
-      <scheme>check_energy_chng</scheme>              <!-- Global integral checker required for certain diagnostic outputs -->
-      <scheme>tropopause_output</scheme>              <!-- Calculate tropopause diagnostic variables, and output them to history file -->
-      <scheme>cam_export</scheme>                     <!-- Add various physics state variables to host model surface fluxes -->
-      <scheme>diag_export</scheme>                    <!-- Output various host model surface fluxes to history file -->
-    </time_split>
-  </group>
-  <group name="physics_ac">
-    <!--cam6:  diffusion=HB, chem=none -->
-    <time_split>
-      <scheme>flux_avg_run</scheme>                   <!-- Smooth/average surface fluxes, but only if phys_do_flux_avg is True -->
-      <scheme>physics_state_check</scheme>            <!-- Only if state_debug_checks is True. This scheme only looks for infs/nans, and kills the model if found -->
-      <scheme>calc_flx_net</scheme>                   <!-- Accumulate net surface fluxes, which is necessary for spectral dycores -->
-      <!-- Negative moisture/tracer check -->
-      <!-- **************************** -->
-      <scheme>qneg4</scheme>                          <!-- Modify surface moisture and heat fluxes to prevent negative moisture values, and output diagnostics -->
-      <scheme>aoa_tracers_timestep_tend</scheme>      <!-- Calculate age of air tracer tendencies.  Also output tendencies to history file -->
-      <scheme>check_tracers_chng</scheme>             <!-- Global tracer mass checker that kills model if error is large enough. -->
-      <scheme>co2_cycle_set_ptend</scheme>            <!-- Calculate CO2 tendencies.  Only matters if co2_flag or co2_readFlux_aircraft is True -->
-      <!-- **************************** -->
-      <!-- Vertical diffusion -->
-      <!-- **************************** -->
-      <scheme>set_dry_to_wet</scheme>                 <!-- Convert mixing ratios from dry air to air + water vapor -->
-      <scheme>tint_calc</scheme>                      <!-- Interpolate air temperature to layer interface levels -->
-      <scheme>ubc_get_vals</scheme>                   <!-- Calcuate upper-level boundary conditions (depends on chemistry and model-top choice) -->
-      <scheme>set_top_tint_val</scheme>               <!-- Calculate air temperature at top interface level -->
-      <scheme>rhoi_calc</scheme>                      <!-- Interpolate air density and dry air density to layer interface levels -->
-      <scheme>compute_tms</scheme>                    <!-- Calculate Turbulent Mountain Stress (TMS) tendency -->
-      <scheme>tms_diag_output</scheme>                <!-- Calculate TMS diangostic variables, and output them to history file -->
-      <scheme>compute_blj</scheme>                    <!-- Calculate Sub-Grid Orgraphic (SGO) drag via Beljaars parameterization -->
-      <scheme>blj_diag_output</scheme>                <!-- Calculate SGO diagnostic variables, and output them to history file -->
-      <scheme>temp_to_potential_temp</scheme>         <!-- Calculate potential temperature -->
-      <scheme>virtem</scheme>                         <!-- Calculate virtual temperature (managed by registry/framework?) -->
-      <scheme>calc_ustar</scheme>                     <!-- Calculate friction velocity -->
-      <scheme>calc_obklen</scheme>                    <!-- Calculate Obhukov length -->
-      <!-- Holtslag and Boville, 1991 PBL scheme -->
-      <!-- ++++++++++++++++++++++++++ -->
-      <scheme>trbintd</scheme>                        <!-- Calculate shear squared, brunt-viasala frequency, and Richardson number -->
-      <scheme>pblintd</scheme>                        <!-- Initialize time dependent variables that depend on PBL height -->
-      <scheme>austausch_atm</scheme>                  <!-- Calculate free atmosphere exchange coefficients -->
-      <scheme>austausch_pbl</scheme>                  <!-- Calculate PBL exchange coefficients (and assume kvq = kvh) -->
-      <!-- ++++++++++++++++++++++++++ -->
-      <scheme>pbl_diag_calc</scheme>                  <!-- Calculate PBL diagnositc variables, if do_pbl_diags is False -->
-      <scheme>dse_top_calc</scheme>                   <!-- Calculate top-level dry static energy, but only if do_molec_diff is True and WACCM-X is False -->
-      <scheme>compute_molec_diff_wet</scheme>         <!-- Calculate molecular diffusion of wet atmospheric constituents, if do_molec_diff is True -->
-      <scheme>compute_vdiff_wet</scheme>              <!-- Calculate the vertical (eddy) diffusion of wet atmospheric constituents -->
-      <scheme>compute_molec_diff_dry</scheme>         <!-- Calculate molecular diffusion of dry atmospheric constituents, if do_molec_diff is True -->
-      <scheme>compute_vdiff_dry</scheme>              <!-- Calculate the vertical (eddy) diffusion of dry atmospheric constituents -->
-      <scheme>diff_flux_diag</scheme>                 <!-- Calculate diffusion variable diagnostics, if do_pbl_diags is False (is that correct?) -->
-      <scheme>diff_flux_tend_dry</scheme>             <!-- Calculate vertical diffusion tendencies for "dry" quantities, and send them back to host model -->
-      <scheme>set_wet_to_dry</scheme>                 <!-- Convert mixing ratios from air + water vapor to dry air -->
-      <scheme>pbl_diag_calc</scheme>                  <!-- Calculate PBL diagnositc variables, if do_pbl_diags is False -->
-      <scheme>diff_mass_check</scheme>                <!-- Check mass conservation after vertical diffusion, and send error messages if check fails -->
-      <scheme>pbl_output</scheme>                     <!-- Write PBL diagnostic variables to history files -->
-      <!-- **************************** -->
-      <scheme>rayleigh_friction_tend</scheme>         <!-- Calculate Rayleigh friction tendency -->
-      <scheme>check_energy_chng</scheme>              <!-- Global integral checker required for certain diagnostic outputs -->
-      <scheme>check_tracers_chng</scheme>             <!-- Global tracer mass checker that kills model if error is large enough. -->
-      <scheme>charge_balance</scheme>                 <!-- Enforce charge nuetrality, if chemistry simulates electrons -->
-      <!-- Gravit wave tendencies -->
-      <!-- **************************** -->
-      <!-- This interface depends heavily
-           on namelist inputs, with entire
-           blocks of code being used (or not)
-           depending on said namelist choices.
-           However, the general structure of these
-           code blocks is more or less the same,
-           so a "generic" scheme set is included
-           here, which will need to be expanded
-           out once "if-statement" like dependencies
-           can be added to suite definition files
-           like this one -->
-      <scheme>set_dry_to_wet</scheme>                  <!-- Convert mixing ratios from dry air to air + water vapor -->
-      <scheme>gw_prof</scheme>                         <!-- Calculate layer interface densities and Brunt-Viasala frequencies (combine with other schemes?) -->
-      <!-- Generic gravity wave scheme order  -->
-      <!-- +++++++++++++++++++++++++ -->
-      <scheme>effgw_calc</scheme>                      <!-- Calculate the efficiency of gravity wave momentum transfer -->
-      <scheme>gw_src_calc</scheme>                     <!-- Determine gravity wave sources -->
-      <scheme>gw_drag_prof</scheme>                    <!-- Solve for the drag profile with the gravity wave spectrum -->
-      <scheme>calc_taucd</scheme>                      <!-- Project stress into directional components -->
-      <scheme>egwdffi_tot_calc</scheme>                <!-- add diffusion coefficients -->
-      <scheme>momentum_flux_calc</scheme>              <!-- Calculate momentum fluxes/wind tendencies -->
-      <scheme>energy_change</scheme>                   <!-- Calculate atmospheric energy change -->
-      <scheme>energy_fixer</scheme>                    <!-- Ensure energy conservation -->
-      <scheme>gw_cam_update</scheme>                   <!-- Placeholder for CAM gravity wave updates and diagnostic output calculations -->
-      <!-- +++++++++++++++++++++++++ -->
-      <!-- **************************** -->
-      <scheme>check_energy_chng</scheme>               <!-- Global integral checker required for certain diagnostic outputs -->
-      <scheme>lunar_tides_tend</scheme>                <!-- Calculate horizontal wind tendencies due to M2 lunar tide, but only if apply_lunar_tides is True -->
-      <scheme>check_energy_chng</scheme>               <!-- Global integral checker required for certain diagnostic outputs -->
-      <scheme>calc_te_and_aam_budgets</scheme>         <!-- Managed by host model? Diagnostic output suffix = 'pAP' -->
-      <scheme>nudging_timestep_tend</scheme>           <!-- Apply nudging to horizontal winds, heat, and water vapor, and output diagnostics, but only if nudging is turned on. -->
-      <scheme>check_energy_chng</scheme>               <!-- Global integral checker required for certain diagnostic outputs -->
-      <scheme>set_dry_to_wet</scheme>                  <!-- Only matters if dycore is LR (still used?) or SE-->
-      <!-- Dry air mass adjuster -->                   <!-- Only matters if dycore is FV (LR), otherwise this calculation is purely diagnostic -->
-      <!-- **************************** -->
-      <scheme>qfac_state_adjust</scheme>               <!-- Adjust state variables based off the change in water vapor -->
-      <scheme>geopotential_dse</scheme>                <!-- Calculate the temperatue and geopotential height using pressure and dry static energy -->
-      <!-- **************************** -->
-      <scheme>calc_te_and_aam_budgets</scheme>         <!-- Managed by host model? Diagnostic output suffix = 'pAM' -->
-      <scheme>dtcore_reset</scheme>                    <!-- Reset "dtcore" variable to equal temperature -->
-      <scheme>diag_phys_tend_writeout</scheme>         <!-- Calculate physics diagnostic variables, and output them to history file -->
-    </time_split>
-  </group>
-</suite>
diff --git a/suites/suite_cam6.xml b/suites/suite_cam6.xml
deleted file mode 100644
index d995b70b..00000000
--- a/suites/suite_cam6.xml
+++ /dev/null
@@ -1,364 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<suite name="cam6" version="1.0">
-  <group name="physics_bc">
-    <!--cam6:  deep=ZM, shallow=CLUBB, macrop=CLUBB, microp=MG2, radiation=RRTMG, chem=trop_mam4 -->
-    <time_split>
-      <scheme>physics_state_check</scheme> <!-- Only if state_debug_checks is True. This scheme only looks for infs/nans, and kills the model if found. -->
-      <scheme>clybry_fam_adj</scheme>      <!-- Only matters if chemistry package with Cly and Bry is used -->
-      <!-- Negative moisture/tracer check -->
-      <!-- **************************** -->
-      <scheme>qneg</scheme>               <!-- This scheme modifies the state directly.  Combine with state check? -->
-      <!-- **************************** -->
-      <scheme>physics_state_check</scheme>      <!-- Only if state_debug_checks is True. This scheme only looks for infs/nans, and kills the model if found. -->
-      <scheme>diag_state_b4_phys_write</scheme> <!-- Diagnostics -->
-      <!-- energy and momentum fixer -->
-      <!-- **************************** -->
-      <scheme>calc_te_and_aam_budgets</scheme>           <!-- Managed by host model? Diagnostic output suffix = 'pBF' -->
-      <scheme>check_energy_fix</scheme>                  <!-- Only matters if dycore is FV (called "LR" in physics) or SE-->
-      <scheme>check_energy_cam_update_pre_chng</scheme>  <!-- Placeholder for CAM updates and diagnostic output calculations before "chng" call. -->
-      <scheme>check_energy_chng</scheme>                 <!-- Global integral checker required for certain diagnostic outputs -->
-      <scheme>check_energy_cam_update_post_chng</scheme> <!-- Placeholder for CAM updates and diagnostic output calculations after "chng" call. -->
-      <scheme>calc_te_and_aam_budgets</scheme>           <!-- Managed by host model? Diagnostic output suffix = 'pBP' -->
-      <!-- **************************** -->
-      <scheme>diag_conv_tend_ini</scheme>      <!-- Initalizes convective-scheme diagnostic outputs -->
-      <scheme>calc_dtcore</scheme>             <!-- diagnostic calculation.  Could likely be included in energy fixer scheme. -->
-      <!-- Dry adiabatic adjustment  -->
-      <!-- **************************** -->
-      <!-- Technically only needs temperature and humidity as inputs -->
-      <scheme>dadadj_calc_update</scheme>      <!-- Actual dry adiabatic adjustment scheme, with placeholders for CAM accumulation calculations -->
-      <!-- **************************** -->
-      <!-- Zhang-Macfarlane deep convection scheme -->
-      <!-- **************************** -->
-      <scheme>zm_convr</scheme>                 <!-- Actual deep convection routine -->
-      <scheme>zm_convr_cam_update</scheme>      <!-- Placeholder for CAM updates and diagnostic output calculations -->
-      <scheme>zm_conv_evap</scheme>             <!-- Actual ZM rain evaporation scheme -->
-      <scheme>zm_conv_evap_cam_update</scheme>  <!-- Placeholder for CAM updates and diagnostic output calculations -->
-      <scheme>momtran</scheme>                  <!-- Actual ZM momentum transport scheme -->
-      <scheme>momtran_cam_update</scheme>       <!-- Placeholder for CAM updates and diagnostic output calculations -->
-      <scheme>convtran</scheme>                 <!-- Actual ZM convective transport scheme, for constituents in cnst_is_convtran1 -->
-      <scheme>convtran_cam_update</scheme>      <!-- Placeholder for CAM updates and diagnostic output calculations -->
-      <!-- **************************** -->
-      <scheme>check_energy_chng</scheme>        <!-- Global integral checker required for certain diagnostic outputs -->
-      <scheme>check_tracers_chng</scheme>       <!-- Global tracer mass checker that kills model if error is large enough. -->
-      <scheme>sslt_rebin_adv</scheme>           <!-- Only matters if certain sea salt species are present in chemistry package-->
-      <subcycle loop="cloud_macmic_num_steps">  <!-- Cloud macrophysics-microphysics loop -->
-        <!-- CLUBB turbulence, convection, and macrophysics -->
-        <!-- **************************** -->
-        <!-- The commented-out schemes below are all included in the "clubb_input_prepare" scheme -->
-        <!-- ++++++++++++++++++++++++++++++
-        <scheme>set_dry_to_wet</scheme>                  Convert mixing ratios from dry air to air + water vapor
-        <scheme>grid_size</scheme>                       Calculate grid-cell size
-        <scheme>clubb_dtime_calc</scheme>                Calculate CLUBB time-step as function of host model time-step
-        <scheme>exner_clubb</scheme>                     Calculate Exner function using CLUBB definition
-        <scheme>clubb_thermo_vars</scheme>               Calculate various thermodynamic variables needed for CLUBB (Theta-V, Theta-L, etc.)
-        <scheme>tropopause_findChemTrop</scheme>         Calculate tropopause height
-        <scheme>clubb_vertical_grid_create_inv</scheme>  Create CLUBB vertical grids, which is in the opposite order of CAM
-        <scheme>clubb_thermo_vars_grid</scheme>          Calculate additional thermodynamic variables that are on the CLUBB vertical grid
-        <scheme>clubb_calc_ustar</scheme>                Only matters for single-column mode
-        <scheme>setup_grid_heights_api</scheme>          Re-calculate CLUBB grid heights
-        <scheme>setup_parameters_api</scheme>            Re-calculate grid-dependent CLUBB parameters
-        <scheme>zt2zm_convert</scheme>                   Transition variables on thermodynamic levels to momentum levels
-        <scheme>clubb_calc_input_vars</scheme>           Calculate additional CLUBB input variables
-        +++++++++++++++++++++++++++++++ -->
-        <scheme>clubb_input_prepare</scheme>             <!-- Prepare inputs for the "CLUBB" turbulence/convection/macrophysics scheme -->
-        <scheme>clubb_var_vert_inv</scheme>              <!-- Change order of vertical levels for CLUBB input variables -->
-        <subcycle loop="clubb_time_substep">             <!-- CLUBB sub-step loop (number of iterations should be calculated in the "clubb_dtime_calc" scheme), CAM6 var = 'clubb_nadv' -->
-          <scheme>stats_begin_timestep_api</scheme>      <!-- Only matters if "l_stats" is True -->
-          <scheme>advance_clubb_core_api</scheme>        <!-- Actual CLUBB parameterization scheme -->
-          <scheme>update_xp2_mc_intr</scheme>            <!-- Only matters if "do_rainturb" is True -->
-          <scheme>calculate_thlp2_rad_intr</scheme>      <!-- Only matters if "do_cldcool" is True -->
-          <scheme>stats_end_timestep_clubb</scheme>      <!-- Only matters if "l_stats" is True -->
-        </subcycle>
-        <!-- The commented-out schemes below are all included in the "clubb_output_prepare" scheme -->
-        <!-- ++++++++++++++++++++++++++++++
-        <scheme>zm2zt_convert</scheme>                   Transition variables on momentum levels to thermodynamic levels
-        <scheme>clubb_calc_output_vars</scheme>          Calculate additional CLUBB output variables
-        +++++++++++++++++++++++++++++++ -->
-        <scheme>clubb_output_prepare</scheme>            <!-- Prepare CLUBB outputs for use in the host model -->
-        <scheme>clubb_var_vert_rev</scheme>              <!-- Change order of vertical levels for CLUBB output variables back to host model ordering -->
-        <scheme>clubb_upper_diss</scheme>                <!-- CLUBB energy and total water mass fixer -->
-        <scheme>clubb_cam_update</scheme>                <!-- Placeholder for CAM updates and diagnostic output calculations -->
-        <scheme>liquid_macro_tend</scheme>               <!-- Only matters if "clubb_do_liqsupersat" is True-->
-        <scheme>liquid_macro_CAM_update</scheme>         <!-- Placeholder for CAM updates and diagnostic output calculations -->
-        <scheme>conv_cond_detrain_calc</scheme>          <!-- Calculate the host model cloud condensate and energy tendencies produced by convective detrainment -->
-        <scheme>conv_cond_detrain_cam_update</scheme>    <!-- Placeholder for CAM updates and diagnostic output calculations -->
-        <scheme>set_wet_to_dry</scheme>                  <!-- Convert mixing ratios from air + water vapor to dry air -->
-        <scheme>clubb_diag_output</scheme>               <!-- Calculate numerous different CLUBB diagnostic variables, and output them to history file -->
-        <!-- **************************** -->
-        <scheme>check_energy_chng</scheme>            <!-- Global integral checker required for certain diagnostic outputs -->
-        <partition gen="subcol_generator_name" avg="subcol_averager_name">
-          <process_split>
-            <!-- MG aerosol microphysics -->
-            <!-- **************************** -->
-            <scheme>hetfrz_classnuc_cam_save_cbaero</scheme> <!-- Save copy of cloud-borne aerosols (only needed if use_hetfrz_classnuc is True) -->
-            <scheme>aero_get_num_mmr</scheme>                <!-- Collect particle number and mass mixing ratios for each aerosol species, unless already managed by framework -->
-            <scheme>aero_calc_wsub</scheme>                  <!-- Calculate subgrid-scale vertical velocity -->
-            <scheme>nucleate_ice_cam_calc</scheme>           <!-- Calculate ice nucleation -->
-            <scheme>lcldm_min_check</scheme>                 <!-- Check that low cloud fraction is above threshold -->
-            <scheme>aero_cam_drop_activate</scheme>          <!-- Calculate droplet activation -->
-            <scheme>aero_cam_contact_freezing</scheme>       <!-- Calculate contact freezing -->
-            <scheme>ndrop_bam_ccn</scheme>                   <!-- Calculate bulk CCN concentration (only needed if clim_modal_aero is False) -->
-            <scheme>hetfrz_classnuc_cam_calc</scheme>        <!-- Calculate heterogeneous freezing (only needed if use_hetfrz_classnuc is True) -->
-            <scheme>microp_aero_diag_output</scheme>         <!-- Output diagnostics from MG aerosol microphysics. -->
-            <!-- **************************** -->
-            <!-- MG cloud microphysics -->
-            <!-- **************************** -->
-            <scheme>micro_mg_get_cols3_0</scheme>       <!-- Determine atmospheric columns used by the MG2 microphysics schemes -->
-            <scheme>calc_incloud_LWP</scheme>           <!-- Calculate in-cloud Liquid Water Path (LWP) before MG2 is run -->
-            <scheme>micro_calc_tropopause</scheme>      <!-- Calculate the cold-point tropopause for use by the microphysics -->
-            <scheme>micro_mg_tend3_0</scheme>           <!-- Actual MG2 cloud micro-physics parameterization scheme -->
-            <scheme>mg_calc_outputs</scheme>            <!-- Calculate additional MG2 output variables and diagnostics -->
-            <scheme>calc_atm_density</scheme>           <!-- Calculate atmospheric density -->
-            <!-- This section of code could likely be grouped together as one scheme (at least partially)-->
-            <!-- +++++++++++++++++++++++++ -->
-            <scheme>size_dist_param_liq</scheme>        <!-- Calculate size distribution of cloud droplets -->
-            <scheme>micro_eff_radius_liq</scheme>       <!-- Calculate the effective radius of a given cloud droplet distribution -->
-            <scheme>size_dist_param_liq_const</scheme>  <!-- Calculate size distribution of cloud droplets assuming a constant ncic -->
-            <scheme>calc_ncic_grid</scheme>             <!-- Calculate ncic (number of cloud droplets?) in grid cell -->
-            <scheme>size_dist_param_liq</scheme>        <!-- Calculate size distribution of cloud droplets -->
-            <scheme>micro_eff_radius_liq</scheme>       <!-- Calculate the effective radius of a given cloud droplet distribution -->
-            <scheme>micro_eff_radius_rain</scheme>      <!-- Calculate the effective radius of rain (assumed size distribution?) -->
-            <scheme>micro_eff_radius_snow</scheme>      <!-- Calculate the effective radius of snow (assumed size distribution?) -->
-            <scheme>micro_eff_radius_graupel</scheme>   <!-- Calculate the effective radius of graupel (only if MG microphysics version 3 or later is used) -->
-            <scheme>calc_niic_grid</scheme>             <!-- Calculate niic (number of cloud ice crystals?) in grid cell -->
-            <scheme>size_dist_param_basic</scheme>      <!-- Calculate the size distribution of ice crystals -->
-            <scheme>micro_eff_radius_ice</scheme>       <!-- Calculate the effective radius of a given cloud ice distribution -->
-            <!-- +++++++++++++++++++++++++ -->
-            <scheme>calc_micro_column_vars</scheme>     <!-- Calculate Liquid Water Path (LWP) and net column condensation -->
-            <scheme>calc_prec_efficiency</scheme>       <!-- Calculate precipitation efficiency -->
-            <scheme>micro_diag_output</scheme>          <!-- Calculate microphysics diagnostic variables, and output them to history file -->
-            <!-- **************************** -->
-            <scheme>massless_droplet_destroyer</scheme> <!-- Remove massless droplets, doesn't influences only grid-scale tendencies -->
-          </process_split>
-          <scheme>check_energy_chng</scheme>          <!-- Global integral checker required for certain diagnostic outputs -->
-        </partition>
-        <scheme>diag_clip_tend_writeout</scheme>      <!-- Output water mass clipping diagnostics to history file -->
-        <scheme>check_energy_chng</scheme>            <!-- Global integral checker required for certain diagnostic outputs -->
-        <scheme>calc_prec_sum</scheme>                <!-- Sum surface precipitation amounts over each subcycle loop -->
-      </subcycle>
-      <scheme>calc_prec_avg</scheme>                  <!-- Divide surface precipitation sum by number of "macmic" subcycle iterations -->
-      <scheme>modal_aero_calcsize_diag</scheme>       <!-- Only if climatological aerosols are used instead of prognostic aerosols -->
-      <!-- Modal Aerosol water uptake -->             <!-- Only if climatological aerosols are used instead of prognostic aerosols -->
-      <!-- **************************** -->
-      <!-- The commented-out schemes below are all included in the "modal_aero_wateruptake_dr" scheme -->
-      <!-- ++++++++++++++++++++++++++++++
-      <scheme>tropopause_find</scheme>                Calculate tropopause height
-      <scheme>calc_h2so4_equilib_mixrat</scheme>      Calculate Sulfuric acid phase equilibrium, if modal_strat_sulfate is True
-      <scheme>h2so4_equilib_diag</scheme>             Output sulfer aerosol diagnostics to history file
-      <scheme>qsat_water</scheme>                     Calculate saturation vapor pressure with respect to liquid water
-      <scheme>relhum_calc</scheme>                    Calculate the relative humidity
-      <scheme>calc_atm_density</scheme>               Calculate atmospheric density
-      <scheme>modal_aero_wateruptake_sub</scheme>     Actual aerosol moisture up-take parameterization
-      <scheme>modal_aero_wetdens_calc</scheme>        Calculate the wet density of aerosols
-      <scheme>modal_aero_wateruptake_diag</scheme>    Calculate aerosol water uptake diagnostic variables, and output them to history file
-      ++++++++++++++++++++++++++++++++++ -->
-      <scheme>modal_aero_wateruptake_dr</scheme>
-      <!-- **************************** -->
-      <!-- Aerosol wet deposition -->
-      <!-- **************************** -->
-      <scheme>modal_aero_calcsize_sub</scheme>        <!-- Calculate  aerosol size distribution parameters -->
-      <scheme>modal_aero_wateruptake_dr</scheme>      <!-- Repeat "Modal Aerosol water uptake" schemes shown above -->
-      <scheme>wetdep_prec_calc</scheme>               <!-- Calculate precipitation amount that impacts wet deposition -->
-      <scheme>coarse_fact_calc</scheme>               <!-- Calculate "f_act_conv" for coarse mode aerosols (note here the comments don't match the variables) -->
-      <subcycle loop="aerosol_dist_modes">            <!-- Loop over aerosol size distribution modes, CAM6 var = 'ntot_amode' -->
-        <subcycle loop="aerosol_phase">               <!-- Loop over aerosol phase types (interstitial vs cloud-borne), CAM6 var = 'lphase' -->
-          <scheme>aero_fact_calc</scheme>             <!-- Calculate aerosol activation fraction (f_act_conv) depending on aerosol type -->
-          <scheme>wetdepa_v2</scheme>                 <!-- Actual aerosol wet deposition parameterization -->
-          <scheme>wetdep_diag_output</scheme>         <!-- Calculate numerous different CLUBB diagnostic variables, and output them to history file -->
-        </subcycle>
-      </subcycle>
-      <scheme>ma_convproc_intr</scheme>               <!-- Convective in-cloud aerosol removal parameterization, only used if convproc_do_aer is True -->
-      <scheme>set_srf_wetdep</scheme>                 <!-- Add aerosol deposition rates to host model surface fluxes -->
-      <!-- **************************** -->
-      <scheme>convtran</scheme>                       <!-- Actual ZM convective transport scheme, for constituents in cnst_is_convtran2 -->
-      <scheme>check_tracers_chng</scheme>             <!-- Global tracer mass checker that kills model if error is large enough. -->
-      <scheme>diag_phys_writeout</scheme>             <!-- Calculate generic atmospheric physics diagnostics and output them to history file -->
-      <scheme>diag_conv</scheme>                      <!-- Calculate generic precipitation and convection diagnostics and output them to history file -->
-      <scheme>cloud_diagnostics_calc</scheme>         <!-- Calculate generic cloud diagnostics and output them to history file -->
-      <!-- RRTMG radiation -->
-      <!-- **************************** -->
-      <scheme>calc_solar_zenith_ang</scheme>          <!-- Calculate the solar zenith angle for the given time step -->
-      <scheme>group_day_night</scheme>                <!-- Determine which columns are in the day-side, vs night-side -->
-      <scheme>tropopause_find</scheme>                <!-- Calculate tropopause height -->
-      <!-- The commented-out schemes below are all included in the "rrtmg_state_prepare" scheme -->
-      <!-- ++++++++++++++++++++++++++++++
-      <scheme>rrtmg_state_create</scheme>             Create RRTMG state object
-      <scheme>calc_cldfprime</scheme>                 Calculate "prime" cloud fraction
-      <scheme>calc_ice_optics_sw</scheme>             Calculate cloud ice shortwave optics (case structure, may need to be broken up)
-      <scheme>calc_liq_optics_sw</scheme>             Calculate cloud liquid shortwave optics (case structure, may need to be broken up)
-      <scheme>calc_snow_optics_sw</scheme>            Calculate snow shortwave optics
-      <scheme>calc_snow_optics_sw</scheme>            Calculate graupel shortwave optics
-      <scheme>rrtmg_state_tau_add</scheme>            Calculate and add various optical depths to the RRTMG state structure
-      <scheme>radiation_output_cld</scheme>           Output optical depth diagnostics to history file
-      <scheme>calc_ice_optics_lw</scheme>             Calculate cloud ice longwave optics (case structure, may need to be broken up)
-      <scheme>calc_liq_optics_lw</scheme>             Calculate cloud liquid longwave optics (case structure, may need to be broken up)
-      <scheme>calc_snow_optics_lw</scheme>            Calculate snow longwave optics
-      <scheme>calc_snow_optics_lw</scheme>            Calculate graupel longwave optics
-      <scheme>get_variability</scheme>                Calculate solar spectral irradiance scaling factors
-      ++++++++++++++++++++++++++++++++++ -->
-      <scheme>rrtmg_state_prepare</scheme>            <!-- Prepare inputs for the "RRTMG" radiation scheme -->
-      <subcycle loop="rad_active_cnst">               <!-- Loop over radiatively active constituents, CAM6 var = 'n_diag'  -->
-        <scheme>rrtmg_state_update</scheme>           <!-- Add shortwave constiuent concentrations to RRTMG state structure -->
-        <scheme>aer_rad_props_sw</scheme>             <!-- Gather/calculate aerosol shortwave optical properties (potentially provided by registry/framework?) -->
-        <scheme>rad_rrtmg_sw</scheme>                 <!-- Actual RRTMG shortwave radiation parameterization -->
-        <scheme>rad_sw_diag_output</scheme>           <!-- Calculate shortwave diagnostic variables, and output them to history file -->
-      </subcycle>
-      <scheme>rad_cnst_out</scheme>                   <!-- Calculate radiatively active constituent diagnostic variables, and output them to history file -->
-      <subcycle loop="rad_active_cnst">               <!-- Loop over radiatively active constituents, CAM6 var = 'n_diag'  -->
-        <scheme>rrtmg_state_update</scheme>           <!-- Add longwave constiuent concentrations to RRTMG state structure -->
-        <scheme>aer_rad_props_lw</scheme>             <!-- Gather/calculate aerosol longwave optical properties (potentially provided by registry/framework?) -->
-        <scheme>rad_rrtmg_lw</scheme>                 <!-- Actual RRTMG longwave radiation parameterization -->
-        <scheme>rad_lw_diag_output</scheme>           <!-- Calculate longwave diagnostic variables, and output them to history file -->
-      </subcycle>
-      <scheme>cosp_input_prepare</scheme>             <!-- Prepare inputs required for COSP.  Only matters if COSP is active -->
-      <scheme>cosp_simulator</scheme>                 <!-- Actual COSP simulator paramaterization.  Only matters if COSP is active -->
-      <scheme>rad_qdp_q_calc</scheme>                 <!-- Convert Q*dp to Q (potentially managed by registry/framework?) -->
-      <scheme>rad_data_write</scheme>                 <!-- Calculate additional radiation diagnostics, and output them to history file -->
-      <scheme>radheat_tend</scheme>                   <!-- Calculate net radiative heating tendencies -->
-      <scheme>radheat_diag_output</scheme>            <!-- Calculate radiative heating diagnostic variables, and output them to history file -->
-      <scheme>rad_q_qdp_calc</scheme>                 <!-- Convert Q to Q*dp (potentially managed by registry/framework?) -->
-      <scheme>set_srf_net_sw</scheme>                 <!-- Add net shortwave surface flux to host model surface fluxes -->
-      <!-- **************************** -->
-      <scheme>check_energy_chng</scheme>              <!-- Global integral checker required for certain diagnostic outputs -->
-      <scheme>tropopause_output</scheme>              <!-- Calculate tropopause diagnostic variables, and output them to history file -->
-      <scheme>cam_export</scheme>                     <!-- Add various physics state variables to host model surface fluxes -->
-      <scheme>diag_export</scheme>                    <!-- Output various host model surface fluxes to history file -->
-    </time_split>
-  </group>
-  <group name="physics_ac">
-    <time_split>
-      <!--cam6:  diffusion=CLUBB, chem=trop_mam4 -->
-      <scheme>flux_avg_run</scheme>                   <!-- Smooth/average surface fluxes, but only if phys_do_flux_avg is True -->
-      <scheme>physics_state_check</scheme>            <!-- Only if state_debug_checks is True. This scheme only looks for infs/nans, and kills the model if found -->
-      <scheme>calc_flx_net</scheme>                   <!-- Accumulate net surface fluxes, which is necessary for spectral dycores -->
-      <!-- Chemistry emissisons -->
-      <!-- **************************** -->
-      <scheme>aero_model_emissions</scheme>           <!-- Calculate aerosol emissions, and add them to the host model's surface inputs -->
-      <scheme>calc_MEGAN_fluxes</scheme>              <!-- Calculate MEGAN fluxes, and add them to the host model's surface inputs and history files -->
-      <scheme>set_srf_emissions</scheme>              <!-- Calculate surface chemistry emissions -->
-      <scheme>srf_emis_diag_output</scheme>           <!-- Add surface chemistry emissions to host model's surface inputs and history files -->
-      <scheme>fire_emissions_srf</scheme>             <!-- Calculate fire emissions, and add to host model's surface inputs -->
-      <!-- **************************** -->
-      <!-- Negative moisture/tracer check -->
-      <!-- **************************** -->
-      <scheme>qneg_surface</scheme>                   <!-- Modify surface moisture and heat fluxes to prevent negative moisture values, and output diagnostics - qneg4 in CAM6 -->
-      <!-- **************************** -->
-      <scheme>aoa_tracers_timestep_tend</scheme>      <!-- Calculate age of air tracer tendencies.  Also output tendencies to history file -->
-      <scheme>check_tracers_chng</scheme>             <!-- Global tracer mass checker that kills model if error is large enough. -->
-      <scheme>co2_cycle_set_ptend</scheme>            <!-- Calculate CO2 tendencies.  Only matters if co2_flag or co2_readFlux_aircraft is True -->
-      <!-- Atmospheric Chemistry (MOZART), only matters if chem_is_active is True -->
-      <!-- **************************** -->
-      <scheme>short_lived_species_writeic</scheme>    <!-- Write initial values for short-lived chemical species to history file, if requested by user -->
-      <scheme>get_curr_calday</scheme>                <!-- Determine day of year -->
-      <scheme>chem_tropopause_find</scheme>           <!-- Determine tropopause height (specific tropopause calculation depends on chem_use_chemtrop) -->
-      <scheme>neu_wetdep_tend</scheme>                <!-- Calculate wet deposition rates via the "Neu" scheme -->
-      <scheme>chem_calc_cldw</scheme>                 <!-- Calculate total cloud water mass and droplet number -->
-      <scheme>gas_phase_chemdr</scheme>               <!-- Calculate gas-phase chemical reaction tendencies -->
-      <scheme>nitro_srf_flx</scheme>                  <!-- Add nitrogen surface fluxes to host model surface fluxes (managed by registry/framework?) -->
-      <scheme>chem_diag_output</scheme>               <!-- Calculate chemistry diagnostic variables, and output them to history file -->
-      <!-- **************************** -->
-      <scheme>check_energy_chng</scheme>              <!-- Global integral checker required for certain diagnostic outputs -->
-      <scheme>check_tracers_chng</scheme>             <!-- Global tracer mass checker that kills model if error is large enough. -->
-      <!-- Vertical diffusion -->
-      <!-- **************************** -->
-      <scheme>set_dry_to_wet</scheme>                 <!-- Convert mixing ratios from dry air to air + water vapor -->
-      <scheme>tint_calc</scheme>                      <!-- Interpolate air temperature to layer interface levels -->
-      <scheme>ubc_get_vals</scheme>                   <!-- Calcuate upper-level boundary conditions (depends on chemistry and model-top choice) -->
-      <scheme>set_top_tint_val</scheme>               <!-- Calculate air temperature at top interface level -->
-      <scheme>rhoi_calc</scheme>                      <!-- Interpolate air density and dry air density to layer interface levels -->
-      <scheme>compute_tms</scheme>                    <!-- Calculate Turbulent Mountain Stress (TMS) tendency -->
-      <scheme>tms_diag_output</scheme>                <!-- Calculate TMS diangostic variables, and output them to history file -->
-      <scheme>compute_blj</scheme>                    <!-- Calculate Sub-Grid Orgraphic (SGO) drag via Beljaars parameterization -->
-      <scheme>blj_diag_output</scheme>                <!-- Calculate SGO diagnostic variables, and output them to history file -->
-      <scheme>theta_calc</scheme>                     <!-- Calculate potential temperature (managed by registry/framework?) -->
-      <scheme>virtem</scheme>                         <!-- Calculate virtual temperature (managed by registry/framework?) -->
-      <scheme>calc_ustar</scheme>                     <!-- Calculate friction velocity -->
-      <scheme>calc_obklen</scheme>                    <!-- Calculate Obhukov length -->
-      <scheme>pbl_diag_calc</scheme>                  <!-- Calculate PBL diagnositc variables, if do_pbl_diags is False -->
-      <scheme>dse_top_calc</scheme>                   <!-- Calculate top-level dry static energy, but only if do_molec_diff is True and WACCM-X is False -->
-      <scheme>compute_molec_diff_wet</scheme>         <!-- Calculate molecular diffusion of wet atmospheric constituents, if do_molec_diff is True -->
-      <scheme>compute_vdiff_wet</scheme>              <!-- Calculate the vertical (eddy) diffusion of wet atmospheric constituents -->
-      <scheme>compute_molec_diff_dry</scheme>         <!-- Calculate molecular diffusion of dry atmospheric constituents, if do_molec_diff is True -->
-      <scheme>compute_vdiff_dry</scheme>              <!-- Calculate the vertical (eddy) diffusion of dry atmospheric constituents -->
-      <scheme>aero_srf_flx_add</scheme>               <!-- Add surface aerosol fluxes to bottom model layer, but only if prog_modal_aero is True -->
-      <scheme>diff_flux_diag</scheme>                 <!-- Calculate diffusion variable diagnostics, if do_pbl_diags is False (is that correct?) -->
-      <scheme>diff_flux_tend_dry</scheme>             <!-- Calculate vertical diffusion tendencies for "dry" quantities, and send them back to host model -->
-      <scheme>set_wet_to_dry</scheme>                 <!-- Convert mixing ratios from air + water vapor to dry air -->
-      <scheme>pbl_diag_calc</scheme>                  <!-- Calculate PBL diagnositc variables, if do_pbl_diags is False -->
-      <scheme>diff_mass_check</scheme>                <!-- Check mass conservation after vertical diffusion, and send error messages if check fails -->
-      <scheme>pbl_output</scheme>                     <!-- Write PBL diagnostic variables to history files -->
-      <!-- **************************** -->
-      <scheme>rayleigh_friction_tend</scheme>         <!-- Calculate Rayleigh friction tendency -->
-      <scheme>check_energy_chng</scheme>              <!-- Global integral checker required for certain diagnostic outputs -->
-      <scheme>check_tracers_chng</scheme>             <!-- Global tracer mass checker that kills model if error is large enough. -->
-      <!-- Aerosol dry deposition -->
-      <!-- **************************** -->
-      <scheme>calcram</scheme>                        <!-- Calculate aerodynamic resistance and friction velocity -->
-      <scheme>calcram_diag_output</scheme>            <!-- Write aerodynamic resistance and friction velocity to history file -->
-      <scheme>calc_atm_density</scheme>               <!-- Calculate atmospheric density -->
-      <subcycle loop="dep_velocity_idx_34">           <!-- loop over deposition velocity (vlc) array index values 3 and 4 -->
-        <scheme>modal_aero_depvel_part</scheme>       <!-- Calculate dry deposition velocity for cloud droplets -->
-      </subcycle>
-      <subcycle loop="aerosol_dist_modes">            <!-- Loop over aerosol size distribution modes, CAM6 var = 'ntot_amode' -->
-        <subcycle loop="aerosol_phase">               <!-- Loop over aerosol phase types (interstitial vs cloud-borne), CAM6 var = 'lphase' -->
-          <scheme>calc_aero_vars</scheme>             <!-- Calculate aerosol mean wet radius and other properties -->
-          <subcycle loop="dep_velocity_idx_12" >      <!-- loop over deposition velocity (vlc) array index values 1 and 2 -->
-            <scheme>modal_aero_depvel_part</scheme>   <!-- Calculate dry deposition velocity for interstial aerosols -->
-          </subcycle>
-          <scheme>aero_tracer_indx</scheme>           <!-- Determine aerosol tracer index (managed by registry/framework?) -->
-          <scheme>depvel_m_to_pa</scheme>             <!-- Convert the deposition velocity from m/s to Pa/s, and write to history file (maanged by registry/framework?) -->
-          <scheme>dust_sediment_tend</scheme>         <!-- Calculate host model tendencies and surface fluxes from dry deposition -->
-          <scheme>drydep_diag_output</scheme>         <!-- Calculate dry deposition diagnostic variables, and output them to history file -->
-        </subcycle>
-      </subcycle>
-      <scheme>set_srf_drydep</scheme>                 <!-- Add dry deposition surface fluxes to host model, if aerodep_flx_prescribed is False -->
-      <!-- **************************** -->
-      <scheme>charge_balance</scheme>                 <!-- Enforce charge nuetrality, if chemistry simulates electrons -->
-      <!-- Gravit wave tendencies -->
-      <!-- **************************** -->
-      <!-- This interface depends heavily
-           on namelist inputs, with entire
-           blocks of code being used (or not)
-           depending on said namelist choices.
-           However, the general structure of these
-           code blocks is more or less the same,
-           so a "generic" scheme set is included
-           here, which will need to be expanded
-           out once "if-statement" like dependencies
-           can be added to suite definition files
-           like this one -->
-      <scheme>set_dry_to_wet</scheme>                  <!-- Convert mixing ratios from dry air to air + water vapor -->
-      <scheme>gw_prof</scheme>                         <!-- Calculate layer interface densities and Brunt-Viasala frequencies (combine with other schemes?) -->
-      <!-- Generic gravity wave scheme order  -->
-      <!-- +++++++++++++++++++++++++ -->
-      <scheme>effgw_calc</scheme>                      <!-- Calculate the efficiency of gravity wave momentum transfer -->
-      <scheme>gw_src_calc</scheme>                     <!-- Determine gravity wave sources -->
-      <scheme>gw_drag_prof</scheme>                    <!-- Solve for the drag profile with the gravity wave spectrum -->
-      <scheme>calc_taucd</scheme>                      <!-- Project stress into directional components -->
-      <scheme>egwdffi_tot_calc</scheme>                <!-- add diffusion coefficients (manageable by registry/framework?) -->
-      <scheme>momentum_flux_calc</scheme>              <!-- Calculate momentum fluxes/wind tendencies -->
-      <scheme>energy_change</scheme>                   <!-- Calculate atmospheric energy change -->
-      <scheme>energy_fixer</scheme>                    <!-- Ensure energy conservation -->
-      <scheme>gw_cam_update</scheme>                   <!-- Placeholder for CAM gravity wave updates and diagnostic output calculations -->
-      <!-- +++++++++++++++++++++++++ -->
-      <!-- **************************** -->
-      <scheme>check_energy_chng</scheme>               <!-- Global integral checker required for certain diagnostic outputs -->
-      <scheme>lunar_tides_tend</scheme>                <!-- Calculate horizontal wind tendencies due to M2 lunar tide, but only if apply_lunar_tides is True -->
-      <scheme>check_energy_chng</scheme>               <!-- Global integral checker required for certain diagnostic outputs -->
-      <scheme>calc_te_and_aam_budgets</scheme>         <!-- Managed by host model? Diagnostic output suffix = 'pAP' -->
-      <scheme>nudging_timestep_tend</scheme>           <!-- Apply nudging to horizontal winds, heat, and water vapor, and output diagnostics, but only if nudging is turned on. -->
-      <scheme>check_energy_chng</scheme>               <!-- Global integral checker required for certain diagnostic outputs -->
-      <scheme>set_dry_to_wet</scheme>                  <!-- Only matters if dycore is FV (LR) or SE -->
-      <!-- Dry air mass adjuster -->                   <!-- Only matters if dycore is FV (LR), otherwise this calculation is purely diagnostic -->
-      <!-- **************************** -->
-      <scheme>qfac_state_adjust</scheme>               <!-- Adjust state variables based off the change in water vapor -->
-      <scheme>geopotential_dse</scheme>                <!-- Calculate the temperatue and geopotential height using pressure and dry static energy -->
-      <!-- **************************** -->
-      <scheme>calc_te_and_aam_budgets</scheme>         <!-- Managed by host model? Diagnostic output suffix = 'pAM' -->
-      <scheme>dtcore_reset</scheme>                    <!-- Reset "dtcore" variable to equal temperature -->
-      <scheme>diag_phys_tend_writeout</scheme>         <!-- Calculate physics diagnostic variables, and output them to history file -->
-      <scheme>clybry_fam_set</scheme>                  <!-- Set ClOy and BrOy mass mixig ratios. Only matters if chemistry package with Cly and Bry is used -->
-    </time_split>
-  </group>
-</suite>
diff --git a/suites/suite_cam6_silhs.xml b/suites/suite_cam6_silhs.xml
deleted file mode 100644
index 9bd45239..00000000
--- a/suites/suite_cam6_silhs.xml
+++ /dev/null
@@ -1,379 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<suite name="cam6_silhs" version="1.0">
-  <group name="physics_bc">
-    <!--cam6:  deep=ZM, shallow=CLUBB, macrop=CLUBB, microp=MG2, radiation=RRTMG, chem=trop_mam4 -->
-    <time_split>
-      <scheme>physics_state_check</scheme> <!-- Only if state_debug_checks is True. This scheme only looks for infs/nans, and kills the model if found. -->
-      <scheme>clybry_fam_adj</scheme>      <!-- Only matters if chemistry package with Cly and Bry is used -->
-      <!-- Negative moisture/tracer check -->
-      <!-- **************************** -->
-      <scheme>qneg3</scheme>               <!-- This scheme modifies the state directly.  Combine with state check? -->
-      <!-- **************************** -->
-      <scheme>physics_state_check</scheme>      <!-- Only if state_debug_checks is True. This scheme only looks for infs/nans, and kills the model if found. -->
-      <scheme>diag_state_b4_phys_write</scheme> <!-- Diagnostics -->
-      <!-- energy and momentum fixer -->
-      <!-- **************************** -->
-      <scheme>calc_te_and_aam_budgets</scheme>           <!-- Managed by host model? Diagnostic output suffix = 'pBF' -->
-      <scheme>check_energy_fix</scheme>                  <!-- Only matters if dycore is FV (called "LR" in physics) or SE-->
-      <scheme>check_energy_cam_update_pre_chng</scheme>  <!-- Placeholder for CAM updates and diagnostic output calculations before "chng" call. -->
-      <scheme>check_energy_chng</scheme>                 <!-- Global integral checker required for certain diagnostic outputs -->
-      <scheme>check_energy_cam_update_post_chng</scheme> <!-- Placeholder for CAM updates and diagnostic output calculations after "chng" call. -->
-      <scheme>calc_te_and_aam_budgets</scheme>           <!-- Managed by host model? Diagnostic output suffix = 'pBP' -->
-      <!-- **************************** -->
-      <scheme>diag_conv_tend_ini</scheme>      <!-- Initalizes convective-scheme diagnostic outputs -->
-      <scheme>calc_dtcore</scheme>             <!-- diagnostic calculation.  Could likely be included in energy fixer scheme. -->
-      <!-- Dry adiabatic adjustment  -->
-      <!-- **************************** -->
-      <!-- Technically only needs temperature and humidity as inputs -->
-      <scheme>dadadj_calc_update</scheme>      <!-- Actual dry adiabatic adjustment scheme, with placeholders for CAM accumulation calculations -->
-      <!-- **************************** -->
-      <!-- Zhang-Macfarlane deep convection scheme -->
-      <!-- **************************** -->
-      <scheme>zm_convr</scheme>                 <!-- Actual deep convection routine -->
-      <scheme>zm_convr_cam_update</scheme>      <!-- Placeholder for CAM updates and diagnostic output calculations -->
-      <scheme>zm_conv_evap</scheme>             <!-- Actual ZM rain evaporation scheme -->
-      <scheme>zm_conv_evap_cam_update</scheme>  <!-- Placeholder for CAM updates and diagnostic output calculations -->
-      <scheme>momtran</scheme>                  <!-- Actual ZM momentum transport scheme -->
-      <scheme>momtran_cam_update</scheme>       <!-- Placeholder for CAM updates and diagnostic output calculations -->
-      <scheme>convtran</scheme>                 <!-- Actual ZM convective transport scheme, for constituents in cnst_is_convtran1 -->
-      <scheme>convtran_cam_update</scheme>      <!-- Placeholder for CAM updates and diagnostic output calculations -->
-      <!-- **************************** -->
-      <scheme>check_energy_chng</scheme>        <!-- Global integral checker required for certain diagnostic outputs -->
-      <scheme>check_tracers_chng</scheme>       <!-- Global tracer mass checker that kills model if error is large enough. -->
-      <scheme>sslt_rebin_adv</scheme>           <!-- Only matters if certain sea salt species are present in chemistry package-->
-      <subcycle loop="cloud_macmic_num_steps">  <!-- Cloud macrophysics-microphysics loop -->
-        <!-- CLUBB turbulence, convection, and macrophysics -->
-        <!-- **************************** -->
-        <!-- The commented-out schemes below are all included in the "clubb_input_prepare" scheme -->
-        <!-- ++++++++++++++++++++++++++++++
-        <scheme>set_dry_to_wet</scheme>                  Convert mixing ratios from dry air to air + water vapor
-        <scheme>grid_size</scheme>                       Calculate grid-cell size
-        <scheme>clubb_dtime_calc</scheme>                Calculate CLUBB time-step as function of host model time-step
-        <scheme>exner_clubb</scheme>                     Calculate Exner function using CLUBB definition
-        <scheme>clubb_thermo_vars</scheme>               Calculate various thermodynamic variables needed for CLUBB (Theta-V, Theta-L, etc.)
-        <scheme>tropopause_findChemTrop</scheme>         Calculate tropopause height
-        <scheme>clubb_vertical_grid_create_inv</scheme>  Create CLUBB vertical grids, which is in the opposite order of CAM
-        <scheme>clubb_thermo_vars_grid</scheme>          Calculate additional thermodynamic variables that are on the CLUBB vertical grid
-        <scheme>clubb_calc_ustar</scheme>                Only matters for single-column mode
-        <scheme>setup_grid_heights_api</scheme>          Re-calculate CLUBB grid heights
-        <scheme>setup_parameters_api</scheme>            Re-calculate grid-dependent CLUBB parameters
-        <scheme>zt2zm_convert</scheme>                   Transition variables on thermodynamic levels to momentum levels
-        <scheme>clubb_calc_input_vars</scheme>           Calculate additional CLUBB input variables
-        +++++++++++++++++++++++++++++++ -->
-        <scheme>clubb_input_prepare</scheme>             <!-- Prepare inputs for the "CLUBB" turbulence/convection/macrophysics scheme -->
-        <scheme>clubb_var_vert_inv</scheme>              <!-- Change order of vertical levels for CLUBB input variables -->
-        <subcycle loop="clubb_time_substep">             <!-- CLUBB sub-step loop (number of iterations should be calculated in the "clubb_dtime_calc" scheme), CAM6 var = 'clubb_nadv' -->
-          <scheme>stats_begin_timestep_api</scheme>      <!-- Only matters if "l_stats" is True -->
-          <scheme>advance_clubb_core_api</scheme>        <!-- Actual CLUBB parameterization scheme -->
-          <scheme>update_xp2_mc_intr</scheme>            <!-- Only matters if "do_rainturb" is True -->
-          <scheme>calculate_thlp2_rad_intr</scheme>      <!-- Only matters if "do_cldcool" is True -->
-          <scheme>stats_end_timestep_clubb</scheme>      <!-- Only matters if "l_stats" is True -->
-        </subcycle>
-        <!-- The commented-out schemes below are all included in the "clubb_output_prepare" scheme -->
-        <!-- ++++++++++++++++++++++++++++++
-        <scheme>zm2zt_convert</scheme>                   Transition variables on momentum levels to thermodynamic levels
-        <scheme>clubb_calc_output_vars</scheme>          Calculate additional CLUBB output variables
-        +++++++++++++++++++++++++++++++ -->
-        <scheme>clubb_output_prepare</scheme>            <!-- Prepare CLUBB outputs for use in the host model -->
-        <scheme>clubb_var_vert_rev</scheme>              <!-- Change order of vertical levels for CLUBB output variables back to host model ordering -->
-        <scheme>clubb_upper_diss</scheme>                <!-- CLUBB energy and total water mass fixer -->
-        <scheme>clubb_cam_update</scheme>                <!-- Placeholder for CAM updates and diagnostic output calculations -->
-        <scheme>liquid_macro_tend</scheme>               <!-- Only matters if "clubb_do_liqsupersat" is True-->
-        <scheme>liquid_macro_CAM_update</scheme>         <!-- Placeholder for CAM updates and diagnostic output calculations -->
-        <scheme>conv_cond_detrain_calc</scheme>          <!-- Calculate the host model cloud condensate and energy tendencies produced by convective detrainment -->
-        <scheme>conv_cond_detrain_cam_update</scheme>    <!-- Placeholder for CAM updates and diagnostic output calculations -->
-        <scheme>set_wet_to_dry</scheme>                  <!-- Convert mixing ratios from air + water vapor to dry air -->
-        <scheme>clubb_diag_output</scheme>               <!-- Calculate numerous different CLUBB diagnostic variables, and output them to history file -->
-        <!-- **************************** -->
-        <scheme>check_energy_chng</scheme>            <!-- Global integral checker required for certain diagnostic outputs -->
-        <partition gen="subcol_generator_name" avg="subcol_averager_name">
-          <process_split>
-            <!-- MG aerosol microphysics -->
-            <!-- **************************** -->
-            <scheme>hetfrz_classnuc_cam_save_cbaero</scheme> <!-- Save copy of cloud-borne aerosols (only needed if use_hetfrz_classnuc is True) -->
-            <scheme>aero_get_num_mmr</scheme>                <!-- Collect particle number and mass mixing ratios for each aerosol species, unless already managed by framework -->
-            <scheme>aero_calc_wsub</scheme>                  <!-- Calculate subgrid-scale vertical velocity -->
-            <scheme>nucleate_ice_cam_calc</scheme>           <!-- Calculate ice nucleation -->
-            <scheme>lcldm_min_check</scheme>                 <!-- Check that low cloud fraction is above threshold -->
-            <scheme>aero_cam_drop_activate</scheme>          <!-- Calculate droplet activation -->
-            <scheme>aero_cam_contact_freezing</scheme>       <!-- Calculate contact freezing -->
-            <scheme>ndrop_bam_ccn</scheme>                   <!-- Calculate bulk CCN concentration (only needed if clim_modal_aero is False) -->
-            <scheme>hetfrz_classnuc_cam_calc</scheme>        <!-- Calculate heterogeneous freezing (only needed if use_hetfrz_classnuc is True) -->
-            <scheme>microp_aero_diag_output</scheme>         <!-- Output diagnostics from MG aerosol microphysics. -->
-            <!-- **************************** -->
-            <!-- MG cloud microphysics -->
-            <!-- **************************** -->
-            <scheme>micro_mg_get_cols3_0</scheme>       <!-- Determine atmospheric columns used by the MG2 microphysics schemes -->
-            <scheme>calc_incloud_LWP</scheme>           <!-- Calculate in-cloud Liquid Water Path (LWP) before MG2 is run -->
-            <scheme>micro_calc_tropopause</scheme>      <!-- Calculate the cold-point tropopause for use by the microphysics -->
-            <scheme>micro_mg_tend3_0</scheme>           <!-- Actual MG2 cloud micro-physics parameterization scheme -->
-            <scheme>mg_calc_outputs</scheme>            <!-- Calculate additional MG2 output variables and diagnostics -->
-            <scheme>calc_atm_density</scheme>           <!-- Calculate atmospheric density -->
-            <!-- This section of code could likely be grouped together as one scheme (at least partially)-->
-            <!-- +++++++++++++++++++++++++ -->
-            <scheme>size_dist_param_liq</scheme>        <!-- Calculate size distribution of cloud droplets -->
-            <scheme>micro_eff_radius_liq</scheme>       <!-- Calculate the effective radius of a given cloud droplet distribution -->
-            <scheme>size_dist_param_liq_const</scheme>  <!-- Calculate size distribution of cloud droplets assuming a constant ncic -->
-            <scheme>calc_ncic_grid</scheme>             <!-- Calculate ncic (number of cloud droplets?) in grid cell -->
-            <scheme>size_dist_param_liq</scheme>        <!-- Calculate size distribution of cloud droplets -->
-            <scheme>micro_eff_radius_liq</scheme>       <!-- Calculate the effective radius of a given cloud droplet distribution -->
-            <scheme>micro_eff_radius_rain</scheme>      <!-- Calculate the effective radius of rain (assumed size distribution?) -->
-            <scheme>micro_eff_radius_snow</scheme>      <!-- Calculate the effective radius of snow (assumed size distribution?) -->
-            <scheme>micro_eff_radius_graupel</scheme>   <!-- Calculate the effective radius of graupel (only if MG microphysics version 3 or later is used) -->
-            <scheme>calc_niic_grid</scheme>             <!-- Calculate niic (number of cloud ice crystals?) in grid cell -->
-            <scheme>size_dist_param_basic</scheme>      <!-- Calculate the size distribution of ice crystals -->
-            <scheme>micro_eff_radius_ice</scheme>       <!-- Calculate the effective radius of a given cloud ice distribution -->
-            <!-- +++++++++++++++++++++++++ -->
-            <scheme>calc_micro_column_vars</scheme>     <!-- Calculate Liquid Water Path (LWP) and net column condensation -->
-            <scheme>calc_prec_efficiency</scheme>       <!-- Calculate precipitation efficiency -->
-            <scheme>micro_diag_output</scheme>          <!-- Calculate microphysics diagnostic variables, and output them to history file -->
-            <!-- **************************** -->
-            <!-- SILHS subcolumn covariance -->
-            <!-- **************************** -->
-            <scheme>calc_total_moisture</scheme>               <!-- Combine vapor and condensate (manageable by registry/framework)? -->
-            <scheme>calc_dry_static_density</scheme>           <!-- Calculate the dry static density -->
-            <scheme>convert_omega_to_w</scheme>                <!-- Convert pressure velocity to vertical velocity, manageable by registry/framework? -->
-            <scheme>convert_dse_to_temp</scheme>               <!-- Convert dry static energy (DSE) to air temperature, manageable by registry/framework? -->
-            <scheme>exner_silhs</scheme>                       <!-- Calculate the Exner function according to SILHS (should be the same as CLUBB, but possible issues) -->
-            <scheme>thl_calc</scheme>                          <!-- Calculate liquid water potential temperature (theta-l) -->
-            <scheme>silhs_var_vert_inv</scheme>                <!-- Change order of vertical levels for SILHS input variables, and add ghost point (should be manageable via the registry/meta file) -->
-            <scheme>silhs_get_subcol_wgts</scheme>             <!-- Collect subcolumn weights for SILHS -->
-            <scheme>lh_microphys_var_covar_driver_api</scheme> <!-- Actual SILHS sub-column parameterization -->
-            <scheme>zero_upper_level</scheme>                  <!-- Set covariances above SILHS max altitude to zero -->
-            <!-- **************************** -->
-            <scheme>subcol_SILHS_fill_holes_conserv_calc</scheme> <!-- Prevent holes (values less than qmin) using mass-conserving adjustments -->
-            <scheme>massless_droplet_destroyer</scheme>           <!-- Remove massless droplets, doesn't influences only grid-scale tendencies -->
-            <scheme>subcol_SILHS_hydromet_conc_tend_lim</scheme>  <!-- Place limits on hydrometeor drop-size. Only used if SILHS is enabled. -->
-          </process_split>
-          <scheme>check_energy_chng</scheme>          <!-- Global integral checker required for certain diagnostic outputs -->
-        </partition>
-        <scheme>diag_clip_tend_writeout</scheme>      <!-- Output water mass clipping diagnostics to history file -->
-        <scheme>check_energy_chng</scheme>            <!-- Global integral checker required for certain diagnostic outputs -->
-        <scheme>calc_prec_sum</scheme>                <!-- Sum surface precipitation amounts over each subcycle loop -->
-      </subcycle>
-      <scheme>calc_prec_avg</scheme>                  <!-- Divide surface precipitation sum by number of "macmic" subcycle iterations -->
-      <scheme>modal_aero_calcsize_diag</scheme>       <!-- Only if climatological aerosols are used instead of prognostic aerosols -->
-      <!-- Modal Aerosol water uptake -->             <!-- Only if climatological aerosols are used instead of prognostic aerosols -->
-      <!-- **************************** -->
-      <!-- The commented-out schemes below are all included in the "modal_aero_wateruptake_dr" scheme -->
-      <!-- ++++++++++++++++++++++++++++++
-      <scheme>tropopause_find</scheme>                Calculate tropopause height
-      <scheme>calc_h2so4_equilib_mixrat</scheme>      Calculate Sulfuric acid phase equilibrium, if modal_strat_sulfate is True
-      <scheme>h2so4_equilib_diag</scheme>             Output sulfer aerosol diagnostics to history file
-      <scheme>qsat_water</scheme>                     Calculate saturation vapor pressure with respect to liquid water
-      <scheme>relhum_calc</scheme>                    Calculate the relative humidity
-      <scheme>calc_atm_density</scheme>               Calculate atmospheric density
-      <scheme>modal_aero_wateruptake_sub</scheme>     Actual aerosol moisture up-take parameterization
-      <scheme>modal_aero_wetdens_calc</scheme>        Calculate the wet density of aerosols
-      <scheme>modal_aero_wateruptake_diag</scheme>    Calculate aerosol water uptake diagnostic variables, and output them to history file
-      ++++++++++++++++++++++++++++++++++ -->
-      <scheme>modal_aero_wateruptake_dr</scheme>
-      <!-- **************************** -->
-      <!-- Aerosol wet deposition -->
-      <!-- **************************** -->
-      <scheme>modal_aero_calcsize_sub</scheme>        <!-- Calculate  aerosol size distribution parameters -->
-      <scheme>modal_aero_wateruptake_dr</scheme>      <!-- Repeat "Modal Aerosol water uptake" schemes shown above -->
-      <scheme>wetdep_prec_calc</scheme>               <!-- Calculate precipitation amount that impacts wet deposition -->
-      <scheme>coarse_fact_calc</scheme>               <!-- Calculate "f_act_conv" for coarse mode aerosols (note here the comments don't match the variables) -->
-      <subcycle loop="aerosol_dist_modes">            <!-- Loop over aerosol size distribution modes, CAM6 var = 'ntot_amode' -->
-        <subcycle loop="aerosol_phase">               <!-- Loop over aerosol phase types (interstitial vs cloud-borne), CAM6 var = 'lphase' -->
-          <scheme>aero_fact_calc</scheme>             <!-- Calculate aerosol activation fraction (f_act_conv) depending on aerosol type -->
-          <scheme>wetdepa_v2</scheme>                 <!-- Actual aerosol wet deposition parameterization -->
-          <scheme>wetdep_diag_output</scheme>         <!-- Calculate numerous different CLUBB diagnostic variables, and output them to history file -->
-        </subcycle>
-      </subcycle>
-      <scheme>ma_convproc_intr</scheme>               <!-- Convective in-cloud aerosol removal parameterization, only used if convproc_do_aer is True -->
-      <scheme>set_srf_wetdep</scheme>                 <!-- Add aerosol deposition rates to host model surface fluxes -->
-      <!-- **************************** -->
-      <scheme>convtran</scheme>                       <!-- Actual ZM convective transport scheme, for constituents in cnst_is_convtran2 -->
-      <scheme>check_tracers_chng</scheme>             <!-- Global tracer mass checker that kills model if error is large enough. -->
-      <scheme>diag_phys_writeout</scheme>             <!-- Calculate generic atmospheric physics diagnostics and output them to history file -->
-      <scheme>diag_conv</scheme>                      <!-- Calculate generic precipitation and convection diagnostics and output them to history file -->
-      <scheme>cloud_diagnostics_calc</scheme>         <!-- Calculate generic cloud diagnostics and output them to history file -->
-      <!-- RRTMG radiation -->
-      <!-- **************************** -->
-      <scheme>calc_solar_zenith_ang</scheme>          <!-- Calculate the solar zenith angle for the given time step -->
-      <scheme>group_day_night</scheme>                <!-- Determine which columns are in the day-side, vs night-side -->
-      <scheme>tropopause_find</scheme>                <!-- Calculate tropopause height -->
-      <!-- The commented-out schemes below are all included in the "rrtmg_state_prepare" scheme -->
-      <!-- ++++++++++++++++++++++++++++++
-      <scheme>rrtmg_state_create</scheme>             Create RRTMG state object
-      <scheme>calc_cldfprime</scheme>                 Calculate "prime" cloud fraction
-      <scheme>calc_ice_optics_sw</scheme>             Calculate cloud ice shortwave optics (case structure, may need to be broken up)
-      <scheme>calc_liq_optics_sw</scheme>             Calculate cloud liquid shortwave optics (case structure, may need to be broken up)
-      <scheme>calc_snow_optics_sw</scheme>            Calculate snow shortwave optics
-      <scheme>calc_snow_optics_sw</scheme>            Calculate graupel shortwave optics
-      <scheme>rrtmg_state_tau_add</scheme>            Calculate and add various optical depths to the RRTMG state structure
-      <scheme>radiation_output_cld</scheme>           Output optical depth diagnostics to history file
-      <scheme>calc_ice_optics_lw</scheme>             Calculate cloud ice longwave optics (case structure, may need to be broken up)
-      <scheme>calc_liq_optics_lw</scheme>             Calculate cloud liquid longwave optics (case structure, may need to be broken up)
-      <scheme>calc_snow_optics_lw</scheme>            Calculate snow longwave optics
-      <scheme>calc_snow_optics_lw</scheme>            Calculate graupel longwave optics
-      <scheme>get_variability</scheme>                Calculate solar spectral irradiance scaling factors
-      ++++++++++++++++++++++++++++++++++ -->
-      <scheme>rrtmg_state_prepare</scheme>            <!-- Prepare inputs for the "RRTMG" radiation scheme -->
-      <subcycle loop="rad_active_cnst">               <!-- Loop over radiatively active constituents, CAM6 var = 'n_diag'  -->
-        <scheme>rrtmg_state_update</scheme>           <!-- Add shortwave constiuent concentrations to RRTMG state structure -->
-        <scheme>aer_rad_props_sw</scheme>             <!-- Gather/calculate aerosol shortwave optical properties (potentially provided by registry/framework?) -->
-        <scheme>rad_rrtmg_sw</scheme>                 <!-- Actual RRTMG shortwave radiation parameterization -->
-        <scheme>rad_sw_diag_output</scheme>           <!-- Calculate shortwave diagnostic variables, and output them to history file -->
-      </subcycle>
-      <scheme>rad_cnst_out</scheme>                   <!-- Calculate radiatively active constituent diagnostic variables, and output them to history file -->
-      <subcycle loop="rad_active_cnst">               <!-- Loop over radiatively active constituents, CAM6 var = 'n_diag'  -->
-        <scheme>rrtmg_state_update</scheme>           <!-- Add longwave constiuent concentrations to RRTMG state structure -->
-        <scheme>aer_rad_props_lw</scheme>             <!-- Gather/calculate aerosol longwave optical properties (potentially provided by registry/framework?) -->
-        <scheme>rad_rrtmg_lw</scheme>                 <!-- Actual RRTMG longwave radiation parameterization -->
-        <scheme>rad_lw_diag_output</scheme>           <!-- Calculate longwave diagnostic variables, and output them to history file -->
-      </subcycle>
-      <scheme>cosp_input_prepare</scheme>             <!-- Prepare inputs required for COSP.  Only matters if COSP is active -->
-      <scheme>cosp_simulator</scheme>                 <!-- Actual COSP simulator paramaterization.  Only matters if COSP is active -->
-      <scheme>rad_qdp_q_calc</scheme>                 <!-- Convert Q*dp to Q (potentially managed by registry/framework?) -->
-      <scheme>rad_data_write</scheme>                 <!-- Calculate additional radiation diagnostics, and output them to history file -->
-      <scheme>radheat_tend</scheme>                   <!-- Calculate net radiative heating tendencies -->
-      <scheme>radheat_diag_output</scheme>            <!-- Calculate radiative heating diagnostic variables, and output them to history file -->
-      <scheme>rad_q_qdp_calc</scheme>                 <!-- Convert Q to Q*dp (potentially managed by registry/framework?) -->
-      <scheme>set_srf_net_sw</scheme>                 <!-- Add net shortwave surface flux to host model surface fluxes -->
-      <!-- **************************** -->
-      <scheme>check_energy_chng</scheme>              <!-- Global integral checker required for certain diagnostic outputs -->
-      <scheme>tropopause_output</scheme>              <!-- Calculate tropopause diagnostic variables, and output them to history file -->
-      <scheme>cam_export</scheme>                     <!-- Add various physics state variables to host model surface fluxes -->
-      <scheme>diag_export</scheme>                    <!-- Output various host model surface fluxes to history file -->
-    </time_split>
-  </group>
-  <group name="physics_ac">
-    <time_split>
-      <!--cam6:  diffusion=CLUBB, chem=trop_mam4 -->
-      <scheme>flux_avg_run</scheme>                   <!-- Smooth/average surface fluxes, but only if phys_do_flux_avg is True -->
-      <scheme>physics_state_check</scheme>            <!-- Only if state_debug_checks is True. This scheme only looks for infs/nans, and kills the model if found -->
-      <scheme>calc_flx_net</scheme>                   <!-- Accumulate net surface fluxes, which is necessary for spectral dycores -->
-      <!-- Chemistry emissisons -->
-      <!-- **************************** -->
-      <scheme>aero_model_emissions</scheme>           <!-- Calculate aerosol emissions, and add them to the host model's surface inputs -->
-      <scheme>calc_MEGAN_fluxes</scheme>              <!-- Calculate MEGAN fluxes, and add them to the host model's surface inputs and history files -->
-      <scheme>set_srf_emissions</scheme>              <!-- Calculate surface chemistry emissions -->
-      <scheme>srf_emis_diag_output</scheme>           <!-- Add surface chemistry emissions to host model's surface inputs and history files -->
-      <scheme>fire_emissions_srf</scheme>             <!-- Calculate fire emissions, and add to host model's surface inputs -->
-      <!-- **************************** -->
-      <!-- Negative moisture/tracer check -->
-      <!-- **************************** -->
-      <scheme>qneg4</scheme>                          <!-- Modify surface moisture and heat fluxes to prevent negative moisture values, and output diagnostics -->
-      <!-- **************************** -->
-      <scheme>aoa_tracers_timestep_tend</scheme>      <!-- Calculate age of air tracer tendencies.  Also output tendencies to history file -->
-      <scheme>check_tracers_chng</scheme>             <!-- Global tracer mass checker that kills model if error is large enough. -->
-      <scheme>co2_cycle_set_ptend</scheme>            <!-- Calculate CO2 tendencies.  Only matters if co2_flag or co2_readFlux_aircraft is True -->
-      <!-- Atmospheric Chemistry (MOZART), only matters if chem_is_active is True -->
-      <!-- **************************** -->
-      <scheme>short_lived_species_writeic</scheme>    <!-- Write initial values for short-lived chemical species to history file, if requested by user -->
-      <scheme>get_curr_calday</scheme>                <!-- Determine day of year -->
-      <scheme>chem_tropopause_find</scheme>           <!-- Determine tropopause height (specific tropopause calculation depends on chem_use_chemtrop) -->
-      <scheme>neu_wetdep_tend</scheme>                <!-- Calculate wet deposition rates via the "Neu" scheme -->
-      <scheme>chem_calc_cldw</scheme>                 <!-- Calculate total cloud water mass and droplet number -->
-      <scheme>gas_phase_chemdr</scheme>               <!-- Calculate gas-phase chemical reaction tendencies -->
-      <scheme>nitro_srf_flx</scheme>                  <!-- Add nitrogen surface fluxes to host model surface fluxes (managed by registry/framework?) -->
-      <scheme>chem_diag_output</scheme>               <!-- Calculate chemistry diagnostic variables, and output them to history file -->
-      <!-- **************************** -->
-      <scheme>check_energy_chng</scheme>              <!-- Global integral checker required for certain diagnostic outputs -->
-      <scheme>check_tracers_chng</scheme>             <!-- Global tracer mass checker that kills model if error is large enough. -->
-      <!-- Vertical diffusion -->
-      <!-- **************************** -->
-      <scheme>set_dry_to_wet</scheme>                 <!-- Convert mixing ratios from dry air to air + water vapor -->
-      <scheme>tint_calc</scheme>                      <!-- Interpolate air temperature to layer interface levels -->
-      <scheme>ubc_get_vals</scheme>                   <!-- Calcuate upper-level boundary conditions (depends on chemistry and model-top choice) -->
-      <scheme>set_top_tint_val</scheme>               <!-- Calculate air temperature at top interface level -->
-      <scheme>rhoi_calc</scheme>                      <!-- Interpolate air density and dry air density to layer interface levels -->
-      <scheme>compute_tms</scheme>                    <!-- Calculate Turbulent Mountain Stress (TMS) tendency -->
-      <scheme>tms_diag_output</scheme>                <!-- Calculate TMS diangostic variables, and output them to history file -->
-      <scheme>compute_blj</scheme>                    <!-- Calculate Sub-Grid Orgraphic (SGO) drag via Beljaars parameterization -->
-      <scheme>blj_diag_output</scheme>                <!-- Calculate SGO diagnostic variables, and output them to history file -->
-      <scheme>theta_calc</scheme>                     <!-- Calculate potential temperature (managed by registry/framework?) -->
-      <scheme>virtem</scheme>                         <!-- Calculate virtual temperature (managed by registry/framework?) -->
-      <scheme>calc_ustar</scheme>                     <!-- Calculate friction velocity -->
-      <scheme>calc_obklen</scheme>                    <!-- Calculate Obhukov length -->
-      <scheme>pbl_diag_calc</scheme>                  <!-- Calculate PBL diagnositc variables, if do_pbl_diags is False -->
-      <scheme>dse_top_calc</scheme>                   <!-- Calculate top-level dry static energy, but only if do_molec_diff is True and WACCM-X is False -->
-      <scheme>compute_molec_diff_wet</scheme>         <!-- Calculate molecular diffusion of wet atmospheric constituents, if do_molec_diff is True -->
-      <scheme>compute_vdiff_wet</scheme>              <!-- Calculate the vertical (eddy) diffusion of wet atmospheric constituents -->
-      <scheme>compute_molec_diff_dry</scheme>         <!-- Calculate molecular diffusion of dry atmospheric constituents, if do_molec_diff is True -->
-      <scheme>compute_vdiff_dry</scheme>              <!-- Calculate the vertical (eddy) diffusion of dry atmospheric constituents -->
-      <scheme>aero_srf_flx_add</scheme>               <!-- Add surface aerosol fluxes to bottom model layer, but only if prog_modal_aero is True -->
-      <scheme>diff_flux_diag</scheme>                 <!-- Calculate diffusion variable diagnostics, if do_pbl_diags is False (is that correct?) -->
-      <scheme>diff_flux_tend_dry</scheme>             <!-- Calculate vertical diffusion tendencies for "dry" quantities, and send them back to host model -->
-      <scheme>set_wet_to_dry</scheme>                 <!-- Convert mixing ratios from air + water vapor to dry air -->
-      <scheme>pbl_diag_calc</scheme>                  <!-- Calculate PBL diagnositc variables, if do_pbl_diags is False -->
-      <scheme>diff_mass_check</scheme>                <!-- Check mass conservation after vertical diffusion, and send error messages if check fails -->
-      <scheme>pbl_output</scheme>                     <!-- Write PBL diagnostic variables to history files -->
-      <!-- **************************** -->
-      <scheme>rayleigh_friction_tend</scheme>         <!-- Calculate Rayleigh friction tendency -->
-      <scheme>check_energy_chng</scheme>              <!-- Global integral checker required for certain diagnostic outputs -->
-      <scheme>check_tracers_chng</scheme>             <!-- Global tracer mass checker that kills model if error is large enough. -->
-      <!-- Aerosol dry deposition -->
-      <!-- **************************** -->
-      <scheme>calcram</scheme>                        <!-- Calculate aerodynamic resistance and friction velocity -->
-      <scheme>calcram_diag_output</scheme>            <!-- Write aerodynamic resistance and friction velocity to history file -->
-      <scheme>calc_atm_density</scheme>               <!-- Calculate atmospheric density -->
-      <subcycle loop="dep_velocity_idx_34">           <!-- loop over deposition velocity (vlc) array index values 3 and 4 -->
-        <scheme>modal_aero_depvel_part</scheme>       <!-- Calculate dry deposition velocity for cloud droplets -->
-      </subcycle>
-      <subcycle loop="aerosol_dist_modes">            <!-- Loop over aerosol size distribution modes, CAM6 var = 'ntot_amode' -->
-        <subcycle loop="aerosol_phase">               <!-- Loop over aerosol phase types (interstitial vs cloud-borne), CAM6 var = 'lphase' -->
-          <scheme>calc_aero_vars</scheme>             <!-- Calculate aerosol mean wet radius and other properties -->
-          <subcycle loop="dep_velocity_idx_12" >      <!-- loop over deposition velocity (vlc) array index values 1 and 2 -->
-            <scheme>modal_aero_depvel_part</scheme>   <!-- Calculate dry deposition velocity for interstial aerosols -->
-          </subcycle>
-          <scheme>aero_tracer_indx</scheme>           <!-- Determine aerosol tracer index (managed by registry/framework?) -->
-          <scheme>depvel_m_to_pa</scheme>             <!-- Convert the deposition velocity from m/s to Pa/s, and write to history file (maanged by registry/framework?) -->
-          <scheme>dust_sediment_tend</scheme>         <!-- Calculate host model tendencies and surface fluxes from dry deposition -->
-          <scheme>drydep_diag_output</scheme>         <!-- Calculate dry deposition diagnostic variables, and output them to history file -->
-        </subcycle>
-      </subcycle>
-      <scheme>set_srf_drydep</scheme>                 <!-- Add dry deposition surface fluxes to host model, if aerodep_flx_prescribed is False -->
-      <!-- **************************** -->
-      <scheme>charge_balance</scheme>                 <!-- Enforce charge nuetrality, if chemistry simulates electrons -->
-      <!-- Gravit wave tendencies -->
-      <!-- **************************** -->
-      <!-- This interface depends heavily
-           on namelist inputs, with entire
-           blocks of code being used (or not)
-           depending on said namelist choices.
-           However, the general structure of these
-           code blocks is more or less the same,
-           so a "generic" scheme set is included
-           here, which will need to be expanded
-           out once "if-statement" like dependencies
-           can be added to suite definition files
-           like this one -->
-      <scheme>set_dry_to_wet</scheme>                  <!-- Convert mixing ratios from dry air to air + water vapor -->
-      <scheme>gw_prof</scheme>                         <!-- Calculate layer interface densities and Brunt-Viasala frequencies (combine with other schemes?) -->
-      <!-- Generic gravity wave scheme order  -->
-      <!-- +++++++++++++++++++++++++ -->
-      <scheme>effgw_calc</scheme>                      <!-- Calculate the efficiency of gravity wave momentum transfer -->
-      <scheme>gw_src_calc</scheme>                     <!-- Determine gravity wave sources -->
-      <scheme>gw_drag_prof</scheme>                    <!-- Solve for the drag profile with the gravity wave spectrum -->
-      <scheme>calc_taucd</scheme>                      <!-- Project stress into directional components -->
-      <scheme>egwdffi_tot_calc</scheme>                <!-- add diffusion coefficients (manageable by registry/framework?) -->
-      <scheme>momentum_flux_calc</scheme>              <!-- Calculate momentum fluxes/wind tendencies -->
-      <scheme>energy_change</scheme>                   <!-- Calculate atmospheric energy change -->
-      <scheme>energy_fixer</scheme>                    <!-- Ensure energy conservation -->
-      <scheme>gw_cam_update</scheme>                   <!-- Placeholder for CAM gravity wave updates and diagnostic output calculations -->
-      <!-- +++++++++++++++++++++++++ -->
-      <!-- **************************** -->
-      <scheme>check_energy_chng</scheme>               <!-- Global integral checker required for certain diagnostic outputs -->
-      <scheme>lunar_tides_tend</scheme>                <!-- Calculate horizontal wind tendencies due to M2 lunar tide, but only if apply_lunar_tides is True -->
-      <scheme>check_energy_chng</scheme>               <!-- Global integral checker required for certain diagnostic outputs -->
-      <scheme>calc_te_and_aam_budgets</scheme>         <!-- Managed by host model? Diagnostic output suffix = 'pAP' -->
-      <scheme>nudging_timestep_tend</scheme>           <!-- Apply nudging to horizontal winds, heat, and water vapor, and output diagnostics, but only if nudging is turned on. -->
-      <scheme>check_energy_chng</scheme>               <!-- Global integral checker required for certain diagnostic outputs -->
-      <scheme>set_dry_to_wet</scheme>                  <!-- Only matters if dycore is FV (LR) or SE -->
-      <!-- Dry air mass adjuster -->                   <!-- Only matters if dycore is FV (LR), otherwise this calculation is purely diagnostic -->
-      <!-- **************************** -->
-      <scheme>qfac_state_adjust</scheme>               <!-- Adjust state variables based off the change in water vapor -->
-      <scheme>geopotential_dse</scheme>                <!-- Calculate the temperatue and geopotential height using pressure and dry static energy -->
-      <!-- **************************** -->
-      <scheme>calc_te_and_aam_budgets</scheme>         <!-- Managed by host model? Diagnostic output suffix = 'pAM' -->
-      <scheme>dtcore_reset</scheme>                    <!-- Reset "dtcore" variable to equal temperature -->
-      <scheme>diag_phys_tend_writeout</scheme>         <!-- Calculate physics diagnostic variables, and output them to history file -->
-      <scheme>clybry_fam_set</scheme>                  <!-- Set ClOy and BrOy mass mixig ratios. Only matters if chemistry package with Cly and Bry is used -->
-    </time_split>
-  </group>
-</suite>
diff --git a/suites/suite_cam7.xml b/suites/suite_cam7.xml
index b949654e..49c345cb 100644
--- a/suites/suite_cam7.xml
+++ b/suites/suite_cam7.xml
@@ -10,15 +10,19 @@
     <!-- After gmean, output global mean energy diagnostics -->
     <scheme>check_energy_gmean_diagnostics</scheme>
 
-    <!-- Add global mean energy difference as heating (diff between gmean and save_teout) -->
+    <!--
+      Global energy fixer (check_energy_fix)
+      Add global mean energy difference as heating (diff between gmean and save_teout)
+    -->
     <scheme>check_energy_zero_fluxes</scheme>
     <scheme>check_energy_fix</scheme>
     <scheme>apply_heating_rate</scheme>
     <scheme>geopotential_temp</scheme>
-
-    <!-- Check that energy and water change matches the boundary fluxes -->
+    <!-- Check that energy and water change matches the boundary fluxes, update global energy -->
     <scheme>check_energy_scaling</scheme>
     <scheme>check_energy_chng</scheme>
+    <!-- Global energy fixer diagnostics (must run after check_energy_chng which updates global energies, but before zero_fluxes zeroes out boundary fluxes from energy fixer) -->
+    <scheme>check_energy_fix_diagnostics</scheme>
 
     <!-- Dry Adiabatic Adjustment -->
     <scheme>dadadj</scheme>