Skip to content

Commit

Permalink
variables were being resolved too early causing env vars to be used i…
Browse files Browse the repository at this point in the history
…ncorrectly
  • Loading branch information
jedwards4b committed Aug 13, 2016
1 parent dab4528 commit 90422ae
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
2 changes: 1 addition & 1 deletion driver_cpl/cime_config/config_component.xml
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@

<entry id="USER">
<type>char</type>
<default_value>UNSET</default_value>
<default_value>$ENV{USER}</default_value>
<group>case_desc</group>
<file>env_case.xml</file>
<desc>case user name</desc>
Expand Down
3 changes: 2 additions & 1 deletion utils/python/CIME/case.py
Original file line number Diff line number Diff line change
Expand Up @@ -491,9 +491,10 @@ def configure(self, compset_name, grid_name, machine_name=None,
'COMPILER' not in x and 'MPILIB' not in x]

for nodename in nodenames:
value = machobj.get_value(nodename)
value = machobj.get_value(nodename, resolved=False)
type_str = self.get_type_info(nodename)
if type_str is not None:
logger.debug("machine nodname %s value %s"%(nodename, value))
self.set_value(nodename, convert_to_type(value, type_str, nodename))

if compiler is None:
Expand Down

0 comments on commit 90422ae

Please sign in to comment.