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 of water demand realization and dairy fade out #343

Merged
merged 4 commits into from
Nov 16, 2021

Conversation

weindl
Copy link
Contributor

@weindl weindl commented Nov 16, 2021

🐦 Purpose of this PR 🐦

Minor change: update of config and additional data

  • Update of config: changed default setting for the 42_water_demand module (to all_sectors_aug13)
  • Update of additional data to rev4.07: changed speed of dairy fade-out in India

🔧 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 develop branch (red: MAgPIE rc_NPI)
    • Default run based on the current version of the fork from which PR is made (blue: Wallsectors_Dfadeout_NPI)

image

image

image

image

  • 📉 Performance loss/gain from current default behavior 📈

    • Current develop branch default : 0.50 h
    • This PR's default : 0.54 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

@weindl weindl added High risk Higher risk Release candidate Release candidate labels Nov 16, 2021
@weindl weindl changed the title Rc Update of water demand realization and dairy fade out Nov 16, 2021
@mishkos mishkos assigned mishkos and unassigned mishkos Nov 16, 2021
Copy link
Member

@FelicitasBeier FelicitasBeier 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.

@weindl weindl merged commit 84ff46c into magpiemodel:rc Nov 16, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
High risk Higher risk Release candidate Release candidate
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants