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.

Sign up for GitHub

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

Add CEDS emission variables including bunkers #610

Merged
merged 2 commits into from
Jan 10, 2025
Merged

Add CEDS emission variables including bunkers #610

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
146d547
add emission variables w bunkers to CEDS
pweigmann Jan 10, 2025
d92e0c0
increment version
pweigmann Jan 10, 2025
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
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ValidationKey: '41196800'
ValidationKey: '41220998'
AcceptedWarnings:
- Invalid URL: .*
- 'Warning: package ''.*'' was built under R version'
Expand Down
4 changes: 2 additions & 2 deletions CITATION.cff
View file
Open in desktop
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: 'mrremind: MadRat REMIND Input Data Package'
version: 0.205.0
date-released: '2025-01-08'
version: 0.205.1
date-released: '2025-01-10'
abstract: The mrremind packages contains data preprocessing for the REMIND model.
authors:
- family-names: Baumstark
Expand Down
4 changes: 2 additions & 2 deletions DESCRIPTION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
Type: Package
Package: mrremind
Title: MadRat REMIND Input Data Package
Version: 0.205.0
Date: 2025-01-08
Version: 0.205.1
Date: 2025-01-10
Authors@R: c(
person("Lavinia", "Baumstark", , "[email protected]", role = c("aut", "cre")),
person("Renato", "Rodrigues", role = "aut"),
Expand Down
1 change: 1 addition & 0 deletions NAMESPACE
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ export(readAGEB)
export(readAR6GWP)
export(readEDGAR7Fgases)
export(readEmber)
export(readGWEC)
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This does not seem to belong in this PR, or am I missing something? This action stumbled upon this:
https://github.com/r-universe/pik-piam/actions/runs/12712230190/job/35437349733

Copy link
Contributor Author

@pweigmann pweigmann Jan 10, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you are absolutely right, thanks for pointing it out!
Fix incoming

export(readGlobalCCSinstitute)
export(readGlobalEnergyMonitor)
export(readHRE)
Expand Down
28 changes: 25 additions & 3 deletions R/calcEmissions.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -340,16 +340,38 @@ calcEmissions <- function(datasource = "CEDS16") {
emi[, , "Energy"] <- emi[, , "Energy|Demand"] +
emi[, , "Energy|Supply"]

emi <-
add_columns(emi, "Energy and Industrial Processes", dim = 3.1)
emi <- add_columns(emi, "Energy and Industrial Processes", dim = 3.1)
emi[, , "Energy and Industrial Processes"] <-
emi[, , "Energy"] +
emi[, , "Industrial Processes"]

# variables with bunker emissions
emi <- add_columns(emi, "w/ Bunkers|Energy", dim = 3.1)
emi[, , "w/ Bunkers|Energy"] <-
emi[, , "Energy"] +
emi[, , "Energy|Demand|Transport|International Bunkers"]

emi <-
add_columns(emi, "w/ Bunkers|Energy and Industrial Processes", dim = 3.1)
emi[, , "w/ Bunkers|Energy and Industrial Processes"] <-
emi[, , "Energy and Industrial Processes"] +
emi[, , "Energy|Demand|Transport|International Bunkers"]

emi <- add_columns(emi, "w/ Bunkers|Energy|Demand", dim = 3.1)
emi[, , "w/ Bunkers|Energy|Demand"] <-
emi[, , "Energy|Demand"] +
emi[, , "Energy|Demand|Transport|International Bunkers"]

emi <- add_columns(emi, "w/ Bunkers|Energy|Demand|Transport", dim = 3.1)
emi[, , "w/ Bunkers|Energy|Demand|Transport"] <-
emi[, , "Energy|Demand|Transport"] +
emi[, , "Energy|Demand|Transport|International Bunkers"]


# convert N20 to correct unit Mt to kt
emi[, , "N2O"] <- emi[, , "N2O"] * 1000

# change order, add "Emissions|", and reduce to a single dimension by
# change order, add "Emi|", and reduce to a single dimension by
# replacing dots: Waste.SO2.harm -> Emissions|SO2|Waste|harm
tmp <-
gsub("^([^\\.]*)\\.(.*$)",
Expand Down
8 changes: 4 additions & 4 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# MadRat REMIND Input Data Package

R package **mrremind**, version **0.205.0**
R package **mrremind**, version **0.205.1**

[![CRAN status](https://www.r-pkg.org/badges/version/mrremind)](https://cran.r-project.org/package=mrremind) [![R build status](https://github.com/pik-piam/mrremind/workflows/check/badge.svg)](https://github.com/pik-piam/mrremind/actions) [![codecov](https://codecov.io/gh/pik-piam/mrremind/branch/master/graph/badge.svg)](https://app.codecov.io/gh/pik-piam/mrremind) [![r-universe](https://pik-piam.r-universe.dev/badges/mrremind)](https://pik-piam.r-universe.dev/builds)

Expand Down Expand Up @@ -39,17 +39,17 @@ In case of questions / problems please contact Lavinia Baumstark <lavinia@pik-po

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

Baumstark L, Rodrigues R, Levesque A, Oeser J, Bertram C, Mouratiadou I, Malik A, Schreyer F, Soergel B, Rottoli M, Mishra A, Dirnaichner A, Pehl M, Giannousakis A, Klein D, Strefler J, Feldhaus L, Brecha R, Rauner S, Dietrich J, Bi S, Benke F, Weigmann P, Richters O, Hasse R, Fuchs S, Mandaroux R, Koch J (2025). "mrremind: MadRat REMIND Input Data Package." Version: 0.205.0, <https://github.com/pik-piam/mrremind>.
Baumstark L, Rodrigues R, Levesque A, Oeser J, Bertram C, Mouratiadou I, Malik A, Schreyer F, Soergel B, Rottoli M, Mishra A, Dirnaichner A, Pehl M, Giannousakis A, Klein D, Strefler J, Feldhaus L, Brecha R, Rauner S, Dietrich J, Bi S, Benke F, Weigmann P, Richters O, Hasse R, Fuchs S, Mandaroux R, Koch J (2025). "mrremind: MadRat REMIND Input Data Package." Version: 0.205.1, <https://github.com/pik-piam/mrremind>.

A BibTeX entry for LaTeX users is

```latex
@Misc{,
title = {mrremind: MadRat REMIND Input Data Package},
author = {Lavinia Baumstark and Renato Rodrigues and Antoine Levesque and Julian Oeser and Christoph Bertram and Ioanna Mouratiadou and Aman Malik and Felix Schreyer and Bjoern Soergel and Marianna Rottoli and Abhijeet Mishra and Alois Dirnaichner and Michaja Pehl and Anastasis Giannousakis and David Klein and Jessica Strefler and Lukas Feldhaus and Regina Brecha and Sebastian Rauner and Jan Philipp Dietrich and Stephen Bi and Falk Benke and Pascal Weigmann and Oliver Richters and Robin Hasse and Sophie Fuchs and Rahel Mandaroux and Johannes Koch},
date = {2025-01-08},
date = {2025-01-10},
year = {2025},
url = {https://github.com/pik-piam/mrremind},
note = {Version: 0.205.0},
note = {Version: 0.205.1},
}
```
Loading