-
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
309
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
Add guard clause to cover None return value case
- Fix wrong entries in aggregate components - Fix wrong IAMC variable name
- Apply code standard to docstrings - Extend type hinting - Chain pandas operations
Emissions reporting now handled by message_data/run_emissions_workflow.py which uses the emissions_run_config.yaml with GAINS-based CH4/N2O reporting. Deleted: - generate_emissions_report.py (replaced by message_data workflow)
- Change table_def from emissions_tables to materials_dac_tables - Use retr_NONCO2emi() for CH4 and N2O (reads emission_factor with GAINS names) - Required for MESSAGE-GLOBIOM v6.x scenarios where CH4/N2O stored as: CH4_PP_ENE_COAL, CH4_PP_ENE_GAS, CH4_GAS_PROD, etc. in emission_factor Legacy retr_othemi() reads relation_activity which has 0 rows for CH4/N2O.
Uses climate assesment package
Additions: - emissions_run_config.yaml: GAINS-based emissions reporting config for v6.x scenarios - fix_nox_units.py: NOx unit conversion script for MAGICC harmonization - input_data_12_R12.xlsx: Timeslice data for R12 regional model Improvements to .gitignore: - Ignore markdown analysis files - Ignore analysis outputs (plots, temporary Excel files) - Ignore reporting output directories - Ignore Windows Zone.Identifier files - Add wasteland directory for throwaway scripts
- use function predict_from_gmt
- Implement RIMEx functions where rimeX doesn't directly expose them
-adds tests for alps
- add cache functionality
- move 1 function from rime to mix models
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.