From 34852e4a17e024aed7607244a94d5a2d77db7d12 Mon Sep 17 00:00:00 2001 From: Renato-Rodrigues Date: Sat, 3 Jun 2023 17:25:03 +0200 Subject: [PATCH] rescaling non-energy reporting values to match EU-27 data --- .buildlibrary | 2 +- CITATION.cff | 4 ++-- DESCRIPTION | 4 ++-- R/reportFE.R | 16 ++++++++++------ README.md | 6 +++--- 5 files changed, 18 insertions(+), 14 deletions(-) diff --git a/.buildlibrary b/.buildlibrary index 9879c730..2310c1fe 100644 --- a/.buildlibrary +++ b/.buildlibrary @@ -1,4 +1,4 @@ -ValidationKey: '216742277' +ValidationKey: '216806232' 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 97a404cf..f51c7f71 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.111.1 -date-released: '2023-05-30' +version: 1.111.2 +date-released: '2023-06-03' abstract: Contains the REMIND-specific routines for data and model output manipulation. authors: - family-names: Rodrigues diff --git a/DESCRIPTION b/DESCRIPTION index 3c0de2ad..e8e14124 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,8 +1,8 @@ Type: Package Package: remind2 Title: The REMIND R package (2nd generation) -Version: 1.111.1 -Date: 2023-05-30 +Version: 1.111.2 +Date: 2023-06-03 Authors@R: c( person("Renato", "Rodrigues", , "renato.rodrigues@pik-potsdam.de", role = c("aut", "cre")), person("Lavinia", "Baumstark", role = "aut"), diff --git a/R/reportFE.R b/R/reportFE.R index 6af43667..d1e8cf05 100644 --- a/R/reportFE.R +++ b/R/reportFE.R @@ -1358,16 +1358,20 @@ reportFE <- function(gdx, regionSubsetList = NULL, # some initializations required for building library with dplyr operations below encar <- data <- value <- value_subsectors <- SSP <- Value_NonEn <- encar <- region <- period <- NULL - - # read in FE industry non-energy use trajectories from industry subsectors run df.fe_nechem <- read.csv(system.file("extdata","pm_fe_nechem.cs4r",package = "remind2"), sep = ",", skip = 4, header = F) - - # df.fe_nechem <- read.csv("./inst/extdata/pm_fe_nechem.cs4r", - # sep = ",", skip = 4, header = F) - colnames(df.fe_nechem) <- c("period", "region","SSP","encar","value_subsectors") + + # rescaling non-energy use to match 2020 EU27 values for total non-energy use + df.fe_nechem <- df.fe_nechem %>% + mutate(value_subsectors = ifelse(region %in% c("DEU", "FRA", "ECE", "ECS", "ENC", "ESC", "ESW", "EWN"), + value_subsectors * + 3.835 / # average between 2018-2021 = 3.835 EJ (https://ec.europa.eu/eurostat/databrowser/view/NRG_BAL_C__custom_6407922/bookmark/table?lang=en&bookmarkId=f7c8aa0e-3cf6-45d6-b85c-f2e76e90b4aa) + df.fe_nechem %>% filter(region %in% c("DEU", "FRA", "ECE", "ECS", "ENC", "ESC", "ESW", "EWN"), period == 2020, SSP == "SSP2") %>% summarize(value_subsectors = sum(value_subsectors)) %>% pull(value_subsectors), # original 2020 df.fe_nechem total non-energy use + value_subsectors) + ) + vars.nechem <- c("FE|Industry|+|Liquids (EJ/yr)", "FE|Industry|+|Gases (EJ/yr)", "FE|Industry|+|Solids (EJ/yr)") diff --git a/README.md b/README.md index 0750019b..063bd30e 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # The REMIND R package (2nd generation) -R package **remind2**, version **1.111.1** +R package **remind2**, version **1.111.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, 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 (2023). _remind2: The REMIND R package (2nd generation)_. R package version 1.111.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 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}, year = {2023}, - note = {R package version 1.111.1}, + note = {R package version 1.111.2}, url = {https://github.com/pik-piam/remind2}, } ```