From f62ff714274ba6cef92ae01d2a4c99a18691d326 Mon Sep 17 00:00:00 2001 From: James Foucar Date: Fri, 18 Aug 2017 11:42:12 -0600 Subject: [PATCH] Updates based on github feedback --- scripts/Tools/case.build | 2 +- scripts/lib/CIME/build.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/Tools/case.build b/scripts/Tools/case.build index 4f57b10028c9..c8ec78096c07 100755 --- a/scripts/Tools/case.build +++ b/scripts/Tools/case.build @@ -56,7 +56,7 @@ OR "if no arguments then clean all objects other than sharedlib objects") mutex_group.add_argument("-b", "--build", nargs="+", choices=allobjs, - help="libs to build") + help="libs to build. Will cause namelist generation to be skipped.") mutex_group.add_argument("--clean-all", action="store_true", help="clean all objects including sharedlibobjects that may be used by other builds") diff --git a/scripts/lib/CIME/build.py b/scripts/lib/CIME/build.py index f3b414bd1659..ee7ac269f970 100644 --- a/scripts/lib/CIME/build.py +++ b/scripts/lib/CIME/build.py @@ -255,10 +255,10 @@ def _build_libraries(case, exeroot, sharedpath, caseroot, cimeroot, libroot, lid logger.warn(line) # clm not a shared lib for ACME - if get_model() != "acme" and not (buildlist is not None and "lnd" not in buildlist): + if get_model() != "acme" and (buildlist is None or "lnd" in buildlist): comp_lnd = case.get_value("COMP_LND") clm_config_opts = case.get_value("CLM_CONFIG_OPTS") - if comp_lnd == "clm" and not "clm4_0" in clm_config_opts: + if comp_lnd == "clm" and "clm4_0" not in clm_config_opts: logging.info(" - Building clm4_5/clm5_0 Library ") esmfdir = "esmf" if case.get_value("USE_ESMF_LIB") else "noesmf" bldroot = os.path.join(sharedlibroot, sharedpath, case.get_value("COMP_INTERFACE"), esmfdir, "clm","obj" )