Add H2 heating

pik-piam · Jun 4, 2024 · bfc907f · bfc907f
1 parent 5bb270e
commit bfc907f
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 13 deletions.
diff --git a/.buildlibrary b/.buildlibrary
@@ -1,4 +1,4 @@
-ValidationKey: '814793'
+ValidationKey: '834876'
 AutocreateReadme: yes
 AcceptedWarnings:
 - '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: 'reportbrick: Reporting package for BRICK'
-version: 0.4.1
-date-released: '2024-05-30'
+version: 0.4.2
+date-released: '2024-06-04'
 abstract: This package contains BRICK-specific routines to report model results. The
   main functionality is to generate a mif-file from a given BRICK model run folder.
 authors:

diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,8 +1,8 @@
 Type: Package
 Package: reportbrick
 Title: Reporting package for BRICK
-Version: 0.4.1
-Date: 2024-05-30
+Version: 0.4.2
+Date: 2024-06-04
 Authors@R: c(
     person("Robin", "Hasse", , "robin.hasse@pik-potsdam.de",
            role = c("aut", "cre"),
@@ -21,7 +21,7 @@ Imports:
   knitr,
   madrat,
   magclass,
-  mip (>= 0.148.17),
+  mip (>= 0.148.19),
   piamPlotComparison,
   piamutils (>= 0.0.9),
   purrr,

diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # Reporting package for BRICK
 
-R package **reportbrick**, version **0.4.1**
+R package **reportbrick**, version **0.4.2**
 
 [![CRAN status](https://www.r-pkg.org/badges/version/reportbrick)](https://cran.r-project.org/package=reportbrick)  [![R build status](https://github.com/pik-piam/reportbrick/workflows/check/badge.svg)](https://github.com/pik-piam/reportbrick/actions) [![codecov](https://codecov.io/gh/pik-piam/reportbrick/branch/master/graph/badge.svg)](https://app.codecov.io/gh/pik-piam/reportbrick) [![r-universe](https://pik-piam.r-universe.dev/badges/reportbrick)](https://pik-piam.r-universe.dev/builds)
 
@@ -38,7 +38,7 @@ In case of questions / problems please contact Robin Hasse <robin.hasse@pik-pots
 
 To cite package **reportbrick** in publications use:
 
-Hasse R, Rosemann R (2024). _reportbrick: Reporting package for BRICK_. R package version 0.4.1, <https://github.com/pik-piam/reportbrick>.
+Hasse R, Rosemann R (2024). _reportbrick: Reporting package for BRICK_. R package version 0.4.2, <https://github.com/pik-piam/reportbrick>.
 
 A BibTeX entry for LaTeX users is
 
@@ -47,7 +47,7 @@ A BibTeX entry for LaTeX users is
   title = {reportbrick: Reporting package for BRICK},
   author = {Robin Hasse and Ricarda Rosemann},
   year = {2024},
-  note = {R package version 0.4.1},
+  note = {R package version 0.4.2},
   url = {https://github.com/pik-piam/reportbrick},
 }
 ```
diff --git a/inst/compareScenarios/preprocessing.R b/inst/compareScenarios/preprocessing.R
@@ -28,6 +28,7 @@ heating <- c(
   "District heating",
   "Heat pump",
   "Resistive electric",
+  "Hydrogen heater",
   "Gas heater",
   "Liquids heater",
   "Coal heater"
@@ -36,6 +37,7 @@ carrier <- c(
   "Biomass",
   "Heat",
   "Electricity",
+  "Hydrogen",
   "Gases",
   "Liquids",
   "Coal"

diff --git a/inst/extdata/sectoral/brickSets.yaml b/inst/extdata/sectoral/brickSets.yaml
@@ -24,17 +24,18 @@ hsr:
     dihe: District heating
     ehp1: Heat pump
     reel: Resistive electric
+    h2bo: Hydrogen heater
     gabo: Gas heater
     libo: Liquids heater
     sobo: Coal heater
     "0": No change
   subsets:
-    all: [biom, dihe, ehp1, reel, gabo, libo, sobo]
-    all0: [biom, dihe, ehp1, reel, gabo, libo, sobo, "0"]
+    all: [biom, dihe, ehp1, reel, h2bo, gabo, libo, sobo]
+    all0: [biom, dihe, ehp1, reel, h2bo,  gabo, libo, sobo, "0"]
     elec: [ehp1, reel]
   child:
     hs:
-      elements: [biom, dihe, ehp1, reel, gabo, libo, sobo]
+      elements: [biom, dihe, ehp1, reel, h2bo,  gabo, libo, sobo]
       subsets: [all, elec]
 
 
@@ -44,11 +45,12 @@ carrier:
     biomod: Biomass
     heat: Heat
     elec: Electricity
+    h2: Hydrogen
     gases: Gases
     liquids: Liquids
     coal: Coal
   subsets:
-    all: [biomod, heat, elec, gases, liquids, coal]
+    all: [biomod, heat, elec, h2, gases, liquids, coal]
     solids: [biomod, coal]