-
Notifications
You must be signed in to change notification settings - Fork 92
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
Active crown fire (Scott & Reinhardt 2001) #857
Draft
slevis-lmwg
wants to merge
104
commits into
NGEET:main
Choose a base branch
from
slevis-lmwg:active_crown_Scott_2001_contd
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Changes from all commits
Commits
Show all changes
104 commits
Select commit
Hold shift + click to select a range
7193bc6
Passive Crown Fire development
bad24e4
Correct EQ for crown_FI
093db93
Update and correct variable names for passive crown fire
f3077df
Update name for crown_fire flag
f28f546
Remove redundant details within evaluation for crown fire ignition
79a8f5e
Add q_dry as available to entire fire module
ae0a5e7
Change name for passive_crown fire intensity
cafdac5
Revert q_dry to be local within fire ROS subroutine
f908f8e
Introducing active crown fire equations
slevis-lmwg 5558381
Update fire/SFMainMod.F90
jkshuman 1d23671
Clean up calculation of fraction crown burnt
764d6c4
Re-order for clearer calculation of clear branch bole height
a1ebec9
Clean up else statements for scorch height fraction crown burnt
a0e59a2
Add Cohort variables for crown damage to CohortDynamics
1365bf4
Define variable name for crown fire damage
45377c9
Zero new cohort values for crown damage
73c8762
Add missing parentheses crown damage conditional
c288d76
Clean up crown damage subroutine
0fc0c14
Remove unnecssary line character crown damage routine
fa1973f
Define new crown damage variables in EDTypes
ee2e576
Update to only "nan" crown damage variables in EDCohortDynamics
39a39f3
Remove extra parentheses crown damage
703d87f
Add crown_fire_threshold read from EDTypes
7e691e0
Update crown damage for clarity with surface fires
52b0734
Update crown damage variables to be local to subroutine
cce9213
Remove local crown damage variables from EDTypes
eb6e6d1
Remove local crown damage variables from EDTypes, another location
8ac2053
Merge remote-tracking branch 'jkshuman_repo/passive_crown_fire' into …
slevis-lmwg dc1ba20
Zero cambial_mort inside cambial_damage_kill not zero_cohort
8eeb2c7
Merge remote-tracking branch 'jkshuman_repo/passive_crown_fire' into …
slevis-lmwg e11602f
Update drying_ratio value in params file
f00187f
One-line correction in active crown-fire code
slevis-lmwg 9465439
Merge branch 'master' of https://github.com/NGEET/fates into passive_…
5587782
Update crown_ignite_energy to PFT level
76ed1fa
Update crown_ignite name in EDPftvarcon
2feddcb
Add paran in SFMain
0aef4a9
Add comment with equation for crown_ignite_energy per VanWagner 1977
8d582b7
Add comment with details for empirical value C in passive_crown_FI
29fd4ff
Update flag to logical, clean up conditional
cb67c91
Revert passive crown fire flag to binary
5b84356
Update variable names in EDTypes
188e683
Update passive_crown_fire in EDTypes
4f017a2
Update variable name and comments crown_fire flag
3e0d8f7
Update fire/SFMainMod.F90
jkshuman 12dc816
Merge remote-tracking branch 'jkshuman_repo/passive_crown_fire' into …
slevis-lmwg ce4933a
Use crown_fire param as real to scale effects of passive crown fires
slevis-lmwg aeefb59
Update fire/SFMainMod.F90
jkshuman 5a6fcc0
Update fire/SFMainMod.F90
jkshuman 2917215
Merge branch 'passive_crown_fire' into active_crown_fire
slevis-lmwg 9997422
Add comment about passive crown fire survival
9ba50cb
Merge branch 'passive_crown_fire' into active_crown_fire
slevis-lmwg 012e363
Revert zero variables to again occur in EDCohortDynamics
c3191bf
Merge remote-tracking branch 'jkshuman_repo/passive_crown_fire' into …
slevis-lmwg d377f27
Correction that fixes problem of no fire after year 1
slevis-lmwg 402dfd0
Correct crown_fuel_bulkd formula to include n and c_area
slevis-lmwg b762dad
This is only a test
slevis-lmwg 9a3fac0
Effect of active crown fire on the Rate of Spread
slevis-lmwg 6ed93b8
Small corrections to previous commit
slevis-lmwg b084604
Completing the addition of active crown fire effects
slevis-lmwg f4d99f8
Improvement in code organization
slevis-lmwg e6fff14
Added missing pointer
slevis-lmwg b715f76
Add calculation for canopy base height for crown fire
380666c
Update canopy_base_height to patch level for crown fire
299cbf5
Clean up crown damage SFMain
f244279
Update passive fire fuels in crown damage
88fe84d
Merge branch 'fire-threshold' into passive_crown_fire
ea6ecd9
Update fire parameter names foliar_moisture, crown_fire_flag
8b9565e
Update var namaes for crown fire and foliar moisture
23ccb3f
SH as cohort level in crown damage/SFMain
339aca2
Clean up patch level crown fire calculations
d1b85f9
Revisions from code review
slevis-lmwg 11552e7
Merge remote-tracking branch 'jkshuman_repo/passive_crown_fire' into …
slevis-lmwg c9e5cbc
Corrections needed to build and start a run
slevis-lmwg e66d24f
Minor cleanup
slevis-lmwg 3512d1e
Adding my lightning mods to this branch
slevis-lmwg 7dd6019
Merge branch 'master' into active_crown_fire
slevis-lmwg 58ea52e
Resolve conflicts in EDPatchDynamicsMod.F90
slevis-lmwg f401107
Resolve conflicts in EDTypesMod.F90 and fates_params_default.cdl
slevis-lmwg d4f8a03
Resolve another conflict in EDTypesMod.F90
slevis-lmwg fe28162
Resolve conflicts in SFMainMod.F90
slevis-lmwg d2d1de3
Resolve conflict in FatesHistoryInterfaceMod.F90
slevis-lmwg 18ae658
Merge branch 'master' into active_crown_fire
slevis-lmwg 742d5cd
Added a TODO comment and made a history field active
slevis-lmwg 2a47137
One-line fix: code builds now
slevis-lmwg 0a3668b
Fix to fates_fire_active_crown_fire: Code runs now
slevis-lmwg fc88363
Correcting active_crown_fire_flg in code that's commented out for now
slevis-lmwg 85f0dba
Update active crown fire per Scott and Reinhardt 2001, Rothermel 1977
jkshuman a93375e
Fix solve for phi wind in active fire
jkshuman 92f7929
Revert to the scalar version of fates_fire_active_crown_fire
slevis-lmwg ce81867
Corrections to fire/SFMainMod.F90; model doesn't run, yet
slevis-lmwg 00d01ad
Code correction in do loop
slevis-lmwg ac0d7e0
Updates toward getting the code to run
slevis-lmwg 4efbcba
Clean-up in params file
slevis-lmwg 3ab4d70
Adding "if active_crown_fire_switch" to make use of corresp. user choice
slevis-lmwg 03f7992
Changed 5 variables to currentPatch% variables
slevis-lmwg 594db97
Some clean-up
slevis-lmwg e9e282c
Added checks to avoid div by zero and negative canopy_frac_burnt
slevis-lmwg 82f0df1
Reduction of duplicated code by moving ROS_final to after if-block
slevis-lmwg 80c6c5a
Bring in Jackie's mods pertaining to canopy_bulk_density
slevis-lmwg 4d43cf1
Bring in Jackie's mods: 5cb79fe5fa529c47e9e520e030524c4b78fba9ca
slevis-lmwg cd6ca3f
Ensure that ROS_front & FI only increase due to fire in the upper canopy
slevis-lmwg a87fa2e
Add the decimal in the declaration of a real parameter
slevis-lmwg 7109173
Correction of if statement now allows active crown fire occurrence
slevis-lmwg afaf136
Changed two history fields to active
slevis-lmwg File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
Large diffs are not rendered by default.
Oops, something went wrong.
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
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
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
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
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
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
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Added suffix
_switch
to prevent compiler error that complained about same name assubroutine active_crown_fire
.