Skip to content

Conversation

@Wegatriespython
Copy link
Contributor

This PR is intended to be the main development branch for ALPS 16 Part B.

  • It will cover model extensions to incorporate seasonal water availability.
  • It will integrate with MAGICC and RIME to enable climate impacts integration.
  • It will not be merged as it is.

How to review

N/A

PR checklist

  • [ ] Continuous integration checks all ✅. Will not be merged
  • [ ] Add or expand tests; coverage checks both ✅
  • [ ] Add, expand, or update documentation.
  • [ ] Update doc/whatsnew.

@Wegatriespython Wegatriespython marked this pull request as draft September 24, 2025 08:40
@Wegatriespython Wegatriespython added the water MESSAGEix-Nexus (water) variant label Sep 24, 2025
@Wegatriespython Wegatriespython self-assigned this Sep 24, 2025
Wegatriespython and others added 23 commits September 26, 2025 11:56
Bound = histroical cap at last historical year.
- Code was very messy
Use basin filtering everywhere

More filtering

More filtering

Fix accidental removal

Add basin reduction options

Clean up filtering code

Add min 1 basin region pair req

Add reg_to_basin return tech

consolidate return logic

Fix failing tests

Tests failure due to missing valid_basins list. Adding list to context
to fix issue.
* Update minimum info for NEWPATHWAYS doc

---------

Co-authored-by: Fridolin Glatter <[email protected]>
Bumps the all-actions group with 1 update: [actions/checkout](https://github.com/actions/checkout).


Updates `actions/checkout` from 4 to 5
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](actions/checkout@v4...v5)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-version: '5'
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: all-actions
...

Signed-off-by: dependabot[bot] <[email protected]>
Remove unnecessary reads/writes to disk
Replace sequential unit conversions with loop
- Add aggregation step to Final Energy|Industry
- Fix |Solids, |Coal and |Biomass aggregate components
- Add missing ammonia mass-energy conversion
- Fix unit conversion for Final Energy quantities
Only replace Liquids|Other and not Other Sector strings
- Move electricity mapping
- Rename function variables for readability
khaeru and others added 20 commits October 6, 2025 14:03
- 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.
- Input level at water_avail_basin
- Input commodity surfacewater_basin

- output level water_supply
- output commodity freshwater
- Add build_nexus_subannual.py: Integration script for building MESSAGEix-Nexus with monthly timesteps
- Add timeslice.py: Modular implementation of subannual timeslice addition
- Add Excel template for 12 monthly timeslices (input_data_12_R12.xlsx)
- Add monthly water demand data for R12 regions (ssp2_m_water_demands.csv)

Enables water-energy nexus modeling with monthly temporal resolution for improved
representation of seasonal water availability and energy demand patterns.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

water MESSAGEix-Nexus (water) variant

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants