From 1a46a9d8981a59d77b5d65062a25a96e93d6d10e Mon Sep 17 00:00:00 2001 From: Leon Merfort <58845874+merfort@users.noreply.github.com> Date: Fri, 6 Oct 2023 16:05:22 +0200 Subject: [PATCH 1/2] Add biogasc reporting variables --- R/reportPE.R | 2 ++ 1 file changed, 2 insertions(+) diff --git a/R/reportPE.R b/R/reportPE.R index 9231e9f2..e098e453 100644 --- a/R/reportPE.R +++ b/R/reportPE.R @@ -130,6 +130,8 @@ reportPE <- function(gdx,regionSubsetList=NULL,t=c(seq(2005,2060,5),seq(2070,211 pe_carrier(demPE,dataoc,oc2te,sety,pebio,"seel",teccs, name="PE|Biomass|Electricity|w/ CC (EJ/yr)"), pe_carrier(demPE,dataoc,oc2te,sety,pebio,"seel",tenoccs, name="PE|Biomass|Electricity|w/o CC (EJ/yr)"), pe_carrier(demPE,dataoc,oc2te,sety,pebio,se_Gas, name="PE|Biomass|Gases (EJ/yr)"), + pe_carrier(demPE,dataoc,oc2te,sety,pebio,se_Gas,teccs, name="PE|Biomass|Gases|w/ CC (EJ/yr)"), + pe_carrier(demPE,dataoc,oc2te,sety,pebio,se_Gas,tenoccs, name="PE|Biomass|Gases|w/o CC (EJ/yr)"), pe_carrier(demPE,dataoc,oc2te,sety,pebio,"seh2", name="PE|Biomass|Hydrogen (EJ/yr)"), pe_carrier(demPE,dataoc,oc2te,sety,pebio,"seh2",teccs, name="PE|Biomass|Hydrogen|w/ CC (EJ/yr)"), pe_carrier(demPE,dataoc,oc2te,sety,pebio,"seh2",tenoccs, name="PE|Biomass|Hydrogen|w/o CC (EJ/yr)"), From ccc04a1d8a32392527c10ce20194cce5ee5f2954 Mon Sep 17 00:00:00 2001 From: Leon Merfort <58845874+merfort@users.noreply.github.com> Date: Mon, 9 Oct 2023 10:42:17 +0200 Subject: [PATCH 2/2] Increase verison 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 67476404..7ce312dc 100644 --- a/.buildlibrary +++ b/.buildlibrary @@ -1,4 +1,4 @@ -ValidationKey: '219780240' +ValidationKey: '219956800' 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 ba490fa4..4726ec1d 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.119.5 -date-released: '2023-10-02' +version: 1.120.0 +date-released: '2023-10-09' abstract: Contains the REMIND-specific routines for data and model output manipulation. authors: - family-names: Rodrigues diff --git a/DESCRIPTION b/DESCRIPTION index 23eed995..4126d634 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,8 +1,8 @@ Type: Package Package: remind2 Title: The REMIND R package (2nd generation) -Version: 1.119.5 -Date: 2023-10-02 +Version: 1.120.0 +Date: 2023-10-09 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 572f30fe..d848ffc7 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # The REMIND R package (2nd generation) -R package **remind2**, version **1.119.5** +R package **remind2**, version **1.120.0** [![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, 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 (2023). _remind2: The REMIND R package (2nd generation)_. R package version 1.120.0, . 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 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 = {2023}, - note = {R package version 1.119.5}, + note = {R package version 1.120.0}, url = {https://github.com/pik-piam/remind2}, } ```