Skip to content

Commit

Permalink
updated variablemappingAgMIP
Browse files Browse the repository at this point in the history
  • Loading branch information
@FelicitasBeier
FelicitasBeier committed Apr 5, 2024
1 parent aa31d6a commit 5ce793a
Show file tree
Hide file tree
Showing 5 changed files with 36 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .buildlibrary
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ValidationKey: '2390126656'
ValidationKey: '2390387706'
AutocreateReadme: yes
AcceptedWarnings:
- 'Warning: package ''.*'' was built under R version'
Expand Down
4 changes: 2 additions & 2 deletions CITATION.cff
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ cff-version: 1.2.0
message: If you use this software, please cite it using the metadata from this file.
type: software
title: 'magpie4: MAgPIE outputs R package for MAgPIE version 4.x'
version: 1.206.16
date-released: '2024-04-03'
version: 1.206.17
date-released: '2024-04-05'
abstract: Common output routines for extracting results from the MAgPIE framework
(versions 4.x).
authors:
Expand Down
4 changes: 2 additions & 2 deletions DESCRIPTION
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
Type: Package
Package: magpie4
Title: MAgPIE outputs R package for MAgPIE version 4.x
Version: 1.206.16
Date: 2024-04-03
Version: 1.206.17
Date: 2024-04-05
Authors@R: c(
person("Benjamin Leon", "Bodirsky", , "[email protected]", role = c("aut", "cre")),
person("Florian", "Humpenoeder", , "[email protected]", role = "aut"),
Expand Down
6 changes: 3 additions & 3 deletions README.md
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# MAgPIE outputs R package for MAgPIE version 4.x

R package **magpie4**, version **1.206.16**
R package **magpie4**, version **1.206.17**

[![CRAN status](https://www.r-pkg.org/badges/version/magpie4)](https://cran.r-project.org/package=magpie4) [![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.1158582.svg)](https://doi.org/10.5281/zenodo.1158582) [![R build status](https://github.com/pik-piam/magpie4/workflows/check/badge.svg)](https://github.com/pik-piam/magpie4/actions) [![codecov](https://codecov.io/gh/pik-piam/magpie4/branch/master/graph/badge.svg)](https://app.codecov.io/gh/pik-piam/magpie4) [![r-universe](https://pik-piam.r-universe.dev/badges/magpie4)](https://pik-piam.r-universe.dev/builds)

Expand Down Expand Up @@ -39,7 +39,7 @@ In case of questions / problems please contact Benjamin Leon Bodirsky <bodirsky@

To cite package **magpie4** in publications use:

Bodirsky B, Humpenoeder F, Dietrich J, Stevanovic M, Weindl I, Karstens K, Wang X, Mishra A, Beier F, Breier J, Yalew A, Chen D, Biewald A, Wirth S, von Jeetze P, Leip D, Crawford M, Alves M (2024). _magpie4: MAgPIE outputs R package for MAgPIE version 4.x_. doi: 10.5281/zenodo.1158582 (URL: https://doi.org/10.5281/zenodo.1158582), R package version 1.206.16, <URL: https://github.com/pik-piam/magpie4>.
Bodirsky B, Humpenoeder F, Dietrich J, Stevanovic M, Weindl I, Karstens K, Wang X, Mishra A, Beier F, Breier J, Yalew A, Chen D, Biewald A, Wirth S, von Jeetze P, Leip D, Crawford M, Alves M (2024). _magpie4: MAgPIE outputs R package for MAgPIE version 4.x_. doi:10.5281/zenodo.1158582 <https://doi.org/10.5281/zenodo.1158582>, R package version 1.206.17, <https://github.com/pik-piam/magpie4>.

A BibTeX entry for LaTeX users is

Expand All @@ -48,7 +48,7 @@ A BibTeX entry for LaTeX users is
title = {magpie4: MAgPIE outputs R package for MAgPIE version 4.x},
author = {Benjamin Leon Bodirsky and Florian Humpenoeder and Jan Philipp Dietrich and Miodrag Stevanovic and Isabelle Weindl and Kristine Karstens and Xiaoxi Wang and Abhijeet Mishra and Felicitas Beier and Jannes Breier and Amsalu Woldie Yalew and David Chen and Anne Biewald and Stephen Wirth and Patrick {von Jeetze} and Debbora Leip and Michael Crawford and Marcos Alves},
year = {2024},
note = {R package version 1.206.16},
note = {R package version 1.206.17},
doi = {10.5281/zenodo.1158582},
url = {https://github.com/pik-piam/magpie4},
}
Expand Down
28 changes: 28 additions & 0 deletions inst/extdata/variablemappingAgMIP.csv
View file
Original file line number Diff line number Diff line change
Expand Up @@ -958,3 +958,31 @@ Factor requirement shares|Livestock products|+|Capital requirement share (%);CAP
Emissions|NH3|Land (Mt NH3/yr) ;ENH3;AGR;Mt NH3/yr;NULL;1
Emissions|NH3|Land (Mt NH3/yr) ;ENH3;TOT;Mt NH3/yr;NULL;1
Nutrition|Anthropometrics|People underweight (million people);FSEC_abs;TOT;million;NULL;1
Prices|Producer Price Index|Crop products (Index 2020=100);XPRP;CRP;Index;NULL;1
Prices|Producer Price Index|Rice (Index 2020=100);XPRP;RIC;Index;NULL;1
Prices|Producer Price Index|Temperate cereals (Index 2020=100);XPRP;WHT;Index;NULL;1
Prices|Producer Price Index|Tropical cereals (Index 2020=100);XPRP;CGR;Index;Production|Crops|Cereals|+|Tropical cereals (Mt DM/yr);1
Prices|Producer Price Index|Maize (Index 2020=100);XPRP;CGR;Index;Production|Crops|Cereals|+|Maize (Mt DM/yr);1
Prices|Producer Price Index|Soybean (Index 2020=100);XPRP;OSD;Index;Production|Crops|Oil crops|+|Soybean (Mt DM/yr);1
Prices|Producer Price Index|Groundnuts (Index 2020=100);XPRP;OSD;Index;Production|Crops|Oil crops|+|Groundnuts (Mt DM/yr);1
Prices|Producer Price Index|Other oil crops incl rapeseed (Index 2020=100);XPRP;OSD;Index;Production|Crops|Oil crops|+|Other oil crops incl rapeseed (Mt DM/yr);1
Prices|Producer Price Index|Oilpalms (Index 2020=100);XPRP;OSD;Index;Production|Crops|Oil crops|+|Oilpalms (Mt DM/yr);1
Prices|Producer Price Index|Sunflower (Index 2020=100);XPRP;OSD;Index;Production|Crops|Oil crops|+|Sunflower (Mt DM/yr);1
Prices|Producer Price Index|Sugar cane (Index 2020=100);XPRP;SGC;Index;Production|Crops|Sugar crops|+|Sugar cane (Mt DM/yr);1
Prices|Producer Price Index|Sugar beet (Index 2020=100);XPRP;SGC;Index;Production|Crops|Sugar crops|+|Sugar beet (Mt DM/yr);1
Prices|Producer Price Index|Fruits Vegetables Nuts (Index 2020=100);XPRP;VFN;Index;NULL;1
Prices|Producer Price Index|Cotton seed (Index 2020=100);XPRP;PFB;Index;NULL;1
Prices|Producer Price Index|Short rotation grasses (Index 2020=100);XPRP;ECP;Index;Production|Bioenergy crops|+|Short rotation grasses (Mt DM/yr);1
Prices|Producer Price Index|Short rotation trees (Index 2020=100);XPRP;ECP;Index;Production|Bioenergy crops|+|Short rotation trees (Mt DM/yr);1
Prices|Producer Price Index|Pulses (Index 2020=100);XPRP;OCR;Index;Production|Crops|Other crops|+|Pulses (Mt DM/yr);1
Prices|Producer Price Index|Potatoes (Index 2020=100);XPRP;OCR;Index;Production|Crops|Other crops|+|Potatoes (Mt DM/yr);1
Prices|Producer Price Index|Tropical roots (Index 2020=100);XPRP;OCR;Index;Production|Crops|Other crops|+|Tropical roots (Mt DM/yr);1
Prices|Producer Price Index|Crop products (Index 2020=100);XPRP;CRP;Index;NULL;1
Prices|Producer Price Index|Ruminant meat (Index 2020=100);XPRP;RUM;Index;NULL;1
Prices|Producer Price Index|Monogastric meat (Index 2020=100);XPRP;NRM;Index;Production|Livestock products|+|Monogastric meat (Mt DM/yr);1
Prices|Producer Price Index|Poultry meat (Index 2020=100);XPRP;NRM;Index;Production|Livestock products|+|Poultry meat (Mt DM/yr);1
Prices|Producer Price Index|Eggs (Index 2020=100);XPRP;NRM;Index;Production|Livestock products|+|Eggs (Mt DM/yr);1
Prices|Producer Price Index|Dairy (Index 2020=100);XPRP;DRY;Index;Production|Livestock products|+|Dairy (Mt DM/yr);1
Prices|Producer Price Index|Livestock products (Index 2020=100);XPRP;LSP;Index;NULL;1
Prices|Producer Price Index|Fish (Index 2020=100);XPRP;FSH;Index;NULL;1
Prices|Producer Price Index|All products (Index 2020=100);XPRP;AGR;Index;NULL;1

0 comments on commit 5ce793a

Please sign in to comment.