From 72841a5eabe02c66381c48dd9a82949d644bd5b0 Mon Sep 17 00:00:00 2001 From: lea-hayez Date: Fri, 5 Jun 2026 11:23:26 +0200 Subject: [PATCH 1/3] actual variable to check EUR emission targets, note that region includes UK which should be excluded to check if target is reached --- inst/compareScenarios/cs_03_emissions.Rmd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/inst/compareScenarios/cs_03_emissions.Rmd b/inst/compareScenarios/cs_03_emissions.Rmd index 9e6edaa3..541ec727 100644 --- a/inst/compareScenarios/cs_03_emissions.Rmd +++ b/inst/compareScenarios/cs_03_emissions.Rmd @@ -38,7 +38,7 @@ showLinePlots( ) items <- c( - "scenario" = "Emi|GHG", # scenario + "scenario" = "Emi|GHG|w/ Intra-region Bunkers|LULUCF national accounting", # scenario "historical" = "Emi|GHGtot" # historical ) From 8853d169bca510668df964c1346cdfa430e46645 Mon Sep 17 00:00:00 2001 From: lea-hayez Date: Fri, 5 Jun 2026 11:52:28 +0200 Subject: [PATCH 2/3] running buildlibrary() --- .buildlibrary | 2 +- CITATION.cff | 4 ++-- DESCRIPTION | 4 ++-- README.md | 10 +++++----- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.buildlibrary b/.buildlibrary index b332d912..8709a2ec 100644 --- a/.buildlibrary +++ b/.buildlibrary @@ -1,4 +1,4 @@ -ValidationKey: '4533760' +ValidationKey: '4554589' AcceptedWarnings: - .*following variables are expected in the piamInterfaces.* - Summation checks have revealed some gaps.* diff --git a/CITATION.cff b/CITATION.cff index 161d382f..59ed341f 100755 --- 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: 2.2.0 -date-released: '2026-06-04' +version: 2.2.1 +date-released: '2026-06-05' abstract: Contains the REMIND-specific routines for data and model output manipulation. authors: - family-names: Rodrigues diff --git a/DESCRIPTION b/DESCRIPTION index 1364a5f5..6006c719 100755 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,8 +1,8 @@ Type: Package Package: remind2 Title: The REMIND R package (2nd generation) -Version: 2.2.0 -Date: 2026-06-04 +Version: 2.2.1 +Date: 2026-06-05 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 64a10b21..913f2a90 100755 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # The REMIND R package (2nd generation) -R package **remind2**, version **2.2.0** +R package **remind2**, version **2.2.1** [![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) @@ -37,8 +37,8 @@ The package comes with vignettes describing the basic functionality of the packa ```r vignette("compareScenariosRemind2") # compareScenarios in remind2 -vignette("remind_summary") # Adding plots to the REMIND_summary.pdf vignette("remind2_reporting") # remind2 reporting +vignette("remind_summary") # Adding plots to the REMIND_summary.pdf ``` ## Questions / Problems @@ -49,7 +49,7 @@ In case of questions / problems please contact Renato Rodrigues . +Rodrigues R, Baumstark L, Benke F, Bantje D, Dietrich J, Dirnaichner A, Dorndorf T, Duerrwaechter J, Führlich P, Giannousakis A, Hasse R, Hilaire J, Klein D, Koch J, Kowalczyk K, Lécuyer F, Levesque A, Malik A, Merfort A, Merfort L, Morena-Leiva S, Pehl M, Pietzcker R, Rauner S, Richters O, Rottoli M, Rüter T, Salzwedel R, Schötz C, Schreyer F, Siala K, Sörgel B, Spahr M, Strefler J, Verpoort P, Weigmann P (2026). "remind2: The REMIND R package (2nd generation)." Version: 2.2.1, . A BibTeX entry for LaTeX users is @@ -57,9 +57,9 @@ A BibTeX entry for LaTeX users is @Misc{, title = {remind2: The REMIND R package (2nd generation)}, author = {Renato Rodrigues and Lavinia Baumstark and Falk Benke and David Bantje and Jan Philipp Dietrich and Alois Dirnaichner and Tabea Dorndorf 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 Fabrice Lécuyer 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 Tonn Rüter and Robert Salzwedel 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}, - date = {2026-06-04}, + date = {2026-06-05}, year = {2026}, url = {https://github.com/pik-piam/remind2}, - note = {Version: 2.2.0}, + note = {Version: 2.2.1}, } ``` From cc57c6ed9f5cc649378ef3d2316b8301f8bbc98e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9a=20Hayez?= Date: Tue, 9 Jun 2026 17:46:40 +0200 Subject: [PATCH 3/3] Adjust historical data source --- inst/compareScenarios/cs_03_emissions.Rmd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/inst/compareScenarios/cs_03_emissions.Rmd b/inst/compareScenarios/cs_03_emissions.Rmd index 541ec727..975bbac6 100644 --- a/inst/compareScenarios/cs_03_emissions.Rmd +++ b/inst/compareScenarios/cs_03_emissions.Rmd @@ -39,7 +39,7 @@ showLinePlots( items <- c( "scenario" = "Emi|GHG|w/ Intra-region Bunkers|LULUCF national accounting", # scenario - "historical" = "Emi|GHGtot" # historical + "historical" = "Emi|GHG|LULUCF national accounting" # historical ) showLinePlotsWithTarget(data, items)