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

Update 58_peatland and 80_optimization modules #714

Open
wants to merge 20 commits into
base: develop
Choose a base branch
from

Conversation

flohump
Copy link
Contributor

@flohump flohump commented Aug 16, 2024

🐦 Description of this PR 🐦

  • 80_optimization added threads = 1 as default to avoid infeasibilites and Flg_NoDefc = TRUE as option
  • config default settings for 58_peatland revised
  • 58_peatland variable v58_scalingFactorExp converted into parameter p58_scalingFactorExp to avoid infeasibilites. p58_scalingFactorRed has been revised.
  • 32_forestry Interfaces vm_landexpansion_forestry and vm_landreduction_forestry have been corrected by harvested and replanted timber plantation area
  • 80_optimization bugfix for variables levels not obeying the bounds in nlp_par, conopt changed to conopt3

🔧 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 : 15 mins
  • This PR's default : 15 mins

export-197
export-199
export-198
export-194
export-195
export-196

🚨 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)

@flohump flohump added Minor Smaller modifications High risk Higher risk bugfix labels Aug 16, 2024
@flohump flohump marked this pull request as ready for review August 16, 2024 14:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bugfix High risk Higher risk Minor Smaller modifications
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

1 participant