Collect pieces for SSP 2024/ScenarioMIP #235
Conversation
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## main #235 +/- ##
=======================================
- Coverage 77.9% 77.0% -0.9%
=======================================
Files 213 213
Lines 16512 16512
=======================================
- Hits 12872 12724 -148
- Misses 3640 3788 +148
|
khaeru
force-pushed
the
ssp-dev
branch
2 times, most recently
from
526f5cb to
334106a
Compare
|
@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. |
The reply (in Slack) was that the changes in #247 supersede the ones that were on this branch.
|
| wind_res2,Renewable,0.15,0.3,0.53,0.53,0.65,0.75 | ||
| wind_res3,Renewable,0.15,0.3,0.53,0.53,0.65,0.75 | ||
| wind_res4,Renewable,0.15,0.3,0.53,0.53,0.65,0.75 | ||
| dac_lt,CCS,0.1,0.3,0.5,0.7,0.9 |
There was a problem hiding this comment.
@measrainsey @ywpratama I think there is probably an issue to be resolved here.
- In the earlier-merged commits on this branch, an additional column
low_mediumwas added to this table, leading to 6 total columns with numeric values. - In parallel, the 3 rows for
dac_ltetc. were added with only 5 numeric values. - Thus for instance the value 0.5 appears to be in the
low_mediumcolumn, when the DAC-related commit added them to amediumcolumn, and so on for the rest of the row.
I was able to deconflict the branch history, but the latter rows probably also need values (or NaNs) for low_medium inserted so that the entered values appear in the right place.
Please let me know if that's unclear or if you need help making the adjustment.
There was a problem hiding this comment.
gotcha! @ywpratama could you add low_medium values for the DAC technologies? since i wouldn't know the assumptions to make here
|
I see the branch is showing conflicts, so I will rebase manually and force-push. |
Now done. |
|
I will drop my 3 most recent commits and force-push because they break the model build . The commits will be added later again when the industry revisions are fully functional. |
khaeru
force-pushed
the
ssp-dev
branch
2 times, most recently
from
05c1ef5 to
e0f6afa
Compare
|
Rebased after merge of #255. |
khaeru
force-pushed
the
ssp-dev
branch
2 times, most recently
from
d00bdab to
1e47d3c
Compare
|
|
Rebased after the merge of #258. In doing so, there was a conflict in message_ix_models/data/costs/materials/tech_map.csv. I resolved this in favour of the version on FYI @measrainsey if you are making a PR into |
|
After clarifying with @ywpratama, we figured out that the last two commits were pushed accidentally by him. I will drop them now and force-push. |
|
Rebased after merge of #395; the branch goes from 134 to 109 commits (-25). |
Input changes by year_act rather than year_vtg.
This is the script to modify ssp setup to feasibly run low_overshoot scenarios. Important to note that modification to share constraints for end-user technologies for the transport sector is omitted here. I suggest that this is performed in the transport model so if there are updates from their side, this script does not accidentally remove the updates.
Please note that the location of ccs setup data is hardcoded in this function. Please edit according to user's data path
This values were for DAC with storage, but the technology is no longer included as DAC's variants list
- Apply `ruff format`. - Address format check errors or add exclusions. - Address or add mypy exclusions.
- Register new modes - Transfer original meth_h2 mode parametrization to new modes - Delete old meth_h2 mode parametrization
5 participants
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
main, so will include those updates.main.How to review
N/A: this PR will probably not be merged.
Instead, we will pick off subsets of commits to make smaller PRs.
ssp-dev#340 for an example.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.