Skip to content
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

Add BE price incentive realization for 1st and 2nd gen #639

Merged
merged 107 commits into from May 15, 2024

Conversation

jansteinhauser
Copy link
Contributor

@jansteinhauser jansteinhauser commented Mar 4, 2024

🐦 Description of this PR 🐦

This PR prepares MAgPIE for its use in the MAgPIE-MESSAGE emulator. Primarily, this includes a new realization that is a slight variation of the current default for 60_bioenergy, allowing for price-driven BE production. It also includes several other smaller changes such as, optional, an early afforestation block and a cropland growth constraint.

🔧 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,...)

Productivity_Landuse_Intensity_Indicator_Tau

Prices_Index2010_Agriculture_Food_products

Emissions_CO2_Land_Land_use_Change

Resources_Land_Cover_Forest

Resources_Land_Cover_Cropland

📉 Performance changes 📈

  • Current develop branch default : 20 mins
  • This PR's default : 23 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)

jansteinhauser and others added 30 commits March 2, 2023 11:52
Copy link
Member

@tscheypidi tscheypidi left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the new changes look good except the one config change I highlighted...there must have been gone something wrong I think

config/default.cfg Outdated Show resolved Hide resolved
Copy link
Contributor

@flohump flohump left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good in general.
I have one comment / request on age-classes (ac0) to double check with @tscheypidi

modules/32_forestry/dynamic_feb21/presolve.gms Outdated Show resolved Hide resolved
modules/44_biodiversity/bii_target/equations.gms Outdated Show resolved Hide resolved
Copy link
Contributor

@flohump flohump left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for these developments.
Looks good overall.
I have some minor suggestions for the code.

modules/30_crop/endo_apr21/equations.gms Outdated Show resolved Hide resolved
modules/30_crop/penalty_apr22/equations.gms Outdated Show resolved Hide resolved
modules/30_crop/rotation_apr22/equations.gms Outdated Show resolved Hide resolved
config/default.cfg Show resolved Hide resolved
jansteinhauser and others added 2 commits April 19, 2024 16:36
Co-authored-by: Florian Humpenöder <humpenoeder@pik-potsdam.de>
Copy link
Contributor

@flohump flohump left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good!

config/default.cfg Outdated Show resolved Hide resolved
@pvjeetze pvjeetze self-requested a review May 14, 2024 16:28
@jansteinhauser jansteinhauser merged commit 655813b into magpiemodel:develop May 15, 2024
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
High risk Higher risk
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants