From f4599840b611486a9c924a7d7f2b1815d2d6856b Mon Sep 17 00:00:00 2001 From: Michaja Pehl Date: Fri, 15 Sep 2023 16:16:59 +0200 Subject: [PATCH 1/2] fix missing INDSTAT2 model/scenario in historical.mif --- R/UNIDO.R | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/R/UNIDO.R b/R/UNIDO.R index ab03c0c5..b061283d 100644 --- a/R/UNIDO.R +++ b/R/UNIDO.R @@ -308,6 +308,10 @@ calcUNIDO <- function(subtype = 'INDSTAT2') getNames(x) <- variable_names[match(getNames(x), subsector_names)] + x <- x %>% + add_dimension(dim = 3.1, add = 'model', nm = 'INDSTAT2') %>% + add_dimension(dim = 3.2, add = 'scenario', nm = 'historical') + return(list(x = x, weight = NULL, unit = 'billion US$2005/yr', From e9fb5f599895786183d4529f6724a099fab379a6 Mon Sep 17 00:00:00 2001 From: Michaja Pehl Date: Fri, 15 Sep 2023 16:30:26 +0200 Subject: [PATCH 2/2] lucode hubbub --- .buildlibrary | 2 +- CITATION.cff | 2 +- DESCRIPTION | 2 +- README.md | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.buildlibrary b/.buildlibrary index 1b589702..de931592 100644 --- a/.buildlibrary +++ b/.buildlibrary @@ -1,4 +1,4 @@ -ValidationKey: '33208195' +ValidationKey: '33227810' 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 034a1382..8bd39442 100644 --- a/CITATION.cff +++ b/CITATION.cff @@ -2,7 +2,7 @@ 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.169.3 +version: 0.169.4 date-released: '2023-09-15' abstract: The mrremind packages contains data preprocessing for the REMIND model. authors: diff --git a/DESCRIPTION b/DESCRIPTION index aa60de8a..01c8d241 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,7 +1,7 @@ Type: Package Package: mrremind Title: MadRat REMIND Input Data Package -Version: 0.169.3 +Version: 0.169.4 Date: 2023-09-15 Authors@R: c( person("Lavinia", "Baumstark", , "lavinia@pik-potsdam.de", role = c("aut", "cre")), diff --git a/README.md b/README.md index c15e92fb..1570b823 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # MadRat REMIND Input Data Package -R package **mrremind**, version **0.169.3** +R package **mrremind**, version **0.169.4** [![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 (2023). _mrremind: MadRat REMIND Input Data Package_. R package version 0.169.4, . 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}, year = {2023}, - note = {R package version 0.169.3}, + note = {R package version 0.169.4}, url = {https://github.com/pik-piam/mrremind}, } ```