Skip to content

Commit

Permalink
Updates based on github feedback
Browse files Browse the repository at this point in the history
  • Loading branch information
jgfouca committed Aug 18, 2017
1 parent 73016a8 commit f62ff71
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion scripts/Tools/case.build
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
4 changes: 2 additions & 2 deletions scripts/lib/CIME/build.py
Original file line number Diff line number Diff line change
Expand Up @@ -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" )
Expand Down

0 comments on commit f62ff71

Please sign in to comment.