forked from NCAR/ccpp-scm
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request NCAR#96 from grantfirl/update_SDFs
Updating SCM codebase to work with CCPP physics and framework changes since the new year (plus updating SDFs and input namelists)
- Loading branch information
Showing
54 changed files
with
1,765 additions
and
1,348 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Submodule framework
updated
12 files
| +1 −1 | CODEOWNERS | |
| +5 −5 | doc/DevelopersGuide/scheme_template.F90 | |
| +4 −14 | schemes/check/ccpp_prebuild_config.py | |
| +63 −65 | scripts/ccpp_prebuild.py | |
| +5 −0 | scripts/common.py | |
| +83 −9 | scripts/mkcap.py | |
| +361 −286 | scripts/mkstatic.py | |
| +17 −5 | src/ccpp_types.F90 | |
| +230 −0 | test/nemsfv3gfs/regression_test_nemsfv3gfs.py | |
| +32 −0 | test/nemsfv3gfs/regression_test_nemsfv3gfs_cheyenne.cfg | |
| +32 −0 | test/nemsfv3gfs/regression_test_nemsfv3gfs_macbook_dom.cfg | |
| +6 −0 | test/nemsfv3gfs/setenv_cheyenne.sh |
Submodule physics
updated
61 files
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,73 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
|
|
||
| <suite name="SCM_CPT_advanced_prescribed_surface" lib="ccppphys" ver="2.0.0"> | ||
| <!-- <init></init> --> | ||
| <group name="time_vary"> | ||
| <subcycle loop="1"> | ||
| <scheme>GFS_time_vary_pre</scheme> | ||
| <scheme>GFS_rrtmg_setup</scheme> | ||
| <scheme>GFS_rad_time_vary</scheme> | ||
| <scheme>GFS_phys_time_vary</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> | ||
| </subcycle> | ||
| </group> | ||
| <group name="physics"> | ||
| <subcycle loop="1"> | ||
| <scheme>GFS_suite_interstitial_phys_reset</scheme> | ||
| <scheme>GFS_suite_stateout_reset</scheme> | ||
| <scheme>get_prs_fv3</scheme> | ||
| <scheme>GFS_suite_interstitial_1</scheme> | ||
| <scheme>dcyc2t3</scheme> | ||
| <scheme>GFS_suite_interstitial_2</scheme> | ||
| <scheme>GFS_surface_generic_pre</scheme> | ||
| <scheme>gmtb_scm_sfc_flux_spec</scheme> | ||
| <scheme>dcyc2t3_post</scheme> | ||
| <scheme>GFS_PBL_generic_pre</scheme> | ||
| <scheme>hedmf</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_stateout_update</scheme> | ||
| <scheme>ozphys_2015</scheme> | ||
| <scheme>h2ophys</scheme> | ||
| <scheme>GFS_DCNV_generic_pre</scheme> | ||
| <scheme>get_phi_fv3</scheme> | ||
| <scheme>GFS_suite_interstitial_3</scheme> | ||
| <scheme>cs_conv_pre</scheme> | ||
| <scheme>cs_conv</scheme> | ||
| <scheme>cs_conv_post</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>samfshalcnv</scheme> | ||
| <scheme>samfshalcnv_post</scheme> | ||
| <scheme>GFS_SCNV_generic_post</scheme> | ||
| <scheme>GFS_suite_interstitial_4</scheme> | ||
| <scheme>cnvc90</scheme> | ||
| <scheme>GFS_MP_generic_pre</scheme> | ||
| <scheme>m_micro_pre</scheme> | ||
| <scheme>m_micro</scheme> | ||
| <scheme>m_micro_post</scheme> | ||
| <scheme>cs_conv_aw_adj</scheme> | ||
| <scheme>GFS_MP_generic_post</scheme> | ||
| <scheme>sfc_sice_post</scheme> | ||
| </subcycle> | ||
| </group> | ||
| <!-- <finalize></finalize> --> | ||
| </suite> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,88 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
|
|
||
| <suite name="SCM_GFS_2017_updated_csawmgshoc" lib="ccppphys" ver="2"> | ||
| <!-- <init></init> --> | ||
| <group name="time_vary"> | ||
| <subcycle loop="1"> | ||
| <scheme>GFS_time_vary_pre</scheme> | ||
| <scheme>GFS_rrtmg_setup</scheme> | ||
| <scheme>GFS_rad_time_vary</scheme> | ||
| <scheme>GFS_phys_time_vary</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> | ||
| </subcycle> | ||
| </group> | ||
| <group name="physics"> | ||
| <subcycle loop="1"> | ||
| <scheme>GFS_suite_interstitial_phys_reset</scheme> | ||
| <scheme>GFS_suite_stateout_reset</scheme> | ||
| <scheme>get_prs_fv3</scheme> | ||
| <scheme>GFS_suite_interstitial_1</scheme> | ||
| <scheme>dcyc2t3</scheme> | ||
| <scheme>GFS_surface_generic_pre</scheme> | ||
| <scheme>GFS_suite_interstitial_2</scheme> | ||
| </subcycle> | ||
| <!-- Surface iteration loop --> | ||
| <subcycle loop="2"> | ||
| <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> | ||
| </subcycle> | ||
| <!-- End of surface iteration loop --> | ||
| <subcycle loop="1"> | ||
| <scheme>dcyc2t3_post</scheme> | ||
| <scheme>sfc_diag</scheme> | ||
| <scheme>sfc_diag_post</scheme> | ||
| <scheme>GFS_surface_generic_post</scheme> | ||
| <scheme>GFS_PBL_generic_pre</scheme> | ||
| <scheme>moninshoc</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_stateout_update</scheme> | ||
| <scheme>ozphys_2015</scheme> | ||
| <scheme>h2ophys</scheme> | ||
| <scheme>GFS_DCNV_generic_pre</scheme> | ||
| <scheme>get_phi_fv3</scheme> | ||
| <scheme>GFS_suite_interstitial_3</scheme> | ||
| <scheme>shoc</scheme> | ||
| <scheme>cs_conv_pre</scheme> | ||
| <scheme>cs_conv</scheme> | ||
| <scheme>cs_conv_post</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>GFS_SCNV_generic_post</scheme> | ||
| <scheme>GFS_suite_interstitial_4</scheme> | ||
| <scheme>cnvc90</scheme> | ||
| <scheme>GFS_MP_generic_pre</scheme> | ||
| <scheme>m_micro_pre</scheme> | ||
| <scheme>m_micro</scheme> | ||
| <scheme>m_micro_post</scheme> | ||
| <scheme>cs_conv_aw_adj</scheme> | ||
| <scheme>GFS_MP_generic_post</scheme> | ||
| <scheme>sfc_sice_post</scheme> | ||
| </subcycle> | ||
| </group> | ||
| <!-- <finalize></finalize> --> | ||
| </suite> |
Oops, something went wrong.