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.

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

Adjust for iiasa/message_ix#738 #120

Merged
merged 1 commit into from
Sep 2, 2023
Merged

Adjust for iiasa/message_ix#738 #120

merged 1 commit into from
Sep 2, 2023

Conversation

khaeru
Copy link
Member

@khaeru khaeru commented Sep 2, 2023

  • Only add "y::model", "y0" if not already defined. After Update & improve reporting message_ix#738 (that is, first message_ix release after 3.7.0), these will be defined in the Reporter by default.
  • Add a new "defaults" callback to hold settings and computations always used.

How to review

Read the diff and note that the CI checks all pass.

PR checklist

  • Continuous integration checks all ✅
  • Add or expand tests; coverage checks both ✅
  • Add, expand, or update documentation.
  • Update doc/whatsnew. Covered by Migrate message_data.reporting #116.

Only add "y::model", "y0" if not already defined
@khaeru khaeru added the enh New features or functionality label Sep 2, 2023
@khaeru khaeru self-assigned this Sep 2, 2023
@codecov
Copy link

codecov bot commented Sep 2, 2023

Codecov Report

Merging #120 (b625672) into main (2f62b67) will increase coverage by 0.1%.
The diff coverage is 100.0%.

@@           Coverage Diff           @@
##            main    #120     +/-   ##
=======================================
+ Coverage   66.9%   67.1%   +0.1%     
=======================================
  Files         70      70             
  Lines       4635    4640      +5     
=======================================
+ Hits        3104    3116     +12     
+ Misses      1531    1524      -7     
Files Changed Coverage Δ
message_ix_models/report/__init__.py 68.0% <100.0%> (+5.4%) ⬆️

@khaeru khaeru merged commit 493c6a0 into main Sep 2, 2023
10 checks passed
@khaeru khaeru deleted the enh/report-y branch September 18, 2023 12:07
lorenzousai pushed a commit to lorenzousai/message-ix-models that referenced this pull request Sep 21, 2023
* Add IAMC variable names in sections "iamc:" and "report:"
* Create quantity for total electricity generation in "combine:"
* Add biomass quantities and IAMC variable names
* Rename variables in SE aggregation; simplify "iamc:" and "report:" sections
* Move secondary_energy key to "general:" section to apply units over it
* Add secondary energy solids to reporting
* Add missing entries for secondary energy gases to reporting
* Include @behnam-zakeri electricity reporting from iiasa#105
  First of multiple steps.
* Improve docstring of reporting.core.add_general()
* Improve global.yaml to include secondary inputs & outputs
  The re-combine of the main outputs of some groups of technologies needs to be adressed e.g. ethanol, methanol, lightoil, etc.
* Correct typo in gases:nl-ya and added the correct tag to qty 'out::'
* Update docstring of reporting.core.add_general()
* Correct typo in previous.
* Reflow lines and comments in global.yaml
* Comment unused share_cogeneration
* Simplify regex replacement in reporting.util

Co-authored-by: Paul Natsuo Kishimoto <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enh New features or functionality
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant