From 2f61f63d41cee30031caa10931a6a9e0cf6a1e30 Mon Sep 17 00:00:00 2001 From: Felicitas Date: Wed, 10 Jan 2024 15:59:29 +0100 Subject: [PATCH] Separation of nuts target into nuts_seeds and peanuts because otherwise other is going nuts in MAgPIE --- .buildlibrary | 2 +- CITATION.cff | 4 ++-- DESCRIPTION | 4 ++-- R/calcEATLancetTargets.R | 6 ++++-- R/fullMAGPIE.R | 1 + README.md | 6 +++--- 6 files changed, 13 insertions(+), 10 deletions(-) diff --git a/.buildlibrary b/.buildlibrary index ded5e9ef..7d832f2a 100644 --- a/.buildlibrary +++ b/.buildlibrary @@ -1,4 +1,4 @@ -ValidationKey: '10338520' +ValidationKey: '10359300' AcceptedWarnings: - 'Warning: package ''.*'' was built under R version' - 'Warning: namespace ''.*'' is not available and has been replaced' diff --git a/CITATION.cff b/CITATION.cff index 40f60aad..77fa2f35 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: 'mrland: MadRaT land data package' -version: 0.52.4 -date-released: '2024-01-08' +version: 0.52.5 +date-released: '2024-01-10' abstract: The package provides land related data via the madrat framework. authors: - family-names: Dietrich diff --git a/DESCRIPTION b/DESCRIPTION index 6f559038..7aae1623 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,8 +1,8 @@ Type: Package Package: mrland Title: MadRaT land data package -Version: 0.52.4 -Date: 2024-01-08 +Version: 0.52.5 +Date: 2024-01-10 Authors@R: c( person("Jan Philipp", "Dietrich", , "dietrich@pik-potsdam.de", role = c("aut", "cre")), person("Abhijeet", "Mishra", role = "aut"), diff --git a/R/calcEATLancetTargets.R b/R/calcEATLancetTargets.R index 066cb269..f241422d 100644 --- a/R/calcEATLancetTargets.R +++ b/R/calcEATLancetTargets.R @@ -27,12 +27,14 @@ calcEATLancetTargets <- function(attributes = "kcal/d") { eatFood <- c("legumes", "fish", "poultry", "eggs", "milk", "sugar", "oil_palm", "oil_veg", - "nuts_seeds", "vegetables", "fruits", + "nuts_seeds", "peanuts", + "vegetables", "fruits", "fruits_starch", "roots", "fg_redmeat") eatTFood15 <- c("t_legumes", "t_fish", "t_livst_chick", "t_livst_egg", "t_livst_milk", "t_sugar", "t_oils", "t_oils", - "t_nutseeds", "t_fruitveg", "t_fruitveg", + "t_nutseeds", "t_peanuts", + "t_fruitveg", "t_fruitveg", "t_fruitstarch", "t_roots", "t_redmeat") relMatrixFood <- cbind(eatFood, eatTFood15) diff --git a/R/fullMAGPIE.R b/R/fullMAGPIE.R index 8bb25578..1012f79e 100644 --- a/R/fullMAGPIE.R +++ b/R/fullMAGPIE.R @@ -225,6 +225,7 @@ fullMAGPIE <- function(rev = 0.1, dev = "") { # 38 factor costs calcOutput("FAOYield", cut = 0.98, years = 1995, round = 2, file = "f38_region_yield.csv") + # Question: Is f38_region_yield used? And why not f14_region_yield? calcOutput("FacReq", round = 2, aggregate = "GLO", years = 2005, file = "f38_fac_req_fao.csv") calcOutput("FacReq", round = 2, aggregate = TRUE, file = "f38_fac_req_fao_regional.cs4") calcOutput("AgCapLabourShare", round = 2, aggregate = TRUE, years = c(1995, 2000, 2005, 2010), diff --git a/README.md b/README.md index 34dccbcf..32e9e57f 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # MadRaT land data package -R package **mrland**, version **0.52.4** +R package **mrland**, version **0.52.5** [![CRAN status](https://www.r-pkg.org/badges/version/mrland)](https://cran.r-project.org/package=mrland) [![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.3822083.svg)](https://doi.org/10.5281/zenodo.3822083) [![R build status](https://github.com/pik-piam/mrland/workflows/check/badge.svg)](https://github.com/pik-piam/mrland/actions) [![codecov](https://codecov.io/gh/pik-piam/mrland/branch/master/graph/badge.svg)](https://app.codecov.io/gh/pik-piam/mrland) [![r-universe](https://pik-piam.r-universe.dev/badges/mrland)](https://pik-piam.r-universe.dev/builds) @@ -39,7 +39,7 @@ In case of questions / problems please contact Jan Philipp Dietrich , R package version 0.52.4, . +Dietrich J, Mishra A, Weindl I, Bodirsky B, Wang X, Baumstark L, Kreidenweis U, Klein D, Steinmetz N, Chen D, Humpenoeder F, von Jeetze P, Wirth S, Beier F, Hoetten D (2024). _mrland: MadRaT land data package_. doi:10.5281/zenodo.3822083 , R package version 0.52.5, . A BibTeX entry for LaTeX users is @@ -48,7 +48,7 @@ A BibTeX entry for LaTeX users is title = {mrland: MadRaT land data package}, author = {Jan Philipp Dietrich and Abhijeet Mishra and Isabelle Weindl and Benjamin Leon Bodirsky and Xiaoxi Wang and Lavinia Baumstark and Ulrich Kreidenweis and David Klein and Nele Steinmetz and David Chen and Florian Humpenoeder and Patrick {von Jeetze} and Stephen Wirth and Felicitas Beier and David Hoetten}, year = {2024}, - note = {R package version 0.52.4}, + note = {R package version 0.52.5}, doi = {10.5281/zenodo.3822083}, url = {https://github.com/pik-piam/mrland}, }