Code

Add wild fire setting switches#662

Code

Open

JoshuaRady wants to merge 28 commits intouaf-arctic-eco-modeling:masteruaf-arctic-eco-modeling/dvm-dos-tem:masterfrom JoshuaRady:HearthJoshuaRady/dvm-dos-tem:HearthCopy head branch name to clipboard

+173-26

Commits

Commits on Aug 2, 2023

• Add switches to turn wildfire off and on for each run stage.

  

  Joshua Rady

  authored and

  Joshua Rady

  committed
  114cbe0

  Copy full SHA for 114cbe0

• Add commnent to ModelData.h.

  

  Joshua Rady

  authored and

  Joshua Rady

  committed
  7d1422c

  Copy full SHA for 7d1422c

• Add alternate igntions mode switch and placeholder in WildFire::should_ignite().

  

  Joshua Rady

  authored and

  Joshua Rady

  committed
  f8d1d58

  Copy full SHA for f8d1d58

• Update call to fire.should_ignite() with added ModelData parameter.

  

  Joshua Rady

  authored and

  Joshua Rady

  committed
  0f3f65d

  Copy full SHA for 0f3f65d

• Add ignition mode setting that enables fire return interval based wildfire fire in the transient and scenario run stages.

  

  Joshua Rady

  authored and

  Joshua Rady

  committed
  b2cbe98

  Copy full SHA for b2cbe98

Commits on Oct 25, 2023

• Cleanup comments and fix missing pointer in WildFire::should_ignite().

  

  Joshua Rady

  authored and

  Joshua Rady

  committed
  daacde0

  Copy full SHA for daacde0

• Change WildFire::is_fire_return_date() to WildFire::isFireReturnDate().

  

  Joshua Rady

  authored and

  Joshua Rady

  committed
  45a873c

  Copy full SHA for 45a873c

• Resolve conflicts from master. Note that the fire_on_XX and XX_dsb flags esentially duplicate each other.

  

  Joshua Rady

  authored and

  Joshua Rady

  committed
  bbcf797

  Copy full SHA for bbcf797

Commits on Nov 8, 2023

• Fix , -> : in ModelData.h.

  

  Joshua Rady

  authored and

  Joshua Rady

  committed
  3bcea42

  Copy full SHA for 3bcea42

Commits on Nov 13, 2023

• Add missing semicolon.

  

  Joshua Rady

  authored and

  Joshua Rady

  committed
  3008ebf

  Copy full SHA for 3008ebf

• Add missing closing bracket.

  

  Joshua Rady

  authored and

  Joshua Rady

  committed
  e3e36ab

  Copy full SHA for e3e36ab

• Correct variable name.

  

  Joshua Rady

  authored and

  Joshua Rady

  committed
  d18f5a5

  Copy full SHA for d18f5a5

Commits on Jan 5, 2024

• Merge branch 'master' into Hearth

  

  Joshua Rady

  authored and

  Joshua Rady

  committed
  c896614

  Copy full SHA for c896614

Commits on Jan 18, 2024

• Add missing thises and clean up code.

  

  Joshua Rady

  authored and

  Joshua Rady

  committed
  1c76a2a

  Copy full SHA for 1c76a2a

• Change logic in WildFire::isFireReturnDate() to protect against a divide by zero.

  

  Joshua Rady

  authored and

  Joshua Rady

  committed
  1df33d8

  Copy full SHA for 1df33d8

• Add debug reporting to WildFire::isFireReturnDate().

  

  Joshua Rady

  authored and

  Joshua Rady

  committed
  3f987da

  Copy full SHA for 3f987da

• Add missing semicolons.

  

  Joshua Rady

  authored and

  Joshua Rady

  committed
  b1b51f7

  Copy full SHA for b1b51f7

• More handing of divide by zero issues.

  

  Joshua Rady

  authored and

  Joshua Rady

  committed
  4ca12dd

  Copy full SHA for 4ca12dd

• Add missing semicolon.

  

  Joshua Rady

  authored and

  Joshua Rady

  committed
  07a7ff2

  Copy full SHA for 07a7ff2

• More handing of divide by zero issues.

  

  Joshua Rady

  authored and

  Joshua Rady

  committed
  49904a4

  Copy full SHA for 49904a4

Commits on Jan 19, 2024

• Remove temporary reporting and clean up.

  

  Joshua Rady

  authored and

  Joshua Rady

  committed
  3057e2b

  Copy full SHA for 3057e2b

Commits on Jan 22, 2024

• Merge branch 'master' into Hearth

  

  Joshua Rady

  authored and

  Joshua Rady

  committed
  4344348

  Copy full SHA for 4344348

Commits on Apr 15, 2024

• Merge changes from master into Hearth.

  JoshuaRady

  committed
  cd6daaf

  Copy full SHA for cd6daaf

Commits on Apr 16, 2024

• Remove fire_on_PR switch from config file and code.

  

  Joshua Rady

  authored and

  Joshua Rady

  committed
  09b4a3b

  Copy full SHA for 09b4a3b

• Restore orignal check for PR stage.

  

  Joshua Rady

  authored and

  Joshua Rady

  committed
  e7f7291

  Copy full SHA for e7f7291

• Change config flags of the form 'model_settings: fire_on_XX = 0' to 'stage_settings: sc: fire = false'.

  

  Joshua Rady

  authored and

  Joshua Rady

  committed
  08881d7

  Copy full SHA for 08881d7

• Change the 'model_settings: fire_ignition_mode' flag to two 'module_settings: dsb: fire: ignition_XX' flags and update code to reflect this.

  

  Joshua Rady

  authored and

  Joshua Rady

  committed
  64eaca5

  Copy full SHA for 64eaca5

Commits on Jun 3, 2024

• Merge changes from master.

  

  Joshua Rady

  authored and

  Joshua Rady

  committed
  dee51b6

  Copy full SHA for dee51b6