Skip to content
Merged
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
43 changes: 22 additions & 21 deletions ccpp/config/ccpp_prebuild_config.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,22 +15,23 @@
# dependencies of these files to the list.
VARIABLE_DEFINITION_FILES = [
# actual variable definition files
'ccpp/framework/src/ccpp_types.F90',
'ccpp/physics/physics/machine.F',
'ccpp/physics/physics/radsw_param.f',
'ccpp/physics/physics/radlw_param.f',
'ccpp/physics/physics/h2o_def.f',
'ccpp/physics/physics/ozne_def.f',
'ccpp/physics/physics/radlw_param.f',
'ccpp/physics/physics/radiation_surface.f',
'ccpp/physics/physics/rte-rrtmgp/rrtmgp/mo_gas_optics_rrtmgp.F90',
'ccpp/physics/physics/rte-rrtmgp/rrtmgp/mo_gas_concentrations.F90',
'ccpp/physics/physics/rte-rrtmgp/rte/mo_optical_props.F90',
'ccpp/physics/physics/rte-rrtmgp/extensions/cloud_optics/mo_cloud_optics.F90',
'ccpp/physics/physics/rte-rrtmgp/rte/mo_source_functions.F90',
'scm/src/GFS_typedefs.F90',
'scm/src/scm_kinds.F90',
'scm/src/scm_type_defs.F90',
'scm/src/scm_physical_constants.F90',
'scm/src/scm_utils.F90', #no definitions, but scm_type_defs.F90 uses a module from this file
'ccpp/physics/physics/rte-rrtmgp/rrtmgp/mo_gas_optics_rrtmgp.F90',
'ccpp/physics/physics/rte-rrtmgp/rrtmgp/mo_gas_concentrations.F90',
'ccpp/physics/physics/rte-rrtmgp/rte/mo_optical_props.F90',
'ccpp/physics/physics/rte-rrtmgp/extensions/cloud_optics/mo_cloud_optics.F90',
'ccpp/physics/physics/rte-rrtmgp/rte/mo_source_functions.F90'
]

TYPEDEFS_NEW_METADATA = {
Expand Down Expand Up @@ -271,23 +272,23 @@
},
'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',
],
},
'rrtmgp_sw_rte' : {
Expand All @@ -297,13 +298,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/framework
Submodule framework updated 154 files
2 changes: 1 addition & 1 deletion ccpp/physics
Submodule physics updated 190 files
1 change: 0 additions & 1 deletion ccpp/physics_namelists/input_GFS_v15p2.nml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
fhcyc = 24.
use_ufo = .true.
pre_rad = .false.
ncld = 5
imp_physics = 11
pdfcld = .false.
fhswr = 3600.
Expand Down
1 change: 0 additions & 1 deletion ccpp/physics_namelists/input_GFS_v15p2_ACM.nml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
fhcyc = 24.
use_ufo = .true.
pre_rad = .false.
ncld = 5
imp_physics = 11
pdfcld = .false.
fhswr = 3600.
Expand Down
1 change: 0 additions & 1 deletion ccpp/physics_namelists/input_GFS_v15p2_FA.nml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
fhcyc = 24.
use_ufo = .true.
pre_rad = .false.
ncld = 5
imp_physics = 15
spec_adv = .true.
RHGRD = 0.98
Expand Down
1 change: 0 additions & 1 deletion ccpp/physics_namelists/input_GFS_v15p2_MYJ.nml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
fhcyc = 24.
use_ufo = .true.
pre_rad = .false.
ncld = 5
imp_physics = 11
pdfcld = .false.
fhswr = 3600.
Expand Down
1 change: 0 additions & 1 deletion ccpp/physics_namelists/input_GFS_v15p2_RRTMGP.nml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
fhcyc = 24.
use_ufo = .true.
pre_rad = .false.
ncld = 5
imp_physics = 11
pdfcld = .false.
fhswr = 3600.
Expand Down
1 change: 0 additions & 1 deletion ccpp/physics_namelists/input_GFS_v15p2_RRTMGP_LWjac.nml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
fhcyc = 24.
use_ufo = .true.
pre_rad = .false.
ncld = 5
imp_physics = 11
pdfcld = .false.
fhswr = 3600.
Expand Down
1 change: 0 additions & 1 deletion ccpp/physics_namelists/input_GFS_v15p2_YSU.nml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
fhcyc = 24.
use_ufo = .true.
pre_rad = .false.
ncld = 5
imp_physics = 11
pdfcld = .false.
fhswr = 3600.
Expand Down
1 change: 0 additions & 1 deletion ccpp/physics_namelists/input_GFS_v15p2_noahmp.nml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
fhcyc = 24.
use_ufo = .true.
pre_rad = .false.
ncld = 5
imp_physics = 11
pdfcld = .false.
fhswr = 3600.
Expand Down
1 change: 0 additions & 1 deletion ccpp/physics_namelists/input_GFS_v15p2_saYSU.nml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
fhcyc = 24.
use_ufo = .true.
pre_rad = .false.
ncld = 5
imp_physics = 11
pdfcld = .false.
fhswr = 3600.
Expand Down
1 change: 0 additions & 1 deletion ccpp/physics_namelists/input_GFS_v16.nml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
fhcyc = 24
use_ufo = .true.
pre_rad = .false.
ncld = 5
imp_physics = 11
pdfcld = .false.
fhswr = 3600.
Expand Down
1 change: 0 additions & 1 deletion ccpp/physics_namelists/input_GFS_v16_RRTMGP.nml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
fhcyc = 24
use_ufo = .true.
pre_rad = .false.
ncld = 5
imp_physics = 11
pdfcld = .false.
fhswr = 3600.
Expand Down
1 change: 0 additions & 1 deletion ccpp/physics_namelists/input_GFS_v16_RRTMGP_LWjac.nml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
fhcyc = 24
use_ufo = .true.
pre_rad = .false.
ncld = 5
imp_physics = 11
pdfcld = .false.
fhswr = 3600.
Expand Down
1 change: 0 additions & 1 deletion ccpp/physics_namelists/input_GFS_v16_ps.nml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
fhcyc = 24
use_ufo = .true.
pre_rad = .false.
ncld = 5
imp_physics = 11
pdfcld = .false.
fhswr = 3600.
Expand Down
1 change: 0 additions & 1 deletion ccpp/physics_namelists/input_GFS_v16_ugwpv1.nml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
fhcyc = 24
use_ufo = .true.
pre_rad = .false.
ncld = 5
imp_physics = 11
pdfcld = .false.
fhswr = 3600.
Expand Down
1 change: 0 additions & 1 deletion ccpp/physics_namelists/input_GSD_v1.nml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
nst_anl = .true.
use_ufo = .true.
pre_rad = .false.
ncld = 5
imp_physics = 8
ltaerosol = .true.
lradar = .true.
Expand Down
1 change: 0 additions & 1 deletion ccpp/physics_namelists/input_HAFS_v0_hwrf.nml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
nst_anl = .true.
use_ufo = .true.
pre_rad = .false.
ncld = 5
imp_physics = 15
spec_adv = .true. ! HWRF F-A
RHGRD = 0.98 ! HWRF F-A
Expand Down
1 change: 0 additions & 1 deletion ccpp/physics_namelists/input_HAFS_v0_hwrf_thompson.nml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
nst_anl = .true.
use_ufo = .true.
pre_rad = .false.
ncld = 5
imp_physics = 8
spec_adv = .true. ! HWRF F-A
RHGRD = 0.98 ! HWRF F-A
Expand Down
1 change: 0 additions & 1 deletion ccpp/physics_namelists/input_RRFS_v1alpha.nml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,6 @@
lsoil_lsm = 4
ltaerosol = .true.
lwhtr = .true.
ncld = 5
nsradar_reset = 3600
nst_anl = .true.
nstf_name = 2,1,0,0,0
Expand Down
1 change: 0 additions & 1 deletion ccpp/physics_namelists/input_csawmg.nml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
use_ufo = .true.
pre_rad = .false.
crtrh = 0.93,0.90,0.95
ncld = 2
imp_physics = 10
pdfcld = .false.
fhswr = 3600.
Expand Down
1 change: 0 additions & 1 deletion ccpp/suites/suite_HAFS_v0_hwrf.xml
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,6 @@
<scheme>cires_ugwp</scheme>
<scheme>cires_ugwp_post</scheme>
<scheme>GFS_GWD_generic_post</scheme>
<scheme>rayleigh_damp</scheme>
<scheme>GFS_suite_stateout_update</scheme>
<scheme>ozphys_2015</scheme>
<scheme>h2ophys</scheme>
Expand Down
1 change: 0 additions & 1 deletion ccpp/suites/suite_HAFS_v0_hwrf_ps.xml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@
<scheme>cires_ugwp</scheme>
<scheme>cires_ugwp_post</scheme>
<scheme>GFS_GWD_generic_post</scheme>
<scheme>rayleigh_damp</scheme>
<scheme>GFS_suite_stateout_update</scheme>
<scheme>ozphys_2015</scheme>
<scheme>h2ophys</scheme>
Expand Down
1 change: 0 additions & 1 deletion ccpp/suites/suite_HAFS_v0_hwrf_thompson.xml
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,6 @@
<scheme>cires_ugwp</scheme>
<scheme>cires_ugwp_post</scheme>
<scheme>GFS_GWD_generic_post</scheme>
<scheme>rayleigh_damp</scheme>
<scheme>GFS_suite_stateout_update</scheme>
<scheme>ozphys_2015</scheme>
<scheme>h2ophys</scheme>
Expand Down
1 change: 0 additions & 1 deletion ccpp/suites/suite_HAFS_v0_hwrf_thompson_ps.xml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@
<scheme>cires_ugwp</scheme>
<scheme>cires_ugwp_post</scheme>
<scheme>GFS_GWD_generic_post</scheme>
<scheme>rayleigh_damp</scheme>
<scheme>GFS_suite_stateout_update</scheme>
<scheme>ozphys_2015</scheme>
<scheme>h2ophys</scheme>
Expand Down
1 change: 0 additions & 1 deletion ccpp/suites/suite_SCM_GFS_v15p2.xml
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,6 @@
<scheme>cires_ugwp</scheme>
<scheme>cires_ugwp_post</scheme>
<scheme>GFS_GWD_generic_post</scheme>
<scheme>rayleigh_damp</scheme>
<scheme>GFS_suite_stateout_update</scheme>
<scheme>ozphys_2015</scheme>
<scheme>h2ophys</scheme>
Expand Down
1 change: 0 additions & 1 deletion ccpp/suites/suite_SCM_GFS_v15p2_ACM_ps.xml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@
<scheme>cires_ugwp</scheme>
<scheme>cires_ugwp_post</scheme>
<scheme>GFS_GWD_generic_post</scheme>
<scheme>rayleigh_damp</scheme>
<scheme>GFS_suite_stateout_update</scheme>
<scheme>ozphys_2015</scheme>
<scheme>h2ophys</scheme>
Expand Down
1 change: 0 additions & 1 deletion ccpp/suites/suite_SCM_GFS_v15p2_FA.xml
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,6 @@
<scheme>cires_ugwp</scheme>
<scheme>cires_ugwp_post</scheme>
<scheme>GFS_GWD_generic_post</scheme>
<scheme>rayleigh_damp</scheme>
<scheme>GFS_suite_stateout_update</scheme>
<scheme>ozphys_2015</scheme>
<scheme>h2ophys</scheme>
Expand Down
1 change: 0 additions & 1 deletion ccpp/suites/suite_SCM_GFS_v15p2_MYJ.xml
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,6 @@
<scheme>cires_ugwp</scheme>
<scheme>cires_ugwp_post</scheme>
<scheme>GFS_GWD_generic_post</scheme>
<scheme>rayleigh_damp</scheme>
<scheme>GFS_suite_stateout_update</scheme>
<scheme>ozphys_2015</scheme>
<scheme>h2ophys</scheme>
Expand Down
1 change: 0 additions & 1 deletion ccpp/suites/suite_SCM_GFS_v15p2_RRTMGP.xml
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,6 @@
<scheme>cires_ugwp</scheme>
<scheme>cires_ugwp_post</scheme>
<scheme>GFS_GWD_generic_post</scheme>
<scheme>rayleigh_damp</scheme>
<scheme>GFS_suite_stateout_update</scheme>
<scheme>ozphys_2015</scheme>
<scheme>h2ophys</scheme>
Expand Down
1 change: 0 additions & 1 deletion ccpp/suites/suite_SCM_GFS_v15p2_RRTMGP_ps.xml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@
<scheme>cires_ugwp</scheme>
<scheme>cires_ugwp_post</scheme>
<scheme>GFS_GWD_generic_post</scheme>
<scheme>rayleigh_damp</scheme>
<scheme>GFS_suite_stateout_update</scheme>
<scheme>ozphys_2015</scheme>
<scheme>h2ophys</scheme>
Expand Down
1 change: 0 additions & 1 deletion ccpp/suites/suite_SCM_GFS_v15p2_YSU_ps.xml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@
<scheme>cires_ugwp</scheme>
<scheme>cires_ugwp_post</scheme>
<scheme>GFS_GWD_generic_post</scheme>
<scheme>rayleigh_damp</scheme>
<scheme>GFS_suite_stateout_update</scheme>
<scheme>ozphys_2015</scheme>
<scheme>h2ophys</scheme>
Expand Down
1 change: 0 additions & 1 deletion ccpp/suites/suite_SCM_GFS_v15p2_no_nsst.xml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,6 @@
<scheme>cires_ugwp</scheme>
<scheme>cires_ugwp_post</scheme>
<scheme>GFS_GWD_generic_post</scheme>
<scheme>rayleigh_damp</scheme>
<scheme>GFS_suite_stateout_update</scheme>
<scheme>ozphys_2015</scheme>
<scheme>h2ophys</scheme>
Expand Down
1 change: 0 additions & 1 deletion ccpp/suites/suite_SCM_GFS_v15p2_no_nsst_ps.xml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@
<scheme>cires_ugwp</scheme>
<scheme>cires_ugwp_post</scheme>
<scheme>GFS_GWD_generic_post</scheme>
<scheme>rayleigh_damp</scheme>
<scheme>GFS_suite_stateout_update</scheme>
<scheme>ozphys_2015</scheme>
<scheme>h2ophys</scheme>
Expand Down
1 change: 0 additions & 1 deletion ccpp/suites/suite_SCM_GFS_v15p2_noahmp.xml
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,6 @@
<scheme>cires_ugwp</scheme>
<scheme>cires_ugwp_post</scheme>
<scheme>GFS_GWD_generic_post</scheme>
<scheme>rayleigh_damp</scheme>
<scheme>GFS_suite_stateout_update</scheme>
<scheme>ozphys_2015</scheme>
<scheme>h2ophys</scheme>
Expand Down
1 change: 0 additions & 1 deletion ccpp/suites/suite_SCM_GFS_v15p2_ps.xml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@
<scheme>cires_ugwp</scheme>
<scheme>cires_ugwp_post</scheme>
<scheme>GFS_GWD_generic_post</scheme>
<scheme>rayleigh_damp</scheme>
<scheme>GFS_suite_stateout_update</scheme>
<scheme>ozphys_2015</scheme>
<scheme>h2ophys</scheme>
Expand Down
1 change: 0 additions & 1 deletion ccpp/suites/suite_SCM_GFS_v15p2_saYSU_ps.xml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@
<scheme>cires_ugwp</scheme>
<scheme>cires_ugwp_post</scheme>
<scheme>GFS_GWD_generic_post</scheme>
<scheme>rayleigh_damp</scheme>
<scheme>GFS_suite_stateout_update</scheme>
<scheme>ozphys_2015</scheme>
<scheme>h2ophys</scheme>
Expand Down
1 change: 0 additions & 1 deletion ccpp/suites/suite_SCM_GFS_v16.xml
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,6 @@
<scheme>cires_ugwp</scheme>
<scheme>cires_ugwp_post</scheme>
<scheme>GFS_GWD_generic_post</scheme>
<scheme>rayleigh_damp</scheme>
<scheme>GFS_suite_stateout_update</scheme>
<scheme>ozphys_2015</scheme>
<scheme>h2ophys</scheme>
Expand Down
1 change: 0 additions & 1 deletion ccpp/suites/suite_SCM_GFS_v16_RRTMGP.xml
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,6 @@
<scheme>cires_ugwp</scheme>
<scheme>cires_ugwp_post</scheme>
<scheme>GFS_GWD_generic_post</scheme>
<scheme>rayleigh_damp</scheme>
<scheme>GFS_suite_stateout_update</scheme>
<scheme>ozphys_2015</scheme>
<scheme>h2ophys</scheme>
Expand Down
1 change: 0 additions & 1 deletion ccpp/suites/suite_SCM_GFS_v16_RRTMGP_ps.xml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@
<scheme>cires_ugwp</scheme>
<scheme>cires_ugwp_post</scheme>
<scheme>GFS_GWD_generic_post</scheme>
<scheme>rayleigh_damp</scheme>
<scheme>GFS_suite_stateout_update</scheme>
<scheme>ozphys_2015</scheme>
<scheme>h2ophys</scheme>
Expand Down
Loading