Skip to content

ccpp-framework RRTMG lw/sw radiation CCPP-compliant #85

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.

Sign up for GitHub

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

Merged
climbfuji merged 12 commits into from
Jun 27, 2018
Merged

ccpp-framework RRTMG lw/sw radiation CCPP-compliant #85

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
3a7fb97
Add radiation routines to ccpp compile
Jun 14, 2018
8ff2954
a few more module dependencies
Jun 14, 2018
576c50e
Merge branch 'master' into update_v1_radiation
llpcarson Jun 14, 2018
41c0240
Remove HRRR Thompson MP from default SDF for FV3, create separate SDF
climbfuji Jun 19, 2018
3fa1aaf
scripts/ccpp_prebuild_config_SCM.py: add new optional arguments (clou…
climbfuji Jun 21, 2018
41afcfb
scripts/ccpp_prebuild_config_FV3.py: enable RRTMG lw/sw schemes and i…
climbfuji Jun 21, 2018
1afac15
examples/suite_FV3_test.xml and examples/suite_FV3_test_thompson.xml:…
climbfuji Jun 21, 2018
2e7e4ff
Activate GFS_debug.F90 scheme in FV3 CCPP prebuild config
climbfuji Jun 25, 2018
e82ede8
src/ccpp_fcall.F90: add information on current stage to debugging output
climbfuji Jun 25, 2018
99286b4
Add GFS_suite_interstitial_phys_reset to list of known schemes in gro…
climbfuji Jun 25, 2018
999cbd8
Merge branch 'master' of https://github.com/NCAR/ccpp-framework into …
climbfuji Jun 26, 2018
0b32d82
examples/suite_FV3_test.xml and examples/suite_FV3_test_thompson.xml:…
climbfuji Jun 26, 2018
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
25 changes: 24 additions & 1 deletion examples/suite_FV3_test.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,33 @@
<scheme>FV3_test</scheme>
</subcycle>
</group>
<group name="time_vary">
<subcycle loop="1">
<scheme>GFS_rrtmg_setup</scheme>
</subcycle>
</group>
<group name="radiation">
<subcycle loop="1">
<scheme>GFS_suite_interstitial_rad_reset</scheme>
<scheme>GFS_rrtmg_pre</scheme>
<scheme>rrtmg_sw_pre</scheme>
<scheme>rrtmg_sw</scheme>
<scheme>rrtmg_sw_post</scheme>
<scheme>rrtmg_lw_pre</scheme>
<scheme>rrtmg_lw</scheme>
<scheme>rrtmg_lw_post</scheme>
<scheme>GFS_rrtmg_post</scheme>
<!-- <scheme>memcheck</scheme> -->
<!-- <scheme>GFS_diagtoscreen</scheme> -->
<!-- <scheme>GFS_interstitialtoscreen</scheme> -->
</subcycle>
</group>
<group name="physics">
<subcycle loop="1">
<scheme>GFS_suite_interstitial_phys_reset</scheme>
<scheme>hedmf</scheme>
<scheme>samfdeepcnv</scheme>
<scheme>cnvc90</scheme>
<scheme>mp_thompson_hrrr</scheme>
</subcycle>
</group>
<!-- <finalize></finalize> -->
Expand Down
41 changes: 41 additions & 0 deletions examples/suite_FV3_test_thompson.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
<?xml version="1.0" encoding="UTF-8"?>

<suite name="FV3_test" lib="ccppphys" ver="1">
<!-- <init></init> -->
<group name="fast_physics">
<subcycle loop="1">
<scheme>FV3_test</scheme>
</subcycle>
</group>
<group name="time_vary">
<subcycle loop="1">
<scheme>GFS_rrtmg_setup</scheme>
</subcycle>
</group>
<group name="radiation">
<subcycle loop="1">
<scheme>GFS_suite_interstitial_rad_reset</scheme>
<scheme>GFS_rrtmg_pre</scheme>
<scheme>rrtmg_sw_pre</scheme>
<scheme>rrtmg_sw</scheme>
<scheme>rrtmg_sw_post</scheme>
<scheme>rrtmg_lw_pre</scheme>
<scheme>rrtmg_lw</scheme>
<scheme>rrtmg_lw_post</scheme>
<scheme>GFS_rrtmg_post</scheme>
<!-- <scheme>memcheck</scheme> -->
<!-- <scheme>GFS_diagtoscreen</scheme> -->
<!-- <scheme>GFS_interstitialtoscreen</scheme> -->
</subcycle>
</group>
<group name="physics">
<subcycle loop="1">
<scheme>GFS_suite_interstitial_phys_reset</scheme>
<scheme>hedmf</scheme>
<scheme>samfdeepcnv</scheme>
<scheme>cnvc90</scheme>
<scheme>mp_thompson_hrrr</scheme>
</subcycle>
</group>
<!-- <finalize></finalize> -->
</suite>
92 changes: 46 additions & 46 deletions scripts/ccpp_prebuild_config_FV3.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,41 +16,42 @@
# Add all physics scheme dependencies relative to basedir - note that these are all violations
# of the CCPP requirement to not use any external modules except Fortran standard modules!
SCHEME_FILES_DEPENDENCIES = [
# 'ccpp/physics/physics/GFDL_parse_tracers.F90',
'ccpp/physics/physics/GFDL_parse_tracers.F90',
# 'ccpp/physics/physics/date_def.f',
'ccpp/physics/physics/funcphys.f90',
# 'ccpp/physics/physics/gfs_phy_tracer_config.f',
# 'ccpp/physics/physics/gocart_tracer_config_stub.f',
# 'ccpp/physics/physics/h2o_def.f',
# 'ccpp/physics/physics/iounitdef.f',
'ccpp/physics/physics/gfs_phy_tracer_config.f',
'ccpp/physics/physics/gocart_tracer_config_stub.f',
'ccpp/physics/physics/h2o_def.f',
'ccpp/physics/physics/iounitdef.f',
'ccpp/physics/physics/machine.F', # DH should this be in FV3/gfsphysics/physics/physparam.f ?
# 'ccpp/physics/physics/mersenne_twister.f',
'ccpp/physics/physics/mersenne_twister.f',
'ccpp/physics/physics/mfpbl.f',
# 'ccpp/physics/physics/module_bfmicrophysics.f',
'ccpp/physics/physics/module_bfmicrophysics.f',
# 'ccpp/physics/physics/module_nst_model.f90',
# 'ccpp/physics/physics/module_nst_parameters.f90',
# 'ccpp/physics/physics/module_nst_water_prop.f90',
'ccpp/physics/physics/module_mp_thompson_hrrr_radar.F90',
'ccpp/physics/physics/module_mp_thompson_hrrr.F90',
# 'ccpp/physics/physics/namelist_soilveg.f',
# 'ccpp/physics/physics/ozne_def.f',
'ccpp/physics/physics/ozne_def.f',
'ccpp/physics/physics/physcons.f90',
'ccpp/physics/physics/physparam.f', # DH should this be in FV3/gfsphysics/physics/physparam.f ?
# 'ccpp/physics/physics/radcons.f90',
# 'ccpp/physics/physics/radiation_aerosols.f',
# 'ccpp/physics/physics/radiation_astronomy.f',
# 'ccpp/physics/physics/radiation_clouds.f',
# 'ccpp/physics/physics/radiation_gases.f',
# 'ccpp/physics/physics/radiation_surface.f',
# 'ccpp/physics/physics/radlw_datatb.f',
'ccpp/physics/physics/radlw_param.f', # DH should this be in FV3/gfsphysics/physics/radlw_param.f
# 'ccpp/physics/physics/radsw_datatb.f',
'ccpp/physics/physics/radsw_param.f', # DH should this be in FV3/gfsphysics/physics/radsw_param.f
# 'ccpp/physics/physics/rascnvv2.f',
'ccpp/physics/physics/radcons.f90',
'ccpp/physics/physics/radiation_aerosols.f',
'ccpp/physics/physics/radiation_astronomy.f',
'ccpp/physics/physics/radiation_clouds.f',
'ccpp/physics/physics/radiation_gases.f',
'ccpp/physics/physics/radiation_surface.f',
'ccpp/physics/physics/radlw_datatb.f',
'ccpp/physics/physics/radlw_param.f',
'ccpp/physics/physics/radsw_datatb.f',
'ccpp/physics/physics/radsw_param.f',
'ccpp/physics/physics/rascnvv2.f',
# 'ccpp/physics/physics/sflx.f',
'ccpp/physics/physics/surface_perturbation.F90',
'ccpp/physics/physics/tridi.f',
# 'ccpp/physics/physics/wam_f107_kp_mod.f90',
# 'FV3/gfsphysics/GFS_layer/GFS_typedefs.F90',
'ccpp/physics/physics/wam_f107_kp_mod.f90',
'FV3/gfsphysics/GFS_layer/GFS_typedefs.F90',
]

# Add all physics scheme files relative to basedir
Expand All @@ -62,11 +63,12 @@
# 'ccpp/physics/physics/GFS_PBL_generic.f90',
# 'ccpp/physics/physics/GFS_SCNV_generic.f90',
# 'ccpp/physics/physics/GFS_calpreciptype.f90',
# 'ccpp/physics/physics/GFS_debug.F90',
# 'ccpp/physics/physics/GFS_rrtmg_post.F90',
# 'ccpp/physics/physics/GFS_rrtmg_pre.F90',
'ccpp/physics/physics/GFS_debug.F90',
'ccpp/physics/physics/GFS_rrtmg_post.F90',
'ccpp/physics/physics/GFS_rrtmg_pre.F90',
'ccpp/physics/physics/GFS_rrtmg_setup.F90',
# 'ccpp/physics/physics/GFS_stochastics.f90',
# 'ccpp/physics/physics/GFS_suite_interstitial.ccpp.F90',
'ccpp/physics/physics/GFS_suite_interstitial.F90',
# 'ccpp/physics/physics/GFS_surface_generic.f90',
# 'ccpp/physics/physics/GFS_surface_loop_control.f',
# 'ccpp/physics/physics/GFS_zhao_carr_pre.f90',
Expand All @@ -82,13 +84,13 @@
'ccpp/physics/physics/mp_thompson_hrrr.F90',
# 'ccpp/physics/physics/ozphys.f',
# 'ccpp/physics/physics/precpd.f',
# 'ccpp/physics/physics/radlw_main.f',
# 'ccpp/physics/physics/radsw_main.f',
'ccpp/physics/physics/radlw_main.f',
'ccpp/physics/physics/radsw_main.f',
# 'ccpp/physics/physics/rayleigh_damp.f',
# 'ccpp/physics/physics/rrtmg_lw_post.F90',
# 'ccpp/physics/physics/rrtmg_lw_pre.F90',
# 'ccpp/physics/physics/rrtmg_sw_post.F90',
# 'ccpp/physics/physics/rrtmg_sw_pre.F90',
'ccpp/physics/physics/rrtmg_lw_post.F90',
'ccpp/physics/physics/rrtmg_lw_pre.F90',
'ccpp/physics/physics/rrtmg_sw_post.F90',
'ccpp/physics/physics/rrtmg_sw_pre.F90',
# 'ccpp/physics/physics/sfc_diag.f',
# 'ccpp/physics/physics/sfc_diff.f',
# 'ccpp/physics/physics/sfc_drv.f',
Expand Down Expand Up @@ -156,6 +158,8 @@
'mean_effective_radius_for_rain_drop',
'cloud_snow_water_path',
'mean_effective_radius_for_snow_flake',
'cloud_optical_depth_weighted',
'cloud_optical_depth_layers_678',
],
},
'rrtmg_lw' : {
Expand All @@ -169,6 +173,8 @@
'mean_effective_radius_for_rain_drop',
'cloud_snow_water_path',
'mean_effective_radius_for_snow_flake',
'cloud_optical_depth_weighted',
'cloud_optical_depth_layers_678',
],
},
'mp_thompson_hrrr' : {
Expand Down Expand Up @@ -222,24 +228,18 @@
use ccpp_api, only: ccpp_error
'''

## Modules to load for auto-generated ccpp_field_get code
## in the physics scheme cap (e.g. derived data types)
#MODULE_USE_TEMPLATE_SCHEME_CAP = \
#'''
# use machine, only: kind_phys
# use module_radlw_parameters, only: sfcflw_type, topflw_type
# use module_radsw_parameters, only: cmpfsw_type, sfcfsw_type, topfsw_type
# use GFS_typedefs, only: GFS_statein_type, GFS_stateout_type, &
# GFS_sfcprop_type, GFS_coupling_type, &
# GFS_control_type, GFS_grid_type, &
# GFS_tbd_type, GFS_cldprop_type, &
# GFS_radtend_type, GFS_diag_type, &
# GFS_interstitial_type
#'''

# Modules to load for auto-generated ccpp_field_get code
# in the physics scheme cap (e.g. derived data types)
MODULE_USE_TEMPLATE_SCHEME_CAP = \
'''
use machine, only: kind_phys
use machine, only: kind_phys
use module_radlw_parameters, only: sfcflw_type, topflw_type
use module_radsw_parameters, only: cmpfsw_type, sfcfsw_type, topfsw_type
use GFS_typedefs, only: GFS_statein_type, GFS_stateout_type, &
GFS_sfcprop_type, GFS_coupling_type, &
GFS_control_type, GFS_grid_type, &
GFS_tbd_type, GFS_cldprop_type, &
GFS_radtend_type, GFS_diag_type, &
GFS_interstitial_type
'''
6 changes: 5 additions & 1 deletion scripts/ccpp_prebuild_config_SCM.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
'ccpp-physics/physics/GFS_rad_time_vary.scm.f90',
'ccpp-physics/physics/GFS_rrtmg_post.F90',
'ccpp-physics/physics/GFS_rrtmg_pre.F90',
'ccpp-physics/physics/GFS_suite_interstitial.ccpp.F90',
'ccpp-physics/physics/GFS_suite_interstitial.F90',
'ccpp-physics/physics/GFS_surface_generic.f90',
'ccpp-physics/physics/GFS_surface_loop_control.f',
'ccpp-physics/physics/GFS_zhao_carr_pre.f90',
Expand Down Expand Up @@ -97,6 +97,8 @@
'mean_effective_radius_for_rain_drop',
'cloud_snow_water_path',
'mean_effective_radius_for_snow_flake',
'cloud_optical_depth_weighted',
'cloud_optical_depth_layers_678',
],
},
'rrtmg_lw' : {
Expand All @@ -110,6 +112,8 @@
'mean_effective_radius_for_rain_drop',
'cloud_snow_water_path',
'mean_effective_radius_for_snow_flake',
'cloud_optical_depth_weighted',
'cloud_optical_depth_layers_678',
],
},
#'subroutine_name_1' : 'all',
Expand Down
6 changes: 3 additions & 3 deletions src/ccpp_fcall.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ subroutine ccpp_run_suite(suite, cdata, stage, ierr)

ierr = 0

call ccpp_debug('Called ccpp_run_suite')
call ccpp_debug('Called ccpp_run_suite for stage ' // trim(stage))

do i=1,suite%groups_max
call ccpp_run_group(suite%groups(i), cdata, stage=stage, ierr=ierr)
Expand Down Expand Up @@ -243,7 +243,7 @@ subroutine ccpp_run_group(group, cdata, stage, ierr)

ierr = 0

call ccpp_debug('Called ccpp_run_group')
call ccpp_debug('Called ccpp_run_group for stage ' // trim(stage))

do i=1,group%subcycles_max
call ccpp_run_subcycle(group%subcycles(i), cdata, stage=stage, ierr=ierr)
Expand Down Expand Up @@ -307,7 +307,7 @@ subroutine ccpp_run_subcycle(subcycle, cdata, stage, ierr)

ierr = 0

call ccpp_debug('Called ccpp_run_subcycle')
call ccpp_debug('Called ccpp_run_subcycle for stage ' // trim(stage))

do i=1,subcycle%loop
do j=1,subcycle%schemes_max
Expand Down