From 5467e1f4fbbafb211438d4a1e01c25110be1f755 Mon Sep 17 00:00:00 2001 From: Haipeng Lin Date: Thu, 13 Feb 2025 22:45:11 -0500 Subject: [PATCH] Implement diagnostics for global energy fixer, check_energy standard name update (#169) Originator(s): @jimmielin Summary (include the keyword ['closes', 'fixes', 'resolves'] and issue number): * Fixes #161: Add check_energy related history output variables to check_energy_diagnostics * Fixes #166: Need to remove old CAM suite definition files * Fixes #176 (updates `teout` standard name to `vertically_integrated_total_energy_using_dycore_energy_formula_at_end_of_physics_timestep`) Companion PR in SIMA: https://github.com/ESCOMP/CAM-SIMA/pull/339 Describe any changes made to the namelist: N/A List all files eliminated and why: ``` Fix #166 to remove old SDF files from scoping exercise D suites/suite_cam4.xml D suites/suite_cam6.xml D suites/suite_cam6_silhs.xml ``` List all files added and what they do: ``` Add global energy fixer diagnostics (teinp, teout, tefix, efix) A schemes/sima_diagnostics/check_energy_fix_diagnostics.F90 A schemes/sima_diagnostics/check_energy_fix_diagnostics.meta ``` List all existing files that have been modified, and describe the changes: (Helpful git command: `git diff --name-status development...`) ``` Move some developments to check_energy_fix_diagnostics so they can be called at right time. M schemes/sima_diagnostics/check_energy_diagnostics.F90 M schemes/sima_diagnostics/check_energy_diagnostics.meta Add call to check_energy_fix_diagnostics in schemes using global energy fixer: M suites/suite_adiabatic.xml M suites/suite_cam7.xml Update teout standard name M doc/NamesNotInDictionary.txt M schemes/check_energy/check_energy_chng.meta M schemes/check_energy/check_energy_gmean/check_energy_gmean.meta M schemes/check_energy/check_energy_save_teout.meta M schemes/sima_diagnostics/check_energy_diagnostics.F90 M schemes/sima_diagnostics/check_energy_diagnostics.meta M schemes/sima_diagnostics/check_energy_gmean_diagnostics.meta ``` List any test failures: N/A Is this a science-changing update? New physics package, algorithm change, tuning changes, etc? N/A (diagnostics change only) --- doc/NamesNotInDictionary.txt | 408 +++++++++--------- schemes/check_energy/check_energy_chng.meta | 2 +- .../check_energy_gmean.meta | 4 +- .../check_energy/check_energy_save_teout.meta | 2 +- .../check_energy_diagnostics.F90 | 11 +- .../check_energy_diagnostics.meta | 12 - .../check_energy_fix_diagnostics.F90 | 73 ++++ .../check_energy_fix_diagnostics.meta | 59 +++ .../check_energy_gmean_diagnostics.meta | 2 +- suites/suite_adiabatic.xml | 10 +- suites/suite_cam4.xml | 202 --------- suites/suite_cam6.xml | 364 ---------------- suites/suite_cam6_silhs.xml | 379 ---------------- suites/suite_cam7.xml | 10 +- 14 files changed, 358 insertions(+), 1180 deletions(-) create mode 100644 schemes/sima_diagnostics/check_energy_fix_diagnostics.F90 create mode 100644 schemes/sima_diagnostics/check_energy_fix_diagnostics.meta delete mode 100644 suites/suite_cam4.xml delete mode 100644 suites/suite_cam6.xml delete mode 100644 suites/suite_cam6_silhs.xml 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 @@ check_energy_gmean_diagnostics - + check_energy_zero_fluxes check_energy_fix apply_heating_rate geopotential_temp - - + check_energy_scaling check_energy_chng + + check_energy_fix_diagnostics check_energy_save_teout 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 @@ - - - - - - - physics_state_check - - - qneg3 - - physics_state_check - diag_state_b4_phys_write - - - calc_te_and_aam_budgets - check_energy_fix - check_energy_cam_update_pre_chng - check_energy_chng - check_energy_cam_update_post_chng - calc_te_and_aam_budgets - - diag_conv_tend_ini - calc_dtcore - - - - dadadj_calc_update - - - - - - zm_convr - zm_convr_cam_update - zm_conv_evap - zm_conv_evap_cam_update - momtran - momtran_cam_update - convtran - convtran_cam_update - - check_energy_chng - - - cmfmca - cmfmca_cam_update - zm_conv_evap - zm_conv_evap_cam_update - - check_energy_chng - check_tracers_chng - sslt_rebin_adv - - - tropopause_find - cld_sediment_vel - cld_sediment_tend - rk_sed_cam_update - add_conv_detrain_rliq - cldfrc - cldfrc_rh2 - rhdfda_calc - cldfrc_fice - strat_cond_repartition - pcond - rk_pcond_cam_update - cldfrc - cldfrc_diag_output - cldefr - - convtran - check_tracers_chng - diag_phys_writeout - diag_conv - cloud_diagnostics_calc - - - calc_solar_zenith_ang - group_day_night - calc_col_mean_co2 - eccf_calc - tropopause_find - calc_col_mean_o2 - aer_rad_props_sw - radcswmx - rad_sw_diag_output - aer_rad_props_lw - radclwmx - rad_lw_diag_output - cloud_cover_diags_output - rad_qdp_q_calc - rad_data_write - radheat_tend - radheat_diag_output - rad_q_qdp_calc - set_srf_net_sw - - check_energy_chng - tropopause_output - cam_export - diag_export - - - - - - flux_avg_run - physics_state_check - calc_flx_net - - - qneg4 - aoa_tracers_timestep_tend - check_tracers_chng - co2_cycle_set_ptend - - - - set_dry_to_wet - tint_calc - ubc_get_vals - set_top_tint_val - rhoi_calc - compute_tms - tms_diag_output - compute_blj - blj_diag_output - temp_to_potential_temp - virtem - calc_ustar - calc_obklen - - - trbintd - pblintd - austausch_atm - austausch_pbl - - pbl_diag_calc - dse_top_calc - compute_molec_diff_wet - compute_vdiff_wet - compute_molec_diff_dry - compute_vdiff_dry - diff_flux_diag - diff_flux_tend_dry - set_wet_to_dry - pbl_diag_calc - diff_mass_check - pbl_output - - rayleigh_friction_tend - check_energy_chng - check_tracers_chng - charge_balance - - - - set_dry_to_wet - gw_prof - - - effgw_calc - gw_src_calc - gw_drag_prof - calc_taucd - egwdffi_tot_calc - momentum_flux_calc - energy_change - energy_fixer - gw_cam_update - - - check_energy_chng - lunar_tides_tend - check_energy_chng - calc_te_and_aam_budgets - nudging_timestep_tend - check_energy_chng - set_dry_to_wet - - - qfac_state_adjust - geopotential_dse - - calc_te_and_aam_budgets - dtcore_reset - diag_phys_tend_writeout - - - 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 @@ - - - - - - - physics_state_check - clybry_fam_adj - - - qneg - - physics_state_check - diag_state_b4_phys_write - - - calc_te_and_aam_budgets - check_energy_fix - check_energy_cam_update_pre_chng - check_energy_chng - check_energy_cam_update_post_chng - calc_te_and_aam_budgets - - diag_conv_tend_ini - calc_dtcore - - - - dadadj_calc_update - - - - zm_convr - zm_convr_cam_update - zm_conv_evap - zm_conv_evap_cam_update - momtran - momtran_cam_update - convtran - convtran_cam_update - - check_energy_chng - check_tracers_chng - sslt_rebin_adv - - - - - - clubb_input_prepare - clubb_var_vert_inv - - stats_begin_timestep_api - advance_clubb_core_api - update_xp2_mc_intr - calculate_thlp2_rad_intr - stats_end_timestep_clubb - - - - clubb_output_prepare - clubb_var_vert_rev - clubb_upper_diss - clubb_cam_update - liquid_macro_tend - liquid_macro_CAM_update - conv_cond_detrain_calc - conv_cond_detrain_cam_update - set_wet_to_dry - clubb_diag_output - - check_energy_chng - - - - - hetfrz_classnuc_cam_save_cbaero - aero_get_num_mmr - aero_calc_wsub - nucleate_ice_cam_calc - lcldm_min_check - aero_cam_drop_activate - aero_cam_contact_freezing - ndrop_bam_ccn - hetfrz_classnuc_cam_calc - microp_aero_diag_output - - - - micro_mg_get_cols3_0 - calc_incloud_LWP - micro_calc_tropopause - micro_mg_tend3_0 - mg_calc_outputs - calc_atm_density - - - size_dist_param_liq - micro_eff_radius_liq - size_dist_param_liq_const - calc_ncic_grid - size_dist_param_liq - micro_eff_radius_liq - micro_eff_radius_rain - micro_eff_radius_snow - micro_eff_radius_graupel - calc_niic_grid - size_dist_param_basic - micro_eff_radius_ice - - calc_micro_column_vars - calc_prec_efficiency - micro_diag_output - - massless_droplet_destroyer - - check_energy_chng - - diag_clip_tend_writeout - check_energy_chng - calc_prec_sum - - calc_prec_avg - modal_aero_calcsize_diag - - - - - modal_aero_wateruptake_dr - - - - modal_aero_calcsize_sub - modal_aero_wateruptake_dr - wetdep_prec_calc - coarse_fact_calc - - - aero_fact_calc - wetdepa_v2 - wetdep_diag_output - - - ma_convproc_intr - set_srf_wetdep - - convtran - check_tracers_chng - diag_phys_writeout - diag_conv - cloud_diagnostics_calc - - - calc_solar_zenith_ang - group_day_night - tropopause_find - - - rrtmg_state_prepare - - rrtmg_state_update - aer_rad_props_sw - rad_rrtmg_sw - rad_sw_diag_output - - rad_cnst_out - - rrtmg_state_update - aer_rad_props_lw - rad_rrtmg_lw - rad_lw_diag_output - - cosp_input_prepare - cosp_simulator - rad_qdp_q_calc - rad_data_write - radheat_tend - radheat_diag_output - rad_q_qdp_calc - set_srf_net_sw - - check_energy_chng - tropopause_output - cam_export - diag_export - - - - - - flux_avg_run - physics_state_check - calc_flx_net - - - aero_model_emissions - calc_MEGAN_fluxes - set_srf_emissions - srf_emis_diag_output - fire_emissions_srf - - - - qneg_surface - - aoa_tracers_timestep_tend - check_tracers_chng - co2_cycle_set_ptend - - - short_lived_species_writeic - get_curr_calday - chem_tropopause_find - neu_wetdep_tend - chem_calc_cldw - gas_phase_chemdr - nitro_srf_flx - chem_diag_output - - check_energy_chng - check_tracers_chng - - - set_dry_to_wet - tint_calc - ubc_get_vals - set_top_tint_val - rhoi_calc - compute_tms - tms_diag_output - compute_blj - blj_diag_output - theta_calc - virtem - calc_ustar - calc_obklen - pbl_diag_calc - dse_top_calc - compute_molec_diff_wet - compute_vdiff_wet - compute_molec_diff_dry - compute_vdiff_dry - aero_srf_flx_add - diff_flux_diag - diff_flux_tend_dry - set_wet_to_dry - pbl_diag_calc - diff_mass_check - pbl_output - - rayleigh_friction_tend - check_energy_chng - check_tracers_chng - - - calcram - calcram_diag_output - calc_atm_density - - modal_aero_depvel_part - - - - calc_aero_vars - - modal_aero_depvel_part - - aero_tracer_indx - depvel_m_to_pa - dust_sediment_tend - drydep_diag_output - - - set_srf_drydep - - charge_balance - - - - set_dry_to_wet - gw_prof - - - effgw_calc - gw_src_calc - gw_drag_prof - calc_taucd - egwdffi_tot_calc - momentum_flux_calc - energy_change - energy_fixer - gw_cam_update - - - check_energy_chng - lunar_tides_tend - check_energy_chng - calc_te_and_aam_budgets - nudging_timestep_tend - check_energy_chng - set_dry_to_wet - - - qfac_state_adjust - geopotential_dse - - calc_te_and_aam_budgets - dtcore_reset - diag_phys_tend_writeout - clybry_fam_set - - - 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 @@ - - - - - - - physics_state_check - clybry_fam_adj - - - qneg3 - - physics_state_check - diag_state_b4_phys_write - - - calc_te_and_aam_budgets - check_energy_fix - check_energy_cam_update_pre_chng - check_energy_chng - check_energy_cam_update_post_chng - calc_te_and_aam_budgets - - diag_conv_tend_ini - calc_dtcore - - - - dadadj_calc_update - - - - zm_convr - zm_convr_cam_update - zm_conv_evap - zm_conv_evap_cam_update - momtran - momtran_cam_update - convtran - convtran_cam_update - - check_energy_chng - check_tracers_chng - sslt_rebin_adv - - - - - - clubb_input_prepare - clubb_var_vert_inv - - stats_begin_timestep_api - advance_clubb_core_api - update_xp2_mc_intr - calculate_thlp2_rad_intr - stats_end_timestep_clubb - - - - clubb_output_prepare - clubb_var_vert_rev - clubb_upper_diss - clubb_cam_update - liquid_macro_tend - liquid_macro_CAM_update - conv_cond_detrain_calc - conv_cond_detrain_cam_update - set_wet_to_dry - clubb_diag_output - - check_energy_chng - - - - - hetfrz_classnuc_cam_save_cbaero - aero_get_num_mmr - aero_calc_wsub - nucleate_ice_cam_calc - lcldm_min_check - aero_cam_drop_activate - aero_cam_contact_freezing - ndrop_bam_ccn - hetfrz_classnuc_cam_calc - microp_aero_diag_output - - - - micro_mg_get_cols3_0 - calc_incloud_LWP - micro_calc_tropopause - micro_mg_tend3_0 - mg_calc_outputs - calc_atm_density - - - size_dist_param_liq - micro_eff_radius_liq - size_dist_param_liq_const - calc_ncic_grid - size_dist_param_liq - micro_eff_radius_liq - micro_eff_radius_rain - micro_eff_radius_snow - micro_eff_radius_graupel - calc_niic_grid - size_dist_param_basic - micro_eff_radius_ice - - calc_micro_column_vars - calc_prec_efficiency - micro_diag_output - - - - calc_total_moisture - calc_dry_static_density - convert_omega_to_w - convert_dse_to_temp - exner_silhs - thl_calc - silhs_var_vert_inv - silhs_get_subcol_wgts - lh_microphys_var_covar_driver_api - zero_upper_level - - subcol_SILHS_fill_holes_conserv_calc - massless_droplet_destroyer - subcol_SILHS_hydromet_conc_tend_lim - - check_energy_chng - - diag_clip_tend_writeout - check_energy_chng - calc_prec_sum - - calc_prec_avg - modal_aero_calcsize_diag - - - - - modal_aero_wateruptake_dr - - - - modal_aero_calcsize_sub - modal_aero_wateruptake_dr - wetdep_prec_calc - coarse_fact_calc - - - aero_fact_calc - wetdepa_v2 - wetdep_diag_output - - - ma_convproc_intr - set_srf_wetdep - - convtran - check_tracers_chng - diag_phys_writeout - diag_conv - cloud_diagnostics_calc - - - calc_solar_zenith_ang - group_day_night - tropopause_find - - - rrtmg_state_prepare - - rrtmg_state_update - aer_rad_props_sw - rad_rrtmg_sw - rad_sw_diag_output - - rad_cnst_out - - rrtmg_state_update - aer_rad_props_lw - rad_rrtmg_lw - rad_lw_diag_output - - cosp_input_prepare - cosp_simulator - rad_qdp_q_calc - rad_data_write - radheat_tend - radheat_diag_output - rad_q_qdp_calc - set_srf_net_sw - - check_energy_chng - tropopause_output - cam_export - diag_export - - - - - - flux_avg_run - physics_state_check - calc_flx_net - - - aero_model_emissions - calc_MEGAN_fluxes - set_srf_emissions - srf_emis_diag_output - fire_emissions_srf - - - - qneg4 - - aoa_tracers_timestep_tend - check_tracers_chng - co2_cycle_set_ptend - - - short_lived_species_writeic - get_curr_calday - chem_tropopause_find - neu_wetdep_tend - chem_calc_cldw - gas_phase_chemdr - nitro_srf_flx - chem_diag_output - - check_energy_chng - check_tracers_chng - - - set_dry_to_wet - tint_calc - ubc_get_vals - set_top_tint_val - rhoi_calc - compute_tms - tms_diag_output - compute_blj - blj_diag_output - theta_calc - virtem - calc_ustar - calc_obklen - pbl_diag_calc - dse_top_calc - compute_molec_diff_wet - compute_vdiff_wet - compute_molec_diff_dry - compute_vdiff_dry - aero_srf_flx_add - diff_flux_diag - diff_flux_tend_dry - set_wet_to_dry - pbl_diag_calc - diff_mass_check - pbl_output - - rayleigh_friction_tend - check_energy_chng - check_tracers_chng - - - calcram - calcram_diag_output - calc_atm_density - - modal_aero_depvel_part - - - - calc_aero_vars - - modal_aero_depvel_part - - aero_tracer_indx - depvel_m_to_pa - dust_sediment_tend - drydep_diag_output - - - set_srf_drydep - - charge_balance - - - - set_dry_to_wet - gw_prof - - - effgw_calc - gw_src_calc - gw_drag_prof - calc_taucd - egwdffi_tot_calc - momentum_flux_calc - energy_change - energy_fixer - gw_cam_update - - - check_energy_chng - lunar_tides_tend - check_energy_chng - calc_te_and_aam_budgets - nudging_timestep_tend - check_energy_chng - set_dry_to_wet - - - qfac_state_adjust - geopotential_dse - - calc_te_and_aam_budgets - dtcore_reset - diag_phys_tend_writeout - clybry_fam_set - - - 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 @@ check_energy_gmean_diagnostics - + check_energy_zero_fluxes check_energy_fix apply_heating_rate geopotential_temp - - + check_energy_scaling check_energy_chng + + check_energy_fix_diagnostics dadadj