forked from magpiemodel/magpie
-
Notifications
You must be signed in to change notification settings - Fork 0
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
merge develop #56
Open
caviddhen
wants to merge
1,022
commits into
marketingMargins
Choose a base branch
from
develop
base: marketingMargins
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.
Open
merge develop #56
Conversation
This file contains 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
Merge master into develop
# Conflicts: # CHANGELOG.md
Bugfix in water cost equation
Co-authored-by: Jan Dietrich <[email protected]>
Co-authored-by: Pascal Sauer <[email protected]>
Co-authored-by: Pascal Sauer <[email protected]>
Co-authored-by: Pascal Sauer <[email protected]>
Co-authored-by: Pascal Sauer <[email protected]>
# Conflicts: # CHANGELOG.md # main.gms
# Conflicts: # config/default.cfg
Co-authored-by: Debbora Leip <[email protected]>
bugfix removal grassland realisation
option for exogenous peatland rewetting
new additional_data version with upgraded npi_ndc policy settings.
syncing npi and ndc policies to year 2025.
bugfix fader GHG emission pricing policy and Sync of NPI and NDC policies to 2025
release MAgPIE 4.9.0
merge master into develop
FSEC AMTs one folder per scenario, inputdelete spamplots
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.
🐦 Description of this PR 🐦
🔧 Checklist for PR creator 🔧
Label pull request from the label list.
Self-review own code
magpie4
R library has been updated accordingly and backwards compatible where necessary.scenario_config.csv
has been updated accordingly (important ifdefault.cfg
has been updated)Document changes
CHANGELOG.md
goxygen::goxygen()
and verify the modified code is properly documentedPerform test runs
Rscript start.R --> "compilation check"
Rscript start.R --> "test runs"
Rscript start.R --> "test runs"
📉 Performance changes 📈
🚨 Checklist for reviewer 🚨
CHANGELOG
is updated correctly