From 45101e6725e84f003e28748bb8a749b625cda70d Mon Sep 17 00:00:00 2001 From: robinhasse Date: Fri, 20 Jan 2023 15:53:43 +0100 Subject: [PATCH] Bugfix: Correct scenario names. --- .buildlibrary | 2 +- .zenodo.json | 2 +- DESCRIPTION | 4 ++-- R/readEDGE.R | 2 +- README.md | 6 +++--- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.buildlibrary b/.buildlibrary index 3400a203..de774fee 100644 --- a/.buildlibrary +++ b/.buildlibrary @@ -1,4 +1,4 @@ -ValidationKey: '29643750' +ValidationKey: '29666187' AcceptedWarnings: - 'Warning: package ''.*'' was built under R version' - 'Warning: namespace ''.*'' is not available and has been replaced' diff --git a/.zenodo.json b/.zenodo.json index 1c9fb78e..c1e7ae3b 100644 --- a/.zenodo.json +++ b/.zenodo.json @@ -1,6 +1,6 @@ { "title": "mrremind: MadRat REMIND Input Data Package", - "version": "0.153.0", + "version": "0.153.1", "description": "

The mrremind packages contains data preprocessing for the\n REMIND model.<\/p>", "creators": [ { diff --git a/DESCRIPTION b/DESCRIPTION index a5c0b76b..4181842c 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,8 +1,8 @@ Type: Package Package: mrremind Title: MadRat REMIND Input Data Package -Version: 0.153.0 -Date: 2023-01-18 +Version: 0.153.1 +Date: 2023-01-20 Authors@R: c( person("Lavinia", "Baumstark", , "lavinia@pik-potsdam.de", role = c("aut", "cre")), person("Renato", "Rodrigues", role = "aut"), diff --git a/R/readEDGE.R b/R/readEDGE.R index b4e9ed6a..efda6405 100644 --- a/R/readEDGE.R +++ b/R/readEDGE.R @@ -20,7 +20,7 @@ readEDGE <- function(subtype = c("FE_stationary", "FE_buildings", "Capital", "Ca ver <- "1.11" scenarios <- list( SSPs = paste0("SSP", 1:5), - SSP2s = paste0("SSP2", c("EU", "_lowEn", paste0("_NAV_", c("act", "tec", "ele", "lce", "all")))), + SSP2s = paste0("SSP2", c("EU", "_lowEn", paste0("EU_NAV_", c("act", "tec", "ele", "lce", "all")))), SDPs = paste0("SDP", c("", "_EI", "_MC", "_RC"))) addDim <- function(x, addnm, dim, dimCode = 3.2) { diff --git a/README.md b/README.md index 73bf5f88..66d77d1c 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # MadRat REMIND Input Data Package -R package **mrremind**, version **0.153.0** +R package **mrremind**, version **0.153.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/ui#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 (2023). _mrremind: MadRat REMIND Input Data Package_. R package version 0.153.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}, year = {2023}, - note = {R package version 0.153.0}, + note = {R package version 0.153.1}, url = {https://github.com/pik-piam/mrremind}, } ```