Merge pull request pik-piam#610 from pweigmann/CEDS_bunkers

Add CEDS emission variables including bunkers
merfort · Jan 10, 2025 · 292a2ff · 292a2ff
2 parents 6f3b2b1 + d92e0c0
commit 292a2ff
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 12 deletions.
diff --git a/.buildlibrary b/.buildlibrary
@@ -1,4 +1,4 @@
-ValidationKey: '41196800'
+ValidationKey: '41220998'
 AcceptedWarnings:
 - Invalid URL: .*
 - 'Warning: package ''.*'' was built under R version'

diff --git 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: '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

diff --git a/DESCRIPTION b/DESCRIPTION
@@ -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"),

diff --git a/NAMESPACE b/NAMESPACE
@@ -36,6 +36,7 @@ export(readAGEB)
 export(readAR6GWP)
 export(readEDGAR7Fgases)
 export(readEmber)
+export(readGWEC)
 export(readGlobalCCSinstitute)
 export(readGlobalEnergyMonitor)
 export(readHRE)

diff --git a/R/calcEmissions.R b/R/calcEmissions.R
@@ -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("^([^\\.]*)\\.(.*$)",

diff --git a/README.md b/README.md
@@ -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)
 
@@ -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},
 }
 ```