diff --git a/.buildlibrary b/.buildlibrary index 0492e300..94beb64b 100644 --- a/.buildlibrary +++ b/.buildlibrary @@ -1,4 +1,4 @@ -ValidationKey: '34918422' +ValidationKey: '35069300' AcceptedWarnings: - 'Warning: package ''.*'' was built under R version' - 'Warning: namespace ''.*'' is not available and has been replaced' diff --git a/.github/workflows/pkgdown.yaml b/.github/workflows/pkgdown.yaml index ec2d3cb7..d62e0501 100644 --- a/.github/workflows/pkgdown.yaml +++ b/.github/workflows/pkgdown.yaml @@ -28,7 +28,7 @@ jobs: run: | options(repos = c(pikpiam = 'https://pik-piam.r-universe.dev', CRAN = Sys.getenv('RSPM'))) - pak::pak(".") + pak::pak(".", dependencies = 'all') pak::pkg_install("tidyverse/tidytemplate") - name: Build site diff --git a/CITATION.cff b/CITATION.cff index ea978351..d6c91181 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: 'mrcommons: MadRat commons Input Data Library' -version: 1.69.4 -date-released: '2026-06-09' +version: 1.70.0 +date-released: '2026-06-25' 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. authors: diff --git a/DESCRIPTION b/DESCRIPTION index f2f768d8..3a9cc8d2 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,8 +1,8 @@ Type: Package Package: mrcommons Title: MadRat commons Input Data Library -Version: 1.69.4 -Date: 2026-06-09 +Version: 1.70.0 +Date: 2026-06-25 Authors@R: c( person("Benjamin Leon", "Bodirsky", , "bodirsky@pik-potsdam.de", role = "aut"), person("Kristine", "Karstens", role = "aut"), diff --git a/R/readMAgPIE.R b/R/readMAgPIE.R index 945494e4..d9884f54 100644 --- a/R/readMAgPIE.R +++ b/R/readMAgPIE.R @@ -16,7 +16,7 @@ readMAgPIE <- function(subtype) { # input data version - ver <- "2026-05" + ver <- "2026-06" if (subtype == "EmiAirPoll") { x <- read.csv(file.path(ver, "emiAPexo.csv"), row.names = 1) @@ -74,22 +74,19 @@ readMAgPIE <- function(subtype) { # Please update scenario names in mrremind::calcBiomassPrices.R if necessary scenarioNames <- c( - "f30_bioen_price_SDP-MC-SSP1-NPi_replaced_flat", - "f30_bioen_price_SDP-MC-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" + "f30_bioen_price_SSP1-NPi2025_replaced_flat", # ssp1.rcp45 + "f30_bioen_price_SSP1-PkBudg1000_replaced_flat", # ssp1.rcp26 + "f30_bioen_price_SSP1-PkBudg750_replaced_flat", # ssp1.rcp20 + #"f30_bioen_price_SSP2-EcBudg500_replaced_flat", + "f30_bioen_price_SSP2-NDC_replaced_flat", # ssp2.rcp37 + "f30_bioen_price_SSP2-NPi2025_replaced_flat", # ssp2.rcp45 --> ssp5.rcp45 + "f30_bioen_price_SSP2-PkBudg1000_replaced_flat", # ssp2.rcp26 --> ssp5.rcp26 + "f30_bioen_price_SSP2-PkBudg750_replaced_flat", # ssp2.rcp20 --> ssp5.rcp20 + "f30_bioen_price_SSP3-NPi2025_replaced_flat", # ssp3.rcp45 + "f30_bioen_price_SSP3-PkBudg1000_replaced_flat" # ssp3.rcp26 + #"f30_bioen_price_SSP3-rollBack_replaced_flat" ) - + fileList <- file.path(ver, paste0(scenarioNames, regcode, ".cs4r")) setnames <- c("region", "year", "scenario", "char") diff --git a/README.md b/README.md index a8dde01d..be1dfbdd 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # MadRat commons Input Data Library -R package **mrcommons**, version **1.69.4** +R package **mrcommons**, version **1.70.0** [![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) @@ -40,7 +40,7 @@ In case of questions / problems please contact Jan Philipp Dietrich , Version: 1.69.4, . +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, Bleidorn 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 (2026). "mrcommons: MadRat commons Input Data Library." doi:10.5281/zenodo.3822009 , Version: 1.70.0, . A BibTeX entry for LaTeX users is @@ -49,9 +49,9 @@ 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 Eva Bleidorn 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}, doi = {10.5281/zenodo.3822009}, - date = {2026-06-09}, + date = {2026-06-25}, year = {2026}, url = {https://github.com/pik-piam/mrcommons}, - note = {Version: 1.69.4}, + note = {Version: 1.70.0}, } ```