diff --git a/.buildlibrary b/.buildlibrary index 94785c1a..a3ab809c 100644 --- a/.buildlibrary +++ b/.buildlibrary @@ -1,4 +1,4 @@ -ValidationKey: '39461070' +ValidationKey: '39485043' AcceptedWarnings: - Invalid URL: .* - 'Warning: package ''.*'' was built under R version' diff --git a/CITATION.cff b/CITATION.cff index 73177de1..f8a62cd1 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: 'mrremind: MadRat REMIND Input Data Package' -version: 0.197.0 -date-released: '2024-11-04' +version: 0.197.1 +date-released: '2024-11-06' abstract: The mrremind packages contains data preprocessing for the REMIND model. authors: - family-names: Baumstark diff --git a/DESCRIPTION b/DESCRIPTION index 637412d0..c171eea5 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,8 +1,8 @@ Type: Package Package: mrremind Title: MadRat REMIND Input Data Package -Version: 0.197.0 -Date: 2024-11-04 +Version: 0.197.1 +Date: 2024-11-06 Authors@R: c( person("Lavinia", "Baumstark", , "lavinia@pik-potsdam.de", role = c("aut", "cre")), person("Renato", "Rodrigues", role = "aut"), @@ -52,7 +52,7 @@ Imports: magclass (>= 6.16.1), magrittr, mrcommons (>= 1.44.12), - mrdrivers (>= 2.0.0), + mrdrivers (>= 4.0.0), mrindustry (>= 0.4.0), nnls, purrr, diff --git a/R/calcHistorical.R b/R/calcHistorical.R index a144cadd..3682b3e4 100644 --- a/R/calcHistorical.R +++ b/R/calcHistorical.R @@ -33,7 +33,7 @@ calcHistorical <- function() { pop <- add_dimension(pop, dim = 3.1, add = "model", nm = "WDI") # GDP in ppp - gdp <- calcOutput("GDPPast", GDPPast = "WDI", aggregate = FALSE) / 1000 + gdp <- calcOutput("GDPPast", pastData = "WDI", aggregate = FALSE) / 1000 getNames(gdp) <- paste0("GDP|PPP (billion US$2017/yr)") gdp <- add_dimension(gdp, dim = 3.1, add = "model", nm = "WDI") diff --git a/README.md b/README.md index 7272f364..d7426946 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # MadRat REMIND Input Data Package -R package **mrremind**, version **0.197.0** +R package **mrremind**, version **0.197.1** [![CRAN status](https://www.r-pkg.org/badges/version/mrremind)](https://cran.r-project.org/package=mrremind) [![R build status](https://github.com/pik-piam/mrremind/workflows/check/badge.svg)](https://github.com/pik-piam/mrremind/actions) [![codecov](https://codecov.io/gh/pik-piam/mrremind/branch/master/graph/badge.svg)](https://app.codecov.io/gh/pik-piam/mrremind) [![r-universe](https://pik-piam.r-universe.dev/badges/mrremind)](https://pik-piam.r-universe.dev/builds) @@ -39,7 +39,7 @@ In case of questions / problems please contact Lavinia Baumstark . +Baumstark L, Rodrigues R, Levesque A, Oeser J, Bertram C, Mouratiadou I, Malik A, Schreyer F, Soergel B, Rottoli M, Mishra A, Dirnaichner A, Pehl M, Giannousakis A, Klein D, Strefler J, Feldhaus L, Brecha R, Rauner S, Dietrich J, Bi S, Benke F, Weigmann P, Richters O, Hasse R, Fuchs S, Mandaroux R, Koch J (2024). _mrremind: MadRat REMIND Input Data Package_. R package version 0.197.1, . A BibTeX entry for LaTeX users is @@ -48,7 +48,7 @@ A BibTeX entry for LaTeX users is title = {mrremind: MadRat REMIND Input Data Package}, author = {Lavinia Baumstark and Renato Rodrigues and Antoine Levesque and Julian Oeser and Christoph Bertram and Ioanna Mouratiadou and Aman Malik and Felix Schreyer and Bjoern Soergel and Marianna Rottoli and Abhijeet Mishra and Alois Dirnaichner and Michaja Pehl and Anastasis Giannousakis and David Klein and Jessica Strefler and Lukas Feldhaus and Regina Brecha and Sebastian Rauner and Jan Philipp Dietrich and Stephen Bi and Falk Benke and Pascal Weigmann and Oliver Richters and Robin Hasse and Sophie Fuchs and Rahel Mandaroux and Johannes Koch}, year = {2024}, - note = {R package version 0.197.0}, + note = {R package version 0.197.1}, url = {https://github.com/pik-piam/mrremind}, } ```