Skip to content

ctsm5.4.048: Merge b4bdev 20260727 - #4140

Merged
ekluzek merged 94 commits into
ESCOMP:masterfrom
ekluzek:merge-b4bdev-20260727
Jul 31, 2026
Merged

ctsm5.4.048: Merge b4bdev 20260727#4140
ekluzek merged 94 commits into
ESCOMP:masterfrom
ekluzek:merge-b4bdev-20260727

Conversation

@ekluzek

@ekluzek ekluzek commented Jul 27, 2026

Copy link
Copy Markdown
Contributor

Description of changes

Bring b4b-dev to master.

Documentation updates:

  • FATES
  • Hydrology
  • Dry-deposition

Code changes:

  • Comment out failing fields so all_hist_vars tests actually work
  • Add more history variables even for calc_human_stress_indices==FAST
  • Make nc3crop and nc3irrig private to pftconMod, add some functions to determine: is_crop, is_bare, is_generic_crop, is_prognostic_crop, is_irrigated

Specific notes

Contributors other than yourself, if any:

CTSM issues resolved or otherwise addressed, if any:

PR's being merged in:

Any user interface changes (namelist or namelist defaults changes)?

Testing planned or performed, if any: regular

  • build-namelist
  • python
  • aux_clm Derecho
  • aux_clm Izumi

Requirements before merge:

  • The code in this PR branch builds with no errors.
  • The code in this PR branch runs with no errors. Briefly describe tested configuration(s):
  • This either (a) does not change answers, (b) it only changes answers at roundoff level, or (c) I have performed a scientific evaluation of the answer changes. Which?: a
  • I have reviewed relevant parts of the CLM documentation Tech Note or User's Guide to determine if anything needs to be changed or added. If it does, describe:
  • This PR either (a) does not create a need to update the documentation or (b) includes required documentation updates (see guidelines for contributing documentation). Which?: a

olyson and others added 30 commits January 22, 2026 09:15
Replace "alpha's" with "alpha coefficients"
Replace ephemeral eq. number with permanent description
Replace another ephemeral eq. number with permanent description
Replace one more ephemeral eq. number with permanent description
Regular merge of b4b-dev branch into master. Includes just one PR:

ESCOMP#3666: b4b: Move the changes to initialize the task decomposition from mpi_scan to main development
Review of Docs 2.29. Dynamic Global Vegetation and FATES
@ekluzek ekluzek self-assigned this Jul 27, 2026
@ekluzek ekluzek added enhancement new capability or improved behavior of existing capability priority: high High priority to fix/merge soon, e.g., because it is a problem in important configurations b4b bit-for-bit labels Jul 27, 2026
Comment thread cime_config/testdefs/ExpectedTestFails.xml
@ekluzek

ekluzek commented Jul 28, 2026

Copy link
Copy Markdown
Contributor Author

Testing is finally almost finished, and is looking as expected so far.

@ekluzek
ekluzek requested a review from slevis-lmwg July 28, 2026 21:16

@slevis-lmwg slevis-lmwg left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you @ekluzek!

@ekluzek

ekluzek commented Jul 29, 2026

Copy link
Copy Markdown
Contributor Author

These tests show changes to the fieldlists compared to baseline that I'm not sure is expected:

LCISO_Ld396.f10_f10_mg37.IHistClm60BgcCrop.derecho_intel.clm-ciso_monthly--clm-matrixcnOn_ignore_warnings.GC.ctsm5448acl_int
LCISO_Ld396.f10_f10_mg37.IHistClm60BgcCrop.derecho_intel.clm-ciso_monthly.GC.ctsm5448acl_int
LGRAIN2_Ly1_P128x1.f10_f10_mg37.I1850Clm50BgcCrop.derecho_gnu.clm-ciso--clm-cropMonthOutput.GC.ctsm5448acl_gnu
LGRAIN2_Ly2_P128x1.f10_f10_mg37.I1850Clm45BgcCrop.derecho_gnu.clm-ciso--clm-cropMonthOutput.GC.ctsm5448acl_gnu
LREPRSTRUCT_Ly1_P128x1.f10_f10_mg37.I1850Clm50BgcCrop.derecho_gnu.clm-ciso--clm-cropMonthOutput.GC.ctsm5448acl_gnu
LREPRSTRUCT_Ly2_P128x1.f10_f10_mg37.I1850Clm45BgcCrop.derecho_gnu.clm-ciso--clm-cropMonthOutput.GC.ctsm5448acl_gnu
LWISO_Ld10.f10_f10_mg37.I2000Clm50BgcCrop.derecho_gnu.clm-coldStart.GC.ctsm5448acl_gnu

OK, this is expected. I had looked in the ctsm5.4.047 tests and didn't see this signal, because a lot of the tests had been scrubbed.

@ekluzek ekluzek changed the title Merge b4bdev 20260727 ctsm5.4.048: Merge b4bdev 20260727 Jul 29, 2026
@github-project-automation github-project-automation Bot moved this to Ready to start (or start again) in CTSM: Upcoming tags Jul 29, 2026
@github-project-automation github-project-automation Bot moved this from Ready to start (or start again) to In progress - master in CTSM: Upcoming tags Jul 29, 2026
@ekluzek ekluzek moved this from Todo to In Progress in LMWG: Sprint Planning Board Jul 29, 2026
Comment thread cime_config/usermods_dirs/clm/PLUMBER2/defaults/shell_commands
ekluzek added 3 commits July 31, 2026 14:36
…an 78 PFTs should be removed by issue ESCOMP#4120, tested that this compiles/runs with SMS_D.f10_f10_mg37.I2000Clm60BgcCrop.derecho_intel.clm-crop
@ekluzek
ekluzek merged commit 41db637 into ESCOMP:master Jul 31, 2026
7 checks passed
@github-project-automation github-project-automation Bot moved this from In progress - master to Done (non release/external) in CTSM: Upcoming tags Jul 31, 2026
@github-project-automation github-project-automation Bot moved this from In Progress to Done in LMWG: Sprint Planning Board Jul 31, 2026
@ekluzek
ekluzek deleted the merge-b4bdev-20260727 branch July 31, 2026 20:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

b4b bit-for-bit enhancement new capability or improved behavior of existing capability priority: high High priority to fix/merge soon, e.g., because it is a problem in important configurations

Projects

Status: Done (non release/external)
Status: Done

5 participants