- 
                Notifications
    You must be signed in to change notification settings 
- Fork 50
Add seasonality and impacts integration to model.water #429
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
          
     Draft
      
      
            Wegatriespython
  wants to merge
  284
  commits into
  iiasa:main
  
    
      
        
          
  
    
      Choose a base branch
      
     
    
      
        
      
      
        
          
          
        
        
          
            
              
              
              
  
           
        
        
          
            
              
              
           
        
       
     
  
        
          
            
          
            
          
        
       
    
      
from
Wegatriespython:project/2026/alpsB
  
      
      
   
  
    
  
  
  
 
  
      
    base: main
Could not load branches
            
              
  
    Branch not found: {{ refName }}
  
            
                
      Loading
              
            Could not load tags
            
            
              Nothing to show
            
              
  
            
                
      Loading
              
            Are you sure you want to change the base?
            Some commits from the old base branch may be removed from the timeline,
            and old review comments may become outdated.
          
          Conversation
  
    
      This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
      Learn more about bidirectional Unicode characters
    
  
  
    
    85d90b2    to
    83f5984      
    Compare
  
    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]>
- Closes iiasa#397. - Expand type hints.
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
- 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.
83f5984    to
    ea689e1      
    Compare
  
    
      
        
      
      
  
    6 tasks
  
- Adds custom emissions table - Fixes issue with nexus basins causing world aggregation error - Adds script to call Magicc via climate-processor package
  
    Sign up for free
    to join this conversation on GitHub.
    Already have an account?
    Sign in to comment
  
      
  Add this suggestion to a batch that can be applied as a single commit.
  This suggestion is invalid because no changes were made to the code.
  Suggestions cannot be applied while the pull request is closed.
  Suggestions cannot be applied while viewing a subset of changes.
  Only one suggestion per line can be applied in a batch.
  Add this suggestion to a batch that can be applied as a single commit.
  Applying suggestions on deleted lines is not supported.
  You must change the existing code in this line in order to create a valid suggestion.
  Outdated suggestions cannot be applied.
  This suggestion has been applied or marked resolved.
  Suggestions cannot be applied from pending reviews.
  Suggestions cannot be applied on multi-line comments.
  Suggestions cannot be applied while the pull request is queued to merge.
  Suggestion cannot be applied right now. Please check back later.
  
    
  
    
This PR is intended to be the main development branch for ALPS 16 Part B.
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.