Skip to content
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.

Sign up for GitHub

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 #584

Closed
wants to merge 86 commits into from
Closed

Active crown fire #584

Show file tree
Hide file tree
Changes from 61 commits
Commits
Show all changes
86 commits
Select commit Hold shift + click to select a range
7193bc6
Passive Crown Fire development
Sep 4, 2019
bad24e4
Correct EQ for crown_FI
Sep 4, 2019
093db93
Update and correct variable names for passive crown fire
Sep 5, 2019
f3077df
Update name for crown_fire flag
Sep 5, 2019
f28f546
Remove redundant details within evaluation for crown fire ignition
Sep 5, 2019
79a8f5e
Add q_dry as available to entire fire module
Sep 5, 2019
ae0a5e7
Change name for passive_crown fire intensity
Sep 5, 2019
cafdac5
Revert q_dry to be local within fire ROS subroutine
Sep 6, 2019
f908f8e
Introducing active crown fire equations
slevis-lmwg Sep 7, 2019
5558381
Update fire/SFMainMod.F90
jkshuman Sep 9, 2019
1d23671
Clean up calculation of fraction crown burnt
Sep 9, 2019
764d6c4
Re-order for clearer calculation of clear branch bole height
Sep 9, 2019
a1ebec9
Clean up else statements for scorch height fraction crown burnt
Sep 10, 2019
a0e59a2
Add Cohort variables for crown damage to CohortDynamics
Sep 10, 2019
1365bf4
Define variable name for crown fire damage
Sep 10, 2019
45377c9
Zero new cohort values for crown damage
Sep 10, 2019
73c8762
Add missing parentheses crown damage conditional
Sep 10, 2019
c288d76
Clean up crown damage subroutine
Sep 10, 2019
0fc0c14
Remove unnecssary line character crown damage routine
Sep 10, 2019
fa1973f
Define new crown damage variables in EDTypes
Sep 10, 2019
ee2e576
Update to only "nan" crown damage variables in EDCohortDynamics
Sep 10, 2019
39a39f3
Remove extra parentheses crown damage
Sep 10, 2019
703d87f
Add crown_fire_threshold read from EDTypes
Sep 10, 2019
7e691e0
Update crown damage for clarity with surface fires
Sep 10, 2019
52b0734
Update crown damage variables to be local to subroutine
Sep 11, 2019
cce9213
Remove local crown damage variables from EDTypes
Sep 11, 2019
eb6e6d1
Remove local crown damage variables from EDTypes, another location
Sep 11, 2019
8ac2053
Merge remote-tracking branch 'jkshuman_repo/passive_crown_fire' into …
slevis-lmwg Sep 11, 2019
dc1ba20
Zero cambial_mort inside cambial_damage_kill not zero_cohort
Sep 12, 2019
8eeb2c7
Merge remote-tracking branch 'jkshuman_repo/passive_crown_fire' into …
slevis-lmwg Sep 12, 2019
e11602f
Update drying_ratio value in params file
Sep 12, 2019
f00187f
One-line correction in active crown-fire code
slevis-lmwg Sep 16, 2019
9465439
Merge branch 'master' of https://github.com/NGEET/fates into passive_…
Sep 24, 2019
5587782
Update crown_ignite_energy to PFT level
Sep 25, 2019
76ed1fa
Update crown_ignite name in EDPftvarcon
Sep 25, 2019
2feddcb
Add paran in SFMain
Sep 25, 2019
0aef4a9
Add comment with equation for crown_ignite_energy per VanWagner 1977
Sep 30, 2019
8d582b7
Add comment with details for empirical value C in passive_crown_FI
Sep 30, 2019
29fd4ff
Update flag to logical, clean up conditional
Sep 30, 2019
cb67c91
Revert passive crown fire flag to binary
Oct 1, 2019
5b84356
Update variable names in EDTypes
Oct 1, 2019
188e683
Update passive_crown_fire in EDTypes
Oct 1, 2019
4f017a2
Update variable name and comments crown_fire flag
Oct 1, 2019
3e0d8f7
Update fire/SFMainMod.F90
jkshuman Oct 3, 2019
12dc816
Merge remote-tracking branch 'jkshuman_repo/passive_crown_fire' into …
slevis-lmwg Oct 3, 2019
ce4933a
Use crown_fire param as real to scale effects of passive crown fires
slevis-lmwg Oct 4, 2019
aeefb59
Update fire/SFMainMod.F90
jkshuman Oct 4, 2019
5a6fcc0
Update fire/SFMainMod.F90
jkshuman Oct 4, 2019
2917215
Merge branch 'passive_crown_fire' into active_crown_fire
slevis-lmwg Oct 4, 2019
9997422
Add comment about passive crown fire survival
Oct 4, 2019
9ba50cb
Merge branch 'passive_crown_fire' into active_crown_fire
slevis-lmwg Oct 4, 2019
012e363
Revert zero variables to again occur in EDCohortDynamics
Oct 7, 2019
c3191bf
Merge remote-tracking branch 'jkshuman_repo/passive_crown_fire' into …
slevis-lmwg Oct 7, 2019
d377f27
Correction that fixes problem of no fire after year 1
slevis-lmwg Oct 8, 2019
402dfd0
Correct crown_fuel_bulkd formula to include n and c_area
slevis-lmwg Oct 9, 2019
b762dad
This is only a test
slevis-lmwg Oct 11, 2019
9a3fac0
Effect of active crown fire on the Rate of Spread
slevis-lmwg Oct 25, 2019
6ed93b8
Small corrections to previous commit
slevis-lmwg Oct 26, 2019
b084604
Completing the addition of active crown fire effects
slevis-lmwg Oct 27, 2019
f4d99f8
Improvement in code organization
slevis-lmwg Oct 27, 2019
e6fff14
Added missing pointer
slevis-lmwg Oct 28, 2019
b715f76
Add calculation for canopy base height for crown fire
Nov 21, 2019
380666c
Update canopy_base_height to patch level for crown fire
Nov 22, 2019
299cbf5
Clean up crown damage SFMain
Nov 23, 2019
f244279
Update passive fire fuels in crown damage
Nov 24, 2019
88fe84d
Merge branch 'fire-threshold' into passive_crown_fire
Nov 25, 2019
ea6ecd9
Update fire parameter names foliar_moisture, crown_fire_flag
Nov 25, 2019
8b9565e
Update var namaes for crown fire and foliar moisture
Nov 25, 2019
23ccb3f
SH as cohort level in crown damage/SFMain
Nov 25, 2019
339aca2
Clean up patch level crown fire calculations
Nov 26, 2019
d1b85f9
Revisions from code review
slevis-lmwg Nov 27, 2019
11552e7
Merge remote-tracking branch 'jkshuman_repo/passive_crown_fire' into …
slevis-lmwg Nov 27, 2019
c9e5cbc
Corrections needed to build and start a run
slevis-lmwg Nov 27, 2019
e66d24f
Minor cleanup
slevis-lmwg Dec 2, 2019
3512d1e
Adding my lightning mods to this branch
slevis-lmwg Dec 3, 2019
7dd6019
Merge branch 'master' into active_crown_fire
slevis-lmwg Mar 31, 2022
58ea52e
Resolve conflicts in EDPatchDynamicsMod.F90
slevis-lmwg Mar 31, 2022
f401107
Resolve conflicts in EDTypesMod.F90 and fates_params_default.cdl
slevis-lmwg Apr 1, 2022
d4f8a03
Resolve another conflict in EDTypesMod.F90
slevis-lmwg Apr 1, 2022
fe28162
Resolve conflicts in SFMainMod.F90
slevis-lmwg Apr 1, 2022
d2d1de3
Resolve conflict in FatesHistoryInterfaceMod.F90
slevis-lmwg Apr 1, 2022
18ae658
Merge branch 'master' into active_crown_fire
slevis-lmwg Apr 1, 2022
742d5cd
Added a TODO comment and made a history field active
slevis-lmwg Apr 1, 2022
2a47137
One-line fix: code builds now
slevis-lmwg Apr 11, 2022
0a3668b
Fix to fates_fire_active_crown_fire: Code runs now
slevis-lmwg Apr 11, 2022
fc88363
Correcting active_crown_fire_flg in code that's commented out for now
slevis-lmwg Apr 11, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions biogeochem/EDCohortDynamicsMod.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -535,6 +535,8 @@ subroutine nan_cohort(cc_p)

! FIRE
currentCohort%fraction_crown_burned = nan ! proportion of crown affected by fire
currentCohort%passive_crown_fire_flg = 9999 ! flag to indicate passive crown fire ignition
currentCohort%active_crown_fire_flg = 9999 ! flag to indicate active crown fire ignition
currentCohort%cambial_mort = nan ! probability that trees dies due to cambial char P&R (1986)
currentCohort%crownfire_mort = nan ! probability of tree post-fire mortality due to crown scorch
currentCohort%fire_mort = nan ! post-fire mortality from cambial and crown damage assuming two are independent
Expand Down
Loading