conflict resolutions #7
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
merge remote tracking
…so added cambial and crown fire mort diagnostci variables
… and got rid of old fmort variable entirely
Update typos within patch dynamics to link cambial and crown scorch mortality for diagnostics. Remove hard coding of canopy layer Fixes: 412 User interface changes?: No Code review: JKShuman, CKoven, RKnox, RFisher Test suite: Hobart Test baseline: Test namelist changes: Test answer changes: expect changes Test summary: Run on Hobart and then test on Cheyenne.
Correct typo to set the diffuse surface albedo correctly as identified by JHolm Fixes:408 User interface changes?: No Code review: JKShuman, JHolm, RKnox, RFisher Test suite: Hobart and Cheyenne Test baseline: Test namelist changes: none Test answer changes:expect changes Test summary: will run on Hobart and follow with baseline tests on Cheyenne
conflict resolutions performed by @rgknox to bring this branch up to speed with parteh-master. This will make testing and eventual merge into master much faster.
Update to master
Remove the reducing effect of high wind speeds on fire behavior. Also remove the fire_wind_max that triggers this reducing effect. New reserach shows that there is not a reducing link between wind speed and fire behavior, specifically rate of spread. Andela et al 2018 https://doi.org/10.5194/essd-2018-89 User interface changes?: Yes, remove fire_wind_max parameter Code review: JKShuman Test suite: Cheyenne Test baseline: Test namelist changes: none Test answer changes: expect changes, dependant on wind conditions Test summary: tested for compile on Cheyenne
Code review: JKShuman Test suite: Hobart Test summary: 2 year test run
… area minimums for termination
Remove Lasslop wind effect on fire ROS
Checks on Patch Spawning
Fix to net assimilation tracker used for trimming
conflict resolutions and fixes to canopy layer diagnostics
With this update, a change in SAV will result in an updated alpha_FMC based on new calcualtion from SF_drying_ratio to calculate weighted avg of relative fuel moisture content
Updated termination diagnostic arrays to fill over canopy layer
fire mortality -- restart diagnostics
Fire mortality diagnostics update
xuchongang
approved these changes
Jan 14, 2019
xuchongang
merged commit 911b539
into
xuchongang:xuchongang/fates_hydro_improve_ready_to_merge
xuchongang
pushed a commit
that referenced
this pull request
Apr 2, 2020
scorch height history variable
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 PR contains conflict resolutions, and merges in master. Conflicts are mostly generated from the fire mortality updates.