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
14 changes: 14 additions & 0 deletions cime_config/testdefs/ExpectedTestFails.xml
Original file line number Diff line number Diff line change
Expand Up @@ -191,6 +191,20 @@
<issue>ESCOMP/mizuRoute#613</issue>
</phase>
</test>

<test name="SMS_D_Ld5.5x5_amazon_rHDMA.I2000Clm60SpMizGs.derecho_gnu.mizuroute-default">
<phase name="NLCOMP">
<status>FAIL</status>
<issue>ESMCI/cime#4966</issue>
</phase>
</test>

<test name="SMS_D_Ld5.5x5_amazon_rHDMA.I2000Clm60SpMizGs.derecho_intel.mizuroute-default">
<phase name="NLCOMP">
<status>FAIL</status>
<issue>ESMCI/cime#4966</issue>
</phase>
</test>

<test name="SMS_D_Ld5.5x5_amazon_rHDMA.I2000Clm60SpMizGs.izumi_nag.mizuroute-default">
<phase name="MODEL_BUILD">
Expand Down
43 changes: 43 additions & 0 deletions doc/ChangeLog
Original file line number Diff line number Diff line change
@@ -1,4 +1,47 @@
===============================================================
Tag name: ctsm5.4.034
Originator(s): afoster (Adrianna Foster,UCAR/TSS,303-497-1728)
Date: Wed Apr 22 11:02:13 AM MDT 2026
One-line Summary: bug fix to the FATES land use driver input code

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

This PR includes a cherry-picked fix from NorESMhub/CTSM#209 to address swap in the
order of rangeland and pasture in the reading of the landuse drivers


Bugs fixed
----------

List of CTSM issues fixed (include CTSM Issue # and description):
Resolves FATES https://github.com/NGEET/fates/issues/1551


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

Added 2 new expected fails for mizuroute NLCOMP DIFFs.


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

Changes answers relative to baseline:

Landuse tests are not B4B, otherwise B4B

===============================================================
===============================================================
Tag name: ctsm5.4.033
Originator(s): glemieux (Gregory Lemieux, LBNL, glemieux@lbl.gov)
Date: Fri Apr 17 10:39:02 AM 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.034 afoster 04/22/2026 bug fix to the FATES land use driver input code
ctsm5.4.033 glemieux 04/17/2026 Update fates tag with missing land use data check fix
ctsm5.4.032 samrabin 04/10/2026 Simplify doc build messaging.
ctsm5.4.031 samrabin 04/09/2026 b4b-dev merge 2026-04-09
Expand Down
2 changes: 1 addition & 1 deletion src/utils/clmfates_interfaceMod.F90
Original file line number Diff line number Diff line change
Expand Up @@ -3939,7 +3939,7 @@ subroutine GetLandusePFTData(bounds, landuse_pft_file, landuse_pft_map, landuse_

! Land use name arrays
character(len=10), parameter :: landuse_pft_map_varnames(num_landuse_pft_vars) = &
[character(len=10) :: 'frac_primr','frac_secnd','frac_pastr','frac_range'] !need to move 'frac_surf' to a different variable
[character(len=10) :: 'frac_primr','frac_secnd','frac_range','frac_pastr'] !need to move 'frac_surf' to a different variable

character(len=*), parameter :: subname = 'GetLandusePFTData'

Expand Down
Loading