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

Changes for newest set of FSEC runs #455

Merged
merged 34 commits into from
Sep 22, 2022

Conversation

FelicitasBeier
Copy link
Member

@FelicitasBeier FelicitasBeier commented Sep 21, 2022

🐦 Purpose of this PR 🐦

  • reverted relaxation of tc that was required when using the pasture realization in combination with Half Earth protection
  • updated emis_policy to include new scenarios required for single transformation FSEC runs
  • relaxed NPi for China
  • reporting of water cellular output for maps
  • inclusion of new scenario combinations in FSEC script
  • lower ghg price for FSEC runs

🔧 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
    • Default run based on the current version of the fork from which PR is made
  • 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)

⚠️ 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

@mscrawford
Copy link
Contributor

mscrawford commented Sep 21, 2022

In FSDP_process L82, the new dietRelatedScenarios need to be:

c("c_BAU", 
    "d_SSP1bau", "d_SSP3bau", "d_SSP4bau", "d_SSP5bau", 
    "d_SSP1fsdp", "d_SSP3fsdp", "d_SSP4fsdp", "d_SSP5fsdp", 
    "a_NoUnderweight", "a_NoOverweight", 
    "a_DietVegFruitsNutsSeeds", "a_DietMonogastrics", "a_DietRuminants", "a_DietLegumes", "a_DietEmptyCals", "a_DietFish", 
    "a_LessFoodWaste", 
    "e_FSDP", 
    "b_REDDaffRuminants", "b_DietRotations", "b_MonogastricsRotations", 
    "b_TradeMonogastrics", "b_TradeRuminants", "b_TradeVeggies", 
    "b_MonogastricsVeggies", "b_SoilMonogastric", "b_SoilMonogastricRuminants", 
    "b_AllNitrogen", "b_AllHealth", "b_Efficiency", "b_Sufficiency")

@mscrawford
Copy link
Contributor

Other than that one aspect from FSDP_process, it looks fine to me. :-)

scripts/output/projects/FSEC_water.R Show resolved Hide resolved
scripts/output/projects/FSDP_collect.R Outdated Show resolved Hide resolved
@FelicitasBeier FelicitasBeier merged commit 76046da into magpiemodel:develop Sep 22, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants