From d511f2e7107a70dba311c1afb2338ddf019d7dd0 Mon Sep 17 00:00:00 2001 From: robinhasse Date: Fri, 29 Nov 2024 11:36:47 +0100 Subject: [PATCH] Add line plots for FE demand: total sectoral and types of buildings biomass --- .buildlibrary | 2 +- CITATION.cff | 4 ++-- DESCRIPTION | 4 ++-- README.md | 6 +++--- inst/compareScenarios/cs_05_energy_demand.Rmd | 16 +++++++++++++++- 5 files changed, 23 insertions(+), 9 deletions(-) diff --git a/.buildlibrary b/.buildlibrary index 5f8607c8..7fad998c 100644 --- a/.buildlibrary +++ b/.buildlibrary @@ -1,4 +1,4 @@ -ValidationKey: '232674959' +ValidationKey: '232729824' AcceptedWarnings: - .*following variables are expected in the piamInterfaces.* - Summation checks have revealed some gaps.* diff --git a/CITATION.cff b/CITATION.cff index fdecced0..d9ce1a4b 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.160.3 -date-released: '2024-11-26' +version: 1.160.4 +date-released: '2024-11-29' abstract: Contains the REMIND-specific routines for data and model output manipulation. authors: - family-names: Rodrigues diff --git a/DESCRIPTION b/DESCRIPTION index 7343e797..1aceabdb 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,8 +1,8 @@ Type: Package Package: remind2 Title: The REMIND R package (2nd generation) -Version: 1.160.3 -Date: 2024-11-26 +Version: 1.160.4 +Date: 2024-11-29 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 7f7c1236..dfe1eb7b 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # The REMIND R package (2nd generation) -R package **remind2**, version **1.160.3** +R package **remind2**, version **1.160.4** [![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, Rüter T (2024). _remind2: The REMIND R package (2nd generation)_. R package version 1.160.4, . 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 and Tonn Rüter}, year = {2024}, - note = {R package version 1.160.3}, + note = {R package version 1.160.4}, url = {https://github.com/pik-piam/remind2}, } ``` diff --git a/inst/compareScenarios/cs_05_energy_demand.Rmd b/inst/compareScenarios/cs_05_energy_demand.Rmd index 2336772e..eccad126 100644 --- a/inst/compareScenarios/cs_05_energy_demand.Rmd +++ b/inst/compareScenarios/cs_05_energy_demand.Rmd @@ -109,6 +109,11 @@ showAreaAndBarPlots(data, items2, tot, orderVars = "user", scales = "fixed") ``` ### FE Buildings Line Plots +```{r Buildings} +showLinePlots(data, "FE|Buildings", + histModelsExclude = paste("IEA ETP", c("2DS", "B2DS", "RTS"))) +``` + #### Electricity ```{r Electricity} showLinePlots(data, "FE|Buildings|Electricity") @@ -127,6 +132,8 @@ showLinePlots(data, "FE|Buildings|Gases") #### Solids ```{r Solids} showLinePlots(data, "FE|Buildings|Solids") +showLinePlots(data, "FE|Buildings|Solids|Biomass") +showLinePlots(data, "FE|Buildings|Solids|Fossil") ``` #### Hydrogen @@ -191,7 +198,11 @@ showAreaAndBarPlots(data, items, tot, orderVars = "user", fill = TRUE) showAreaAndBarPlots(data, items2, tot, orderVars = "user", scales = "fixed") ``` -#### FE Industry Line Plots +### FE Industry Line Plots +```{r Industry} +showLinePlots(data, "FE|Industry") +``` + #### Electricity ```{r Electricity} showLinePlots(data, "FE|Industry|Electricity") @@ -522,6 +533,9 @@ showAreaAndBarPlots(data, items_bioliq, tot_bioliq, orderVars = "user", scales = ``` ### FE Transport w/ Bunkers - Line Plots +```{r Transport} +showLinePlots(data, "FE|Transport") +``` #### Electricity ```{r Electricity}