-
Notifications
You must be signed in to change notification settings - Fork 50
Add reporting for bilateralize tool #457
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
Draft
junukitashepard
wants to merge
180
commits into
main
Choose a base branch
from
tools/bilateralize-reporting
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add lines s.t. repo ignores bare, edit, and diagnostic files
Tested for pipelines only
This will get replaced with bilateralization documentation later
bilateralize.py now relies on the message_ix.make_df function rather than a user-defined function. Cuts down code ~120 lines.
In updated framework, flow technologies produce commodities (capacity) that are inputs to trade technologies, rather than using relation_activity to link flow-trade.
1) prepare_edit to generate edit files 2) bare_to_scenario to generate dictionary 3) load_and_solve to update scenario and optionally solve
Update formatting to pass mypy/ruff and allow testing
This removes the NEWPATHWAYS project version of documentation (same content)
Load and solve is now tested Debug to load_and_solve.py (add "_") Add encoding to prepare_edit.py
Increase coverage to GEM and MariTeam imports
Should be in separate GEM folder
Set scenario to a message_ix.Scenario for direct bialteralization in load_and_clone Otherwise function uses start model/scenario from config.yaml There is also option to name specific start model/scenario
To remove oil_exp and oil_imp
Necessary for legacy reporting update
…sa/message-ix-models into tools/bilateralize-reporting
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This adds both legacy reporting and new reporting capabilities for bilateralized trade.
Bilateralizing trade introduces new structures that are not compatible with the existing legacy reporting script.
This PR adds a new version of the legacy reporting (
report/legacy/iamc_report_hackathon_trade.py), default tables (report/legacy/default_tables_trade.py), and post-processing scripts (report/legacy/postprocess_trade.py) to update reported tables to reflect updated import and export structures. This assumes that the user has bilateralized all default fuels (see below for list).In addition, this adds new reporting for imports and exports, using updated reporting functionalities. These can be found in
tools/bilateralize/reporting/new_reporting.py.Users should view
tools/bilateralize/reporting/reporting_workflow.pyfor an example of how both legacy and updated reporting can be used with the bilateralized structure.Default bilateralized commodities
How to review
tools/bilateralize/reporting/reporting_workflow.pyruns and produces outputsPR checklist