From 2bd371605e1a1165a4a78bd8d7a02971b2cbffb3 Mon Sep 17 00:00:00 2001 From: Falk Benke Date: Wed, 4 Sep 2024 09:55:14 +0200 Subject: [PATCH 1/3] update IEA Energy Balances --- R/calcFE.R | 2 +- R/calcIO.R | 2 +- R/calcPE.R | 2 +- R/calcTrade.R | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/R/calcFE.R b/R/calcFE.R index cb0dad6d..4860068c 100644 --- a/R/calcFE.R +++ b/R/calcFE.R @@ -26,7 +26,7 @@ calcFE <- function(source = "IEA", scenario_proj = "SSP2", ieaVersion = "default colnames(map) <- gsub("io", "names_in", colnames(map)) # Give description - ieaYear <- if (ieaVersion == "default") 2022 else 2023 + ieaYear <- if (ieaVersion == "default") 2022 else 2024 descript <- paste0("IEA Final Energy Data based on ", ieaYear, " version of IEA Energy Balances") #------ PROCESS DATA ------------------------------------------ diff --git a/R/calcIO.R b/R/calcIO.R index 2e32c08e..a2295e89 100644 --- a/R/calcIO.R +++ b/R/calcIO.R @@ -97,7 +97,7 @@ calcIO <- function(subtype = c("input", "output", "output_biomass", "trade", } ieaSubtype <- if (ieaVersion == "default") "EnergyBalances" else "EnergyBalances-latest" - ieaYear <- if (ieaVersion == "default") 2022 else 2023 + ieaYear <- if (ieaVersion == "default") 2022 else 2024 # read in data and convert from ktoe to EJ data <- readSource("IEA", subtype = ieaSubtype) * 4.1868e-5 diff --git a/R/calcPE.R b/R/calcPE.R index d347cb72..ecde6517 100644 --- a/R/calcPE.R +++ b/R/calcPE.R @@ -45,7 +45,7 @@ calcPE <- function(subtype = "IEA", ieaVersion = "default") { x <- mbind(x, setNames(dimSums(x[, , "PE|Gas", pmatch = TRUE], dim = 3), "PE|Gas (EJ/yr)")) x <- mbind(x, setNames(dimSums(x[, , "PE|Biomass", pmatch = TRUE], dim = 3), "PE|Biomass (EJ/yr)")) - ieaYear <- if (ieaVersion == "default") 2022 else 2023 + ieaYear <- if (ieaVersion == "default") 2022 else 2024 return(list(x = x, weight = NULL, unit = "EJ", description = paste0("IEA Primary Energy Data based on ", ieaYear, diff --git a/R/calcTrade.R b/R/calcTrade.R index b1cbffa7..583055a1 100644 --- a/R/calcTrade.R +++ b/R/calcTrade.R @@ -23,6 +23,6 @@ calcTrade <- function() { return(list( x = x, weight = NULL, unit = "EJ", - description = "IEA Final Energy Data based on 2023 version of IEA Energy Balances" + description = "IEA Final Energy Data based on 2024 version of IEA Energy Balances" )) } From 08d4913d2af1109962a29a77142b0c8e0a7b4367 Mon Sep 17 00:00:00 2001 From: Falk Benke Date: Wed, 4 Sep 2024 10:35:22 +0200 Subject: [PATCH 2/3] increment to dev version --- .buildlibrary | 2 +- CITATION.cff | 4 ++-- DESCRIPTION | 4 ++-- README.md | 6 +++--- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.buildlibrary b/.buildlibrary index 55194e15..8d8645a3 100644 --- a/.buildlibrary +++ b/.buildlibrary @@ -1,4 +1,4 @@ -ValidationKey: '37361999' +ValidationKey: '37383840' 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 4dd7d29e..aa6c5812 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.187.1 -date-released: '2024-09-03' +version: 0.187.1.9001 +date-released: '2024-09-04' abstract: The mrremind packages contains data preprocessing for the REMIND model. authors: - family-names: Baumstark diff --git a/DESCRIPTION b/DESCRIPTION index 05c74e3b..259de113 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,8 +1,8 @@ Type: Package Package: mrremind Title: MadRat REMIND Input Data Package -Version: 0.187.1 -Date: 2024-09-03 +Version: 0.187.1.9001 +Date: 2024-09-04 Authors@R: c( person("Lavinia", "Baumstark", , "lavinia@pik-potsdam.de", role = c("aut", "cre")), person("Renato", "Rodrigues", role = "aut"), diff --git a/README.md b/README.md index f5f23477..260ff5c9 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # MadRat REMIND Input Data Package -R package **mrremind**, version **0.187.1** +R package **mrremind**, version **0.187.1.9001** [![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.187.1.9001, . 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.187.1}, + note = {R package version 0.187.1.9001}, url = {https://github.com/pik-piam/mrremind}, } ``` From d802415aa1cbeac8f489a095fd0f5de93ecd621e Mon Sep 17 00:00:00 2001 From: Falk Benke Date: Wed, 4 Sep 2024 16:18:00 +0200 Subject: [PATCH 3/3] increment version --- CITATION.cff | 2 +- DESCRIPTION | 2 +- README.md | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CITATION.cff b/CITATION.cff index aa6c5812..3bfd5e10 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.187.1.9001 +version: 0.187.2 date-released: '2024-09-04' abstract: The mrremind packages contains data preprocessing for the REMIND model. authors: diff --git a/DESCRIPTION b/DESCRIPTION index 259de113..3f3a23b1 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,7 +1,7 @@ Type: Package Package: mrremind Title: MadRat REMIND Input Data Package -Version: 0.187.1.9001 +Version: 0.187.2 Date: 2024-09-04 Authors@R: c( person("Lavinia", "Baumstark", , "lavinia@pik-potsdam.de", role = c("aut", "cre")), diff --git a/README.md b/README.md index 260ff5c9..e6e18f10 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # MadRat REMIND Input Data Package -R package **mrremind**, version **0.187.1.9001** +R package **mrremind**, version **0.187.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.187.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.187.1.9001}, + note = {R package version 0.187.2}, url = {https://github.com/pik-piam/mrremind}, } ```