Skip to content

Commit 1224d97

Browse files
ekluzekekluzek
committed
Merge remote-tracking branch 'escomp/b4b-dev' into cesm3_0_beta05_submodules
2 parents d19a679 + d59162c commit 1224d97

File tree

9 files changed

+244
-28
lines changed

9 files changed

+244
-28
lines changed

‎bld/CLMBuildNamelist.pm

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3395,7 +3395,7 @@ sub setup_logic_mineral_nitrogen_dynamics {
33953395
#
33963396
my ($opts, $nl_flags, $definition, $defaults, $nl) = @_;
33973397

3398-
my @vars = ( "freelivfix_slope_wet", "freelivfix_intercept" );
3398+
my @vars = ( "freelivfix_slope_wet", "freelivfix_intercept", "nfix_method" );
33993399
if ( &value_is_true($nl_flags->{'use_cn'}) && &value_is_true($nl->get_value('use_fun')) ) {
34003400
foreach my $var ( @vars ) {
34013401
add_default($opts, $nl_flags->{'inputdata_rootdir'}, $definition, $defaults, $nl, $var,
@@ -3408,6 +3408,7 @@ sub setup_logic_mineral_nitrogen_dynamics {
34083408
}
34093409
}
34103410
}
3411+
34113412
}
34123413

34133414

@@ -5208,6 +5209,7 @@ sub write_output_files {
52085209
}
52095210
push @groups, "clm_humanindex_inparm";
52105211
push @groups, "cnmresp_inparm";
5212+
push @groups, "cnfun_inparm";
52115213
push @groups, "photosyns_inparm";
52125214
push @groups, "cnfire_inparm";
52135215
push @groups, "cn_general";

‎bld/namelist_files/namelist_defaults_ctsm.xml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -524,10 +524,9 @@ attributes from the config_cache.xml file (with keys converted to upper-case).
524524
<!-- The default filenames are given relative to the root directory
525525
for the CLM2 data in the CESM distribution -->
526526
<!-- Plant function types (relative to {csmdata}) -->
527-
<paramfile phys="clm6_0" >lnd/clm2/paramdata/ctsm60_params.c241017.nc</paramfile>
528-
<paramfile phys="clm5_1" >lnd/clm2/paramdata/ctsm51_params.c241017.nc</paramfile>
529-
<paramfile phys="clm5_0" >lnd/clm2/paramdata/clm50_params.c241017.nc</paramfile>
530-
<paramfile phys="clm4_5" >lnd/clm2/paramdata/clm45_params.c241017.nc</paramfile>
527+
<paramfile phys="clm6_0" >lnd/clm2/paramdata/ctsm60_params.c241119.nc</paramfile>
528+
<paramfile phys="clm5_0" >lnd/clm2/paramdata/clm50_params.c241119.nc</paramfile>
529+
<paramfile phys="clm4_5" >lnd/clm2/paramdata/clm45_params.c241119.nc</paramfile>
531530

532531
<!-- ================================================================== -->
533532
<!-- FATES default parameter file -->
@@ -1894,6 +1893,8 @@ lnd/clm2/surfdata_esmf/NEON/ctsm5.3.0/surfdata_1x1_NEON_TOOL_hist_2000_78pfts_c2
18941893
<freelivfix_intercept use_fun=".true." use_cn=".true.">0.0117d00</freelivfix_intercept>
18951894
<freelivfix_slope_wet use_fun=".true." use_cn=".true.">0.0006d00</freelivfix_slope_wet>
18961895

1896+
<nfix_method>Houlton</nfix_method>
1897+
18971898
<br_root>0.83d-06</br_root>
18981899

18991900
<!-- Scalar of leaf respiration to vcmax (used for SP mode and with luna) (could vary with physics version) -->

‎bld/namelist_files/namelist_definition_ctsm.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -388,6 +388,11 @@ Slope of free living Nitrogen fixation with annual ET
388388
Intercept of free living Nitrogen fixation with zero annual ET
389389
</entry>
390390

391+
<entry id="nfix_method" type="char*25" category="cnfun_inparm"
392+
group="cnfun_inparm" valid_values="Houlton,Bytnerowicz" value="Houlton" >
393+
Choice of nfix parameterization
394+
</entry>
395+
391396
<entry id="use_undercanopy_stability" type="logical" category="clm_physics"
392397
group="canopyfluxes_inparm" valid_values="" >
393398
If TRUE use the undercanopy stability term used with CLM4.5 (Sakaguchi&amp;Zeng, 2008)

‎cime_config/testdefs/testmods_dirs/clm/ciso_cwd_hr/user_nl_clm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
paramfile = '$DIN_LOC_ROOT/lnd/clm2/paramdata/ctsm51_ciso_cwd_hr_params.c241017.nc'
1+
paramfile = '$DIN_LOC_ROOT/lnd/clm2/paramdata/ctsm60_ciso_cwd_hr_params.c241119.nc'
22
hist_fincl1 = 'CWDC_HR','C13_CWDC_HR','C14_CWDC_HR','CWD_HR_L2','CWD_HR_L2_vr','CWD_HR_L3','CWD_HR_L3_vr'

‎cime_config/testdefs/testmods_dirs/clm/clm60_monthly_matrixcn_soilCN30/user_nl_clm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
use_soil_matrixcn = .true.
2-
paramfile = '$DIN_LOC_ROOT/lnd/clm2/paramdata/ctsm60_params_cn30.c241017.nc'
2+
paramfile = '$DIN_LOC_ROOT/lnd/clm2/paramdata/ctsm60_params_cn30.c241119.nc'

‎doc/ChangeLog

Lines changed: 84 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,88 @@
11
===============================================================
2+
Tag name: ctsm5.3.017
3+
Originator(s): slevis (Samuel Levis,UCAR/TSS,303-665-1310)
4+
Date: Tue 24 Dec 2024 03:43:01 PM MST
5+
One-line Summary: Merge b4b-dev
6+
7+
Purpose and description of changes
8+
----------------------------------
9+
10+
#2869 Update temperature cost function for symbiotic Nfix in FUN
11+
12+
13+
Significant changes to scientifically-supported configurations
14+
--------------------------------------------------------------
15+
16+
Does this tag change answers significantly for any of the following physics configurations?
17+
(Details of any changes will be given in the "Answer changes" section below.)
18+
19+
[Put an [X] in the box for any configuration with significant answer changes.]
20+
21+
[ ] clm6_0
22+
23+
[ ] clm5_0
24+
25+
[ ] ctsm5_0-nwp
26+
27+
[ ] clm4_5
28+
29+
30+
Bugs fixed
31+
----------
32+
List of CTSM issues fixed (include CTSM Issue # and description) [one per line]:
33+
Resolves #2869
34+
35+
Notes of particular relevance for users
36+
---------------------------------------
37+
Changes to CTSM's user interface (e.g., new/renamed XML or namelist variables):
38+
New namelist variable: nfix_method
39+
40+
Changes made to namelist defaults (e.g., changed parameter values):
41+
nfix_method default: Houlton
42+
other available option: Bytnerowicz
43+
44+
45+
Testing summary:
46+
----------------
47+
48+
[PASS means all tests PASS; OK means tests PASS other than expected fails.]
49+
50+
build-namelist tests (if CLMBuildNamelist.pm has changed):
51+
52+
derecho - PASS
53+
54+
regular tests (aux_clm: https://github.com/ESCOMP/CTSM/wiki/System-Testing-Guide#pre-merge-system-testing):
55+
56+
derecho ----- OK
57+
izumi ------- machine seems problematic at the moment
58+
59+
60+
Answer changes
61+
--------------
62+
63+
Changes answers relative to baseline: No, but read caveat.
64+
65+
Summarize any changes to answers, i.e.,
66+
- what code configurations: tests with ciso_cwd_hr testmods
67+
- what platforms/compilers: all
68+
- nature of change: irrelevant
69+
70+
Explanation:
71+
"diff ctsm60_ciso_cwd_hr_params.c241119.asc ctsm60_params.c241119.asc"
72+
differ ONLY in the value of ceta. The previous paramfile for ciso_cwd_hr
73+
showed additional diffs, likely due to problems that we have seen before
74+
when generating new paramfiles. The ciso_cwd_hr tests would not have shown
75+
diffs had the previous paramfile been correct, so I only mention the diffs
76+
here for the record.
77+
78+
79+
Other details
80+
-------------
81+
Pull Requests that document the changes (include PR ids):
82+
https://github.com/ESCOMP/ctsm/pull/2869
83+
84+
===============================================================
85+
===============================================================
286
Tag name: ctsm5.3.016
387
Originator(s): jedwards and erik (Erik Kluzek,UCAR/TSS,303-497-1326)
488
Date: Thu 19 Dec 2024 04:23:39 PM MST

‎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.017 slevis 12/24/2024 Merge b4b-dev
34
ctsm5.3.016 erik 12/19/2024 Rpointer files for restart now have the simulation date in the filename
45
ctsm5.3.015 erik 12/18/2024 Update cdeps with cam7 nextsw cday changes
56
ctsm5.3.014 erik 12/03/2024 Bring in several fixes for testing in the previous cesm3_0_beta03/04 tags

0 commit comments

Comments
 (0)