Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

FE synthetic liquid and biomass liquid breakdown by use in Tranport #514

Merged
merged 7 commits into from
Feb 1, 2024
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .buildlibrary
Original file line number Diff line number Diff line change
@@ -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'
Expand Down
4 changes: 2 additions & 2 deletions CITATION.cff
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -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", , "[email protected]", role = c("aut", "cre")),
person("Lavinia", "Baumstark", role = "aut"),
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -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)

Expand Down Expand Up @@ -49,7 +49,7 @@ In case of questions / problems please contact Renato Rodrigues <renato.rodrigue

To cite package **remind2** in publications use:

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.2, <https://github.com/pik-piam/remind2>.
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, <https://github.com/pik-piam/remind2>.

A BibTeX entry for LaTeX users is

Expand All @@ -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},
}
```
38 changes: 38 additions & 0 deletions inst/markdown/compareScenarios2/cs2_05_energy_demand.Rmd
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
1 change: 1 addition & 0 deletions man/remind2-package.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading