diff --git a/Externals_CLM.cfg b/Externals_CLM.cfg
index 61e2a29f85..cab31b6b7f 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.68.1_api.29.0.0
+tag = sci.1.68.2_api.30.0.0
required = True
[externals_description]
diff --git a/cime_config/testdefs/ExpectedTestFails.xml b/cime_config/testdefs/ExpectedTestFails.xml
index 8e72abb8eb..b696fadcf2 100644
--- a/cime_config/testdefs/ExpectedTestFails.xml
+++ b/cime_config/testdefs/ExpectedTestFails.xml
@@ -57,6 +57,13 @@
+
+
+ FAIL
+ #2236
+
+
+
diff --git a/cime_config/testdefs/testlist_clm.xml b/cime_config/testdefs/testlist_clm.xml
index ec18a504ed..34c2cc33f9 100644
--- a/cime_config/testdefs/testlist_clm.xml
+++ b/cime_config/testdefs/testlist_clm.xml
@@ -1562,6 +1562,19 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/doc/ChangeLog b/doc/ChangeLog
index a5eba5e49e..66fc04a752 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,4 +1,78 @@
===============================================================
+Tag name: ctsm5.1.dev151
+Originator(s): rgknox (Ryan Knox,LAWRENCE BERKELEY NATIONAL LABORATORY,510-495-2153)
+Date: Sat Nov 11 16:53:01 MST 2023
+One-line Summary: Fixes to FATES long run restarts
+
+Purpose and description of changes
+----------------------------------
+
+This is a set of changes that enables exact restart tests to pass with FATES, for
+ longer periods, particularly those that have elapsed over a year.
+ We removed calls that were incrementing, uncecessary calls, and added key new
+ variables to the restart file (such as the leaf layer carbon balance vector).
+
+Collaborators: @mvdebolskiy, @mvertens, @glemieux, @ekluzek, @ckoven, @rosiealice
+
+Significant changes to scientifically-supported configurations
+--------------------------------------------------------------
+
+No changes to scientifically-supported configurations.
+
+Bugs fixed or introduced
+------------------------
+
+Fixes: FATES#1051 https://github.com/NGEET/fates/issues/1051
+
+Notes of particular relevance for users
+---------------------------------------
+
+This set of changes is introduced, while there is a known test failure in:
+ERS_Lm20_Mmpi-serial.1x1_smallvilleIA.I2000Clm50BgcCropQianRs.izumi_gnu.clm-cropMonthlyNoinitial
+
+This is documented in issue: 2236 and a fix is slated for integration. The nature of the changes
+ in this PR where obviously orthogonal to the issue.
+
+Substantial timing or memory changes: None
+
+
+Notes of particular relevance for developers:
+---------------------------------------------
+
+A new test was added to aux_clm and fates test suites. The walltime for this test
+ was 29 minutes. This is an important new test for FATES because it is the
+ first gridded test that spans significantly over a year (and passes). Various test
+ configurations were explored to find a gridded test that completed 25 months
+ with some attempt at expedience in walltime. A walltime
+ allowance of 60 minutes is set in the test. Here is the test:
+ ERS_P144x1_Lm25.f10_f10_mg37.I2000Clm51Fates clm-FatesColdNoComp
+
+
+Testing summary:
+----------------
+ regular tests:
+
+ cheyenne ---- ok
+ izumi ------- ok
+
+Answer changes
+--------------
+
+No answer changes
+
+Other details
+-------------
+
+List any externals directories updated (cime, rtm, mosart, cism, fates, etc.): fates API30
+
+Pull Requests that document the changes (include PR ids):
+
+https://github.com/ESCOMP/CTSM/pull/2199
+https://github.com/NGEET/fates/pull/1098
+
+
+===============================================================
+===============================================================
Tag name: ctsm5.1.dev150
Originator(s): rgknox (Ryan Knox,LAWRENCE BERKELEY NATIONAL LABORATORY,510-495-2153)
Date: Mon Nov 6 14:12:37 MST 2023
diff --git a/doc/ChangeSum b/doc/ChangeSum
index ecaa21c598..9ef20790d9 100644
--- a/doc/ChangeSum
+++ b/doc/ChangeSum
@@ -1,5 +1,6 @@
Tag Who Date Summary
============================================================================================================================
+ ctsm5.1.dev151 rgknox 11/11/2023 Fixes to FATES long run restarts
ctsm5.1.dev150 rgknox 11/06/2023 FATES API fix to support future fates npp-fixation coupling, and urgent coupling fixes with E3SM.
ctsm5.1.dev149 samrabin 11/03/2023 Rearrange leaf/stem "harvest" and fix soil gas diffusivity
ctsm5.1.dev148 samrabin 11/03/2023 Add GRAINN outputs
diff --git a/src/utils/clmfates_interfaceMod.F90 b/src/utils/clmfates_interfaceMod.F90
index 6f6b2cb6fd..4b9ce297ed 100644
--- a/src/utils/clmfates_interfaceMod.F90
+++ b/src/utils/clmfates_interfaceMod.F90
@@ -1087,7 +1087,8 @@ subroutine dynamics_driv(this, nc, bounds_clump, &
call ed_update_site(this%fates(nc)%sites(s), &
this%fates(nc)%bc_in(s), &
- this%fates(nc)%bc_out(s))
+ this%fates(nc)%bc_out(s), &
+ is_restarting = .false.)
enddo
@@ -1764,9 +1765,17 @@ subroutine restart( this, bounds_proc, ncid, flag, waterdiagnosticbulk_inst, &
this%fates(nc)%bc_in(s)%max_rooting_depth_index_col = &
min(this%fates(nc)%bc_in(s)%nlevsoil, active_layer_inst%altmax_lastyear_indx_col(c))
+ ! When restarting the model, this subroutine has several
+ ! procedures that are incremental or don't need to be performed for
+ ! during the restart sequence. For the prior, we don't want the restarted
+ ! run to call these routines more than would had been called during
+ ! a continuous simulation period, as it would change results. So
+ ! we pass in the "is_restarting=.true." flag so we can bypass those procedures
+
call ed_update_site( this%fates(nc)%sites(s), &
this%fates(nc)%bc_in(s), &
- this%fates(nc)%bc_out(s) )
+ this%fates(nc)%bc_out(s), &
+ is_restarting = .true. )
end do
@@ -1995,7 +2004,8 @@ subroutine init_coldstart(this, waterstatebulk_inst, waterdiagnosticbulk_inst, &
call ed_update_site(this%fates(nc)%sites(s), &
this%fates(nc)%bc_in(s), &
- this%fates(nc)%bc_out(s))
+ this%fates(nc)%bc_out(s), &
+ is_restarting = .false.)
end do