Skip to content

Commit 0a1a450

Browse files
samsrabinsamsrabin
authored
Merge pull request #3327 from samsrabin/merge-master-20250710
Merge ctsm5.3.063 into b4b-dev
2 parents 7e52c96 + e76985f commit 0a1a450

File tree

20 files changed

+1471
-1172
lines changed

20 files changed

+1471
-1172
lines changed

‎.gitmodules‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,15 +44,15 @@ fxDONOTUSEurl = https://github.com/ESCOMP/CISM-wrapper
4444
[submodule "rtm"]
4545
path = components/rtm
4646
url = https://github.com/ESCOMP/RTM
47-
fxtag = rtm1_0_86
47+
fxtag = rtm1_0_87
4848
fxrequired = ToplevelRequired
4949
# Standard Fork to compare to with "git fleximod test" to ensure personal forks aren't committed
5050
fxDONOTUSEurl = https://github.com/ESCOMP/RTM
5151

5252
[submodule "mosart"]
5353
path = components/mosart
5454
url = https://github.com/ESCOMP/MOSART
55-
fxtag = mosart1.1.08
55+
fxtag = mosart1.1.09
5656
fxrequired = ToplevelRequired
5757
# Standard Fork to compare to with "git fleximod test" to ensure personal forks aren't committed
5858
fxDONOTUSEurl = https://github.com/ESCOMP/MOSART

‎cime_config/SystemTests/rxcropmaturityinst.py‎

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎cime_config/SystemTests/rxcropmaturityskipgeninst.py‎

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎cime_config/config_archive.xml‎

Lines changed: 10 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
<components version="2.0">
22
<comp_archive_spec compname="clm" compclass="lnd">
33
<rest_file_extension>r</rest_file_extension>
4-
<rest_file_extension>rh\d?</rest_file_extension>
4+
<rest_file_extension>rh\da</rest_file_extension>
5+
<rest_file_extension>rh\di</rest_file_extension>
56
<hist_file_extension>h\d*.*\.nc$</hist_file_extension>
67
<hist_file_extension>lilac_hi.*\.nc$</hist_file_extension>
78
<hist_file_extension>lilac_atm_driver_h\d*.*\.nc$</hist_file_extension>
@@ -13,37 +14,19 @@
1314
</rpointer>
1415
<test_file_names>
1516
<tfile disposition="copy">rpointer.lnd</tfile>
16-
<tfile disposition="copy">rpointer.lnd_9999</tfile>
17+
<tfile disposition="copy">rpointer.lnd_9999.1976-01-01-00000</tfile>
1718
<tfile disposition="copy">casename.clm2.r.1976-01-01-00000.nc</tfile>
18-
<tfile disposition="copy">casename.clm2.rh4.1976-01-01-00000.nc</tfile>
19-
<tfile disposition="move">casename.clm2.h0.1976-01-01-00000.nc</tfile>
19+
<tfile disposition="copy">casename.clm2.rh4a.1976-01-01-00000.nc</tfile>
20+
<tfile disposition="copy">casename.clm2.rh4i.1976-01-01-00000.nc</tfile>
21+
<tfile disposition="move">casename.clm2.h0a.1976-01-01-00000.nc</tfile>
22+
<tfile disposition="move">casename.clm2.h0i.1976-01-01-00000.nc</tfile>
2023
<tfile disposition="move">casename.clm2.lilac_hi.1976-01-01-00000.nc</tfile>
2124
<tfile disposition="move">casename.clm2.lilac_atm_driver_h0.0001-01.nc</tfile>
22-
<tfile disposition="ignore">casename.clm2.h0.1976-01-01-00000.nc.base</tfile>
25+
<tfile disposition="ignore">casename.clm2.h0a.1976-01-01-00000.nc.base</tfile>
26+
<tfile disposition="ignore">casename.clm2.h0i.1976-01-01-00000.nc.base</tfile>
2327
<tfile disposition="move">casename.clm2_0002.e.postassim.1976-01-01-00000.nc</tfile>
2428
<tfile disposition="move">casename.clm2_0002.e.preassim.1976-01-01-00000.nc</tfile>
25-
<tfile disposition="ignore">anothercasename.clm2.i.1976-01-01-00000.nc</tfile>
26-
</test_file_names>
27-
</comp_archive_spec>
28-
<comp_archive_spec compname="ctsm" compclass="lnd">
29-
<rest_file_extension>r</rest_file_extension>
30-
<rest_file_extension>rh\d?</rest_file_extension>
31-
<hist_file_extension>h\d*.*\.nc$</hist_file_extension>
32-
<hist_file_extension>e</hist_file_extension>
33-
<rest_history_varname>locfnh</rest_history_varname>
34-
<rpointer>
35-
<rpointer_file>rpointer.lnd$NINST_STRING</rpointer_file>
36-
<rpointer_content>./$CASE.ctsm$NINST_STRING.r.$DATENAME.nc</rpointer_content>
37-
</rpointer>
38-
<test_file_names>
39-
<tfile disposition="copy">rpointer.lnd</tfile>
40-
<tfile disposition="copy">rpointer.lnd_9999</tfile>
41-
<tfile disposition="copy">casename.ctsm.r.1976-01-01-00000.nc</tfile>
42-
<tfile disposition="copy">casename.ctsm.rh4.1976-01-01-00000.nc</tfile>
43-
<tfile disposition="move">casename.ctsm.h0.1976-01-01-00000.nc</tfile>
44-
<tfile disposition="ignore">casename.ctsm.h0.1976-01-01-00000.nc.base</tfile>
45-
<tfile disposition="move">casename.ctsm_0002.e.postassim.1976-01-01-00000.nc</tfile>
46-
<tfile disposition="move">casename.ctsm_0002.e.preassim.1976-01-01-00000.nc</tfile>
29+
<tfile disposition="ignore">anothercasename.clm2.r.1976-01-01-00000.nc</tfile>
4730
</test_file_names>
4831
</comp_archive_spec>
4932
</components>

‎cime_config/config_tests.xml‎

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -145,16 +145,6 @@ This defines various CTSM-specific system tests
145145
<HIST_N>$STOP_N</HIST_N>
146146
</test>
147147

148-
<test NAME="RXCROPMATURITYINST">
149-
<DESC>As RXCROPMATURITY but ensure instantaneous h1. Can be removed once instantaneous and other variables are on separate files.</DESC>
150-
<INFO_DBUG>1</INFO_DBUG>
151-
<DOUT_S>FALSE</DOUT_S>
152-
<CONTINUE_RUN>FALSE</CONTINUE_RUN>
153-
<REST_OPTION>never</REST_OPTION>
154-
<HIST_OPTION>$STOP_OPTION</HIST_OPTION>
155-
<HIST_N>$STOP_N</HIST_N>
156-
</test>
157-
158148
<test NAME="RXCROPMATURITYSKIPGEN">
159149
<DESC>As RXCROPMATURITY but don't actually generate GDDs. Allows short testing with existing GDD inputs.</DESC>
160150
<INFO_DBUG>1</INFO_DBUG>
@@ -165,16 +155,6 @@ This defines various CTSM-specific system tests
165155
<HIST_N>$STOP_N</HIST_N>
166156
</test>
167157

168-
<test NAME="RXCROPMATURITYSKIPGENINST">
169-
<DESC>As RXCROPMATURITYSKIPGEN but ensure instantaneous h1. Can be removed once instantaneous and other variables are on separate files.</DESC>
170-
<INFO_DBUG>1</INFO_DBUG>
171-
<DOUT_S>FALSE</DOUT_S>
172-
<CONTINUE_RUN>FALSE</CONTINUE_RUN>
173-
<REST_OPTION>never</REST_OPTION>
174-
<HIST_OPTION>$STOP_OPTION</HIST_OPTION>
175-
<HIST_N>$STOP_N</HIST_N>
176-
</test>
177-
178158
<!--
179159
SSP smoke CLM spinup test (only valid for CLM compsets with CLM45)
180160
do an initial spin test (setting CLM_ACCELERATED_SPINUP to on)

‎cime_config/testdefs/ExpectedTestFails.xml‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,42 @@
2929

3030

3131
<!-- ctsm_sci test suite failures -->
32+
<test name="SMS_Ld5.f19_g17.I1850Clm60BgcCrujra.derecho_intel.clm-default">
33+
<phase name="RUN">
34+
<status>FAIL</status>
35+
<issue>#3311</issue>
36+
<comment>Requires finidat with c13/c14 to PASS</comment>
37+
</phase>
38+
</test>
39+
<test name="SMS_Ld5.f19_g17.I1850Clm60Bgc.derecho_intel.clm-default">
40+
<phase name="RUN">
41+
<status>FAIL</status>
42+
<issue>#3311</issue>
43+
<comment>Requires finidat with c13/c14 to PASS</comment>
44+
</phase>
45+
</test>
46+
<test name="SMS_Ld5.f19_g17.IHistClm60BgcCropCrujra.derecho_intel.clm-default">
47+
<phase name="RUN">
48+
<status>FAIL</status>
49+
<issue>#3311</issue>
50+
<comment>Requires finidat with c13/c14 to PASS</comment>
51+
</phase>
52+
</test>
53+
<test name="SMS_Ld5.f19_g17.IHistClm60BgcCrop.derecho_intel.clm-default">
54+
<phase name="RUN">
55+
<status>FAIL</status>
56+
<issue>#3311</issue>
57+
<comment>Requires finidat with c13/c14 to PASS</comment>
58+
</phase>
59+
</test>
60+
<test name="SMS_Lm1.f19_g17.I1850Clm60BgcCropCmip6waccm.derecho_intel.clm-basic">
61+
<phase name="RUN">
62+
<status>FAIL</status>
63+
<issue>#3311</issue>
64+
<comment>Requires finidat with c13/c14 to PASS</comment>
65+
</phase>
66+
</test>
67+
3268
<test name="SMS_Ld12_Mmpi-serial.1x1_urbanc_alpha.I1PtClm60SpRs.derecho_intel.clm-output_sp_highfreq">
3369
<phase name="RUN">
3470
<status>FAIL</status>

‎cime_config/testdefs/testlist_clm.xml‎

Lines changed: 1 addition & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -4298,17 +4298,6 @@
42984298
</options>
42994299
</test>
43004300

4301-
<test name="RXCROPMATURITYINST_Lm61" grid="f10_f10_mg37" compset="IHistClm60BgcCrop" testmods="clm/cropMonthOutput">
4302-
<machines>
4303-
<machine name="derecho" compiler="intel" category="rxcropmaturity"/>
4304-
<machine name="derecho" compiler="intel" category="crop_calendars"/>
4305-
</machines>
4306-
<options>
4307-
<option name="wallclock">6:00:00</option>
4308-
<option name="comment">As RXCROPMATURITY, but ensure that h1 file is instantaneous. Can be removed once instantaneous and other variables are separated onto separate files.</option>
4309-
</options>
4310-
</test>
4311-
43124301
<test name="RXCROPMATURITYSKIPGEN_Ld1097" grid="f10_f10_mg37" compset="IHistClm60BgcCrop" testmods="clm/cropMonthOutput">
43134302
<machines>
43144303
<machine name="derecho" compiler="intel" category="aux_clm"/>
@@ -4321,17 +4310,6 @@
43214310
</options>
43224311
</test>
43234312

4324-
<test name="RXCROPMATURITYSKIPGENINST_Ld1097" grid="f10_f10_mg37" compset="IHistClm60BgcCrop" testmods="clm/cropMonthOutput">
4325-
<machines>
4326-
<machine name="derecho" compiler="intel" category="rxcropmaturity"/>
4327-
<machine name="derecho" compiler="intel" category="crop_calendars"/>
4328-
</machines>
4329-
<options>
4330-
<option name="wallclock">00:45:00</option>
4331-
<option name="comment">As RXCROPMATURITYSKIPGEN, but ensure that h1 file is instantaneous. Can be removed once instantaneous and other variables are separated onto separate files.</option>
4332-
</options>
4333-
</test>
4334-
43354313
<test name="ERP_D_P64x2_Ld10" grid="f10_f10_mg37" compset="I2000Clm60Bgc" testmods="clm/Hillslope">
43364314
<machines>
43374315
<machine name="derecho" compiler="intel" category="aux_clm"/>
@@ -4446,7 +4424,7 @@
44464424
<machine name="derecho" compiler="intel" category="crop_calendars"/>
44474425
</machines>
44484426
<options>
4449-
<option name="wallclock">00:20:00</option>
4427+
<option name="wallclock">02:00:00</option>
44504428
</options>
44514429
</test>
44524430

‎cime_config/testdefs/testmods_dirs/clm/crop/user_nl_clm‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,5 @@ hist_fincl3 = 'SDATES', 'SDATES_PERHARV', 'SYEARS_PERHARV', 'HDATES', 'GRAINC_TO
1717
hist_nhtfrq = -24,-8,-24
1818
hist_mfilt = 1,1,1
1919
hist_type1d_pertape(3) = 'PFTS'
20+
hist_avgflag_pertape(3) = 'I'
2021
hist_dov2xy = .true.,.false.,.false.

‎components/mosart‎

‎components/rtm‎

0 commit comments

Comments
 (0)