Code

Regional emission pools#514

Code

Draft

volker-krey wants to merge 47 commits intoiiasa:mainiiasa/message_ix:mainfrom volker-krey:carbon_poolvolker-krey/message_ix:carbon_poolCopy head branch name to clipboard

+4,628-101

Commits

Commits on Jan 26, 2022

• draft of regional emission pool implementation

  Show description for 364aafe
  

  volker-krey

  authored and

  OFR-IIASA

  committed
  364aafe

• Update emission_pool formulation

  OFR-IIASA

  committed
  b3889c9

• Add new tutorial draft on emission_pool

  OFR-IIASA

  committed
  53d3237

• Update emission_pool formulation to use is_XX table

  OFR-IIASA

  committed
  1bd266f

• Add tax_emission_pool to GAMS code and optionally in tutorial

  OFR-IIASA

  committed
  471db69

• Add parameter bound_emission_pool to GAMS code and tutorial

  OFR-IIASA

  committed
  b3c8f20

• Update index of EMISS_POOL to match EMISS

  OFR-IIASA

  committed
  7644095

• Adjust naming of sets for consistency

  OFR-IIASA

  committed
  02ef4d8

• Extend tutorial to test 'World' tax

  OFR-IIASA

  committed
  ab7442f

• Subtract emission pool taxes from COST_NODAL_NET in MACRO

  OFR-IIASA

  committed
  73fd29e

• Start documentation of new GAMS code

  OFR-IIASA

  committed
  2e4b517

• Update of documentation for new GAMS code

  OFR-IIASA

  committed
  3a131f0

• Update model_core for consistency in variable and equation names

  

  behnam-zakeri

  authored and

  OFR-IIASA

  committed
  5a69e43

• Cleanup tutorial a bit

  

  behnam-zakeri

  authored and

  OFR-IIASA

  committed
  d66eb60

• Add reporting equation for PRICE_EMISSION_POOL

  

  behnam-zakeri

  authored and

  OFR-IIASA

  committed
  7dc6466

• Add draft tests for carbon_pool formulation

  OFR-IIASA

  committed
  65bb32f

• Update tests for emission_pool formulation

  OFR-IIASA

  committed
  51ebec2

• Adjust cost accounting of emission_pool

  OFR-IIASA

  committed
  33b4818

• Auto stash before merge of "review-carbon-pool" and "volker-krey/carbon_pool"

  

  behnam-zakeri

  authored and

  OFR-IIASA

  committed
  48fcc45

• Adjust PRICE_EMISSION_POOL reporting

  OFR-IIASA

  committed
  c3682bf

• Remove the scaling of emission marginals based on df_year

  

  behnam-zakeri

  authored and

  OFR-IIASA

  committed
  bc575bb

• Test tutorial for bound and tax

  

  behnam-zakeri

  authored and

  OFR-IIASA

  committed
  279d69c

• Remove extra scaling

  

  behnam-zakeri

  authored and

  OFR-IIASA

  committed
  489032c

• improved documentation of carbon pool implementation in GAMS code

  

  volker-krey

  authored and

  OFR-IIASA

  committed
  51f9a72

• modify carbon pool equations so that pools are always positive

  

  volker-krey

  authored and

  OFR-IIASA

  committed
  512cfd4

• corrected error in documentation of emission_pool equation

  

  volker-krey

  authored and

  OFR-IIASA

  committed
  e71c389

• switched order of terms in EMISSION_POOL_EQUIVALENCE and fixed name in documentation

  Show description for c54da7d
  

  volker-krey

  authored and

  OFR-IIASA

  committed
  c54da7d

• Move the mapping of years to the top of equation block

  

  behnam-zakeri

  authored and

  OFR-IIASA

  committed
  02ba2e6

• Correct the reporting of PRICE_EMISSION_POOL

  

  behnam-zakeri

  authored and

  OFR-IIASA

  committed
  b9b4cc7

• Account for duration_period in reporting of PRICE_EMISSION_POOL

  

  behnam-zakeri

  authored and

  OFR-IIASA

  committed
  41a8372

• Remove manual init/setting of new sets/pars in .tests.test_emission_pool

  

  khaeru

  authored and

  OFR-IIASA

  committed
  aceb928

• Remove solve(var_list=…) for new vars in .tests.test_emission_pool

  

  khaeru

  authored and

  OFR-IIASA

  committed
  f6df460

• Reflow comments/docstrings in .models

  

  khaeru

  authored and

  OFR-IIASA

  committed
  2b574f6

• Add EMISS_POOL, PRICE_EMISSION_POOL to MESSAGE_ITEMS

  

  khaeru

  authored and

  OFR-IIASA

  committed
  b53bfc2

• Add {GAMSModel,MESSAGE}.enforce to enforce consistency of mapping sets

  

  khaeru

  authored and

  OFR-IIASA

  committed
  8a06411

• Ensure variables in MESSAGE_ITEMS are always read by JDBCBackend

  

  khaeru

  authored and

  OFR-IIASA

  committed
  3e2445f

• Ensure all tests pass

  OFR-IIASA

  committed
  349c8a0

• Remove parameter/set initialization

  OFR-IIASA

  committed
  038f2db

• Adjust test and tutorial to work with changes from rebase

  OFR-IIASA

  committed
  2e40d75

• Enhance test to check removal of 'is*' set is correct

  OFR-IIASA

  committed
  fcc5795

• Extend emission_pool tests

  OFR-IIASA

  committed
  2d7bac6

• Implement lower and upper bounds for emission pooling

  

  behnam-zakeri

  authored and

  OFR-IIASA

  committed
  9b615e1

• Change =G= to =E= in model_core for EMISS_POOL

  

  behnam-zakeri

  authored and

  OFR-IIASA

  committed
  4b69843

• Reset of tutorial - clear_output

  OFR-IIASA

  committed
  e8b768a

• Revise tests for carbon_pool adjustments

  OFR-IIASA

  committed
  edf2c1b

• Apply black formatting

  OFR-IIASA

  committed
  26a43bf

• Update tests to pass

  OFR-IIASA

  committed
  c7016ad