Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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.7_api.46.0.0
fxtag = sci.1.93.3_api.47.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
50 changes: 50 additions & 0 deletions doc/ChangeLog
Original file line number Diff line number Diff line change
@@ -1,4 +1,54 @@
===============================================================
Tag name: ctsm5.4.066
Originator(s): rgknox (Ryan Knox, LAWRENCE BERKELEY NATIONAL LABORATORY, rgknox@lbl.gov)
Date: Sat Oct 24 11:19:11 PM MDT 2026
One-line Summary: Add bc_out to FATES restart and remove litter flux recalculations

Purpose and description of changes
----------------------------------

This is a bug fix for mass fluxes between fates and ctsm with N-limitations turned on.
This set of changes cleans up how litter fluxes are updated and restarted in FATES

Bugs fixed
----------
List of CTSM issues fixed (include CTSM Issue # and description) [one per line]:
ngeet/fates#1607


Testing summary:
----------------

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-<FATES TAG>-<CTSM TAG>)
derecho ----- OK
izumi ------- OK


Answer changes
--------------

Changes answers relative to baseline: Yes, but only for one FATES testmod

Expected DIFF in FATES_MEANLIQVOL_DROUGHTPHEN_PF and FATES_MEANSMP_DROUGHTPHEN_PF only
due to ngeet/fates#1389 (sci.1.92.11_api.46.0.0).

Other details
-------------
List any git submodules updated (cime, rtm, mosart, cism, fates, etc.):
fates: sci.1.92.7_api.46.0.0 -> sci.1.93.3_api.47.0.0

Pull Requests that document the changes (include PR ids):
(https://github.com/ESCOMP/ctsm/pull)
https://github.com/ESCOMP/CTSM/pull/4233
https://github.com/NGEET/fates/pull/1611

===============================================================
===============================================================
Tag name: ctsm5.4.064
Originator(s): samrabin (Sam Rabin, UCAR/TSS)
Date: Fri Oct 16 16:11:46 MDT 2026
Expand Down
1 change: 1 addition & 0 deletions doc/ChangeSum
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
Tag Who Date Summary
============================================================================================================================
ctsm5.4.066 rgknox 10/24/2026 Add bc_out to FATES restart and remove litter flux recalculations
ctsm5.4.064 samrabin 10/16/2026 b4b-dev merge 2026-10-15
ctsm5.4.063 slevis 10/06/2026 Move CTSM tests from t232 to t233
ctsm5.4.062 slevis 10/02/2026 Merge b4b-dev to master
Expand Down
12 changes: 4 additions & 8 deletions src/utils/clmfates_interfaceMod.F90
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,6 @@ module CLMFatesInterfaceMod
use EDCanopyStructureMod , only : UpdateFatesAvgSnowDepth
use FatesPlantRespPhotosynthMod, only : FatesPlantRespPhotosynthDrive
use EDAccumulateFluxesMod , only : AccumulateFluxes_ED
use FatesSoilBGCFluxMod , only : FluxIntoLitterPools
use FatesSoilBGCFluxMod , only : UnPackNutrientAquisitionBCs
use FatesPlantHydraulicsMod, only : hydraulics_drive
use FatesPlantHydraulicsMod, only : HydrSiteColdStart
Expand Down Expand Up @@ -1506,11 +1505,6 @@ subroutine UpdateCLitterFluxes(this,soilbiogeochem_carbonflux_inst,ci,c)

if ( .not. use_fates_sp ) then


call FluxIntoLitterPools(this%fates(ci)%sites(s), &
this%fates(ci)%bc_in(s), &
this%fates(ci)%bc_out(s))

! (gC/m3/timestep)
cf_soil%decomp_cpools_sourcesink_col(c,1:nlevdecomp,i_met_lit) = &
cf_soil%decomp_cpools_sourcesink_col(c,1:nlevdecomp,i_met_lit) + &
Expand Down Expand Up @@ -1939,7 +1933,9 @@ subroutine restart( this, bounds_proc, ncid, flag, waterdiagnosticbulk_inst, &
do nc = 1, nclumps
if (this%fates(nc)%nsites>0) then
call this%fates_restart%set_restart_vectors(nc,this%fates(nc)%nsites, &
this%fates(nc)%sites,this%fates(nc)%bc_in)
this%fates(nc)%sites, &
this%fates(nc)%bc_in, &
this%fates(nc)%bc_out)
end if
end do
!$OMP END PARALLEL DO
Expand Down Expand Up @@ -2027,7 +2023,7 @@ subroutine restart( this, bounds_proc, ncid, flag, waterdiagnosticbulk_inst, &
this%fates(nc)%bc_out)

call this%fates_restart%get_restart_vectors(nc, this%fates(nc)%nsites, &
this%fates(nc)%sites,this%fates(nc)%bc_in )
this%fates(nc)%sites,this%fates(nc)%bc_in,this%fates(nc)%bc_out)

! I think ed_update_site and update_hlmfates_dyn are doing some similar
! update type stuff, should consolidate (rgk 11-2016)
Expand Down
Loading