From ec4630c470a185f87878c605f7d0d7a75b1aee54 Mon Sep 17 00:00:00 2001 From: Lavinia Baumstark Date: Fri, 2 Feb 2024 10:09:24 +0100 Subject: [PATCH 1/2] adjust reporting according to https://github.com/remindmodel/remind/pull/1509 --- R/reportCosts.R | 2 +- R/reportLCOE.R | 4 ++-- R/reportPrices.R | 4 ++-- R/reportTax.R | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/R/reportCosts.R b/R/reportCosts.R index 4421fc43..d243456f 100644 --- a/R/reportCosts.R +++ b/R/reportCosts.R @@ -132,7 +132,7 @@ reportCosts <- function(gdx,output=NULL,regionSubsetList=NULL,t=c(seq(2005,2060, vm_demFeSector <- readGDX(gdx,name=c("vm_demFeSector"),field="l",restore_zeros=FALSE,format="first_found") demFeIndst.m <- readGDX(gdx,name=c("q37_demFeIndst"),types="equations",restore_zeros=FALSE,field="m",format="first_found") demFeBuild.m <- readGDX(gdx,name=c("q36_demFeBuild"),types="equations",restore_zeros=FALSE,field="m",format="first_found") - balFe.m <- readGDX(gdx,name=c("qm_balFe","q_balFe"),types="equations",restore_zeros=FALSE,field="m",format="first_found") + balFe.m <- readGDX(gdx,name=c("q_balFe","qm_balFe"),types="equations",restore_zeros=FALSE,field="m",format="first_found") #balFeCDR.m <- readGDX(gdx,name=c("q33_balFeCDR"),types="equations",restore_zeros=FALSE,field="m",format="first_found") #febalForUe.m <- dimReduce(febalForUe.m, dim_exclude = 2) demFeTrans.m <- readGDX(gdx,name=c("q35_demFeTrans"),types="equations",restore_zeros=FALSE,field="m",format="first_found") diff --git a/R/reportLCOE.R b/R/reportLCOE.R index fab39872..48f6b7e6 100644 --- a/R/reportLCOE.R +++ b/R/reportLCOE.R @@ -1189,8 +1189,8 @@ df.co2price.weighted <- df.pomeg.expand %>% sector.mapping <- c("build" = "buildings", "indst" = "industry", "trans" = "transport") - pm_tau_fe_tax <- readGDX(gdx, "pm_tau_fe_tax", restore_zeros = F) - pm_tau_fe_sub <- readGDX(gdx, "pm_tau_fe_sub", restore_zeros = F) + pm_tau_fe_tax <- readGDX(gdx, c("p21_tau_fe_tax","pm_tau_fe_tax"), restore_zeros = F) + pm_tau_fe_sub <- readGDX(gdx, c("p21_tau_fe_sub","pm_tau_fe_sub"), restore_zeros = F) df.taxrate <- as.quitte(pm_tau_fe_tax * 1.2 / s_twa2mwh * 1e12) %>% rename(taxrate = value) diff --git a/R/reportPrices.R b/R/reportPrices.R index ee3898d3..2f3fbfb5 100644 --- a/R/reportPrices.R +++ b/R/reportPrices.R @@ -552,8 +552,8 @@ reportPrices <- function(gdx, output=NULL, regionSubsetList=NULL, "indst.fehos", "indst.fesos", "indst.feels", "indst.feh2s", "indst.fegas", "build.fepet", "indst.fepet" ) - pm_tau_fe_tax <- readGDX(gdx, "pm_tau_fe_tax")[, YearsFrom2005, entyFe2Sector] # [tr USD2005/TWa] - pm_tau_fe_sub <- readGDX(gdx, "pm_tau_fe_sub")[, YearsFrom2005, entyFe2Sector] # [tr USD2005/TWa] + pm_tau_fe_tax <- readGDX(gdx, c("p21_tau_fe_tax","pm_tau_fe_tax"))[, YearsFrom2005, entyFe2Sector] # [tr USD2005/TWa] + pm_tau_fe_sub <- readGDX(gdx, c("p21_tau_fe_sub","pm_tau_fe_sub"))[, YearsFrom2005, entyFe2Sector] # [tr USD2005/TWa] price.tax <- (pm_tau_fe_tax + pm_tau_fe_sub) / s_twa2mwh / 3.6 * 1e12 # [USD2005/GJ] out <- mbind( diff --git a/R/reportTax.R b/R/reportTax.R index c034eaee..a9396d90 100644 --- a/R/reportTax.R +++ b/R/reportTax.R @@ -45,8 +45,8 @@ reportTax <- function(gdx,output=NULL,regionSubsetList=NULL,t=c(seq(2005,2060,5) out <- NULL ### FE taxes/subsidies per sector - fe_tax <- readGDX(gdx, name=c("pm_tau_fe_tax"), format="first_found", react = "silent")[,t,] * tdptwyr2dpgj - fe_sub <- readGDX(gdx, name=c("pm_tau_fe_sub"), format="first_found", react = "silent")[,t,] * tdptwyr2dpgj + fe_tax <- readGDX(gdx, name=c("p21_tau_fe_tax","pm_tau_fe_tax"), format="first_found", react = "silent")[,t,] * tdptwyr2dpgj + fe_sub <- readGDX(gdx, name=c("p21_tau_fe_sub","pm_tau_fe_sub"), format="first_found", react = "silent")[,t,] * tdptwyr2dpgj vm_demFeSector <- readGDX(gdx,name=c("vm_demFeSector"),field="l",format="first_found",restore_zeros=FALSE)[,t,]*TWa_2_EJ vm_demFeSector[is.na(vm_demFeSector)] <- 0 From e807ac93f07cd4b651b4cda34b36c0d8e51d9a7a Mon Sep 17 00:00:00 2001 From: Falk Benke Date: Fri, 2 Feb 2024 12:22:42 +0100 Subject: [PATCH 2/2] increment version --- .buildlibrary | 2 +- CITATION.cff | 4 ++-- DESCRIPTION | 4 ++-- README.md | 6 +++--- man/remind2-package.Rd | 1 - 5 files changed, 8 insertions(+), 9 deletions(-) diff --git a/.buildlibrary b/.buildlibrary index a33df1dd..6488ae2c 100644 --- a/.buildlibrary +++ b/.buildlibrary @@ -1,4 +1,4 @@ -ValidationKey: '223437494' +ValidationKey: '223468560' 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 889ce3b0..a814f309 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.131.1 -date-released: '2024-02-01' +version: 1.131.2 +date-released: '2024-02-02' abstract: Contains the REMIND-specific routines for data and model output manipulation. authors: - family-names: Rodrigues diff --git a/DESCRIPTION b/DESCRIPTION index 68786775..dcdd6de1 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,8 +1,8 @@ Type: Package Package: remind2 Title: The REMIND R package (2nd generation) -Version: 1.131.1 -Date: 2024-02-01 +Version: 1.131.2 +Date: 2024-02-02 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 4fcd510d..00c52db0 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # The REMIND R package (2nd generation) -R package **remind2**, version **1.131.1** +R package **remind2**, version **1.131.2** [![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.131.2, . 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.131.1}, + note = {R package version 1.131.2}, url = {https://github.com/pik-piam/remind2}, } ``` diff --git a/man/remind2-package.Rd b/man/remind2-package.Rd index 7b64919d..5169a479 100644 --- a/man/remind2-package.Rd +++ b/man/remind2-package.Rd @@ -3,7 +3,6 @@ \docType{package} \name{remind2-package} \alias{remind2-package} -\alias{_PACKAGE} \alias{remind2} \title{The REMIND R package (2nd generation)} \description{