add new noresm cime model - #5057
Conversation
update NorESMhub CIME to and ESMCI cime6.0.173 The only difference between NorESMhub CIME in this PR and and ESMCI cime6.0.173 is the addition of blom in CIME/data/config/cesm/config_files.xml Test suite: Ran SMS_D_Ld1.T62_tn14.NOINYOC.betzy_intel and verified that it was bfb. Test baseline: Test namelist changes: Test status: bfb User interface changes?: None Update gh-pages html (Y/N)?: No
cime6.0.184
update noresm to cime6.0.184
cime6.0.218
update to cime6.0.222
merge to cime6.0.232 This PR merges the NorESMHub cime fork to cime6.0.232 and is needed to have the new dglc component be able to be run out of system tests. Test suite: Testing was done on derecho - see ESCOMP/CDEPS#268 Fixes: None User interface changes?: None Update gh-pages html (Y/N)?: N
Update to cime6.0.250 Remove ssh dependence in .gitmodules file
cime6.1.28
update to cime6.1.28 Needed to update share (i.e. nuopc_shr_methods.F90) which in turn in needed to update CMEPS. Testing: Verified that SMS_D_Ln9.ne30pg3_ne30pg3_mtn14.NF2000.betzy_intel.cam-outfrq9s is bfb with noresm2_5_013_cam6_3_158. Test status: bit for bit User interface changes?: No Update gh-pages html ?: No
Update CIME to ESMCI/cime6.1.38 Add in one bug fix from cime6.1.44 GitHub PR link: NorESMhub#93 Test suite: noresm prealpha Test baseline: NA Test namelist changes: NA Test status: BFB
Rpointers update cime
Update mkDepends and Makefile to be able to handle Fortran submodules - These files are identical to the ones in ESMCI/master. - CAM has started using Fortran submodules (a Fortran 2008 feature). - Updated Makefile also contains capability of building FTorch library Test suite: aux_cam_noresm Test baseline: NA Test namelist changes: NA Test status: bit for bit User interface changes?: NA Update gh-pages html (Y/N)?: N
cime6.1.142
cime6.1.142_noresm_v1: update to ESMCI cime6.1.142
updated to cime6.1.143
Co-authored-by: goldy <1588651+gold2718@users.noreply.github.com>
Update to ESMCI/cime-6.1.173 - Fix check_input_data (from ESMCI update) - Fix issues with resubmit on Olivia and Betzy
…_to_config_files addition of ww3 to entries where it was missing
- Fix spelling of FORTRAN in CIME/Tools/Makefile - Fix python path in find_circular_dependency.py script
cime6.5.12 # Conflicts: # CIME/non_py/cprnc
merge noresm to cime6.5.12
add noresm model as an option to CIME
billsacks
left a comment
There was a problem hiding this comment.
This is great! I really like this approach - both the CESM_LIKE_MODELS and the check for a model id file at the top level. Thanks a lot for doing this, @mvertens - this is going to really help with coordination of CMEPS, CDEPS and other repositories between NorESM and CESM!
I have one request for a fix to the doctest. (Sorry that I missed this in my review on NorESMhub.) Other than that, this looks great.
| >>> get_model() | ||
| 'e3sm' | ||
| >>> reset_cime_config() | ||
| >>> del os.environ["SRCROOT"] |
There was a problem hiding this comment.
It seems like, instead of deleting the SRCROOT environment variable, this doctest should save any pre-existing SRCROOT environment variable and then, if it existed previously, reset it to the original rather than deleting it.
There was a problem hiding this comment.
@billsacks - thanks for catching this. I have fixed this problem.
|
@jasonb5 and @jgfouca - There are a couple of design points here that I discussed with @mvertens and am satisfied with myself, but would be happy for your input on: (1) The new (2) Do we still have tests that use a standalone cime, outside of any model? If so, can you see any problems with this check for |
|
@billsacks , I'm ok with |
billsacks
left a comment
There was a problem hiding this comment.
Looks good now - thank you!
|
@jgfouca @billsacks - thanks for your reviews. Is it okay to merge this? Who normally does this? |
Description
NorESM and CESM share the same git-fleximod layout, so a NorESM checkout was previously detected as
cesm. This PR addsnoresmas a model in its own right. This PR should have no impact on E3SM CIME functionality.new file
CIME/data/config/noresm/config_files.xml— this new file is based on the cesm file, withMODELset tonoresm, components NorESM does not use removed.get_model()now reads a new file -$SRCROOT/.cime_model_idif it is present.CIME_MODEL; a conflicting value is warned about.cime/CIME/data/config(currently cesm, e3sm, noresm and ufs)a new variable
CESM_LIKE_MODELScollects the places where CIME branches on the model name and noresm must behave as cesm: shared library list, unsupported compset check, describe_version tag lookup, case cloning, build provenance.Backwards compatible. Nothing is modified without the presence of the
.cime_model_idfile, which lives in the NorESM repo.A few other changes:
Testing: verified that this change is completel backwards compatible with noresm checkouts
Checklist