Merge pull request #15 from fbenke-pik/main

Shifting the phase-in of hydrogen in calcFeDemand

.buildlibrary

@@ -1,4 +1,4 @@
-ValidationKey: '1223233'
+ValidationKey: '1403920'
 AutocreateReadme: yes
 AcceptedWarnings:
 - 'Warning: package ''.*'' was built under R version'

.pre-commit-config.yaml

@@ -3,7 +3,7 @@
 exclude: '^tests/testthat/_snaps/.*$'
 repos:
 -   repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: 2c9f875913ee60ca25ce70243dc24d5b6415598c  # frozen: v4.6.0
+    rev: cef0300fd0fc4d2a87a85fa2093c6b283ea36f4b  # frozen: v5.0.0
     hooks:
     -   id: check-case-conflict
     -   id: check-json
@@ -15,7 +15,7 @@ repos:
     -   id: mixed-line-ending
 
 -   repo: https://github.com/lorenzwalthert/precommit
-    rev: bae853d82da476eee0e0a57960ee6b741a3b3fb7  # frozen: v0.4.3
+    rev: 3b70240796cdccbe1474b0176560281aaded97e6  # frozen: v0.4.3.9003
     hooks:
     -   id: parsable-R
     -   id: deps-in-desc

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: 'mrindustry: input data generation for the REMIND industry module'
-version: 0.6.1
-date-released: '2024-11-26'
+version: 0.7.0
+date-released: '2024-11-29'
 abstract: The mrindustry packages contains data preprocessing for the REMIND model.
 authors:
 - family-names: Benke

DESCRIPTION

@@ -1,8 +1,8 @@
 Type: Package
 Package: mrindustry
 Title: input data generation for the REMIND industry module
-Version: 0.6.1
-Date: 2024-11-26
+Version: 0.7.0
+Date: 2024-11-29
 Authors@R: c(
     person(given = "Falk", family = "Benke", email = "[email protected]",
            role = c("aut", "cre")),

R/calcFeDemandIndustry.R

@@ -1259,9 +1259,9 @@ calcFeDemandIndustry <- function(use_ODYM_RECC = FALSE,
   }
 
   ### extend to H2 and HTH_el shares ----
-  feh2_share_in_fega <- 0.3
+  feh2_share_in_fega <- 0.35
   # H2 shares grow linearly from 0.1 % to feh2_share_in_fega of fega from
-  # 2020 to 2050 and are constant afterwards
+  # 2025 to 2060 and are constant afterwards
   industry_subsectors_en_shares <- bind_rows(
     industry_subsectors_en_shares %>%
       filter(!grepl("^fega", .data$pf)),
@@ -1275,7 +1275,7 @@ calcFeDemandIndustry <- function(use_ODYM_RECC = FALSE,
       mutate(feh2 = pmin(feh2_share_in_fega,
                          pmax(0.01,
                               feh2_share_in_fega
-                              * (.data$year - 2020) / (2050 - 2020)))
+                              * (.data$year - 2025) / (2060 - 2025)))
              * .data$fega,
              fega = .data$fega - .data$feh2) %>%
       pivot_longer(c("fega", "feh2"), names_to = "pf.fety",

README.md

@@ -1,6 +1,6 @@
 # input data generation for the REMIND industry module
 
-R package **mrindustry**, version **0.6.1**
+R package **mrindustry**, version **0.7.0**
 
 [![CRAN status](https://www.r-pkg.org/badges/version/mrindustry)](https://cran.r-project.org/package=mrindustry)  [![R build status](https://github.com/pik-piam/mrindustry/workflows/check/badge.svg)](https://github.com/pik-piam/mrindustry/actions) [![codecov](https://codecov.io/gh/pik-piam/mrindustry/branch/master/graph/badge.svg)](https://app.codecov.io/gh/pik-piam/mrindustry) [![r-universe](https://pik-piam.r-universe.dev/badges/mrindustry)](https://pik-piam.r-universe.dev/builds)
 
@@ -39,7 +39,7 @@ In case of questions / problems please contact Falk Benke <[email protected]>
 
 To cite package **mrindustry** in publications use:
 
-Benke F, Dürrwächter J, Rodrigues R, Moreno-Leiva S, Baumstark L, Pehl M (2024). _mrindustry: input data generation for the REMIND industry module_. R package version 0.6.1, <https://github.com/pik-piam/mrindustry>.
+Benke F, Dürrwächter J, Rodrigues R, Moreno-Leiva S, Baumstark L, Pehl M (2024). _mrindustry: input data generation for the REMIND industry module_. R package version 0.7.0, <https://github.com/pik-piam/mrindustry>.
 
 A BibTeX entry for LaTeX users is
 
@@ -48,7 +48,7 @@ A BibTeX entry for LaTeX users is
   title = {mrindustry: input data generation for the REMIND industry module},
   author = {Falk Benke and Jakob Dürrwächter and Renato Rodrigues and Simón Moreno-Leiva and Lavinia Baumstark and Michaja Pehl},
   year = {2024},
-  note = {R package version 0.6.1},
+  note = {R package version 0.7.0},
   url = {https://github.com/pik-piam/mrindustry},
 }
 ```