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

Jump to bottom

move control of this variable to cam #454

Closed
wants to merge 3 commits into from
Closed

move control of this variable to cam #454

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b623691
move control of this variable to cam
jedwards4b Apr 24, 2024
2ac6cd2
remove valid_values
jedwards4b Apr 25, 2024
06c7b20
Merge branch 'main' into fix/cam_control_add_gusts
jedwards4b Jun 27, 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
6 changes: 0 additions & 6 deletions cime_config/buildnml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,6 @@ def _create_drv_namelists(case, infile, confdir, nmlgen, files):
config["COMP_OCN"] = case.get_value("COMP_OCN")
config["COMP_ROF"] = case.get_value("COMP_ROF")
config["COMP_WAV"] = case.get_value("COMP_WAV")
config["CAMDEV"] = "True" if "CAM70" in case.get_value("COMPSET") else "False"

if (
(
Expand Down Expand Up @@ -145,11 +144,6 @@ def _create_drv_namelists(case, infile, confdir, nmlgen, files):
# set aquaplanet if appropriate
if config["COMP_OCN"] == "docn" and "aqua" in case.get_value("DOCN_MODE"):
nmlgen.set_value("aqua_planet", value=".true.")

# make sure that variable add_gusts is only set to true if compset includes cam7 physics
add_gusts = literal_to_python_value(nmlgen.get_value("add_gusts"), type_="logical")
if add_gusts:
expect("CAM70" in case.get_value("COMPSET"),"ERROR: add_gusts can only be set if CAM70 in compset {}".format(case.get_value("COMPSET")))

# --------------------------------
# Overwrite: set component coupling frequencies
Expand Down
13 changes: 0 additions & 13 deletions cime_config/namelist_definition_drv.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -944,19 +944,6 @@
</values>
</entry>

<entry id="add_gusts">
<type>logical</type>
<category>control</category>
<group>MED_attributes</group>
<desc>
add a wind gustiness factor
</desc>
<values>
<value CAMDEV="True">.true.</value>
<value CAMDEV="False">.false.</value>
</values>
</entry>

<entry id="do_budgets" modify_via_xml="BUDGETS">
<type>logical</type>
<category>budget</category>
Expand Down
13 changes: 13 additions & 0 deletions cime_config/namelist_definition_drv_flds.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,4 +197,17 @@
</desc>
</entry>

<!-- ======================================================================================== -->
<!-- Gusts -->
<!-- ======================================================================================== -->

<entry id="add_gusts">
<type>logical</type>
<category>control</category>
<group>wind_gusts_nl</group>
<desc>
add a wind gustiness factor
</desc>
</entry>

</entry_id>
Loading