Skip to content

Conversation

khaeru
Copy link
Member

@khaeru khaeru commented Aug 7, 2025

#380 ← previous PR | following PR → #430

How to review

@r-aneeque

  • Check that the input data files now contain the correct data for the DIGSY-{BEST,WORST}-{C,S} scenarios. I tried to consolidate the many commits inserting/changing/reverting values in these files, for instance commits that used scenario labels like "SSP(2024).2" and "DIGSY-BEST" before the "DIGSY-BEST-S" etc. labels were added.
  • Confirm that we can delete the branch for Run DIGSY/transport scenarios for 2025-W36 #415 and https://github.com/iiasa/message-ix-models/commits/transport/2025-w20-digsy/ or, if there are data changes there that need to be preserved, give a specific list of which values in which data flows.

@glatterf42

  • Note that 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.

@khaeru khaeru added this to the 2025-09 milestone Aug 7, 2025
@khaeru khaeru self-assigned this Aug 7, 2025
@khaeru khaeru added enh New features or functionality transport MESSAGEix-Transport variant or transport in the base model labels Aug 7, 2025
@khaeru khaeru mentioned this pull request Aug 7, 2025
8 tasks
@khaeru khaeru force-pushed the transport/2025-w32 branch from dd599af to f6df7e4 Compare August 7, 2025 09:37
@codecov
Copy link

codecov bot commented Aug 7, 2025

Codecov Report

❌ Patch coverage is 98.74214% with 2 lines in your changes missing coverage. Please review.
✅ Project coverage is 74.8%. Comparing base (f580412) to head (6e96b04).
⚠️ Report is 21 commits behind head on main.

Files with missing lines Patch % Lines
...sage_ix_models/tests/model/transport/test_build.py 91.6% 1 Missing ⚠️
...essage_ix_models/tests/model/transport/test_ldv.py 83.3% 1 Missing ⚠️
Additional details and impacted files
@@           Coverage Diff           @@
##            main    #392     +/-   ##
=======================================
- Coverage   75.5%   74.8%   -0.7%     
=======================================
  Files        270     270             
  Lines      22093   22153     +60     
=======================================
- Hits       16687   16592     -95     
- Misses      5406    5561    +155     
Files with missing lines Coverage Δ
message_ix_models/model/transport/build.py 94.1% <100.0%> (-1.1%) ⬇️
message_ix_models/model/transport/config.py 98.9% <100.0%> (+<0.1%) ⬆️
message_ix_models/model/transport/data.py 98.9% <100.0%> (+0.1%) ⬆️
message_ix_models/model/transport/demand.py 100.0% <100.0%> (ø)
message_ix_models/model/transport/freight.py 100.0% <100.0%> (ø)
message_ix_models/model/transport/key.py 100.0% <100.0%> (ø)
message_ix_models/model/transport/ldv.py 97.3% <100.0%> (-0.1%) ⬇️
message_ix_models/model/transport/other.py 100.0% <100.0%> (ø)
message_ix_models/model/transport/testing.py 100.0% <100.0%> (ø)
message_ix_models/model/transport/workflow.py 84.5% <100.0%> (+0.1%) ⬆️
... and 12 more

... and 9 files with indirect coverage changes

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@khaeru khaeru force-pushed the transport/2025-w32 branch 4 times, most recently from 811707f to fd3589c Compare September 18, 2025 11:05
khaeru added a commit that referenced this pull request Sep 18, 2025
khaeru pushed a commit that referenced this pull request Sep 19, 2025
Increase values for n=R12_WEU and some other regions to test effect on
LDV CAP/CAP_NEW over time.
khaeru pushed a commit that referenced this pull request Sep 19, 2025
- Experimental: use higher values for R12_WEU
- Revert to more realistic values.
khaeru added a commit that referenced this pull request Sep 19, 2025
- Replace usage of "RAIL", "ROAD" that was ambiguous with e.g. "P RAIL".
- Update .transport.other.
- Update input data files.
Copy link
Member

@glatterf42 glatterf42 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The tests for Python 3.9 and upstream version 3.8.0 are not passing, is that intentional?

@khaeru
Copy link
Member Author

khaeru commented Sep 19, 2025

The tests for Python 3.9 and upstream version 3.8.0 are not passing, is that intentional?

Ah, no—I seem to have used some features that were not advertised as being added in 3.10 or later. Will adjust.

r-aneeque and others added 16 commits September 23, 2025 12:38
Increase values for n=R12_WEU and some other regions to test effect on
LDV CAP/CAP_NEW over time.
- Experimental: use higher values for R12_WEU
- Revert to more realistic values.
- Move .use_scenario_code() method to .code setter.
- Document ScenarioCodeAnnotations.
- Adjust usage and tests.
- MultiFile is a common parent class for existing PDT_CAP and
  LoadFactorLDV.
- Use Config.label property to construct file names.
- Remove duplicative logic in .demand.prepare_computer().
- Use LoadFactorLDV in .build.add_exogenous_data().
- Add tests.
These are now added by LoadFactorLDV.transform().
- Add to project scenario code list.
- Add to transport scenario code list.
- Adjust tests.
- Format files.
- Remove former DIGSY-BEST.csv in favour of DIGSY-BEST-C.csv, etc.
@khaeru
Copy link
Member Author

khaeru commented Sep 23, 2025

The tests for Python 3.9 and upstream version 3.8.0 are not passing, is that intentional?

Ah, no—I seem to have used some features that were not advertised as being added in 3.10 or later. Will adjust.

@glatterf42 I think I ran into python/cpython#136672 —this affected my local (Ubuntu) copy of the 3.13.3 docs, but the updated 3.13.7 version on docs.python.org has the notification. I've adjusted the code to work with earlier Pythons, so tests are now passing.

Copy link
Member

@glatterf42 glatterf42 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks, lgtm since tests are all passing :)

@khaeru khaeru merged commit b51d8f0 into main Sep 24, 2025
25 checks passed
@khaeru khaeru deleted the transport/2025-w32 branch September 24, 2025 08:23
@khaeru khaeru mentioned this pull request Sep 24, 2025
7 tasks
Copy link
Contributor

@r-aneeque r-aneeque left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

Wegatriespython pushed a commit to Wegatriespython/message-ix-models that referenced this pull request Oct 6, 2025
- Update elasticity-f values for scenario=DIGSY-BEST-C.
- Add values for scenario=DIGSY-*-S.
Wegatriespython pushed a commit to Wegatriespython/message-ix-models that referenced this pull request Oct 6, 2025
Increase values for n=R12_WEU and some other regions to test effect on
LDV CAP/CAP_NEW over time.
Wegatriespython pushed a commit to Wegatriespython/message-ix-models that referenced this pull request Oct 6, 2025
- Experimental: use higher values for R12_WEU
- Revert to more realistic values.
Wegatriespython pushed a commit to Wegatriespython/message-ix-models that referenced this pull request Oct 6, 2025
Wegatriespython pushed a commit to Wegatriespython/message-ix-models that referenced this pull request Oct 6, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

enh New features or functionality transport MESSAGEix-Transport variant or transport in the base model

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants