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

Allow CHARGE_ACCOUNT to use subprojects and default to command line given project #2888

Merged
merged 4 commits into from
Oct 29, 2018

Conversation

jhkennedy
Copy link
Contributor

@jhkennedy jhkennedy commented Oct 29, 2018

CHARGE_ACCOUNT was not falling back to the project value given on the command line in #2676 and was fixed in #2763 . However, #2763 no longer allowed for subprojects to be charged on OLCF machines. This reverts #2763 and fixes both #2676 and #2886.

Test suite: scripts_regression_tests.py on Titan
Test baseline: N/A
Test namelist changes: N/A
Test status: [bit for bit]

Fixes #2676
Fixes #2886

User interface changes?: None

Update gh-pages html (Y/N)?: Y

Code review:

Joseph H Kennedy added 3 commits October 29, 2018 12:02
This reverts commit b1bc5d6, reversing
changes made to ca3ac20.

Charge account and project should be allowed to be different so that
sub-projects can be charged

Fixes 2886
While the documentation says the CHARGE_ACCOUNT falls back to PROJECT if
it cannot be found in the user environment, user config, or machine
config, it actually only fell back to the probed machine value and not
the value set at the command line which should override the probed
value. Now, CHARGE_ACCOUNT will actually fall back to the previously
determined correct PROJECT value.

Fixes #2676
This makes the help message for `--project` uniform for the three
`create_*` scripts, and updates the CIME user config doccumentation to
better describe PROJECT and CHARGE_ACCOUNT
@jhkennedy
Copy link
Contributor Author

@billsacks I updated a little of the documentation; what do you think of those updates?

@billsacks
Copy link
Member

If you want this to auto-close #2886 you need to list things a little differently in the PR comment:
Fixes #2676
Fixes #2886

@billsacks
Copy link
Member

(i.e., you need a separate "Fixes" for each issue.) (My comment isn't enough to auto-close those: you'll need to edit your initial comment.)

@jhkennedy
Copy link
Contributor Author

@billsacks Woops! You're right. Fixed my fixes.

Copy link
Member

@billsacks billsacks left a comment

Choose a reason for hiding this comment

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

Looks great - thanks a lot!

@jedwards4b jedwards4b merged commit 44aa1f2 into master Oct 29, 2018
@jhkennedy jhkennedy deleted the jhkennedy/charge-account-2886 branch October 29, 2018 22:05
jhkennedy pushed a commit to E3SM-Project/E3SM that referenced this pull request Oct 30, 2018
jhkennedy pushed a commit to E3SM-Project/E3SM that referenced this pull request Oct 30, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

CHARGE_ACCOUNT no longer allows for sub-projects CHARGE_ACCOUNT doesn't listen to --project flag
4 participants