Sync HAFS for with recent work in NOAA/EMC#3
Merged
Conversation
Update CDEPS to the 20201124 version of the master branch at ESCOMP/CDEPS.
Fortran subroutines used for CFSR data source are added. The updated code can be compiled successfully on Hera.
This fixes a bug in running the test SMS_Ln9_P4_Vnuopc.f19_f19.A.cheyenne_intel
replace musgs with mg37 in cdeps tests
Jedwards/namelist cleanup
Description of changes
Replace DATM_CLMNCEP_YR and DATM_CPLHIST_YR with DATM_YR - there is no need to distinguish these. Also change
scol_mode = 'true' and create_mesh = 'true' in namelist_definition_datm.xml with mode='single_column', mode='create'.
Tested aux_cdeps (against feb0121) and cmeps testlist_drv (against jan17)
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?
bit for bit
different at roundoff level
more substantial
Any User Interface Changes (namelist or namelist defaults changes)?
Yes See description above.
No
Testing performed:
(required) aux_cdeps
machines and compilers: Cheyenne intel
details (e.g. failed tests): All pass
(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:ef6b28c80
CMEPS
repository to check out: https://github.com/ESCOMP/CESM.git
branch: master
hash:ff6ec1977
CESM
repository to check out: https://github.com/ESCOMP/CESM.git
branch: nuopc_dev
hash:c019fc221
…onal flux calculation (#10)
Component level PIO initialization for external applications such as HAFS
This update includes component-level PIO initialization feature from the ESCOMP/CDEPS master branch.
…ain if outside the data range for transient cases, remove the extend settings for 1PT tower sites as this shouldn't be done for sub-daily data
### Description of changes Add in ability to handle 1PT forcing streams for a generic CLM_USRDAT site. This was in MCT, but left off of the NUOPC implementation. NEON sites were added, but not the generic case. Also change some of the settings of extend from 1PT streams to cycle. And for 1PT cases and NLDAS2 forcing use limit in place of cycle, so you'll see if you are out of the data range. ### Specific notes Contributors other than yourself, if any: CMEPS Issues Fixed (include github issue #): Fixes ESCOMP#86 Are there dependencies on other component PRs - [ x] CIME cime5.8.47 #3954 Are changes expected to change answers? - [ x] bit for bit Any User Interface Changes (namelist or namelist defaults changes)? - [ ] Yes - [ x] No Testing performed: Ran following single point tests... SMS_D_Ld5_Mmpi-serial.1x1_mexicocityMEX.I1PtClm50SpRs.cheyenne_intel.clm-default SMS_D_Lm1_Mmpi-serial.CLM_USRDAT.I1PtClm50SpRs.cheyenne_intel.clm-USUMB_mct SMS_D_Lm1_Mmpi-serial_Vnuopc.CLM_USRDAT.I1PtClm50SpRs.cheyenne_intel.clm-USUMB_nuopc SMS_Lm1_Mmpi-serial.1x1_brazil.IHistClm50BgcQianRs.cheyenne_gnu.clm-output_bgc_highfreq SMS_Lm1_Mmpi-serial_Vnuopc.1x1_brazil.IHistClm50BgcQianRs.cheyenne_gnu.clm-output_bgc_highfreq Hashes used for testing: - [ ] CIME - repository to check out: https://github.com/ESCOMP/CESM.git - tag: cime5.8.47 - [ ] CMEPS - repository to check out: https://github.com/ESCOMP/CESM.git - tag: v0.10.0 - [ ] CTSM - repository to check out: https://github.com/jedwards4b/CTSM.git - branch: neon_compsets - describe: ctsm5.1.dev038-37-g8a65d2f19 - This will be ctsm5.1.dev039
…'t the best way to do this especially for the cases with multiple years, which you'll want the user to be able to customize
…ream settings, so the user has control over these
### Description of changes Improve support for user mods in *.streams.xml file. If the file is found in the run directory it will be used for that data components streams. I have added an xsd file as well to use with xmllint to assure the syntax of the file. Due to namelist change in cmeps for multiple ice sheets all namelists changed and so new baselines, may12, were generated. ### Specific notes Contributors other than yourself, if any: CMEPS Issues Fixed (include github issue #): ESCOMP#79 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)? - [X] Yes Indirectly due to changes in glc (multiple ice sheet support) - [ ] No Testing performed: - [X] (required) aux_cdeps - machines and compilers: cheyenne intel - details (e.g. failed tests): see issue ESCOMP#89 - [ ] (optional) CESM prealpha test - machines and compilers - details (e.g. failed tests): Hashes used for testing: - [X] CIME - repository to check out: https://github.com/ESCOMP/CESM.git - branch: master - hash: 353730e - [X] CMEPS - repository to check out: https://github.com/ESCOMP/CESM.git - branch: master - hash: cf0d47b - [ ] CESM - repository to check out: https://github.com/ESCOMP/CESM.git - branch: nuopc_dev - hash:
### Description of changes Fix the align year issue. Fix a total of three issues. ### Specific notes Contributors other than yourself, if any: CMEPS Issues Fixed (include github issue #): Fixes ESCOMP#86 Fixes ESCOMP#89 Fixes ESCOMP#91 Are there dependencies on other component PRs: No - [ ] CIME (list) - [ ] CMEPS (list) Are changes expected to change answers? - [ x] bit for bit - [ ] different at roundoff level - [ ] more substantial Technically tests with the 1PT sites will be different because the start date is different. Any User Interface Changes (namelist or namelist defaults changes)? - [ ] Yes - [ x] No The one caveat is that now $DATM_YR is enabled to work for the 1PT sites Testing performed: - [ x] (required) aux_cdeps - machines and compilers: cheyenne_intel - failed tests: Since I tested in a CTSM checkout the DLND test fails as expected, but as no changes to dlnd this shouldn't matter: SMS_Vnuopc_Ld3.f09_f09_mg17.1850_SATM_DLND%SCPL_SICE_SOCN_SROF_SGLC_SWAV.cheyenne_intel Hashes used for testing: - [ ] CIME - repository to check out: https://github.com/ESCOMP/CESM.git - tag: cime5.8.47 - [ ] CMEPS - repository to check out: https://github.com/ESCOMP/CESM.git - tag; v0.10.0 - [ ] CTSM - repository to check out: https://github.com/jedwards4b/CESM.git - branch: neon_compsets - hash: ctsm5.1.dev038-43-gd43264c75
### Description of changes These should have been part of ESCOMP#88 and were used in the testing of that PR but missed in the commit.
…s to be processed correctly.
Fix a bug in streams/dshr_stream_mod.F90
### Description of changes Adds missing aerosol fluxes to JRA mode compsets ### Specific notes Contributors other than yourself, if any: None CMEPS Issues Fixed: None Are there dependencies on other component PRs: No No Are changes expected to change answers? All are bfb other than C and G compsets that use aerosol fluxes in jra mode Any User Interface Changes (namelist or namelist defaults changes)? No Testing performed: The following two compsets were tested and validation occurred SMS_Vnuopc_Ld1.TL319_g17.G1850ECOIAF_JRA_PHYS_DEV.cheyenne_intel.pop-ecosys /glade/scratch/mvertens/mvertens/SMS_Vmct_Ld1.TL319_g17.G1850ECOIAF_JRA_PHYS_DEV.cheyenne_intel.pop-ecosys Hashes used for testing: - [ ] CESM - repository to check out: https://github.com/ESCOMP/CESM.git - hash: cesm2_3_alpha03a
* change cdeps data component module names when a CPP macro named CESMCOUPLED is not defined. Co-authored-by: Jun Wang <jun.wang@noaa.gov> Co-authored-by: Jim Edwards <jedwards@ucar.edu>
BinLiu-NOAA
approved these changes
Jun 10, 2021
Collaborator
BinLiu-NOAA
left a comment
BinLiu-NOAA
left a comment
There was a problem hiding this comment.
This support/HAFS branch have not yet been used by HAFS develop branch yet. And I assume you have already tested it after the sync. Approve the PR.
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
8 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
This PR aims to update HAFS CDEPS fork with the recent fix in NOAA/EMC one.