From 84f44e5eb435f827e93923a1ef203cb65b3be28a Mon Sep 17 00:00:00 2001 From: Felix Schreyer Date: Tue, 24 Sep 2024 09:53:15 +0200 Subject: [PATCH 1/4] add some missing emissions and cdr variables with national LULUCF accounting and report CDR variable for existing forests --- R/reportEmi.R | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/R/reportEmi.R b/R/reportEmi.R index 6b2cc88a..bf694e94 100644 --- a/R/reportEmi.R +++ b/R/reportEmi.R @@ -2520,17 +2520,22 @@ reportEmi <- function(gdx, output = NULL, regionSubsetList = NULL, as.numeric(out["DEU", "y2015", "Emi|CO2|Energy|Supply|++|Electricity and Heat (Mt CO2/yr)"]) } - # emissions with Grassi Correction (LULUCF emissions adjusted to national LULUCF accounting) + # emissions national LULUCF accounting (including carbon sink from existing forests calculated by difference between historic Magpie and UNFCCC data) p47_LULUCFEmi_GrassiShift <- readGDX(gdx, "p47_LULUCFEmi_GrassiShift", restore_zeros = T, react = "silent")[getRegions(out), getYears(out),] if (!is.null(p47_LULUCFEmi_GrassiShift)) { - # variables of which version with Grassi correction should be reported + + # variables of which version with national LULUCF accounting should be added vars.lulucf <- c("Emi|GHG (Mt CO2eq/yr)", "Emi|CO2 (Mt CO2/yr)", "Emi|GHG|+++|Land-Use Change (Mt CO2eq/yr)", - "Emi|CO2|+|Land-Use Change (Mt CO2/yr)") + "Emi|CO2|+|Land-Use Change (Mt CO2/yr)", + "Emi|CO2|CDR|Land-Use Change (Mt CO2/yr)", + "Emi|CO2|CDR (Mt CO2/yr)", + "Emi|GHG|Outside ETS and ESR|+|Land-Use Change (Mt CO2eq/yr)", + "Emi|GHG|++|Outside ETS and ESR (Mt CO2eq/yr)") out.lulucf <- out[,,vars.lulucf] # subtract shift of LULUCF emissions to be in line with national accounting @@ -2546,6 +2551,11 @@ reportEmi <- function(gdx, output = NULL, regionSubsetList = NULL, names.lulucf <- gsub("\\|\\+\\+\\+\\|", "\\|", names.lulucf ) getNames(out.lulucf) <- names.lulucf + # also report carbon sink from existing forests which is the difference between historic Magpie and UNFCCC land-use change emissions + out.lulucf <- mbind(out.lulucf, + setNames(p47_LULUCFEmi_GrassiShift * GtC_2_MtCO2, + "Emi|CO2|CDR|existing forest sink|LULUCF national accounting (Mt CO2/yr)")) + out <- mbind(out, out.lulucf) } From 47719e0791342eb6f7ec53cfb51b144138a0cdc7 Mon Sep 17 00:00:00 2001 From: Felix Schreyer Date: Tue, 24 Sep 2024 10:34:32 +0200 Subject: [PATCH 2/4] increment library version --- .buildlibrary | 2 +- CITATION.cff | 4 ++-- DESCRIPTION | 4 ++-- README.md | 6 +++--- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.buildlibrary b/.buildlibrary index 40c14da4..4283c547 100644 --- a/.buildlibrary +++ b/.buildlibrary @@ -1,4 +1,4 @@ -ValidationKey: '231092829' +ValidationKey: '231284300' 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 2aafe0d3..4cd8a919 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.156.1 -date-released: '2024-09-23' +version: 1.157.0 +date-released: '2024-09-24' abstract: Contains the REMIND-specific routines for data and model output manipulation. authors: - family-names: Rodrigues diff --git a/DESCRIPTION b/DESCRIPTION index 99510c9d..5c7bd0f2 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,8 +1,8 @@ Type: Package Package: remind2 Title: The REMIND R package (2nd generation) -Version: 1.156.1 -Date: 2024-09-23 +Version: 1.157.0 +Date: 2024-09-24 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 42160569..a9cd13fe 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # The REMIND R package (2nd generation) -R package **remind2**, version **1.156.1** +R package **remind2**, version **1.157.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, 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.157.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 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.156.1}, + note = {R package version 1.157.0}, url = {https://github.com/pik-piam/remind2}, } ``` From 3485bf7d2524791fc279161ed6e0c11729549111 Mon Sep 17 00:00:00 2001 From: Felix Schreyer Date: Thu, 26 Sep 2024 08:28:12 +0200 Subject: [PATCH 3/4] add LULUCF national accounting variable for Emi|GHG|AFOLU --- R/reportEmi.R | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/R/reportEmi.R b/R/reportEmi.R index bf694e94..1b5c2992 100644 --- a/R/reportEmi.R +++ b/R/reportEmi.R @@ -2520,7 +2520,8 @@ reportEmi <- function(gdx, output = NULL, regionSubsetList = NULL, as.numeric(out["DEU", "y2015", "Emi|CO2|Energy|Supply|++|Electricity and Heat (Mt CO2/yr)"]) } - # emissions national LULUCF accounting (including carbon sink from existing forests calculated by difference between historic Magpie and UNFCCC data) + # emissions national LULUCF accounting + # (including carbon sink from existing forests calculated by difference between historic Magpie and UNFCCC data) p47_LULUCFEmi_GrassiShift <- readGDX(gdx, "p47_LULUCFEmi_GrassiShift", restore_zeros = T, react = "silent")[getRegions(out), getYears(out),] @@ -2535,7 +2536,8 @@ reportEmi <- function(gdx, output = NULL, regionSubsetList = NULL, "Emi|CO2|CDR|Land-Use Change (Mt CO2/yr)", "Emi|CO2|CDR (Mt CO2/yr)", "Emi|GHG|Outside ETS and ESR|+|Land-Use Change (Mt CO2eq/yr)", - "Emi|GHG|++|Outside ETS and ESR (Mt CO2eq/yr)") + "Emi|GHG|++|Outside ETS and ESR (Mt CO2eq/yr)", + "Emi|GHG|AFOLU (Mt CO2eq/yr)") out.lulucf <- out[,,vars.lulucf] # subtract shift of LULUCF emissions to be in line with national accounting From 598e28f43e4bada7de6cab46106a343f07462f12 Mon Sep 17 00:00:00 2001 From: Felix Schreyer Date: Mon, 30 Sep 2024 11:26:06 +0200 Subject: [PATCH 4/4] increment library version --- .buildlibrary | 2 +- CITATION.cff | 4 ++-- DESCRIPTION | 4 ++-- README.md | 6 +++--- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.buildlibrary b/.buildlibrary index 81093aab..e83f0f7d 100644 --- a/.buildlibrary +++ b/.buildlibrary @@ -1,4 +1,4 @@ -ValidationKey: '231339003' +ValidationKey: '231393712' 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 f5edffd9..74891457 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.157.1 -date-released: '2024-09-27' +version: 1.157.2 +date-released: '2024-09-30' abstract: Contains the REMIND-specific routines for data and model output manipulation. authors: - family-names: Rodrigues diff --git a/DESCRIPTION b/DESCRIPTION index 11e916d2..aa7a34e0 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,8 +1,8 @@ Type: Package Package: remind2 Title: The REMIND R package (2nd generation) -Version: 1.157.1 -Date: 2024-09-27 +Version: 1.157.2 +Date: 2024-09-30 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 1eac9af9..22167476 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # The REMIND R package (2nd generation) -R package **remind2**, version **1.157.1** +R package **remind2**, version **1.157.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, Rüter T (2024). _remind2: The REMIND R package (2nd generation)_. R package version 1.157.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 and Tonn Rüter}, year = {2024}, - note = {R package version 1.157.1}, + note = {R package version 1.157.2}, url = {https://github.com/pik-piam/remind2}, } ```