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.

Sign up for GitHub

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

Jump to bottom

IGNORE: Carbon pool [for building docs] #743

Closed
wants to merge 47 commits into from
Closed

IGNORE: Carbon pool [for building docs] #743

wants to merge 47 commits into from

Commits on Jan 26, 2022

  1. draft of regional emission pool implementation 

    - added new  parameter emission_sink_rate
- added new equation EMISSION_POOL with variable EMISS_POOL
- possibility to limit size of pools via constraint currently not included
- note that I did not run the code, so it has not been tested for correct syntax
    @volker-krey @OFR-IIASA
    volker-krey authored and OFR-IIASA committed Jan 26, 2022
    Configuration menu
    Copy the full SHA
    364aafe View commit details
    Browse the repository at this point in the history

  2. Update emission_pool formulation

    @OFR-IIASA
    OFR-IIASA committed Jan 26, 2022
    Configuration menu
    Copy the full SHA
    b3889c9 View commit details
    Browse the repository at this point in the history

  3. Add new tutorial draft on emission_pool

    @OFR-IIASA
    OFR-IIASA committed Jan 26, 2022
    Configuration menu
    Copy the full SHA
    53d3237 View commit details
    Browse the repository at this point in the history

  4. Update emission_pool formulation to use is_XX table

    @OFR-IIASA
    OFR-IIASA committed Jan 26, 2022
    Configuration menu
    Copy the full SHA
    1bd266f View commit details
    Browse the repository at this point in the history

  5. Add tax_emission_pool to GAMS code and optionally in tutorial

    @OFR-IIASA
    OFR-IIASA committed Jan 26, 2022
    Configuration menu
    Copy the full SHA
    471db69 View commit details
    Browse the repository at this point in the history

  6. Add parameter bound_emission_pool to GAMS code and tutorial

    @OFR-IIASA
    OFR-IIASA committed Jan 26, 2022
    Configuration menu
    Copy the full SHA
    b3c8f20 View commit details
    Browse the repository at this point in the history

  7. Update index of EMISS_POOL to match EMISS

    @OFR-IIASA
    OFR-IIASA committed Jan 26, 2022
    Configuration menu
    Copy the full SHA
    7644095 View commit details
    Browse the repository at this point in the history

  8. Adjust naming of sets for consistency

    @OFR-IIASA
    OFR-IIASA committed Jan 26, 2022
    Configuration menu
    Copy the full SHA
    02ef4d8 View commit details
    Browse the repository at this point in the history

  9. Extend tutorial to test 'World' tax

    @OFR-IIASA
    OFR-IIASA committed Jan 26, 2022
    Configuration menu
    Copy the full SHA
    ab7442f View commit details
    Browse the repository at this point in the history

  10. Subtract emission pool taxes from COST_NODAL_NET in MACRO

    @OFR-IIASA
    OFR-IIASA committed Jan 26, 2022
    Configuration menu
    Copy the full SHA
    73fd29e View commit details
    Browse the repository at this point in the history

  11. Start documentation of new GAMS code

    @OFR-IIASA
    OFR-IIASA committed Jan 26, 2022
    Configuration menu
    Copy the full SHA
    2e4b517 View commit details
    Browse the repository at this point in the history

  12. Update of documentation for new GAMS code

    @OFR-IIASA
    OFR-IIASA committed Jan 26, 2022
    Configuration menu
    Copy the full SHA
    3a131f0 View commit details
    Browse the repository at this point in the history

  13. Update model_core for consistency in variable and equation names

    @behnam-zakeri @OFR-IIASA
    behnam-zakeri authored and OFR-IIASA committed Jan 26, 2022
    Configuration menu
    Copy the full SHA
    5a69e43 View commit details
    Browse the repository at this point in the history

  14. Cleanup tutorial a bit

    @behnam-zakeri @OFR-IIASA
    behnam-zakeri authored and OFR-IIASA committed Jan 26, 2022
    Configuration menu
    Copy the full SHA
    d66eb60 View commit details
    Browse the repository at this point in the history

  15. Add reporting equation for PRICE_EMISSION_POOL

    @behnam-zakeri @OFR-IIASA
    behnam-zakeri authored and OFR-IIASA committed Jan 26, 2022
    Configuration menu
    Copy the full SHA
    7dc6466 View commit details
    Browse the repository at this point in the history

  16. Add draft tests for carbon_pool formulation

    @OFR-IIASA
    OFR-IIASA committed Jan 26, 2022
    Configuration menu
    Copy the full SHA
    65bb32f View commit details
    Browse the repository at this point in the history

  17. Update tests for emission_pool formulation

    @OFR-IIASA
    OFR-IIASA committed Jan 26, 2022
    Configuration menu
    Copy the full SHA
    51ebec2 View commit details
    Browse the repository at this point in the history

  18. Adjust cost accounting of emission_pool

    @OFR-IIASA
    OFR-IIASA committed Jan 26, 2022
    Configuration menu
    Copy the full SHA
    33b4818 View commit details
    Browse the repository at this point in the history

  19. Auto stash before merge of "review-carbon-pool" and "volker-krey/carb… 

    …on_pool"
    @behnam-zakeri @OFR-IIASA
    behnam-zakeri authored and OFR-IIASA committed Jan 26, 2022
    Configuration menu
    Copy the full SHA
    48fcc45 View commit details
    Browse the repository at this point in the history

  20. Adjust PRICE_EMISSION_POOL reporting

    @OFR-IIASA
    OFR-IIASA committed Jan 26, 2022
    Configuration menu
    Copy the full SHA
    c3682bf View commit details
    Browse the repository at this point in the history

  21. Remove the scaling of emission marginals based on df_year

    @behnam-zakeri @OFR-IIASA
    behnam-zakeri authored and OFR-IIASA committed Jan 26, 2022
    Configuration menu
    Copy the full SHA
    bc575bb View commit details
    Browse the repository at this point in the history

  22. Test tutorial for bound and tax

    @behnam-zakeri @OFR-IIASA
    behnam-zakeri authored and OFR-IIASA committed Jan 26, 2022
    Configuration menu
    Copy the full SHA
    279d69c View commit details
    Browse the repository at this point in the history

  23. Remove extra scaling

    @behnam-zakeri @OFR-IIASA
    behnam-zakeri authored and OFR-IIASA committed Jan 26, 2022
    Configuration menu
    Copy the full SHA
    489032c View commit details
    Browse the repository at this point in the history

  24. improved documentation of carbon pool implementation in GAMS code

    @volker-krey @OFR-IIASA
    volker-krey authored and OFR-IIASA committed Jan 26, 2022
    Configuration menu
    Copy the full SHA
    51f9a72 View commit details
    Browse the repository at this point in the history

  25. modify carbon pool equations so that pools are always positive

    @volker-krey @OFR-IIASA
    volker-krey authored and OFR-IIASA committed Jan 26, 2022
    Configuration menu
    Copy the full SHA
    512cfd4 View commit details
    Browse the repository at this point in the history

  26. corrected error in documentation of emission_pool equation

    @volker-krey @OFR-IIASA
    volker-krey authored and OFR-IIASA committed Jan 26, 2022
    Configuration menu
    Copy the full SHA
    e71c389 View commit details
    Browse the repository at this point in the history

  27. switched order of terms in EMISSION_POOL_EQUIVALENCE and fixed name i… 

    …n documentation

switching order of terms has no impact on results, but is more logical when presenting the material
    @volker-krey @OFR-IIASA
    volker-krey authored and OFR-IIASA committed Jan 26, 2022
    Configuration menu
    Copy the full SHA
    c54da7d View commit details
    Browse the repository at this point in the history

  28. Move the mapping of years to the top of equation block

    @behnam-zakeri @OFR-IIASA
    behnam-zakeri authored and OFR-IIASA committed Jan 26, 2022
    Configuration menu
    Copy the full SHA
    02ba2e6 View commit details
    Browse the repository at this point in the history

  29. Correct the reporting of PRICE_EMISSION_POOL

    @behnam-zakeri @OFR-IIASA
    behnam-zakeri authored and OFR-IIASA committed Jan 26, 2022
    Configuration menu
    Copy the full SHA
    b9b4cc7 View commit details
    Browse the repository at this point in the history

  30. Account for duration_period in reporting of PRICE_EMISSION_POOL

    @behnam-zakeri @OFR-IIASA
    behnam-zakeri authored and OFR-IIASA committed Jan 26, 2022
    Configuration menu
    Copy the full SHA
    41a8372 View commit details
    Browse the repository at this point in the history

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

    @khaeru @OFR-IIASA
    khaeru authored and OFR-IIASA committed Jan 26, 2022
    Configuration menu
    Copy the full SHA
    aceb928 View commit details
    Browse the repository at this point in the history

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

    @khaeru @OFR-IIASA
    khaeru authored and OFR-IIASA committed Jan 26, 2022
    Configuration menu
    Copy the full SHA
    f6df460 View commit details
    Browse the repository at this point in the history

  33. Reflow comments/docstrings in .models

    @khaeru @OFR-IIASA
    khaeru authored and OFR-IIASA committed Jan 26, 2022
    Configuration menu
    Copy the full SHA
    2b574f6 View commit details
    Browse the repository at this point in the history

  34. Add EMISS_POOL, PRICE_EMISSION_POOL to MESSAGE_ITEMS

    @khaeru @OFR-IIASA
    khaeru authored and OFR-IIASA committed Jan 26, 2022
    Configuration menu
    Copy the full SHA
    b53bfc2 View commit details
    Browse the repository at this point in the history

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

    @khaeru @OFR-IIASA
    khaeru authored and OFR-IIASA committed Jan 26, 2022
    Configuration menu
    Copy the full SHA
    8a06411 View commit details
    Browse the repository at this point in the history

  36. Ensure variables in MESSAGE_ITEMS are always read by JDBCBackend

    @khaeru @OFR-IIASA
    khaeru authored and OFR-IIASA committed Jan 26, 2022
    Configuration menu
    Copy the full SHA
    3e2445f View commit details
    Browse the repository at this point in the history

  37. Ensure all tests pass

    @OFR-IIASA
    OFR-IIASA committed Jan 26, 2022
    Configuration menu
    Copy the full SHA
    349c8a0 View commit details
    Browse the repository at this point in the history

  38. Remove parameter/set initialization

    @OFR-IIASA
    OFR-IIASA committed Jan 26, 2022
    Configuration menu
    Copy the full SHA
    038f2db View commit details
    Browse the repository at this point in the history

  39. Adjust test and tutorial to work with changes from rebase

    @OFR-IIASA
    OFR-IIASA committed Jan 26, 2022
    Configuration menu
    Copy the full SHA
    2e40d75 View commit details
    Browse the repository at this point in the history

  40. Enhance test to check removal of 'is*' set is correct

    @OFR-IIASA
    OFR-IIASA committed Jan 26, 2022
    Configuration menu
    Copy the full SHA
    fcc5795 View commit details
    Browse the repository at this point in the history

  41. Extend emission_pool tests

    @OFR-IIASA
    OFR-IIASA committed Jan 26, 2022
    Configuration menu
    Copy the full SHA
    2d7bac6 View commit details
    Browse the repository at this point in the history

  42. Implement lower and upper bounds for emission pooling

    @behnam-zakeri @OFR-IIASA
    behnam-zakeri authored and OFR-IIASA committed Jan 26, 2022
    Configuration menu
    Copy the full SHA
    9b615e1 View commit details
    Browse the repository at this point in the history

  43. Change =G= to =E= in model_core for EMISS_POOL

    @behnam-zakeri @OFR-IIASA
    behnam-zakeri authored and OFR-IIASA committed Jan 26, 2022
    Configuration menu
    Copy the full SHA
    4b69843 View commit details
    Browse the repository at this point in the history

  44. Reset of tutorial - clear_output

    @OFR-IIASA
    OFR-IIASA committed Jan 26, 2022
    Configuration menu
    Copy the full SHA
    e8b768a View commit details
    Browse the repository at this point in the history

  45. Revise tests for carbon_pool adjustments

    @OFR-IIASA
    OFR-IIASA committed Jan 26, 2022
    Configuration menu
    Copy the full SHA
    edf2c1b View commit details
    Browse the repository at this point in the history

  46. Apply black formatting

    @OFR-IIASA
    OFR-IIASA committed Jan 26, 2022
    Configuration menu
    Copy the full SHA
    26a43bf View commit details
    Browse the repository at this point in the history

  47. Update tests to pass

    @OFR-IIASA
    OFR-IIASA committed Jan 26, 2022
    Configuration menu
    Copy the full SHA
    c7016ad View commit details
    Browse the repository at this point in the history