From d234fd6194435101e80f310b19068c1eb3d0baa6 Mon Sep 17 00:00:00 2001 From: Felicitas Date: Tue, 12 Sep 2023 22:49:12 +0200 Subject: [PATCH] fix in AgMIP mapping (missing bracket included) --- .buildlibrary | 2 +- CITATION.cff | 4 ++-- DESCRIPTION | 4 ++-- README.md | 6 +++--- inst/extdata/variablemappingAgMIP.csv | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.buildlibrary b/.buildlibrary index 285587d8..8052e281 100644 --- a/.buildlibrary +++ b/.buildlibrary @@ -1,4 +1,4 @@ -ValidationKey: '233754654' +ValidationKey: '233833876' AutocreateReadme: yes AcceptedWarnings: - 'Warning: package ''.*'' was built under R version' diff --git a/CITATION.cff b/CITATION.cff index 644fff48..09ae45e2 100644 --- a/CITATION.cff +++ b/CITATION.cff @@ -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.192.2 -date-released: '2023-09-07' +version: 1.192.3 +date-released: '2023-09-12' abstract: Common output routines for extracting results from the MAgPIE framework (versions 4.x). authors: diff --git a/DESCRIPTION b/DESCRIPTION index 36b3265e..cccd0fb2 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,8 +1,8 @@ Type: Package Package: magpie4 Title: MAgPIE outputs R package for MAgPIE version 4.x -Version: 1.192.2 -Date: 2023-09-07 +Version: 1.192.3 +Date: 2023-09-12 Authors@R: c( person("Benjamin Leon", "Bodirsky", , "bodirsky@pik-potsdam.de", role = c("aut", "cre")), person("Florian", "Humpenoeder", , "humpenoeder@pik-potsdam.de", role = "aut"), diff --git a/README.md b/README.md index 4b996ebe..ce965e97 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # MAgPIE outputs R package for MAgPIE version 4.x -R package **magpie4**, version **1.192.2** +R package **magpie4**, version **1.192.3** [![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) @@ -39,7 +39,7 @@ In case of questions / problems please contact Benjamin Leon Bodirsky , R package version 1.192.2, . +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 (2023). _magpie4: MAgPIE outputs R package for MAgPIE version 4.x_. doi:10.5281/zenodo.1158582 , R package version 1.192.3, . A BibTeX entry for LaTeX users is @@ -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 = {2023}, - note = {R package version 1.192.2}, + note = {R package version 1.192.3}, doi = {10.5281/zenodo.1158582}, url = {https://github.com/pik-piam/magpie4}, } diff --git a/inst/extdata/variablemappingAgMIP.csv b/inst/extdata/variablemappingAgMIP.csv index a2fc15e9..7a4fa6ba 100644 --- a/inst/extdata/variablemappingAgMIP.csv +++ b/inst/extdata/variablemappingAgMIP.csv @@ -55,7 +55,7 @@ Demand|Feed|Feed for Aquaculture|Crops|Cereals|+|Tropical cereals (Mt DM/yr);FFS Demand|Feed|Feed for Aquaculture|Crops|Oil crops|+|Cotton seed (Mt DM/yr);FFSH;PFB;1000 t dm;NULL;1000 Demand|Feed|Feed for Aquaculture|Crops|Oil crops|+|Groundnuts (Mt DM/yr);FFSH;OSD;1000 t dm;NULL;1000 Demand|Feed|Feed for Aquaculture|Crops|Oil crops|+|Oilpalms (Mt DM/yr);FFSH;OSD;1000 t dm;NULL;1000 -Demand|Feed|Feed for Aquaculture|Crops|Oil crops|+|Other oil crops incl rapeseed (Mt DM/yr;FFSH;OSD;1000 t dm;NULL;1000 +Demand|Feed|Feed for Aquaculture|Crops|Oil crops|+|Other oil crops incl rapeseed (Mt DM/yr);FFSH;OSD;1000 t dm;NULL;1000 Demand|Feed|Feed for Aquaculture|Crops|Oil crops|+|Soybean (Mt DM/yr);FFSH;OSD;1000 t dm;NULL;1000 Demand|Feed|Feed for Aquaculture|Crops|Oil crops|+|Sunflower (Mt DM/yr);FFSH;OSD;1000 t dm;NULL;1000 Demand|Feed|Feed for Aquaculture|Crops|Other crops|+|Fruits Vegetables Nuts (Mt DM/yr);FFSH;VFN;1000 t dm;NULL;1000