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

Attribute waste emissions to energy-related emissions of sectors based on historical shares and remove waste emissions variables from energy-related emissions taxonomy #641

Merged
merged 10 commits into from
Aug 15, 2024
Merged
2 changes: 1 addition & 1 deletion .buildlibrary
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ValidationKey: '229293806'
ValidationKey: '229425000'
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.149.4
date-released: '2024-08-14'
version: 1.150.0
date-released: '2024-08-15'
abstract: Contains the REMIND-specific routines for data and model output manipulation.
authors:
- family-names: Rodrigues
Expand Down
7 changes: 4 additions & 3 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.149.4
Date: 2024-08-14
Version: 1.150.0
Date: 2024-08-15
Authors@R: c(
person("Renato", "Rodrigues", , "[email protected]", role = c("aut", "cre")),
person("Lavinia", "Baumstark", role = "aut"),
Expand Down Expand Up @@ -75,7 +75,8 @@ Imports:
tidyr,
tidyselect,
withr,
yaml
yaml,
digest
Suggests:
covr,
gridExtra,
Expand Down
1 change: 1 addition & 0 deletions NAMESPACE
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,7 @@ importFrom(data.table,fwrite)
importFrom(data.table,rbindlist)
importFrom(data.table,setDT)
importFrom(data.table,setnames)
importFrom(digest,digest)
importFrom(dplyr,"%>%")
importFrom(dplyr,across)
importFrom(dplyr,arrange)
Expand Down
368 changes: 264 additions & 104 deletions R/reportEmi.R

Large diffs are not rendered by default.

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.149.4**
R package **remind2**, version **1.150.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, Rüter T (2024). _remind2: The REMIND R package (2nd generation)_. R package version 1.149.4, <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, Rüter T (2024). _remind2: The REMIND R package (2nd generation)_. R package version 1.150.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 and Tonn Rüter},
year = {2024},
note = {R package version 1.149.4},
note = {R package version 1.150.0},
url = {https://github.com/pik-piam/remind2},
}
```
54 changes: 53 additions & 1 deletion inst/compareScenarios/cs_03_emissions.Rmd
Original file line number Diff line number Diff line change
Expand Up @@ -201,6 +201,58 @@ showLinePlots(
showLinePlots(data, "Emi|CO2|Industry")
```

### Waste Emissions

#### Total Waste Emissions

```{r total waste CO2}


tot <- "Emi|CO2|Energy|Waste"
items <- c(
"Emi|CO2|Energy|Waste|Feedstocks unknown fate",
"Emi|CO2|Energy|Waste|Plastics Incineration"
)

showAreaAndBarPlots(data, items, tot, scales = "fixed")
```

#### Waste Emissions from Plastics-Incineration
```{r CO2 waste plastics incineration}

showLinePlots(data, "Emi|CO2|Energy|Waste|Plastics Incineration")
```

#### Waste Emissions from Non-plastic Materials
```{r CO2 waste non-plastic Materials}

showLinePlots(data, "Emi|CO2|Energy|Waste|Feedstocks unknown fate")
```

#### Waste Emissions Attributed to Electricity
```{r CO2 waste attributed to electricity}

showLinePlots(data, "Emi|CO2|Energy|Supply|Electricity|Waste")
```

#### Waste Emissions Attributed to Heat
```{r CO2 waste attributed to heat}

showLinePlots(data, "Emi|CO2|Energy|Supply|Heat|Waste")
```

#### Waste Emissions Attributed to Industry
```{r CO2 waste attributed to industry}

showLinePlots(data, "Emi|CO2|Energy|Demand|Industry|Waste")
```

#### Waste Emissions Attributed to Buildings
```{r CO2 waste attributed to buildings}

showLinePlots(data, "Emi|CO2|Energy|Demand|Buildings|Waste")
```


### Transport

Expand All @@ -222,7 +274,7 @@ showLinePlots(data, "Emi|CO2|Energy|Demand|Transport|International Bunkers")
showLinePlots(data, "Emi|CO2|Industrial Processes")
```

```{r CO2 Process Emissions}
```{r CO2 Process Emissions by Sector}
tot <- c("Emi|CO2|Industrial Processes")
items <- c(
"Emi|CO2|Industrial Processes|Chemicals",
Expand Down
Loading