Some cleanup following maint-5.6 merge #3462
Merged
Conversation
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
maint-5.6 added support for new OMIP compsets in POP as well as better handling
of the different versions of JRA forcings. Unfortunately, a lot of these
changes conflicted with other updates to master and the original merge couldn't
be tested because the POP changes weren't available on master yet. I brought
the POP changes from cesm2_1_x_rel to master, and these were the CIME changes
necessary to run the aux_pop testlist:
1. Support the JRA025v2 grid
2. Properly configure POP for compsets with longnames that start with OMIP
3. Support DATM_CO2_TSERIES=omip
-- required converting fco2_datm_global_ssp585_simyr_1750-2020_CMIP6 file
from netcdf-4 to cdf5
4. Remove CORE_IAF_JRA.CORE2.ArcFactor
5. Remove extra rof.iaf_jra block from namelist_definition_drof.xml
6. Update CCSM_CO2_PPMV default value for POP ecosystem from 284.7 to 284.317
unless specificing ECOCESM20
jedwards4b
approved these changes
Mar 26, 2020
|
Is this PR ready to be merged? |
Not yet -- @klindsay28 and I have a code review scheduled for tomorrow afternoon and I'll update this PR afterwards |
co2tseries.omip isn't used with any JRA v1.3 compsets (none of them have ocean ecosystem turned on), so no need to specify stream_align for that case.
|
@fischer-ncar this is ready to go now, thanks for waiting |
|
Thanks @mnlevy1981, I'm merging it now and making a new cime tag. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
maint-5.6added support for new OMIP compsets in POP as well as better handlingof the different versions of JRA forcings. Unfortunately, a lot of these
changes conflicted with other updates to
masterand the original merge couldn'tbe tested because the POP changes weren't available on
masteryet. I broughtthe POP changes from
cesm2_1_x_reltomaster, and these were the CIME changesnecessary to run the
aux_popandaux_pop_MARBLtestlists:JRA025v2gridOMIPDATM_CO2_TSERIES=omip-- required converting
fco2_datm_global_ssp585_simyr_1750-2020_CMIP6filefrom netcdf-4 to cdf5
CORE_IAF_JRA.CORE2.ArcFactorrof.iaf_jrablock fromnamelist_definition_drof.xmlCCSM_CO2_PPMVdefault value for POP ecosystem from 284.7 to 284.317unless specifying
ECOCESM20[ Description of the changes in this Pull Request. It should be enough
information for someone not following this development to understand.
Lines should be wrapped at about 72 characters. Please also update
the CIME documentation, if necessary, in doc/source/rst and indicate
below if you need to have the gh-pages html regenerated.]
Test suite:
aux_popandaux_pop_MARBLusing POP from ESCOMP/POP2-CESM#25Test baseline:
cime5.8.17andcesm_pop_2_1_20200318tagsTest namelist changes:
Test status: climate changing for specific C and G compsets, bit-for-bit (I think) for both fully coupled and any compsets with docn or MOM instead of POP
Update gh-pages html (Y/N)?: N
Code review:
I'd like @klindsay28 to look this over and give it a green light before it gets merged