ctsm5.3.065: Merge b4bdev 20250725 #3353
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
… it in so it is consistent across all ranks when not using the default value ('nn').
… it in so it is consistent across all ranks when not using the default value ('nn').
…s/CTSM into fix_urbantvmapalgo_broadcast Conflicts: .git-blame-ignore-revs doc/ChangeLog doc/ChangeSum
…rrently used at ultra-high res (largely to get around an issue we had with online regridding here, which can be another approach taken later)
…than the MCT namelist list fixing ESCOMP#1912
…options for mapping are used
…s/CTSM into fix_urbantvmapalgo_broadcast Conflicts: bld/namelist_files/namelist_definition_ctsm.xml
modified: bld/namelist_files/namelist_definition_drv_flds.xml modified: src/biogeochem/VOCEmissionMod.F90
modified: bld/namelist_files/namelist_definition_drv_flds.xml
modified: bld/CLMBuildNamelist.pm
modified: bld/namelist_files/namelist_definition_ctsm.xml
modified: src/biogeochem/VOCEmissionMod.F90
modified: src/main/clm_instMod.F90
Resolves ESCOMP#3316
Merge b4b-dev to master
Merge ctsm5.3.063 into b4b-dev
Remove flexCN_FUN_BNF test and testmods as redundant.
…the code so they can be used, also do some veritical alignment for the mapalgo options which should help readability for this text for users
…roadcast Adds a broadcast of the namelist value 'urbantvmapalgo'
Fix a self-test
Conflicts: bld/unit_testers/build-namelist_test.pl
Isoprene soil moisture options for MEGAN
Add time dimension to *1d_wt* fields that change in transient simulations Add namelist variable vars_1d_w_time that defaults true in transient runs and false in non-transient. User may change it to true in non-transient, but they will get an error if they change to false in transient.
ekluzek
added
priority: high
Collaborator
Author
|
Testing is as expected on Izumi and Derecho. There are 53 tests on Derecho and 5 on Izumi with a so called "answer change", because the field lists differ, but this is expected. |
slevis-lmwg
approved these changes
Jul 25, 2025
Contributor
slevis-lmwg
left a comment
slevis-lmwg
left a comment
There was a problem hiding this comment.
I browsed quickly and approved, as each contributing PR should have gone through the review/approval process already.
Thank you @ekluzek!
Collaborator
Author
|
I still get #3205 when running the python tests, even with completely removing my ctsm_pylib environment and reinstalling using py_lib_create. I'll look this over with people at the standup to see if we can figure it out. |
github-project-automation
bot
moved this from Todo
to Done
in LMWG: Sprint Planning Board
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
7 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description of changes
Implement namelist options for soil moisture activation factor used in MEGAN isoprene emissions.
Adds a GitHub issue template for things related to documentation.
Fixes a self-test.
Adds a broadcast of the namelist value for a few mapalgo items after reading it in so it is consistent across all ranks when not using the default value. Also update the mapalgo options list to be consistent with the NUOPC options, the MCT list was in place before this.
Update submodules so we are using the latest in cesm development for cesm3_0_alpha07b.
Harden github actions to improve security (use a hash, rather than a tag, reduce permissions to readonly when possible)
Update SpinupStability scripts for h0->h0a transition (backwards compatible).
Update run_clm_historical script for nuopc, extension through 2023, produces restart files for 1979 and 2000, and h0->h0a transition (backwards compatible).
Remove flexCN_FUN_BNF test and testmods as redundant
Fix string replacements in lreprstruct test:
The previous logic caused problems if "GRAIN" appeared in two (or more) strings, where one was a substring of the other. For example, in LREPRSTRUCT_Ly1_P128x1.f10_f10_mg37.I1850Clm50BgcCrop.derecho_gnu.clm-ciso--clm-cropMonthOutput, before this replacement, one line contained 'GRAINN_TO_FOOD' and a later line contained (among other things) "'GRAINN_TO_FOOD_PERHARV', 'GRAINN_TO_FOOD_ANN'". This was problematic because the first replacement of GRAINN_TO_FOOD incorrectly led to replacements in the later strings as well.
Two new CTSM megan_opts namelist items:
megan_use_gamma_sm
megan_min_gamma_sm
Fix the list of options for the mapalgo namelist items:
Remove nnonj, nnoni, spval, copy
Add: consf, consd, none
List of PR's:
Specific notes
Contributors other than yourself, if any: @samrabin @billsacks @olyson @slevis-lmwg
CTSM Issues Fixed (include github issue #):
Fixes #3316
Work on #3016
Fixes #2533
Fixes #3345
Fixes #1912
Fixes #3303
Fixes #2983
Fixes #3316
Fixes #3313
Are answers expected to change (and if so in what way)? No
Any User Interface Changes (namelist or namelist defaults changes)? Yes
Does this create a need to change or add documentation? Did you do so? No No
Testing performed, if any: regular aux_clm on Derecho and Izumi