diff --git a/.buildlibrary b/.buildlibrary index 164dc9a7..35b1f9d5 100644 --- a/.buildlibrary +++ b/.buildlibrary @@ -1,4 +1,4 @@ -ValidationKey: '40729920' +ValidationKey: '40942800' AcceptedWarnings: - Invalid URL: .* - 'Warning: package ''.*'' was built under R version' diff --git a/CITATION.cff b/CITATION.cff index e2134531..75c68db4 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.203.0 -date-released: '2024-12-07' +version: 0.204.0 +date-released: '2024-12-13' abstract: The mrremind packages contains data preprocessing for the REMIND model. authors: - family-names: Baumstark diff --git a/DESCRIPTION b/DESCRIPTION index c787a32b..a7dc8692 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,8 +1,8 @@ Type: Package Package: mrremind Title: MadRat REMIND Input Data Package -Version: 0.203.0 -Date: 2024-12-07 +Version: 0.204.0 +Date: 2024-12-13 Authors@R: c( person("Lavinia", "Baumstark", , "lavinia@pik-potsdam.de", role = c("aut", "cre")), person("Renato", "Rodrigues", role = "aut"), diff --git a/R/readEDGETransport.R b/R/readEDGETransport.R index f87ac87a..c2189b1d 100644 --- a/R/readEDGETransport.R +++ b/R/readEDGETransport.R @@ -28,17 +28,13 @@ readEDGETransport <- function(subtype) { ## for all "default" SSP variants we ship the whole zoo of standard ## EDGE-T scenarios expand_grid( - SSPscen = c("SSP2", "SSP3", "SSP5", "SDP"), + SSPscen = c("SSP1", "SSP2", "SSP3", "SSP5", "SDP"), transportPolScen = c("Mix1", "Mix2", "Mix3", "Mix4"), isICEban = c(TRUE, FALSE), demScen = c("default")), # Specific project scenarios tribble( ~SSPscen, ~transportPolScen, ~isICEban, ~demScen, - "SSP1", "Mix1", FALSE, "default", - "SSP1", "Mix2", FALSE, "default", - "SSP1", "Mix3", TRUE, "default", - "SSP1", "Mix4", TRUE, "default", "SSP2", "Mix1", FALSE, "SSP2_demRedStrong", "SSP2", "Mix2", FALSE, "SSP2_demRedStrong", "SSP2", "Mix3", TRUE, "SSP2_demRedStrong", diff --git a/README.md b/README.md index 19c2d108..dd8afdcd 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # MadRat REMIND Input Data Package -R package **mrremind**, version **0.203.0** +R package **mrremind**, version **0.204.0** [![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.204.0, . 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.203.0}, + note = {R package version 0.204.0}, url = {https://github.com/pik-piam/mrremind}, } ```