From 90ca6c6a5eff9dcbf6f1e694ca907588a2a2149b Mon Sep 17 00:00:00 2001 From: Michaja Pehl Date: Mon, 5 Feb 2024 11:29:51 +0100 Subject: [PATCH 1/5] add cs2 plot for industry CCS by subsector --- .../compareScenarios2/cs2_09_carbon_management.Rmd | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/inst/markdown/compareScenarios2/cs2_09_carbon_management.Rmd b/inst/markdown/compareScenarios2/cs2_09_carbon_management.Rmd index 6322e164..f343887d 100644 --- a/inst/markdown/compareScenarios2/cs2_09_carbon_management.Rmd +++ b/inst/markdown/compareScenarios2/cs2_09_carbon_management.Rmd @@ -7,7 +7,19 @@ showLinePlots(data, "Carbon Management|Carbon Capture") showAreaAndBarPlotsPlus(data, "Carbon Management|Carbon Capture", scales = "fixed") showAreaAndBarPlotsPlus(data, "Carbon Management|Carbon Capture|Biomass|Pe2Se", scales = "fixed") showAreaAndBarPlotsPlus(data, "Carbon Management|Carbon Capture|Fossil|Pe2Se", scales = "fixed") -showAreaAndBarPlotsPlus(data, "Carbon Management|Carbon Capture|Industry Energy", scales = "fixed") + +# industry ---- +showAreaAndBarPlotsPlus(data, + "Carbon Management|Carbon Capture|Industry Energy", + scales = "fixed") + +showAreaAndBarPlots( + data = data, + vars = rev(c('Carbon Management|Carbon Capture|Industry Energy|Cement', + 'Carbon Management|Carbon Capture|Industry Process|Cement', + 'Carbon Management|Carbon Capture|Industry Energy|Chemicals', + 'Carbon Management|Carbon Capture|Industry Energy|Steel')), + orderVars = 'user') ``` ## Storage From b77cd4d4ca6b5f7c52e96f16c3e8fbeb565a4d5f Mon Sep 17 00:00:00 2001 From: Michaja Pehl Date: Mon, 5 Feb 2024 16:49:45 +0100 Subject: [PATCH 2/5] lucode hubbub --- .buildlibrary | 2 +- CITATION.cff | 2 +- DESCRIPTION | 2 +- README.md | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.buildlibrary b/.buildlibrary index 2f1e575b..3604a038 100644 --- a/.buildlibrary +++ b/.buildlibrary @@ -1,4 +1,4 @@ -ValidationKey: '223680318' +ValidationKey: '223858140' 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 2dcbf7bc..aa111b87 100644 --- a/CITATION.cff +++ b/CITATION.cff @@ -2,7 +2,7 @@ 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.132.1 +version: 1.133.0 date-released: '2024-02-05' abstract: Contains the REMIND-specific routines for data and model output manipulation. authors: diff --git a/DESCRIPTION b/DESCRIPTION index c52b7893..5e6800ba 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,7 +1,7 @@ Type: Package Package: remind2 Title: The REMIND R package (2nd generation) -Version: 1.132.1 +Version: 1.133.0 Date: 2024-02-05 Authors@R: c( person("Renato", "Rodrigues", , "renato.rodrigues@pik-potsdam.de", role = c("aut", "cre")), diff --git a/README.md b/README.md index a36bdab2..aa8c2838 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # The REMIND R package (2nd generation) -R package **remind2**, version **1.132.1** +R package **remind2**, version **1.133.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 (2024). _remind2: The REMIND R package (2nd generation)_. R package version 1.133.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}, year = {2024}, - note = {R package version 1.132.1}, + note = {R package version 1.133.0}, url = {https://github.com/pik-piam/remind2}, } ``` From f54f70217a02734b03bce8e6beb3b144626cb618 Mon Sep 17 00:00:00 2001 From: Michaja Pehl Date: Mon, 5 Feb 2024 17:38:36 +0100 Subject: [PATCH 3/5] fixed scales --- inst/markdown/compareScenarios2/cs2_09_carbon_management.Rmd | 1 + 1 file changed, 1 insertion(+) diff --git a/inst/markdown/compareScenarios2/cs2_09_carbon_management.Rmd b/inst/markdown/compareScenarios2/cs2_09_carbon_management.Rmd index f343887d..bd15a9c5 100644 --- a/inst/markdown/compareScenarios2/cs2_09_carbon_management.Rmd +++ b/inst/markdown/compareScenarios2/cs2_09_carbon_management.Rmd @@ -19,6 +19,7 @@ showAreaAndBarPlots( 'Carbon Management|Carbon Capture|Industry Process|Cement', 'Carbon Management|Carbon Capture|Industry Energy|Chemicals', 'Carbon Management|Carbon Capture|Industry Energy|Steel')), + scales = 'fixed', orderVars = 'user') ``` From 693f322cbc5e1137171713944823f96ed9a6ca2f Mon Sep 17 00:00:00 2001 From: Michaja Pehl Date: Tue, 6 Feb 2024 09:38:46 +0100 Subject: [PATCH 4/5] fix URLs in REMIND summary vignette --- vignettes/remind_summary.Rmd | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/vignettes/remind_summary.Rmd b/vignettes/remind_summary.Rmd index 8adad201..154cda5f 100644 --- a/vignettes/remind_summary.Rmd +++ b/vignettes/remind_summary.Rmd @@ -58,8 +58,10 @@ outfile <- "validationSummary.pdf" hist <- NULL # Download test data from PIK's RSE server -download.file("http://rse.pik-potsdam.de/data/example/fulldata.gdx", "fulldata.gdx",mode = "wb") -download.file("http://rse.pik-potsdam.de/data/example/REMIND_generic_RCP26.mif", "REMIND_generic_RCP26.mif") +download.file("https://rse.pik-potsdam.de/data/example/fulldata.gdx", + "fulldata.gdx", mode = "wb") +download.file("https://rse.pik-potsdam.de/data/example/REMIND_generic_RCP26.mif", + "REMIND_generic_RCP26.mif") ``` From 31fc0dfa09837344208b7fcdc43894ec9bd8c9f9 Mon Sep 17 00:00:00 2001 From: Michaja Pehl Date: Tue, 6 Feb 2024 10:03:30 +0100 Subject: [PATCH 5/5] lucode hubbub --- .buildlibrary | 2 +- CITATION.cff | 4 ++-- DESCRIPTION | 4 ++-- README.md | 6 +++--- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.buildlibrary b/.buildlibrary index 3604a038..7694be48 100644 --- a/.buildlibrary +++ b/.buildlibrary @@ -1,4 +1,4 @@ -ValidationKey: '223858140' +ValidationKey: '223889229' 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 aa111b87..338797c4 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.133.0 -date-released: '2024-02-05' +version: 1.133.1 +date-released: '2024-02-06' abstract: Contains the REMIND-specific routines for data and model output manipulation. authors: - family-names: Rodrigues diff --git a/DESCRIPTION b/DESCRIPTION index 5e6800ba..3849a07b 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,8 +1,8 @@ Type: Package Package: remind2 Title: The REMIND R package (2nd generation) -Version: 1.133.0 -Date: 2024-02-05 +Version: 1.133.1 +Date: 2024-02-06 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 aa8c2838..30d33ae4 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # The REMIND R package (2nd generation) -R package **remind2**, version **1.133.0** +R package **remind2**, version **1.133.1** [![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 (2024). _remind2: The REMIND R package (2nd generation)_. R package version 1.133.1, . 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}, year = {2024}, - note = {R package version 1.133.0}, + note = {R package version 1.133.1}, url = {https://github.com/pik-piam/remind2}, } ```