-
Notifications
You must be signed in to change notification settings - Fork 322
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Add tillage and residue removal #2311
Merged
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
Each crop column should only have one patch, so by only calling these for crop columns, we can simplify things considerably.
"Throw error during namelist build if tillage is called with FATES"
Update FATES tests to double precision This pull request updates the fates tests to set the output precision to double precision. The usermod fates_sp is similarly updated.
Improvements to processing of crop calendar files In python/ctsm/crop_calendars/, process_ggcmi_shdates.py and regrid_ggcmi_shdates.py are used to convert the raw GGCMI crop calendar files into CTSM-compatible versions. This update fixes some bugs, removes dependencies on the nco utilities, enables the use of surface datasets as template files (in addition to the existing ability to use CTSM output files), and standardizes things for consistency with other CTSM Python tools.
See ESCOMP#2310: NEON tests sometimes fail (ESCOMP#2310)
See ESCOMP#2310: NEON tests sometimes fail (ESCOMP#2310)
(cherry picked from commit 142c2c1)
Makes no changes, but I realized the cherry-pick I did before won't let Github recognize that this is up-to-date with the tillage branch.
Seems like this will have to be integrated into MatrixCN before @slevis-lmwg can merge #640 |
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
enhancement
new capability or improved behavior of existing capability
science
Enhancement to or bug impacting science
testing
additions or changes to tests
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
This PR combines #2040 and #2297.
Tillage: This PR brings in the tillage code written by Sam Levis and Michael Graham and used in Graham et al. (2021, ERL, doi:10.1088/1748-9326/abe6c6). Low- and high-intensity tillage here work by increasing the decomposition rate of different soil carbon pools. These "decomposition multipliers" vary based on soil pool and how long it's been since the crop was planted; they are set with new paramfile variables
till_decompk_multipliers
andmimics_till_decompk_multipliers
. Note that tillage is off by default.Residue removal: Adds parameter
crop_residue_removal_frac
(default 0) that represents what fraction of post-harvest crop residues (stems and leaves) should be removed to the crop product pool rather than being transferred to litter.Specific notes
Contributors other than yourself, if any: @mwgraham, @slevis-lmwg, @danicalombardozzi
CTSM Issues Fixed:
run_sys_tests
no longer fails on IzumiAre answers expected to change (and if so in what way)? No
Any User Interface Changes (namelist or namelist defaults changes)?
tillage_mode
with optionsoff
(default),low
, andhigh
.use_original_tillage_phases
(false by default; see Add soil tillage for crops #2040).max_tillage_depth
.crop_residue_removal_frac
(default 0)Testing performed, if any:
aux_clm
passes