Skip to content

Commit

Permalink
fix error in path to env_mach_specific.xml file in case
Browse files Browse the repository at this point in the history
  • Loading branch information
jedwards4b committed Jul 7, 2017
1 parent 3d40552 commit 24de804
Showing 1 changed file with 3 additions and 4 deletions.
7 changes: 3 additions & 4 deletions scripts/lib/CIME/XML/env_mach_specific.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,8 @@ def __init__(self, caseroot=None, infile="env_mach_specific.xml",
"""
initialize an object interface to file env_mach_specific.xml in the case directory
"""
fullpath = infile if os.path.isabs(infile) else os.path.join(caseroot, infile)
schema = os.path.join(get_cime_root(), "config", "xml_schemas", "env_mach_specific.xsd")
EnvBase.__init__(self, caseroot, fullpath,schema=schema)
EnvBase.__init__(self, caseroot, infile, schema=schema)
self._allowed_mpi_attributes = ("compiler", "mpilib", "threaded", "unit_testing")
self._unit_testing = unit_testing

Expand Down Expand Up @@ -236,7 +235,7 @@ def _load_modules_generic(self, modules_to_load):
# Purpose is for environment management system that does not have
# a python interface and therefore can only determine what they
# do by running shell command and looking at the changes
# in the environment.
# in the environment.

cmd = "source {}".format(sh_init_cmd)

Expand Down Expand Up @@ -283,7 +282,7 @@ def _load_modules_generic(self, modules_to_load):
if key in os.environ and key not in newenv:
del(os.environ[key])
else:
os.environ[key] = newenv[key]
os.environ[key] = newenv[key]

def _load_none_modules(self, modules_to_load):
"""
Expand Down

0 comments on commit 24de804

Please sign in to comment.