Merge b4bdev 20240926 #2792
Merged
Merge b4bdev 20240926 #2792
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
Bring b4b-dev branch to main CTSM development. - PLUMBER2 for ctsm5.2 datasets - Last bit of PPE changes for namelist and parameter file settings - Update run_sys_tests on Derecho for compiler jobs to run using 16 tasks - Bring in a fix for dust emissions for coupling with CAM Update cs.status parsing script to make expected BASELINE fails more obvious Fix some issues with finding IC files for certain lnd_tuning_modes: all for cam7, clm5_0_cam6.0, and clm6_0_cam6.0
Merge master 20240828
hs-uii: Merge in latest b4b-dev
Add a namelist warning when hillslope hydrology is used with initial interpolation.
Fix comments on urban thermal variables (no testing done)
Also makes it accessible from table of contents. Not actually changing file contents at this point.
* The experience of making a mesh from an input with 1d vs. 2d coordinates is identical, so only provide one example. * In example, use as input file the 5x5_amazon surface dataset included with CTSM. * Various wording and typo fixes.
- Adds --dpi option (default 300) - Existing output file without --overwrite will now actually fail - More reasonable cell-center marker sizes, with an option to disable them
To namelist_definition_ctsm.xml
# Conflicts: # python/ctsm/site_and_regional/mesh_plot_type.py
Various documentation fixes/improvements
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.
slevis resolved 2 conflicts:
doc/source/users_guide/using-clm-tools/building-the-clm-tools.rst
doc/source/users_guide/using-clm-tools/what-are-the-clm-tools.rst
ekluzek
approved these changes
Sep 26, 2024
|
Both aux_clm suites are in progress. |
|
Seemingly unexpected failure but see #2619 for what I think makes this an EXPECTED failure: From discussion with @ekluzek: |
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 b4b-dev branch.
Specific notes
Contributors other than yourself, if any:
@olyson @mvdebolskiy @samsrabin
CTSM Issues Fixed (include github issue #):
Resolves #2769
Resolves #2489
Resolves #2763
Resolves #1806
Are answers expected to change (and if so in what way)? NO
Testing performed, if any:
I may need to add "EXPECTED FAIL" to some tests that started failing in ctsm5.3 PR #2500