Update emc/develop branch to include most recent updates from ESCOMP/CDEPS#23
Merged
Merged
Conversation
Update for ERA5 data atmosphere
fix for fldptr return mode
Add fox submodule
add genf90 as a submodule
update fox external for nag CMEPS Issues Fixed (include github issue #): Are there dependencies on other component PRs - [ ] CIME (list) - [ ] CMEPS (list) Are changes expected to change answers? - [x] bit for bit - [ ] different at roundoff level - [ ] more substantial Any User Interface Changes (namelist or namelist defaults changes)? - [ ] Yes - [x] No Testing performed: This update was tested in NOAA-EMC#51 but the fox update was accidentally left out. Contributors other than yourself, if any: Hashes used for testing: See NOAA-EMC#51
These data are used to force cases with GLC - i.e., T compsets
This way we don't need to maintain the same first and last years in two different places.
Point to new dlnd scpl forcing data ### Description of changes Point to new dlnd scpl forcing data. These data are used to force cases with GLC - i.e., T compsets. ### Specific notes Contributors other than yourself, if any: Choice of data approved by @whlipscomb, @Katetc and @gunterl CMEPS Issues Fixed (include github issue #): none Are there dependencies on other component PRs - [ ] CIME (list) - [ ] CMEPS (list) Are changes expected to change answers? - [ ] bit for bit - [ ] different at roundoff level - [x] more substantial - substantial changes for T compsets (bit-for-bit for other compsets) Any User Interface Changes (namelist or namelist defaults changes)? - [ ] Yes - [x] No Testing performed: - [ ] (required) aux_cdeps - machines and compilers: - details (e.g. failed tests): - [ ] (optional) CESM prealpha test - machines and compilers - details (e.g. failed tests): - Just ran `SMS_Vnuopc_Ly35.f09_g17_gl4.T1850G.cheyenne_intel` (using CDEPS version from the CESM nuopc_dev branch (b91e418) with the first two commits on this branch cherry-picked in. I then checked the last commit on this branch (48a26e6) by confirming that the dlnd.streams.xml file was identical before and after that change. Hashes used for testing: - [ ] CIME - repository to check out: https://github.com/ESCOMP/CESM.git - branch: nuopc_dev - hash: - [ ] CMEPS - repository to check out: https://github.com/ESCOMP/CESM.git - branch: nuopc_dev - hash: - [x] CESM - repository to check out: https://github.com/ESCOMP/CESM.git - branch: nuopc_dev - hash: `913272a`
…5 version, and there was a typo in another mesh filename
Fixes NOAA-EMC#63, two files were in NetCDF4 format and need a NetCDF5 version ### Description of changes There were three ESMF mesh files that needed to be corrected. Two were in NetCDF4 format and needed to be NetCDF5 and one was entered incorrectly. ### Specific notes Contributors other than yourself, if any: None CMEPS Issues Fixed (include github issue #): NOAA-EMC#63 Are there dependencies on other component PRs: No Are changes expected to change answers? No - [x] bit for bit Any User Interface Changes (namelist or namelist defaults changes)? - [X] Yes Testing performed: Ran a short list of tests on izumi: ERP_D_Ld5_P48x1_Vnuopc.f10_f10_mg37.I2000Clm50BgcCru.izumi_nag.clm-flexCN_FUN ERP_D_Ld5_P48x1_Vnuopc.f10_f10_mg37.I2000Clm50BgcCru.izumi_nag.clm-luna ERP_D_Ld5_P48x1_Vnuopc.f10_f10_mg37.I2000Clm50BgcCru.izumi_nag.clm-noFUN_flexCN ERP_D_Ld5_P48x1_Vnuopc.f10_f10_mg37.I2000Clm50BgcCru.izumi_nag.clm-reduceOutput SMS_D_Ld1_P48x1_Vnuopc.f10_f10_mg37.I2000Clm50BgcCru.izumi_nag.clm-af_bias_v7 Hashes used for testing: - [ ] CIME - repository to check out: https://github.com/ESCOMP/CESM.git - tag: cime5.8.39 - [ ] CMEPS - repository to check out: https://github.com/ESCOMP/CESM.git - tag: v0.5.0 - [ ] CTSM - repository to check out: https://github.com/mvertens/CTSM.git - branch: mvertens/scolpr
changes for cmeps threading ### Description of changes Add the SetVM needed for nuopc threading. The cdeps routines have no openmp sections so this is only for compatibility with the updated cmeps code. ### Specific notes Contributors other than yourself, if any: CMEPS Issues Fixed (include github issue #): Are there dependencies on other component PRs - [ ] CIME (list) - [ ] CMEPS (list) Are changes expected to change answers? - [X] bit for bit - [ ] different at roundoff level - [ ] more substantial Any User Interface Changes (namelist or namelist defaults changes)? - [ ] Yes - [X] No Testing performed: - [X] (required) aux_cdeps - machines and compilers: cheyenne intel, created baseline apr05 - details (e.g. failed tests): - [ ] (optional) CESM prealpha test - machines and compilers - details (e.g. failed tests): Hashes used for testing: - [ ] CIME - repository to check out: https://github.com/ESCOMP/CESM.git - branch: - hash:6eac99c34e69 - [ ] CMEPS - repository to check out: https://github.com/ESCOMP/CESM.git - branch: nuopc_dev - hash:2ece713a1958 - [ ] CESM - repository to check out: https://github.com/ESCOMP/CESM.git - branch: nuopc_dev - hash:
Fix bugs in dlnd/lnd_comp_nuopc.F90.
### Description of changes Adds support for NEON tower data in datm. ### Specific notes Contributors other than yourself, if any: CMEPS Issues Fixed (include github issue #): Are there dependencies on other component PRs - [X] CIME (list) Requires branch neon_data_mode (PR ESMCI/cime#3850) - [ ] CMEPS (list) Are changes expected to change answers? - [X] bit for bit - [ ] different at roundoff level - [ ] more substantial Any User Interface Changes (namelist or namelist defaults changes)? - [ ] Yes - [X] No Testing performed: - [X] (required) aux_cdeps - machines and compilers: cheyenne intel - details (e.g. failed tests): SMS_Vnuopc_Ld5.TL319_t061.2000_DATM%JRA-1p4-2018_SLND_SICE_SOCN_SROF_SGLC_SWAV_SESP.cheyenne_intel fails in build with Invalid values ['CORE_IAF_JRA_1p4_2018'] - [ ] (optional) CESM prealpha test - machines and compilers - details (e.g. failed tests): Hashes used for testing: - [ ] CIME - repository to check out: https://github.com/ESCOMP/CESM.git - branch: master - hash:8b48a2e - [ ] CMEPS - repository to check out: https://github.com/ESCOMP/CESM.git - branch: master - hash: v0.9.0 - [ ] CESM - repository to check out: https://github.com/ESCOMP/CESM.git - branch: master - hash:
junwang-noaa
approved these changes
Apr 26, 2021
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
7 participants
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.
Description of changes
The master branch of ESCOMP/CDEPS (04/23/2021 version) will be merged to the emc/develop branch.
Specific notes
CMEPS Issues Fixed #22