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

Propagate --project value to CHARGE_ACCOUNT #2763

Merged
merged 1 commit into from
Aug 21, 2018

Conversation

sarich
Copy link
Contributor

@sarich sarich commented Aug 21, 2018

If project is set on the command line, then use that value for CHARGE_ACCOUNT as well

Test suite: scripts_regression_tests.py

Fixes CIME Github issue #2676

User interface changes?: N

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

Code review:

@jedwards4b jedwards4b merged commit b1bc5d6 into master Aug 21, 2018
@sarich sarich deleted the sarich/fix-charge-account branch August 22, 2018 15:46
jhkennedy pushed a commit that referenced this pull request Oct 29, 2018
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
jedwards4b added a commit that referenced this pull request Oct 29, 2018
Allow CHARGE_ACCOUNT to use subprojects and default to command line given project
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:sacks
jgfouca added a commit that referenced this pull request Nov 27, 2018
Conflicts:
	ChangeLog
	config/e3sm/machines/config_machines.xml
	scripts/Tools/Makefile
	scripts/lib/CIME/SystemTests/funit.py
	scripts/lib/CIME/SystemTests/system_tests_common.py
	scripts/lib/CIME/case/case_run.py
	scripts/lib/CIME/case/case_setup.py
	scripts/lib/CIME/hist_utils.py
	scripts/lib/CIME/utils.py
	src/components/data_comps/datm/cime_config/namelist_definition_datm.xml
	src/drivers/mct/main/cime_comp_mod.F90

* esmci_remote_for_split/master: (1080 commits)
  Fix new pylint errs
  Update ChangeLog for cime5.7.5
  Use raw string for regex
  Consolidate near-duplicate regular expressions
  Fix regex match in hist_utils: get_extension
  Update lnd2glc_averaged_now in the driver loop
  Remove duplicate test
  Add MPI-serial test to cime_developer suite
  Remove check against MPI_TAG_UB
  Fix some whitespace
  Fixes to SOM forcing scripts
  Update get_charge_account docstring example
  Update the descriptions of PROJECT and CHARGE_ACCOUNT
  Have get_charge_account fall back to previously determined project
  FUNIT test: Fix path to run_tests.py if get_test_spec_dir is overridden
  Revert "Merge pull request #2763 from ESMCI/sarich/fix-charge-account"
  Add config_component_e3sm.xml for nuopc
  resolve mpi run command
  add e3sm as cime_model
  Fix PET on no-batch machines
  ...
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.

3 participants