diff --git a/Externals_CLM.cfg b/Externals_CLM.cfg
index 378992c777..866b9ac5b2 100644
--- a/Externals_CLM.cfg
+++ b/Externals_CLM.cfg
@@ -2,7 +2,7 @@
local_path = src/fates
protocol = git
repo_url = https://github.com/NGEET/fates
-tag = sci.1.72.2_api.34.0.0
+tag = sci.1.73.0_api.35.0.0
required = True
[externals_description]
diff --git a/bld/CLMBuildNamelist.pm b/bld/CLMBuildNamelist.pm
index eb34ac916f..fb44023cd5 100755
--- a/bld/CLMBuildNamelist.pm
+++ b/bld/CLMBuildNamelist.pm
@@ -4546,6 +4546,10 @@ sub setup_logic_fates {
if ( $nl->get_value('fates_spitfire_mode') > 0 ) {
$log->fatal_error('fates_spitfire_mode can NOT be set to greater than 0 when use_fates_sp is true');
}
+ # hydro isn't currently supported to work when FATES SP mode is active
+ if (&value_is_true( $nl->get_value('use_fates_planthydro') )) {
+ $log->fatal_error('fates sp mode is currently not supported to work with fates hydro');
+ }
}
}
my $var = "use_fates_inventory_init";
diff --git a/bld/namelist_files/namelist_defaults_ctsm.xml b/bld/namelist_files/namelist_defaults_ctsm.xml
index ecced7a6e2..147a23f49a 100644
--- a/bld/namelist_files/namelist_defaults_ctsm.xml
+++ b/bld/namelist_files/namelist_defaults_ctsm.xml
@@ -480,7 +480,7 @@ attributes from the config_cache.xml file (with keys converted to upper-case).
-lnd/clm2/paramdata/fates_params_api.32.0.0_12pft_c231215.nc
+lnd/clm2/paramdata/fates_params_api.35.0.0_12pft_c240326.nc
diff --git a/bld/unit_testers/build-namelist_test.pl b/bld/unit_testers/build-namelist_test.pl
index c8875090cd..7b654337af 100755
--- a/bld/unit_testers/build-namelist_test.pl
+++ b/bld/unit_testers/build-namelist_test.pl
@@ -163,7 +163,7 @@ sub cat_and_create_namelistinfile {
#
# Figure out number of tests that will run
#
-my $ntests = 2511;
+my $ntests = 2513;
if ( defined($opts{'compare'}) ) {
$ntests += 1545;
@@ -1023,6 +1023,16 @@ sub cat_and_create_namelistinfile {
GLC_TWO_WAY_COUPLING=>"FALSE",
phys=>"clm4_5",
},
+ "usespitfireusefatessp" =>{ options=>"-envxml_dir . --bgc fates",
+ namelst=>"fates_spitfire_mode=1,use_fates_sp=.true.",
+ GLC_TWO_WAY_COUPLING=>"FALSE",
+ phys=>"clm5_0",
+ },
+ "usefatesspusefateshydro" =>{ options=>"-envxml_dir . --bgc fates",
+ namelst=>"use_fates_sp=.true.,use_fates_planthydro=.true.",
+ GLC_TWO_WAY_COUPLING=>"FALSE",
+ phys=>"clm5_0",
+ },
"useloggingButNOTFATES" =>{ options=>"-envxml_dir . -no-megan",
namelst=>"use_fates_logging=.true.",
GLC_TWO_WAY_COUPLING=>"FALSE",
diff --git a/cime_config/testdefs/ExpectedTestFails.xml b/cime_config/testdefs/ExpectedTestFails.xml
index fe6a54c221..3365565a5e 100644
--- a/cime_config/testdefs/ExpectedTestFails.xml
+++ b/cime_config/testdefs/ExpectedTestFails.xml
@@ -58,13 +58,6 @@
-
-
- FAIL
- #1733
-
-
-
FAIL
@@ -197,13 +190,6 @@
-
-
- FAIL
- FATES#701
-
-
-
FAIL
@@ -233,7 +219,7 @@
-
+ FAILFATES#1089
@@ -247,31 +233,31 @@
-
-
+
+ FAIL
- #2325
+ #2423
-
+ FAIL#2325
-
+ FAIL#2325
-
+ FAIL
- #2478
+ #2325
diff --git a/cime_config/testdefs/testlist_clm.xml b/cime_config/testdefs/testlist_clm.xml
index 05526b3529..c2a90507ba 100644
--- a/cime_config/testdefs/testlist_clm.xml
+++ b/cime_config/testdefs/testlist_clm.xml
@@ -2654,24 +2654,24 @@
-
+
-
+
-
+
-
+
@@ -3665,6 +3665,16 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/doc/ChangeLog b/doc/ChangeLog
index 671f5020de..e5c2466085 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,4 +1,121 @@
===============================================================
+Tag name: ctsm5.2.002
+Originator(s): glemieux (Gregory Lemieux, LBNL, glemieux@lbl.gov)
+Date: Fri 26 Apr 2024 11:13:46 AM MDT
+One-line Summary: FATES default allometry parameter file update
+
+Purpose and description of changes
+----------------------------------
+
+This updates the default FATES parameter file which includes a number
+of changes:
+
+ - Default global tree pft allometry update
+ - New allometric mode options
+ - New scaling coefficients for alternative leaf maintenance respiration
+ - New switch to control the use of host land model day length scaling factor
+
+This also incorporates some testing additions and clean up, including:
+
+ - Removes cheyenne expected failure tests that have been converted to derecho
+ - Adds a 5x5_amazon test to aux_clm and the expected failures list
+ - Temporarilry converts a fates 5x5_amazon test to f10 test
+ - Adds namelist check and corresponding unit test to make sure fates hydro
+ and fates satellite phenology mode can not be used together
+
+The FATES externals tag is also updated which includes a number of bug fixes
+and the addition of new history output.
+
+
+Significant changes to scientifically-supported configurations
+--------------------------------------------------------------
+
+Does this tag change answers significantly for any of the following physics configurations?
+(Details of any changes will be given in the "Answer changes" section below.)
+
+ [Put an [X] in the box for any configuration with significant answer changes.]
+
+[ ] clm6_0
+
+[ ] clm5_1
+
+[ ] clm5_0
+
+[ ] ctsm5_0-nwp
+
+[ ] clm4_5
+
+
+Notes of particular relevance for users
+---------------------------------------
+
+Caveats for users (e.g., need to interpolate initial conditions):
+ NOTE: FATES hydro mode and FATES satellite phenology mode can not
+ be used in conjunction as of this API update
+
+Changes made to namelist defaults (e.g., changed parameter values):
+ FATES parameter file default updated to fates_params_api.35.0.0_12pft_c240326.nc
+
+
+Notes of particular relevance for developers:
+---------------------------------------------
+Changes to tests or testing:
+ A 5x5_amazon smoke test, not using MPI-serial has been added to the test list
+ and list of expected failures to track issue #2423.
+ Out-of-date cheyenne tests on the expected failure list have been removed.
+
+
+Testing summary:
+----------------
+
+ [PASS means all tests PASS; OK means tests PASS other than expected fails.]
+
+ build-namelist tests (if CLMBuildNamelist.pm has changed):
+
+ derecho - PASS
+
+ regular tests (aux_clm: https://github.com/ESCOMP/CTSM/wiki/System-Testing-Guide#pre-merge-system-testing):
+
+ derecho ----- OK
+ izumi ------- OK
+
+ fates tests: (give name of baseline if different from CTSM tagname, normally fates baselines are fates--)
+
+ derecho ----- OK
+ izumi ------- OK
+
+
+Answer changes
+--------------
+
+Changes answers relative to baseline: Yes, only for FATES configurations
+
+ Summarize any changes to answers, i.e.,
+ - what code configurations: FATES
+ - what platforms/compilers: ALL
+ - nature of change (roundoff; larger than roundoff/same climate; new climate): larger than roundoff
+
+ The FATES externals update incorporates a number of bug fixes and the new allometry default
+ paramters result in a new scientific baseline.
+
+
+Other details
+-------------
+
+List any externals directories updated (cime, rtm, mosart, cism, fates, etc.):
+ FATES: sci.1.72.2_api.34.0.0 -> sci.1.73.0_api.35.0.0
+
+Pull Requests that document the changes (include PR ids):
+(https://github.com/ESCOMP/ctsm/pull)
+
+#2436 -- FATES API35 parameter file update
+NGEET#1093 -- Update default allometry parameters for tree PFTs
+NGEET#1128 -- New allometric modes
+NGEET#1149 -- Alternative vertical scaling of leaf maintenance respiration
+NGEET#1161 -- Adding day length factor switch
+
+===============================================================
+===============================================================
Tag name: ctsm5.2.001
Originator(s): erik (Erik Kluzek,UCAR/TSS,303-497-1326)
Date: Mon 22 Apr 2024 02:10:55 PM MDT
diff --git a/doc/ChangeSum b/doc/ChangeSum
index 2451783ec2..40033a7d6f 100644
--- a/doc/ChangeSum
+++ b/doc/ChangeSum
@@ -1,5 +1,6 @@
Tag Who Date Summary
============================================================================================================================
+ ctsm5.2.002 glemieux 04/26/2024 FATES default allometry parameter file update
ctsm5.2.001 erik 04/22/2024 Merge b4b-dev
ctsm5.2.0 many 04/20/2024 New mksurfdata_esmf tool to create new surface datasets that are in place
ctsm5.1.dev176 afoster 04/04/2024 Merge b4b-dev