From 545fd9fd98f9db35ff8ea7efe2193eea3064924c Mon Sep 17 00:00:00 2001 From: Jim Edwards Date: Fri, 29 Mar 2024 14:26:22 -0600 Subject: [PATCH] clean up buildnml --- cime_config/buildnml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/cime_config/buildnml b/cime_config/buildnml index ff2553be..f95b2012 100755 --- a/cime_config/buildnml +++ b/cime_config/buildnml @@ -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 @@ -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), @@ -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):