From a8f0e1b90782058e0d631c1d56a5b217197b9eed Mon Sep 17 00:00:00 2001 From: David Klein Date: Sat, 9 Nov 2024 21:02:59 +0100 Subject: [PATCH] Bugfix file names --- .buildlibrary | 2 +- CITATION.cff | 2 +- DESCRIPTION | 2 +- R/readMAgPIE.R | 28 ++++++++++++++-------------- README.md | 6 +++--- 5 files changed, 20 insertions(+), 20 deletions(-) diff --git a/.buildlibrary b/.buildlibrary index 5cd0878b..faafc0f0 100644 --- a/.buildlibrary +++ b/.buildlibrary @@ -1,4 +1,4 @@ -ValidationKey: '29312668' +ValidationKey: '29332704' 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 3e805a05..0d3b18e1 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: 'mrcommons: MadRat commons Input Data Library' -version: 1.46.3 +version: 1.46.4 date-released: '2024-11-09' abstract: Provides useful functions and a common structure to all the input data required to run models like MAgPIE and REMIND of model input data. diff --git a/DESCRIPTION b/DESCRIPTION index 0a94d426..c11b28ad 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,7 +1,7 @@ Package: mrcommons Type: Package Title: MadRat commons Input Data Library -Version: 1.46.3 +Version: 1.46.4 Date: 2024-11-09 Authors@R: c(person("Benjamin Leon", "Bodirsky", email = "bodirsky@pik-potsdam.de", role = "aut"), person("Kristine", "Karstens", role = "aut"), diff --git a/R/readMAgPIE.R b/R/readMAgPIE.R index 64154add..5411b422 100644 --- a/R/readMAgPIE.R +++ b/R/readMAgPIE.R @@ -76,20 +76,20 @@ readMAgPIE <- function(subtype) { # Please update scenario names in mrremind::calcBiomassPrices.R if necessary scenarioNames <- c( - "f30_bioen_price_SSP1-SSP1-NPi_replaced_flat_62eff8f7.cs4r", - "f30_bioen_price_SSP1-SSP1-PkBudg650_replaced_flat_62eff8f7.cs4r", - "f30_bioen_price_SSP2-SSP2_lowEn-NPi_replaced_flat_62eff8f7.cs4r", - "f30_bioen_price_SSP2-SSP2_lowEn-PkBudg1000_replaced_flat_62eff8f7.cs4r", - "f30_bioen_price_SSP2-SSP2_lowEn-PkBudg650_replaced_flat_62eff8f7.cs4r", - "f30_bioen_price_SSP2-SSP2-NPi_replaced_flat_62eff8f7.cs4r", - "f30_bioen_price_SSP2-SSP2-PkBudg1000_replaced_flat_62eff8f7.cs4r", - "f30_bioen_price_SSP2-SSP2-PkBudg650_replaced_flat_62eff8f7.cs4r", - "f30_bioen_price_SSP3-SSP2-NPi_replaced_flat_62eff8f7.cs4r", - "f30_bioen_price_SSP3-SSP2-PkBudg1000_replaced_flat_62eff8f7.cs4r", - "f30_bioen_price_SSP3-SSP2-PkBudg650_replaced_flat_62eff8f7.cs4r", - "f30_bioen_price_SSP5-SSP5-NPi_replaced_flat_62eff8f7.cs4r", - "f30_bioen_price_SSP5-SSP5-PkBudg1000_replaced_flat_62eff8f7.cs4r", - "f30_bioen_price_SSP5-SSP5-PkBudg650_replaced_flat_62eff8f7.cs4r" + "f30_bioen_price_SSP1-SSP1-NPi_replaced_flat", + "f30_bioen_price_SSP1-SSP1-PkBudg650_replaced_flat", + "f30_bioen_price_SSP2-SSP2_lowEn-NPi_replaced_flat", + "f30_bioen_price_SSP2-SSP2_lowEn-PkBudg1000_replaced_flat", + "f30_bioen_price_SSP2-SSP2_lowEn-PkBudg650_replaced_flat", + "f30_bioen_price_SSP2-SSP2-NPi_replaced_flat", + "f30_bioen_price_SSP2-SSP2-PkBudg1000_replaced_flat", + "f30_bioen_price_SSP2-SSP2-PkBudg650_replaced_flat", + "f30_bioen_price_SSP3-SSP2-NPi_replaced_flat", + "f30_bioen_price_SSP3-SSP2-PkBudg1000_replaced_flat", + "f30_bioen_price_SSP3-SSP2-PkBudg650_replaced_flat", + "f30_bioen_price_SSP5-SSP5-NPi_replaced_flat", + "f30_bioen_price_SSP5-SSP5-PkBudg1000_replaced_flat", + "f30_bioen_price_SSP5-SSP5-PkBudg650_replaced_flat" ) fileList <- file.path(ver, paste0(scenarioNames, regcode, ".cs4r")) diff --git a/README.md b/README.md index 0d7ef0d3..012f31e9 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # MadRat commons Input Data Library -R package **mrcommons**, version **1.46.2** +R package **mrcommons**, version **1.46.4** [![CRAN status](https://www.r-pkg.org/badges/version/mrcommons)](https://cran.r-project.org/package=mrcommons) [![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.3822009.svg)](https://doi.org/10.5281/zenodo.3822009) [![R build status](https://github.com/pik-piam/mrcommons/workflows/check/badge.svg)](https://github.com/pik-piam/mrcommons/actions) [![codecov](https://codecov.io/gh/pik-piam/mrcommons/branch/master/graph/badge.svg)](https://app.codecov.io/gh/pik-piam/mrcommons) [![r-universe](https://pik-piam.r-universe.dev/badges/mrcommons)](https://pik-piam.r-universe.dev/builds) @@ -39,7 +39,7 @@ In case of questions / problems please contact Jan Philipp Dietrich , R package version 1.46.2, . +Bodirsky B, Karstens K, Baumstark L, Weindl I, Wang X, Mishra A, Wirth S, Stevanovic M, Steinmetz N, Kreidenweis U, Rodrigues R, Popov R, Humpenoeder F, Giannousakis A, Levesque A, Klein D, Araujo E, Beier F, Oeser J, Pehl M, Leip D, Crawford M, Molina Bacca E, von Jeetze P, Martinelli E, Schreyer F, Soergel B, Sauer P, Hötten D, Hasse R, Abrahão G, Weigmann P, Dietrich J (2024). _mrcommons: MadRat commons Input Data Library_. doi:10.5281/zenodo.3822009 , R package version 1.46.4, . A BibTeX entry for LaTeX users is @@ -48,7 +48,7 @@ A BibTeX entry for LaTeX users is title = {mrcommons: MadRat commons Input Data Library}, author = {Benjamin Leon Bodirsky and Kristine Karstens and Lavinia Baumstark and Isabelle Weindl and Xiaoxi Wang and Abhijeet Mishra and Stephen Wirth and Mishko Stevanovic and Nele Steinmetz and Ulrich Kreidenweis and Renato Rodrigues and Roman Popov and Florian Humpenoeder and Anastasis Giannousakis and Antoine Levesque and David Klein and Ewerton Araujo and Felicitas Beier and Julian Oeser and Michaja Pehl and Debbora Leip and Michael Crawford and Edna {Molina Bacca} and Patrick {von Jeetze} and Eleonora Martinelli and Felix Schreyer and Bjoern Soergel and Pascal Sauer and David Hötten and Robin Hasse and Gabriel Abrahão and Pascal Weigmann and Jan Philipp Dietrich}, year = {2024}, - note = {R package version 1.46.2}, + note = {R package version 1.46.4}, url = {https://github.com/pik-piam/mrcommons}, doi = {10.5281/zenodo.3822009}, }