forked from NOAA-EMC/fv3atm
-
Notifications
You must be signed in to change notification settings - Fork 5
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 #3 from climbfuji/ccpp_add_sas_and_satmedmfvdifq
Add SAS deep/shallow convection and satmedmfvdifq (updated version of satmedmfvdif) to CCPP
- Loading branch information
Showing
29 changed files
with
372 additions
and
83 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
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
3 files
| +9 −5 | scripts/metadata2html.py | |
| +3 −0 | scripts/mkcap.py | |
| +7 −1 | src/CMakeLists.txt |
Submodule physics
updated
30 files
| +57 −7 | physics/GFS_GWD_generic.F90 | |
| +137 −0 | physics/GFS_GWD_generic.meta | |
| +38 −1 | physics/GFS_SCNV_generic.F90 | |
| +128 −0 | physics/GFS_SCNV_generic.meta | |
| +5 −4 | physics/cires_ugwp.F90 | |
| +9 −0 | physics/cires_ugwp.meta | |
| +26 −22 | physics/cires_ugwp_module.F90 | |
| +2 −20 | physics/cires_ugwp_post.F90 | |
| +0 −79 | physics/cires_ugwp_post.meta | |
| +0 −156 | physics/drag_suite.F90 | |
| +0 −276 | physics/drag_suite.meta | |
| +0 −56 | physics/gwdps.f | |
| +0 −147 | physics/gwdps.meta | |
| +453 −0 | physics/mfpbltq.f | |
| +550 −0 | physics/mfscuq.f | |
| +18 −1 | physics/ozphys.f | |
| +25 −0 | physics/ozphys.meta | |
| +18 −1 | physics/ozphys_2015.f | |
| +25 −0 | physics/ozphys_2015.meta | |
| +0 −74 | physics/samfshalcnv.f | |
| +0 −169 | physics/samfshalcnv.meta | |
| +2,155 −0 | physics/sascnvn.F | |
| +583 −0 | physics/sascnvn.meta | |
| +22 −64 | physics/satmedmfvdif.F | |
| +38 −0 | physics/satmedmfvdif.meta | |
| +1,416 −0 | physics/satmedmfvdifq.F | |
| +597 −0 | physics/satmedmfvdifq.meta | |
| +1,351 −0 | physics/shalcnv.F | |
| +466 −0 | physics/shalcnv.meta | |
| +67 −3 | physics/tridi.f |
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
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
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
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
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,93 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
|
|
||
| <suite name="FV3_GFS_2017_sas" lib="ccppphys" ver="3"> | ||
| <!-- <init></init> --> | ||
| <group name="fast_physics"> | ||
| <subcycle loop="1"> | ||
| <scheme>fv_sat_adj</scheme> | ||
| </subcycle> | ||
| </group> | ||
| <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>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>sfc_diff</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>GFS_surface_composites_post</scheme> | ||
| <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>hedmf</scheme> | ||
| <scheme>GFS_PBL_generic_post</scheme> | ||
| <scheme>GFS_GWD_generic_pre</scheme> | ||
| <scheme>cires_ugwp</scheme> | ||
| <scheme>cires_ugwp_post</scheme> | ||
| <scheme>GFS_GWD_generic_post</scheme> | ||
| <scheme>rayleigh_damp</scheme> | ||
| <scheme>GFS_suite_stateout_update</scheme> | ||
| <scheme>ozphys</scheme> | ||
| <scheme>GFS_DCNV_generic_pre</scheme> | ||
| <scheme>get_phi_fv3</scheme> | ||
| <scheme>GFS_suite_interstitial_3</scheme> | ||
| <scheme>sascnvn</scheme> | ||
| <scheme>GFS_DCNV_generic_post</scheme> | ||
| <scheme>GFS_SCNV_generic_pre</scheme> | ||
| <scheme>shalcnv</scheme> | ||
| <scheme>GFS_SCNV_generic_post</scheme> | ||
| <scheme>GFS_suite_interstitial_4</scheme> | ||
| <scheme>cnvc90</scheme> | ||
| <scheme>GFS_MP_generic_pre</scheme> | ||
| <scheme>gfdl_cloud_microphys</scheme> | ||
| <scheme>GFS_MP_generic_post</scheme> | ||
| <scheme>maximum_hourly_diagnostics</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
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,89 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
|
|
||
| <suite name="FV3_GFS_2017_satmedmfq" lib="ccppphys" ver="3"> | ||
| <!-- <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>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>sfc_diff</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>GFS_surface_composites_post</scheme> | ||
| <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>satmedmfvdifq</scheme> | ||
| <scheme>GFS_PBL_generic_post</scheme> | ||
| <scheme>GFS_GWD_generic_pre</scheme> | ||
| <scheme>cires_ugwp</scheme> | ||
| <scheme>cires_ugwp_post</scheme> | ||
| <scheme>GFS_GWD_generic_post</scheme> | ||
| <scheme>rayleigh_damp</scheme> | ||
| <scheme>GFS_suite_stateout_update</scheme> | ||
| <scheme>ozphys</scheme> | ||
| <scheme>GFS_DCNV_generic_pre</scheme> | ||
| <scheme>get_phi_fv3</scheme> | ||
| <scheme>GFS_suite_interstitial_3</scheme> | ||
| <scheme>samfdeepcnv</scheme> | ||
| <scheme>GFS_DCNV_generic_post</scheme> | ||
| <scheme>GFS_SCNV_generic_pre</scheme> | ||
| <scheme>samfshalcnv</scheme> | ||
| <scheme>GFS_SCNV_generic_post</scheme> | ||
| <scheme>GFS_suite_interstitial_4</scheme> | ||
| <scheme>cnvc90</scheme> | ||
| <scheme>GFS_MP_generic_pre</scheme> | ||
| <scheme>zhaocarr_gscond</scheme> | ||
| <scheme>zhaocarr_precpd</scheme> | ||
| <scheme>GFS_MP_generic_post</scheme> | ||
| <scheme>maximum_hourly_diagnostics</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
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
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
Oops, something went wrong.