diff --git a/.buildlibrary b/.buildlibrary index c86c969..7ac2407 100644 --- a/.buildlibrary +++ b/.buildlibrary @@ -1,4 +1,4 @@ -ValidationKey: '834834' +ValidationKey: '997200' AutocreateReadme: yes AcceptedWarnings: - 'Warning: package ''.*'' was built under R version' diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 62f13da..7ccf77e 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -15,7 +15,7 @@ repos: - id: mixed-line-ending - repo: https://github.com/lorenzwalthert/precommit - rev: 7910e0323d7213f34275a7a562b9ef0fde8ce1b9 # frozen: v0.4.2 + rev: bae853d82da476eee0e0a57960ee6b741a3b3fb7 # frozen: v0.4.3 hooks: - id: parsable-R - id: deps-in-desc diff --git a/CITATION.cff b/CITATION.cff index 07757d2..41b5a1d 100644 --- a/CITATION.cff +++ b/CITATION.cff @@ -2,19 +2,19 @@ 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.2 -date-released: '2024-06-03' +version: 0.5.0 +date-released: '2024-08-09' 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: - family-names: Hasse given-names: Robin email: robin.hasse@pik-potsdam.de - orcid: 0000-0003-1818-3186 + orcid: https://orcid.org/0000-0003-1818-3186 - family-names: Rosemann given-names: Ricarda email: ricarda.rosemann@pik-potsdam.de - orcid: 0009-0006-5939-3197 + orcid: https://orcid.org/0009-0006-5939-3197 license: LGPL-3.0 repository-code: https://github.com/pik-piam/reportbrick diff --git a/DESCRIPTION b/DESCRIPTION index a5eed34..2f4e2f3 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,8 +1,8 @@ Type: Package Package: reportbrick Title: Reporting package for BRICK -Version: 0.4.2 -Date: 2024-06-03 +Version: 0.5.0 +Date: 2024-08-09 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.18), + mip (>= 0.148.19), piamPlotComparison, piamutils (>= 0.0.9), purrr, @@ -32,4 +32,4 @@ Suggests: covr, testthat Encoding: UTF-8 -RoxygenNote: 7.3.1 +RoxygenNote: 7.3.2 diff --git a/README.md b/README.md index a85e4b8..8b3be27 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Reporting package for BRICK -R package **reportbrick**, version **0.4.2** +R package **reportbrick**, version **0.5.0** [![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 . +Hasse R, Rosemann R (2024). _reportbrick: Reporting package for BRICK_. R package version 0.5.0, . 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.2}, + note = {R package version 0.5.0}, url = {https://github.com/pik-piam/reportbrick}, } ``` diff --git a/inst/compareScenarios/preprocessing.R b/inst/compareScenarios/preprocessing.R index 8d4a5ac..70d7272 100644 --- 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 index bdd61c4..a2b076f 100644 --- 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]