Skip to content

Commit

Permalink
Wrapper PR for "Update CCPP standard names for consistency (NOAA-EMC#337
Browse files Browse the repository at this point in the history 
)" (NOAA-EMC#356)

* update standard names in accordance with CCPPStandardNames PR#13 as of 2021/7/1
* Fix merge conflicts in ccpp/data/GFS_typedefs.meta

Co-authored-by: grantfirl <grantf@ucar.edu>
  • Loading branch information
@climbfuji @grantfirl
climbfuji and grantfirl committed Jul 29, 2021
1 parent f8732ff commit fca8282
Show file tree
Hide file tree
Showing 5 changed files with 1,358 additions and 1,355 deletions.
36 changes: 18 additions & 18 deletions ccpp/config/ccpp_prebuild_config.py
View file
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
View file
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
7 changes: 4 additions & 3 deletions ccpp/data/GFS_typedefs.F90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1970,6 +1970,7 @@ module GFS_typedefs
integer :: nsamftrac !<
integer :: nscav !<
integer :: nspc1 !<
integer :: ntcwx !<
integer :: ntiwx !<
integer :: ntk !<
integer :: ntkev !<
Expand Down Expand Up @@ -6904,7 +6905,7 @@ subroutine interstitial_create (Interstitial, IM, Model)
!
allocate (Interstitial%otspt (Model%ntracp1,2))
! Set up numbers of tracers for PBL, convection, etc: sets
! Interstitial%{nvdiff,mg3_as_mg2,nn,tracers_total,ntiwx,ntk,ntkev,otspt,nsamftrac,ncstrac,nscav}
! Interstitial%{nvdiff,mg3_as_mg2,nn,tracers_total,ntcwx,ntiwx,ntk,ntkev,otspt,nsamftrac,ncstrac,nscav}
call interstitial_setup_tracers(Interstitial, Model)
! Allocate arrays
allocate (Interstitial%adjsfculw_land (IM))
Expand Down Expand Up @@ -7443,8 +7444,7 @@ subroutine interstitial_setup_tracers(Interstitial, Model)

Interstitial%nscav = Model%ntrac - Model%ncnd + 2


! DH* STILL VALID GIVEN THE CHANGES BELOW FOR CPLCHM?
Interstitial%ntcwx = Model%ntcw
if (Interstitial%nvdiff == Model%ntrac) then
Interstitial%ntiwx = Model%ntiw
else
Expand Down Expand Up @@ -8012,6 +8012,7 @@ subroutine interstitial_print(Interstitial, Model, mpirank, omprank, blkno)
write (0,*) 'Interstitial%nsamftrac = ', Interstitial%nsamftrac
write (0,*) 'Interstitial%nscav = ', Interstitial%nscav
write (0,*) 'Interstitial%nspc1 = ', Interstitial%nspc1
write (0,*) 'Interstitial%ntcwx = ', Interstitial%ntcwx
write (0,*) 'Interstitial%ntiwx = ', Interstitial%ntiwx
write (0,*) 'Interstitial%nvdiff = ', Interstitial%nvdiff
write (0,*) 'Interstitial%phys_hydrostatic = ', Interstitial%phys_hydrostatic
Expand Down
Loading

0 comments on commit fca8282

Please sign in to comment.