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.

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

Draft
wants to merge 93 commits into
base: main
Choose a base branch
from

Commits on Sep 4, 2019

  1. 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 committed Sep 4, 2019
    Configuration menu
    Copy the full SHA
    7193bc6 View commit details
    Browse the repository at this point in the history
  2. Correct EQ for crown_FI

    Jacquelyn Shuman committed Sep 4, 2019
    Configuration menu
    Copy the full SHA
    bad24e4 View commit details
    Browse the repository at this point in the history

Commits on Sep 5, 2019

  1. Update and correct variable names for passive crown fire

    Jacquelyn Shuman committed Sep 5, 2019
    Configuration menu
    Copy the full SHA
    093db93 View commit details
    Browse the repository at this point in the history
  2. Update name for crown_fire flag

    Jacquelyn Shuman committed Sep 5, 2019
    Configuration menu
    Copy the full SHA
    f3077df View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    f28f546 View commit details
    Browse the repository at this point in the history
  4. Add q_dry as available to entire fire module

    Jacquelyn Shuman committed Sep 5, 2019
    Configuration menu
    Copy the full SHA
    79a8f5e View commit details
    Browse the repository at this point in the history
  5. Change name for passive_crown fire intensity

    Jacquelyn Shuman committed Sep 5, 2019
    Configuration menu
    Copy the full SHA
    ae0a5e7 View commit details
    Browse the repository at this point in the history

Commits on Sep 6, 2019

  1. Revert q_dry to be local within fire ROS subroutine

    Jacquelyn Shuman committed Sep 6, 2019
    Configuration menu
    Copy the full SHA
    cafdac5 View commit details
    Browse the repository at this point in the history

Commits on Sep 7, 2019

  1. Introducing active crown fire equations

    Following @jkshuman's introduction of the Bessie and Johnson (1995)
    formulation for determining the presence of passive crown fire
    (NGEET#572),
    I now add the same paper's formulation for determining the presence of
    active crown fire.
    
    The corresponding issue is NGEET#573
    slevis-lmwg committed Sep 7, 2019
    Configuration menu
    Copy the full SHA
    f908f8e View commit details
    Browse the repository at this point in the history

Commits on Sep 9, 2019

  1. Update fire/SFMainMod.F90

    Co-Authored-By: Samuel Levis <[email protected]>
    jkshuman and slevis-lmwg authored Sep 9, 2019
    Configuration menu
    Copy the full SHA
    5558381 View commit details
    Browse the repository at this point in the history
  2. Clean up calculation of fraction crown burnt

    Jacquelyn Shuman committed Sep 9, 2019
    Configuration menu
    Copy the full SHA
    1d23671 View commit details
    Browse the repository at this point in the history
  3. Re-order for clearer calculation of clear branch bole height

    Jacquelyn Shuman committed Sep 9, 2019
    Configuration menu
    Copy the full SHA
    764d6c4 View commit details
    Browse the repository at this point in the history

Commits on Sep 10, 2019

  1. Clean up else statements for scorch height fraction crown burnt

    Jacquelyn Shuman committed Sep 10, 2019
    Configuration menu
    Copy the full SHA
    a1ebec9 View commit details
    Browse the repository at this point in the history
  2. Add Cohort variables for crown damage to CohortDynamics

    Jacquelyn Shuman committed Sep 10, 2019
    Configuration menu
    Copy the full SHA
    a0e59a2 View commit details
    Browse the repository at this point in the history
  3. Define variable name for crown fire damage

    Jacquelyn Shuman committed Sep 10, 2019
    Configuration menu
    Copy the full SHA
    1365bf4 View commit details
    Browse the repository at this point in the history
  4. Zero new cohort values for crown damage

    Jacquelyn Shuman committed Sep 10, 2019
    Configuration menu
    Copy the full SHA
    45377c9 View commit details
    Browse the repository at this point in the history
  5. Add missing parentheses crown damage conditional

    Jacquelyn Shuman committed Sep 10, 2019
    Configuration menu
    Copy the full SHA
    73c8762 View commit details
    Browse the repository at this point in the history
  6. Clean up crown damage subroutine

    Jacquelyn Shuman committed Sep 10, 2019
    Configuration menu
    Copy the full SHA
    c288d76 View commit details
    Browse the repository at this point in the history
  7. Remove unnecssary line character crown damage routine

    Jacquelyn Shuman committed Sep 10, 2019
    Configuration menu
    Copy the full SHA
    0fc0c14 View commit details
    Browse the repository at this point in the history
  8. Define new crown damage variables in EDTypes

    Jacquelyn Shuman committed Sep 10, 2019
    Configuration menu
    Copy the full SHA
    fa1973f View commit details
    Browse the repository at this point in the history
  9. Update to only "nan" crown damage variables in EDCohortDynamics

    Jacquelyn Shuman committed Sep 10, 2019
    Configuration menu
    Copy the full SHA
    ee2e576 View commit details
    Browse the repository at this point in the history
  10. Remove extra parentheses crown damage

    Jacquelyn Shuman committed Sep 10, 2019
    Configuration menu
    Copy the full SHA
    39a39f3 View commit details
    Browse the repository at this point in the history
  11. Add crown_fire_threshold read from EDTypes

    Jacquelyn Shuman committed Sep 10, 2019
    Configuration menu
    Copy the full SHA
    703d87f View commit details
    Browse the repository at this point in the history
  12. Update crown damage for clarity with surface fires

    Jacquelyn Shuman committed Sep 10, 2019
    Configuration menu
    Copy the full SHA
    7e691e0 View commit details
    Browse the repository at this point in the history

Commits on Sep 11, 2019

  1. Update crown damage variables to be local to subroutine

    Jacquelyn Shuman committed Sep 11, 2019
    Configuration menu
    Copy the full SHA
    52b0734 View commit details
    Browse the repository at this point in the history
  2. Remove local crown damage variables from EDTypes

    Jacquelyn Shuman committed Sep 11, 2019
    Configuration menu
    Copy the full SHA
    cce9213 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    eb6e6d1 View commit details
    Browse the repository at this point in the history
  4. Merge remote-tracking branch 'jkshuman_repo/passive_crown_fire' into …

    …active_crown_fire
    
    Resolved conflicts in
     	fire/SFMainMod.F90
    slevis-lmwg committed Sep 11, 2019
    Configuration menu
    Copy the full SHA
    8ac2053 View commit details
    Browse the repository at this point in the history

Commits on Sep 12, 2019

  1. Zero cambial_mort inside cambial_damage_kill not zero_cohort

    Jacquelyn Shuman committed Sep 12, 2019
    Configuration menu
    Copy the full SHA
    dc1ba20 View commit details
    Browse the repository at this point in the history
  2. Merge remote-tracking branch 'jkshuman_repo/passive_crown_fire' into …

    …active_crown_fire
    
    Resolved Conflicts:
     	main/EDTypesMod.F90
    slevis-lmwg committed Sep 12, 2019
    Configuration menu
    Copy the full SHA
    8eeb2c7 View commit details
    Browse the repository at this point in the history
  3. Update drying_ratio value in params file

    Jacquelyn Shuman committed Sep 12, 2019
    Configuration menu
    Copy the full SHA
    e11602f View commit details
    Browse the repository at this point in the history

Commits on Sep 16, 2019

  1. One-line correction in active crown-fire code

    Also made two crown-related history varialbes active
    slevis-lmwg committed Sep 16, 2019
    Configuration menu
    Copy the full SHA
    f00187f View commit details
    Browse the repository at this point in the history

Commits on Sep 24, 2019

  1. Merge branch 'master' of https://github.com/NGEET/fates into passive_…

    …crown_fire
    Jacquelyn Shuman committed Sep 24, 2019
    Configuration menu
    Copy the full SHA
    9465439 View commit details
    Browse the repository at this point in the history

Commits on Sep 25, 2019

  1. Update crown_ignite_energy to PFT level

    Jacquelyn Shuman committed Sep 25, 2019
    Configuration menu
    Copy the full SHA
    5587782 View commit details
    Browse the repository at this point in the history
  2. Update crown_ignite name in EDPftvarcon

    Jacquelyn Shuman committed Sep 25, 2019
    Configuration menu
    Copy the full SHA
    76ed1fa View commit details
    Browse the repository at this point in the history
  3. Add paran in SFMain

    Jacquelyn Shuman committed Sep 25, 2019
    Configuration menu
    Copy the full SHA
    2feddcb View commit details
    Browse the repository at this point in the history

Commits on Sep 30, 2019

  1. Configuration menu
    Copy the full SHA
    0aef4a9 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    8d582b7 View commit details
    Browse the repository at this point in the history
  3. Update flag to logical, clean up conditional

    Jacquelyn Shuman committed Sep 30, 2019
    Configuration menu
    Copy the full SHA
    29fd4ff View commit details
    Browse the repository at this point in the history

Commits on Oct 1, 2019

  1. Revert passive crown fire flag to binary

    Jacquelyn Shuman committed Oct 1, 2019
    Configuration menu
    Copy the full SHA
    cb67c91 View commit details
    Browse the repository at this point in the history
  2. Update variable names in EDTypes

    Jacquelyn Shuman committed Oct 1, 2019
    Configuration menu
    Copy the full SHA
    5b84356 View commit details
    Browse the repository at this point in the history
  3. Update passive_crown_fire in EDTypes

    Jacquelyn Shuman committed Oct 1, 2019
    Configuration menu
    Copy the full SHA
    188e683 View commit details
    Browse the repository at this point in the history
  4. Update variable name and comments crown_fire flag

    Jacquelyn Shuman committed Oct 1, 2019
    Configuration menu
    Copy the full SHA
    4f017a2 View commit details
    Browse the repository at this point in the history

Commits on Oct 3, 2019

  1. Update fire/SFMainMod.F90

    Co-Authored-By: Samuel Levis <[email protected]>
    jkshuman and slevis-lmwg authored Oct 3, 2019
    Configuration menu
    Copy the full SHA
    3e0d8f7 View commit details
    Browse the repository at this point in the history
  2. Merge remote-tracking branch 'jkshuman_repo/passive_crown_fire' into …

    …active_crown_fire
    
    Resolved conflicts in:
     	fire/SFMainMod.F90
     	main/EDTypesMod.F90
    slevis-lmwg committed Oct 3, 2019
    Configuration menu
    Copy the full SHA
    12dc816 View commit details
    Browse the repository at this point in the history

Commits on Oct 4, 2019

  1. 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.
    slevis-lmwg committed Oct 4, 2019
    Configuration menu
    Copy the full SHA
    ce4933a View commit details
    Browse the repository at this point in the history
  2. Update fire/SFMainMod.F90

    Co-Authored-By: Samuel Levis <[email protected]>
    jkshuman and slevis-lmwg authored Oct 4, 2019
    Configuration menu
    Copy the full SHA
    aeefb59 View commit details
    Browse the repository at this point in the history
  3. Update fire/SFMainMod.F90

    Co-Authored-By: Samuel Levis <[email protected]>
    jkshuman and slevis-lmwg authored Oct 4, 2019
    Configuration menu
    Copy the full SHA
    5a6fcc0 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    2917215 View commit details
    Browse the repository at this point in the history
  5. Add comment about passive crown fire survival

    Jacquelyn Shuman committed Oct 4, 2019
    Configuration menu
    Copy the full SHA
    9997422 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    9ba50cb View commit details
    Browse the repository at this point in the history

Commits on Oct 7, 2019

  1. Revert zero variables to again occur in EDCohortDynamics

    Jacquelyn Shuman committed Oct 7, 2019
    Configuration menu
    Copy the full SHA
    012e363 View commit details
    Browse the repository at this point in the history
  2. 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
    slevis-lmwg committed Oct 7, 2019
    Configuration menu
    Copy the full SHA
    c3191bf View commit details
    Browse the repository at this point in the history

Commits on Oct 8, 2019

  1. 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.
    slevis-lmwg committed Oct 8, 2019
    Configuration menu
    Copy the full SHA
    d377f27 View commit details
    Browse the repository at this point in the history

Commits on Oct 9, 2019

  1. 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.
    slevis-lmwg committed Oct 9, 2019
    Configuration menu
    Copy the full SHA
    402dfd0 View commit details
    Browse the repository at this point in the history

Commits on Oct 11, 2019

  1. This is only a test

    slevis-lmwg committed Oct 11, 2019
    Configuration menu
    Copy the full SHA
    b762dad View commit details
    Browse the repository at this point in the history

Commits on Oct 25, 2019

  1. 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.
    slevis-lmwg committed Oct 25, 2019
    Configuration menu
    Copy the full SHA
    9a3fac0 View commit details
    Browse the repository at this point in the history

Commits on Oct 26, 2019

  1. 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.
    slevis-lmwg committed Oct 26, 2019
    Configuration menu
    Copy the full SHA
    6ed93b8 View commit details
    Browse the repository at this point in the history

Commits on Oct 27, 2019

  1. 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
    slevis-lmwg committed Oct 27, 2019
    Configuration menu
    Copy the full SHA
    b084604 View commit details
    Browse the repository at this point in the history
  2. 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.
    slevis-lmwg committed Oct 27, 2019
    Configuration menu
    Copy the full SHA
    f4d99f8 View commit details
    Browse the repository at this point in the history

Commits on Oct 28, 2019

  1. Added missing pointer

    slevis-lmwg committed Oct 28, 2019
    Configuration menu
    Copy the full SHA
    e6fff14 View commit details
    Browse the repository at this point in the history

Commits on Nov 21, 2019

  1. Add calculation for canopy base height for crown fire

    Jacquelyn Shuman committed Nov 21, 2019
    Configuration menu
    Copy the full SHA
    b715f76 View commit details
    Browse the repository at this point in the history

Commits on Nov 22, 2019

  1. Update canopy_base_height to patch level for crown fire

    Jacquelyn Shuman committed Nov 22, 2019
    Configuration menu
    Copy the full SHA
    380666c View commit details
    Browse the repository at this point in the history

Commits on Nov 23, 2019

  1. Clean up crown damage SFMain

    Jacquelyn Shuman committed Nov 23, 2019
    Configuration menu
    Copy the full SHA
    299cbf5 View commit details
    Browse the repository at this point in the history

Commits on Nov 24, 2019

  1. Update passive fire fuels in crown damage

    Jacquelyn Shuman committed Nov 24, 2019
    Configuration menu
    Copy the full SHA
    f244279 View commit details
    Browse the repository at this point in the history

Commits on Nov 25, 2019

  1. Merge branch 'fire-threshold' into passive_crown_fire

    Jacquelyn Shuman committed Nov 25, 2019
    Configuration menu
    Copy the full SHA
    88fe84d View commit details
    Browse the repository at this point in the history
  2. Update fire parameter names foliar_moisture, crown_fire_flag

    Jacquelyn Shuman committed Nov 25, 2019
    Configuration menu
    Copy the full SHA
    ea6ecd9 View commit details
    Browse the repository at this point in the history
  3. Update var namaes for crown fire and foliar moisture

    Jacquelyn Shuman committed Nov 25, 2019
    Configuration menu
    Copy the full SHA
    8b9565e View commit details
    Browse the repository at this point in the history
  4. SH as cohort level in crown damage/SFMain

    Jacquelyn Shuman committed Nov 25, 2019
    Configuration menu
    Copy the full SHA
    23ccb3f View commit details
    Browse the repository at this point in the history

Commits on Nov 26, 2019

  1. Clean up patch level crown fire calculations

    Jacquelyn Shuman committed Nov 26, 2019
    Configuration menu
    Copy the full SHA
    339aca2 View commit details
    Browse the repository at this point in the history

Commits on Nov 27, 2019

  1. Configuration menu
    Copy the full SHA
    d1b85f9 View commit details
    Browse the repository at this point in the history
  2. Merge remote-tracking branch 'jkshuman_repo/passive_crown_fire' into …

    …active_crown_fire
    
    Resolved Conflicts:
     	biogeochem/EDCohortDynamicsMod.F90
     	fire/SFMainMod.F90
    slevis-lmwg committed Nov 27, 2019
    Configuration menu
    Copy the full SHA
    11552e7 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    c9e5cbc View commit details
    Browse the repository at this point in the history

Commits on Dec 2, 2019

  1. Minor cleanup

    slevis-lmwg committed Dec 2, 2019
    Configuration menu
    Copy the full SHA
    e66d24f View commit details
    Browse the repository at this point in the history

Commits on Dec 3, 2019

  1. Configuration menu
    Copy the full SHA
    3512d1e View commit details
    Browse the repository at this point in the history

Commits on Mar 31, 2022

  1. 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
    slevis-lmwg committed Mar 31, 2022
    Configuration menu
    Copy the full SHA
    7dd6019 View commit details
    Browse the repository at this point in the history
  2. Resolve conflicts in EDPatchDynamicsMod.F90

    This and next few commits resolve conflicts missed by git and caught by
    github
    slevis-lmwg committed Mar 31, 2022
    Configuration menu
    Copy the full SHA
    58ea52e View commit details
    Browse the repository at this point in the history

Commits on Apr 1, 2022

  1. Configuration menu
    Copy the full SHA
    f401107 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    d4f8a03 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    fe28162 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    d2d1de3 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    18ae658 View commit details
    Browse the repository at this point in the history
  6. Added a TODO comment and made a history field active

    Committing only to get ./manage_externals/checkout_externals to finish
    slevis-lmwg committed Apr 1, 2022
    Configuration menu
    Copy the full SHA
    742d5cd View commit details
    Browse the repository at this point in the history

Commits on Apr 11, 2022

  1. One-line fix: code builds now

    Using existing test:
    SMS_Lm12_D_Mmpi-serial.1x1_brazil.I2000Clm50FatesCruRsGs.izumi_intel.clm-FatesFireLightningPopDens
    slevis-lmwg committed Apr 11, 2022
    Configuration menu
    Copy the full SHA
    2a47137 View commit details
    Browse the repository at this point in the history
  2. 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
    slevis-lmwg committed Apr 11, 2022
    Configuration menu
    Copy the full SHA
    0a3668b View commit details
    Browse the repository at this point in the history
  3. 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
    slevis-lmwg committed Apr 11, 2022
    Configuration menu
    Copy the full SHA
    fc88363 View commit details
    Browse the repository at this point in the history

Commits on Apr 17, 2022

  1. 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:
    jkshuman committed Apr 17, 2022
    Configuration menu
    Copy the full SHA
    85f0dba View commit details
    Browse the repository at this point in the history

Commits on Apr 18, 2022

  1. 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.
    jkshuman committed Apr 18, 2022
    Configuration menu
    Copy the full SHA
    a93375e View commit details
    Browse the repository at this point in the history

Commits on Apr 19, 2022

  1. Configuration menu
    Copy the full SHA
    456706f View commit details
    Browse the repository at this point in the history

Commits on May 5, 2022

  1. Configuration menu
    Copy the full SHA
    32684f7 View commit details
    Browse the repository at this point in the history

Commits on May 6, 2022

  1. Configuration menu
    Copy the full SHA
    5cb79fe View commit details
    Browse the repository at this point in the history

Commits on Oct 24, 2023

  1. Merge branch 'main' into active_crown_Scott_2001

    adrifoster committed Oct 24, 2023
    Configuration menu
    Copy the full SHA
    5ff191b View commit details
    Browse the repository at this point in the history

Commits on Oct 26, 2023

  1. fix merge conflicts

    adrifoster committed Oct 26, 2023
    Configuration menu
    Copy the full SHA
    3090ea4 View commit details
    Browse the repository at this point in the history