Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
13 changes: 0 additions & 13 deletions datm/cime_config/buildnml
Original file line number Diff line number Diff line change
Expand Up @@ -89,18 +89,6 @@ def _get_neon_data_availability(case, neonsite):
expect(newestdate, "No tower data found on server for NEON site {}".format(neonsite))
return None

####################################################################################
def _check_datm_af_mismatch(anomaly_forcing, datm_mode):
####################################################################################

# CMIP5 and CMIP6 anomalies were only generated relative to GSWP3v1
is_cmip5_or_6 = any(x in anomaly_forcing for x in ["cmip5", "cmip6"])
if is_cmip5_or_6 and datm_mode != "CLMGSWP3v1":
raise SystemExit(
"CMIP5 and CMIP6 anomalies were only generated relative for DATM_MODE CLMGSWP3v1."
" To fix this error, do: ./xmlchange DATM_MODE=CLMGSWP3v1"
)


# pylint: disable=too-many-arguments,too-many-locals,too-many-branches,too-many-statements
####################################################################################
Expand Down Expand Up @@ -236,7 +224,6 @@ def _create_namelists(case, confdir, inst_string, infile, nmlgen, data_list_path
# Set anomaly forcing in datm.streams.xml
anomaly_forcing = nmlgen.get_value("anomaly_forcing")
if anomaly_forcing[0] is not None and anomaly_forcing[0] != "none":
_check_datm_af_mismatch(anomaly_forcing[0], datm_mode)
streamlist += anomaly_forcing

# Generate datm.streams.xml
Expand Down
10 changes: 10 additions & 0 deletions datm/cime_config/testdefs/testlist_datm.xml
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,16 @@
<option name="comment">Check that SSP126 compset works right</option>
</options>
</test>
<test compset="SSP126_DATM%CRUJRA2024_SLND_SICE_SOCN_SROF_SGLC_SWAV_SESP" grid="f10_f10_mg37" name="SMS_Ld5">
<machines>
<machine name="derecho" compiler="intel" category="aux_cdeps"/>
<machine name="betzy" compiler="intel" category="aux_cdeps_noresm"/>
</machines>
<options>
<option name="wallclock"> 00:10:00 </option>
<option name="comment">Check that SSP126 compset works right with CRU-JRA</option>
</options>
</test>
<test compset="SSP245_DATM%GSWP3v1_SLND_SICE_SOCN_SROF_SGLC_SWAV_SESP" grid="f10_f10_mg37" name="SMS_Ld5">
<machines>
<machine name="derecho" compiler="intel" category="aux_cdeps"/>
Expand Down