Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
57 commits
Select commit Hold shift + click to select a range
e505dc8
Add two 1x1 FatesColdPRT2 tests, one with, one without MIMICS
slevis-lmwg Jul 30, 2025
01671b9
Uncomment if ( .not. use_fates_sp ) section of clmfates_interfaceMod
slevis-lmwg Aug 11, 2025
59f9d09
Replace plant_ndemand(c) * nuptake_prof(c,j) with plant_ndemand_vr(c,j)
slevis-lmwg Aug 12, 2025
b155e58
New use_fates section for plant_ndemand_vr and plant_ndemand from fates
slevis-lmwg Aug 13, 2025
c79230c
New use_fates section to set the FATES N uptake fluxes
slevis-lmwg Aug 13, 2025
98b4b7d
Change clm_fate from "in" to "inout" argument
slevis-lmwg Aug 13, 2025
a46a76c
Replace if (use_fates) with (is_fates(c)) to add flexibility
slevis-lmwg Aug 14, 2025
f2202fb
Remove two unhelpful 1x1 FatesColdPRT2 tests that I added earlier
slevis-lmwg Aug 15, 2025
e96b87e
New is_fates section for plant_ndemand, now when use_nitrif_denitrif
slevis-lmwg Aug 26, 2025
b24738b
Add (really, uncomment) FATES npp to enable fixation
slevis-lmwg Aug 26, 2025
00a332e
Uncomment hrv_deadstem_to_prod* lines in clmfates_interfaceMod
slevis-lmwg Sep 19, 2025
2bbdd64
Add error check about fates_parteh_mode = 2 and suplnitro = suplnAll
slevis-lmwg Sep 20, 2025
d8bc6ce
Upd. namelist_defaults for suplnitro when parteh_mode == 1 or /= 1
slevis-lmwg Sep 22, 2025
116b310
prt_carbon_allom_hyp -> fates_c_only & prt_cnp_flex_allom_hyp ->fates_cn
slevis-lmwg Sep 22, 2025
ba955b6
Correction to syntax error caught by gnu and nvhpc, not intel
slevis-lmwg Sep 23, 2025
391a023
Update fates paramfile var prescribed_puptake to 1 for PRT2 test
slevis-lmwg Sep 23, 2025
e881a89
Adjust unit conversions to agree with FATES commit b2a1da6
slevis-lmwg Dec 8, 2025
8135820
Change fates paramfile var prescribed_puptake to 10 for PRT2 test
slevis-lmwg Dec 10, 2025
e73b42d
Replace fates_cn with fates_cnp throughout
slevis-lmwg Dec 16, 2025
25ea275
Remove FATES_ERROR_EL from user_nl_clm (out-of-scope fix)
slevis-lmwg Dec 17, 2025
71ed0fe
Merge tag 'ctsm5.4.004' into fates-cn
slevis-lmwg Dec 17, 2025
3b7e863
Merge tag 'ctsm5.4.005' into fates-cn
slevis-lmwg Dec 20, 2025
b146c70
Add PRT2 test with synthetic N to replicate the pre-CN-coupling setup
slevis-lmwg Dec 20, 2025
223b6e1
changing namelist type for fates_parteh_mode, part 1
rgknox Dec 26, 2025
fab4aa0
Update two namelist error-checks
slevis-lmwg Dec 30, 2025
e5403d2
Update equivalent to last error-checks, this time in controlMod.F90
slevis-lmwg Dec 31, 2025
cfa42fa
Add FatesColdPRT2_suplnAll test and corresponding testmod
slevis-lmwg Dec 31, 2025
f09d9ac
more name changes for fates CNP and c-only
rgknox Jan 16, 2026
b3afab9
working on passing nl defaults
rgknox Jan 18, 2026
94fc2e2
Merge branch 'fates-cn' into fates-cn
slevis-lmwg Jan 20, 2026
d260110
fixes to namelist processing of suplnitro
rgknox Jan 26, 2026
e4b33ae
more explicit logic on suplnitro with fates
rgknox Jan 26, 2026
88a6770
more explicit namelist defaults
rgknox Jan 26, 2026
8f2c0bb
Remove trailing whitespace
slevis-lmwg Jan 27, 2026
dde7942
Changes for namelist updates to work
slevis-lmwg Jan 28, 2026
069000f
Merge pull request #19 from rgknox/fates-cn
slevis-lmwg Feb 7, 2026
dd4bd70
Merge tag 'ctsm5.4.019' into fates-cn-merge
rgknox Feb 27, 2026
631b728
merge with 5.3.026
rgknox Mar 27, 2026
924347c
Added uptake fluxes to restarts for fates, pass in boundary condition…
rgknox Mar 31, 2026
1f3bba8
Merge pull request #20 from rgknox/fates-cn
slevis-lmwg Apr 6, 2026
9d17906
Merge branch 'master' into fates-cn
slevis-lmwg Apr 6, 2026
911f307
Simplify elsif in CLMBuildNamelist.pm to get past failure
slevis-lmwg Apr 13, 2026
d7d8a22
Correct minor typo
slevis-lmwg Apr 13, 2026
f798627
Add 2 expected failure tests to build-namelist_test.pl
slevis-lmwg Apr 13, 2026
488b93c
Merge tag 'ctsm5.4.032' into fates-cn
slevis-lmwg Apr 13, 2026
83bf1f1
Update to existing compsets in new PRT2 tests for cases to create
slevis-lmwg Apr 13, 2026
2a5158f
Merge tag 'ctsm5.4.034' into fates-cn
slevis-lmwg Apr 23, 2026
566b160
Remove passing test from expected failures
slevis-lmwg Apr 24, 2026
8aa1f66
Update .gitmodules with the new FATES tag (ie, FATES-side fates-cn)
slevis-lmwg Apr 24, 2026
e7598c6
Remove machine lawrencium from testlist_clm.xml
slevis-lmwg Apr 27, 2026
868f277
Add comments about suplnitro in namelist_defaults_ctsm.xml
slevis-lmwg Apr 27, 2026
38463da
Change fates_parteh_mode to SHR_KIND_CS (char*80 inst. of 256)
slevis-lmwg Apr 27, 2026
17cad76
Add comments clarifying the presence of two very similar loops
slevis-lmwg Apr 27, 2026
7a779d6
Merge remote-tracking branch 'escomp/master' into fates-cn
slevis-lmwg Apr 27, 2026
200f1ff
Update total number of tests in build-namelist_test.pl
slevis-lmwg Apr 27, 2026
907d6b3
Draft updates to ChangeLog/ChangeSum
slevis-lmwg Apr 27, 2026
4565761
Revert 25ea275 by putting FATES_ERROR_EL back in user_nl_clm
slevis-lmwg Apr 27, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
[submodule "fates"]
path = src/fates
url = https://github.com/NGEET/fates
fxtag = sci.1.92.1_api.44.1.0
fxtag = sci.1.92.4_api.45.0.0
fxrequired = AlwaysRequired
# Standard Fork to compare to with "git fleximod test" to ensure personal forks aren't committed
fxDONOTUSEurl = https://github.com/NGEET/fates
Expand Down
32 changes: 18 additions & 14 deletions bld/CLMBuildNamelist.pm
Original file line number Diff line number Diff line change
Expand Up @@ -1705,10 +1705,10 @@ sub process_namelist_inline_logic {
}
setup_logic_cnmatrix($opts, $nl_flags, $definition, $defaults, $nl, $envxml_ref);
setup_logic_spinup($opts, $nl_flags, $definition, $defaults, $nl);
setup_logic_supplemental_nitrogen($opts, $nl_flags, $definition, $defaults, $nl);
setup_logic_c_isotope($opts, $nl_flags, $definition, $defaults, $nl);
setup_logic_snowpack($opts, $nl_flags, $definition, $defaults, $nl);
setup_logic_fates($opts, $nl_flags, $definition, $defaults, $nl);
setup_logic_supplemental_nitrogen($opts, $nl_flags, $definition, $defaults, $nl);
setup_logic_z0param($opts, $nl_flags, $definition, $defaults, $nl);
setup_logic_misc($opts, $nl_flags, $definition, $defaults, $nl);

Expand Down Expand Up @@ -3323,12 +3323,12 @@ sub setup_logic_supplemental_nitrogen {
if ( $nl_flags->{'bgc_mode'} ne "sp" && $nl_flags->{'bgc_mode'} ne "fates" && &value_is_true($nl_flags->{'use_crop'}) ) {
# If this is non-fates, non-sp and crop is active
add_default($opts, $nl_flags->{'inputdata_rootdir'}, $definition, $defaults, $nl,
'suplnitro', 'use_cn'=>$nl_flags->{'use_cn'}, 'use_crop'=>$nl_flags->{'use_crop'});
'suplnitro', 'use_cn'=>$nl_flags->{'use_cn'}, 'use_crop'=>$nl_flags->{'use_crop'});

} elsif ( $nl_flags->{'bgc_mode'} eq "fates" && not &value_is_true( $nl_flags->{'use_fates_sp'}) ) {
# Or... if its fates but not fates-sp
} elsif ( $nl_flags->{'bgc_mode'} eq "fates" ) {
# Or... if its fates
add_default($opts, $nl_flags->{'inputdata_rootdir'}, $definition, $defaults, $nl,
'suplnitro', 'use_fates'=>$nl_flags->{'use_fates'});
'suplnitro', 'fates_parteh_mode'=>remove_leading_and_trailing_quotes($nl->get_value('fates_parteh_mode')));
}
#
# Error checking for suplnitro
Expand All @@ -3344,9 +3344,21 @@ sub setup_logic_supplemental_nitrogen {

if ( $suplnitro =~ /ALL/i ) {
if ( $nl_flags->{'bgc_spinup'} eq "on" && $nl_flags->{'bgc_mode'} ne "fates" ) {
$log->warning("There is no need to use a bgc_spinup mode when supplemental Nitrogen is on for all PFT's, as these modes spinup Nitrogen" );
$log->warning("There is no need to use a bgc_spinup mode when supplemental Nitrogen is on for all PFTs, as these modes spinup Nitrogen" );
}
}

my $parteh_mode = $nl->get_value('fates_parteh_mode');
if ( ($parteh_mode =~ /carbon_only/i) && ($suplnitro !~ /ALL/i) ) {
$log->fatal_error("supplemental Nitrogen (suplnitro) is NOT set to ALL, FATES is on, " .
"and fates_parteh_mode = $parteh_mode, so Nitrogen is not active; " .
"change suplnitro back to ALL");
}
if ( ($parteh_mode =~ /carbon_nitrogen/i) && &value_is_true( $nl_flags->{'use_fates_sp'}) ) {
$log->fatal_error("FATES is on, " .
"FATES-SP is active, but fates_parteh_mode = $parteh_mode, so Nitrogen is active; " .
"change fates_parteh_mode to carbon_only or do not use FATES-SP");
}
}
}

Expand Down Expand Up @@ -4914,14 +4926,6 @@ sub setup_logic_fates {
'use_fates_managed_fire'=>$nl->get_value('use_fates_managed_fire'),
'use_fates_sp'=>$nl_flags->{'use_fates_sp'} );

my $suplnitro = $nl->get_value('suplnitro');
my $parteh_mode = $nl->get_value('fates_parteh_mode');
if ( ($parteh_mode == 1) && ($suplnitro !~ /ALL/) && not &value_is_true( $nl_flags->{'use_fates_sp'}) ) {
$log->fatal_error("supplemental Nitrogen (suplnitro) is NOT set to ALL, FATES is on, " .
"but and FATES-SP is not active, but fates_parteh_mode is 1, so Nitrogen is not active" .
"Change suplnitro back to ALL");
}

# For FATES SP mode make sure no-competetiion, and fixed-biogeography are also set
# And also check for other settings that can't be trigged on as well
#
Expand Down
11 changes: 6 additions & 5 deletions bld/namelist_files/namelist_defaults_ctsm.xml
Original file line number Diff line number Diff line change
Expand Up @@ -221,10 +221,6 @@ attributes from the config_cache.xml file (with keys converted to upper-case).
<megan_use_gamma_sm>.false.</megan_use_gamma_sm>
<megan_min_gamma_sm>0.0d00</megan_min_gamma_sm>

<!-- Supplmental Nitrogen mode -->
<suplnitro use_cn=".true." >NONE</suplnitro>
<suplnitro use_fates=".true." >ALL</suplnitro>

<!-- Albedo for glaciers -->
<albice >0.50,0.30</albice>
<albice phys="clm4_5" >0.60,0.40</albice>
Expand Down Expand Up @@ -2728,7 +2724,7 @@ lnd/clm2/surfdata_esmf/NEON/ctsm5.4.0/surfdata_1x1_NEON_TOOL_hist_2000_78pfts_c2
<use_fates_luh use_fates=".true." use_fates_potentialveg=".true.">.true.</use_fates_luh>
<use_fates_luh use_fates=".true." >.false.</use_fates_luh>
<fates_lu_transition_logic use_fates=".true." use_fates_luh=".true." >4</fates_lu_transition_logic>
<fates_parteh_mode use_fates=".true.">1</fates_parteh_mode>
<fates_parteh_mode use_fates=".true.">carbon_only</fates_parteh_mode>
<fates_seeddisp_cadence use_fates=".true.">0</fates_seeddisp_cadence>
<use_fates_nocomp use_fates=".true." use_fates_sp=".true." >.true.</use_fates_nocomp>
<use_fates_nocomp use_fates=".true." use_fates_lupft=".true.">.true.</use_fates_nocomp>
Expand All @@ -2738,6 +2734,11 @@ lnd/clm2/surfdata_esmf/NEON/ctsm5.4.0/surfdata_1x1_NEON_TOOL_hist_2000_78pfts_c2
<use_fates_fixed_biogeog use_fates=".true." >.false.</use_fates_fixed_biogeog>
<fates_history_dimlevel use_fates=".true.">2,2</fates_history_dimlevel>

<!-- Supplmental Nitrogen mode -->
<!-- FATES carbon_only needs suplnitro set to ALL. -->
<!-- In previous versions, all FATES cases needed suplnitro set to ALL. -->
<suplnitro >NONE</suplnitro>
<suplnitro fates_parteh_mode="carbon_only" >ALL</suplnitro>
Comment thread
slevis-lmwg marked this conversation as resolved.
Resolved

<!-- ========================================= -->
<!-- Defaults for dynamic subgrid -->
Expand Down
5 changes: 3 additions & 2 deletions bld/namelist_files/namelist_definition_ctsm.xml
Original file line number Diff line number Diff line change
Expand Up @@ -708,10 +708,11 @@ Toggle to turn on the FATES model
Functionally Assembled Terrestrial Ecosystem Simulator (FATES)
</entry>

<entry id="fates_parteh_mode" type="integer" category="physics"
group="clm_inparm" valid_values="1,2">
<entry id="fates_parteh_mode" type="char*80" category="physics"
group="clm_inparm" valid_values="carbon_only,carbon_nitrogen">
Switch deciding which nutrient model to use in FATES.
(Only relevant if FATES is on)
Comment thread
slevis-lmwg marked this conversation as resolved.
Resolved
(fates_parteh_mode='carbon_nitrogen' is EXPERIMENTAL and UNSUPPORTED)
</entry>

<entry id="fates_seeddisp_cadence" type="integer" category="physics"
Expand Down
10 changes: 7 additions & 3 deletions bld/unit_testers/build-namelist_test.pl
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ sub cat_and_create_namelistinfile {
#
# Figure out number of tests that will run
#
my $ntests = 3405;
my $ntests = 3406;

if ( defined($opts{'compare'}) ) {
$ntests += 2061;
Expand Down Expand Up @@ -1151,8 +1151,12 @@ sub cat_and_create_namelistinfile {
namelst=>"use_fun=TRUE",
phys=>"clm6_0",
},
"useFATESWOsuplnitro" =>{ options=>"--bgc fates --envxml_dir . --no-megan",
namelst=>"suplnitro='NONE'",
"useFATESCwsuplnNONE" =>{ options=>"--bgc fates --envxml_dir . --no-megan",
namelst=>"suplnitro='NONE', fates_parteh_mode='carbon_only'",
phys=>"clm6_0",
},
"useFATESCNwuse_fates_sp" =>{ options=>"--bgc fates --envxml_dir . --no-megan",
namelst=>"use_fates_sp = TRUE, fates_parteh_mode='carbon_nitrogen'",
phys=>"clm6_0",
},
"FATESwBothSpST3" =>{ options=>"--bgc fates --envxml_dir . --no-megan",
Expand Down
7 changes: 0 additions & 7 deletions cime_config/testdefs/ExpectedTestFails.xml
Original file line number Diff line number Diff line change
Expand Up @@ -135,13 +135,6 @@
</test>

<!-- mpi-serial failures on derecho_intel with the intel compiler update to intel/2025.3.2 -->
<test name="ERP_Ld9.f45_f45_mg37.I2000Clm50FatesCruRsGs.derecho_intel.clm-FatesColdAllVars">
<phase name="RUN">
<status>FAIL</status>
<issue>#3798</issue>
<comment>Divide by zero happens when ch4finundatedmapalgo==bilinear with intel/2025.3.2, but passes for nn,consf,consd</comment>
</phase>
</test>
<test name="ERS_D_Ld7_Mmpi-serial.1x1_smallvilleIA.IHistClm50BgcCropRs.derecho_intel.clm-decStart1851_noinitial">
<phase name="RUN">
<status>FAIL</status>
Expand Down
38 changes: 19 additions & 19 deletions cime_config/testdefs/testlist_clm.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3875,7 +3875,6 @@
<test name="ERP_Ld3" grid="f09_g17" compset="I2000Clm50FatesRs" testmods="clm/FatesCold">
<machines>
<machine name="derecho" compiler="intel" category="fates"/>
<machine name="lawrencium-lr3" compiler="intel" category="fates"/>
</machines>
<options>
<option name="wallclock">00:20:00</option>
Expand All @@ -3885,7 +3884,6 @@
<test name="ERP_Ld9" grid="f45_f45_mg37" compset="I2000Clm50FatesCruRsGs" testmods="clm/FatesColdAllVars">
<machines>
<machine name="derecho" compiler="intel" category="fates"/>
<machine name="lawrencium-lr3" compiler="intel" category="fates"/>
</machines>
<options>
<option name="wallclock">00:20:00</option>
Expand All @@ -3896,18 +3894,34 @@
<machines>
<machine name="derecho" compiler="intel" category="fates"/>
<machine name="izumi" compiler="nag" category="fates"/>
<machine name="lawrencium-lr3" compiler="intel" category="fates"/>
</machines>
<options>
<option name="wallclock">00:40:00</option>
<option name="comment">Exact restart debug test covering Fates CNP nutrients mode.</option>
<option name="comment">Exact restart debug test covering Fates CNP nutrients mode (P still prescribed in clm).</option>
</options>
</test>
<test name="ERS_D_Ld30" grid="f45_f45_mg37" compset="I2000Clm60FatesRs" testmods="clm/FatesColdPRT2_suplnAll">
<machines>
<machine name="derecho" compiler="intel" category="fates"/>
</machines>
<options>
<option name="wallclock">00:40:00</option>
<option name="comment">Exact restart debug test covering Fates CNP nutrients mode with suplnitro set to ALL.</option>
</options>
</test>
<test name="ERS_D_Ld30" grid="f45_f45_mg37" compset="I2000Clm60FatesRs" testmods="clm/FatesColdPRT2_synthN">
<machines>
<machine name="derecho" compiler="intel" category="fates"/>
</machines>
<options>
<option name="wallclock">00:40:00</option>
<option name="comment">Exact restart debug test covering Fates CNP nutrients mode with both P and N prescribed to replicate what happened before the CLM-FATES-CN coupling.</option>
</options>
</test>
<test name="ERS_D_Ld30" grid="f45_f45_mg37" compset="HIST_DATM%CRUv7_CLM50%FATES_SICE_SOCN_SROF_SGLC_SWAV_SESP" testmods="clm/FatesColdLandUse">
<machines>
<machine name="derecho" compiler="intel" category="fates"/>
<machine name="izumi" compiler="nag" category="fates"/>
<machine name="lawrencium-lr3" compiler="intel" category="fates"/>
</machines>
<options>
<option name="wallclock">00:40:00</option>
Expand Down Expand Up @@ -3955,7 +3969,6 @@
<machines>
<machine name="derecho" compiler="intel" category="fates"/>
<machine name="derecho" compiler="gnu" category="fates"/>
<machine name="lawrencium-lr3" compiler="intel" category="fates"/>
</machines>
<options>
<option name="wallclock">00:40:00</option>
Expand All @@ -3965,7 +3978,6 @@
<test name="ERS_D_Ld5" grid="f19_g17" compset="I2000Clm50BgcCru" testmods="clm/default">
<machines>
<machine name="derecho" compiler="intel" category="fates"/>
<machine name="lawrencium-lr3" compiler="intel" category="fates"/>
</machines>
<options>
<option name="wallclock">00:20:00</option>
Expand All @@ -3976,7 +3988,6 @@
<machines>
<machine name="derecho" compiler="gnu" category="fates"/>
<machine name="izumi" compiler="nag" category="fates"/>
<machine name="lawrencium-lr3" compiler="intel" category="fates"/>
</machines>
<options>
<option name="wallclock">00:20:00</option>
Expand All @@ -3986,7 +3997,6 @@
<test name="ERS_Ld9" grid="f10_f10_mg37" compset="I2000Clm50FatesCruRsGs" testmods="clm/FatesColdCH4Off">
<machines>
<machine name="derecho" compiler="intel" category="fates"/>
<machine name="lawrencium-lr3" compiler="intel" category="fates"/>
<machine name="derecho" compiler="intel" category="aux_clm"/>
</machines>
<options>
Expand All @@ -4010,7 +4020,6 @@
<machines>
<machine name="derecho" compiler="intel" category="fates"/>
<machine name="izumi" compiler="nag" category="fates"/>
<machine name="lawrencium-lr3" compiler="intel" category="fates"/>
</machines>
<options>
<option name="wallclock">00:40:00</option>
Expand All @@ -4020,7 +4029,6 @@
<test name="ERS_Ld5" grid="f19_g17" compset="I2000Clm45Fates" testmods="clm/FatesCold">
<machines>
<machine name="derecho" compiler="intel" category="fates"/>
<machine name="lawrencium-lr3" compiler="intel" category="fates"/>
</machines>
<options>
<option name="wallclock">00:20:00</option>
Expand All @@ -4030,7 +4038,6 @@
<test name="ERI_Ld60" grid="f45_f45_mg37" compset="I2000Clm50FatesCruRsGs" testmods="clm/Fates">
<machines>
<machine name="derecho" compiler="intel" category="fates"/>
<machine name="lawrencium-lr3" compiler="intel" category="fates"/>
</machines>
<options>
<option name="wallclock">00:40:00</option>
Expand All @@ -4040,7 +4047,6 @@
<test name="ERS_Ld60" grid="f45_f45_mg37" compset="I2000Clm50FatesCruRsGs" testmods="clm/FatesColdNoFire">
<machines>
<machine name="derecho" compiler="intel" category="fates"/>
<machine name="lawrencium-lr3" compiler="intel" category="fates"/>
</machines>
<options>
<option name="wallclock">00:40:00</option>
Expand All @@ -4059,7 +4065,6 @@
<test name="ERS_Ld60" grid="f45_f45_mg37" compset="I2000Clm50FatesCruRsGs" testmods="clm/FatesColdST3">
<machines>
<machine name="derecho" compiler="intel" category="fates"/>
<machine name="lawrencium-lr3" compiler="intel" category="fates"/>
</machines>
<options>
<option name="wallclock">00:20:00</option>
Expand All @@ -4078,7 +4083,6 @@
<test name="ERS_Ld30" grid="f45_f45_mg37" compset="I2000Clm50FatesCruRsGs" testmods="clm/FatesColdFixedBiogeo">
<machines>
<machine name="derecho" compiler="intel" category="fates"/>
<machine name="lawrencium-lr3" compiler="intel" category="fates"/>
</machines>
<options>
<option name="wallclock">00:40:00</option>
Expand All @@ -4087,7 +4091,6 @@
<test name="ERS_Ld30" grid="f45_f45_mg37" compset="I2000Clm50FatesCruRsGs" testmods="clm/FatesColdNoComp">
<machines>
<machine name="derecho" compiler="intel" category="fates"/>
<machine name="lawrencium-lr3" compiler="intel" category="fates"/>
</machines>
<options>
<option name="wallclock">00:40:00</option>
Expand Down Expand Up @@ -4153,7 +4156,6 @@
<test name="ERS_Ld30" grid="f45_f45_mg37" compset="I2000Clm60FatesSpCruRsGs" testmods="clm/FatesColdSatPhen">
<machines>
<machine name="derecho" compiler="intel" category="fates"/>
<machine name="lawrencium-lr3" compiler="intel" category="fates"/>
</machines>
<options>
<option name="wallclock">00:40:00</option>
Expand Down Expand Up @@ -4183,7 +4185,6 @@
<test name="ERS_Ld30" grid="f45_f45_mg37" compset="I2000Clm50FatesCruRsGs" testmods="clm/FatesColdSizeAgeMort">
<machines>
<machine name="derecho" compiler="intel" category="fates"/>
<machine name="lawrencium-lr3" compiler="intel" category="fates"/>
</machines>
<options>
<option name="wallclock">00:40:00</option>
Expand All @@ -4193,7 +4194,6 @@
<test name="SMS_Lm6" grid="f45_f45_mg37" compset="I2000Clm50FatesCruRsGs" testmods="clm/Fates">
<machines>
<machine name="derecho" compiler="intel" category="fates"/>
<machine name="lawrencium-lr3" compiler="intel" category="fates"/>
</machines>
<options>
<option name="wallclock">00:20:00</option>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,4 +34,4 @@ hist_fincl1 = 'FATES_NCOHORTS', 'FATES_TRIMMING', 'FATES_AREA_PLANTS',
'FATES_TRANSITION_MATRIX_LULU',
'FATES_VEGC_LUPF','FATES_NOCOMP_PATCHAREA_LUPF',
'FATES_TVEG_LU','FATES_TSA_LU','FATES_SWABS_LU','FATES_NETLW_LU',
'FATES_SHFLUX_LU','FATES_LHFLUX_LU','FATES_GPP_LU'
'FATES_SHFLUX_LU','FATES_LHFLUX_LU','FATES_GPP_LU'
Original file line number Diff line number Diff line change
@@ -1,13 +1,10 @@
SRCDIR=`./xmlquery SRCROOT --value`
CASEDIR=`./xmlquery CASEROOT --value`
FATESDIR=$SRCDIR/src/fates/

FATESPARAMFILE=$CASEDIR/fates_params_prt2_prescribed_np.json
FATESPARAMFILE=$CASEDIR/fates_params_prt2_prescribed_p.json

cp $FATESDIR/parameter_files/fates_params_default.json $FATESPARAMFILE

$FATESDIR/tools/modify_fates_paramfile.py --overwrite --fin $FATESPARAMFILE --param fates_cnp_prescribed_nuptake --values 1.0 --indices all

$FATESDIR/tools/modify_fates_paramfile.py --overwrite --fin $FATESPARAMFILE --param fates_cnp_prescribed_puptake --values 1.0 --indices all
$FATESDIR/tools/modify_fates_paramfile.py --overwrite --fin $FATESPARAMFILE --param fates_cnp_prescribed_puptake --values 10.0 --indices all

echo "fates_paramfile = '$FATESPARAMFILE'" >> $CASEDIR/user_nl_clm
echo "fates_paramfile = '$FATESPARAMFILE'" >> $CASEDIR/user_nl_clm
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
fates_parteh_mode = 2
fates_parteh_mode = 'carbon_nitrogen'
hist_fincl1 = 'FATES_L2FR','FATES_L2FR_CANOPY_REC_PF','FATES_L2FR_USTORY_REC_PF',
'FATES_NH4UPTAKE_SZPF','FATES_NO3UPTAKE_SZPF','FATES_NEFFLUX_SZPF',
'FATES_NDEMAND_SZPF','FATES_NFIX_SYM_SZPF','FATES_NH4UPTAKE','FATES_NO3UPTAKE',
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
../nofireemis
../cn_conly
../FatesColdPRT2
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
../Fates
../FatesCold
../FatesSetupParamBuild/
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
SRCDIR=`./xmlquery SRCROOT --value`
CASEDIR=`./xmlquery CASEROOT --value`
FATESDIR=$SRCDIR/src/fates/
FATESPARAMFILE=$CASEDIR/fates_params_prt2_prescribed_np.json

cp $FATESDIR/parameter_files/fates_params_default.json $FATESPARAMFILE

$FATESDIR/tools/modify_fates_paramfile.py --overwrite --fin $FATESPARAMFILE --param fates_cnp_prescribed_puptake --values 10.0 --indices all
$FATESDIR/tools/modify_fates_paramfile.py --overwrite --fin $FATESPARAMFILE --param fates_cnp_prescribed_nuptake --values 10.0 --indices all

echo "fates_paramfile = '$FATESPARAMFILE'" >> $CASEDIR/user_nl_clm
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
fates_parteh_mode = 'carbon_nitrogen'
hist_fincl1 = 'FATES_L2FR','FATES_L2FR_CANOPY_REC_PF','FATES_L2FR_USTORY_REC_PF',
'FATES_NH4UPTAKE_SZPF','FATES_NO3UPTAKE_SZPF','FATES_NEFFLUX_SZPF',
'FATES_NDEMAND_SZPF','FATES_NFIX_SYM_SZPF','FATES_NH4UPTAKE','FATES_NO3UPTAKE',
'FATES_NEFFLUX','FATES_NDEMAND','FATES_NFIX_SYM','FATES_STOREN','FATES_STOREN_TF',
'FATES_VEGN','FATES_SAPWOODN','FATES_LEAFN','FATES_FROOTN','FATES_REPRON','FATES_VEGN_SZPF',
'FATES_LEAFN_SZPF','FATES_FROOTN_SZPF','FATES_SAPWOODN_SZPF','FATES_STOREN_SZPF','FATES_STOREN_TF_CANOPY_SZPF',
'FATES_STOREN_TF_USTORY_SZPF','FATES_REPRON_SZPF','FATES_STOREP','FATES_STOREP_TF','FATES_VEGP','FATES_SAPWOODP',
'FATES_LEAFP','FATES_FROOTP','FATES_REPROP','FATES_PUPTAKE','FATES_PEFFLUX','FATES_PDEMAND',
'FATES_VEGP_SZPF','FATES_LEAFP_SZPF','FATES_FROOTP_SZPF','FATES_SAPWOODP_SZPF','FATES_STOREP_SZPF',
'FATES_STOREP_TF_CANOPY_SZPF','FATES_STOREP_TF_USTORY_SZPF','FATES_REPROP_SZPF','FATES_PUPTAKE_SZPF',
'FATES_PEFFLUX_SZPF','FATES_PDEMAND_SZPF'
Loading
Loading