From 00431eaff9b293599ada2ef35fbd10021b4faf58 Mon Sep 17 00:00:00 2001 From: Dustin Swales Date: Mon, 1 Jun 2020 19:20:48 +0000 Subject: [PATCH] Renamed sampling routines. --- ccpp/config/ccpp_prebuild_config.py | 54 ++++++++------------ ccpp/physics | 2 +- ccpp/suites/suite_FV3_GFS_v15p2_RRTMGP.xml | 4 +- ccpp/suites/suite_FV3_GFS_v16beta_RRTMGP.xml | 4 +- 4 files changed, 27 insertions(+), 37 deletions(-) diff --git a/ccpp/config/ccpp_prebuild_config.py b/ccpp/config/ccpp_prebuild_config.py index 88076af3b..31a5e3aef 100755 --- a/ccpp/config/ccpp_prebuild_config.py +++ b/ccpp/config/ccpp_prebuild_config.py @@ -295,26 +295,28 @@ # for testing the and sections 'FV3/ccpp/physics/physics/GFS_suite_init_finalize_test.F90' : [ 'slow_physics' ], # RRTMGP - 'FV3/ccpp/physics/physics/rrtmg_lw_cloud_optics.F90' : [ 'slow_physics' ], - 'FV3/ccpp/physics/physics/rrtmg_sw_cloud_optics.F90' : [ 'slow_physics' ], - 'FV3/ccpp/physics/physics/mo_cloud_sampling.F90' : [ 'slow_physics' ], - 'FV3/ccpp/physics/physics/rrtmgp_aux.F90' : [ 'slow_physics' ], - 'FV3/ccpp/physics/physics/rrtmgp_lw_gas_optics.F90' : [ 'slow_physics' ], - 'FV3/ccpp/physics/physics/rrtmgp_lw_cloud_optics.F90' : [ 'slow_physics' ], - 'FV3/ccpp/physics/physics/rrtmgp_sw_gas_optics.F90' : [ 'slow_physics' ], - 'FV3/ccpp/physics/physics/rrtmgp_sw_cloud_optics.F90' : [ 'slow_physics' ], - 'FV3/ccpp/physics/physics/rrtmgp_sw_aerosol_optics.F90' : [ 'slow_physics' ], - 'FV3/ccpp/physics/physics/rrtmgp_lw_rte.F90' : [ 'slow_physics' ], - 'FV3/ccpp/physics/physics/rrtmgp_lw_cloud_sampling.F90' : [ 'slow_physics' ], - 'FV3/ccpp/physics/physics/rrtmgp_sw_rte.F90' : [ 'slow_physics' ], - 'FV3/ccpp/physics/physics/rrtmgp_sw_cloud_sampling.F90' : [ 'slow_physics' ], - 'FV3/ccpp/physics/physics/rrtmgp_lw_aerosol_optics.F90' : [ 'slow_physics' ], - 'FV3/ccpp/physics/physics/GFS_rrtmgp_setup.F90' : [ 'slow_physics' ], - 'FV3/ccpp/physics/physics/GFS_rrtmgp_pre.F90' : [ 'slow_physics' ], - 'FV3/ccpp/physics/physics/rrtmgp_lw_pre.F90' : [ 'slow_physics' ], - 'FV3/ccpp/physics/physics/GFS_rrtmgp_sw_pre.F90' : [ 'slow_physics' ], - 'FV3/ccpp/physics/physics/GFS_rrtmgp_lw_post.F90' : [ 'slow_physics' ], - 'FV3/ccpp/physics/physics/GFS_rrtmgp_sw_post.F90' : [ 'slow_physics' ], + 'FV3/ccpp/physics/physics/rrtmg_lw_cloud_optics.F90' : [ 'slow_physics' ], + 'FV3/ccpp/physics/physics/rrtmg_sw_cloud_optics.F90' : [ 'slow_physics' ], + 'FV3/ccpp/physics/physics/mo_cloud_sampling.F90' : [ 'slow_physics' ], + 'FV3/ccpp/physics/physics/rrtmgp_aux.F90' : [ 'slow_physics' ], + 'FV3/ccpp/physics/physics/rrtmgp_lw_gas_optics.F90' : [ 'slow_physics' ], + 'FV3/ccpp/physics/physics/rrtmgp_lw_cloud_optics.F90' : [ 'slow_physics' ], + 'FV3/ccpp/physics/physics/rrtmgp_sw_gas_optics.F90' : [ 'slow_physics' ], + 'FV3/ccpp/physics/physics/rrtmgp_sw_cloud_optics.F90' : [ 'slow_physics' ], + 'FV3/ccpp/physics/physics/rrtmgp_sw_aerosol_optics.F90' : [ 'slow_physics' ], + 'FV3/ccpp/physics/physics/rrtmgp_lw_rte.F90' : [ 'slow_physics' ], + 'FV3/ccpp/physics/physics/rrtmgp_gfdlmp_lw_cloud_sampling.F90' : [ 'slow_physics' ], + 'FV3/ccpp/physics/physics/rrtmgp_sw_rte.F90' : [ 'slow_physics' ], + 'FV3/ccpp/physics/physics/rrtmgp_gfdlmp_sw_cloud_sampling.F90' : [ 'slow_physics' ], + 'FV3/ccpp/physics/physics/rrtmgp_lw_aerosol_optics.F90' : [ 'slow_physics' ], + 'FV3/ccpp/physics/physics/GFS_rrtmgp_setup.F90' : [ 'slow_physics' ], + 'FV3/ccpp/physics/physics/GFS_rrtmgp_pre.F90' : [ 'slow_physics' ], + 'FV3/ccpp/physics/physics/GFS_rrtmgp_gfdlmp_pre.F90' : [ 'slow_physics' ], + 'FV3/ccpp/physics/physics/GFS_cloud_diagnostics.F90' : [ 'slow_physics' ], + 'FV3/ccpp/physics/physics/rrtmgp_lw_pre.F90' : [ 'slow_physics' ], + 'FV3/ccpp/physics/physics/GFS_rrtmgp_sw_pre.F90' : [ 'slow_physics' ], + 'FV3/ccpp/physics/physics/GFS_rrtmgp_lw_post.F90' : [ 'slow_physics' ], + 'FV3/ccpp/physics/physics/GFS_rrtmgp_sw_post.F90' : [ 'slow_physics' ], } # Default build dir, relative to current working directory, @@ -358,29 +360,17 @@ 'rrtmgp_sw_rte' : { 'rrtmgp_sw_rte_run' : [ 'components_of_surface_downward_shortwave_fluxes', - 'sw_fluxes_sfc', - 'sw_fluxes_toa', ], }, 'GFS_rrtmgp_sw_post' : { 'GFS_rrtmgp_sw_post_run' : [ 'tendency_of_air_temperature_due_to_shortwave_heating_assuming_clear_sky_on_radiation_time_step_and_radiation_levels', 'components_of_surface_downward_shortwave_fluxes', - 'sw_fluxes_sfc', - 'sw_fluxes_toa', ], }, - 'rrtmgp_lw_rte' : { - 'rrtmgp_lw_rte_run' : [ - 'lw_fluxes_sfc', - 'lw_fluxes_toa', - ], - }, 'GFS_rrtmgp_lw_post' : { 'GFS_rrtmgp_lw_post_run' : [ 'tendency_of_air_temperature_due_to_longwave_heating_assuming_clear_sky_on_radiation_time_step_and_radiation_levels', - 'lw_fluxes_sfc', - 'lw_fluxes_toa', ], }, 'GFS_rrtmgp_post' : { diff --git a/ccpp/physics b/ccpp/physics index 9d9805615..499b3ddb6 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit 9d98056157ec6af0175b917bb73fbc69ed6b8799 +Subproject commit 499b3ddb629e02d8d4956323f8901799baf003f0 diff --git a/ccpp/suites/suite_FV3_GFS_v15p2_RRTMGP.xml b/ccpp/suites/suite_FV3_GFS_v15p2_RRTMGP.xml index 2d2328123..688821f81 100644 --- a/ccpp/suites/suite_FV3_GFS_v15p2_RRTMGP.xml +++ b/ccpp/suites/suite_FV3_GFS_v15p2_RRTMGP.xml @@ -25,14 +25,14 @@ rrtmgp_sw_gas_optics rrtmgp_sw_aerosol_optics rrtmgp_sw_cloud_optics - rrtmgp_sw_cloud_sampling + rrtmgp_gfdlmp_sw_cloud_sampling rrtmgp_sw_rte GFS_rrtmgp_sw_post rrtmgp_lw_pre rrtmgp_lw_gas_optics rrtmgp_lw_aerosol_optics rrtmgp_lw_cloud_optics - rrtmgp_lw_cloud_sampling + rrtmgp_gfdlmp_lw_cloud_sampling rrtmgp_lw_rte GFS_rrtmgp_lw_post diff --git a/ccpp/suites/suite_FV3_GFS_v16beta_RRTMGP.xml b/ccpp/suites/suite_FV3_GFS_v16beta_RRTMGP.xml index e6705da77..0a0e34227 100644 --- a/ccpp/suites/suite_FV3_GFS_v16beta_RRTMGP.xml +++ b/ccpp/suites/suite_FV3_GFS_v16beta_RRTMGP.xml @@ -25,14 +25,14 @@ rrtmgp_sw_gas_optics rrtmgp_sw_aerosol_optics rrtmgp_sw_cloud_optics - rrtmgp_sw_cloud_sampling + rrtmgp_gfdlmp_sw_cloud_sampling rrtmgp_sw_rte GFS_rrtmgp_sw_post rrtmgp_lw_pre rrtmgp_lw_gas_optics rrtmgp_lw_aerosol_optics rrtmgp_lw_cloud_optics - rrtmgp_lw_cloud_sampling + rrtmgp_gfdlmp_lw_cloud_sampling rrtmgp_lw_rte GFS_rrtmgp_lw_post