forked from NOAA-EMC/fv3atm
-
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 NCAR:dtc/develop into develop 2020/04/14 (NOAA-EMC#98)
* Update .gitmodules and submodule pointers for GFDL_atmos_cubed_sphere, ccpp-framework, ccpp-physics for code review and testing * Merge NCAR:dtc/develop into NOAA-EMC:develop - RRTMGP in CCPP - build system improvement: get CCPP kind and type definitions from CCPP framework, remove libxml2 from static CCPP build - cleanup radiation tendencies in CCPP - required cmake version now 3.0 - missing code changes for MG-IN-CCN update (from code review)
- Loading branch information
Showing
17 changed files
with
1,204 additions
and
104 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 atmos_cubed_sphere
updated
2 files
| +1 −2 | driver/fvGFS/atmosphere.F90 | |
| +2 −2 | model/fv_regional_bc.F90 |
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
14 files
| +11 −16 | CMakeLists.txt | |
| +11 −6 | schemes/check/ccpp_prebuild_config.py | |
| +140 −29 | scripts/ccpp_prebuild.py | |
| +4 −3 | scripts/common.py | |
| +48 −2 | scripts/conversion_tools/__init__.py | |
| +8 −0 | scripts/conversion_tools/unit_conversion.py | |
| +2 −2 | scripts/metadata_parser.py | |
| +1 −1 | scripts/metadata_table.py | |
| +135 −10 | scripts/mkcap.py | |
| +2 −2 | scripts/mkdoc.py | |
| +175 −19 | 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
62 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,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 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.