From 131ad676349f918e817496d627a91fd72939e6fe Mon Sep 17 00:00:00 2001 From: Chen Gong <> Date: Thu, 1 Feb 2024 14:53:45 +0100 Subject: [PATCH 1/6] version number --- .buildlibrary | 2 +- CITATION.cff | 4 ++-- DESCRIPTION | 4 ++-- README.md | 6 +++--- man/remind2-package.Rd | 1 + 5 files changed, 9 insertions(+), 8 deletions(-) diff --git a/.buildlibrary b/.buildlibrary index 198c5ad7..220ce6d7 100644 --- a/.buildlibrary +++ b/.buildlibrary @@ -1,4 +1,4 @@ -ValidationKey: '223160847' +ValidationKey: '223383810' 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 a180adf0..ed20ccb2 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.130.1 -date-released: '2024-01-25' +version: 1.131.0 +date-released: '2024-01-29' abstract: Contains the REMIND-specific routines for data and model output manipulation. authors: - family-names: Rodrigues diff --git a/DESCRIPTION b/DESCRIPTION index b9b0fee7..9615c03a 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,8 +1,8 @@ Type: Package Package: remind2 Title: The REMIND R package (2nd generation) -Version: 1.130.1 -Date: 2024-01-25 +Version: 1.131.0 +Date: 2024-01-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 2ed5445c..f5fb8b58 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # The REMIND R package (2nd generation) -R package **remind2**, version **1.130.1** +R package **remind2**, version **1.131.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.131.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.130.1}, + note = {R package version 1.131.0}, url = {https://github.com/pik-piam/remind2}, } ``` diff --git a/man/remind2-package.Rd b/man/remind2-package.Rd index 5169a479..7b64919d 100644 --- a/man/remind2-package.Rd +++ b/man/remind2-package.Rd @@ -3,6 +3,7 @@ \docType{package} \name{remind2-package} \alias{remind2-package} +\alias{_PACKAGE} \alias{remind2} \title{The REMIND R package (2nd generation)} \description{ From b1eaae9cc073dde5bd211cadb11fd6260e3c8151 Mon Sep 17 00:00:00 2001 From: Chen Gong <> Date: Thu, 1 Feb 2024 16:05:54 +0100 Subject: [PATCH 2/6] Revert "version number" This reverts commit 131ad676349f918e817496d627a91fd72939e6fe. --- .buildlibrary | 2 +- CITATION.cff | 4 ++-- DESCRIPTION | 4 ++-- README.md | 6 +++--- man/remind2-package.Rd | 1 - 5 files changed, 8 insertions(+), 9 deletions(-) diff --git a/.buildlibrary b/.buildlibrary index 220ce6d7..198c5ad7 100644 --- a/.buildlibrary +++ b/.buildlibrary @@ -1,4 +1,4 @@ -ValidationKey: '223383810' +ValidationKey: '223160847' 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 ed20ccb2..a180adf0 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.131.0 -date-released: '2024-01-29' +version: 1.130.1 +date-released: '2024-01-25' abstract: Contains the REMIND-specific routines for data and model output manipulation. authors: - family-names: Rodrigues diff --git a/DESCRIPTION b/DESCRIPTION index 9615c03a..b9b0fee7 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,8 +1,8 @@ Type: Package Package: remind2 Title: The REMIND R package (2nd generation) -Version: 1.131.0 -Date: 2024-01-29 +Version: 1.130.1 +Date: 2024-01-25 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 f5fb8b58..2ed5445c 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # The REMIND R package (2nd generation) -R package **remind2**, version **1.131.0** +R package **remind2**, version **1.130.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.130.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.131.0}, + note = {R package version 1.130.1}, url = {https://github.com/pik-piam/remind2}, } ``` diff --git a/man/remind2-package.Rd b/man/remind2-package.Rd index 7b64919d..5169a479 100644 --- a/man/remind2-package.Rd +++ b/man/remind2-package.Rd @@ -3,7 +3,6 @@ \docType{package} \name{remind2-package} \alias{remind2-package} -\alias{_PACKAGE} \alias{remind2} \title{The REMIND R package (2nd generation)} \description{ From 8a75bbb9889103fa002f356567c94ef7ec1572fd Mon Sep 17 00:00:00 2001 From: Chen Gong <> Date: Thu, 1 Feb 2024 16:09:32 +0100 Subject: [PATCH 3/6] add transport liquid breakdown --- .../cs2_05_energy_demand.Rmd | 38 +++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/inst/markdown/compareScenarios2/cs2_05_energy_demand.Rmd b/inst/markdown/compareScenarios2/cs2_05_energy_demand.Rmd index fb4f5158..b9ae67aa 100644 --- a/inst/markdown/compareScenarios2/cs2_05_energy_demand.Rmd +++ b/inst/markdown/compareScenarios2/cs2_05_energy_demand.Rmd @@ -369,6 +369,44 @@ showAreaAndBarPlots(data, items, tot, orderVars = "user", fill = TRUE) showAreaAndBarPlots(data, items2, tot, orderVars = "user", scales = "fixed") ``` +#### FE Transport Liquid Area Plots -- with Bunkers + +```{r Transport Final Energy Synthetic Liquid} +tot_synliq <- "FE|Transport|Liquids|Hydrogen" +items_synliq <- c( + "FE|Transport|Pass|Road|LDV|Liquids|Hydrogen", + "FE|Transport|Freight|Road|Liquids|Hydrogen", + "FE|Transport|Pass|Road|Bus|Liquids|Hydrogen", + "FE|Transport|Freight|Rail|Liquids|Hydrogen", + "FE|Transport|Pass|Rail|Liquids|Hydrogen", + "FE|Transport|Pass|Aviation|Domestic|Liquids|Hydrogen", + "FE|Transport|Pass|Aviation|International|Liquids|Hydrogen", + "FE|Transport|Freight|International Shipping|Liquids|Hydrogen", + NULL +) + +showAreaAndBarPlots(data, items_synliq, tot_synliq, orderVars = "user", scales = "fixed") + +``` + +```{r Transport Final Energy Biogenic Liquid} +tot_bioliq <- "FE|Transport|Liquids|Biomass" +items_bioliq <- c( + "FE|Transport|Pass|Road|LDV|Liquids|Biomass", + "FE|Transport|Freight|Road|Liquids|Biomass", + "FE|Transport|Pass|Road|Bus|Liquids|Biomass", + "FE|Transport|Freight|Rail|Liquids|Biomass", + "FE|Transport|Pass|Rail|Liquids|Biomass", + "FE|Transport|Pass|Aviation|Domestic|Liquids|Biomass", + "FE|Transport|Pass|Aviation|International|Liquids|Biomass", + "FE|Transport|Freight|International Shipping|Liquids|Biomass", + NULL +) + +showAreaAndBarPlots(data, items_bioliq, tot_bioliq, orderVars = "user", scales = "fixed") + +``` + #### FE Transport Line Plots -- with Bunkers ```{r FE Transport Line Plots -- with Bunkers} From 0ea7495dc199c27c2b9f504de52477dd051c060a Mon Sep 17 00:00:00 2001 From: Chen Gong <> Date: Thu, 1 Feb 2024 16:27:52 +0100 Subject: [PATCH 4/6] version update --- .buildlibrary | 2 +- CITATION.cff | 4 ++-- DESCRIPTION | 4 ++-- README.md | 6 +++--- man/remind2-package.Rd | 1 + 5 files changed, 9 insertions(+), 8 deletions(-) diff --git a/.buildlibrary b/.buildlibrary index b7dbafdd..d01542e2 100644 --- a/.buildlibrary +++ b/.buildlibrary @@ -1,4 +1,4 @@ -ValidationKey: '223237104' +ValidationKey: '223417740' 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 2718cd61..ccd9ac56 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.130.2 -date-released: '2024-01-30' +version: 1.131.0 +date-released: '2024-02-01' abstract: Contains the REMIND-specific routines for data and model output manipulation. authors: - family-names: Rodrigues diff --git a/DESCRIPTION b/DESCRIPTION index e25292a5..e4eafe41 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,8 +1,8 @@ Type: Package Package: remind2 Title: The REMIND R package (2nd generation) -Version: 1.130.2 -Date: 2024-01-30 +Version: 1.131.0 +Date: 2024-02-01 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 b04d4021..f5fb8b58 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # The REMIND R package (2nd generation) -R package **remind2**, version **1.130.2** +R package **remind2**, version **1.131.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.131.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.130.2}, + note = {R package version 1.131.0}, url = {https://github.com/pik-piam/remind2}, } ``` diff --git a/man/remind2-package.Rd b/man/remind2-package.Rd index 5169a479..7b64919d 100644 --- a/man/remind2-package.Rd +++ b/man/remind2-package.Rd @@ -3,6 +3,7 @@ \docType{package} \name{remind2-package} \alias{remind2-package} +\alias{_PACKAGE} \alias{remind2} \title{The REMIND R package (2nd generation)} \description{ From 04f977375491396d428e9b7bc9bd59dcee0732c3 Mon Sep 17 00:00:00 2001 From: Chen Gong <> Date: Thu, 1 Feb 2024 17:56:41 +0100 Subject: [PATCH 5/6] small patches --- inst/markdown/compareScenarios2/cs2_05_energy_demand.Rmd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/inst/markdown/compareScenarios2/cs2_05_energy_demand.Rmd b/inst/markdown/compareScenarios2/cs2_05_energy_demand.Rmd index b9ae67aa..5b47d4d8 100644 --- a/inst/markdown/compareScenarios2/cs2_05_energy_demand.Rmd +++ b/inst/markdown/compareScenarios2/cs2_05_energy_demand.Rmd @@ -371,7 +371,7 @@ showAreaAndBarPlots(data, items2, tot, orderVars = "user", scales = "fixed") #### FE Transport Liquid Area Plots -- with Bunkers -```{r Transport Final Energy Synthetic Liquid} +```{r Transport Final Energy Synthetic Liquid - by Use} tot_synliq <- "FE|Transport|Liquids|Hydrogen" items_synliq <- c( "FE|Transport|Pass|Road|LDV|Liquids|Hydrogen", @@ -389,7 +389,7 @@ showAreaAndBarPlots(data, items_synliq, tot_synliq, orderVars = "user", scales = ``` -```{r Transport Final Energy Biogenic Liquid} +```{r Transport Final Energy Biogenic Liquid - by Use} tot_bioliq <- "FE|Transport|Liquids|Biomass" items_bioliq <- c( "FE|Transport|Pass|Road|LDV|Liquids|Biomass", From c60f565c8d1945b6aae615ce6c242d143cddebb8 Mon Sep 17 00:00:00 2001 From: Chen Gong <> Date: Thu, 1 Feb 2024 17:58:15 +0100 Subject: [PATCH 6/6] version update --- .buildlibrary | 2 +- CITATION.cff | 2 +- DESCRIPTION | 2 +- README.md | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.buildlibrary b/.buildlibrary index d01542e2..a33df1dd 100644 --- a/.buildlibrary +++ b/.buildlibrary @@ -1,4 +1,4 @@ -ValidationKey: '223417740' +ValidationKey: '223437494' 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 ccd9ac56..889ce3b0 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.131.0 +version: 1.131.1 date-released: '2024-02-01' abstract: Contains the REMIND-specific routines for data and model output manipulation. authors: diff --git a/DESCRIPTION b/DESCRIPTION index e4eafe41..68786775 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,7 +1,7 @@ Type: Package Package: remind2 Title: The REMIND R package (2nd generation) -Version: 1.131.0 +Version: 1.131.1 Date: 2024-02-01 Authors@R: c( person("Renato", "Rodrigues", , "renato.rodrigues@pik-potsdam.de", role = c("aut", "cre")), diff --git a/README.md b/README.md index f5fb8b58..4fcd510d 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # The REMIND R package (2nd generation) -R package **remind2**, version **1.131.0** +R package **remind2**, version **1.131.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.131.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.131.0}, + note = {R package version 1.131.1}, url = {https://github.com/pik-piam/remind2}, } ```