From 5d8ee2f56bcbf60b911fed133864a673108576db Mon Sep 17 00:00:00 2001 From: Michaja Pehl Date: Thu, 10 Oct 2024 10:25:01 +0200 Subject: [PATCH 1/2] fix steel projections by converting James GDPpC from 2005 to 2017 --- R/EDGE-Industry.R | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/R/EDGE-Industry.R b/R/EDGE-Industry.R index 8ec3f9c5..bfb17cf7 100644 --- a/R/EDGE-Industry.R +++ b/R/EDGE-Industry.R @@ -213,11 +213,13 @@ calcSteel_Projections <- function(subtype = 'production', ## historic per-capita GDP ---- GDPpC_history <- readSource(type = 'James', subtype = 'IHME_USD05_PPP_pc', convert = FALSE) %>% - as.data.frame() %>% as_tibble() %>% - select(iso3c = .data$Region, year = .data$Year, GDPpC = .data$Value) %>% - character.data.frame() %>% - mutate(year = as.integer(.data$year)) + select('iso3c' = 'ISO3', 'year' = 'Year', 'value') %>% + convertGDP(unit_in = 'constant 2005 US$MER', + unit_out = mrdrivers::toolGetUnitDollar(), + replace_NAs = 'with_USA') %>% + rename(GDPpC = 'value') %>% + character.data.frame() ## historic population ---- population_history <- calcOutput(type = 'PopulationPast', From 0a32532a5d7fe3da74966ed1cda65f4370a9d0b6 Mon Sep 17 00:00:00 2001 From: Michaja Pehl Date: Thu, 10 Oct 2024 10:35:19 +0200 Subject: [PATCH 2/2] lucode hubbub --- .buildlibrary | 2 +- CITATION.cff | 4 ++-- DESCRIPTION | 4 ++-- README.md | 6 +++--- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.buildlibrary b/.buildlibrary index 23eefd69..6efc9863 100644 --- a/.buildlibrary +++ b/.buildlibrary @@ -1,4 +1,4 @@ -ValidationKey: '38709675' +ValidationKey: '38731616' 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 996aff9c..90b06dde 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.5 -date-released: '2024-10-09' +version: 0.193.6 +date-released: '2024-10-10' abstract: The mrremind packages contains data preprocessing for the REMIND model. authors: - family-names: Baumstark diff --git a/DESCRIPTION b/DESCRIPTION index 4fe13022..90b5a484 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,8 +1,8 @@ Type: Package Package: mrremind Title: MadRat REMIND Input Data Package -Version: 0.193.5 -Date: 2024-10-09 +Version: 0.193.6 +Date: 2024-10-10 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 51735ddf..8d2adf18 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # MadRat REMIND Input Data Package -R package **mrremind**, version **0.193.5** +R package **mrremind**, version **0.193.6** [![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.6, . 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.5}, + note = {R package version 0.193.6}, url = {https://github.com/pik-piam/mrremind}, } ```