Skip to content

Commit 588278e

Browse files
billsacksbillsacks
authored
Merge branch 'main' into hotfix/build
2 parents fe04b56 + 5f7f239 commit 588278e

File tree

5 files changed

+170
-31
lines changed

5 files changed

+170
-31
lines changed

‎datm/cime_config/config_component.xml‎

Lines changed: 25 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,11 @@
1010
This file may have atm desc entries.
1111
-->
1212
<description modifier_mode="1">
13-
<desc atm="DATM[%QIA][%WISOQIA][%CRUJRA2024][%CRUv7][%GSWP3v1][%MOSARTTEST][%NLDAS2][%CPLHIST][%1PT][%NYF][%IAF][%JRA][%JRA-1p4-2018][%JRA-1p5-2023][%JRA-RYF6162][%JRA-RYF8485][%JRA-RYF9091][%JRA-RYF0304][%SIMPLE]"> Data driven ATM </desc>
13+
<desc atm="DATM[%QIA][%WISOQIA][%CRUJRA2024][%CRUJRA2024b][%CRUv7][%GSWP3v1][%MOSARTTEST][%NLDAS2][%CPLHIST][%1PT][%NYF][%IAF][%JRA][%JRA-1p4-2018][%JRA-1p5-2023][%JRA-RYF6162][%JRA-RYF8485][%JRA-RYF9091][%JRA-RYF0304][%SIMPLE]"> Data driven ATM </desc>
1414
<desc option="QIA"> QIAN data set </desc>
1515
<desc option="WISOQIA">QIAN with water isotopes</desc>
1616
<desc option="CRUJRA2024"> CRUJRA 2024 data set </desc>
17+
<desc option="CRUJRA2024b"> CRUJRA 2024b data set: fills the Greenland snow hole per https://github.com/ESCOMP/CDEPS/issues/382; the previous 2024 version already filled Antarctica </desc>
1718
<desc option="CRUv7"> CLM CRU NCEP v7 data set </desc>
1819
<desc option="GSWP3v1"> GSWP3v1 data set </desc>
1920
<desc option="NLDAS2"> NLDAS2 regional 0.125 degree data set over the U.S. (25-53N, 235-293E). WARNING: Garbage data will be produced for runs extending beyond this regional domain. </desc>
@@ -43,13 +44,13 @@
4344

4445
<entry id="DATM_MODE">
4546
<type>char</type>
46-
<valid_values>CORE2_NYF,CORE2_IAF,CLM_QIAN,CLM_QIAN_WISO,1PT,CLMCRUJRA2024,CLMCRUNCEPv7,CLMGSWP3v1,CLMNLDAS2,CPLHIST,CORE_IAF_JRA,CORE_IAF_JRA_1p4_2018,CORE_IAF_JRA_1p5_2023,CORE_RYF6162_JRA,CORE_RYF8485_JRA,CORE_RYF9091_JRA,CORE_RYF0304_JRA,ERA5,SIMPLE</valid_values>
47+
<valid_values>CORE2_NYF,CORE2_IAF,CLM_QIAN,CLM_QIAN_WISO,1PT,CLMCRUJRA2024,CLMCRUJRA2024b,CLMCRUNCEPv7,CLMGSWP3v1,CLMNLDAS2,CPLHIST,CORE_IAF_JRA,CORE_IAF_JRA_1p4_2018,CORE_IAF_JRA_1p5_2023,CORE_RYF6162_JRA,CORE_RYF8485_JRA,CORE_RYF9091_JRA,CORE_RYF0304_JRA,ERA5,SIMPLE</valid_values>
4748
<default_value>CORE2_NYF</default_value>
4849
<group>run_component_datm</group>
4950
<file>env_run.xml</file>
5051
<desc>Mode for data atmosphere component.
5152
CORE2_NYF (CORE2 normal year forcing) are modes used in forcing prognostic ocean/sea-ice components.
52-
CLMCRUJRA2024, CLMCRUNCEPv7, CLMGSWP3v1, CLMNLDAS2 and 1PT are modes using observational data for forcing prognostic land components.
53+
CLMCRUJRA2024, CLMCRUJRA2024b, CLMCRUNCEPv7, CLMGSWP3v1, CLMNLDAS2 and 1PT are modes using observational data for forcing prognostic land components.
5354
WARNING for CLMNLDAS2: This is a regional forcing dataset over the U.S. (25-53N, 235-293E). Garbage data will be produced for runs extending beyond this regional domain. </desc>
5455
<values match="last">
5556
<value compset="DATM%NYF">CORE2_NYF</value>
@@ -64,6 +65,7 @@
6465
<value compset="DATM%QIA">CLM_QIAN</value>
6566
<value compset="DATM%WISOQIA">CLM_QIAN_WISO</value>
6667
<value compset="DATM%CRUJRA2024">CLMCRUJRA2024</value>
68+
<value compset="DATM%CRUJRA2024b">CLMCRUJRA2024b</value>
6769
<value compset="DATM%CRUv7">CLMCRUNCEPv7</value>
6870
<value compset="DATM%GSWP3v1">CLMGSWP3v1</value>
6971
<value compset="DATM%NLDAS2">CLMNLDAS2</value>
@@ -223,20 +225,20 @@
223225
<values match="last">
224226
<value compset="2000.*_DATM%1PT">$DATM_YR_START</value>
225227
<value compset="1850.*_DATM%QIA">1</value>
226-
<value compset="1850.*_DATM%CRUJRA2024">1</value>
228+
<value compset="1850.*_DATM%CRUJRA2024[b]*">1</value>
227229
<value compset="1850.*_DATM%CRUv7">1</value>
228230
<value compset="1850.*_DATM%GSW">1</value>
229231
<value compset="HIST.*_DATM%QIA">1895</value>
230-
<value compset="HIST.*_DATM%CRUJRA2024">1901</value>
232+
<value compset="HIST.*_DATM%CRUJRA2024[b]*">1901</value>
231233
<value compset="HIST.*_DATM%CRUv7">1901</value>
232234
<value compset="HIST.*_DATM%GSW">1901</value>
233235
<value compset="HIST.*_DATM%NLDAS2">$DATM_YR_START</value>
234236
<value compset="20TR.*_DATM%QIA">1895</value>
235-
<value compset="20TR.*_DATM%CRUJRA2024">1901</value>
237+
<value compset="20TR.*_DATM%CRUJRA2024[b]*">1901</value>
236238
<value compset="20TR.*_DATM%CRUv7">1901</value>
237239
<value compset="20TR.*_DATM%GSW">1901</value>
238240
<value compset="SSP.*_DATM%QIA">$DATM_YR_START</value>
239-
<value compset="SSP.*_DATM%CRUJRA2024">$DATM_YR_START</value>
241+
<value compset="SSP.*_DATM%CRUJRA2024[b]*">$DATM_YR_START</value>
240242
<value compset="SSP.*_DATM%CRUv7">$DATM_YR_START</value>
241243
<value compset="SSP.*_DATM%GSW">$DATM_YR_START</value>
242244
<value compset="2000.*_DATM">$DATM_YR_START</value>
@@ -271,32 +273,32 @@
271273
<value compset="2000.*_DATM%1PT" grid="1x1_vancouverCAN" >1992</value>
272274
<value compset="2000.*_DATM%1PT" grid="1x1_urbanc_alpha" >1</value>
273275
<value compset="1850.*_DATM%QIA">1948</value>
274-
<value compset="1850.*_DATM%CRUJRA2024">1901</value>
276+
<value compset="1850.*_DATM%CRUJRA2024[b]*">1901</value>
275277
<value compset="1850.*_DATM%CRUv7">1901</value>
276278
<value compset="1850.*_DATM%GSW">1901</value>
277279
<value compset="1850.*_DATM%NLDAS2">0</value> <!-- Unsupported -->
278280
<value compset="2000.*_DATM%WISOQIA">2000</value>
279281
<value compset="2000.*_DATM%QIA">1972</value>
280282
<value compset="HIST.*_DATM%QIA">1948</value>
281-
<value compset="HIST.*_DATM%CRUJRA2024">1901</value>
283+
<value compset="HIST.*_DATM%CRUJRA2024[b]*">1901</value>
282284
<value compset="HIST.*_DATM%CRUv7">1901</value>
283285
<value compset="HIST.*_DATM%GSW">1901</value>
284286
<value compset="HIST.*_DATM%NLDAS2">0</value> <!-- Unsupported -->
285287
<value compset="20TR.*_DATM%QIA">1948</value>
286-
<value compset="20TR.*_DATM%CRUJRA2024">1901</value>
288+
<value compset="20TR.*_DATM%CRUJRA2024[b]*">1901</value>
287289
<value compset="20TR.*_DATM%CRUv7">1901</value>
288290
<value compset="20TR.*_DATM%GSW">1901</value>
289291
<value compset="20TR.*_DATM%NLDAS2">0</value> <!-- Unsupported -->
290292
<value compset="4804.*_DATM%QIA">1948</value>
291293
<value compset="SSP.*_DATM%QIA" >1995</value>
292-
<value compset="SSP.*_DATM%CRUJRA2024" >2001</value>
294+
<value compset="SSP.*_DATM%CRUJRA2024[b]*" >2001</value>
293295
<value compset="SSP.*_DATM%CRUv7">2001</value>
294296
<value compset="SSP.*_DATM%GSW" >2001</value>
295297
<value compset="2003.*_DATM%QIA.*_TEST">2002</value>
296-
<value compset="1850.*_DATM%CRUJRA2024">1901</value>
297-
<value compset="2000.*_DATM%CRUJRA2024">1991</value>
298-
<value compset="2003.*_DATM%CRUJRA2024">2002</value>
299-
<value compset="2010.*_DATM%CRUJRA2024">2005</value>
298+
<value compset="1850.*_DATM%CRUJRA2024[b]*">1901</value>
299+
<value compset="2000.*_DATM%CRUJRA2024[b]*">1991</value>
300+
<value compset="2003.*_DATM%CRUJRA2024[b]*">2002</value>
301+
<value compset="2010.*_DATM%CRUJRA2024[b]*">2005</value>
300302
<value compset="1850.*_DATM%CRUv7">1901</value>
301303
<value compset="2000.*_DATM%CRUv7">1991</value>
302304
<value compset="2003.*_DATM%CRUv7">2002</value>
@@ -333,32 +335,32 @@
333335
<value compset="2000.*_DATM%1PT" grid="1x1_vancouverCAN" >1992</value>
334336
<value compset="2000.*_DATM%1PT" grid="1x1_urbanc_alpha" >2</value>
335337
<value compset="1850.*_DATM%QIA">1972</value>
336-
<value compset="1850.*_DATM%CRUJRA2024">1920</value>
338+
<value compset="1850.*_DATM%CRUJRA2024[b]*">1920</value>
337339
<value compset="1850.*_DATM%CRUv7">1920</value>
338340
<value compset="1850.*_DATM%GSW">1920</value>
339341
<value compset="1850.*_DATM%NLDAS2">-1</value> <!-- Unsupported -->
340342
<value compset="2000.*_DATM%WISOQIA">2004</value>
341343
<value compset="2000.*_DATM%QIA">2004</value>
342344
<value compset="HIST.*_DATM%QIA">1972</value>
343-
<value compset="HIST.*_DATM%CRUJRA2024">1920</value>
345+
<value compset="HIST.*_DATM%CRUJRA2024[b]*">1920</value>
344346
<value compset="HIST.*_DATM%CRUv7">1920</value>
345347
<value compset="HIST.*_DATM%GSW">1920</value>
346348
<value compset="HIST.*_DATM%NLDAS2">-1</value> <!-- Unsupported -->
347349
<value compset="20TR.*_DATM%QIA">1972</value>
348-
<value compset="20TR.*_DATM%CRUJRA2024">1920</value>
350+
<value compset="20TR.*_DATM%CRUJRA2024[b]*">1920</value>
349351
<value compset="20TR.*_DATM%CRUv7">1920</value>
350352
<value compset="20TR.*_DATM%GSW">1920</value>
351353
<value compset="20TR.*_DATM%NLDAS2">-1</value> <!-- Unsupported -->
352354
<value compset="4804.*_DATM%QIA">2004</value>
353355
<value compset="SSP.*_DATM%QIA">2004</value>
354-
<value compset="SSP.*_DATM%CRUJRA2024">2023</value>
356+
<value compset="SSP.*_DATM%CRUJRA2024[b]*">2023</value>
355357
<value compset="SSP.*_DATM%CRUv7">2016</value>
356358
<value compset="SSP.*_DATM%GSW">2014</value>
357359
<value compset="2003.*_DATM%QIA.*_TEST">2003</value>
358-
<value compset="1850.*_DATM%CRUJRA2024">1920</value>
359-
<value compset="2000.*_DATM%CRUJRA2024">2010</value>
360-
<value compset="2003.*_DATM%CRUJRA2024">2003</value>
361-
<value compset="2010.*_DATM%CRUJRA2024">2014</value>
360+
<value compset="1850.*_DATM%CRUJRA2024[b]*">1920</value>
361+
<value compset="2000.*_DATM%CRUJRA2024[b]*">2010</value>
362+
<value compset="2003.*_DATM%CRUJRA2024[b]*">2003</value>
363+
<value compset="2010.*_DATM%CRUJRA2024[b]*">2014</value>
362364
<value compset="1850.*_DATM%CRUv7">1920</value>
363365
<value compset="2000.*_DATM%CRUv7">2010</value>
364366
<value compset="2003.*_DATM%CRUv7">2003</value>

‎datm/cime_config/namelist_definition_datm.xml‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,15 @@
44

55
<!-- Note that streamslist here does not handle the optional streams - -->
66
<!-- those are handled in buildnml -->
7+
<!-- Note2: The list below gets searched using a "first match" method. -->
8+
<!-- This means a different result when CLM_XYZ is listed before -->
9+
<!-- versus after CLM_XYZb. Before will incorrectly select CLM_XYZ -->
10+
<!-- even when we request CLM_XYZb, while after will correctly select -->
11+
<!-- CLM_XYZ when we request CLM_XYZ and CLM_XYZb when we request -->
12+
<!-- CLM_XYZb. -->
13+
<!-- Note3: The reg-expression (?!b) after CLMCRUJRA2024 means NOT -->
14+
<!-- followed by a "b" and ensures order-independent selection of the -->
15+
<!-- correct match for CLMCRUJRA2024 and CLMCRUJRA2024b specifically. -->
716

817
<entry id="streamslist">
918
<type>char(100)</type>
@@ -14,7 +23,10 @@
1423
<value datm_mode="CLM_QIAN$">
1524
CLM_QIAN.Solar,CLM_QIAN.Precip,CLM_QIAN.TPQW
1625
</value>
17-
<value datm_mode="CLMCRUJRA2024">
26+
<value datm_mode="CLMCRUJRA2024b">
27+
CLMCRUJRA2024b.Solar,CLMCRUJRA2024b.Precip,CLMCRUJRA2024b.TPQW
28+
</value>
29+
<value datm_mode="CLMCRUJRA2024(?!b)">
1830
CLMCRUJRA2024.Solar,CLMCRUJRA2024.Precip,CLMCRUJRA2024.TPQW
1931
</value>
2032
<value datm_mode="CLMCRUNCEPv7">

‎datm/cime_config/stream_definition_datm.xml‎

Lines changed: 110 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,8 @@
2727
Currently the following data modes are supported:
2828
CLM_QIAN = Run with the CLM Qian dataset valid from 1948 to 2004 (force CLM)
2929
CLM_QIAN_WISO = Run with the CLM Qian dataset with isotopes valid from 2000 to 2004 (force CLM)
30-
CLMCRUJRA2024 = Run with the CLM CRUJRA 2024 forcing valid from 1901 to 2023 (force CLM)
30+
CLMCRUJRA2024 = Run with the CLM CRUJRA 2024 (filled Antarctica) forcing valid from 1901 to 2023 (force CLM)
31+
CLMCRUJRA2024b = Run with the CLM CRUJRA 2024b (filled Greenland snow hole) forcing valid from 1901 to 2023 (force CLM)
3132
CLMCRUNCEPv7 = Run with the CLM CRU NCEP V7 forcing valid from 1900 to 2010 (force CLM)
3233
CLMGSWP3v1 = Run with the CLM GSWP3 V1 forcing (force CLM)
3334
CLMNLDAS2 = Run with the CLM NLDAS2 regional forcing valid from 1980 to 2018 (force CLM)
@@ -75,6 +76,13 @@
7576
CLMCRUJRA2024.Precip
7677
CLMCRUJRA2024.TPQW
7778
79+
========================
80+
datm_mode CLMCRUJRA2024b: (DATM%CRUJRA2024b in env_run.xml)
81+
========================
82+
CLMCRUJRA2024b.Solar
83+
CLMCRUJRA2024b.Precip
84+
CLMCRUJRA2024b.TPQW
85+
7886
========================
7987
datm_mode CLMCRUNCEPv7: (DATM%CRUv7 in env_run.xml)
8088
========================
@@ -497,6 +505,107 @@
497505
<stream_readmode>single</stream_readmode>
498506
</stream_entry>
499507

508+
<!-- =================================== -->
509+
<!-- datm_mode CLMCRUJRA2024b -->
510+
<!-- =================================== -->
511+
512+
<stream_entry name="CLMCRUJRA2024b.Solar">
513+
<stream_meshfile>
514+
<meshfile>$DIN_LOC_ROOT/atm/datm7/atm_forcing.datm7.CRUJRA.0.5d.c20260129/three_stream/mesh_0.5x0.5_CRUJRAv2.5mask_cdf5_c20240916.nc</meshfile>
515+
</stream_meshfile>
516+
<stream_datafiles>
517+
<file first_year="1901" last_year="2023">$DIN_LOC_ROOT/atm/datm7/atm_forcing.datm7.CRUJRA.0.5d.c20260129/three_stream/clmforc.CRUJRAv2.5_filled_antarct_and_grnlnd_0.5x0.5.Solr.%y.nc</file>
518+
</stream_datafiles>
519+
<stream_datavars>
520+
<var>FSDS Faxa_swdn</var>
521+
</stream_datavars>
522+
<stream_lev_dimname>null</stream_lev_dimname>
523+
<stream_mapalgo>
524+
<mapalgo>bilinear</mapalgo>
525+
</stream_mapalgo>
526+
<stream_vectors>null</stream_vectors>
527+
<stream_year_align>$DATM_YR_ALIGN</stream_year_align>
528+
<stream_year_first>$DATM_YR_START</stream_year_first>
529+
<stream_year_last>$DATM_YR_END</stream_year_last>
530+
<stream_offset>0</stream_offset>
531+
<stream_tintalgo>
532+
<tintalgo>coszen</tintalgo>
533+
</stream_tintalgo>
534+
<stream_taxmode>
535+
<taxmode>cycle</taxmode>
536+
</stream_taxmode>
537+
<stream_dtlimit>
538+
<dtlimit>1.5</dtlimit>
539+
</stream_dtlimit>
540+
<stream_readmode>single</stream_readmode>
541+
</stream_entry>
542+
543+
<stream_entry name="CLMCRUJRA2024b.Precip">
544+
<stream_meshfile>
545+
<meshfile>$DIN_LOC_ROOT/atm/datm7/atm_forcing.datm7.CRUJRA.0.5d.c20260129/three_stream/mesh_0.5x0.5_CRUJRAv2.5mask_cdf5_c20240916.nc</meshfile>
546+
</stream_meshfile>
547+
<stream_datafiles>
548+
<file first_year="1901" last_year="2023">$DIN_LOC_ROOT/atm/datm7/atm_forcing.datm7.CRUJRA.0.5d.c20260129/three_stream/clmforc.CRUJRAv2.5_filled_antarct_and_grnlnd_0.5x0.5.Prec.%y.nc</file>
549+
</stream_datafiles>
550+
<stream_datavars>
551+
<var>PRECTmms Faxa_precn</var>
552+
</stream_datavars>
553+
<stream_lev_dimname>null</stream_lev_dimname>
554+
<stream_mapalgo>
555+
<mapalgo>bilinear</mapalgo>
556+
</stream_mapalgo>
557+
<stream_vectors>null</stream_vectors>
558+
<stream_year_align>$DATM_YR_ALIGN</stream_year_align>
559+
<stream_year_first>$DATM_YR_START</stream_year_first>
560+
<stream_year_last>$DATM_YR_END</stream_year_last>
561+
<stream_offset>0</stream_offset>
562+
<stream_tintalgo>
563+
<tintalgo>nearest</tintalgo>
564+
</stream_tintalgo>
565+
<stream_taxmode>
566+
<taxmode>cycle</taxmode>
567+
</stream_taxmode>
568+
<stream_dtlimit>
569+
<dtlimit>1.5</dtlimit>
570+
</stream_dtlimit>
571+
<stream_readmode>single</stream_readmode>
572+
</stream_entry>
573+
574+
<stream_entry name="CLMCRUJRA2024b.TPQW">
575+
<stream_meshfile>
576+
<meshfile>$DIN_LOC_ROOT/atm/datm7/atm_forcing.datm7.CRUJRA.0.5d.c20260129/three_stream/mesh_0.5x0.5_CRUJRAv2.5mask_cdf5_c20240916.nc</meshfile>
577+
</stream_meshfile>
578+
<stream_datafiles>
579+
<file first_year="1901" last_year="2023">$DIN_LOC_ROOT/atm/datm7/atm_forcing.datm7.CRUJRA.0.5d.c20260129/three_stream/clmforc.CRUJRAv2.5_filled_antarct_and_grnlnd_0.5x0.5.TPQWL.%y.nc</file>
580+
</stream_datafiles>
581+
<stream_datavars>
582+
<var>TBOT Sa_tbot</var>
583+
<var>WIND Sa_wind</var>
584+
<var>QBOT Sa_shum</var>
585+
<var>PSRF Sa_pbot</var>
586+
<var>FLDS Faxa_lwdn</var>
587+
</stream_datavars>
588+
<stream_lev_dimname>null</stream_lev_dimname>
589+
<stream_mapalgo>
590+
<mapalgo>bilinear</mapalgo>
591+
</stream_mapalgo>
592+
<stream_vectors>null</stream_vectors>
593+
<stream_year_align>$DATM_YR_ALIGN</stream_year_align>
594+
<stream_year_first>$DATM_YR_START</stream_year_first>
595+
<stream_year_last>$DATM_YR_END</stream_year_last>
596+
<stream_offset>0</stream_offset>
597+
<stream_tintalgo>
598+
<tintalgo>linear</tintalgo>
599+
</stream_tintalgo>
600+
<stream_taxmode>
601+
<taxmode>cycle</taxmode>
602+
</stream_taxmode>
603+
<stream_dtlimit>
604+
<dtlimit>1.5</dtlimit>
605+
</stream_dtlimit>
606+
<stream_readmode>single</stream_readmode>
607+
</stream_entry>
608+
500609
<!-- =================================== -->
501610
<!-- datm_mode CLMCRUJRA2024 -->
502611
<!-- =================================== -->

‎datm/cime_config/testdefs/testlist_datm.xml‎

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
<option name="comment">Check that SSP126 compset works right</option>
6363
</options>
6464
</test>
65-
<test compset="SSP126_DATM%CRUJRA2024_SLND_SICE_SOCN_SROF_SGLC_SWAV_SESP" grid="f10_f10_mg37" name="SMS_Ld5">
65+
<test compset="SSP126_DATM%CRUJRA2024b_SLND_SICE_SOCN_SROF_SGLC_SWAV_SESP" grid="f10_f10_mg37" name="SMS_Ld5">
6666
<machines>
6767
<machine name="derecho" compiler="intel" category="aux_cdeps"/>
6868
<machine name="betzy" compiler="intel" category="aux_cdeps_noresm"/>
@@ -101,14 +101,14 @@
101101
<option name="wallclock"> 00:10:00 </option>
102102
</options>
103103
</test>
104-
<test compset="HIST_DATM%CRUJRA2024_SLND_SICE_SOCN_SROF_SGLC_SWAV_SESP" grid="f10_f10_mg37" name="SMS_Ld5">
104+
<test compset="HIST_DATM%CRUJRA2024b_SLND_SICE_SOCN_SROF_SGLC_SWAV_SESP" grid="f10_f10_mg37" name="SMS_Ld5">
105105
<machines>
106106
<machine name="derecho" compiler="intel" category="aux_cdeps"/>
107107
<machine name="betzy" compiler="gnu" category="aux_cdeps_noresm"/>
108108
</machines>
109109
<options>
110110
<option name="wallclock"> 00:10:00 </option>
111-
<option name="comment">Test historical CRUJRA2024 forcing in a short smoke test to make sure it works</option>
111+
<option name="comment">Test historical CRUJRA2024b forcing in a short smoke test to make sure it works</option>
112112
</options>
113113
</test>
114114
<test compset="1850_DATM%CRUJRA2024_SLND_SICE_SOCN_SROF_SGLC_SWAV_SESP" grid="f10_f10_mg37" name="SMS_Ld5">
@@ -121,14 +121,24 @@
121121
<option name="comment">Test 1850 CRUJRA2024 forcing in a short smoke test to make sure it works</option>
122122
</options>
123123
</test>
124-
<test compset="2010_DATM%CRUJRA2024_SLND_SICE_SOCN_SROF_SGLC_SWAV_SESP" grid="f10_f10_mg37" name="SMS_Ld5">
124+
<test compset="1850_DATM%CRUJRA2024b_SLND_SICE_SOCN_SROF_SGLC_SWAV_SESP" grid="f10_f10_mg37" name="SMS_Ld5">
125125
<machines>
126126
<machine name="derecho" compiler="intel" category="aux_cdeps"/>
127127
<machine name="betzy" compiler="intel" category="aux_cdeps_noresm"/>
128128
</machines>
129129
<options>
130130
<option name="wallclock"> 00:10:00 </option>
131-
<option name="comment">Test 2010 CRUJRA2024 forcing in a short smoke test to make sure it works</option>
131+
<option name="comment">Test 1850 CRUJRA2024b forcing in a short smoke test to make sure it works</option>
132+
</options>
133+
</test>
134+
<test compset="2010_DATM%CRUJRA2024b_SLND_SICE_SOCN_SROF_SGLC_SWAV_SESP" grid="f10_f10_mg37" name="SMS_Ld5">
135+
<machines>
136+
<machine name="derecho" compiler="intel" category="aux_cdeps"/>
137+
<machine name="betzy" compiler="intel" category="aux_cdeps_noresm"/>
138+
</machines>
139+
<options>
140+
<option name="wallclock"> 00:10:00 </option>
141+
<option name="comment">Test 2010 CRUJRA2024b forcing in a short smoke test to make sure it works</option>
132142
</options>
133143
</test>
134144
<test compset="2000_DATM%NLDAS2_SLND_SICE_SOCN_SROF_SGLC_SWAV_SESP" grid="f10_f10_mg37" name="SMS_Ld5">

‎doc/source/datm.rst‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ referred to as its mode.
1111
In the case of CESM, the active model components would be: CTSM,
1212
POP2, MOM6, POP2, CICE5-6, WW3 and MOSART. As examples, CORE2_NYF
1313
(CORE2 normal year forcing) is the DATM mode used in driving
14-
POP2 and MOM6. On the other hand CLM_QIAN, CLMCRUJRA2024, CLMCRUNCEP, CLMGSWP3
14+
POP2 and MOM6. On the other hand CLM_QIAN, CLMCRUJRA2024, CLMCRUJRA2024b, CLMCRUNCEP, CLMGSWP3
1515
and CLM1PT are DATM modes using observational data for forcing CTSM.
1616

1717
.. _datm-datamodes:
@@ -121,6 +121,12 @@ DATM%CLM_QIAN
121121
- streams: CLM_QIAN.Solar,CLM_QIAN.Precip,CLM_QIAN.TPQW
122122
- datamode: CLMNCEP
123123

124+
DATM%CLMCRUJRA2024b
125+
- CRUJRA atm input data (CESM I compsets)
126+
- datm_mode: CLMNCEP
127+
- streams: CLMCRUJRA2024b.Solar,CLMCRUJRA2024b.Precip,CLMCRUJRA2024b.TPQW
128+
- datamode: CLMNCEP
129+
124130
DATM%CLMCRUJRA2024
125131
- CRUJRA atm input data (CESM I compsets)
126132
- datm_mode: CLMNCEP

0 commit comments

Comments
 (0)