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

bioenergy yield input data bugfix + smaller updates #349

Merged
merged 28 commits into from
Dec 3, 2021

Conversation

flohump
Copy link
Contributor

@flohump flohump commented Nov 29, 2021

🐦 Purpose of this PR 🐦

  • config Update cellular input: inclusion of corrected bioenergy yields from LPJmL
  • config Update of calibration factors
  • config Inclusion of LAMACLIMA scenarios in scenario_config.csv
  • 32_foresty Avoid division by zero (observed under higher regional resolutions)
  • 35_natveg Avoid division by zero (observed under higher regional resolutions)
  • 70_livestock Avoid division by zero (observed under higher regional resolutions)
  • output.R added SLURM standby maxMem and SLURM priority maxMem; needed for some output scripts (e.g. disaggregation_LUH2.R)
  • scripts Refinement of land conversion cost calibration script
  • scripts output/extra/disaggregation_LUH2.R -> bugfixes and extension
  • scripts start/Rprofile.R added option to remove snapshot
  • scripts start/projects/project_LAMACLIMA_WP4.R revision + updates
  • 60_bioenergy Minimum dedicated 2nd generation bioenergy demand assumed in each region raised from 0.01 to 1 mio. GJ per yr, and added as option in the config file (s60_2ndgen_bioenergy_dem_min)

🔧 Checklist for PR creator 🔧

  • Low risk : Simple bugfixes (missing files, updated documentation, typos) or Start/output scripts
  • Medium risk : New realization / Changes to existing realization / Other changes which don't modify default.cfg
  • High risk : New input files (if cfg$input is changed in default.cfg) / Modification to core model (eg. changes in equations, calculations, introduction of new sets etc.) / Other changes in default.cfg
  • Providing additional information based on PR label
  • Low risk : No new model run needed.
  • Medium risk : Default run based on the current version of the fork from which PR is made
  • High risk
    • Default run from the current MASTER branch: RED
    • Default run from the current RC branch: BLUE
    • Default run based on the current version of the fork from which PR is made: GREEN

Resources_Land_Cover_Cropland-55
Resources_Land_Cover_Pastures_and_Rangelands-23
Productivity_Yield_Crops-9
Productivity_Landuse_Intensity_Indicator_Tau-47
Productivity_Yield_before_calibration_Bioenergy_crops_Short_rotation_grasses_rainfed

  • 📉 Performance loss/gain from current default behavior 📈

    • Current develop branch default : 0.6 h
    • This PR's default : 0.6 h
  • Added changes to CHANGELOG.md

  • Compilation check (model starts without compilation errors - use gams main.gms action=c in model folder for testing).

  • No hard coded numbers and cluster/country/region names.

  • The new code doesn't contain declared but unused parameters or variables.

  • Where relevant, In-code comments added including documentation comments.

  • Made sure that documentation created with goxygen is okay (use goxygen::goxygen() for testing).

  • Changes to magpie4 R library for post processing of model output (ideally backward compatible).

  • Self-review of my own code.

  • For high risk runs: validation of major model indicators - Land-use, emissions, food prices, Tau. %Delete this line in case it is not a high risk run%

⚠️ Additional notes or warnings ⚠️

NA

🚨 Checklist for RSE reviewer 🚨

  • PR is labeled correctly.
  • CHANGELOG is updated correctly
  • No hard coded numbers and cluster/country/region names.
  • No unnecessary increase in module interfaces
  • All required updates in interfaces (if any) have been properly adressed in the module contracts
  • In-code comments and documentation comments are satisfactory.
  • model behavior/performance is satisfactory.
  • Requested changes (if any) were applied correctly

🚨 Checklist for MAgPIE reviewer 🚨

  • PR is labeled correctly.
  • CHANGELOG is updated correctly
  • No hard coded numbers and cluster/country/region names.
  • Changes to the model are scientifically sound
  • In-code comments and documentation comments are satisfactory.
  • model behavior/performance is satisfactory.
  • Requested changes (if any) were applied correctly

@flohump flohump added bugfix High risk Higher risk Minor Smaller modifications Release candidate Release candidate labels Dec 2, 2021
@flohump flohump marked this pull request as ready for review December 2, 2021 09:00
Copy link
Member

@abhimishr abhimishr left a comment

Choose a reason for hiding this comment

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

Seems fine to me! (thanks for fixing div0 error in higher resolution runs)

@flohump flohump merged commit ea26fa5 into magpiemodel:rc Dec 3, 2021
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 Release candidate Release candidate
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants