Skip to content

Commit 88e0c0f

Browse files
authored
Merge pull request #821 from tabeado/bugFixes
add "Carbon Management|Storage" to cumulated variables
2 parents c332608 + 3ac0f96 commit 88e0c0f

6 files changed

Lines changed: 16 additions & 14 deletions

File tree

‎.buildlibrary‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ValidationKey: '5186162'
1+
ValidationKey: '5210100'
22
AcceptedWarnings:
33
- .*following variables are expected in the piamInterfaces.*
44
- Summation checks have revealed some gaps.*

‎CITATION.cff‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ cff-version: 1.2.0
22
message: If you use this software, please cite it using the metadata from this file.
33
type: software
44
title: 'remind2: The REMIND R package (2nd generation)'
5-
version: 2.5.1
6-
date-released: '2026-07-28'
5+
version: 2.5.2
6+
date-released: '2026-08-10'
77
abstract: Contains the REMIND-specific routines for data and model output manipulation.
88
authors:
99
- family-names: Rodrigues

‎DESCRIPTION‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
Type: Package
22
Package: remind2
33
Title: The REMIND R package (2nd generation)
4-
Version: 2.5.1
5-
Date: 2026-07-28
4+
Version: 2.5.2
5+
Date: 2026-08-10
66
Authors@R: c(
77
person("Renato", "Rodrigues", , "renato.rodrigues@pik-potsdam.de", role = c("aut", "cre")),
88
person("Lavinia", "Baumstark", role = "aut"),

‎R/reportEmi.R‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3781,7 +3781,8 @@ reportEmi <- function(gdx, output = NULL, regionSubsetList = NULL,
37813781
vars %>%
37823782
deletePlus() %>% # remove all + from extended variables: summation checks only make sense if all sub-variables are covered
37833783
sub("^Emi\\|CO2", paste0("Emi|CO2|", addedString), .) %>%
3784-
sub("^Emi\\|GHG", paste0("Emi|GHG|", addedString), .)
3784+
sub("^Emi\\|GHG", paste0("Emi|GHG|", addedString), .) %>%
3785+
sub("^Carbon Management\\|Storage", paste0("Carbon Management|Storage|", addedString), .)
37853786
}
37863787

37873788
# emissions variables with bunkers. Insert 'w/ Bunkers' into variable name
@@ -3838,7 +3839,8 @@ reportEmi <- function(gdx, output = NULL, regionSubsetList = NULL,
38383839
"Emi|CO2|CDR|+|EW (Mt CO2/yr)",
38393840
"Emi|CO2|CDR|+|OAE (Mt CO2/yr)",
38403841
"Emi|CO2|CDR|+|Land-Use Change (Mt CO2/yr)",
3841-
"Emi|CO2|CDR|+|Materials (Mt CO2/yr)"
3842+
"Emi|CO2|CDR|+|Materials (Mt CO2/yr)",
3843+
"Carbon Management|Storage (Mt CO2/yr)"
38423844
) %>%
38433845
intersect(getNames(out)) # keep only variables that are in out
38443846

‎README.md‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# The REMIND R package (2nd generation)
22

3-
R package **remind2**, version **2.5.1**
3+
R package **remind2**, version **2.5.2**
44

55
[![R build status](https://github.com/pik-piam/remind2/workflows/check/badge.svg)](https://github.com/pik-piam/remind2/actions) [![codecov](https://codecov.io/gh/pik-piam/remind2/branch/master/graph/badge.svg)](https://app.codecov.io/gh/pik-piam/remind2) [![r-universe](https://pik-piam.r-universe.dev/badges/remind2)](https://pik-piam.r-universe.dev/builds)
66

@@ -37,8 +37,8 @@ The package comes with vignettes describing the basic functionality of the packa
3737

3838
```r
3939
vignette("compareScenariosRemind2") # compareScenarios in remind2
40-
vignette("remind_summary") # Adding plots to the REMIND_summary.pdf
4140
vignette("remind2_reporting") # remind2 reporting
41+
vignette("remind_summary") # Adding plots to the REMIND_summary.pdf
4242
```
4343

4444
## Questions / Problems
@@ -49,17 +49,17 @@ In case of questions / problems please contact Renato Rodrigues <renato.rodrigue
4949

5050
To cite package **remind2** in publications use:
5151

52-
Rodrigues R, Baumstark L, Benke F, Bantje D, Dietrich J, Dirnaichner A, Dorndorf T, Duerrwaechter J, Führlich P, Giannousakis A, Hasse R, Hilaire J, Klein D, Koch J, Kowalczyk K, Lécuyer F, Levesque A, Malik A, Merfort A, Merfort L, Morena-Leiva S, Odenweller A, Pehl M, Pietzcker R, Rauner S, Richters O, Rottoli M, Rüter T, Salzwedel R, Schötz C, Schreyer F, Siala K, Sörgel B, Spahr M, Strefler J, Verpoort P, Weigmann P (2026). "remind2: The REMIND R package (2nd generation)." Version: 2.5.1, <https://github.com/pik-piam/remind2>.
52+
Rodrigues R, Baumstark L, Benke F, Bantje D, Dietrich J, Dirnaichner A, Dorndorf T, Duerrwaechter J, Führlich P, Giannousakis A, Hasse R, Hilaire J, Klein D, Koch J, Kowalczyk K, Lécuyer F, Levesque A, Malik A, Merfort A, Merfort L, Morena-Leiva S, Odenweller A, Pehl M, Pietzcker R, Rauner S, Richters O, Rottoli M, Rüter T, Salzwedel R, Schötz C, Schreyer F, Siala K, Sörgel B, Spahr M, Strefler J, Verpoort P, Weigmann P (2026). "remind2: The REMIND R package (2nd generation)." Version: 2.5.2, <https://github.com/pik-piam/remind2>.
5353

5454
A BibTeX entry for LaTeX users is
5555

5656
```latex
5757
@Misc{,
5858
title = {remind2: The REMIND R package (2nd generation)},
5959
author = {Renato Rodrigues and Lavinia Baumstark and Falk Benke and David Bantje and Jan Philipp Dietrich and Alois Dirnaichner and Tabea Dorndorf and Jakob Duerrwaechter and Pascal Führlich and Anastasis Giannousakis and Robin Hasse and Jérome Hilaire and David Klein and Johannes Koch and Katarzyna Kowalczyk and Fabrice Lécuyer and Antoine Levesque and Aman Malik and Anne Merfort and Leon Merfort and Simón Morena-Leiva and Adrian Odenweller and Michaja Pehl and Robert Pietzcker and Sebastian Rauner and Oliver Richters and Marianna Rottoli and Tonn Rüter and Robert Salzwedel and Christof Schötz and Felix Schreyer and Kais Siala and Björn Sörgel and Mike Spahr and Jessica Strefler and Philipp Verpoort and Pascal Weigmann},
60-
date = {2026-07-28},
60+
date = {2026-08-10},
6161
year = {2026},
6262
url = {https://github.com/pik-piam/remind2},
63-
note = {Version: 2.5.1},
63+
note = {Version: 2.5.2},
6464
}
6565
```

‎man/calc_regionSubset_sums.Rd‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)