Skip to content

Commit

Permalink
clean up buildnml
Browse files Browse the repository at this point in the history
  • Loading branch information
jedwards4b committed Mar 29, 2024
1 parent 546b39b commit 545fd9f
Showing 1 changed file with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions cime_config/buildnml
Original file line number Diff line number Diff line change
Expand Up @@ -305,7 +305,7 @@ def _create_drv_namelists(case, infile, confdir, nmlgen, files):

for item in case.get_values("COMP_CLASSES"):
comp = case.get_value("COMP_" + item)
if case.get_value(f"PIO_ASYNC_INTERFACE", {"compclass":item}):
if case.get_value("PIO_ASYNC_INTERFACE", {"compclass":item}):
asyncio = True

valid = True
Expand Down Expand Up @@ -608,8 +608,6 @@ def buildnml(case, caseroot, component):
if component != "drv":
raise AttributeError

# Do a check here of ESMF VERSION, requires 8.1.0 or newer (8.2.0 or newer for esmf_aware_threading)
esmf_aware_threading = case.get_value("ESMF_AWARE_THREADING")
esmfmkfile = os.getenv("ESMFMKFILE")
expect(
esmfmkfile and os.path.isfile(esmfmkfile),
Expand All @@ -623,7 +621,7 @@ def buildnml(case, caseroot, component):
major = line[-2] if "MAJOR" in line else major
minor = line[-2] if "MINOR" in line else minor
logger.debug("ESMF version major {} minor {}".format(major, minor))
expect(int(major) >= 8 and int(minor) >=4, "ESMF version should be 8.4.1 or newer")
expect(int(major) >= 8 and int(minor) >=6, "ESMF version should be 8.6.1 or newer")

confdir = os.path.join(case.get_value("CASEBUILD"), "cplconf")
if not os.path.isdir(confdir):
Expand Down

0 comments on commit 545fd9f

Please sign in to comment.