diff --git a/.buildlibrary b/.buildlibrary index ba0a2b65..0acc7259 100644 --- a/.buildlibrary +++ b/.buildlibrary @@ -1,4 +1,4 @@ -ValidationKey: '40118049' +ValidationKey: '40298490' AcceptedWarnings: - Invalid URL: .* - 'Warning: package ''.*'' was built under R version' diff --git a/CITATION.cff b/CITATION.cff index fd745af4..a1497297 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: 'mrremind: MadRat REMIND Input Data Package' -version: 0.200.1 +version: 0.201.0 date-released: '2024-11-22' abstract: The mrremind packages contains data preprocessing for the REMIND model. authors: diff --git a/DESCRIPTION b/DESCRIPTION index 8241fc45..660cb8f6 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,7 +1,7 @@ Type: Package Package: mrremind Title: MadRat REMIND Input Data Package -Version: 0.200.1 +Version: 0.201.0 Date: 2024-11-22 Authors@R: c( person("Lavinia", "Baumstark", , "lavinia@pik-potsdam.de", role = c("aut", "cre")), diff --git a/R/calcFEdemand.R b/R/calcFEdemand.R index 02357e5d..e4f354c8 100644 --- a/R/calcFEdemand.R +++ b/R/calcFEdemand.R @@ -10,14 +10,8 @@ calcFEdemand <- function() { # add Navigate and Campaigners scenarios to industry and transport to match buildings scenarios by duplication duplicateScens <- "gdp_SSP2EU_NAV_all" - - feTransport <- mbind(feTransport, do.call(mbind, lapply(duplicateScens, function(to) { - setItems(feTransport[, , "gdp_SSP2EU"], 3.1, to) - }))) - - feIndustry <- mbind(feIndustry, do.call(mbind, lapply(duplicateScens, function(to) { - setItems(feIndustry[, , "gdp_SSP2EU"], 3.1, to) - }))) + feTransport <- mbind(feTransport, setItems(feTransport[, , "gdp_SSP2EU"], 3.1, duplicateScens)) + feIndustry <- mbind(feIndustry, setItems(feIndustry[, , "gdp_SSP2EU"], 3.1, duplicateScens)) # add up industry and buildings contributions to stationary stationaryItems <- c("fehes", "feh2s") diff --git a/R/calcFeDemandBuildings.R b/R/calcFeDemandBuildings.R index 20f31c4d..f09e516f 100644 --- a/R/calcFeDemandBuildings.R +++ b/R/calcFeDemandBuildings.R @@ -23,10 +23,7 @@ calcFeDemandBuildings <- function(subtype) { stationary <- toolAggregateTimeSteps(stationary) # add scenarios to stationary to match buildings scenarios by duplication - duplicateScens <- "SSP2EU_NAV_all" - stationary <- mbind(stationary, do.call(mbind, lapply(duplicateScens, function(to) { - setItems(stationary[, , "SSP2EU"], 3.1, to) - }))) + stationary <- mbind(stationary, setItems(stationary[, , "SSP2EU"], 3.1, "SSP2EU_NAV_all")) if (subtype == "FE") { diff --git a/README.md b/README.md index 65c0c89e..1310ae32 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # MadRat REMIND Input Data Package -R package **mrremind**, version **0.200.1** +R package **mrremind**, version **0.201.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.201.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.200.1}, + note = {R package version 0.201.0}, url = {https://github.com/pik-piam/mrremind}, } ```