Skip to content

Commit 5130bd1

Browse files
jonbobjonbob
committed
Merge branch 'jonbob/datm/add-jra-1p5-2023' (PR #6628)
Add support for new JRA forcing through year 2023 Adds new datm and drof settings to support JRA forcing through 2023, as well as a new G-case compset that uses the forcing. It is distinguished from the typical JRA-1p5 in the compset aliases, GMPAS-JRA1p5-2023 and GMPAS-JRA1p5, for backwards compatibility. [BFB]
2 parents 6920f5e + 6fbecc1 commit 5130bd1

File tree

3 files changed

+18
-4
lines changed

3 files changed

+18
-4
lines changed

‎components/data_comps/datm/cime_config/config_component.xml‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
This file may have atm desc entries.
1111
-->
1212
<description modifier_mode="1">
13-
<desc atm="DATM[%QIA][%WISOQIA][%CRU][%CRUv7][%GSWP3v1][%ERA5][%ERA56HR][%GSWP3w5e5][%MOSARTTEST][%NLDAS2][%CPLHIST][%E3SMWCv2][%CPLWCH][%1PT][%NYF][%IAF][%JRA][%JRA-1p5][%JRA-1p4-2018][%JRA-RYF8485][%JRA-RYF9091][%JRA-RYF0304][%CFSv2][%CFSR]"> Data driven ATM </desc>
13+
<desc atm="DATM[%QIA][%WISOQIA][%CRU][%CRUv7][%GSWP3v1][%ERA5][%ERA56HR][%GSWP3w5e5][%MOSARTTEST][%NLDAS2][%CPLHIST][%E3SMWCv2][%CPLWCH][%1PT][%NYF][%IAF][%JRA][%JRA-1p5][%JRA-1p5-2023][%JRA-1p4-2018][%JRA-RYF8485][%JRA-RYF9091][%JRA-RYF0304][%CFSv2][%CFSR]"> Data driven ATM </desc>
1414
<desc option="QIA"> QIAN data set </desc>
1515
<desc option="WISOQIA">QIAN with water isotopes</desc>
1616
<desc option="CRU"> CRUNCEP data set </desc>
@@ -28,8 +28,9 @@
2828
<desc option="NYF">COREv2 normal year forcing</desc>
2929
<desc option="IAF">COREv2 interannual forcing</desc>
3030
<desc option="JRA">interannual JRA55 forcing</desc>
31-
<desc option="JRA-1p5">interannual JRA55 forcing, v1.5, through 2020</desc>
3231
<desc option="JRA-1p4-2018">interannual JRA55 forcing, v1.4, through 2018</desc>
32+
<desc option="JRA-1p5">interannual JRA55 forcing, v1.5, through 2020</desc>
33+
<desc option="JRA-1p5-2023">interannual JRA55 forcing, v1.5, through 2023</desc>
3334
<desc option="JRA-RYF8485"> JRA55 Repeat Year Forcing v1.3 1984-1985</desc>
3435
<desc option="JRA-RYF9091"> JRA55 Repeat Year Forcing v1.3 1990-1991</desc>
3536
<desc option="JRA-RYF0304"> JRA55 Repeat Year Forcing v1.3 2003-2004</desc>
@@ -63,8 +64,9 @@ data (see cime issue #3653 -- https://github.com/ESMCI/cime/issues/3653).
6364
<value compset="%NYF">CORE2_NYF</value>
6465
<value compset="%IAF">CORE2_IAF</value>
6566
<value compset="%JRA">CORE_IAF_JRA</value>
66-
<value compset="%JRA-1p5">IAF_JRA_1p5</value>
6767
<value compset="%JRA-1p4-2018">CORE_IAF_JRA_1p4_2018</value>
68+
<value compset="%JRA-1p5">IAF_JRA_1p5</value>
69+
<value compset="%JRA-1p5-2023">IAF_JRA_1p5</value>
6870
<value compset="%JRA-RYF8485">CORE_RYF8485_JRA</value>
6971
<value compset="%JRA-RYF9091">CORE_RYF9091_JRA</value>
7072
<value compset="%JRA-RYF0304">CORE_RYF0304_JRA</value>
@@ -391,6 +393,7 @@ data (see cime issue #3653 -- https://github.com/ESMCI/cime/issues/3653).
391393
<value compset="2000.*_DATM">$DATM_CLMNCEP_YR_START</value>
392394
<value compset="2000_DATM%JRA">1</value>
393395
<value compset="2000_DATM%JRA-1p5">1</value>
396+
<value compset="2000_DATM%JRA-1p5_2023">1</value>
394397
<value compset="2003.*_DATM">$DATM_CLMNCEP_YR_START</value>
395398
<value compset="2010.*_DATM">$DATM_CLMNCEP_YR_START</value>
396399
<value compset="4804.*_DATM">$DATM_CLMNCEP_YR_START</value>
@@ -488,6 +491,7 @@ data (see cime issue #3653 -- https://github.com/ESMCI/cime/issues/3653).
488491
<value compset="2003.*_DATM%NLDAS2">2003</value>
489492
<value compset="2000_DATM%JRA">2016</value>
490493
<value compset="2000_DATM%JRA-1p5">2020</value>
494+
<value compset="2000_DATM%JRA-1p5-2023">2023</value>
491495
<value compset="2000.*_DATM%ERA5">1979</value>
492496
<value compset="2000.*_DATM%ERA56HR">1979</value>
493497
</values>

‎components/data_comps/drof/cime_config/config_component.xml‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
-->
1414

1515
<description modifier_mode="1">
16-
<desc rof="DROF[%NULL][%NYF][%NYFAIS00][%NYFAIS45][%NYFAIS55][%IAF][%IAFAIS00][%IAFAIS45][%IAFAIS55][%CPLHIST][%JRA][%JRA-1p5][%JRA-1p5-AIS0ROF][%JRA-1p4-2018][%JRA-1p4-2018-AIS0ICE][%JRA-1p4-2018-AIS0LIQ][%JRA-1p4-2018-AIS0ROF[%JRA-RYF8485][%JRA-RYF9091][%JRA-RYF0304]">Data runoff model</desc>
16+
<desc rof="DROF[%NULL][%NYF][%NYFAIS00][%NYFAIS45][%NYFAIS55][%IAF][%IAFAIS00][%IAFAIS45][%IAFAIS55][%CPLHIST][%JRA][%JRA-1p5][%JRA-1p5-2023][%JRA-1p5-AIS0ROF][%JRA-1p4-2018][%JRA-1p4-2018-AIS0ICE][%JRA-1p4-2018-AIS0LIQ][%JRA-1p4-2018-AIS0ROF[%JRA-RYF8485][%JRA-RYF9091][%JRA-RYF0304]">Data runoff model</desc>
1717
<desc option="NULL" >NULL mode</desc>
1818
<desc option="NYF" >COREv2 normal year forcing:</desc>
1919
<desc option="NYFAIS00" >COREv2 normal year forcing:</desc>
@@ -24,6 +24,7 @@
2424
<desc option="IAFAIS45" >COREv2 interannual year forcing:</desc>
2525
<desc option="IAFAIS55" >COREv2 interannual year forcing:</desc>
2626
<desc option="CPLHIST" >CPLHIST mode:</desc>
27+
<desc option="JRA-1p5-2023">JRA55 interannual forcing, v1.5, through 2023</desc>
2728
<desc option="JRA-1p5">JRA55 interannual forcing, v1.5, through 2020</desc>
2829
<desc option="JRA-1p5-AIS0ROF">JRA55 interannual forcing, v1.5, through 2020, no rofi or rofl around AIS</desc>
2930
<desc option="JRA-1p4-2018">JRA55 interannual forcing, v1.4, through 2018</desc>
@@ -61,6 +62,7 @@
6162
<value compset="_DROF%IAFAIS55" >DIATREN_IAF_AIS55_RX1</value>
6263
<value compset="_DROF%CPLHIST">CPLHIST</value>
6364
<value compset="_DROF%JRA" >IAF_JRA</value>
65+
<value compset="_DROF%JRA-1p5-2023" >IAF_JRA_1p5</value>
6466
<value compset="_DROF%JRA-1p5" >IAF_JRA_1p5</value>
6567
<value compset="_DROF%JRA-1p5-AIS0ROF" >IAF_JRA_1p5_AIS0ROF</value>
6668
<value compset="_DROF%JRA-1p4-2018" >IAF_JRA_1p4_2018</value>
@@ -165,6 +167,7 @@
165167
<value compset="_DROF%JRA" >1</value>
166168
<value compset="_DROF%JRA-1p4-2018" >1</value>
167169
<value compset="_DROF%JRA-1p5" >1</value>
170+
<value compset="_DROF%JRA-1p5-2023" >1</value>
168171
</values>
169172
<group>run_component_drof</group>
170173
<file>env_run.xml</file>
@@ -179,6 +182,7 @@
179182
<value compset="_DROF%JRA" >1958</value>
180183
<value compset="_DROF%JRA-1p4-2018" >1958</value>
181184
<value compset="_DROF%JRA-1p5" >1958</value>
185+
<value compset="_DROF%JRA-1p5-2023" >1958</value>
182186
</values>
183187
<group>run_component_drof</group>
184188
<file>env_run.xml</file>
@@ -193,6 +197,7 @@
193197
<value compset="_DROF%JRA" >2016</value>
194198
<value compset="_DROF%JRA-1p4-2018" >2018</value>
195199
<value compset="_DROF%JRA-1p5" >2020</value>
200+
<value compset="_DROF%JRA-1p5-2023" >2023</value>
196201
</values>
197202
<group>run_component_drof</group>
198203
<file>env_run.xml</file>

‎components/mpas-ocean/cime_config/config_compsets.xml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,11 @@
6767
<lname>2000_DATM%JRA-1p5_SLND_MPASSI_MPASO%DATMFORCED_DROF%JRA-1p5_SGLC_SWAV</lname>
6868
</compset>
6969

70+
<compset>
71+
<alias>GMPAS-JRA1p5-2023</alias>
72+
<lname>2000_DATM%JRA-1p5-2023_SLND_MPASSI_MPASO%DATMFORCED_DROF%JRA-1p5-2023_SGLC_SWAV</lname>
73+
</compset>
74+
7075
<compset>
7176
<alias>GMPAS-OECO-JRA1p4</alias>
7277
<lname>2000_DATM%JRA-1p4-2018_SLND_MPASSI_MPASO%OECODATMFORCED_DROF%JRA-1p4-2018_SGLC_SWAV</lname>

0 commit comments

Comments
 (0)