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 default MACCs from PBL2007 to PBL2022 #468

Merged
merged 2 commits into from
Nov 2, 2022

Conversation

flohump
Copy link
Contributor

@flohump flohump commented Nov 1, 2022

🐦 Purpose of this PR 🐦

  • Update default MACCs data set from PBL2007 to PBL2022 + NAVIGATE scenarios added to scenario_config.csv
  • New data set from NAVIGATE project: https://www.navigate-h2020.eu/navigator/apply/
  • Results for the default are unchanged
  • Reduction of CH4 emissions from enteric fermentatation is considerably lower with PBL2022
  • N2O reduction is very similar
  • FSEC runs are all feasible

🔧 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

Results for SSP2-Ref (default)
PR468 = current develop
PR468NEW = this PR

Resources_Land_Cover_Cropland-76
Productivity_Landuse_Intensity_Indicator_Tau-66
Emissions_CO2_Land_Land_use_Change-56

Results for SSP2-PkBudg900

Emissions_CH4_Land_Agriculture_Enteric_fermentation
Emissions_CH4_Land_Agriculture-2
Emissions_N2O_Land_Agriculture

  • 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
    • Default run based on the current version of the fork from which PR is made
  • 📉 Performance loss/gain from current default behavior 📈

    • Current develop branch default : 0.45 h
    • This PR's default : 0.43 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.

  • In case of updated cellular input tgz file in default.cfg: scenario_config.csv has been updated accordingly (rcp1p9, rcp2p6 etc)

  • 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 Minor Smaller modifications High risk Higher risk labels Nov 2, 2022
@flohump flohump marked this pull request as ready for review November 2, 2022 08:34
Copy link
Contributor

@mikewin-climsci mikewin-climsci left a comment

Choose a reason for hiding this comment

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

Have we dealt with the issue brought up by Gabriel regarding values >1 in some USA entries?

@flohump flohump closed this Nov 2, 2022
@flohump flohump reopened this Nov 2, 2022
@flohump
Copy link
Contributor Author

flohump commented Nov 2, 2022

Have we dealt with the issue brought up by Gabriel regarding values >1 in some USA entries?

This was correct by PBL in the most recent data set. However, it is in the 0 cost step, which is ignored anyways.

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 to me. Only thing I was wondering whether the changes in the scenario_config should also be mentioned in the CHANGELOG.

@flohump flohump merged commit a3b364c into magpiemodel:develop Nov 2, 2022
@flohump flohump deleted the f_landNAVIGATE branch June 18, 2024 16:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
High risk Higher risk Minor Smaller modifications
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants