Skip to content

merge develop#56

Open
caviddhen wants to merge 1767 commits intomarketingMarginsfrom
develop
Open

merge develop#56
caviddhen wants to merge 1767 commits intomarketingMarginsfrom
develop

Conversation

@caviddhen
Copy link
Owner

🐦 Description of this PR 🐦

  • Briefly explain the purpose of this pull request

🔧 Checklist for PR creator 🔧

  • Label pull request from the label list.

    • Low risk: Simple bugfixes (missing files, updated documentation, typos) or changes in start or output scripts
    • Medium risk: Uncritical changes in the model core (e.g. moderate modifications in non-default realizations)
    • High risk: Critical changes in model core or default settings (e.g. changing a model default or adjusting a core mechanic in the model)
  • Self-review own code

    • No hard coded numbers and cluster/country/region names.
    • The new code doesn't contain declared but unused parameters or variables.
    • magpie4 R library has been updated accordingly and backwards compatible where necessary.
    • scenario_config.csv has been updated accordingly (important if default.cfg has been updated)
  • Document changes

    • Add changes to CHANGELOG.md
    • Where relevant, put In-code documentation comments
    • Properly address updates in interfaces in the module documentations
    • run goxygen::goxygen() and verify the modified code is properly documented
  • Perform test runs

    • Low risk:
      • Run a compilation check via Rscript start.R --> "compilation check"
    • Medium risk:
      • Run test runs via Rscript start.R --> "test runs"
      • Check logs for errors/warnings
    • High risk:
      • Run test runs via Rscript start.R --> "test runs"
      • Check logs for errors/warnings
      • Default run from the PR target branch for comparison
      • Provide relevant comparison plots (land-use, emissions, food prices, land-use intensity,...)

📉 Performance changes 📈

  • Current develop branch default : ** mins
  • This PR's default : ** mins

🚨 Checklist for reviewer 🚨

  • PR is labeled correctly
  • Code changes look reasonable
    • No hard coded numbers and cluster/country/region names.
    • No unnecessary increase in module interfaces
    • model behavior/performance is satisfactory.
  • Changes are properly documented
    • CHANGELOG is updated correctly
    • Updates in interfaces have been properly addressed in the module documentations
    • In-code documentation looks appropriate
  • content review done (at least 1)
  • RSE review done (at least 1)

georg-schroeter and others added 30 commits June 3, 2025 14:33
Add consumer margin to food price postsolve
Update input data from rev4.118 to rev rev4.119
Co-authored-by: Florian Humpenöder <humpenoeder@pik-potsdam.de>
Co-authored-by: Florian Humpenöder <humpenoeder@pik-potsdam.de>
Co-authored-by: Florian Humpenöder <humpenoeder@pik-potsdam.de>
Update of pasture feed balance flows and inclusion of feed intake switch
pascal-sauer and others added 30 commits January 13, 2026 09:51
Co-authored-by: georg-schroeter <Georg.Schroeter@pik-potsdam.de>
Co-authored-by: Pascal Sauer <156898545+pascal-sauer@users.noreply.github.com>
Update revision + starting script for biomass
…magpie_calib_expansion

# Conflicts:
#	CHANGELOG.md
Co-authored-by: Pascal Sauer <156898545+pascal-sauer@users.noreply.github.com>
reverted calculation of 2020 as average of 2010 and 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.