Skip to content

Commit ac02a71

Browse files
authored
Merge pull request #795 from dklein-pik/master
Add air pollutant emissions from MAgPIE to files used for reporting
2 parents 8706009 + 3b43a70 commit ac02a71

25 files changed

Lines changed: 39 additions & 44 deletions

.buildlibrary

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ValidationKey: '55430140'
1+
ValidationKey: '55641600'
22
AcceptedWarnings:
33
- Invalid URL: .*
44
- 'Warning: package ''.*'' was built under R version'

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: 'mrremind: MadRat REMIND Input Data Package'
5-
version: 0.269.0
6-
date-released: '2026-06-02'
5+
version: 0.270.0
6+
date-released: '2026-06-04'
77
abstract: The mrremind packages contains data preprocessing for the REMIND model.
88
authors:
99
- family-names: Baumstark

DESCRIPTION

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
Type: Package
22
Package: mrremind
33
Title: MadRat REMIND Input Data Package
4-
Version: 0.269.0
5-
Date: 2026-06-02
4+
Version: 0.270.0
5+
Date: 2026-06-04
66
Authors@R: c(
77
person("Lavinia", "Baumstark", , "lavinia@pik-potsdam.de", role = c("aut", "cre")),
88
person("Renato", "Rodrigues", role = "aut"),

R/fullREMIND.R

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -205,6 +205,7 @@ fullREMIND <- function() {
205205
calcOutput("AirPollBaseyearEmi", data_source = "CEDS2025", outsectors = "GAINS", baseyear = 2020, CEDS.5yearmean = TRUE, round = 8, file = "emi2020_sectGAINS_sourceCEDS.cs4r")
206206
calcOutput("AirPollBaseyearEmi", data_source = "GAINS2025", outsectors = "GAINS", baseyear = 2020, CEDS.5yearmean = TRUE, round = 8, file = "emi2020_sectGAINS_sourceGAINS.cs4r")
207207
calcOutput("AirPollBaseyearEmi", data_source = "CEDS2025", outsectors = "INT", baseyear = 2020, CEDS.5yearmean = TRUE, round = 8, file = "emi2020_sectNOGAINS_sourceCEDS.cs4r")
208+
calcOutput("MAgPIEReport", subtype = "AirPollutants", round = 8, file = "AirPollutantsMAgPIE.cs4r")
208209

209210
#---------------no longer used in REMIND develop-----------------------------------------------------
210211

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# MadRat REMIND Input Data Package
22

3-
R package **mrremind**, version **0.269.0**
3+
R package **mrremind**, version **0.270.0**
44

55
[![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/builds)
66

@@ -39,17 +39,17 @@ In case of questions / problems please contact Lavinia Baumstark <lavinia@pik-po
3939

4040
To cite package **mrremind** in publications use:
4141

42-
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, Fuchs S, Mandaroux R, Koch J, Abrahao G, Dorndorf T (2026). "mrremind: MadRat REMIND Input Data Package." Version: 0.269.0, <https://github.com/pik-piam/mrremind>.
42+
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, Fuchs S, Mandaroux R, Koch J, Abrahao G, Dorndorf T (2026). "mrremind: MadRat REMIND Input Data Package." Version: 0.270.0, <https://github.com/pik-piam/mrremind>.
4343

4444
A BibTeX entry for LaTeX users is
4545

4646
```latex
4747
@Misc{,
4848
title = {mrremind: MadRat REMIND Input Data Package},
4949
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 and Sophie Fuchs and Rahel Mandaroux and Johannes Koch and Gabriel Abrahao and Tabea Dorndorf},
50-
date = {2026-06-02},
50+
date = {2026-06-04},
5151
year = {2026},
5252
url = {https://github.com/pik-piam/mrremind},
53-
note = {Version: 0.269.0},
53+
note = {Version: 0.270.0},
5454
}
5555
```

man/calcEuropeanEnergyDatasheets.Rd

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

man/calcExogDemScen.Rd

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

man/calcHRE.Rd

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

man/calcJRC_IDEES.Rd

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

man/calcSeProduction.Rd

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)