From 24de804613680f34a0238a41f3835426c3f111ce Mon Sep 17 00:00:00 2001 From: Jim Edwards Date: Fri, 7 Jul 2017 15:40:55 -0600 Subject: [PATCH] fix error in path to env_mach_specific.xml file in case --- scripts/lib/CIME/XML/env_mach_specific.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/scripts/lib/CIME/XML/env_mach_specific.py b/scripts/lib/CIME/XML/env_mach_specific.py index 2c1a15ba04a..ca834bc6172 100644 --- a/scripts/lib/CIME/XML/env_mach_specific.py +++ b/scripts/lib/CIME/XML/env_mach_specific.py @@ -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 @@ -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) @@ -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): """