Skip to content

Commit 37b1a13

Browse files
committed
extend jra v1.5 to 2023
1 parent 0c37744 commit 37b1a13

File tree

6 files changed

+65
-41
lines changed

6 files changed

+65
-41
lines changed

datm/cime_config/config_component.xml

Lines changed: 4 additions & 4 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][%MOSARTTEST][%NLDAS2][%CPLHIST][%1PT][%NYF][%IAF][%JRA][%JRA-1p4-2018][%JRA-1p5-2018][%JRA-RYF8485][%JRA-RYF9091][%JRA-RYF0304][%SIMPLE]"> Data driven ATM </desc>
13+
<desc atm="DATM[%QIA][%WISOQIA][%CRU][%CRUv7][%GSWP3v1][%MOSARTTEST][%NLDAS2][%CPLHIST][%1PT][%NYF][%IAF][%JRA][%JRA-1p4-2018][%JRA-1p5-2023][%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="CRU"> CRUNCEP data set </desc>
@@ -23,7 +23,7 @@
2323
<desc option="IAF">COREv2 interannual forcing</desc>
2424
<desc option="JRA">interannual JRA55 forcing</desc>
2525
<desc option="JRA-1p4-2018">interannual JRA55 forcing, v1.4, through 2018</desc>
26-
<desc option="JRA-1p5-2018">interannual JRA55 forcing, v1.5, through 2018</desc>
26+
<desc option="JRA-1p5-2023">interannual JRA55 forcing, v1.5, through 2023</desc>
2727
<desc option="JRA-RYF8485"> JRA55 Repeat Year Forcing v1.3 1984-1985</desc>
2828
<desc option="JRA-RYF9091"> JRA55 Repeat Year Forcing v1.3 1990-1991</desc>
2929
<desc option="JRA-RYF0304"> JRA55 Repeat Year Forcing v1.3 2003-2004</desc>
@@ -42,7 +42,7 @@
4242

4343
<entry id="DATM_MODE">
4444
<type>char</type>
45-
<valid_values>CORE2_NYF,CORE2_IAF,CLM_QIAN,CLM_QIAN_WISO,1PT,CLMCRUNCEP,CLMCRUNCEPv7,CLMGSWP3v1,CLMNLDAS2,CPLHIST,CORE_IAF_JRA,CORE_IAF_JRA_1p4_2018,CORE_IAF_JRA_1p5_2018,CORE_IAF_JRA_1p5_2018,ERA5,SIMPLE</valid_values>
45+
<valid_values>CORE2_NYF,CORE2_IAF,CLM_QIAN,CLM_QIAN_WISO,1PT,CLMCRUNCEP,CLMCRUNCEPv7,CLMGSWP3v1,CLMNLDAS2,CPLHIST,CORE_IAF_JRA,CORE_IAF_JRA_1p4_2018,CORE_IAF_JRA_1p5_2023,ERA5,SIMPLE</valid_values>
4646
<default_value>CORE2_NYF</default_value>
4747
<group>run_component_datm</group>
4848
<file>env_run.xml</file>
@@ -55,7 +55,7 @@
5555
<value compset="DATM%IAF">CORE2_IAF</value>
5656
<value compset="DATM%JRA">CORE_IAF_JRA</value>
5757
<value compset="DATM%JRA-1p4-2018">CORE_IAF_JRA_1p4_2018</value>
58-
<value compset="DATM%JRA-1p5-2018">CORE_IAF_JRA_1p5_2018</value>
58+
<value compset="DATM%JRA-1p5-2023">CORE_IAF_JRA_1p5_2023</value>
5959
<value compset="DATM%QIA">CLM_QIAN</value>
6060
<value compset="DATM%WISOQIA">CLM_QIAN_WISO</value>
6161
<value compset="DATM%CRUv7">CLMCRUNCEPv7</value>

datm/cime_config/namelist_definition_datm.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@
5252
<value datm_mode="CORE_IAF_JRA_1p4_2018" >
5353
CORE_IAF_JRA_1p4_2018.GCGCS.PREC,CORE_IAF_JRA_1p4_2018.GISS.LWDN,CORE_IAF_JRA_1p4_2018.GISS.SWDN,CORE_IAF_JRA_1p4_2018.NCEP.Q_10,CORE_IAF_JRA_1p4_2018.NCEP.SLP_,CORE_IAF_JRA_1p4_2018.NCEP.T_10,CORE_IAF_JRA_1p4_2018.NCEP.U_10,CORE_IAF_JRA_1p4_2018.NCEP.V_10
5454
</value>
55-
<value datm_mode="CORE_IAF_JRA_1p5_2018" >
56-
CORE_IAF_JRA_1p5_2018.GCGCS.PREC,CORE_IAF_JRA_1p5_2018.GISS.LWDN,CORE_IAF_JRA_1p5_2018.GISS.SWDN,CORE_IAF_JRA_1p5_2018.NCEP.Q_10,CORE_IAF_JRA_1p5_2018.NCEP.SLP_,CORE_IAF_JRA_1p5_2018.NCEP.T_10,CORE_IAF_JRA_1p5_2018.NCEP.U_10,CORE_IAF_JRA_1p5_2018.NCEP.V_10
55+
<value datm_mode="CORE_IAF_JRA_1p5_2023" >
56+
CORE_IAF_JRA_1p5_2023.GCGCS.PREC,CORE_IAF_JRA_1p5_2023.GISS.LWDN,CORE_IAF_JRA_1p5_2023.GISS.SWDN,CORE_IAF_JRA_1p5_2023.NCEP.Q_10,CORE_IAF_JRA_1p5_2023.NCEP.SLP_,CORE_IAF_JRA_1p5_2023.NCEP.T_10,CORE_IAF_JRA_1p5_2023.NCEP.U_10,CORE_IAF_JRA_1p5_2023.NCEP.V_10
5757
</value>
5858
<value datm_mode="CORE_RYF8485_JRA">
5959
CORE_RYF8485_JRA.GISS.LWDN,CORE_RYF8485_JRA.GISS.SWDN,CORE_RYF8485_JRA.GCGCS,CORE_RYF8485_JRA.NCEP

datm/cime_config/stream_definition_datm.xml

Lines changed: 50 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
CORE2_IAF = CORE2 intra-annual year forcing (for forcing MOM6 and CICE)
3838
CORE_IAF_JRA = JRA55 intra-annual year forcing (for forcing MOM6 and CICE)
3939
CORE_IAF_JRA_1p4_2018 = JRA55 intra-annual year forcing, v1.4, through 2018 (for forcing MOM6 and CICE)
40-
CORE_IAF_JRA_1p5_2018 = JRA55 intra-annual year forcing, v1.5, through 2018 (for forcing MOM6 and CICE
40+
CORE_IAF_JRA_1p5_2023 = JRA55 intra-annual year forcing, v1.5, through 2023 (for forcing MOM6 and CICE)
4141
CORE_RYF8485_JRA = JRA55 repeat year forcing, v1.3, 1984-1985 (for forcing MOM6 and CICE)
4242
CORE_RYF9091_JRA = JRA55 repeat year forcing, v1.3, 1990-1991 (for forcing MOM6 and CICE)
4343
CORE_RYF0304_JRA = JRA55 repeat year forcing, v1.3, 2003-2004 (for forcing MOM6 and CICE)
@@ -2418,15 +2418,18 @@
24182418
</stream_entry>
24192419

24202420
<!-- ================================ -->
2421-
<!-- datm_mode CORE_IAF_JRA_1p5_2018 -->
2421+
<!-- datm_mode CORE_IAF_JRA_1p5_2023 -->
24222422
<!-- ================================ -->
24232423

2424-
<stream_entry name="CORE_IAF_JRA_1p5_2018.GCGCS.PREC">
2424+
<stream_entry name="CORE_IAF_JRA_1p5_2023.GCGCS.PREC">
24252425
<stream_meshfile>
24262426
<meshfile>$DIN_LOC_ROOT/share/meshes/TL319_151007_ESMFmesh.nc</meshfile>
24272427
</stream_meshfile>
24282428
<stream_datafiles>
2429-
<file first_year="1958" last_year="2018">$DIN_LOC_ROOT/ocn/jra55/v1.5_noleap/JRA.v1.5.prec.TL319.%y.210504.nc</file>
2429+
<file first_year="1958" last_year="2020">$DIN_LOC_ROOT/ocn/jra55/v1.5_noleap/JRA.v1.5.prec.TL319.%y.210504.nc</file>
2430+
<file first_year="2021" last_year="2021">$DIN_LOC_ROOT/ocn/jra55/v1.5_noleap/JRA.v1.5.prec.TL319.%y.220505.nc</file>
2431+
<file first_year="2022" last_year="2022">$DIN_LOC_ROOT/ocn/jra55/v1.5_noleap/JRA.v1.5.prec.TL319.%y.230718.nc</file>
2432+
<file first_year="2023" last_year="2023">$DIN_LOC_ROOT/ocn/jra55/v1.5_noleap/JRA.v1.5.prec.TL319.%y.240531.nc</file>
24302433
</stream_datafiles>
24312434
<stream_datavars>
24322435
<var>prec Faxa_prec</var>
@@ -2438,7 +2441,7 @@
24382441
<stream_vectors>null</stream_vectors>
24392442
<stream_year_align>1</stream_year_align>
24402443
<stream_year_first>1958</stream_year_first>
2441-
<stream_year_last>2018</stream_year_last>
2444+
<stream_year_last>2023</stream_year_last>
24422445
<stream_offset>0</stream_offset>
24432446
<stream_tintalgo>
24442447
<tintalgo>linear</tintalgo>
@@ -2452,12 +2455,15 @@
24522455
<stream_readmode>single</stream_readmode>
24532456
</stream_entry>
24542457

2455-
<stream_entry name="CORE_IAF_JRA_1p5_2018.GISS.LWDN">
2458+
<stream_entry name="CORE_IAF_JRA_1p5_2023.GISS.LWDN">
24562459
<stream_meshfile>
24572460
<meshfile>$DIN_LOC_ROOT/share/meshes/TL319_151007_ESMFmesh.nc</meshfile>
24582461
</stream_meshfile>
24592462
<stream_datafiles>
2460-
<file first_year="1958" last_year="2018">$DIN_LOC_ROOT/ocn/jra55/v1.5_noleap/JRA.v1.5.lwdn.TL319.%y.210504.nc</file>
2463+
<file first_year="1958" last_year="2020">$DIN_LOC_ROOT/ocn/jra55/v1.5_noleap/JRA.v1.5.lwdn.TL319.%y.210504.nc</file>
2464+
<file first_year="2021" last_year="2021">$DIN_LOC_ROOT/ocn/jra55/v1.5_noleap/JRA.v1.5.lwdn.TL319.%y.220505.nc</file>
2465+
<file first_year="2022" last_year="2022">$DIN_LOC_ROOT/ocn/jra55/v1.5_noleap/JRA.v1.5.lwdn.TL319.%y.230718.nc</file>
2466+
<file first_year="2023" last_year="2023">$DIN_LOC_ROOT/ocn/jra55/v1.5_noleap/JRA.v1.5.lwdn.TL319.%y.240531.nc</file>
24612467
</stream_datafiles>
24622468
<stream_datavars>
24632469
<var>lwdn Faxa_lwdn</var>
@@ -2469,7 +2475,7 @@
24692475
<stream_vectors>null</stream_vectors>
24702476
<stream_year_align>1</stream_year_align>
24712477
<stream_year_first>1958</stream_year_first>
2472-
<stream_year_last>2018</stream_year_last>
2478+
<stream_year_last>2023</stream_year_last>
24732479
<stream_offset>0</stream_offset>
24742480
<stream_tintalgo>
24752481
<tintalgo>linear</tintalgo>
@@ -2483,12 +2489,15 @@
24832489
<stream_readmode>single</stream_readmode>
24842490
</stream_entry>
24852491

2486-
<stream_entry name="CORE_IAF_JRA_1p5_2018.GISS.SWDN">
2492+
<stream_entry name="CORE_IAF_JRA_1p5_2023.GISS.SWDN">
24872493
<stream_meshfile>
24882494
<meshfile>$DIN_LOC_ROOT/share/meshes/TL319_151007_ESMFmesh.nc</meshfile>
24892495
</stream_meshfile>
24902496
<stream_datafiles>
2491-
<file first_year="1958" last_year="2018">$DIN_LOC_ROOT/ocn/jra55/v1.5_noleap/JRA.v1.5.swdn.TL319.%y.210504.nc</file>
2497+
<file first_year="1958" last_year="2020">$DIN_LOC_ROOT/ocn/jra55/v1.5_noleap/JRA.v1.5.swdn.TL319.%y.210504.nc</file>
2498+
<file first_year="2021" last_year="2021">$DIN_LOC_ROOT/ocn/jra55/v1.5_noleap/JRA.v1.5.swdn.TL319.%y.220505.nc</file>
2499+
<file first_year="2022" last_year="2022">$DIN_LOC_ROOT/ocn/jra55/v1.5_noleap/JRA.v1.5.swdn.TL319.%y.230718.nc</file>
2500+
<file first_year="2023" last_year="2023">$DIN_LOC_ROOT/ocn/jra55/v1.5_noleap/JRA.v1.5.swdn.TL319.%y.240531.nc</file>
24922501
</stream_datafiles>
24932502
<stream_datavars>
24942503
<var>swdn Faxa_swdn</var>
@@ -2500,7 +2509,7 @@
25002509
<stream_vectors>null</stream_vectors>
25012510
<stream_year_align>1</stream_year_align>
25022511
<stream_year_first>1958</stream_year_first>
2503-
<stream_year_last>2018</stream_year_last>
2512+
<stream_year_last>2023</stream_year_last>
25042513
<stream_offset>-5400</stream_offset>
25052514
<stream_tintalgo>
25062515
<tintalgo>coszen</tintalgo>
@@ -2514,12 +2523,15 @@
25142523
<stream_readmode>single</stream_readmode>
25152524
</stream_entry>
25162525

2517-
<stream_entry name="CORE_IAF_JRA_1p5_2018.NCEP.Q_10">
2526+
<stream_entry name="CORE_IAF_JRA_1p5_2023.NCEP.Q_10">
25182527
<stream_meshfile>
25192528
<meshfile>$DIN_LOC_ROOT/share/meshes/TL319_151007_ESMFmesh.nc</meshfile>
25202529
</stream_meshfile>
25212530
<stream_datafiles>
2522-
<file first_year="1958" last_year="2018">$DIN_LOC_ROOT/ocn/jra55/v1.5_noleap/JRA.v1.5.q_10.TL319.%y.210504.nc</file>
2531+
<file first_year="1958" last_year="2020">$DIN_LOC_ROOT/ocn/jra55/v1.5_noleap/JRA.v1.5.q_10.TL319.%y.210504.nc</file>
2532+
<file first_year="2021" last_year="2021">$DIN_LOC_ROOT/ocn/jra55/v1.5_noleap/JRA.v1.5.q_10.TL319.%y.220505.nc</file>
2533+
<file first_year="2022" last_year="2022">$DIN_LOC_ROOT/ocn/jra55/v1.5_noleap/JRA.v1.5.q_10.TL319.%y.230718.nc</file>
2534+
<file first_year="2023" last_year="2023">$DIN_LOC_ROOT/ocn/jra55/v1.5_noleap/JRA.v1.5.q_10.TL319.%y.240531.nc</file>
25232535
</stream_datafiles>
25242536
<stream_datavars>
25252537
<var>q_10 Sa_shum</var>
@@ -2531,7 +2543,7 @@
25312543
<stream_vectors>null</stream_vectors>
25322544
<stream_year_align>1</stream_year_align>
25332545
<stream_year_first>1958</stream_year_first>
2534-
<stream_year_last>2018</stream_year_last>
2546+
<stream_year_last>2023</stream_year_last>
25352547
<stream_offset>0</stream_offset>
25362548
<stream_tintalgo>
25372549
<tintalgo>linear</tintalgo>
@@ -2545,12 +2557,15 @@
25452557
<stream_readmode>single</stream_readmode>
25462558
</stream_entry>
25472559

2548-
<stream_entry name="CORE_IAF_JRA_1p5_2018.NCEP.SLP_">
2560+
<stream_entry name="CORE_IAF_JRA_1p5_2023.NCEP.SLP_">
25492561
<stream_meshfile>
25502562
<meshfile>$DIN_LOC_ROOT/share/meshes/TL319_151007_ESMFmesh.nc</meshfile>
25512563
</stream_meshfile>
25522564
<stream_datafiles>
2553-
<file first_year="1958" last_year="2018">$DIN_LOC_ROOT/ocn/jra55/v1.5_noleap/JRA.v1.5.slp.TL319.%y.210504.nc</file>
2565+
<file first_year="1958" last_year="2020">$DIN_LOC_ROOT/ocn/jra55/v1.5_noleap/JRA.v1.5.slp.TL319.%y.210504.nc</file>
2566+
<file first_year="2021" last_year="2021">$DIN_LOC_ROOT/ocn/jra55/v1.5_noleap/JRA.v1.5.slp.TL319.%y.220505.nc</file>
2567+
<file first_year="2022" last_year="2022">$DIN_LOC_ROOT/ocn/jra55/v1.5_noleap/JRA.v1.5.slp.TL319.%y.230718.nc</file>
2568+
<file first_year="2023" last_year="2023">$DIN_LOC_ROOT/ocn/jra55/v1.5_noleap/JRA.v1.5.slp.TL319.%y.240531.nc</file>
25542569
</stream_datafiles>
25552570
<stream_datavars>
25562571
<var>slp Sa_pslv</var>
@@ -2562,7 +2577,7 @@
25622577
<stream_vectors>null</stream_vectors>
25632578
<stream_year_align>1</stream_year_align>
25642579
<stream_year_first>1958</stream_year_first>
2565-
<stream_year_last>2018</stream_year_last>
2580+
<stream_year_last>2023</stream_year_last>
25662581
<stream_offset>0</stream_offset>
25672582
<stream_tintalgo>
25682583
<tintalgo>linear</tintalgo>
@@ -2576,12 +2591,15 @@
25762591
<stream_readmode>single</stream_readmode>
25772592
</stream_entry>
25782593

2579-
<stream_entry name="CORE_IAF_JRA_1p5_2018.NCEP.T_10">
2594+
<stream_entry name="CORE_IAF_JRA_1p5_2023.NCEP.T_10">
25802595
<stream_meshfile>
25812596
<meshfile>$DIN_LOC_ROOT/share/meshes/TL319_151007_ESMFmesh.nc</meshfile>
25822597
</stream_meshfile>
25832598
<stream_datafiles>
2584-
<file first_year="1958" last_year="2018">$DIN_LOC_ROOT/ocn/jra55/v1.5_noleap/JRA.v1.5.t_10.TL319.%y.210504.nc</file>
2599+
<file first_year="1958" last_year="2020">$DIN_LOC_ROOT/ocn/jra55/v1.5_noleap/JRA.v1.5.t_10.TL319.%y.210504.nc</file>
2600+
<file first_year="2021" last_year="2021">$DIN_LOC_ROOT/ocn/jra55/v1.5_noleap/JRA.v1.5.t_10.TL319.%y.220505.nc</file>
2601+
<file first_year="2022" last_year="2022">$DIN_LOC_ROOT/ocn/jra55/v1.5_noleap/JRA.v1.5.t_10.TL319.%y.230718.nc</file>
2602+
<file first_year="2023" last_year="2023">$DIN_LOC_ROOT/ocn/jra55/v1.5_noleap/JRA.v1.5.t_10.TL319.%y.240531.nc</file>
25852603
</stream_datafiles>
25862604
<stream_datavars>
25872605
<var>t_10 Sa_tbot</var>
@@ -2593,7 +2611,7 @@
25932611
<stream_vectors>null</stream_vectors>
25942612
<stream_year_align>1</stream_year_align>
25952613
<stream_year_first>1958</stream_year_first>
2596-
<stream_year_last>2018</stream_year_last>
2614+
<stream_year_last>2023</stream_year_last>
25972615
<stream_offset>0</stream_offset>
25982616
<stream_tintalgo>
25992617
<tintalgo>linear</tintalgo>
@@ -2607,12 +2625,15 @@
26072625
<stream_readmode>single</stream_readmode>
26082626
</stream_entry>
26092627

2610-
<stream_entry name="CORE_IAF_JRA_1p5_2018.NCEP.U_10">
2628+
<stream_entry name="CORE_IAF_JRA_1p5_2023.NCEP.U_10">
26112629
<stream_meshfile>
26122630
<meshfile>$DIN_LOC_ROOT/share/meshes/TL319_151007_ESMFmesh.nc</meshfile>
26132631
</stream_meshfile>
26142632
<stream_datafiles>
2615-
<file first_year="1958" last_year="2018">$DIN_LOC_ROOT/ocn/jra55/v1.5_noleap/JRA.v1.5.u_10.TL319.%y.210504.nc</file>
2633+
<file first_year="1958" last_year="2020">$DIN_LOC_ROOT/ocn/jra55/v1.5_noleap/JRA.v1.5.u_10.TL319.%y.210504.nc</file>
2634+
<file first_year="2021" last_year="2021">$DIN_LOC_ROOT/ocn/jra55/v1.5_noleap/JRA.v1.5.u_10.TL319.%y.220505.nc</file>
2635+
<file first_year="2022" last_year="2022">$DIN_LOC_ROOT/ocn/jra55/v1.5_noleap/JRA.v1.5.u_10.TL319.%y.230718.nc</file>
2636+
<file first_year="2023" last_year="2023">$DIN_LOC_ROOT/ocn/jra55/v1.5_noleap/JRA.v1.5.u_10.TL319.%y.240531.nc</file>
26162637
</stream_datafiles>
26172638
<stream_datavars>
26182639
<var>u_10 Sa_u</var>
@@ -2624,7 +2645,7 @@
26242645
<stream_vectors>null</stream_vectors>
26252646
<stream_year_align>1</stream_year_align>
26262647
<stream_year_first>1958</stream_year_first>
2627-
<stream_year_last>2018</stream_year_last>
2648+
<stream_year_last>2023</stream_year_last>
26282649
<stream_offset>0</stream_offset>
26292650
<stream_tintalgo>
26302651
<tintalgo>linear</tintalgo>
@@ -2638,12 +2659,15 @@
26382659
<stream_readmode>single</stream_readmode>
26392660
</stream_entry>
26402661

2641-
<stream_entry name="CORE_IAF_JRA_1p5_2018.NCEP.V_10">
2662+
<stream_entry name="CORE_IAF_JRA_1p5_2023.NCEP.V_10">
26422663
<stream_meshfile>
26432664
<meshfile>$DIN_LOC_ROOT/share/meshes/TL319_151007_ESMFmesh.nc</meshfile>
26442665
</stream_meshfile>
26452666
<stream_datafiles>
2646-
<file first_year="1958" last_year="2018">$DIN_LOC_ROOT/ocn/jra55/v1.5_noleap/JRA.v1.5.v_10.TL319.%y.210504.nc</file>
2667+
<file first_year="1958" last_year="2020">$DIN_LOC_ROOT/ocn/jra55/v1.5_noleap/JRA.v1.5.v_10.TL319.%y.210504.nc</file>
2668+
<file first_year="2021" last_year="2021">$DIN_LOC_ROOT/ocn/jra55/v1.5_noleap/JRA.v1.5.v_10.TL319.%y.220505.nc</file>
2669+
<file first_year="2022" last_year="2022">$DIN_LOC_ROOT/ocn/jra55/v1.5_noleap/JRA.v1.5.v_10.TL319.%y.230718.nc</file>
2670+
<file first_year="2023" last_year="2023">$DIN_LOC_ROOT/ocn/jra55/v1.5_noleap/JRA.v1.5.v_10.TL319.%y.240531.nc</file>
26472671
</stream_datafiles>
26482672
<stream_datavars>
26492673
<var>v_10 Sa_v</var>
@@ -2655,7 +2679,7 @@
26552679
<stream_vectors>null</stream_vectors>
26562680
<stream_year_align>1</stream_year_align>
26572681
<stream_year_first>1958</stream_year_first>
2658-
<stream_year_last>2018</stream_year_last>
2682+
<stream_year_last>2023</stream_year_last>
26592683
<stream_offset>0</stream_offset>
26602684
<stream_tintalgo>
26612685
<tintalgo>linear</tintalgo>

drof/cime_config/config_component.xml

Lines changed: 4 additions & 4 deletions
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][%IAF][%IAFAIS00][%IAFAIS45][%IAFAIS55][%CPLHIST][%JRA][%JRA-1p4-2018][%JRA-1p4-2018-AIS0ICE][%JRA-1p4-2018-AIS0LIQ][%JRA-1p4-2018-AIS0ROF][%JRA-1p5-2018][%JRA-RYF8485][%JRA-RYF9091][%JRA-RYF0304]">Data runoff model</desc>
16+
<desc rof="DROF[%NULL][%NYF][%IAF][%IAFAIS00][%IAFAIS45][%IAFAIS55][%CPLHIST][%JRA][%JRA-1p4-2018][%JRA-1p4-2018-AIS0ICE][%JRA-1p4-2018-AIS0LIQ][%JRA-1p4-2018-AIS0ROF][%JRA-1p5-2023][%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="IAF" >COREv2 interannual year forcing:</desc>
@@ -25,7 +25,7 @@
2525
<desc option="JRA-1p4-2018-AIS0ICE">JRA55 interannual forcing, v1.4, through 2018, no rofi around AIS</desc>
2626
<desc option="JRA-1p4-2018-AIS0LIQ">JRA55 interannual forcing, v1.4, through 2018, no rofl around AIS</desc>
2727
<desc option="JRA-1p4-2018-AIS0ROF">JRA55 interannual forcing, v1.4, through 2018, no rofi or rofl around AIS</desc>
28-
<desc option="JRA-1p5-2018">JRA55 interannual forcing, v1.5, through 2018</desc>
28+
<desc option="JRA-1p5-2023">JRA55 interannual forcing, v1.5, through 2023</desc>
2929
<desc option="JRA" >JRA55 interannual forcing</desc>
3030
<desc option="JRA-RYF8485">JRA55 Repeat Year Forcing v1.3 1984-1985</desc>
3131
<desc option="JRA-RYF9091">JRA55 Repeat Year Forcing v1.3 1990-1991</desc>
@@ -43,7 +43,7 @@
4343

4444
<entry id="DROF_MODE">
4545
<type>char</type>
46-
<valid_values>CPLHIST,DIATREN_ANN_RX1,DIATREN_IAF_RX1,DIATREN_IAF_AIS00_RX1,DIATREN_IAF_AIS45_RX1,DIATREN_IAF_AIS55_RX1,IAF_JRA,IAF_JRA_1p4_2018,IAF_JRA_1p4_2018_AIS0ICE,IAF_JRA_1p4_2018_AIS0LIQ,IAF_JRA_1p4_2018_AIS0ROF,IAF_JRA_1p5_2018,RYF8485_JRA,RYF9091_JRA,RYF0304_JRA,NULL</valid_values>
46+
<valid_values>CPLHIST,DIATREN_ANN_RX1,DIATREN_IAF_RX1,DIATREN_IAF_AIS00_RX1,DIATREN_IAF_AIS45_RX1,DIATREN_IAF_AIS55_RX1,IAF_JRA,IAF_JRA_1p4_2018,IAF_JRA_1p4_2018_AIS0ICE,IAF_JRA_1p4_2018_AIS0LIQ,IAF_JRA_1p4_2018_AIS0ROF,IAF_JRA_1p5_2023,RYF8485_JRA,RYF9091_JRA,RYF0304_JRA,NULL</valid_values>
4747
<default_value>DIATREN_ANN_RX1</default_value>
4848
<values match="last">
4949
<value compset="_DROF%NULL">NULL</value>
@@ -61,7 +61,7 @@
6161
<value compset="_DROF%JRA-1p4-2018-AIS0ICE" >IAF_JRA_1p4_2018_AIS0ICE</value>
6262
<value compset="_DROF%JRA-1p4-2018-AIS0LIQ" >IAF_JRA_1p4_2018_AIS0LIQ</value>
6363
<value compset="_DROF%JRA-1p4-2018-AIS0ROF" >IAF_JRA_1p4_2018_AIS0ROF</value>
64-
<value compset="_DROF%JRA-1p5-2018" >IAF_JRA_1p5_2018</value>
64+
<value compset="_DROF%JRA-1p5-2023" >IAF_JRA_1p5_2023</value>
6565
<value compset="_DROF%JRA-RYF8485" >RYF8485_JRA</value>
6666
<value compset="_DROF%JRA-RYF9091" >RYF9091_JRA</value>
6767
<value compset="_DROF%JRA-RYF0304" >RYF0304_JRA</value>

drof/cime_config/namelist_definition_drof.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
1919
<value drof_mode="DIATREN_IAF_AIS00_RX1">rof.diatren_iaf_ais00_rx1</value>
2020
<value drof_mode="DIATREN_IAF_AIS45_RX1">rof.diatren_iaf_ais45_rx1</value>
2121
<value drof_mode="DIATREN_IAF_AIS55_RX1">rof.diatren_iaf_ais55_rx1</value>
22-
<value drof_mode="IAF_JRA" >rof.iaf_jra</value>
2322
<value drof_mode="IAF_JRA_1p4_2018" >rof.iaf_jra_1p4_2018</value>
24-
<value drof_mode="IAF_JRA_1p5_2018" >rof.iaf_jra_1p5_2018</value>
23+
<value drof_mode="IAF_JRA_1p5_2023" >rof.iaf_jra_1p5_2023</value>
24+
<value drof_mode="IAF_JRA" >rof.iaf_jra</value>
2525
<value drof_mode="RYF8485_JRA" >rof.ryf8485_jra</value>
2626
<value drof_mode="RYF9091_JRA" >rof.ryf9091_jra</value>
2727
<value drof_mode="RYF0304_JRA" >rof.ryf0304_jra</value>

0 commit comments

Comments
 (0)