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.

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

CCPP run _init and _final for schemes #70

Merged
merged 3 commits into from
May 31, 2018
Merged

CCPP run _init and _final for schemes #70

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a0240c7
New functionality that runs all scheme _init routines as part of ccpp…
DomHeinzeller May 25, 2018
275101f
Update schemes to reflect changes for init/run/finalize: CCPP now add…
DomHeinzeller May 25, 2018
70885cc
Removed _run suffix from schemes in current SDFs
DomHeinzeller May 25, 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
6 changes: 3 additions & 3 deletions examples/suite_FV3_test.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>

<suite name="FV3_test" lib="ccppphys" ver="1">
<init>FV3_test_init</init>
<!-- <init></init> -->
<group name="fast_physics">
<subcycle loop="1">
<scheme>FV3_test_run</scheme>
<scheme>FV3_test</scheme>
</subcycle>
</group>
<finalize>FV3_test_finalize</finalize>
<!-- <finalize></finalize> -->
</suite>
158 changes: 79 additions & 79 deletions examples/suite_GFS_operational_2017.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,97 +9,97 @@
</group>
<group name="radiation">
<subcycle loop="1">
<scheme>GFS_suite_interstitial_rad_reset_run</scheme>
<scheme>GFS_rrtmg_pre_run</scheme>
<scheme>rrtmg_sw_pre_run</scheme>
<scheme>rrtmg_sw_run</scheme>
<scheme>rrtmg_sw_post_run</scheme>
<scheme>rrtmg_lw_pre_run</scheme>
<scheme>rrtmg_lw_run</scheme>
<scheme>rrtmg_lw_post_run</scheme>
<scheme>GFS_rrtmg_post_run</scheme>
<!-- <scheme>memcheck_run</scheme> -->
<!-- <scheme>GFS_diagtoscreen_run</scheme> -->
<!-- <scheme>GFS_interstitialtoscreen_run</scheme> -->
<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_run</scheme>
<scheme>get_prs_fv3_run</scheme>
<scheme>GFS_suite_interstitial_1_run</scheme>
<scheme>sfc_sice_pre_run</scheme>
<scheme>dcyc2t3_run</scheme>
<scheme>GFS_suite_interstitial_2_run</scheme>
<scheme>GFS_surface_generic_pre_run</scheme>
<scheme>GFS_PBL_generic_pre_run</scheme>
<scheme>lsm_noah_pre_run</scheme>
<scheme>GFS_suite_interstitial_phys_reset</scheme>
<scheme>get_prs_fv3</scheme>
<scheme>GFS_suite_interstitial_1</scheme>
<scheme>sfc_sice_pre</scheme>
<scheme>dcyc2t3</scheme>
<scheme>GFS_suite_interstitial_2</scheme>
<scheme>GFS_surface_generic_pre</scheme>
<scheme>GFS_PBL_generic_pre</scheme>
<scheme>lsm_noah_pre</scheme>
<!-- DH* TODO - turn into a subsycle loop="2" construct? -->
<!-- Surface iteration loop 1 -->
<scheme>GFS_surface_loop_control_part0_run</scheme>
<scheme>sfc_ex_coef_run</scheme>
<scheme>GFS_surface_loop_control_part1_run</scheme>
<scheme>sfc_nst_pre_run</scheme>
<scheme>sfc_nst_run</scheme>
<scheme>sfc_nst_post_run</scheme>
<scheme>lsm_noah_run</scheme>
<scheme>sfc_sice_run</scheme>
<scheme>GFS_surface_loop_control_part2_run</scheme>
<scheme>GFS_surface_loop_control_part0</scheme>
<scheme>sfc_ex_coef</scheme>
<scheme>GFS_surface_loop_control_part1</scheme>
<scheme>sfc_nst_pre</scheme>
<scheme>sfc_nst</scheme>
<scheme>sfc_nst_post</scheme>
<scheme>lsm_noah</scheme>
<scheme>sfc_sice</scheme>
<scheme>GFS_surface_loop_control_part2</scheme>
<!-- Surface iteration loop 2 -->
<scheme>GFS_surface_loop_control_part0_run</scheme>
<scheme>sfc_ex_coef_run</scheme>
<scheme>GFS_surface_loop_control_part1_run</scheme>
<scheme>sfc_nst_pre_run</scheme>
<scheme>sfc_nst_run</scheme>
<scheme>sfc_nst_post_run</scheme>
<scheme>lsm_noah_run</scheme>
<scheme>sfc_sice_run</scheme>
<scheme>GFS_surface_loop_control_part2_run</scheme>
<scheme>GFS_surface_loop_control_part0</scheme>
<scheme>sfc_ex_coef</scheme>
<scheme>GFS_surface_loop_control_part1</scheme>
<scheme>sfc_nst_pre</scheme>
<scheme>sfc_nst</scheme>
<scheme>sfc_nst_post</scheme>
<scheme>lsm_noah</scheme>
<scheme>sfc_sice</scheme>
<scheme>GFS_surface_loop_control_part2</scheme>
<!-- End of surface iteration loop -->
<scheme>dcyc2t3_post_run</scheme>
<scheme>sfc_diag_run</scheme>
<scheme>GFS_surface_generic_post_run</scheme>
<scheme>edmf_run</scheme>
<scheme>GFS_PBL_generic_post_run</scheme>
<scheme>gwdps_pre_run</scheme>
<scheme>gwdps_run</scheme>
<scheme>gwdps_post_run</scheme>
<scheme>rayleigh_damp_run</scheme>
<scheme>GFS_suite_update_stateout_run</scheme>
<scheme>ozphys_run</scheme>
<scheme>ozphys_post_run</scheme>
<scheme>GFS_DCNV_generic_pre_run</scheme>
<scheme>get_phi_fv3_run</scheme>
<scheme>GFS_suite_interstitial_3_run</scheme>
<scheme>GFS_zhao_carr_pre_run</scheme>
<scheme>sasas_deep_run</scheme>
<scheme>GFS_DCNV_generic_post_run</scheme>
<scheme>gwdc_pre_run</scheme>
<scheme>gwdc_run</scheme>
<scheme>gwdc_post_run</scheme>
<scheme>GFS_SCNV_generic_pre_run</scheme>
<scheme>sasas_shal_run</scheme>
<scheme>sasas_shal_post_run</scheme>
<scheme>GFS_SCNV_generic_post_run</scheme>
<scheme>cnvc90_run</scheme>
<scheme>GFS_MP_generic_pre_run</scheme>
<scheme>zhaocarr_gscond_run</scheme>
<scheme>zhaocarr_precpd_run</scheme>
<scheme>GFS_calpreciptype_run</scheme>
<scheme>GFS_MP_generic_post_run</scheme>
<scheme>sfc_diag_run</scheme>
<scheme>lsm_noah_post_run</scheme>
<scheme>sfc_sice_post_run</scheme>
<!-- <scheme>memcheck_run</scheme> -->
<!-- <scheme>GFS_diagtoscreen_run</scheme> -->
<!-- <scheme>GFS_interstitialtoscreen_run</scheme> -->
<scheme>dcyc2t3_post</scheme>
<scheme>sfc_diag</scheme>
<scheme>GFS_surface_generic_post</scheme>
<scheme>edmf</scheme>
<scheme>GFS_PBL_generic_post</scheme>
<scheme>gwdps_pre</scheme>
<scheme>gwdps</scheme>
<scheme>gwdps_post</scheme>
<scheme>rayleigh_damp</scheme>
<scheme>GFS_suite_update_stateout</scheme>
<scheme>ozphys</scheme>
<scheme>ozphys_post</scheme>
<scheme>GFS_DCNV_generic_pre</scheme>
<scheme>get_phi_fv3</scheme>
<scheme>GFS_suite_interstitial_3</scheme>
<scheme>GFS_zhao_carr_pre</scheme>
<scheme>sasas_deep</scheme>
<scheme>GFS_DCNV_generic_post</scheme>
<scheme>gwdc_pre</scheme>
<scheme>gwdc</scheme>
<scheme>gwdc_post</scheme>
<scheme>GFS_SCNV_generic_pre</scheme>
<scheme>sasas_shal</scheme>
<scheme>sasas_shal_post</scheme>
<scheme>GFS_SCNV_generic_post</scheme>
<scheme>cnvc90</scheme>
<scheme>GFS_MP_generic_pre</scheme>
<scheme>zhaocarr_gscond</scheme>
<scheme>zhaocarr_precpd</scheme>
<scheme>GFS_calpreciptype</scheme>
<scheme>GFS_MP_generic_post</scheme>
<scheme>sfc_diag</scheme>
<scheme>lsm_noah_post</scheme>
<scheme>sfc_sice_post</scheme>
<!-- <scheme>memcheck</scheme> -->
<!-- <scheme>GFS_diagtoscreen</scheme> -->
<!-- <scheme>GFS_interstitialtoscreen</scheme> -->
</subcycle>
</group>
<group name="stochastics">
<subcycle loop="1">
<scheme>GFS_stochastics_run</scheme>
<!-- <scheme>memcheck_run</scheme> -->
<!-- <scheme>GFS_diagtoscreen_run</scheme> -->
<scheme>GFS_stochastics</scheme>
<!-- <scheme>memcheck</scheme> -->
<!-- <scheme>GFS_diagtoscreen</scheme> -->
</subcycle>
</group>
<finalize>IPD_finalize</finalize>
Expand Down
160 changes: 80 additions & 80 deletions examples/suite_scm_GFS_test.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,100 +1,100 @@
<?xml version="1.0" encoding="UTF-8"?>

<suite name="GFS_operational_2017" lib="ccppphys" ver="1.0.0">
<init>GFS_initialize_scm_run</init>
<init>GFS_initialize_scm</init>
<group name="time_vary">
<subcycle loop="1">
<scheme>GFS_phys_time_vary_1_run</scheme>
<scheme>GFS_rad_time_vary_run</scheme>
<scheme>GFS_phys_time_vary_2_run</scheme>
<!-- <scheme>GFS_diagtoscreen_run</scheme> -->
<scheme>GFS_phys_time_vary_1</scheme>
<scheme>GFS_rad_time_vary</scheme>
<scheme>GFS_phys_time_vary_2</scheme>
<!-- <scheme>GFS_diagtoscreen</scheme> -->
</subcycle>
</group>
<group name="radiation">
<subcycle loop="1">
<scheme>GFS_suite_interstitial_rad_reset_run</scheme>
<scheme>GFS_rrtmg_pre_run</scheme>
<scheme>rrtmg_sw_pre_run</scheme>
<scheme>rrtmg_sw_run</scheme>
<scheme>rrtmg_sw_post_run</scheme>
<scheme>rrtmg_lw_pre_run</scheme>
<scheme>rrtmg_lw_run</scheme>
<scheme>rrtmg_lw_post_run</scheme>
<scheme>GFS_rrtmg_post_run</scheme>
<!-- <scheme>GFS_diagtoscreen_run</scheme> -->
<!-- <scheme>GFS_interstitialtoscreen_run</scheme> -->
<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>GFS_diagtoscreen</scheme> -->
<!-- <scheme>GFS_interstitialtoscreen</scheme> -->
</subcycle>
</group>
<group name="physics">
<subcycle loop="1">
<scheme>GFS_suite_interstitial_phys_reset_run</scheme>
<scheme>get_prs_fv3_run</scheme>
<scheme>GFS_suite_interstitial_1_run</scheme>
<scheme>sfc_sice_pre_run</scheme>
<scheme>dcyc2t3_run</scheme>
<scheme>GFS_suite_interstitial_2_run</scheme>
<scheme>GFS_surface_generic_pre_run</scheme>
<scheme>GFS_PBL_generic_pre_run</scheme>
<scheme>lsm_noah_pre_run</scheme>
<scheme>GFS_suite_interstitial_phys_reset</scheme>
<scheme>get_prs_fv3</scheme>
<scheme>GFS_suite_interstitial_1</scheme>
<scheme>sfc_sice_pre</scheme>
<scheme>dcyc2t3</scheme>
<scheme>GFS_suite_interstitial_2</scheme>
<scheme>GFS_surface_generic_pre</scheme>
<scheme>GFS_PBL_generic_pre</scheme>
<scheme>lsm_noah_pre</scheme>
<!-- DH* TODO - turn into a subsycle loop="2" construct? -->
<!-- Surface iteration loop 1 -->
<scheme>GFS_surface_loop_control_part0_run</scheme>
<scheme>sfc_ex_coef_run</scheme>
<scheme>GFS_surface_loop_control_part1_run</scheme>
<scheme>sfc_nst_pre_run</scheme>
<scheme>sfc_nst_run</scheme>
<scheme>sfc_nst_post_run</scheme>
<scheme>lsm_noah_run</scheme>
<scheme>sfc_sice_run</scheme>
<scheme>GFS_surface_loop_control_part2_run</scheme>
<scheme>GFS_surface_loop_control_part0</scheme>
<scheme>sfc_ex_coef</scheme>
<scheme>GFS_surface_loop_control_part1</scheme>
<scheme>sfc_nst_pre</scheme>
<scheme>sfc_nst</scheme>
<scheme>sfc_nst_post</scheme>
<scheme>lsm_noah</scheme>
<scheme>sfc_sice</scheme>
<scheme>GFS_surface_loop_control_part2</scheme>
<!-- Surface iteration loop 2 -->
<scheme>GFS_surface_loop_control_part0_run</scheme>
<scheme>sfc_ex_coef_run</scheme>
<scheme>GFS_surface_loop_control_part1_run</scheme>
<scheme>sfc_nst_pre_run</scheme>
<scheme>sfc_nst_run</scheme>
<scheme>sfc_nst_post_run</scheme>
<scheme>lsm_noah_run</scheme>
<scheme>sfc_sice_run</scheme>
<scheme>GFS_surface_loop_control_part2_run</scheme>
<scheme>GFS_surface_loop_control_part0</scheme>
<scheme>sfc_ex_coef</scheme>
<scheme>GFS_surface_loop_control_part1</scheme>
<scheme>sfc_nst_pre</scheme>
<scheme>sfc_nst</scheme>
<scheme>sfc_nst_post</scheme>
<scheme>lsm_noah</scheme>
<scheme>sfc_sice</scheme>
<scheme>GFS_surface_loop_control_part2</scheme>
<!-- End of surface iteration loop -->
<scheme>dcyc2t3_post_run</scheme>
<scheme>sfc_diag_run</scheme>
<scheme>GFS_surface_generic_post_run</scheme>
<scheme>edmf_run</scheme>
<scheme>GFS_PBL_generic_post_run</scheme>
<scheme>gwdps_pre_run</scheme>
<scheme>gwdps_run</scheme>
<scheme>gwdps_post_run</scheme>
<scheme>rayleigh_damp_run</scheme>
<scheme>GFS_suite_update_stateout_run</scheme>
<scheme>ozphys_run</scheme>
<scheme>ozphys_post_run</scheme>
<scheme>GFS_DCNV_generic_pre_run</scheme>
<scheme>get_phi_fv3_run</scheme>
<scheme>GFS_suite_interstitial_3_run</scheme>
<scheme>GFS_zhao_carr_pre_run</scheme>
<scheme>sasas_deep_run</scheme>
<scheme>GFS_DCNV_generic_post_run</scheme>
<scheme>gwdc_pre_run</scheme>
<scheme>gwdc_run</scheme>
<scheme>gwdc_post_run</scheme>
<scheme>GFS_SCNV_generic_pre_run</scheme>
<scheme>sasas_shal_run</scheme>
<scheme>sasas_shal_post_run</scheme>
<scheme>GFS_SCNV_generic_post_run</scheme>
<scheme>cnvc90_run</scheme>
<scheme>GFS_MP_generic_pre_run</scheme>
<scheme>zhaocarr_gscond_run</scheme>
<scheme>zhaocarr_precpd_run</scheme>
<scheme>GFS_calpreciptype_run</scheme>
<scheme>GFS_MP_generic_post_run</scheme>
<scheme>sfc_diag_run</scheme>
<scheme>lsm_noah_post_run</scheme>
<scheme>sfc_sice_post_run</scheme>
<!-- <scheme>GFS_diagtoscreen_run</scheme> -->
<!-- <scheme>GFS_interstitialtoscreen_run</scheme> -->
<scheme>dcyc2t3_post</scheme>
<scheme>sfc_diag</scheme>
<scheme>GFS_surface_generic_post</scheme>
<scheme>edmf</scheme>
<scheme>GFS_PBL_generic_post</scheme>
<scheme>gwdps_pre</scheme>
<scheme>gwdps</scheme>
<scheme>gwdps_post</scheme>
<scheme>rayleigh_damp</scheme>
<scheme>GFS_suite_update_stateout</scheme>
<scheme>ozphys</scheme>
<scheme>ozphys_post</scheme>
<scheme>GFS_DCNV_generic_pre</scheme>
<scheme>get_phi_fv3</scheme>
<scheme>GFS_suite_interstitial_3</scheme>
<scheme>GFS_zhao_carr_pre</scheme>
<scheme>sasas_deep</scheme>
<scheme>GFS_DCNV_generic_post</scheme>
<scheme>gwdc_pre</scheme>
<scheme>gwdc</scheme>
<scheme>gwdc_post</scheme>
<scheme>GFS_SCNV_generic_pre</scheme>
<scheme>sasas_shal</scheme>
<scheme>sasas_shal_post</scheme>
<scheme>GFS_SCNV_generic_post</scheme>
<scheme>cnvc90</scheme>
<scheme>GFS_MP_generic_pre</scheme>
<scheme>zhaocarr_gscond</scheme>
<scheme>zhaocarr_precpd</scheme>
<scheme>GFS_calpreciptype</scheme>
<scheme>GFS_MP_generic_post</scheme>
<scheme>sfc_diag</scheme>
<scheme>lsm_noah_post</scheme>
<scheme>sfc_sice_post</scheme>
<!-- <scheme>GFS_diagtoscreen</scheme> -->
<!-- <scheme>GFS_interstitialtoscreen</scheme> -->
</subcycle>
</group>
<finalize>GFS_finalize_scm_run</finalize> <!-- need to add this one? -->
<finalize>GFS_finalize_scm</finalize>
</suite>
6 changes: 3 additions & 3 deletions schemes/check/check_test.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@ module check_test
implicit none

private
public :: test
public :: test_run

contains

subroutine test(gravity, u, v, surf_t)
subroutine test_run(gravity, u, v, surf_t)
implicit none
real, intent(inout) :: gravity
real, intent(inout) :: surf_t(:)
Expand All @@ -39,6 +39,6 @@ subroutine test(gravity, u, v, surf_t)
print *, 'updating v to be -10m/s'
v = -10.0

end subroutine test
end subroutine test_run

end module check_test
Loading