Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update CCPP standard names for consistency #337

Closed
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 18 additions & 18 deletions ccpp/config/ccpp_prebuild_config.py
Original file line number Diff line number Diff line change
Expand Up @@ -272,27 +272,27 @@
},
'mp_thompson' : {
'mp_thompson_init' : [
'cloud_droplet_number_concentration',
'water_friendly_aerosol_number_concentration',
'ice_friendly_aerosol_number_concentration',
'tendency_of_water_friendly_aerosols_at_surface',
'tendency_of_ice_friendly_aerosols_at_surface',
'mass_number_concentration_of_cloud_liquid_water_particles_in_air',
'mass_number_concentration_of_hygroscopic_aerosols',
'mass_number_concentration_of_nonhygroscopic_ice_nucleating_aerosols',
'tendency_of_hygroscopic_aerosols_at_surface_adjacent_layer',
'tendency_of_nonhygroscopic_ice_nucleating_aerosols_at_surface_adjacent_layer',
# DH* 2020-06-01: turn off calculation of effective radii, now done in GFS_rrtmg_pre
#'effective_radius_of_stratiform_cloud_liquid_water_particle_in_um',
#'effective_radius_of_stratiform_cloud_ice_particle_in_um',
#'effective_radius_of_stratiform_cloud_snow_particle_in_um',
#'effective_radius_of_stratiform_cloud_liquid_water_particle',
#'effective_radius_of_stratiform_cloud_ice_particle',
#'effective_radius_of_stratiform_cloud_snow_particle',
# *DH 2020-06-01
],
'mp_thompson_run' : [
'cloud_droplet_number_concentration_updated_by_physics',
'water_friendly_aerosol_number_concentration_updated_by_physics',
'ice_friendly_aerosol_number_concentration_updated_by_physics',
'tendency_of_water_friendly_aerosols_at_surface',
'tendency_of_ice_friendly_aerosols_at_surface',
'mass_number_concentration_of_cloud_liquid_water_particles_in_air_of_new_state',
'mass_number_concentration_of_hygroscopic_aerosols_of_new_state',
'mass_number_concentration_of_nonhygroscopic_ice_nucleating_aerosols_of_new_state',
'tendency_of_hygroscopic_aerosols_at_surface_adjacent_layer',
'tendency_of_nonhygroscopic_ice_nucleating_aerosols_at_surface_adjacent_layer',
# DH* 2020-06-01: turn off calculation of effective radii, now done in GFS_rrtmg_pre
#'effective_radius_of_stratiform_cloud_liquid_water_particle_in_um',
#'effective_radius_of_stratiform_cloud_ice_particle_in_um',
#'effective_radius_of_stratiform_cloud_snow_particle_in_um',
#'effective_radius_of_stratiform_cloud_liquid_water_particle',
#'effective_radius_of_stratiform_cloud_ice_particle',
#'effective_radius_of_stratiform_cloud_snow_particle',
# *DH 2020-06-01
],
},
Expand All @@ -303,13 +303,13 @@
},
'GFS_rrtmgp_sw_post' : {
'GFS_rrtmgp_sw_post_run' : [
'tendency_of_air_temperature_due_to_shortwave_heating_assuming_clear_sky_on_radiation_time_step',
'tendency_of_air_temperature_due_to_shortwave_heating_assuming_clear_sky_on_radiation_timestep',
'components_of_surface_downward_shortwave_fluxes',
],
},
'GFS_rrtmgp_lw_post' : {
'GFS_rrtmgp_lw_post_run' : [
'tendency_of_air_temperature_due_to_longwave_heating_assuming_clear_sky_on_radiation_time_step',
'tendency_of_air_temperature_due_to_longwave_heating_assuming_clear_sky_on_radiation_timestep',
],
},
#'subroutine_name_1' : 'all',
Expand Down
2 changes: 1 addition & 1 deletion ccpp/data/CCPP_data.meta
Original file line number Diff line number Diff line change
Expand Up @@ -46,5 +46,5 @@
standard_name = GFS_interstitial_type_instance_all_threads
long_name = instance of derived type GFS_interstitial_type
units = DDT
dimensions = (omp_threads)
dimensions = (number_of_openmp_threads)
type = GFS_interstitial_type
Loading