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

Collect pieces for SSP 2024/ScenarioMIP #235

Draft
wants to merge 93 commits into
base: main
Choose a base branch
from
Draft

Collect pieces for SSP 2024/ScenarioMIP #235

wants to merge 93 commits into from

Conversation

khaeru
Copy link
Member

@khaeru khaeru commented Sep 26, 2024

This PR is to track the working branch ssp-dev, which exists to help with work on the SSP 2024/ScenarioMIP project by collecting or pointing to all the code that is actually used to execute the workflow.

The goal is to be complete and up-to-date as possible for that purpose; other aspects (code quality, cleanliness, or readiness for main) are less important.

How to use

  • Per Collect pieces for SSP 2024/ScenarioMIP workflows #234, it is not necessary to use this branch. If you can make an atomic PR for individual, small changes, do that first. This branch will be regularly rebased on latest main, so will include those updates.
  • Update this branch, e.g. by cherry-picking commits or copying code from various other working branches used for this project.
  • Make a PR that targets into this branch, and then request that someone review it. Continue work on this branch, rather than the PR source branch.

How to review

TBD: this PR may not eventually be merged.

PR checklist

  • Continuous integration checks all ✅ TBD if this will be required.
  • Add or expand tests; coverage checks both ✅
  • Add, expand, or update documentation.
  • Update doc/whatsnew.

@khaeru khaeru added the p:SSP-2024 2024 SSP updates and ScenarioMIP label Sep 26, 2024
Copy link

codecov bot commented Sep 26, 2024

Codecov Report

Attention: Patch coverage is 0% with 191 lines in your changes missing coverage. Please review.

Project coverage is 60.9%. Comparing base (0645fd5) to head (1a26e6c).

Files with missing lines Patch % Lines
...essage_ix_models/project/ssp/script/util/shares.py 0.0% 100 Missing ⚠️
...age_ix_models/project/ssp/script/util/functions.py 0.0% 91 Missing ⚠️

❗ There is a different number of reports uploaded between BASE (0645fd5) and HEAD (1a26e6c). Click for more details.

HEAD has 78 uploads less than BASE
Flag BASE (0645fd5) HEAD (1a26e6c)
87 9
Additional details and impacted files
@@           Coverage Diff            @@
##            main    #235      +/-   ##
========================================
- Coverage   76.5%   60.9%   -15.6%     
========================================
  Files        203     205       +2     
  Lines      15546   15737     +191     
========================================
- Hits       11896    9597    -2299     
- Misses      3650    6140    +2490     
Files with missing lines Coverage Δ
...age_ix_models/project/ssp/script/util/functions.py 0.0% <0.0%> (ø)
...essage_ix_models/project/ssp/script/util/shares.py 0.0% <0.0%> (ø)

... and 53 files with indirect coverage changes

@khaeru
Copy link
Member Author

khaeru commented Nov 14, 2024

@GamzeUnlu95 @macflo8 —there now appears to be a conflict in a particular materials data file. I think this is the same one modified in #247 (FYI also @glatterf42 who reviewed there).

Can you please say whether these two changes to the file are perhaps the same, or different? Does one supersede the other, or are they parallel/non-overlapping?

This will allow to rebase and update the branch, which we need to do (urgently) in order for it to be usable in the ScenarioMIP process.

macflo8 and others added 28 commits November 14, 2024 12:07
Run tool.costs in "energy" config additionally and extract *_i
technology cost timeseries

Update tech_map_energy.csv with original fix cost ratios
Use 2025 values for price_ref/cost_ref if available

Add demand_ref update procedure
Adjust bounds, constraints and historic activity manually to resolve
infeasibilities
* Add additional technology "meth_fs_ind" between meth_t_d and demand
* Move CO2_Emision from "steam_craker_petro" and "meth_t_d" to
"production_HVC" and "meth_fs_ind"
* Adjust existing methanol input and olefin output coefficients
* Add butylene, C5H10+ and fuel gases yields as refinery_gas and
 lightoil output
* Adjust CO2_cc relation coefficient to reach 1:1 in/out carbon balance
Changes made for solar_res, meth_coal, meth_coal_ccs and nuc_hc technologies.
@khaeru
Copy link
Member Author

khaeru commented Nov 14, 2024

Can you please say whether these two changes to the file are perhaps the same, or different? Does one supersede the other, or are they parallel/non-overlapping?

The reply (in Slack) was that the changes in #247 supersede the ones that were on this branch.
Accordingly, I did:

  • git switch ssp-dev && git pull --rebase update my local copy of the branch.
  • git rebase -i main initiate interactive rebase.
  • Chose edit for the commit with subject "Move co2_trans_disp parametrization to file" —the only commit on this branch that modified the file.
  • Removed the changes to that file from the commit:
    git restore --staged message_ix_models/data/material/steel/Global_steel_MESSAGE.xlsx 
    git restore message_ix_models/data/material/steel/Global_steel_MESSAGE.xlsx 
    
  • git rebase --continue
  • git push --force

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
p:SSP-2024 2024 SSP updates and ScenarioMIP
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants