Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

change needed for the addition of a dglc component in cdeps #2449

Merged
merged 7 commits into from
Apr 4, 2024
Merged

change needed for the addition of a dglc component in cdeps #2449

Changes from 4 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
ef7de61
changes needed for adding a dglc
Mar 27, 2024
79d431f
Merge branch 'master' into feature/add_dglc
Apr 1, 2024
29f5bbb
reformat using black
jedwards4b Apr 1, 2024
bedafa3
refactored the use of GLC_USE_ANTARCTICA
Apr 1, 2024
4d7b488
make black happy
mvdebolskiy Apr 2, 2024
a69456e
Update cism tag
ekluzek Apr 3, 2024
1d6cea3
Merge remote-tracking branch 'escomp/b4b-dev' into feature/add_dglc
ekluzek Apr 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions cime_config/buildnml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ def buildnml(case, caseroot, compname):
run_refdate = case.get_value("RUN_REFDATE")
run_reftod = case.get_value("RUN_REFTOD")
glc_nec = case.get_value("GLC_NEC")
cism_use_antarctica = case.get_value("CISM_USE_ANTARCTICA")
glc_use_antarctica = case.get_value("GLC_USE_ANTARCTICA")
mask = case.get_value("MASK_GRID")
driver = case.get_value("COMP_INTERFACE").lower()

Expand Down Expand Up @@ -153,19 +153,19 @@ def buildnml(case, caseroot, compname):
else:
nomeg = ""

if cism_use_antarctica is None:
# This is the case for compsets without CISM, where the CISM_USE_ANTARCTICA xml
if glc_use_antarctica is None:
# This is the case for compsets with SGLC where the GLC_USE_ANTARCTICA xml
# variable isn't defined
glc_use_antarctica_flag = ""
elif isinstance(cism_use_antarctica, bool):
if cism_use_antarctica:
elif isinstance(glc_use_antarctica, bool):
if glc_use_antarctica:
glc_use_antarctica_flag = "-glc_use_antarctica"
else:
glc_use_antarctica_flag = ""
else:
expect(
False,
"Unexpected value for CISM_USE_ANTARCTICA: {}".format(cism_use_antarctica),
"Unexpected value for GLC_USE_ANTARCTICA: {}".format(glc_use_antarctica),
)

if clm_nml_use_case != "UNSET":
Expand Down
Loading