Merge master 20241230 to b4b-dev #2918
Merged
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
Update surface datasets, CN Matrix, CLM60: excess ice on, explicit A/C on, crop calendars, Sturm snow, Leung dust emissions, prigent roughness data
Purpose and description of changes since ctsm5.2.005
----------------------------------------------------
Bring in updates needed for the CESM3.0 science capability/functionality "chill". Most importantly bringing
in: CN Matrix to speed up spinup for the BGC model, updated surface datasets, updated Leung 2023 dust emissions,
explicit Air Conditioning for the Urban model, updates to crop calendars. For clm6_0 physics these options are now
default turned on in addition to Sturm snow, and excess ice.
Changes to CTSM Infrastructure:
===============================
- manage_externals removed and replaced by git-fleximod
- Ability to handle CAM7 in LND_TUNING_MODE
Changes to CTSM Answers:
========================
Changes to defaults for clm6_0 physics:
- Urban explicit A/C turned on
- Snow thermal conductivity is now Sturm_1997
- New IC file for f09 1850
- New crop calendars
- Dust emissions is now Leung_2023
- Excess ice is turned on
- Updates to MEGAN for BVOC's
- Updates to BGC fire method
Changes for all physics versions:
- Parameter files updated
- FATES parameter file updated
- Glacier region 1 is now undefined
- Update in FATES transient Land use
- Pass active glacier (CISM) runoff directly to river model (MOSART)
- Add the option for using matrix for Carbon/Nitrogen BGC spinup
New surface datasets:
=====================
- With new surface datasets the following GLC fields have region "1" set to UNSET:
glacier_region_behavior, glacier_region_melt_behavior, glacier_region_ice_runoff_behavior
- Updates to allow creating transient landuse timeseries files going back to 1700.
- Fix an important bug on soil fields that was there since ctsm5.2.0. This results in mksurfdata_esmf now giving identical answers with a change in number of processors, as it should.
- Add in creation of ne0np4.POLARCAP.ne30x4 surface datasets.
- Add version to the surface datasets.
- Remove the --hires_pft option from mksurfdata_esmf as we don't have the datasets for it.
- Remove VIC fields from surface datasets.
New input datasets to mksurfdata_esmf:
======================================
- Updates in PFT/LAI/soil-color raw datasets (now from the TRENDY2024 timeseries that ends in 2023), as well as two fire datasets (AG fire, peatland), and the glacier behavior dataset.
Same as ctsm5.3.001 I made an accidental merge and reverted it.
Reduce outputs from matrixcnOn tests
…xtsw_cday_changes Update cdeps with cam7 nextsw cday changes
…ters add timestamp to rpointer files
iRpointer files for restart now have the simulation timestamp in the filename Add the simulation timestamp to the rpointer files. Also update submodules with this change in CMEPS and CDEPS as well as updated cime to handle it. See the notes below for an explaination about this. Add a "clm" level directory under usermods_dirs so that the component where user-mods reside is declared and to make them function the same as test-mods.
Merge b4bdev 20241220
…20241230 Merge b4b-dev 20241220 This tag is in the temporary branch tmp-241219, while master remains "locked" in preparation for a cesm tag. The process was unorthodox, in that I (slevis) received a code review and made revisions and retested after having started the first merge steps.
|
@adrifoster could you approve this one, as well? It's the last step before I unlock the b4b-dev branch. Thanks! |
adrifoster
approved these changes
Dec 30, 2024
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
Merging
branch_tags/tmp-241219.n01.ctsm5.3.016to b4b-dev.Would have been ctsm5.3.017 but master is unavailable while we wait for a new cesm tag.