Merge b4bdev 20250220 #2971
Open
Merge b4bdev 20250220 #2971
+199
−193
Conversation
This file contains 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
merge b4b-dev
Merge master 20250208
Reduce log noise
# Conflicts: # python/ctsm/site_and_regional/run_tower.py
…ents run_tower fixes and improvements
Simplify run_tower tower types
FATES default parameter file update
This tag updates the default parameter file for FATES bringing in a
number of updates:
- adds parameters for land use grazing
- updates the FATES z0mr turbulence parameters for consistency with
CLM
- adds FATES pft-dependent btran model switches for a forthcoming
update
- updates the default hydro solver switch to Picard 2D
This also updates the default FATES tag which includes two issue fixes
and introduces
the aforementioned land use grazing capability.
samsrabin
approved these changes
Feb 21, 2025
TeaganKing
approved these changes
Feb 24, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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
Merge b4b-dev branch to master
Work on reducing log noise. Run tower fixes, and simplify tower types.
Two new command line options to run_tower:
--no-inputdata-check option implies --setup-only but skips the check/download of input data. This is used instead of --setup-only in run_tower system testing for a speedup of ~20%.
--xmlchange option allows user to specify xmlchange settings to apply. E.g., --xmlchange CLM_CO2_TYPE=constant,CCSM_CO2_PPMV=850.
Pull Requests Brought In:
#2969
#2963
#2927
Specific notes
Contributors other than yourself, if any: @samsrabin @adrifoster
CTSM Issues Fixed (include github issue #):
Are answers expected to change (and if so in what way)?
Any User Interface Changes (namelist or namelist defaults changes)?
Does this create a need to change or add documentation? Did you do so?
Testing performed, if any: Will run regular testing