From d5b00ba6377d039ac5e9c9706969f1f9f9f37acf Mon Sep 17 00:00:00 2001 From: Katarzyna Kowalczyk <96818347+katarkow@users.noreply.github.com> Date: Thu, 20 Jul 2023 19:15:04 +0200 Subject: [PATCH] Rockgrind renamed to weathering (#407) Rename rockgrind to weathering --- .buildlibrary | 2 +- CITATION.cff | 4 ++-- DESCRIPTION | 4 ++-- R/readREMIND_11Regi.R | 1 + README.md | 6 +++--- 5 files changed, 9 insertions(+), 8 deletions(-) diff --git a/.buildlibrary b/.buildlibrary index b9f49718..f4ae2433 100644 --- a/.buildlibrary +++ b/.buildlibrary @@ -1,4 +1,4 @@ -ValidationKey: '32259150' +ValidationKey: '32466280' 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 f476dd1c..9838efdc 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.165.0 -date-released: '2023-07-13' +version: 0.166.0 +date-released: '2023-07-20' abstract: The mrremind packages contains data preprocessing for the REMIND model. authors: - family-names: Baumstark diff --git a/DESCRIPTION b/DESCRIPTION index 364c4a94..0381136b 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,8 +1,8 @@ Type: Package Package: mrremind Title: MadRat REMIND Input Data Package -Version: 0.165.0 -Date: 2023-07-13 +Version: 0.166.0 +Date: 2023-07-20 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 a58182ea..ccad5cf3 100644 --- a/R/readREMIND_11Regi.R +++ b/R/readREMIND_11Regi.R @@ -39,6 +39,7 @@ readREMIND_11Regi<- function(subtype) { x <- as.magpie(x,datacol=2) } else if (subtype=="capacityFactorGlobal") { x <- read.csv("f_cf-global.csv",sep=";") + x[x$Tech == "rockgrind", "Tech"] <- "weathering" x <- as.magpie(x,datacol=2) } else if (subtype=="capacityFactorRules") { x <- read.csv("f_cf-rules.csv",sep=";") diff --git a/README.md b/README.md index a0b82a16..0a3d6d90 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # MadRat REMIND Input Data Package -R package **mrremind**, version **0.165.0** +R package **mrremind**, version **0.166.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 (2023). _mrremind: MadRat REMIND Input Data Package_. R package version 0.166.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}, year = {2023}, - note = {R package version 0.165.0}, + note = {R package version 0.166.0}, url = {https://github.com/pik-piam/mrremind}, } ```