Code

Passive Crown Fire development#572

Code

Closed

jkshuman wants to merge 74 commits intoNGEET:masterNGEET/fates:masterfrom jkshuman:passive_crown_firejkshuman/fates:passive_crown_fireCopy head branch name to clipboard

+290-160

Commits

Commits on Sep 4, 2019

• Passive Crown Fire development

  Show description for 7193bc6
  

  Jacquelyn Shuman

  committed
  7193bc6

  Copy full SHA for 7193bc6

• Correct EQ for crown_FI

  

  Jacquelyn Shuman

  committed
  bad24e4

  Copy full SHA for bad24e4

Commits on Sep 5, 2019

• Update and correct variable names for passive crown fire

  

  Jacquelyn Shuman

  committed
  093db93

  Copy full SHA for 093db93

• Update name for crown_fire flag

  

  Jacquelyn Shuman

  committed
  f3077df

  Copy full SHA for f3077df

• Remove redundant details within evaluation for crown fire ignition

  

  Jacquelyn Shuman

  committed
  f28f546

  Copy full SHA for f28f546

• Add q_dry as available to entire fire module

  

  Jacquelyn Shuman

  committed
  79a8f5e

  Copy full SHA for 79a8f5e

• Change name for passive_crown fire intensity

  

  Jacquelyn Shuman

  committed
  ae0a5e7

  Copy full SHA for ae0a5e7

Commits on Sep 6, 2019

• Revert q_dry to be local within fire ROS subroutine

  

  Jacquelyn Shuman

  committed
  cafdac5

  Copy full SHA for cafdac5

Commits on Sep 9, 2019

• Update fire/SFMainMod.F90

  Show description for 5558381
  

  jkshuman

  and

  slevis-lmwg

  authored
  5558381

  Copy full SHA for 5558381

• Clean up calculation of fraction crown burnt

  

  Jacquelyn Shuman

  committed
  1d23671

  Copy full SHA for 1d23671

• Re-order for clearer calculation of clear branch bole height

  

  Jacquelyn Shuman

  committed
  764d6c4

  Copy full SHA for 764d6c4

Commits on Sep 10, 2019

• Clean up else statements for scorch height fraction crown burnt

  

  Jacquelyn Shuman

  committed
  a1ebec9

  Copy full SHA for a1ebec9

• Add Cohort variables for crown damage to CohortDynamics

  

  Jacquelyn Shuman

  committed
  a0e59a2

  Copy full SHA for a0e59a2

• Define variable name for crown fire damage

  

  Jacquelyn Shuman

  committed
  1365bf4

  Copy full SHA for 1365bf4

• Zero new cohort values for crown damage

  

  Jacquelyn Shuman

  committed
  45377c9

  Copy full SHA for 45377c9

• Add missing parentheses crown damage conditional

  

  Jacquelyn Shuman

  committed
  73c8762

  Copy full SHA for 73c8762

• Clean up crown damage subroutine

  

  Jacquelyn Shuman

  committed
  c288d76

  Copy full SHA for c288d76

• Remove unnecssary line character crown damage routine

  

  Jacquelyn Shuman

  committed
  0fc0c14

  Copy full SHA for 0fc0c14

• Define new crown damage variables in EDTypes

  

  Jacquelyn Shuman

  committed
  fa1973f

  Copy full SHA for fa1973f

• Update to only "nan" crown damage variables in EDCohortDynamics

  

  Jacquelyn Shuman

  committed
  ee2e576

  Copy full SHA for ee2e576

• Remove extra parentheses crown damage

  

  Jacquelyn Shuman

  committed
  39a39f3

  Copy full SHA for 39a39f3

• Add crown_fire_threshold read from EDTypes

  

  Jacquelyn Shuman

  committed
  703d87f

  Copy full SHA for 703d87f

• Update crown damage for clarity with surface fires

  

  Jacquelyn Shuman

  committed
  7e691e0

  Copy full SHA for 7e691e0

Commits on Sep 11, 2019

• Update crown damage variables to be local to subroutine

  

  Jacquelyn Shuman

  committed
  52b0734

  Copy full SHA for 52b0734

• Remove local crown damage variables from EDTypes

  

  Jacquelyn Shuman

  committed
  cce9213

  Copy full SHA for cce9213

• Remove local crown damage variables from EDTypes, another location

  

  Jacquelyn Shuman

  committed
  eb6e6d1

  Copy full SHA for eb6e6d1

Commits on Sep 12, 2019

• Zero cambial_mort inside cambial_damage_kill not zero_cohort

  

  Jacquelyn Shuman

  committed
  dc1ba20

  Copy full SHA for dc1ba20

• Update drying_ratio value in params file

  

  Jacquelyn Shuman

  committed
  e11602f

  Copy full SHA for e11602f

Commits on Sep 24, 2019

• Merge branch 'master' of https://github.com/NGEET/fates into passive_crown_fire

  

  Jacquelyn Shuman

  committed
  9465439

  Copy full SHA for 9465439

Commits on Sep 25, 2019

• Update crown_ignite_energy to PFT level

  

  Jacquelyn Shuman

  committed
  5587782

  Copy full SHA for 5587782

• Update crown_ignite name in EDPftvarcon

  

  Jacquelyn Shuman

  committed
  76ed1fa

  Copy full SHA for 76ed1fa

• Add paran in SFMain

  

  Jacquelyn Shuman

  committed
  2feddcb

  Copy full SHA for 2feddcb

Commits on Sep 30, 2019

• Add comment with equation for crown_ignite_energy per VanWagner 1977

  

  Jacquelyn Shuman

  committed
  0aef4a9

  Copy full SHA for 0aef4a9

• Add comment with details for empirical value C in passive_crown_FI

  

  Jacquelyn Shuman

  committed
  8d582b7

  Copy full SHA for 8d582b7

• Update flag to logical, clean up conditional

  

  Jacquelyn Shuman

  committed
  29fd4ff

  Copy full SHA for 29fd4ff

Commits on Oct 1, 2019

• Revert passive crown fire flag to binary

  

  Jacquelyn Shuman

  committed
  cb67c91

  Copy full SHA for cb67c91

• Update variable names in EDTypes

  

  Jacquelyn Shuman

  committed
  5b84356

  Copy full SHA for 5b84356

• Update passive_crown_fire in EDTypes

  

  Jacquelyn Shuman

  committed
  188e683

  Copy full SHA for 188e683

• Update variable name and comments crown_fire flag

  

  Jacquelyn Shuman

  committed
  4f017a2

  Copy full SHA for 4f017a2

Commits on Oct 3, 2019

• Update fire/SFMainMod.F90

  Show description for 3e0d8f7
  

  jkshuman

  and

  slevis-lmwg

  authored
  3e0d8f7

  Copy full SHA for 3e0d8f7

Commits on Oct 4, 2019

• Update fire/SFMainMod.F90

  Show description for aeefb59
  

  jkshuman

  and

  slevis-lmwg

  authored
  aeefb59

  Copy full SHA for aeefb59

• Update fire/SFMainMod.F90

  Show description for 5a6fcc0
  

  jkshuman

  and

  slevis-lmwg

  authored
  5a6fcc0

  Copy full SHA for 5a6fcc0

• Add comment about passive crown fire survival

  

  Jacquelyn Shuman

  committed
  9997422

  Copy full SHA for 9997422

Commits on Oct 7, 2019

• Revert zero variables to again occur in EDCohortDynamics

  

  Jacquelyn Shuman

  committed
  012e363

  Copy full SHA for 012e363

Commits on Nov 7, 2019

• CG scaler on lightning, NF>0 for fire event

  

  Jacquelyn Shuman

  committed
  277352c

  Copy full SHA for 277352c

• Make NF site level variable

  

  Jacquelyn Shuman

  committed
  51ca42c

  Copy full SHA for 51ca42c

• Update to NF and fire_intensity subroutine

  

  Jacquelyn Shuman

  committed
  ace251b

  Copy full SHA for ace251b

• Update to NF in EDInit

  

  Jacquelyn Shuman

  committed
  20944a6

  Copy full SHA for 20944a6

• Remove zero of NF in SFMain

  

  Jacquelyn Shuman

  committed
  c79a977

  Copy full SHA for c79a977

Commits on Nov 8, 2019

• Update scorch height to cohort level SFMain,EDTypes

  

  Jacquelyn Shuman

  committed
  281bce1

  Copy full SHA for 281bce1

• Turn off patch level scorch height history var

  

  Jacquelyn Shuman

  committed
  c3f7c23

  Copy full SHA for c3f7c23

• Turn off SH history variable

  

  Jacquelyn Shuman

  committed
  999fa6b

  Copy full SHA for 999fa6b

• Add SH to EDCohortDynamics

  

  Jacquelyn Shuman

  committed
  a98f7d6

  Copy full SHA for a98f7d6

• Remove SH from fuse patch EDPatchDynamics

  

  Jacquelyn Shuman

  committed
  37b478e

  Copy full SHA for 37b478e

Commits on Nov 9, 2019

• include frac_burnt in FI calculation

  

  Jacquelyn Shuman

  committed
  8bc50d2

  Copy full SHA for 8bc50d2

Commits on Nov 18, 2019

• Update NF conditional to real SFMain

  

  Jacquelyn Shuman

  committed
  9747a76

  Copy full SHA for 9747a76

Commits on Nov 19, 2019

• Track all fires. Update energy threshold for fires to zero

  

  Jacquelyn Shuman

  committed
  27748c5

  Copy full SHA for 27748c5

• Fire threshold of 0.01

  

  Jacquelyn Shuman

  committed
  fe7be5d

  Copy full SHA for fe7be5d

Commits on Nov 21, 2019

• Add calculation for canopy base height for crown fire

  

  Jacquelyn Shuman

  committed
  b715f76

  Copy full SHA for b715f76

Commits on Nov 22, 2019

• Update canopy_base_height to patch level for crown fire

  

  Jacquelyn Shuman

  committed
  380666c

  Copy full SHA for 380666c

Commits on Nov 23, 2019

• Clean up crown scorch SFMain

  

  Jacquelyn Shuman

  committed
  7dfced0

  Copy full SHA for 7dfced0

• remove extra lines crown scorch SFMain

  

  Jacquelyn Shuman

  committed
  adca1fb

  Copy full SHA for adca1fb

• Remove extra paren crown scorch

  

  Jacquelyn Shuman

  committed
  6fbba17

  Copy full SHA for 6fbba17

• Add end if crown scorch SFMain

  

  Jacquelyn Shuman

  committed
  bd50250

  Copy full SHA for bd50250

• Clean up crown damage SFMain

  

  Jacquelyn Shuman

  committed
  299cbf5

  Copy full SHA for 299cbf5

Commits on Nov 24, 2019

• Update passive fire fuels in crown damage

  

  Jacquelyn Shuman

  committed
  f244279

  Copy full SHA for f244279

Commits on Nov 25, 2019

• Maintain 50kW/m threshold for tracking fires

  

  Jacquelyn Shuman

  committed
  9a648ea

  Copy full SHA for 9a648ea

• Add Van Wagner ref crown scrorch SFMain

  

  Jacquelyn Shuman

  committed
  2ace55f

  Copy full SHA for 2ace55f

• Add ref and zero patch vars in area_burnt_intensity

  

  Jacquelyn Shuman

  committed
  38388ad

  Copy full SHA for 38388ad

• Merge branch 'fire-threshold' into passive_crown_fire

  

  Jacquelyn Shuman

  committed
  88fe84d

  Copy full SHA for 88fe84d

• Update fire parameter names foliar_moisture, crown_fire_flag

  

  Jacquelyn Shuman

  committed
  ea6ecd9

  Copy full SHA for ea6ecd9

• Update var namaes for crown fire and foliar moisture

  

  Jacquelyn Shuman

  committed
  8b9565e

  Copy full SHA for 8b9565e

• SH as cohort level in crown damage/SFMain

  

  Jacquelyn Shuman

  committed
  23ccb3f

  Copy full SHA for 23ccb3f

Commits on Nov 26, 2019

• Clean up patch level crown fire calculations

  

  Jacquelyn Shuman

  committed
  339aca2

  Copy full SHA for 339aca2