Code

Feat 13 welfare#156

Code

Merged

sallyrobson merged 25 commits intomaine4st-dev/E4ST.jl:mainfrom feat-13-welfaree4st-dev/E4ST.jl:feat-13-welfareCopy head branch name to clipboardJun 14, 2023

+912-189

Commits

Commits on Jun 5, 2023

• Add more welfare calculations including regulatory factor

  Ethan-Russell

  committed
  bd64b1f

  Copy full SHA for bd64b1f

• Add the E4ST logo

  Ethan-Russell

  committed
  1910539

  Copy full SHA for 1910539

• Add the ability to add things to a result formula, add itc to invest_subsidy

  Ethan-Russell

  committed
  7b97e94

  Copy full SHA for 7b97e94

• Add more formulas, add objective coefficients

  Ethan-Russell

  committed
  d91d124

  Copy full SHA for d91d124

Commits on Jun 6, 2023

• Add more welfare calculations, results formulas and tests

  Ethan-Russell

  committed
  97ee5b7

  Copy full SHA for 97ee5b7

Commits on Jun 7, 2023

• Add CCUS costs to welfare

  Ethan-Russell

  committed
  9fe808b

  Copy full SHA for 9fe808b

• Merge branch 'main' into feat-13-welfare

  Ethan-Russell

  committed
  bfb2eea

  Copy full SHA for bfb2eea

• Add policies to welfare

  Ethan-Russell

  committed
  659a69f

  Copy full SHA for 659a69f

Commits on Jun 8, 2023

• Add many more results formulas for Storage

  Ethan-Russell

  committed
  f616581

  Copy full SHA for f616581

• Merge branch 'main' into feat-13-welfare

  Ethan-Russell

  committed
  d68fece

  Copy full SHA for d68fece

Commits on Jun 9, 2023

• Do not filter retired generators that are still within their econ life

  Ethan-Russell

  committed
  ee9b654

  Copy full SHA for ee9b654

• Fix ITC merge conflict

  Ethan-Russell

  committed
  189fcd5

  Copy full SHA for 189fcd5

• fix name in ITCStorage

  Ethan-Russell

  committed
  7b50a0c

  Copy full SHA for 7b50a0c

• Merge branch 'main' into feat-13-welfare

  Ethan-Russell

  committed
  3dcd020

  Copy full SHA for 3dcd020

• Add results formula for emission price investment cost adjustment

  Ethan-Russell

  committed
  cc58298

  Copy full SHA for cc58298

• Now the summarize model should be logging

  Ethan-Russell

  committed
  0ad3f91

  Copy full SHA for 0ad3f91

Commits on Jun 12, 2023

• Add transmission capex and routine capex to the model

  Ethan-Russell

  committed
  4a51e8c

  Copy full SHA for 4a51e8c

Commits on Jun 13, 2023

• Add past investment cost and subsidy, as well as year unbuilt

  Ethan-Russell

  committed
  8a2e978

  Copy full SHA for 8a2e978

• Add past capex accounting for generators

  Ethan-Russell

  committed
  7724078

  Copy full SHA for 7724078

• Minor update to total cost for generators to include past invest cost/subs

  Ethan-Russell

  committed
  86f70ca

  Copy full SHA for 86f70ca

• Make sure the past capex accounting works for storage, minor fixes

  Ethan-Russell

  committed
  7b0248b

  Copy full SHA for 7b0248b

Commits on Jun 14, 2023

• Add sequential storage

  Ethan-Russell

  committed
  a0deb05

  Copy full SHA for a0deb05

• Minor comments and corrections

  Ethan-Russell

  committed
  2e291b5

  Copy full SHA for 2e291b5

• Merge branch 'main' into feat-13-welfare

  Ethan-Russell

  committed
  8be2c12

  Copy full SHA for 8be2c12

• Change _to_container to to_container

  Ethan-Russell

  committed
  ca2a465

  Copy full SHA for ca2a465