read in final energy on road from AGEB

.buildlibrary

@@ -1,4 +1,4 @@
-ValidationKey: '26508142'
+ValidationKey: '26675490'
 AcceptedWarnings:
 - 'Warning: package ''.*'' was built under R version'
 - 'Warning: namespace ''.*'' is not available and has been replaced'

.github/workflows/lucode2-check.yaml

@@ -72,7 +72,7 @@ jobs:
         run: |
           ./run.sh install_aptget libhdf5-dev
           ./run.sh install_all
-          ./run.sh install_r lucode2 covr
+          ./run.sh install_r lucode2 covr rstudioapi
 
       - name: Remove bspm integration # to get rid of error when running install.packages
         run: |

.zenodo.json

@@ -1,6 +1,6 @@
 {
   "title": "mrremind: MadRat REMIND Input Data Package",
-  "version": "0.138.2",
+  "version": "0.139.0",
   "description": "<p>The mrremind packages contains data preprocessing for the REMIND model.<\/p>",
   "creators": [
     {

DESCRIPTION

@@ -1,8 +1,8 @@
 Package: mrremind
 Type: Package
 Title: MadRat REMIND Input Data Package
-Version: 0.138.2
-Date: 2022-07-08
+Version: 0.139.0
+Date: 2022-07-18
 Authors@R: c(person("Lavinia", "Baumstark", email = "[email protected]", role = c("aut","cre")),
              person("Renato", "Rodrigues", role = "aut"),
              person("Antoine", "Levesque", role = "aut"),

R/readAGEB.R

@@ -20,7 +20,7 @@ readAGEB <- function() {
       "2.1", "2.2",
       "3.1",
       "4.1", "4.2",
-      "6.1", "6.2", "6.3", "6.4", "6.5", "6.6"
+      "6.1", "6.2", "6.3", "6.4", "6.5", "6.6", "6.8"
     ),
     name = c(
       "1.1 Primaerenergiegewinnung im Inland nach Energietraegern",
@@ -38,14 +38,15 @@ readAGEB <- function() {
       "6.3 Endenergieverbrauch Private Haushalte nach Energietraegern",
       "6.4 Endenergieverbrauch Gewerbe, Handel, Dienstleistungen (GHD) nach Energietraegern",
       "6.5 Endenergieverbrauch Landwirtschaft, Fischerei, Bauwirtschaft nach Energietraegern",
-      "6.6 Endenergieverbrauch Verkehr nach Energietraegern"
+      "6.6 Endenergieverbrauch Verkehr nach Energietraegern",
+      "6.8 Endenergieverbrauch im Subsektor Strassenverkehr nach Energietraegern"
     ),
     range = c(
       "B4:AH13", "B4:AH15", "B4:AH15", "B4:AH15", "B4:AH10",
       "B4:AH15", "B4:AH16",
       "B4:AH15",
       "B4:AH15", "B4:AH15",
-      "B4:AH15", "B4:AH15", "B4:AH15", "B4:AH15", "B4:AH15", "B4:AH15"
+      "B4:AH15", "B4:AH15", "B4:AH15", "B4:AH15", "B4:AH15", "B4:AH15", "B4:AH12"
     )
   )
 

README.md

@@ -1,6 +1,6 @@
 # MadRat REMIND Input Data Package
 
-R package **mrremind**, version **0.138.2**
+R package **mrremind**, version **0.139.0**
 
 [![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/ui#builds)
 
@@ -38,7 +38,7 @@ 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 (2022). _mrremind: MadRat REMIND Input Data Package_. R package version 0.138.2, <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 (2022). _mrremind: MadRat REMIND Input Data Package_. R package version 0.139.0, <https://github.com/pik-piam/mrremind>.
 
 A BibTeX entry for LaTeX users is
 
@@ -47,7 +47,7 @@ A BibTeX entry for LaTeX users is
   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},
   year = {2022},
-  note = {R package version 0.138.2},
+  note = {R package version 0.139.0},
   url = {https://github.com/pik-piam/mrremind},
 }
 ```