Bring noresm branch up to dates with FATES main. #12
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
…AI tohave matching with FATES_LAI_AP
… into fire_weather_wind
…defined variables, reduce minimum suction of cch and fixed an error check
Bug fix. Adrianna Foster identified that trunks should be removed from the patch-level variable sum_fuel before being used to calculate rate of spread and fuel consumption.
…o it is more informative.
Also make sure that all primaryland pft areas are exactly zero when bareground area is 1
…e/api36.1.0_params_default.cdl
Per discussions, we decided to not make this a separate parameter file and to roll it into the default.
The files have been appended with numbers to indicated the sequence in which they should be applied to the archived parameter file.
API 36.1.0 merge
|
@rosiealice - thanks for this. I've reviewed this with @mvdebolskiy and I'm going to merge this and tag it in noresmhub. |
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 branch is very far behind both the FATES main and dry deposition development branches. I am adding this PR (at @mvertens suggestion) to split out the changes required to updates in #11
Noting that the main branch is a few commits further along than the current FATES tag used by noresm, which is: https://github.com/NGEET/fates/tree/sci.1.78.2_api.36.0.0
but the drydeposition branch is (perhaps wrongly) built on top of the FATES main branch. The consequence of this is that we (for now) would need to use a new parameter file (new parameters we added between the last tag and now).
An alternative to this PR is to make this PR from the fates tag https://github.com/NGEET/fates/tree/sci.1.78.2_api.36.0.0 and then add the dry deposition commits on top of that.That might be neater in the end?
Description:
Collaborators:
Expectation of Answer Changes:
Checklist:
Test Results:
CTSM (or) E3SM (specify which) test hash-tag:
CTSM (or) E3SM (specify which) baseline hash-tag:
FATES baseline hash-tag:
Test Output: