Skip to content

Commit 98067b4

Browse files
slevis-lmwgslevis-lmwg
authored
Merge pull request #3655 from ESCOMP/post-5.4
ctsm5.4.003: Merge post-5.4 to master
2 parents a00a459 + af366ad commit 98067b4

File tree

14 files changed

+148
-32
lines changed

14 files changed

+148
-32
lines changed

‎.gitmodules‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ fxDONOTUSEurl = https://github.com/NGEET/fates
3636
[submodule "cism"]
3737
path = components/cism
3838
url = https://github.com/ESCOMP/CISM-wrapper
39-
fxtag = cismwrap_2_2_010
39+
fxtag = cismwrap_2_2_011
4040
fxrequired = ToplevelRequired
4141
# Standard Fork to compare to with "git fleximod test" to ensure personal forks aren't committed
4242
fxDONOTUSEurl = https://github.com/ESCOMP/CISM-wrapper
@@ -68,7 +68,7 @@ fxDONOTUSEurl = https://github.com/ESCOMP/mizuRoute
6868
[submodule "ccs_config"]
6969
path = ccs_config
7070
url = https://github.com/ESMCI/ccs_config_cesm.git
71-
fxtag = ccs_config_cesm1.0.61_add_domain_ne3np4.pg2_1
71+
fxtag = ccs_config_cesm1.0.66
7272
fxrequired = ToplevelRequired
7373
# Standard Fork to compare to with "git fleximod test" to ensure personal forks aren't committed
7474
fxDONOTUSEurl = https://github.com/ESMCI/ccs_config_cesm.git

‎WhatsNewInCTSM5.4.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# What's new in CTSM 5.4 (tag `ctsm5.4.0xx`)
1+
# What's new in CTSM 5.4 (tag `ctsm5.4.002`)
22

33
# Purpose and description of changes since CTSM 5.3 (tag `ctsm5.3.021`)
44

‎bld/CLMBuildNamelist.pm‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4501,7 +4501,7 @@ sub setup_logic_cropcal_streams {
45014501
'lnd_tuning_mode'=>$nl_flags->{'lnd_tuning_mode'}
45024502
);
45034503
if ( &value_is_true($cropcals_rx_adapt) ) {
4504-
add_default($opts, $nl_flags->{'inputdata_rootdir'}, $definition, $defaults, $nl, 'stream_fldFileName_gdd20_baseline', 'stream_gdd20_seasons'=>$stream_gdd20_seasons);
4504+
add_default($opts, $nl_flags->{'inputdata_rootdir'}, $definition, $defaults, $nl, 'stream_fldFileName_gdd20_baseline', 'stream_gdd20_seasons'=>$stream_gdd20_seasons, 'lnd_tuning_mode'=>$nl_flags->{'lnd_tuning_mode'});
45054505
}
45064506
}
45074507

‎bld/namelist_files/namelist_defaults_ctsm.xml‎

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -455,9 +455,9 @@ attributes from the config_cache.xml file (with keys converted to upper-case).
455455
<bt_min fire_method="li2024crujra" >0.85d00</bt_min>
456456
<bt_max fire_method="li2024crujra" >0.98d00</bt_max>
457457
<cli_scale fire_method="li2024crujra" >0.03d00</cli_scale>
458-
<boreal_peatfire_c fire_method="li2024crujra" >0.28d-4</boreal_peatfire_c>
458+
<boreal_peatfire_c fire_method="li2024crujra" >0.58d-4</boreal_peatfire_c>
459459
<pot_hmn_ign_counts_alpha fire_method="li2024crujra" >0.010d00</pot_hmn_ign_counts_alpha>
460-
<non_boreal_peatfire_c fire_method="li2024crujra" >0.71d-4</non_boreal_peatfire_c>
460+
<non_boreal_peatfire_c fire_method="li2024crujra" >0.75d-4</non_boreal_peatfire_c>
461461
<cropfire_a1 fire_method="li2024crujra" >0.34d00</cropfire_a1>
462462
<occur_hi_gdp_tree fire_method="li2024crujra" >0.33d00</occur_hi_gdp_tree>
463463
<lfuel fire_method="li2024crujra" >75.d00</lfuel>
@@ -467,7 +467,7 @@ attributes from the config_cache.xml file (with keys converted to upper-case).
467467
<max_rh30_affecting_fuel fire_method="li2024crujra" >95.</max_rh30_affecting_fuel>
468468
<defo_fire_precip_thresh_bet fire_method="li2024crujra" >1.8d00</defo_fire_precip_thresh_bet>
469469
<defo_fire_precip_thresh_bdt fire_method="li2024crujra" >0.6d00</defo_fire_precip_thresh_bdt>
470-
<borpeat_fire_soilmoist_denom fire_method="li2024crujra" > 0.35d00</borpeat_fire_soilmoist_denom>
470+
<borpeat_fire_soilmoist_denom fire_method="li2024crujra" > 0.3d00</borpeat_fire_soilmoist_denom>
471471
<nonborpeat_fire_precip_denom fire_method="li2024crujra" >6.5d00</nonborpeat_fire_precip_denom>
472472

473473

@@ -577,7 +577,7 @@ attributes from the config_cache.xml file (with keys converted to upper-case).
577577
<snow_thermal_cond_method phys="clm6_0">Sturm1997</snow_thermal_cond_method>
578578

579579
<snow_thermal_cond_glc_method>Jordan1991</snow_thermal_cond_glc_method>
580-
<snow_thermal_cond_glc_method phys="clm6_0">Jordan1991</snow_thermal_cond_glc_method>
580+
<snow_thermal_cond_glc_method phys="clm6_0">Sturm1997</snow_thermal_cond_glc_method>
581581

582582
<snow_thermal_cond_lake_method>Jordan1991</snow_thermal_cond_lake_method>
583583
<snow_thermal_cond_lake_method phys="clm6_0">Sturm1997</snow_thermal_cond_lake_method>
@@ -622,7 +622,7 @@ attributes from the config_cache.xml file (with keys converted to upper-case).
622622
<!-- The default filenames are given relative to the root directory
623623
for the CLM2 data in the CESM distribution -->
624624
<!-- Plant function types (relative to {csmdata}) -->
625-
<paramfile phys="clm6_0" >lnd/clm2/paramdata/clm60_params.ctsm6_li2024.c250822.nc</paramfile>
625+
<paramfile phys="clm6_0" >lnd/clm2/paramdata/ctsm60_params.c251124.nc</paramfile>
626626
<paramfile phys="clm5_0" >lnd/clm2/paramdata/clm50_params.c250311.nc</paramfile>
627627
<paramfile phys="clm4_5" >lnd/clm2/paramdata/clm45_params.c250311.nc</paramfile>
628628

@@ -2280,7 +2280,7 @@ lnd/clm2/surfdata_esmf/NEON/ctsm5.4.0/surfdata_1x1_NEON_TOOL_hist_2000_78pfts_c2
22802280
<model_year_align_cropcal_cultivar_gdds >2000</model_year_align_cropcal_cultivar_gdds>
22812281

22822282
<!-- crop calendars: default maturity requirement files -->
2283-
<stream_fldfilename_cultivar_gdds cropcals_rx=".true.">lnd/clm2/cropdata/calendars/processed/gdds_20250809_025305.tweaked_latlons.nc</stream_fldfilename_cultivar_gdds>
2283+
<stream_fldfilename_cultivar_gdds cropcals_rx=".true.">lnd/clm2/cropdata/calendars/processed/cultivar_gdds.c251120.tweaked_latlons.nc</stream_fldfilename_cultivar_gdds>
22842284
<stream_fldfilename_cultivar_gdds cropcals_rx=".true." lnd_tuning_mode="clm4_5_GSWP3v1">lnd/clm2/cropdata/calendars/processed/gdds_20230829_161011.tweaked_latlons.nc</stream_fldfilename_cultivar_gdds>
22852285
<stream_fldfilename_cultivar_gdds cropcals_rx=".true." lnd_tuning_mode="clm5_0_GSWP3v1">lnd/clm2/cropdata/calendars/processed/gdds_20230829_161011.tweaked_latlons.nc</stream_fldfilename_cultivar_gdds>
22862286
<stream_fldfilename_cultivar_gdds cropcals_rx=".true." lnd_tuning_mode="clm6_0_GSWP3v1">lnd/clm2/cropdata/calendars/processed/gdds_20230829_161011.tweaked_latlons.nc</stream_fldfilename_cultivar_gdds>
@@ -2295,7 +2295,10 @@ lnd/clm2/surfdata_esmf/NEON/ctsm5.4.0/surfdata_1x1_NEON_TOOL_hist_2000_78pfts_c2
22952295
<stream_meshfile_cropcal cropcals_rx=".true.">lnd/clm2/cropdata/calendars/processed/360x720_120830_ESMFmesh_c20210507_cdf5.tweaked_latlons.nc</stream_meshfile_cropcal>
22962296
<stream_fldFileName_swindow_start cropcals_rx_adapt=".true.">lnd/clm2/cropdata/calendars/processed/swindow_starts_ggcmi_crop_calendar_phase3_v1.01.2000-2000.20231005_145103.tweaked_latlons.nc</stream_fldFileName_swindow_start>
22972297
<stream_fldFileName_swindow_end cropcals_rx_adapt=".true.">lnd/clm2/cropdata/calendars/processed/swindow_ends_ggcmi_crop_calendar_phase3_v1.01.2000-2000.20231005_145103.tweaked_latlons.nc</stream_fldFileName_swindow_end>
2298-
<stream_fldFileName_gdd20_baseline cropcals_rx_adapt=".true." stream_gdd20_seasons=".false.">lnd/clm2/cropdata/calendars/processed/20230714_cropcals_pr2_1deg.actually2deg.1980-2009.from_GDDB20.interpd_halfdeg.tweaked_latlons.nc</stream_fldFileName_gdd20_baseline>
2298+
<stream_fldFileName_gdd20_baseline cropcals_rx_adapt=".true." stream_gdd20_seasons=".false.">lnd/clm2/cropdata/calendars/processed/gdd20_baseline.c251120.tweaked_latlons.nc</stream_fldFileName_gdd20_baseline>
2299+
<stream_fldFileName_gdd20_baseline cropcals_rx_adapt=".true." stream_gdd20_seasons=".false." lnd_tuning_mode="clm4_5_GSWP3v1">lnd/clm2/cropdata/calendars/processed/20230714_cropcals_pr2_1deg.actually2deg.1980-2009.from_GDDB20.interpd_halfdeg.tweaked_latlons.nc</stream_fldFileName_gdd20_baseline>
2300+
<stream_fldFileName_gdd20_baseline cropcals_rx_adapt=".true." stream_gdd20_seasons=".false." lnd_tuning_mode="clm5_0_GSWP3v1">lnd/clm2/cropdata/calendars/processed/20230714_cropcals_pr2_1deg.actually2deg.1980-2009.from_GDDB20.interpd_halfdeg.tweaked_latlons.nc</stream_fldFileName_gdd20_baseline>
2301+
<stream_fldFileName_gdd20_baseline cropcals_rx_adapt=".true." stream_gdd20_seasons=".false." lnd_tuning_mode="clm6_0_GSWP3v1">lnd/clm2/cropdata/calendars/processed/20230714_cropcals_pr2_1deg.actually2deg.1980-2009.from_GDDB20.interpd_halfdeg.tweaked_latlons.nc</stream_fldFileName_gdd20_baseline>
22992302
<stream_fldFileName_gdd20_baseline cropcals_rx_adapt=".true." stream_gdd20_seasons=".true.">lnd/clm2/cropdata/calendars/processed/gdd20bl.copied_from.gdds_20230829_161011.v2.tweaked_latlons.nc</stream_fldFileName_gdd20_baseline>
23002303
<stream_fldFileName_gdd20_season_start stream_gdd20_seasons=".true.">lnd/clm2/cropdata/calendars/processed/sdates_ggcmi_crop_calendar_phase3_v1.01_nninterp-hcru_hcru_mt13.2000-2000.20230728_165845.tweaked_latlons.nc</stream_fldFileName_gdd20_season_start>
23012304
<stream_fldFileName_gdd20_season_end stream_gdd20_seasons=".true.">lnd/clm2/cropdata/calendars/processed/hdates_ggcmi_crop_calendar_phase3_v1.01_nninterp-hcru_hcru_mt13.2000-2000.20230728_165845.tweaked_latlons.nc</stream_fldFileName_gdd20_season_end>

‎bld/unit_testers/build-namelist_test.pl‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -845,6 +845,11 @@ sub cat_and_create_namelistinfile {
845845
namelst=>"stream_fldfilename_atm_c14='/dev/null'",
846846
phys=>"clm6_0",
847847
},
848+
"c14_meshfile_none" =>{ options=>"-envxml_dir . -bgc bgc",
849+
namelst=>"stream_fldfilename_atm_c14='/dev/null', " .
850+
"stream_meshfile_atm_c14='none'",
851+
phys=>"clm6_0",
852+
},
848853
"lightres no cn" =>{ options=>"-bgc sp -envxml_dir . -light_res 360x720",
849854
namelst=>"",
850855
phys=>"clm5_0",
@@ -1447,11 +1452,6 @@ sub cat_and_create_namelistinfile {
14471452
namelst=>"use_soil_moisture_streams=T,soilm_tintalgo='linear'",
14481453
phys=>"clm5_0",
14491454
},
1450-
"c14_meshfile_none" =>{ options=>"-envxml_dir . -bgc bgc",
1451-
namelst=>"stream_fldfilename_atm_c14='/dev/null', " .
1452-
"stream_meshfile_atm_c14='none'",
1453-
phys=>"clm6_0",
1454-
},
14551455
"missing_ndep_file" =>{ options=>"-envxml_dir . -bgc bgc -ssp_rcp SSP5-3.4",
14561456
namelst=>"",
14571457
phys=>"clm5_0",

‎ccs_config‎

‎cime_config/config_component.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -436,7 +436,7 @@ Caveats:
436436

437437
<entry id="NEONVERSION">
438438
<type>char</type>
439-
<valid_values>v1,v2,v3,latest</valid_values>
439+
<valid_values>v1,v2,v3,v4,latest</valid_values>
440440
<default_value>latest</default_value>
441441
<group>run_component_ctsm</group>
442442
<file>env_run.xml</file>

‎components/cism‎

‎doc/ChangeLog‎

Lines changed: 105 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,109 @@
11
===============================================================
2+
Tag name: ctsm5.4.003
3+
Originator(s): (Samuel Levis,UCAR/TSS,303-665-1310)
4+
Date: Thu Dec 11 12:02:28 PM MST 2025
5+
One-line Summary: Merge post5.4 branch to master
6+
7+
Purpose and description of changes
8+
----------------------------------
9+
10+
Update namelist_defaults:
11+
- parameters for the li2024crujra fire method: PR Post 5.4 namelist updates #3626 by Will Wieder
12+
- snow_thermal_cond_glc_method to Sturm1997 for clm6: PR #3626 by Will Wieder
13+
- clm paramfile to ctsm60_params.c251124.nc for clm6: PR #3626 by Will Wieder
14+
- stream_fldfilename_cultivar_gdds and stream_fldFileName_gdd20_baseline to latest files: PR post-5.4.n00: New crop calendar inputs and updated params (omni02) #3618 by Sam Rabin
15+
- Update default NEON inputs to v4: PR #3626 by Will Wieder
16+
17+
Update cismwrap_2_2_010 to cismwrap_2_2_011 and ccs_config_cesm1.0.61_add_domain_ne3np4.pg2_1 to ccs_config_cesm1.0.66: PR #3626 by Will Wieder
18+
19+
Remove fsat effect on baf_peatf in the fire code and update the corresponding documentation in doc/source/tech_note/Fire/CLM50_Tech_Note_Fire.rst: PR #3626 by Will Wieder and Fang Li
20+
21+
Fix for RRTMGP errors caused by high surface temperatures: PR #3643 by Keith Oleson
22+
23+
Significant changes to scientifically-supported configurations
24+
--------------------------------------------------------------
25+
26+
Does this tag change answers significantly for any of the following physics configurations?
27+
(Details of any changes will be given in the "Answer changes" section below.)
28+
29+
[Put an [X] in the box for any configuration with significant answer changes.]
30+
31+
[X] clm6_0
32+
33+
[X] clm5_0
34+
35+
[X] ctsm5_0-nwp
36+
37+
[ ] clm4_5
38+
39+
40+
Bugs fixed
41+
----------
42+
List of CTSM issues fixed (include CTSM Issue # and description) [one per line]:
43+
Fixes #3589 355+ K land temperature triggers RRTMGP error, by Keith Oleson
44+
Fixes #3598 Change default snow_thermal_cond_glc_method, by Will Wieder
45+
Fixes #3608 Fire calibration for CLM6 release, by Will Wieder and Fang Li
46+
Fixes #3594 Update NEON data to v4, by Will Wieder
47+
Fixes #3321 Crop calendar inputs needed with CRU-JRA climate, by Sam Rabin
48+
Fixes #3658 Move c14_meshfile_none warning test to fatal error (resolves a build_namelist failure)
49+
50+
Notes of particular relevance for users
51+
---------------------------------------
52+
Changes made to namelist defaults (e.g., changed parameter values):
53+
Namelist defaults changes listed in "Purpose and description of changes"
54+
Changes to the datasets (e.g., parameter, surface or initial files):
55+
References to new crop calendar inputs and new paramfile in "Purpose and description of changes"
56+
Changes to documentation:
57+
Updates to documentation mentioned in "Purpose and description of changes"
58+
59+
Notes of particular relevance for developers:
60+
---------------------------------------------
61+
Caveats for developers (e.g., code that is duplicated that requires double maintenance):
62+
I will mention here something that took effect with ctsm5.4.000 (today's discussion reminded me):
63+
We made two history fields default inactive (VEGWPLN, VEGWPPD) to allow LII2* tests to pass the COMPARE_base_no_interp phase. The problem and suggested solution appear in issues #3617 #3620.
64+
65+
Testing summary:
66+
----------------
67+
[PASS means all tests PASS; OK means tests PASS other than expected fails.]
68+
69+
build-namelist tests (if CLMBuildNamelist.pm has changed):
70+
71+
derecho - OK (the usual 2 tests expected to fail)
72+
73+
python testing (if python code has changed; see instructions in python/README.md; document testing done):
74+
75+
derecho - PASS
76+
77+
regular tests (aux_clm: https://github.com/ESCOMP/CTSM/wiki/System-Testing-Guide#pre-merge-system-testing):
78+
79+
derecho ----- OK
80+
izumi ------- OK
81+
82+
Answer changes
83+
--------------
84+
85+
Changes answers relative to baseline: Yes
86+
87+
Summarize any changes to answers, i.e.,
88+
- what code configurations: Clm60 due to updates to CLM6 and Clm50*G due to updated cism
89+
- what platforms/compilers: All
90+
- nature of change: larger than roundoff, possibly new climate
91+
92+
If this tag changes climate describe the run(s) done to evaluate the new
93+
climate (put details of the simulations in the experiment database)
94+
- casename: post-5.4.n02.ctsm5.4.000_HIST_test0 and an issue including links to diagnostics is expeced soon with most likely url https://github.com/NCAR/LMWG_dev/issues/130
95+
96+
Other details
97+
-------------
98+
List any git submodules updated (cime, rtm, mosart, cism, fates, etc.):
99+
cismwrap_2_2_010 to cismwrap_2_2_011
100+
ccs_config_cesm1.0.61_add_domain_ne3np4.pg2_1 to ccs_config_cesm1.0.66
101+
102+
Pull Requests that document the changes (include PR ids):
103+
https://github.com/ESCOMP/ctsm/pull/3655
104+
105+
===============================================================
106+
===============================================================
2107
Tag name: ctsm5.4.002
3108
Originator(s): erik (Erik Kluzek,UCAR/TSS,303-497-1326)
4109
Date: Wed Dec 10 03:35:12 PM MST 2025

‎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.4.003 multiple 12/11/2025 Merge post5.4 branch to master
34
ctsm5.4.002 erik 12/10/2025 Start using CMIP7 Carbon Isotope datasets
45
ctsm5.4.001 samrabin 12/08/2025 Merge b4b-dev
56
ctsm5.4.000 multiple 12/04/2025 Merge alpha-ctsm5.4.CMIP7 to master

0 commit comments

Comments
 (0)