Skip to content

Commit 203db12

Browse files
slevis-lmwgslevis-lmwg
authored
Merge pull request #2928 from slevis-lmwg/tmp-241219
Merge tmp-241219 branch to master
2 parents f437651 + 5c2bc3f commit 203db12

File tree

17 files changed

+498
-40
lines changed

17 files changed

+498
-40
lines changed

‎.gitmodules

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
[submodule "fates"]
2929
path = src/fates
3030
url = https://github.com/NGEET/fates
31-
fxtag = sci.1.79.3_api.37.0.0
31+
fxtag = sci.1.80.4_api.37.0.0
3232
fxrequired = AlwaysRequired
3333
# Standard Fork to compare to with "git fleximod test" to ensure personal forks aren't committed
3434
fxDONOTUSEurl = https://github.com/NCAR/fates-release

‎bld/CLMBuildNamelist.pm

+3-1
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

+5-4
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

+5
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/ExpectedTestFails.xml

+8-1
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@
114114
</test>
115115

116116
<test name="SMS_D.f10_f10_mg37.I2000Clm60BgcCrop.derecho_nvhpc.clm-crop">
117-
<phase name="BUILD">
117+
<phase name="SHAREDLIB_BUILD">
118118
<status>FAIL</status>
119119
<issue>#1733</issue>
120120
</phase>
@@ -556,6 +556,13 @@
556556
</phase>
557557
</test>
558558

559+
<test name="PVT_Lm3.f45_f45_mg37.I2000Clm50FatesCruRsGs.derecho_intel.clm-FatesLUPFT">
560+
<phase name="RUN">
561+
<status>FAIL</status>
562+
<issue>#2919</issue>
563+
</phase>
564+
</test>
565+
559566
<!-- Other submodule test list failures (MOSART, RTM, etc. -->
560567

561568
<test name="SMS_Lh3.f10_f10_mg37.I2000Clm60Sp.derecho_intel.mosart-clmAccelSpinupIgnoreWarn">

‎cime_config/testdefs/testlist_clm.xml

+9
Original file line numberDiff line numberDiff line change
@@ -1317,6 +1317,15 @@
13171317
<option name="comment" >Science support for I1850Clm50BgcCropCru at f19</option>
13181318
</options>
13191319
</test>
1320+
<test name="ERP_D_Ld5_P48x1" grid="f10_f10_mg37" compset="I2000Clm50BgcCru" testmods="clm/flexCN_FUN_BNF">
1321+
<machines>
1322+
<machine name="derecho" compiler="intel" category="aux_clm"/>
1323+
<machine name="izumi" compiler="nag" category="aux_clm"/>
1324+
</machines>
1325+
<options>
1326+
<option name="wallclock">00:20:00</option>
1327+
</options>
1328+
</test>
13201329
<test name="ERP_D_Ld5_P48x1" grid="f10_f10_mg37" compset="I2000Clm50BgcCru" testmods="clm/flexCN_FUN">
13211330
<machines>
13221331
<machine name="izumi" compiler="nag" category="aux_clm"/>

‎cime_config/testdefs/testmods_dirs/clm/FatesColdHydro/shell_commands

-8
This file was deleted.

‎cime_config/testdefs/testmods_dirs/clm/FatesColdHydro/user_nl_clm

-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ hist_mfilt = 365
22
hist_nhtfrq = -24
33
hist_empty_htapes = .true.
44
use_fates_planthydro= .true.
5-
fates_paramfile = '$CASEROOT/fates_params_hydrograsstempfix.nc'
65
hist_fincl1 = 'FATES_ERRH2O_SZPF', 'FATES_TRAN_SZPF',
76
'FATES_SAPFLOW_SZPF', 'FATES_ITERH1_SZPF','FATES_ABSROOT_H2O_SZPF',
87
'FATES_TRANSROOT_H2O_SZPF','FATES_STEM_H2O_SZPF','FATES_LEAF_H2O_SZPF',

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

+1-1
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

+1-1
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'

‎cime_config/testdefs/testmods_dirs/clm/flexCN_FUN_BNF/include_user_mods

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../flexCN_FUN

‎cime_config/testdefs/testmods_dirs/clm/flexCN_FUN_BNF/user_nl_clm

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
nfix_method = 'Bytnerowicz'
2+

0 commit comments

Comments
 (0)