From 88d5ec75984591590f093e09d32d51fe756e0c3c Mon Sep 17 00:00:00 2001 From: Felix Schreyer Date: Wed, 28 Feb 2024 17:42:51 +0100 Subject: [PATCH 1/2] fix carbon price reporting in case p21_CO2TaxSectorMarkup is non-zero and the EU regionmapping with 21 regions is chosen. Relevant for using switch cm_CO2TaxSectorMarkup in REMIND-EU runs. --- R/reportPrices.R | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/R/reportPrices.R b/R/reportPrices.R index 3e252d19..bd034cbb 100644 --- a/R/reportPrices.R +++ b/R/reportPrices.R @@ -768,18 +768,19 @@ reportPrices <- function(gdx, output=NULL, regionSubsetList=NULL, setNames(pm_taxCO2eqSum * 1000 * 12/44, "Price|Carbon|Supply (US$2005/t CO2)") ) - pm_taxCO2eq_FE <- pm_taxCO2eqSum * (1 + + pm_taxCO2eq_FE <- collapseNames( pm_taxCO2eqSum * (1 + ( - p21_CO2TaxSectorMarkup[, , "build"] * output_wo_GLO[, , "FE|Buildings (EJ/yr)"] - + p21_CO2TaxSectorMarkup[, , "trans"] * output_wo_GLO[, , "FE|Transport (EJ/yr)"] - ) / output_wo_GLO[, , "FE (EJ/yr)"] - ) - pm_taxCO2eq_Emi <- pm_taxCO2eqSum * (1 + + p21_CO2TaxSectorMarkup[, , "build"] * output_wo_GLO[getRegions(p21_CO2TaxSectorMarkup), , "FE|Buildings (EJ/yr)"] + + p21_CO2TaxSectorMarkup[, , "trans"] * output_wo_GLO[getRegions(p21_CO2TaxSectorMarkup), , "FE|Transport (EJ/yr)"] + ) / output_wo_GLO[getRegions(p21_CO2TaxSectorMarkup), , "FE (EJ/yr)"] + ) ) + pm_taxCO2eq_Emi <- collapseNames( pm_taxCO2eqSum * (1 + ( - p21_CO2TaxSectorMarkup[, , "build"] * output_wo_GLO[, , "Emi|GHG|Gross|Energy|Demand|Buildings (Mt CO2eq/yr)"] - + p21_CO2TaxSectorMarkup[, , "trans"] * output_wo_GLO[, , "Emi|GHG|Gross|Energy|Demand|Transport (Mt CO2eq/yr)"] - ) / output_wo_GLO[, , "Emi|GHG|Gross|Energy (Mt CO2eq/yr)"] - ) + p21_CO2TaxSectorMarkup[, , "build"] * output_wo_GLO[getRegions(p21_CO2TaxSectorMarkup), , "Emi|GHG|Gross|Energy|Demand|Buildings (Mt CO2eq/yr)"] + + p21_CO2TaxSectorMarkup[, , "trans"] * output_wo_GLO[getRegions(p21_CO2TaxSectorMarkup), , "Emi|GHG|Gross|Energy|Demand|Transport (Mt CO2eq/yr)"] + ) / output_wo_GLO[getRegions(p21_CO2TaxSectorMarkup), , "Emi|GHG|Gross|Energy (Mt CO2eq/yr)"] + ) ) + out <- mbind(out, setNames(pm_taxCO2eq_FE * 1000 * 12/44, "Price|Carbon (US$2005/t CO2)")) # AggregatedbyFE out <- mbind(out, setNames(pm_taxCO2eq_Emi * 1000 * 12/44, From aff4ecc6cecfe140309adf0abe78c74bfc4a9f72 Mon Sep 17 00:00:00 2001 From: Felix Schreyer Date: Fri, 1 Mar 2024 13:00:03 +0100 Subject: [PATCH 2/2] increase library version number --- .buildlibrary | 2 +- CITATION.cff | 4 ++-- DESCRIPTION | 4 ++-- README.md | 6 +++--- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.buildlibrary b/.buildlibrary index fd2e6d14..7786d975 100644 --- a/.buildlibrary +++ b/.buildlibrary @@ -1,4 +1,4 @@ -ValidationKey: '224621680' +ValidationKey: '224675531' 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 285a7200..2f14157e 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: 'remind2: The REMIND R package (2nd generation)' -version: 1.135.6 -date-released: '2024-02-27' +version: 1.135.7 +date-released: '2024-03-01' abstract: Contains the REMIND-specific routines for data and model output manipulation. authors: - family-names: Rodrigues diff --git a/DESCRIPTION b/DESCRIPTION index ee515ac7..8e17fc25 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,8 +1,8 @@ Type: Package Package: remind2 Title: The REMIND R package (2nd generation) -Version: 1.135.6 -Date: 2024-02-27 +Version: 1.135.7 +Date: 2024-03-01 Authors@R: c( person("Renato", "Rodrigues", , "renato.rodrigues@pik-potsdam.de", role = c("aut", "cre")), person("Lavinia", "Baumstark", role = "aut"), diff --git a/README.md b/README.md index cedb3b21..0f7df4c1 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # The REMIND R package (2nd generation) -R package **remind2**, version **1.135.6** +R package **remind2**, version **1.135.7** [![CRAN status](https://www.r-pkg.org/badges/version/remind2)](https://cran.r-project.org/package=remind2) [![R build status](https://github.com/pik-piam/remind2/workflows/check/badge.svg)](https://github.com/pik-piam/remind2/actions) [![codecov](https://codecov.io/gh/pik-piam/remind2/branch/master/graph/badge.svg)](https://app.codecov.io/gh/pik-piam/remind2) [![r-universe](https://pik-piam.r-universe.dev/badges/remind2)](https://pik-piam.r-universe.dev/builds) @@ -49,7 +49,7 @@ In case of questions / problems please contact Renato Rodrigues . +Rodrigues R, Baumstark L, Benke F, Dietrich J, Dirnaichner A, Duerrwaechter J, Führlich P, Giannousakis A, Hasse R, Hilaire J, Klein D, Koch J, Kowalczyk K, Levesque A, Malik A, Merfort A, Merfort L, Morena-Leiva S, Pehl M, Pietzcker R, Rauner S, Richters O, Rottoli M, Schötz C, Schreyer F, Siala K, Sörgel B, Spahr M, Strefler J, Verpoort P, Weigmann P (2024). _remind2: The REMIND R package (2nd generation)_. R package version 1.135.7, . A BibTeX entry for LaTeX users is @@ -58,7 +58,7 @@ A BibTeX entry for LaTeX users is title = {remind2: The REMIND R package (2nd generation)}, author = {Renato Rodrigues and Lavinia Baumstark and Falk Benke and Jan Philipp Dietrich and Alois Dirnaichner and Jakob Duerrwaechter and Pascal Führlich and Anastasis Giannousakis and Robin Hasse and Jérome Hilaire and David Klein and Johannes Koch and Katarzyna Kowalczyk and Antoine Levesque and Aman Malik and Anne Merfort and Leon Merfort and Simón Morena-Leiva and Michaja Pehl and Robert Pietzcker and Sebastian Rauner and Oliver Richters and Marianna Rottoli and Christof Schötz and Felix Schreyer and Kais Siala and Björn Sörgel and Mike Spahr and Jessica Strefler and Philipp Verpoort and Pascal Weigmann}, year = {2024}, - note = {R package version 1.135.6}, + note = {R package version 1.135.7}, url = {https://github.com/pik-piam/remind2}, } ```