-
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 scott 2001 #1108
base: main
Are you sure you want to change the base?
Active crown scott 2001 #1108
Commits on Sep 4, 2019
-
Passive Crown Fire development
Add EQ to evaluate potential for crown fire Add EQ for passive crown fire igntion Set fraction of crown burnt based on this conditional Add crown fire threshold, crown fire flag, and crown fire PFT param
Jacquelyn Shuman committedSep 4, 2019 Configuration menu - View commit details
-
Copy full SHA for 7193bc6 - Browse repository at this point
Copy the full SHA 7193bc6View commit details -
Jacquelyn Shuman committed
Sep 4, 2019 Configuration menu - View commit details
-
Copy full SHA for bad24e4 - Browse repository at this point
Copy the full SHA bad24e4View commit details
Commits on Sep 5, 2019
-
Update and correct variable names for passive crown fire
Jacquelyn Shuman committedSep 5, 2019 Configuration menu - View commit details
-
Copy full SHA for 093db93 - Browse repository at this point
Copy the full SHA 093db93View commit details -
Update name for crown_fire flag
Jacquelyn Shuman committedSep 5, 2019 Configuration menu - View commit details
-
Copy full SHA for f3077df - Browse repository at this point
Copy the full SHA f3077dfView commit details -
Remove redundant details within evaluation for crown fire ignition
Jacquelyn Shuman committedSep 5, 2019 Configuration menu - View commit details
-
Copy full SHA for f28f546 - Browse repository at this point
Copy the full SHA f28f546View commit details -
Add q_dry as available to entire fire module
Jacquelyn Shuman committedSep 5, 2019 Configuration menu - View commit details
-
Copy full SHA for 79a8f5e - Browse repository at this point
Copy the full SHA 79a8f5eView commit details -
Change name for passive_crown fire intensity
Jacquelyn Shuman committedSep 5, 2019 Configuration menu - View commit details
-
Copy full SHA for ae0a5e7 - Browse repository at this point
Copy the full SHA ae0a5e7View commit details
Commits on Sep 6, 2019
-
Revert q_dry to be local within fire ROS subroutine
Jacquelyn Shuman committedSep 6, 2019 Configuration menu - View commit details
-
Copy full SHA for cafdac5 - Browse repository at this point
Copy the full SHA cafdac5View commit details
Commits on Sep 7, 2019
-
Configuration menu - View commit details
-
Copy full SHA for f908f8e - Browse repository at this point
Copy the full SHA f908f8eView commit details
Commits on Sep 9, 2019
-
Co-Authored-By: Samuel Levis <[email protected]>
Configuration menu - View commit details
-
Copy full SHA for 5558381 - Browse repository at this point
Copy the full SHA 5558381View commit details -
Clean up calculation of fraction crown burnt
Jacquelyn Shuman committedSep 9, 2019 Configuration menu - View commit details
-
Copy full SHA for 1d23671 - Browse repository at this point
Copy the full SHA 1d23671View commit details -
Re-order for clearer calculation of clear branch bole height
Jacquelyn Shuman committedSep 9, 2019 Configuration menu - View commit details
-
Copy full SHA for 764d6c4 - Browse repository at this point
Copy the full SHA 764d6c4View commit details
Commits on Sep 10, 2019
-
Clean up else statements for scorch height fraction crown burnt
Jacquelyn Shuman committedSep 10, 2019 Configuration menu - View commit details
-
Copy full SHA for a1ebec9 - Browse repository at this point
Copy the full SHA a1ebec9View commit details -
Add Cohort variables for crown damage to CohortDynamics
Jacquelyn Shuman committedSep 10, 2019 Configuration menu - View commit details
-
Copy full SHA for a0e59a2 - Browse repository at this point
Copy the full SHA a0e59a2View commit details -
Define variable name for crown fire damage
Jacquelyn Shuman committedSep 10, 2019 Configuration menu - View commit details
-
Copy full SHA for 1365bf4 - Browse repository at this point
Copy the full SHA 1365bf4View commit details -
Zero new cohort values for crown damage
Jacquelyn Shuman committedSep 10, 2019 Configuration menu - View commit details
-
Copy full SHA for 45377c9 - Browse repository at this point
Copy the full SHA 45377c9View commit details -
Add missing parentheses crown damage conditional
Jacquelyn Shuman committedSep 10, 2019 Configuration menu - View commit details
-
Copy full SHA for 73c8762 - Browse repository at this point
Copy the full SHA 73c8762View commit details -
Clean up crown damage subroutine
Jacquelyn Shuman committedSep 10, 2019 Configuration menu - View commit details
-
Copy full SHA for c288d76 - Browse repository at this point
Copy the full SHA c288d76View commit details -
Remove unnecssary line character crown damage routine
Jacquelyn Shuman committedSep 10, 2019 Configuration menu - View commit details
-
Copy full SHA for 0fc0c14 - Browse repository at this point
Copy the full SHA 0fc0c14View commit details -
Define new crown damage variables in EDTypes
Jacquelyn Shuman committedSep 10, 2019 Configuration menu - View commit details
-
Copy full SHA for fa1973f - Browse repository at this point
Copy the full SHA fa1973fView commit details -
Update to only "nan" crown damage variables in EDCohortDynamics
Jacquelyn Shuman committedSep 10, 2019 Configuration menu - View commit details
-
Copy full SHA for ee2e576 - Browse repository at this point
Copy the full SHA ee2e576View commit details -
Remove extra parentheses crown damage
Jacquelyn Shuman committedSep 10, 2019 Configuration menu - View commit details
-
Copy full SHA for 39a39f3 - Browse repository at this point
Copy the full SHA 39a39f3View commit details -
Add crown_fire_threshold read from EDTypes
Jacquelyn Shuman committedSep 10, 2019 Configuration menu - View commit details
-
Copy full SHA for 703d87f - Browse repository at this point
Copy the full SHA 703d87fView commit details -
Update crown damage for clarity with surface fires
Jacquelyn Shuman committedSep 10, 2019 Configuration menu - View commit details
-
Copy full SHA for 7e691e0 - Browse repository at this point
Copy the full SHA 7e691e0View commit details
Commits on Sep 11, 2019
-
Update crown damage variables to be local to subroutine
Jacquelyn Shuman committedSep 11, 2019 Configuration menu - View commit details
-
Copy full SHA for 52b0734 - Browse repository at this point
Copy the full SHA 52b0734View commit details -
Remove local crown damage variables from EDTypes
Jacquelyn Shuman committedSep 11, 2019 Configuration menu - View commit details
-
Copy full SHA for cce9213 - Browse repository at this point
Copy the full SHA cce9213View commit details -
Remove local crown damage variables from EDTypes, another location
Jacquelyn Shuman committedSep 11, 2019 Configuration menu - View commit details
-
Copy full SHA for eb6e6d1 - Browse repository at this point
Copy the full SHA eb6e6d1View commit details -
Merge remote-tracking branch 'jkshuman_repo/passive_crown_fire' into …
…active_crown_fire Resolved conflicts in fire/SFMainMod.F90
Configuration menu - View commit details
-
Copy full SHA for 8ac2053 - Browse repository at this point
Copy the full SHA 8ac2053View commit details
Commits on Sep 12, 2019
-
Zero cambial_mort inside cambial_damage_kill not zero_cohort
Jacquelyn Shuman committedSep 12, 2019 Configuration menu - View commit details
-
Copy full SHA for dc1ba20 - Browse repository at this point
Copy the full SHA dc1ba20View commit details -
Merge remote-tracking branch 'jkshuman_repo/passive_crown_fire' into …
…active_crown_fire Resolved Conflicts: main/EDTypesMod.F90
Configuration menu - View commit details
-
Copy full SHA for 8eeb2c7 - Browse repository at this point
Copy the full SHA 8eeb2c7View commit details -
Update drying_ratio value in params file
Jacquelyn Shuman committedSep 12, 2019 Configuration menu - View commit details
-
Copy full SHA for e11602f - Browse repository at this point
Copy the full SHA e11602fView commit details
Commits on Sep 16, 2019
-
One-line correction in active crown-fire code
Also made two crown-related history varialbes active
Configuration menu - View commit details
-
Copy full SHA for f00187f - Browse repository at this point
Copy the full SHA f00187fView commit details
Commits on Sep 24, 2019
-
Merge branch 'master' of https://github.com/NGEET/fates into passive_…
…crown_fire
Jacquelyn Shuman committedSep 24, 2019 Configuration menu - View commit details
-
Copy full SHA for 9465439 - Browse repository at this point
Copy the full SHA 9465439View commit details
Commits on Sep 25, 2019
-
Update crown_ignite_energy to PFT level
Jacquelyn Shuman committedSep 25, 2019 Configuration menu - View commit details
-
Copy full SHA for 5587782 - Browse repository at this point
Copy the full SHA 5587782View commit details -
Update crown_ignite name in EDPftvarcon
Jacquelyn Shuman committedSep 25, 2019 Configuration menu - View commit details
-
Copy full SHA for 76ed1fa - Browse repository at this point
Copy the full SHA 76ed1faView commit details -
Jacquelyn Shuman committed
Sep 25, 2019 Configuration menu - View commit details
-
Copy full SHA for 2feddcb - Browse repository at this point
Copy the full SHA 2feddcbView commit details
Commits on Sep 30, 2019
-
Add comment with equation for crown_ignite_energy per VanWagner 1977
Jacquelyn Shuman committedSep 30, 2019 Configuration menu - View commit details
-
Copy full SHA for 0aef4a9 - Browse repository at this point
Copy the full SHA 0aef4a9View commit details -
Add comment with details for empirical value C in passive_crown_FI
Jacquelyn Shuman committedSep 30, 2019 Configuration menu - View commit details
-
Copy full SHA for 8d582b7 - Browse repository at this point
Copy the full SHA 8d582b7View commit details -
Update flag to logical, clean up conditional
Jacquelyn Shuman committedSep 30, 2019 Configuration menu - View commit details
-
Copy full SHA for 29fd4ff - Browse repository at this point
Copy the full SHA 29fd4ffView commit details
Commits on Oct 1, 2019
-
Revert passive crown fire flag to binary
Jacquelyn Shuman committedOct 1, 2019 Configuration menu - View commit details
-
Copy full SHA for cb67c91 - Browse repository at this point
Copy the full SHA cb67c91View commit details -
Update variable names in EDTypes
Jacquelyn Shuman committedOct 1, 2019 Configuration menu - View commit details
-
Copy full SHA for 5b84356 - Browse repository at this point
Copy the full SHA 5b84356View commit details -
Update passive_crown_fire in EDTypes
Jacquelyn Shuman committedOct 1, 2019 Configuration menu - View commit details
-
Copy full SHA for 188e683 - Browse repository at this point
Copy the full SHA 188e683View commit details -
Update variable name and comments crown_fire flag
Jacquelyn Shuman committedOct 1, 2019 Configuration menu - View commit details
-
Copy full SHA for 4f017a2 - Browse repository at this point
Copy the full SHA 4f017a2View commit details
Commits on Oct 3, 2019
-
Co-Authored-By: Samuel Levis <[email protected]>
Configuration menu - View commit details
-
Copy full SHA for 3e0d8f7 - Browse repository at this point
Copy the full SHA 3e0d8f7View commit details -
Merge remote-tracking branch 'jkshuman_repo/passive_crown_fire' into …
…active_crown_fire Resolved conflicts in: fire/SFMainMod.F90 main/EDTypesMod.F90
Configuration menu - View commit details
-
Copy full SHA for 12dc816 - Browse repository at this point
Copy the full SHA 12dc816View commit details
Commits on Oct 4, 2019
-
Use crown_fire param as real to scale effects of passive crown fires
This pft-dependent parameter is set in the fates params file. Use it instead of setting fraction_crown_burned = 1 for all passive crown fires.
Configuration menu - View commit details
-
Copy full SHA for ce4933a - Browse repository at this point
Copy the full SHA ce4933aView commit details -
Co-Authored-By: Samuel Levis <[email protected]>
Configuration menu - View commit details
-
Copy full SHA for aeefb59 - Browse repository at this point
Copy the full SHA aeefb59View commit details -
Co-Authored-By: Samuel Levis <[email protected]>
Configuration menu - View commit details
-
Copy full SHA for 5a6fcc0 - Browse repository at this point
Copy the full SHA 5a6fcc0View commit details -
Configuration menu - View commit details
-
Copy full SHA for 2917215 - Browse repository at this point
Copy the full SHA 2917215View commit details -
Add comment about passive crown fire survival
Jacquelyn Shuman committedOct 4, 2019 Configuration menu - View commit details
-
Copy full SHA for 9997422 - Browse repository at this point
Copy the full SHA 9997422View commit details -
Configuration menu - View commit details
-
Copy full SHA for 9ba50cb - Browse repository at this point
Copy the full SHA 9ba50cbView commit details
Commits on Oct 7, 2019
-
Revert zero variables to again occur in EDCohortDynamics
Jacquelyn Shuman committedOct 7, 2019 Configuration menu - View commit details
-
Copy full SHA for 012e363 - Browse repository at this point
Copy the full SHA 012e363View commit details -
Merge remote-tracking branch 'jkshuman_repo/passive_crown_fire' into …
…active_crown_fire Hoping that this returns to normal fire behavior. Problems reported previously: - @slevisconsulting saw fire in year 1 and not after - @jkshuman saw fire in years 1-5 and not after
Configuration menu - View commit details
-
Copy full SHA for c3191bf - Browse repository at this point
Copy the full SHA c3191bfView commit details
Commits on Oct 8, 2019
-
Correction that fixes problem of no fire after year 1
The two new flags identifying when passive and active crown fires occur needed to be integers for the if statements to work correctly. To facilitate my debugging, I reverted some aesthetic code mods to look more like @jkshuman's read_lightning_pr561 branch (https://github.com/jkshuman/fates/tree/read_lightning_pr561) so as to minimize unnecessary diffs when typing "git diff read_lightning_pr561". These mods will likely make it back into this branch (active_crown_fire) with later updates.
Configuration menu - View commit details
-
Copy full SHA for d377f27 - Browse repository at this point
Copy the full SHA d377f27View commit details
Commits on Oct 9, 2019
-
Correct crown_fuel_bulkd formula to include n and c_area
I.e. currentCohort%n and currentCohort%c_area. Also 1) Moving active crown fire calculations inside the if statement that confirms ignition of a passive crown fire to increase code efficiency 2) Introducing diagnostic write statements to investigate crown fire behavior; remove in a later commit.
Configuration menu - View commit details
-
Copy full SHA for 402dfd0 - Browse repository at this point
Copy the full SHA 402dfd0View commit details
Commits on Oct 11, 2019
-
Configuration menu - View commit details
-
Copy full SHA for b762dad - Browse repository at this point
Copy the full SHA b762dadView commit details
Commits on Oct 25, 2019
-
Effect of active crown fire on the Rate of Spread
Previous commits computed the occurrence of active crown fire and set currentCohort%fraction_crown_burned = 1.0_r8 Here I begin to introduce the effects of active crown fire on the size and intensity of the fire as discussed with @jkshuman in NGEET#573. First step in this is the effect of active crown fire on the Rate of Spread. I have confirmed that, with the code changes this far, history varialbes FIRE_ROS, SUM_FUEL, fire_fuel_bulkd have changed, while fire size and intensity have not changed. This is what I expected.
Configuration menu - View commit details
-
Copy full SHA for 9a3fac0 - Browse repository at this point
Copy the full SHA 9a3fac0View commit details
Commits on Oct 26, 2019
-
Small corrections to previous commit
1) Moved calculation of currentPatch%sum_fuel out of subr. rate_of_spread and into subr. characteristics_of_fuel because rate_of_spread is called twice now, yet currentPatch%sum_fuel should not be updated a second time. 2) Set currentCohort%active_crown_fire_flg back to 0 after the second call to rate_of_spread because we want it equal to 0 when we make the next timestep's first call to rate_of_spread.
Configuration menu - View commit details
-
Copy full SHA for 6ed93b8 - Browse repository at this point
Copy the full SHA 6ed93b8View commit details
Commits on Oct 27, 2019
-
Completing the addition of active crown fire effects
In the most recent commits I added a second call to rate_of_spread. After that call I now also call the following subroutines a second time: - fire_intensity - area_burnt - crown_scorching - crown_damage
Configuration menu - View commit details
-
Copy full SHA for b084604 - Browse repository at this point
Copy the full SHA b084604View commit details -
Improvement in code organization
In the last commit I initialized currentCohort%active_crown_fire_flg in an awkward location. I have moved to subr. fire_model where other variables are initialized.
Configuration menu - View commit details
-
Copy full SHA for f4d99f8 - Browse repository at this point
Copy the full SHA f4d99f8View commit details
Commits on Oct 28, 2019
-
Configuration menu - View commit details
-
Copy full SHA for e6fff14 - Browse repository at this point
Copy the full SHA e6fff14View commit details
Commits on Nov 21, 2019
-
Add calculation for canopy base height for crown fire
Jacquelyn Shuman committedNov 21, 2019 Configuration menu - View commit details
-
Copy full SHA for b715f76 - Browse repository at this point
Copy the full SHA b715f76View commit details
Commits on Nov 22, 2019
-
Update canopy_base_height to patch level for crown fire
Jacquelyn Shuman committedNov 22, 2019 Configuration menu - View commit details
-
Copy full SHA for 380666c - Browse repository at this point
Copy the full SHA 380666cView commit details
Commits on Nov 23, 2019
-
Jacquelyn Shuman committed
Nov 23, 2019 Configuration menu - View commit details
-
Copy full SHA for 299cbf5 - Browse repository at this point
Copy the full SHA 299cbf5View commit details
Commits on Nov 24, 2019
-
Update passive fire fuels in crown damage
Jacquelyn Shuman committedNov 24, 2019 Configuration menu - View commit details
-
Copy full SHA for f244279 - Browse repository at this point
Copy the full SHA f244279View commit details
Commits on Nov 25, 2019
-
Merge branch 'fire-threshold' into passive_crown_fire
Jacquelyn Shuman committedNov 25, 2019 Configuration menu - View commit details
-
Copy full SHA for 88fe84d - Browse repository at this point
Copy the full SHA 88fe84dView commit details -
Update fire parameter names foliar_moisture, crown_fire_flag
Jacquelyn Shuman committedNov 25, 2019 Configuration menu - View commit details
-
Copy full SHA for ea6ecd9 - Browse repository at this point
Copy the full SHA ea6ecd9View commit details -
Update var namaes for crown fire and foliar moisture
Jacquelyn Shuman committedNov 25, 2019 Configuration menu - View commit details
-
Copy full SHA for 8b9565e - Browse repository at this point
Copy the full SHA 8b9565eView commit details -
SH as cohort level in crown damage/SFMain
Jacquelyn Shuman committedNov 25, 2019 Configuration menu - View commit details
-
Copy full SHA for 23ccb3f - Browse repository at this point
Copy the full SHA 23ccb3fView commit details
Commits on Nov 26, 2019
-
Clean up patch level crown fire calculations
Jacquelyn Shuman committedNov 26, 2019 Configuration menu - View commit details
-
Copy full SHA for 339aca2 - Browse repository at this point
Copy the full SHA 339aca2View commit details
Commits on Nov 27, 2019
-
Configuration menu - View commit details
-
Copy full SHA for d1b85f9 - Browse repository at this point
Copy the full SHA d1b85f9View commit details -
Merge remote-tracking branch 'jkshuman_repo/passive_crown_fire' into …
…active_crown_fire Resolved Conflicts: biogeochem/EDCohortDynamicsMod.F90 fire/SFMainMod.F90
Configuration menu - View commit details
-
Copy full SHA for 11552e7 - Browse repository at this point
Copy the full SHA 11552e7View commit details -
Configuration menu - View commit details
-
Copy full SHA for c9e5cbc - Browse repository at this point
Copy the full SHA c9e5cbcView commit details
Commits on Dec 2, 2019
-
Configuration menu - View commit details
-
Copy full SHA for e66d24f - Browse repository at this point
Copy the full SHA e66d24fView commit details
Commits on Dec 3, 2019
-
Configuration menu - View commit details
-
Copy full SHA for 3512d1e - Browse repository at this point
Copy the full SHA 3512d1eView commit details
Commits on Mar 31, 2022
-
Merge branch 'master' into active_crown_fire
Resolved conflicts: fire/SFMainMod.F90 main/EDPftvarcon.F90 main/EDTypesMod.F90 main/FatesInterfaceMod.F90 parameter_files/fates_params_default.cdl
Configuration menu - View commit details
-
Copy full SHA for 7dd6019 - Browse repository at this point
Copy the full SHA 7dd6019View commit details -
Resolve conflicts in EDPatchDynamicsMod.F90
This and next few commits resolve conflicts missed by git and caught by github
Configuration menu - View commit details
-
Copy full SHA for 58ea52e - Browse repository at this point
Copy the full SHA 58ea52eView commit details
Commits on Apr 1, 2022
-
Configuration menu - View commit details
-
Copy full SHA for f401107 - Browse repository at this point
Copy the full SHA f401107View commit details -
Configuration menu - View commit details
-
Copy full SHA for d4f8a03 - Browse repository at this point
Copy the full SHA d4f8a03View commit details -
Configuration menu - View commit details
-
Copy full SHA for fe28162 - Browse repository at this point
Copy the full SHA fe28162View commit details -
Configuration menu - View commit details
-
Copy full SHA for d2d1de3 - Browse repository at this point
Copy the full SHA d2d1de3View commit details -
Configuration menu - View commit details
-
Copy full SHA for 18ae658 - Browse repository at this point
Copy the full SHA 18ae658View commit details -
Added a TODO comment and made a history field active
Committing only to get ./manage_externals/checkout_externals to finish
Configuration menu - View commit details
-
Copy full SHA for 742d5cd - Browse repository at this point
Copy the full SHA 742d5cdView commit details
Commits on Apr 11, 2022
-
Using existing test: SMS_Lm12_D_Mmpi-serial.1x1_brazil.I2000Clm50FatesCruRsGs.izumi_intel.clm-FatesFireLightningPopDens
Configuration menu - View commit details
-
Copy full SHA for 2a47137 - Browse repository at this point
Copy the full SHA 2a47137View commit details -
Fix to fates_fire_active_crown_fire: Code runs now
There were two copies of this parameter: a scalar and an array and the model was getting confused when trying to read them
Configuration menu - View commit details
-
Copy full SHA for 0a3668b - Browse repository at this point
Copy the full SHA 0a3668bView commit details -
Correcting active_crown_fire_flg in code that's commented out for now
I found references to both currentCohort%active_crown_fire_flg and currentPatch%active_crown_fire_flg and I think the latter is correct and the former incorrect
Configuration menu - View commit details
-
Copy full SHA for fc88363 - Browse repository at this point
Copy the full SHA fc88363View commit details
Commits on Apr 17, 2022
-
Update active crown fire per Scott and Reinhardt 2001, Rothermel 1977
Calculate required intensity to scorch crown and canopy, then re-calculate rate of spread and fire intensity Fixes: 573 User interface changes?: No Code review:
Configuration menu - View commit details
-
Copy full SHA for 85f0dba - Browse repository at this point
Copy the full SHA 85f0dbaView commit details
Commits on Apr 18, 2022
-
Fix solve for phi wind in active fire
Fix mistake in equation to solve for phi_wind as part of steps towards calculation of canopy fraction burnt.
Configuration menu - View commit details
-
Copy full SHA for a93375e - Browse repository at this point
Copy the full SHA a93375eView commit details
Commits on Apr 19, 2022
-
Configuration menu - View commit details
-
Copy full SHA for 456706f - Browse repository at this point
Copy the full SHA 456706fView commit details
Commits on May 5, 2022
-
Configuration menu - View commit details
-
Copy full SHA for 32684f7 - Browse repository at this point
Copy the full SHA 32684f7View commit details
Commits on May 6, 2022
-
Configuration menu - View commit details
-
Copy full SHA for 5cb79fe - Browse repository at this point
Copy the full SHA 5cb79feView commit details
Commits on Oct 24, 2023
-
Merge branch 'main' into active_crown_Scott_2001
adrifoster committedOct 24, 2023 Configuration menu - View commit details
-
Copy full SHA for 5ff191b - Browse repository at this point
Copy the full SHA 5ff191bView commit details
Commits on Oct 26, 2023
-
adrifoster committed
Oct 26, 2023 Configuration menu - View commit details
-
Copy full SHA for 3090ea4 - Browse repository at this point
Copy the full SHA 3090ea4View commit details