From d507f5cf548b0f5cf46d7eab75d66d67cd4e74b6 Mon Sep 17 00:00:00 2001 From: Johannes Koch Date: Fri, 11 Oct 2024 08:11:21 +0200 Subject: [PATCH 1/2] Update in accordance with mrdrivers update --- R/calcNutrientBudgetSewage.R | 3 +-- R/convertGTAPv8v9.R | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/R/calcNutrientBudgetSewage.R b/R/calcNutrientBudgetSewage.R index 9dcb35dc..bb54b812 100644 --- a/R/calcNutrientBudgetSewage.R +++ b/R/calcNutrientBudgetSewage.R @@ -33,8 +33,7 @@ calcNutrientBudgetSewage <- function(historic = TRUE) { drecht <- drecht[, , ssps] drecht <- collapseNames(time_interpolate(drecht, interpolated_year = findset("time"), integrate_interpolated_years = FALSE, extrapolation_type = "constant")) - population <- collapseNames(calcOutput("Population", naming = "indicator.scenario", - PopulationFuture = "SSP", aggregate = FALSE)[, , ssps]) + population <- calcOutput("Population", scenario = "SSPs", naming = "scenario", aggregate = FALSE) } detergent <- population * drecht[, , "det_p_pp"] diff --git a/R/convertGTAPv8v9.R b/R/convertGTAPv8v9.R index 6746115d..b32769ab 100644 --- a/R/convertGTAPv8v9.R +++ b/R/convertGTAPv8v9.R @@ -65,8 +65,7 @@ convertGTAPv8v9 <- function(x, subtype) { } } else { - gdpMer <- calcOutput("GDPPast", GDPPast = "WDI-MI", - unit = "constant 2017 US$MER", aggregate = FALSE) + gdpMer <- calcOutput("GDPPast", unit = "constant 2017 US$MER", aggregate = FALSE) gdpMer <- gdpMer[, getYears(x), , drop = TRUE] w1 <- GDPuc::toolConvertGDP(gdpMer, unit_in = "constant 2017 US$MER", From d9e27e42b03e8f13988cc31376a77ba0b82bfc44 Mon Sep 17 00:00:00 2001 From: Johannes Koch Date: Wed, 6 Nov 2024 11:18:01 +0100 Subject: [PATCH 2/2] Bump version --- .buildlibrary | 2 +- CITATION.cff | 4 ++-- DESCRIPTION | 6 +++--- README.md | 8 ++++---- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.buildlibrary b/.buildlibrary index 87e8a147..f47d9f02 100644 --- a/.buildlibrary +++ b/.buildlibrary @@ -1,4 +1,4 @@ -ValidationKey: '29237960' +ValidationKey: '29268213' 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 1dd20e04..7e743d78 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: 'mrcommons: MadRat commons Input Data Library' -version: 1.46.0 -date-released: '2024-10-30' +version: 1.46.1 +date-released: '2024-11-06' abstract: Provides useful functions and a common structure to all the input data required to run models like MAgPIE and REMIND of model input data. authors: diff --git a/DESCRIPTION b/DESCRIPTION index a81010ba..6cd10067 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,8 +1,8 @@ Package: mrcommons Type: Package Title: MadRat commons Input Data Library -Version: 1.46.0 -Date: 2024-10-30 +Version: 1.46.1 +Date: 2024-11-06 Authors@R: c(person("Benjamin Leon", "Bodirsky", email = "bodirsky@pik-potsdam.de", role = "aut"), person("Kristine", "Karstens", role = "aut"), person("Lavinia", "Baumstark", role = "aut"), @@ -43,7 +43,7 @@ Depends: GDPuc (>= 1.3.0), magclass (>= 3.17), madrat (>= 3.10.0), - mrdrivers (>= 1.0.0), + mrdrivers (>= 4.0.0), mrfaocore (>= 1.0.0), mrlandcore (>= 1.0.0), mstools (>= 0.6.0) diff --git a/README.md b/README.md index b46bceb5..b2f1563b 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # MadRat commons Input Data Library -R package **mrcommons**, version **1.46.0** +R package **mrcommons**, version **1.46.1** [![CRAN status](https://www.r-pkg.org/badges/version/mrcommons)](https://cran.r-project.org/package=mrcommons) [![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.3822009.svg)](https://doi.org/10.5281/zenodo.3822009) [![R build status](https://github.com/pik-piam/mrcommons/workflows/check/badge.svg)](https://github.com/pik-piam/mrcommons/actions) [![codecov](https://codecov.io/gh/pik-piam/mrcommons/branch/master/graph/badge.svg)](https://app.codecov.io/gh/pik-piam/mrcommons) [![r-universe](https://pik-piam.r-universe.dev/badges/mrcommons)](https://pik-piam.r-universe.dev/builds) @@ -39,7 +39,7 @@ In case of questions / problems please contact Jan Philipp Dietrich , R package version 1.46.0, . +Bodirsky B, Karstens K, Baumstark L, Weindl I, Wang X, Mishra A, Wirth S, Stevanovic M, Steinmetz N, Kreidenweis U, Rodrigues R, Popov R, Humpenoeder F, Giannousakis A, Levesque A, Klein D, Araujo E, Beier F, Oeser J, Pehl M, Leip D, Crawford M, Molina Bacca E, von Jeetze P, Martinelli E, Schreyer F, Soergel B, Sauer P, Hötten D, Hasse R, Abrahão G, Weigmann P, Dietrich J (2024). _mrcommons: MadRat commons Input Data Library_. doi:10.5281/zenodo.3822009 , R package version 1.46.1, . A BibTeX entry for LaTeX users is @@ -48,8 +48,8 @@ A BibTeX entry for LaTeX users is title = {mrcommons: MadRat commons Input Data Library}, author = {Benjamin Leon Bodirsky and Kristine Karstens and Lavinia Baumstark and Isabelle Weindl and Xiaoxi Wang and Abhijeet Mishra and Stephen Wirth and Mishko Stevanovic and Nele Steinmetz and Ulrich Kreidenweis and Renato Rodrigues and Roman Popov and Florian Humpenoeder and Anastasis Giannousakis and Antoine Levesque and David Klein and Ewerton Araujo and Felicitas Beier and Julian Oeser and Michaja Pehl and Debbora Leip and Michael Crawford and Edna {Molina Bacca} and Patrick {von Jeetze} and Eleonora Martinelli and Felix Schreyer and Bjoern Soergel and Pascal Sauer and David Hötten and Robin Hasse and Gabriel Abrahão and Pascal Weigmann and Jan Philipp Dietrich}, year = {2024}, - note = {R package version 1.46.0}, - url = {https://github.com/pik-piam/mrcommons}, + note = {R package version 1.46.1}, doi = {10.5281/zenodo.3822009}, + url = {https://github.com/pik-piam/mrcommons}, } ```