From 74d9b463d94016296a7d7578f77b89d7de0e4272 Mon Sep 17 00:00:00 2001 From: Johannes Koch Date: Fri, 11 Oct 2024 07:48:21 +0200 Subject: [PATCH 1/2] Change argument names in accordance with mrdrivers update --- R/EDGE-Industry.R | 2 +- R/calcHistorical.R | 2 +- R/calcSteelStock.R | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/R/EDGE-Industry.R b/R/EDGE-Industry.R index bfb17cf7..fd699790 100644 --- a/R/EDGE-Industry.R +++ b/R/EDGE-Industry.R @@ -223,7 +223,7 @@ calcSteel_Projections <- function(subtype = 'production', ## historic population ---- population_history <- calcOutput(type = 'PopulationPast', - PopulationPast = 'UN_PopDiv', + pastData = 'UN_PopDiv', aggregate = FALSE) %>% as.data.frame() %>% as_tibble() %>% diff --git a/R/calcHistorical.R b/R/calcHistorical.R index 9079409a..04d8fe82 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/R/calcSteelStock.R b/R/calcSteelStock.R index 5a8d4fa1..22ed7d7d 100644 --- a/R/calcSteelStock.R +++ b/R/calcSteelStock.R @@ -10,7 +10,7 @@ calcSteelStock <- function() { steel_stock_per_capita <- readSource(type = "Mueller", subtype = "stocks", convert = TRUE)[, , "Steel stock per-capita|med (t)"] - population <- calcOutput("PopulationPast", PopulationPast = 'UN_PopDiv', aggregate = FALSE) + population <- calcOutput("PopulationPast", pastData = 'UN_PopDiv', aggregate = FALSE) y <- intersect(getItems(steel_stock_per_capita, 2), getItems(population, 2)) @@ -21,6 +21,6 @@ calcSteelStock <- function() { x = stock, weight = NULL, unit = "million t", - description = "Historical steel stock based on Mueller's medium stock per capita numbers and WDI population" + description = "Historical steel stock based on Mueller's medium stock per capita numbers and UN_PopDiv population" )) } From 558c12d6685a381158d1b1b55801fdf8f5d22c24 Mon Sep 17 00:00:00 2001 From: Johannes Koch Date: Fri, 11 Oct 2024 08:01:16 +0200 Subject: [PATCH 2/2] Bump version --- .buildlibrary | 2 +- CITATION.cff | 4 ++-- DESCRIPTION | 4 ++-- README.md | 6 +++--- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.buildlibrary b/.buildlibrary index 6efc9863..ca1ac5d9 100644 --- a/.buildlibrary +++ b/.buildlibrary @@ -1,4 +1,4 @@ -ValidationKey: '38731616' +ValidationKey: '38753559' 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 90b06dde..1fb8457c 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.193.6 -date-released: '2024-10-10' +version: 0.193.7 +date-released: '2024-10-11' abstract: The mrremind packages contains data preprocessing for the REMIND model. authors: - family-names: Baumstark diff --git a/DESCRIPTION b/DESCRIPTION index 90b5a484..15e521e1 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,8 +1,8 @@ Type: Package Package: mrremind Title: MadRat REMIND Input Data Package -Version: 0.193.6 -Date: 2024-10-10 +Version: 0.193.7 +Date: 2024-10-11 Authors@R: c( person("Lavinia", "Baumstark", , "lavinia@pik-potsdam.de", role = c("aut", "cre")), person("Renato", "Rodrigues", role = "aut"), diff --git a/README.md b/README.md index 8d2adf18..24535646 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # MadRat REMIND Input Data Package -R package **mrremind**, version **0.193.6** +R package **mrremind**, version **0.193.7** [![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.193.7, . 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.193.6}, + note = {R package version 0.193.7}, url = {https://github.com/pik-piam/mrremind}, } ```