Landuse fixes history interface deconflict with the latest tag #26
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
Bug fix for issue NGEET#1289
Indexing fix in multiple python scripts
fix typo in modify_fates_paramfile.py
Fix cmake breaking on functional tests for latest CTSM tag
Refactor rate of spread subroutine
Don't zero out `patch%fuel%frac_burnt()` before we use it
Bug fix for issue NGEET#1301 Corrects when the fraction of burnt fuel is zero'd and how the litter mass is updated based on that fraction.
This is clean up from the deconflict merge
This cleans up a bad deconflict merge
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.
This brings
landuse_fixesbranch up to date with the latest tag,sci.1.80.6_api.37.0.0, and deconflicts the history interface mod. The main history conflicts appear to be due to changes that came in with NGEET#1197. Normally I would just push the deconflict directly, but I wanted to give you the option to bring it in just in case you were still doing any work/updates/science on this branch. If not feel free to just merge it.