forked from NOAA-EMC/ufsatm
-
Notifications
You must be signed in to change notification settings - Fork 5
RRTMGP in fv3atm (#26 - based on latest code) #32
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.
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
Merged
Changes from all commits
Commits
Show all changes
12 commits
Select commit
Hold shift + click to select a range
d196b0e
Squashed commit of the following:
climbfuji 515a83f
Update EMC develop from NCAR dtc/develop 2020/03/17 (#81)
climbfuji b14368a
Formatting changes to several files; reversal of changes to gfsphysic…
climbfuji 58977b7
Remove dcyc2t3_post from RRTMGP SDF, rename doRRTMGP to do_RRTMGP to …
climbfuji 51ffb8e
Update to CCPP prebuild config and make/cmake build systems to accomm…
climbfuji 041ea4c
Merge branch 'develop' of https://github.com/NOAA-EMC/fv3atm into add…
climbfuji 0af0078
From @dustinswales: bugfix for optional arguments for RRTMGP in ccpp/…
climbfuji 8f9871e
Cleanup RRTMGP optional argument logic.
dustinswales 3815ff1
Update submodule pointer for ccpp-framework after merging Python 3 co…
climbfuji c678c68
gfsphysics/GFS_layer/GFS_typedefs.F90: re-enable initialization/reset…
climbfuji cc4b75d
Add guard to GFS_typedefs.F90 to prevent running RRTMGP with levr<levs
climbfuji d1b1548
Revert change .gitmodules and update submodule pointers for ccpp-fram…
climbfuji File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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 hidden or 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 hidden or 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
| +7 −0 | CMakeLists.txt | |
| +79 −21 | scripts/ccpp_prebuild.py | |
| +4 −3 | scripts/common.py | |
| +44 −2 | scripts/conversion_tools/__init__.py | |
| +2 −2 | scripts/metadata_parser.py | |
| +1 −1 | scripts/metadata_table.py | |
| +132 −7 | scripts/mkcap.py | |
| +2 −2 | scripts/mkdoc.py | |
| +10 −10 | scripts/mkstatic.py | |
| +16 −16 | scripts/parse_tools/__init__.py | |
| +1 −1 | scripts/parse_tools/parse_checkers.py | |
| +1 −1 | scripts/parse_tools/parse_object.py |
Submodule physics
updated
49 files
This file contains hidden or 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,95 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
|
|
||
| <suite name="FV3_GFS_2017_RRTMGP" lib="ccppphys" ver="3"> | ||
| <!-- <init></init> --> | ||
| <group name="time_vary"> | ||
| <subcycle loop="1"> | ||
| <scheme>GFS_time_vary_pre</scheme> | ||
| <scheme>GFS_rrtmgp_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_rrtmgp_pre</scheme> | ||
| <scheme>GFS_rrtmgp_sw_pre</scheme> | ||
| <scheme>rrtmgp_sw_gas_optics</scheme> | ||
| <scheme>rrtmgp_sw_aerosol_optics</scheme> | ||
| <scheme>rrtmgp_sw_cloud_optics</scheme> | ||
| <scheme>rrtmgp_sw_cloud_sampling</scheme> | ||
| <scheme>rrtmgp_sw_rte</scheme> | ||
| <scheme>GFS_rrtmgp_sw_post</scheme> | ||
| <scheme>rrtmgp_lw_pre</scheme> | ||
| <scheme>rrtmgp_lw_gas_optics</scheme> | ||
| <scheme>rrtmgp_lw_aerosol_optics</scheme> | ||
| <scheme>rrtmgp_lw_cloud_optics</scheme> | ||
| <scheme>rrtmgp_lw_cloud_sampling</scheme> | ||
| <scheme>rrtmgp_lw_rte</scheme> | ||
| <scheme>GFS_rrtmgp_lw_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>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>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 hidden or 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.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ver="4"
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Also, the SDF in the SCM was based on an older version of the GFS suite. Should the RRTMGP suite be updated to be based on GFS_v15p2 or GFS_v16beta?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
No, the version is still 3 in ufs-weather-model (except for the public release code). We will try to add or replace the RRTMGP test with a GFSv15p2 setup in the future. Until now, Dustin has been testing with the old control (FV3_GFS_2017) setup.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
OK. For the SCM PR, I have the SDF using RRTMGP based on GFS_v15p2. I can revert that change if necessary.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
No, I think that's totally fine and a good test that it works in principle with GFSv15p2 (with a different MP scheme and more hydrometeors). It just hasn't been tested in FV3. Maybe we do that as part of the radiation tendencies cleanup (and other RRTMGP cleanup)? Would be nice to have it before sending the code to EMC.