From 694588a108482107001cb95f267c5d2514986e70 Mon Sep 17 00:00:00 2001 From: Falk Benke Date: Fri, 15 Nov 2024 17:14:43 +0100 Subject: [PATCH] update input file to REMIND_11Regi --- .buildlibrary | 2 +- CITATION.cff | 4 ++-- DESCRIPTION | 4 ++-- R/readREMIND_11Regi.R | 2 +- README.md | 6 +++--- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.buildlibrary b/.buildlibrary index 358406ed..32d02813 100644 --- a/.buildlibrary +++ b/.buildlibrary @@ -1,4 +1,4 @@ -ValidationKey: '39699240' +ValidationKey: '39723244' AcceptedWarnings: - Invalid URL: .* - 'Warning: package ''.*'' was built under R version' diff --git a/CITATION.cff b/CITATION.cff index 68302847..29155224 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.198.1 -date-released: '2024-11-13' +version: 0.198.2 +date-released: '2024-11-15' abstract: The mrremind packages contains data preprocessing for the REMIND model. authors: - family-names: Baumstark diff --git a/DESCRIPTION b/DESCRIPTION index 31d314be..e8ad72a3 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,8 +1,8 @@ Type: Package Package: mrremind Title: MadRat REMIND Input Data Package -Version: 0.198.1 -Date: 2024-11-13 +Version: 0.198.2 +Date: 2024-11-15 Authors@R: c( person("Lavinia", "Baumstark", , "lavinia@pik-potsdam.de", role = c("aut", "cre")), person("Renato", "Rodrigues", role = "aut"), diff --git a/R/readREMIND_11Regi.R b/R/readREMIND_11Regi.R index f1a9eefb..950ae8cf 100644 --- a/R/readREMIND_11Regi.R +++ b/R/readREMIND_11Regi.R @@ -31,7 +31,7 @@ readREMIND_11Regi <- function(subtype) { }, "deltacapoffset" = read.csv("p_adj_deltacapoffset.csv", sep = ";") %>% as.magpie(datacol = 2), "capacityFactorGlobal" = read.csv("f_cf-global_REMIND_3.3.5.csv", sep = ";") %>% as.magpie(datacol = 2), - "capacityFactorRules" = read.csv("f_cf-rules.csv", sep = ";") %>% as.magpie(datacol = 4), + "capacityFactorRules" = read.csv("f_cf-rules_v1.1.csv", sep = ";") %>% as.magpie(datacol = 4), "storageFactor" = read.csv("storageFactor.csv", sep = ";") %>% as.magpie(datacol = 2), "residuesShare" = read.csv("residuesShare.csv", row.names = 1) %>% as.magpie(datacol = 4), "shareIndFE" = read.csv("shareIndustyFE.csv", sep = ";", skip = 3) %>% as.magpie(datacol = 3), diff --git a/README.md b/README.md index 7ae60214..7501fe48 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # MadRat REMIND Input Data Package -R package **mrremind**, version **0.198.1** +R package **mrremind**, version **0.198.2** [![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.198.2, . 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.198.1}, + note = {R package version 0.198.2}, url = {https://github.com/pik-piam/mrremind}, } ```