-
Notifications
You must be signed in to change notification settings - Fork 161
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Ninth reconciliation PR from production/RRFS.v1 (#899)
* [production/RRFS.v1] a new parameter to fix REFS member crash and new ccpp suites for RRFS fire weather (#864) * a new parameter is added to control whether G-F will be cold started or not; new ccpp suites are added to support RRFS fire weather prediction * fix RRFS_sas_nogwd suite name inconsistency (#868) * Add is_init flag for GFS_phys_time_vary to ccpp/data/GFS_typedefs.{F90,meta} and fix bug for Thompson MP init flag (used uninitialized, correct by coincidence) * update suites with GFS_photochemistry --------- Co-authored-by: Jili Dong <[email protected]> Co-authored-by: Dom Heinzeller <[email protected]>
- Loading branch information
3 people
authored
Jan 17, 2025
1 parent
7d99880
commit b40f99d
Showing
5 changed files
with
187 additions
and
5 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
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 physics
updated
6 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,84 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
|
|
||
| <suite name="RRFS_sas" version="1"> | ||
| <!-- <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>sgscloud_radpre</scheme> | ||
| <scheme>GFS_rrtmg_pre</scheme> | ||
| <scheme>GFS_radiation_surface</scheme> | ||
| <scheme>rad_sw_pre</scheme> | ||
| <scheme>rrtmg_sw</scheme> | ||
| <scheme>rrtmg_sw_post</scheme> | ||
| <scheme>rrtmg_lw</scheme> | ||
| <scheme>sgscloud_radpost</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>GFS_surface_generic_pre</scheme> | ||
| <scheme>GFS_surface_composites_pre</scheme> | ||
| <scheme>dcyc2t3</scheme> | ||
| <scheme>GFS_surface_composites_inter</scheme> | ||
| <scheme>GFS_suite_interstitial_2</scheme> | ||
| </subcycle> | ||
| <!-- Surface iteration loop --> | ||
| <subcycle loop="2"> | ||
| <scheme>mynnsfc_wrapper</scheme> | ||
| <scheme>GFS_surface_loop_control_part1</scheme> | ||
| <scheme>lsm_ruc</scheme> | ||
| <scheme>clm_lake</scheme> | ||
| <scheme>GFS_surface_loop_control_part2</scheme> | ||
| </subcycle> | ||
| <!-- End of surface iteration loop --> | ||
| <subcycle loop="1"> | ||
| <scheme>GFS_surface_composites_post</scheme> | ||
| <scheme>sfc_diag</scheme> | ||
| <scheme>sfc_diag_post</scheme> | ||
| <scheme>GFS_surface_generic_post</scheme> | ||
| <scheme>rrfs_smoke_wrapper</scheme> | ||
| <scheme>mynnedmf_wrapper</scheme> | ||
| <scheme>rrfs_smoke_postpbl</scheme> | ||
| <scheme>GFS_GWD_generic_pre</scheme> | ||
| <scheme>drag_suite</scheme> | ||
| <scheme>GFS_GWD_generic_post</scheme> | ||
| <scheme>GFS_suite_stateout_update</scheme> | ||
| <scheme>GFS_photochemistry</scheme> | ||
| <scheme>get_phi_fv3</scheme> | ||
| <scheme>GFS_suite_interstitial_3</scheme> | ||
| <scheme>GFS_DCNV_generic_pre</scheme> | ||
| <scheme>samfdeepcnv</scheme> | ||
| <scheme>GFS_DCNV_generic_post</scheme> | ||
| <scheme>GFS_suite_interstitial_4</scheme> | ||
| <scheme>cnvc90</scheme> | ||
| <scheme>GFS_MP_generic_pre</scheme> | ||
| <scheme>mp_thompson_pre</scheme> | ||
| <scheme>mp_thompson</scheme> | ||
| <scheme>mp_thompson_post</scheme> | ||
| <scheme>GFS_MP_generic_post</scheme> | ||
| <scheme>maximum_hourly_diagnostics</scheme> | ||
| <scheme>GFS_physics_post</scheme> | ||
| </subcycle> | ||
| </group> | ||
| <group name="stochastics"> | ||
| <subcycle loop="1"> | ||
| <scheme>GFS_stochastics</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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,81 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
|
|
||
| <suite name="RRFS_sas_nogwd" version="1"> | ||
| <!-- <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>sgscloud_radpre</scheme> | ||
| <scheme>GFS_rrtmg_pre</scheme> | ||
| <scheme>GFS_radiation_surface</scheme> | ||
| <scheme>rad_sw_pre</scheme> | ||
| <scheme>rrtmg_sw</scheme> | ||
| <scheme>rrtmg_sw_post</scheme> | ||
| <scheme>rrtmg_lw</scheme> | ||
| <scheme>sgscloud_radpost</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>GFS_surface_generic_pre</scheme> | ||
| <scheme>GFS_surface_composites_pre</scheme> | ||
| <scheme>dcyc2t3</scheme> | ||
| <scheme>GFS_surface_composites_inter</scheme> | ||
| <scheme>GFS_suite_interstitial_2</scheme> | ||
| </subcycle> | ||
| <!-- Surface iteration loop --> | ||
| <subcycle loop="2"> | ||
| <scheme>mynnsfc_wrapper</scheme> | ||
| <scheme>GFS_surface_loop_control_part1</scheme> | ||
| <scheme>lsm_ruc</scheme> | ||
| <scheme>clm_lake</scheme> | ||
| <scheme>GFS_surface_loop_control_part2</scheme> | ||
| </subcycle> | ||
| <!-- End of surface iteration loop --> | ||
| <subcycle loop="1"> | ||
| <scheme>GFS_surface_composites_post</scheme> | ||
| <scheme>sfc_diag</scheme> | ||
| <scheme>sfc_diag_post</scheme> | ||
| <scheme>GFS_surface_generic_post</scheme> | ||
| <scheme>rrfs_smoke_wrapper</scheme> | ||
| <scheme>mynnedmf_wrapper</scheme> | ||
| <scheme>rrfs_smoke_postpbl</scheme> | ||
| <scheme>GFS_suite_stateout_update</scheme> | ||
| <scheme>GFS_photochemistry</scheme> | ||
| <scheme>get_phi_fv3</scheme> | ||
| <scheme>GFS_suite_interstitial_3</scheme> | ||
| <scheme>GFS_DCNV_generic_pre</scheme> | ||
| <scheme>samfdeepcnv</scheme> | ||
| <scheme>GFS_DCNV_generic_post</scheme> | ||
| <scheme>GFS_suite_interstitial_4</scheme> | ||
| <scheme>cnvc90</scheme> | ||
| <scheme>GFS_MP_generic_pre</scheme> | ||
| <scheme>mp_thompson_pre</scheme> | ||
| <scheme>mp_thompson</scheme> | ||
| <scheme>mp_thompson_post</scheme> | ||
| <scheme>GFS_MP_generic_post</scheme> | ||
| <scheme>maximum_hourly_diagnostics</scheme> | ||
| <scheme>GFS_physics_post</scheme> | ||
| </subcycle> | ||
| </group> | ||
| <group name="stochastics"> | ||
| <subcycle loop="1"> | ||
| <scheme>GFS_stochastics</scheme> | ||
| </subcycle> | ||
| </group> | ||
| <!-- <finalize></finalize> --> | ||
| </suite> |