Skip to content

Commit e07c66a

Browse files
adrifosteradrifoster
authored
Merge pull request #2872 from adrifoster/merge-b4bdev-20241108
Merge b4bdev 20241108
2 parents 26b9aa7 + bbe061d commit e07c66a

24 files changed

Lines changed: 270 additions & 211 deletions

‎bld/CLMBuildNamelist.pm‎

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3602,17 +3602,6 @@ sub setup_logic_luna {
36023602
if ( &value_is_true($nl->get_value('lnc_opt') ) && not &value_is_true( $nl_flags->{'use_cn'}) ) {
36033603
$log->fatal_error("Cannot turn lnc_opt to true when bgc=sp" );
36043604
}
3605-
my $var = "jmaxb1";
3606-
if ( &value_is_true( $nl_flags->{'use_luna'} ) ) {
3607-
add_default($opts, $nl_flags->{'inputdata_rootdir'}, $definition, $defaults, $nl, $var,
3608-
'use_luna'=>$nl_flags->{'use_luna'} );
3609-
}
3610-
my $val = $nl->get_value($var);
3611-
if ( ! &value_is_true( $nl_flags->{'use_luna'} ) ) {
3612-
if ( defined($val) ) {
3613-
$log->fatal_error("Cannot set $var when use_luna is NOT on" );
3614-
}
3615-
}
36163605
}
36173606

36183607
#-------------------------------------------------------------------------------
@@ -4526,8 +4515,6 @@ sub setup_logic_canopyhydrology {
45264515
#
45274516
my ($opts, $nl_flags, $definition, $defaults, $nl) = @_;
45284517

4529-
add_default($opts, $nl_flags->{'inputdata_rootdir'}, $definition, $defaults, $nl, 'interception_fraction' );
4530-
add_default($opts, $nl_flags->{'inputdata_rootdir'}, $definition, $defaults, $nl, 'maximum_leaf_wetted_fraction' );
45314518
add_default($opts, $nl_flags->{'inputdata_rootdir'}, $definition, $defaults, $nl, 'use_clm5_fpi' );
45324519
}
45334520

@@ -4546,7 +4533,6 @@ sub setup_logic_snowpack {
45464533
add_default($opts, $nl_flags->{'inputdata_rootdir'}, $definition, $defaults, $nl, 'wind_dependent_snow_density');
45474534
add_default($opts, $nl_flags->{'inputdata_rootdir'}, $definition, $defaults, $nl, 'snow_overburden_compaction_method');
45484535
add_default($opts, $nl_flags->{'inputdata_rootdir'}, $definition, $defaults, $nl, 'lotmp_snowdensity_method');
4549-
add_default($opts, $nl_flags->{'inputdata_rootdir'}, $definition, $defaults, $nl, 'upplim_destruct_metamorph');
45504536
add_default($opts, $nl_flags->{'inputdata_rootdir'}, $definition, $defaults, $nl, 'reset_snow');
45514537
add_default($opts, $nl_flags->{'inputdata_rootdir'}, $definition, $defaults, $nl, 'reset_snow_glc');
45524538
add_default($opts, $nl_flags->{'inputdata_rootdir'}, $definition, $defaults, $nl, 'reset_snow_glc_ela');

‎bld/namelist_files/namelist_defaults_ctsm.xml‎

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -413,11 +413,7 @@ attributes from the config_cache.xml file (with keys converted to upper-case).
413413

414414
<!-- Canopy hydrology namelist defaults -->
415415
<use_clm5_fpi >.true.</use_clm5_fpi>
416-
<interception_fraction >1.0</interception_fraction>
417-
<maximum_leaf_wetted_fraction >0.05</maximum_leaf_wetted_fraction>
418416
<use_clm5_fpi phys="clm4_5" >.false.</use_clm5_fpi>
419-
<interception_fraction phys="clm4_5" >0.25</interception_fraction>
420-
<maximum_leaf_wetted_fraction phys="clm4_5" >1.0</maximum_leaf_wetted_fraction>
421417

422418
<!-- Soilwater movement namelist defaults -->
423419
<soilwater_movement_method >1</soilwater_movement_method>
@@ -493,9 +489,6 @@ attributes from the config_cache.xml file (with keys converted to upper-case).
493489
<lotmp_snowdensity_method >'Slater2017'</lotmp_snowdensity_method>
494490
<lotmp_snowdensity_method phys="clm4_5" >'TruncatedAnderson1976'</lotmp_snowdensity_method>
495491

496-
<upplim_destruct_metamorph >175.d00</upplim_destruct_metamorph>
497-
<upplim_destruct_metamorph phys="clm4_5" >100.d00</upplim_destruct_metamorph>
498-
499492
<overburden_compress_tfactor>0.08d00</overburden_compress_tfactor>
500493

501494
<reset_snow>.false.</reset_snow>
@@ -551,10 +544,10 @@ attributes from the config_cache.xml file (with keys converted to upper-case).
551544
<!-- The default filenames are given relative to the root directory
552545
for the CLM2 data in the CESM distribution -->
553546
<!-- Plant function types (relative to {csmdata}) -->
554-
<paramfile phys="clm6_0" >lnd/clm2/paramdata/ctsm60_params.c240822.nc</paramfile>
555-
<paramfile phys="clm5_1" >lnd/clm2/paramdata/ctsm51_params.c240814.nc</paramfile>
556-
<paramfile phys="clm5_0" >lnd/clm2/paramdata/clm50_params.c240814.nc</paramfile>
557-
<paramfile phys="clm4_5" >lnd/clm2/paramdata/clm45_params.c240814.nc</paramfile>
547+
<paramfile phys="clm6_0" >lnd/clm2/paramdata/ctsm60_params.c241017.nc</paramfile>
548+
<paramfile phys="clm5_1" >lnd/clm2/paramdata/ctsm51_params.c241017.nc</paramfile>
549+
<paramfile phys="clm5_0" >lnd/clm2/paramdata/clm50_params.c241017.nc</paramfile>
550+
<paramfile phys="clm4_5" >lnd/clm2/paramdata/clm45_params.c241017.nc</paramfile>
558551

559552
<!-- ================================================================== -->
560553
<!-- FATES default parameter file -->
@@ -606,9 +599,6 @@ attributes from the config_cache.xml file (with keys converted to upper-case).
606599
<use_fertilizer >.false.</use_fertilizer>
607600
<use_fertilizer use_crop=".true." >.true.</use_fertilizer>
608601

609-
<!-- Could depend on physics version -->
610-
<jmaxb1 use_luna=".true." >0.17</jmaxb1>
611-
612602
<!-- o3_veg_stress_method-->
613603
<o3_veg_stress_method>unset</o3_veg_stress_method>
614604

‎bld/namelist_files/namelist_definition_ctsm.xml‎

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -404,21 +404,11 @@ Max number of iterations used in subr. CanopyFluxes. For many years, 40 was the
404404
<default>Default: 40</default>
405405
</entry>
406406

407-
<entry id="interception_fraction" type="real" category="clm_physics"
408-
group="clm_canopyhydrology_inparm" valid_values="" >
409-
Fraction of intercepted precipitation
410-
</entry>
411-
412407
<entry id="use_clm5_fpi" type="logical" category="clm_physics"
413408
group="clm_canopyhydrology_inparm" valid_values="" >
414409
If TRUE use clm5 equation for fraction of intercepted precipitation
415410
</entry>
416411

417-
<entry id="maximum_leaf_wetted_fraction" type="real" category="clm_physics"
418-
group="clm_canopyhydrology_inparm" valid_values="" >
419-
Maximum fraction of leaf that may be wet prior to drip occuring
420-
</entry>
421-
422412
<entry id="baseflow_scalar" type="real" category="clm_physics"
423413
group="soilhydrology_inparm" valid_values="" >
424414
Scalar multiplier for base flow rate
@@ -712,11 +702,6 @@ Scalar of leaf respiration to vcmax
712702
The maximum value to use for zeta under stable conditions
713703
</entry>
714704

715-
<entry id="Jmaxb1" type="real" category="clm_physics"
716-
group="luna" >
717-
baseline proportion of nitrogen allocated for electron transport (J)
718-
</entry>
719-
720705
<entry id="use_fates" type="logical" category="physics"
721706
group="clm_inparm" valid_values="" value=".false.">
722707
Toggle to turn on the FATES model
@@ -2844,11 +2829,6 @@ TruncatedAnderson1976 -- Truncate the Anderson-1976 equation at the value for -1
28442829
Slater2017 ------------- Use equation from Slater that increases snow density for very cold temperatures (Arctic, Antarctic)
28452830
</entry>
28462831

2847-
<entry id="upplim_destruct_metamorph" type="real" category="clm_physics"
2848-
group="clm_snowhydrology_inparm" >
2849-
Upper Limit on Destructive Metamorphism Compaction [kg/m3]
2850-
</entry>
2851-
28522832
<entry id="overburden_compress_Tfactor" type="real" category="clm_physics"
28532833
group="clm_snowhydrology_inparm" >
28542834
Snow compaction overburden exponential factor (1/K)

‎bld/unit_testers/build-namelist_test.pl‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1235,10 +1235,6 @@ sub cat_and_create_namelistinfile {
12351235
namelst=>"use_luna=.true., lnc_opt=.true.",
12361236
phys=>"clm5_0",
12371237
},
1238-
"NOlunabutsetJmaxb1" =>{ options=>"-envxml_dir . -bgc sp",
1239-
namelst=>"use_luna=.false., jmaxb1=1.0",
1240-
phys=>"clm5_0",
1241-
},
12421238
"envxml_not_dir" =>{ options=>"-envxml_dir myuser_nl_clm",
12431239
namelst=>"",
12441240
phys=>"clm5_0",

‎cime_config/buildnml‎

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -52,16 +52,8 @@ def buildnml(case, caseroot, compname):
5252
clm_accelerated_spinup = case.get_value("CLM_ACCELERATED_SPINUP")
5353
comp_interface = case.get_value("COMP_INTERFACE")
5454
lilac_mode = case.get_value("LILAC_MODE")
55-
if comp_interface == "nuopc":
56-
yr_start = case.get_value("DATM_YR_START")
57-
yr_end = case.get_value("DATM_YR_END")
58-
else:
59-
yr_start = case.get_value("DATM_CLMNCEP_YR_START")
60-
yr_end = case.get_value("DATM_CLMNCEP_YR_END")
61-
62-
if yr_start != None and yr_start < 0:
63-
yr_start = case.get_value("DATM_CPLHIST_YR_START")
64-
yr_end = case.get_value("DATM_CPLHIST_YR_END")
55+
yr_start = case.get_value("DATM_YR_START")
56+
yr_end = case.get_value("DATM_YR_END")
6557

6658
# For LILAC
6759
if yr_start == None or lilac_mode == "on":

‎cime_config/testdefs/ExpectedTestFails.xml‎

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -283,6 +283,57 @@
283283
<issue>#2325</issue>
284284
</phase>
285285
</test>
286+
287+
<!-- izumi nag failures -->
288+
<test name="ERS_D_Ld5_Mmpi-serial.1x1_vancouverCAN.I1PtClm50SpRs.izumi_nag.clm-CLM1PTStartDate">
289+
<phase name="RUN">
290+
<status>FAIL</status>
291+
<issue>#2861</issue>
292+
</phase>
293+
</test>
294+
295+
<test name="ERS_D_Mmpi-serial_Ld5.1x1_brazil.I2000Clm50FatesRs.izumi_nag.clm-FatesCold">
296+
<phase name="RUN">
297+
<status>FAIL</status>
298+
<issue>#2861</issue>
299+
</phase>
300+
</test>
301+
302+
<test name="SMS_D_Ld1_Mmpi-serial.f45_f45_mg37.I2000Clm50SpRs.izumi_nag.clm-ptsRLA">
303+
<phase name="RUN">
304+
<status>FAIL</status>
305+
<issue>#2861</issue>
306+
</phase>
307+
</test>
308+
309+
<test name="SMS_D_Mmpi-serial_Ld5.5x5_amazon.I2000Clm60FatesRs.izumi_nag.clm-FatesCold">
310+
<phase name="RUN">
311+
<status>FAIL</status>
312+
<issue>#2861</issue>
313+
</phase>
314+
</test>
315+
316+
<test name="SMS_Ld10_D_Mmpi-serial.CLM_USRDAT.I1PtClm60Bgc.izumi_nag.clm-default--clm-NEON-HARV">
317+
<phase name="RUN">
318+
<status>FAIL</status>
319+
<issue>#2861</issue>
320+
</phase>
321+
</test>
322+
323+
<test name="SMS_Ld10_D_Mmpi-serial.CLM_USRDAT.I1PtClm60SpRs.izumi_nag.clm-default--clm-NEON-TOOL">
324+
<phase name="RUN">
325+
<status>FAIL</status>
326+
<issue>#2861</issue>
327+
</phase>
328+
</test>
329+
330+
<test name="ERP_D_Ld5_P48x1.f10_f10_mg37.I1850Clm60Bgc.izumi_nag.clm-ciso">
331+
<phase name="RUN">
332+
<status>FAIL</status>
333+
<issue>#2861</issue>
334+
</phase>
335+
</test>
336+
286337

287338
<test name="SMS_Ld10_D_Mmpi-serial.CLM_USRDAT.I1PtClm60Fates.derecho_intel.clm-FatesFireLightningPopDens--clm-NEON-FATES-NIWO">
288339
<phase name="SHAREDLIB_BUILD">

‎cime_config/testdefs/testlist_clm.xml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -875,6 +875,15 @@
875875
<option name="comment" >Run matrix solution fast spinup for restart beyond a year (to trigger next year logic) turning off extra options to make faster (so without crop or isotopes). This test would've caught a previous bug.</option>
876876
</options>
877877
</test>
878+
<test name="SMS_Lm1" grid="f10_f10_mg37" compset="I1850Clm60Bgc" testmods="clm/clm60_monthly_matrixcn_soilCN30">
879+
<machines>
880+
<machine name="derecho" compiler="intel" category="aux_clm"/>
881+
</machines>
882+
<options>
883+
<option name="wallclock">01:20:00</option>
884+
<option name="comment" >Smoke test of soil CN-matrix on with soil CN ratio set to 30</option>
885+
</options>
886+
</test>
878887
<test name="ERS_D" grid="f19_g17" compset="I1850Clm50BgcCrop" testmods="clm/ciso_monthly_matrixcn_spinup">
879888
<machines>
880889
<machine name="derecho" compiler="intel" category="aux_clm"/>

‎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.c240814.nc'
1+
paramfile = '$DIN_LOC_ROOT/lnd/clm2/paramdata/ctsm51_ciso_cwd_hr_params.c241017.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.c240822.nc'
2+
paramfile = '$DIN_LOC_ROOT/lnd/clm2/paramdata/ctsm60_params_cn30.c241017.nc'

‎doc/ChangeLog‎

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,61 @@
11
===============================================================
2+
Tag name: ctsm5.3.010
3+
Originator(s): afoster (Adrianna Foster)
4+
Date: Sat Nov 9 12:54:18 MST 2024
5+
One-line Summary: Merge b4b-dev
6+
7+
Purpose and description of changes
8+
----------------------------------
9+
10+
- moves namelist variables to parameter file for PPE and makes some parameter variables pft-dimensioned (resolves ESCOMP/CTSM#2830 and resolves ESCOMP/CTSM#2831)
11+
- removes/replaces references to DATM_C* _YR_* variables (resolves ESCOMP/CTSM#2743)
12+
- documents that fincl1 and fexcl1 map to 'h0' history files
13+
14+
15+
Significant changes to scientifically-supported configurations
16+
--------------------------------------------------------------
17+
18+
Does this tag change answers significantly for any of the following physics configurations?
19+
(Details of any changes will be given in the "Answer changes" section below.)
20+
21+
[Put an [X] in the box for any configuration with significant answer changes.]
22+
23+
[ ] clm6_0
24+
25+
[ ] clm5_1
26+
27+
[ ] clm5_0
28+
29+
[ ] ctsm5_0-nwp
30+
31+
[ ] clm4_5
32+
33+
34+
Bugs fixed
35+
----------
36+
- ESCOMP/CTSM#2830 (allow LUNA & mortality parameter to vary by PFT; https://github.com/ESCOMP/CTSM/issues/2830)
37+
- ESCOMP/CTSM#2831 (Move namelist parameters to paramfile; https://github.com/ESCOMP/CTSM/issues/2831)
38+
- ESCOMP/CTSM#2743 (Docs: Remove refs to DATM_CLMNCEP_YR_* and DATM_CPL_YR_* variables; https://github.com/ESCOMP/CTSM/issues/2743)
39+
40+
41+
Testing summary:
42+
----------------
43+
regular tests (aux_clm: https://github.com/ESCOMP/CTSM/wiki/System-Testing-Guide#pre-merge-system-testing):
44+
45+
derecho ----- OK
46+
izumi ------- OK
47+
48+
49+
Other details
50+
-------------
51+
52+
Pull Requests that document the changes (include PR ids):
53+
- ESCOMP/CTSM#2845: PPE parameter work -Addresses issues 2830 and 2831 (https://github.com/ESCOMP/CTSM/pull/2845)
54+
- ESCOMP/CTSM#2852: Remove/replace refs to DATM_C*_YR_* variables (https://github.com/ESCOMP/CTSM/pull/2852)
55+
- ESCOMP/CTSM#2866: Document that fincl1 maps to 'h0' history file. And fexcl1 (https://github.com/ESCOMP/CTSM/pull/2866)
56+
57+
===============================================================
58+
===============================================================
259
Tag name: ctsm5.3.009
360
Originator(s): samrabin (Sam Rabin, UCAR/TSS, samrabin@ucar.edu)
461
Date: Tue Oct 15 17:35:40 MDT 2024

0 commit comments

Comments
 (0)