Skip to content

Fix Mode inconsistencies in water.infra #405

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.

Sign up for GitHub

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

Jump to bottom
Open
wants to merge 38 commits into
base: main
Choose a base branch
from
Open

Fix Mode inconsistencies in water.infra #405

wants to merge 38 commits into from

Conversation

Wegatriespython
Copy link
Contributor

Fix for issue #404

This PR fixes the issues outline in #404:

  • fix loop exit conditions
  • add missing IO for techs
  • increases test coverage to ensure the bug is properly detected and there is no inadvertent regression.

How to review

  • Double check the mode value correspondences for M1 an Mf and the raw data source file.
  • Read the diff and verify tests pass.

PR checklist

  • Continuous integration checks all ✅
  • Add or expand tests; coverage checks both ✅

@Wegatriespython Wegatriespython self-assigned this Aug 14, 2025
@Wegatriespython Wegatriespython added the water MESSAGEix-Nexus (water) variant label Aug 14, 2025
@Wegatriespython
Fix magic technology inp ratios
00e57dd 
- Value of 0.8 inp means 1 unit water for 0.8 units of input
@Wegatriespython
Modify output coeffs to represent efficiency losses
e8c8d55
@Wegatriespython
Raise costs fossil gw
6ec7609
@Wegatriespython
Add desal bound assertion to test
89297dc
@Wegatriespython
Increase fossil_gw elec inp req
1949919
@Wegatriespython
Remove bad input
5e11e24 
- Circular logic
@Wegatriespython
Change vintage active calc for dummy tech
719c586
@Wegatriespython
Relabel 6p0 to 7p0
63a91a6 
- Minor change to values ommitted.
@Wegatriespython
Ruff changes
f11a664
@Wegatriespython
Set hist to 2025
eb6f217 
Unreasonable expectation for first model year here.
@Wegatriespython
Add soft constraint relaxation
d4ed042 
- desal act bound lo causes infeasibilties.
@Wegatriespython
Lower fossil_gw elec inp cost
eb796e1
@Wegatriespython
Make TL filtering more efficient
2b53260 
Harcoded heuristic for kinkyear.
@Wegatriespython
Increase bound_act_lo relaxation
32a0f39
@Wegatriespython
Clip act bound to cap limit
4c189e2
@Wegatriespython
Comment out soft constraints
a4c43ec
@Wegatriespython
Set ot_saline growht new cap growth rate 0
5fef8a0
@Wegatriespython
Swap basin to reg inputs
7609903 
- Input level at water_avail_basin
- Input commodity surfacewater_basin

- output level water_supply
- output commodity freshwater
@Wegatriespython
Set ot_saline growht new cap growth rate 0
3967103
@Wegatriespython
Swap basin to reg inputs
d87856c 
- Input level at water_avail_basin
- Input commodity surfacewater_basin

- output level water_supply
- output commodity freshwater
@Wegatriespython
Add reg_to_basin return tech
1dbd8ea 
consolidate return logic
@Wegatriespython
Update vtg filtering
cc52e86
@Wegatriespython
Add second basin_to_reg for irrigation
4816c0e
@Wegatriespython
Relabel basin_to_reg techs
d6b0907
@Wegatriespython
Fix double water return flows
c939bfd 
Now water return flows follow a single path:
cooling techs -> water_return commodity -> reg_to_basin tech ->
surfacewater_basin
@Wegatriespython
Lower fossil gw TL
6133572
@Wegatriespython
Add bounds to extract_salinewater_cool
7cc6419 
Bound = histroical cap at last historical year.
@Wegatriespython
Refactor add_cool_tech
5b1449f 
- Code was very messy
@Wegatriespython
Fix filtering
3951f42
@Wegatriespython
Restore feasibility
9bcc5af
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@adrivinca adrivinca Awaiting requested review from adrivinca adrivinca is a code owner

@awais307 awais307 Awaiting requested review from awais307 awais307 is a code owner

At least 1 approving review is required to merge this pull request.

Assignees

@Wegatriespython Wegatriespython

Labels
water MESSAGEix-Nexus (water) variant
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@Wegatriespython