New module realizations of 30_crop that introduce fallow land and incentive-based crop rotations #398

bodirsky · 2022-05-26T05:11:36Z

🐦 Purpose of this PR 🐦

New module realizations of 30_crop that introduce fallow land and incentive-based crop rotations

fallow land in 1995

fallow land in 2020

fallow land in 2050

fallow land in 2050 with fallow subsidy

🔧 Checklist for PR creator 🔧

[ x] Labeling pull request correctly from the label list.

Medium risk : New realization

Providing additional information based on PR label

Medium risk : Default run based on the current version of the fork from which PR is made
(still needs to be repeated with merge from PR in between)

📉 Performance loss/gain from current default behavior 📈

actually not sure why this runtime figure shows longer runtimes...

If i check in runstatistics, I get the following:

Old default: 36.03299 mins
Current develop branch default : 39.57953 mins
This PR's new module realization: 36.00311 mins

[ x] Added changes to CHANGELOG.md
[ x] Compilation check (model starts without compilation errors - use gams main.gms action=c in model folder for testing).
[ x] No hard coded numbers and cluster/country/region names.
[ x] The new code doesn't contain declared but unused parameters or variables.
[ x] Where relevant, In-code comments added including documentation comments.
[ x] Made sure that documentation created with goxygen is okay (use goxygen::goxygen() for testing).
[ X] Changes to magpie4 R library for post processing of model output (ideally backward compatible).
[ X] Self-review of my own code.

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

…igation to reduce complexity of optimization)

…develop new module realization

…develop

…develop # Conflicts: # config/default.cfg

…develop # Conflicts: # config/default.cfg # modules/56_ghg_policy/price_jan20/sets.gms

bugfix in roation equations

recalibration of land expansion

adding fsdp merge script

CHANGELOG.md

modules/15_food/anthropometrics_jan18/preloop.gms

modules/30_crop/penalty_apr22/equations.gms

modules/30_crop/rotation_apr22/equations.gms

modules/50_nr_soil_budget/exoeff_aug16/equations.gms

scripts/output/extra/disaggregation.R

scripts/output/projects/fsdp_reporting_reg.R

pvjeetze

Quite amazing stuff, also considering the results you presented in the magpie meeting. I have two main points for improvement. The first one is more conceptual with regard to getting the terminology of set aside/fallow right in comparison to the older implementation of giving space for other land classes to increase compositional heterogeneity of land classes within cells. I've made suggestions how to rework the terminology in the comments.
The second point is with regard to the biodiversity stock calculations. I think the equations for perennial cropland need to be revisisted. Otherwise I just found some minor typos etc.

config/default.cfg

modules/30_crop/penalty_apr22/equations.gms

modules/30_crop/penalty_apr22/input.gms

modules/30_crop/rotation_apr22/equations.gms

modules/30_crop/rotation_apr22/input.gms

modules/30_crop/rotation_apr22/input/files

modules/30_crop/rotation_apr22/preloop.gms

modules/30_crop/rotation_apr22/presolve.gms

pvjeetze · 2022-06-03T13:58:31Z

Please also add some comparison figures to this PR for easier tracking of changes.

Co-authored-by: Jan Dietrich <dietrich@pik-potsdam.de>

Co-authored-by: Felicitas Beier <39262100+FelicitasBeier@users.noreply.github.com>

Co-authored-by: pvjeetze <50408549+pvjeetze@users.noreply.github.com>

…develop # Conflicts: # config/default.cfg # modules/41_area_equipped_for_irrigation/static/presolve.gms

…elop

bodirsky

Can we maybe do the set-aside renaming in a separate pull request?
Its not directly connected to this one...

config/default.cfg

modules/30_crop/endo_apr21/declarations.gms

modules/30_crop/penalty_apr22/declarations.gms

scripts/output/extra/disaggregation.R

scripts/output/projects/fsdp_merge_report.R

scripts/output/projects/fsdp_reporting_reg.R

modules/30_crop/rotation_apr22/input/files

…tation implementation

…develop # Conflicts: # config/default.cfg

…develop # Conflicts: # CHANGELOG.md # config/default.cfg

pvjeetze · 2022-06-17T07:23:59Z

config/default.cfg

-               additional  = "additional_data_rev4.24.tgz",
+cfg$input <- c(regional    = "rev4.73_h12_magpie.tgz",
+               cellular    = "rev4.73_h12_fd712c0b_cellularmagpie_c200_MRI-ESM2-0-ssp370_lpjml-8e6c5eb1.tgz",
+               validation  = "rev4.73_h12_validation.tgz",


Does the new revision 4.73 include all RCPs too?

config/default.cfg

bodirsky added 30 commits April 21, 2022 08:52

new module realization for croplands (and one more interface with irr…

40b31f0

…igation to reduce complexity of optimization)

Merge branch 'develop' of https://github.com/magpiemodel/magpie into …

cbd90b2

…develop new module realization

runscript

8aa41a7

filename corrected

6585657

bugfixing

a5a8e55

bugfixing

2374e50

improving rotational constraints

2cb314a

Merge branch 'develop' of https://github.com/magpiemodel/magpie into …

b92f14b

…develop

update runscript

ac21dd7

new module realization for rotational constraint penalties

2a16ca4

minor

8249c5f

Merge branch 'develop' of https://github.com/magpiemodel/magpie into …

c703bde

…develop # Conflicts: # config/default.cfg

reduced number of constraints in penalty realization

badce8c

new runscript

217f784

counting up input data

6b48c09

update of inputdatarevision

8b49271

update runscript

e905fae

Merge branch 'develop' of https://github.com/magpiemodel/magpie into …

ca468fb

…develop # Conflicts: # config/default.cfg # modules/56_ghg_policy/price_jan20/sets.gms

activate recalibration

7eaed1c

adjusting new realizations to changes in trunk

4055998

changelog edits, new inputdata revision

3f883bd

bugfix

4cb7d3a

bugfix

a530e29

activating sticky

7afb87d

bugfix

ab06b3e

bugfix

9c2a116

bugfix

7377f36

deactivating sticky dynamic

823037a

bugfix in roation equations

new inputdata with higher fallow incentives

521341b

recalibration of land expansion

new inputdata revision

80509a8

adding fsdp merge script

tscheypidi requested changes Jun 2, 2022

View reviewed changes

pvjeetze requested changes Jun 3, 2022

View reviewed changes

bodirsky and others added 7 commits June 5, 2022 08:02

Update CHANGELOG.md

0505033

Co-authored-by: Jan Dietrich <dietrich@pik-potsdam.de>

Update CHANGELOG.md

40ff69b

Co-authored-by: Jan Dietrich <dietrich@pik-potsdam.de>

Update modules/15_food/anthropometrics_jan18/preloop.gms

361bee1

Co-authored-by: Felicitas Beier <39262100+FelicitasBeier@users.noreply.github.com>

Update modules/30_crop/penalty_apr22/declarations.gms

009f37b

Co-authored-by: pvjeetze <50408549+pvjeetze@users.noreply.github.com>

Merge branch 'develop' of https://github.com/magpiemodel/magpie into …

f4ca136

…develop # Conflicts: # config/default.cfg # modules/41_area_equipped_for_irrigation/static/presolve.gms

Merge branch 'develop' of https://github.com/bodirsky/magpie into dev…

d7cc40a

…elop

one bugfix (BII), many documentation updates

3870ec1

bodirsky commented Jun 5, 2022

View reviewed changes

bodirsky and others added 11 commits June 5, 2022 17:07

correcting description

2685c8b

streamlined naming of semi-natural vegetation policy with new crop ro…

e35cad1

…tation implementation

updated scenario_config

b49320d

fixed small bug in changelog update

d9395e1

documentation update

ee441fe

Merge branch 'develop' of https://github.com/magpiemodel/magpie into …

10bcbb3

…develop # Conflicts: # config/default.cfg

downwards compatibility

771d06d

bugfix

af3c5af

updated f30_scenario_fader

fc18e01

using existing calibration files

3921a74

...

2788e5f

bodirsky requested review from tscheypidi and pvjeetze June 15, 2022 06:17

Merge branch 'develop' of https://github.com/magpiemodel/magpie into …

f6bb132

…develop # Conflicts: # CHANGELOG.md # config/default.cfg

tscheypidi approved these changes Jun 15, 2022

View reviewed changes

pvjeetze reviewed Jun 17, 2022

View reviewed changes

pvjeetze approved these changes Jun 17, 2022

View reviewed changes

config/default.cfg Outdated Show resolved Hide resolved

Update config/default.cfg

8e807e7

bodirsky merged commit d7c837f into magpiemodel:develop Jun 21, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

New module realizations of 30_crop that introduce fallow land and incentive-based crop rotations #398

New module realizations of 30_crop that introduce fallow land and incentive-based crop rotations #398

bodirsky commented May 26, 2022 •

edited by pvjeetze

Loading

pvjeetze left a comment

pvjeetze commented Jun 3, 2022

bodirsky left a comment

pvjeetze Jun 17, 2022

New module realizations of 30_crop that introduce fallow land and incentive-based crop rotations #398

New module realizations of 30_crop that introduce fallow land and incentive-based crop rotations #398

Conversation

bodirsky commented May 26, 2022 • edited by pvjeetze Loading

🐦 Purpose of this PR 🐦

🔧 Checklist for PR creator 🔧

⚠️ Additional notes or warnings ⚠️

🚨 Checklist for RSE reviewer 🚨

🚨 Checklist for MAgPIE reviewer 🚨

pvjeetze left a comment

Choose a reason for hiding this comment

pvjeetze commented Jun 3, 2022

bodirsky left a comment

Choose a reason for hiding this comment

pvjeetze Jun 17, 2022

Choose a reason for hiding this comment

bodirsky commented May 26, 2022 •

edited by pvjeetze

Loading