Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Point to a new cime tag #237

Merged
merged 3 commits into from
Jan 30, 2018
Merged

Conversation

billsacks
Copy link
Member

@billsacks billsacks commented Jan 30, 2018

This cime tag auto-detects model=cesm based on the presence of
manage_externals

The diffs in this cime tag are simply:

diff --git a/scripts/lib/CIME/utils.py b/scripts/lib/CIME/utils.py
index 803ac9695..a41656619 100644
--- a/scripts/lib/CIME/utils.py
+++ b/scripts/lib/CIME/utils.py
@@ -171,7 +171,8 @@ def get_model():
     # One last try
     if (model is None):
         srcroot = os.path.dirname(os.path.abspath(get_cime_root()))
-        if os.path.isfile(os.path.join(srcroot, "SVN_EXTERNAL_DIRECTORIES")):
+        if os.path.isfile(os.path.join(srcroot, "SVN_EXTERNAL_DIRECTORIES")) \
+           or os.path.isdir(os.path.join(srcroot, "manage_externals")):
             model = 'cesm'
         else:
             model = 'acme'

These changes are already on cime master (made by @jedwards4b ); here I have cherry-picked them onto the cime branch that we're using.

Fixes #238

This cime tag auto-detects model=cesm based on the presence of
manage_externals
@billsacks
Copy link
Member Author

billsacks commented Jan 30, 2018

@ekluzek It feels like this change could be combined with something else you're working on. However, I'm also happy to bring it to master separately. What would work better for you?

(@billsacks I currently don't have any cime changes to make. But, I can certainly pull this update to the cime branch for ctsm in my next ctsm tag)

Copy link
Collaborator

@ekluzek ekluzek left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me

@billsacks
Copy link
Member Author

@ekluzek since I went ahead and kicked off testing, should I just bring this change to master on its own tomorrow morning, assuming all tests have passed? If so, I'm inclined to make a separate tag for this, so that people can point to a working tag from github, if that sounds good to you. Let me know if you have any thoughts on this.

@ekluzek
Copy link
Collaborator

ekluzek commented Jan 30, 2018 via email

@billsacks billsacks merged commit b299e6e into ESCOMP:master Jan 30, 2018
@billsacks billsacks deleted the autodetect_cime_model branch January 30, 2018 13:00
chrislxj pushed a commit to chrislxj/ctsm that referenced this pull request Apr 2, 2018
Fix auto-detection of CIME_MODEL in a standalone checkout

The auto-detection of whether CIME_MODEL is acme or cesm is broken in
standalone checkouts of clm4_5_18_r273. (This auto-detection relied on
whether there was an SVN_EXTERNAL_DIRECTORIES file present at the top
level.)

This tag points to a new cime version that fixes this issue.
samsrabin pushed a commit to samsrabin/CTSM that referenced this pull request May 3, 2024
Enable build with ESMX and introduce export_all
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants