Skip to content

Commit a0fdd58

Browse files
samsrabinsamsrabin
authored
Merge pull request #3243 from glemieux/fates-pem-otf_param-fix
ctsm5.3.057: Fix PEM test for FATES testmod that builds an on-the-fly parameter file
2 parents dd24bfd + 701266c commit a0fdd58

File tree

6 files changed

+70
-4
lines changed

6 files changed

+70
-4
lines changed

‎cime_config/testdefs/ExpectedTestFails.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -257,13 +257,13 @@
257257
</test>
258258

259259
<test name="PEM_D_Ld20.5x5_amazon.I2000Clm50FatesRs.derecho_gnu.clm-FatesColdSeedDisp">
260-
<phase name="RUN">
260+
<phase name="COMPARE_base_modpes">
261261
<status>FAIL</status>
262-
<issue>#3097</issue>
262+
<issue>FATES#1089</issue>
263263
</phase>
264264
</test>
265265

266-
<test name="PEM_D_Ld20.5x5_amazon.I2000Clm50FatesRs.derecho_gnu.clm-FatesColdSeedDisp">
266+
<test name="PEM_D_Ld20.5x5_amazon.I2000Clm50FatesRs.derecho_intel.clm-FatesColdSeedDisp">
267267
<phase name="COMPARE_base_modpes">
268268
<status>FAIL</status>
269269
<issue>FATES#1089</issue>

‎cime_config/testdefs/testlist_clm.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3280,6 +3280,7 @@
32803280
<test name="PEM_D_Ld20" grid="5x5_amazon" compset="I2000Clm50FatesRs" testmods="clm/FatesColdSeedDisp">
32813281
<machines>
32823282
<machine name="derecho" compiler="gnu" category="fates"/>
3283+
<machine name="derecho" compiler="intel" category="aux_clm"/>
32833284
</machines>
32843285
<options>
32853286
<option name="wallclock">00:40:00</option>

‎cime_config/testdefs/testmods_dirs/clm/FatesColdSeedDisp/shell_commands‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,5 @@ $FATESDIR/tools/modify_fates_paramfile.py --O --fin $FATESPARAMFILE --fout $FATE
99
$FATESDIR/tools/modify_fates_paramfile.py --O --fin $FATESPARAMFILE --fout $FATESPARAMFILE --var fates_seed_dispersal_max_dist --val 2500000 --allpfts
1010
$FATESDIR/tools/modify_fates_paramfile.py --O --fin $FATESPARAMFILE --fout $FATESPARAMFILE --var fates_seed_dispersal_pdf_scale --val 1e-05 --allpfts
1111
$FATESDIR/tools/modify_fates_paramfile.py --O --fin $FATESPARAMFILE --fout $FATESPARAMFILE --var fates_seed_dispersal_pdf_shape --val 0.1 --allpfts
12+
13+
echo "fates_paramfile = '$FATESPARAMFILE'" >> $CASEDIR/user_nl_clm

‎cime_config/testdefs/testmods_dirs/clm/FatesColdSeedDisp/user_nl_clm‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
1-
fates_paramfile = '$CASEROOT/fates_params_seeddisp_4x5.nc'
21
fates_seeddisp_cadence = 1
32
hist_fincl1 = 'FATES_SEEDS_IN_GRIDCELL_PF', 'FATES_SEEDS_OUT_GRIDCELL_PF'

‎doc/ChangeLog‎

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,67 @@
11
===============================================================
2+
Tag name: ctsm5.3.057
3+
Originator(s): glemieux (Gregory Lemieux, LBNL, [email protected])
4+
Date: Fri Jun 13 17:00:00 MDT 2025
5+
One-line Summary: Fix PEM test for on-the-fly parameter file generation
6+
7+
Purpose and description of changes
8+
----------------------------------
9+
10+
This resolves an issue in which PEM tests that are used in conjunction with
11+
testmods that build the FATES parameter file on-the-fly might result in RUN
12+
failure due to the file not being generated for the second case. This
13+
addresses the issue by simply by setting the fates_paramfile namelist setting
14+
to the full path for the primary test case directory.
15+
16+
Significant changes to scientifically-supported configurations
17+
--------------------------------------------------------------
18+
19+
Does this tag change answers significantly for any of the following physics configurations?
20+
(Details of any changes will be given in the "Answer changes" section below.)
21+
22+
[Put an [X] in the box for any configuration with significant answer changes.]
23+
24+
[ ] clm6_0
25+
26+
[ ] clm5_0
27+
28+
[ ] ctsm5_0-nwp
29+
30+
[ ] clm4_5
31+
32+
33+
Bugs fixed
34+
----------
35+
List of CTSM issues fixed (include CTSM Issue # and description) [one per line]:
36+
Resolves #3097 Missing on-the-fly built fates parameter file for test types that have a "case2" subdirectory
37+
38+
Notes of particular relevance for developers:
39+
---------------------------------------------
40+
Changes to tests or testing:
41+
PEM_D_Ld20.5x5_amazon.I2000Clm50FatesRs.derecho_gnu.clm-FatesColdSeedDisp is now added to the aux_clm test suite
42+
Note that this test fails as expected on the COMPARE_mod_pes step
43+
44+
Testing summary:
45+
----------------
46+
regular tests (aux_clm: https://github.com/ESCOMP/CTSM/wiki/System-Testing-Guide#pre-merge-system-testing):
47+
48+
derecho ----- OK
49+
izumi ------- OK
50+
51+
Answer changes
52+
--------------
53+
54+
Changes answers relative to baseline: No
55+
56+
Other details
57+
-------------
58+
59+
Pull Requests that document the changes (include PR ids):
60+
(https://github.com/ESCOMP/ctsm/pull)
61+
[ctsm5.3.057: Fix PEM test for FATES testmod that builds an on-the-fly parameter file](https://github.com/ESCOMP/CTSM/pull/3243)
62+
63+
===============================================================
64+
===============================================================
265
Tag name: ctsm5.3.056
366
Originator(s): erik (Erik Kluzek,UCAR/TSS,303-497-1326)
467
Date: Thu 12 Jun 2025 01:43:46 PM MDT

‎doc/ChangeSum‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
Tag Who Date Summary
22
============================================================================================================================
3+
ctsm5.3.057 glemieux 06/13/2025 Fix PEM test for on-the-fly parameter file generation
34
ctsm5.3.056 erik 06/12/2025 Merge b4b-dev to master
45
ctsm5.3.055 samrabin 06/05/2025 Remove FTorch
56
ctsm5.3.054 samrabin 06/02/2025 CDEPS: Allow anomaly forcings with any DATM

0 commit comments

Comments
 (0)