Skip to content

Commit

Permalink
Add constituent tendency updater (#111)
Browse files Browse the repository at this point in the history
Originator(s): peverwhee

Summary (include the keyword ['closes', 'fixes', 'resolves'] and issue
number):
Adds the `apply_constituent_tendencies` scheme to
`utilties/physics_tendency_updaters.F90`.
- Replaces dadadj_apply_qv_tendency in the dadadj suite.

Describe any changes made to the namelist: None

List all files eliminated and why: 
D schemes/dry_adiabatic_adjust/dadadj_apply_qv_tendency.F90
D schemes/dry_adiabatic_adjust/dadadj_apply_qv_tendency.meta
- remove now-unnecessary temporary water vapor state update scheme

List all files added and what they do: none

List all existing files that have been modified, and describe the
changes:
(Helpful git command: git diff --name-status
development...<your_branch_name>)
M schemes/dry_adiabatic_adjust/dadadj.meta
- add `constituent = True` metadata property to tendency variable

M schemes/utilities/physics_tendency_updaters.F90
M schemes/utilities/physics_tendency_updaters.meta
- add new `apply_constituent_tendencies` scheme

M test/test_suites/suite_dry_adiabatic_adjust.xml
- replace temporary tendency updater scheme with new one

List any test failures: none
- Confirmed no differences found with ne5 run of dadadj (compared to
snapshots) on derecho

Is this a science-changing update? New physics package, algorithm
change, tuning changes, etc? No

---------

Co-authored-by: Courtney Peverley <[email protected]>
  • Loading branch information
peverwhee and Courtney Peverley authored Nov 27, 2024
1 parent 01e619f commit 045b630
Show file tree
Hide file tree
Showing 7 changed files with 216 additions and 207 deletions.
246 changes: 123 additions & 123 deletions doc/NamesNotInDictionary.txt
Original file line number Diff line number Diff line change
@@ -1,46 +1,13 @@

#######################
Date/time of when script was run:
2024-11-21 12:02:27.234727
2024-11-27 11:22:40.595150
#######################

Non-dictionary standard names found in the following metadata files:

--------------------------

atmospheric_physics/schemes/sima_diagnostics/check_energy_gmean_diagnostics.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

--------------------------

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_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

--------------------------

atmospheric_physics/schemes/sima_diagnostics/sima_state_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
- surface_air_pressure

--------------------------

atmospheric_physics/schemes/sima_diagnostics/tropopause_diagnostics.meta

- tropopause_air_pressure
Expand Down Expand Up @@ -69,49 +36,36 @@ atmospheric_physics/schemes/sima_diagnostics/tropopause_diagnostics.meta

--------------------------

atmospheric_physics/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

--------------------------

atmospheric_physics/schemes/tj2016/tj2016_sfc_pbl_hs.meta
atmospheric_physics/schemes/sima_diagnostics/sima_state_diagnostics.meta

- air_pressure_at_interface
- eddy_heat_diffusivity
- eddy_momentum_diffusivity
- gas_constant_of_water_vapor
- air_pressure_of_dry_air_at_interface
- geopotential_height_wrt_surface_at_interface
- 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
- ln_air_pressure_of_dry_air_at_interface
- 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

--------------------------

atmospheric_physics/schemes/dry_adiabatic_adjust/dadadj.meta
atmospheric_physics/schemes/sima_diagnostics/check_energy_gmean_diagnostics.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
- 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

--------------------------

atmospheric_physics/schemes/dry_adiabatic_adjust/dadadj_apply_qv_tendency.meta
atmospheric_physics/schemes/sima_diagnostics/check_energy_diagnostics.meta

- tendency_of_water_vapor_mixing_ratio_wrt_moist_air_and_condensed_water
- 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

--------------------------

Expand Down Expand Up @@ -168,6 +122,28 @@ atmospheric_physics/schemes/zhang_mcfarlane/zm_conv_evap.meta

--------------------------

atmospheric_physics/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
- current_timestep_number
- flag_for_zhang_mcfarlane_deep_convective_transport?
- fraction_of_water_insoluble_convectively_transported_species
- horizontal_index_of_convective_columns_for_deep_convection_for_convective_columns
- maximum_number_of_grid_cells_with_deep_convection?
- minimum_number_of_grid_cells_with_deep_convection?
- pressure_thickness_for_deep_convection_for_convective_columns
- pressure_thickness_for_subcloud_layer_for_deep_convection_for_convective_columns
- pressure_thickness_of_dry_air_for_deep_convection_for_convective_columns?
- tendency_of_ccpp_constituents?
- vertical_index_at_top_of_deep_convection_for_convective_columns
- vertical_index_of_deep_conveciton_launch_level_for_convective_columns

--------------------------

atmospheric_physics/schemes/zhang_mcfarlane/zm_convr.meta

- air_pressure_at_interface
Expand Down Expand Up @@ -225,40 +201,19 @@ atmospheric_physics/schemes/zhang_mcfarlane/zm_convr.meta

--------------------------

atmospheric_physics/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
- current_timestep_number
- flag_for_zhang_mcfarlane_deep_convective_transport?
- fraction_of_water_insoluble_convectively_transported_species
- horizontal_index_of_convective_columns_for_deep_convection_for_convective_columns
- maximum_number_of_grid_cells_with_deep_convection?
- minimum_number_of_grid_cells_with_deep_convection?
- pressure_thickness_for_deep_convection_for_convective_columns
- pressure_thickness_for_subcloud_layer_for_deep_convection_for_convective_columns
- pressure_thickness_of_dry_air_for_deep_convection_for_convective_columns?
- tendency_of_ccpp_constituents?
- vertical_index_at_top_of_deep_convection_for_convective_columns
- vertical_index_of_deep_conveciton_launch_level_for_convective_columns

--------------------------

atmospheric_physics/schemes/utilities/geopotential_temp.meta
atmospheric_physics/schemes/check_energy/dycore_energy_consistency_adjust.meta

- air_pressure_at_interface
- geopotential_height_wrt_surface_at_interface
- ln_air_pressure_at_interface
- 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

--------------------------

atmospheric_physics/schemes/check_energy/check_energy_save_teout.meta
atmospheric_physics/schemes/check_energy/check_energy_zero_fluxes.meta

- vertically_integrated_total_energy_at_end_of_physics_timestep
- vertically_integrated_total_energy_using_dycore_energy_formula
- 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

--------------------------

Expand Down Expand Up @@ -290,19 +245,18 @@ atmospheric_physics/schemes/check_energy/check_energy_chng.meta

--------------------------

atmospheric_physics/schemes/check_energy/check_energy_zero_fluxes.meta
atmospheric_physics/schemes/check_energy/check_energy_fix.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
- air_pressure_at_interface
- global_mean_heating_rate_correction_for_energy_conservation
- net_sensible_heat_flux_through_top_and_bottom_of_atmosphere_column
- net_water_vapor_fluxes_through_top_and_bottom_of_atmosphere_column

--------------------------

atmospheric_physics/schemes/check_energy/dycore_energy_consistency_adjust.meta
atmospheric_physics/schemes/check_energy/check_energy_save_teout.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
- vertically_integrated_total_energy_at_end_of_physics_timestep
- vertically_integrated_total_energy_using_dycore_energy_formula

--------------------------

Expand All @@ -313,14 +267,6 @@ atmospheric_physics/schemes/check_energy/check_energy_scaling.meta

--------------------------

atmospheric_physics/schemes/check_energy/check_energy_fix.meta

- air_pressure_at_interface
- global_mean_heating_rate_correction_for_energy_conservation
- net_sensible_heat_flux_through_top_and_bottom_of_atmosphere_column

--------------------------

atmospheric_physics/schemes/check_energy/check_energy_gmean/check_energy_gmean.meta

- air_pressure_at_interface
Expand All @@ -335,6 +281,74 @@ atmospheric_physics/schemes/check_energy/check_energy_gmean/check_energy_gmean.m

--------------------------

atmospheric_physics/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

--------------------------

atmospheric_physics/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

--------------------------

atmospheric_physics/schemes/musica/musica_ccpp.meta

- blackbody_temperature_at_surface
- dynamic_constituents_for_musica_ccpp
- extraterrestrial_radiation_flux
- geopotential_height_wrt_surface_at_interface
- micm_solver_type
- number_of_grid_cells
- number_of_photolysis_wavelength_grid_sections
- photolysis_wavelength_grid_interfaces
- surface_albedo_due_to_UV_and_VIS_direct

--------------------------

atmospheric_physics/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

--------------------------

atmospheric_physics/schemes/utilities/physics_tendency_updaters.meta

- ccpp_constituent_tendencies

--------------------------

atmospheric_physics/schemes/utilities/geopotential_temp.meta

- air_pressure_at_interface
- geopotential_height_wrt_surface_at_interface
- ln_air_pressure_at_interface

--------------------------

atmospheric_physics/schemes/tropopause_find/tropopause_find.meta

- air_pressure_at_interface
Expand Down Expand Up @@ -373,18 +387,4 @@ atmospheric_physics/schemes/tropopause_find/tropopause_find.meta
- 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
- dynamic_constituents_for_musica_ccpp
- extraterrestrial_radiation_flux
- geopotential_height_wrt_surface_at_interface
- micm_solver_type
- number_of_grid_cells
- number_of_photolysis_wavelength_grid_sections
- photolysis_wavelength_grid_interfaces
- surface_albedo_due_to_UV_and_VIS_direct

#######################
1 change: 1 addition & 0 deletions schemes/dry_adiabatic_adjust/dadadj.meta
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,7 @@
type = real | kind = kind_phys
dimensions = (horizontal_loop_extent, vertical_layer_dimension)
intent = out
constituent = True
[ dadpdf ]
standard_name = binary_indicator_for_dry_adiabatic_adjusted_grid_cell
units = fraction
Expand Down
33 changes: 0 additions & 33 deletions schemes/dry_adiabatic_adjust/dadadj_apply_qv_tendency.F90

This file was deleted.

Loading

0 comments on commit 045b630

Please sign in to comment.