Merge branch 'sarich/scripts/feature-charge-account' into master (PR #…

…1718)

add option CHARGE_ACCOUNT to charge compute time if different from PROJECT

This option can be set by environment variable, in config_machines.xml, or
with xmlchange.
Helpful because PROJECT can be used for directory names that don't match
the name of the charge account.

Addresses issue #1588

* origin/sarich/scripts/feature-charge-account:
  unset CHARGE_ACCOUNT environment variable in tests
  Add simple doctests to get_charge_account
  whitespace edits
  add option CHARGE_ACCOUNT to charge compute time to if different from PROJECT

cime_config/config_component.xml

@@ -2608,6 +2608,14 @@
    <desc>project for project-sensitive build and run paths, and job scripts</desc>
  </entry>
 
+ <entry id="CHARGE_ACCOUNT">
+   <type>char</type>
+   <default_value></default_value>
+   <group>job_submission</group>
+   <file>env_batch.xml</file>
+   <desc>project to charge in scripts if different from PROJECT</desc>
+ </entry>
+
  <entry id="MODEL_VERSION">
    <type>char</type>
    <default_value>unknown</default_value>