Skip to content

Commit 431332c

Browse files
dklein-pikdklein-pik
authored
Merge pull request #197 from dklein-pik/master
Update MAgPIE variable names
2 parents f8a8e04 + 224060d commit 431332c

6 files changed

Lines changed: 32 additions & 32 deletions

File tree

‎.buildlibrary‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ValidationKey: '34827520'
1+
ValidationKey: '34849819'
22
AcceptedWarnings:
33
- 'Warning: package ''.*'' was built under R version'
44
- 'Warning: namespace ''.*'' is not available and has been replaced'

‎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: 'mrcommons: MadRat commons Input Data Library'
5-
version: 1.69.0
6-
date-released: '2026-06-04'
5+
version: 1.69.1
6+
date-released: '2026-06-05'
77
abstract: Provides useful functions and a common structure to all the input data required
88
to run models like MAgPIE and REMIND of model input data.
99
authors:

‎DESCRIPTION‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
Type: Package
22
Package: mrcommons
33
Title: MadRat commons Input Data Library
4-
Version: 1.69.0
5-
Date: 2026-06-04
4+
Version: 1.69.1
5+
Date: 2026-06-05
66
Authors@R: c(
77
person("Benjamin Leon", "Bodirsky", , "bodirsky@pik-potsdam.de", role = "aut"),
88
person("Kristine", "Karstens", role = "aut"),

‎R/calcMAgPIEReport.R‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ calcMAgPIEReport <- function(subtype) {
55

66
if (subtype == "CostTotal") {
77
# with transformation factor from 10E6 US$2017 to 10E12 US$2017
8-
x <- x[, , "Costs Without Incentives (million US$2017/yr)"] / 1000 / 1000
8+
x <- x[, , "Costs Accounting|Costs without incentives (million US$2017/yr)"] / 1000 / 1000
99
d <- "Total Landuse Costs from MAgPIE excluding emission costs"
1010
u <- "trillion US$2017/yr"
1111

@@ -47,27 +47,27 @@ calcMAgPIEReport <- function(subtype) {
4747
} else if (subtype == "co2") {
4848
mapping <- inline.data.frame(
4949
"magpieNames;remindNames",
50-
"Emissions|CO2|Land RAW|+|Land-use Change (Mt CO2/yr);co2luc",
51-
"Emissions|CO2|Land RAW|Land-use Change|+|Deforestation (Mt CO2/yr);co2lucPos",
52-
"Emissions|CO2|Land RAW|Land-use Change|+|Forest degradation (Mt CO2/yr);co2lucPos",
53-
"Emissions|CO2|Land RAW|Land-use Change|+|Other land conversion (Mt CO2/yr);co2lucPos",
54-
"Emissions|CO2|Land RAW|Land-use Change|+|Wood Harvest (Mt CO2/yr);co2lucPos",
55-
"Emissions|CO2|Land RAW|Land-use Change|Peatland|+|Positive (Mt CO2/yr);co2lucPos",
56-
"Emissions|CO2|Land RAW|Land-use Change|Peatland|+|Negative (Mt CO2/yr);co2lucNegIntentPeat",
57-
"Emissions|CO2|Land RAW|Land-use Change|Regrowth|+|CO2-price AR (Mt CO2/yr);co2lucNegIntentAR",
58-
"Emissions|CO2|Land RAW|Land-use Change|Regrowth|+|NPI_NDC AR (Mt CO2/yr);co2lucNegIntentAR",
59-
"Emissions|CO2|Land RAW|Land-use Change|Regrowth|+|Cropland Tree Cover (Mt CO2/yr);co2lucNegIntentAgroforestry",
60-
"Emissions|CO2|Land RAW|Land-use Change|Regrowth|+|Other Land (Mt CO2/yr);co2lucNegUnintent",
61-
"Emissions|CO2|Land RAW|Land-use Change|Regrowth|+|Secondary Forest (Mt CO2/yr);co2lucNegUnintent",
62-
"Emissions|CO2|Land RAW|Land-use Change|Regrowth|+|Timber Plantations (Mt CO2/yr);co2lucNegUnintent",
63-
"Emissions|CO2|Land RAW|Land-use Change|Residual|+|Positive (Mt CO2/yr);co2lucPos",
64-
"Emissions|CO2|Land RAW|Land-use Change|Residual|+|Negative (Mt CO2/yr);co2lucNegUnintent",
65-
"Emissions|CO2|Land RAW|Land-use Change|Soil|++|Emissions (Mt CO2/yr);co2lucPos",
66-
"Emissions|CO2|Land RAW|Land-use Change|Soil|Cropland management|+|Withdrawals (Mt CO2/yr);co2lucNegUnintent",
67-
"Emissions|CO2|Land RAW|Land-use Change|Soil|Land Conversion|+|Withdrawals (Mt CO2/yr);co2lucNegUnintent",
68-
"Emissions|CO2|Land RAW|Land-use Change|Soil|Soil Carbon Management|+|Withdrawals (Mt CO2/yr);co2lucNegIntentSCM",
69-
"Emissions|CO2|Land RAW|Land-use Change|Timber|+|Storage in HWP (Mt CO2/yr);co2lucNegIntentTimber",
70-
"Emissions|CO2|Land RAW|Land-use Change|Timber|+|Release from HWP (Mt CO2/yr);co2lucPos"
50+
"Emissions|CO2|Land|+|Land-use Change (Mt CO2/yr);co2luc",
51+
"Emissions|CO2|Land|Land-use Change|+|Deforestation (Mt CO2/yr);co2lucPos",
52+
"Emissions|CO2|Land|Land-use Change|+|Forest degradation (Mt CO2/yr);co2lucPos",
53+
"Emissions|CO2|Land|Land-use Change|+|Other land conversion (Mt CO2/yr);co2lucPos",
54+
"Emissions|CO2|Land|Land-use Change|+|Wood Harvest (Mt CO2/yr);co2lucPos",
55+
"Emissions|CO2|Land|Land-use Change|Peatland|+|Positive (Mt CO2/yr);co2lucPos",
56+
"Emissions|CO2|Land|Land-use Change|Peatland|+|Negative (Mt CO2/yr);co2lucNegIntentPeat",
57+
"Emissions|CO2|Land|Land-use Change|Regrowth|+|CO2-price AR (Mt CO2/yr);co2lucNegIntentAR",
58+
"Emissions|CO2|Land|Land-use Change|Regrowth|+|NPI_NDC AR (Mt CO2/yr);co2lucNegIntentAR",
59+
"Emissions|CO2|Land|Land-use Change|Regrowth|+|Cropland Tree Cover (Mt CO2/yr);co2lucNegIntentAgroforestry",
60+
"Emissions|CO2|Land|Land-use Change|Regrowth|+|Other Land (Mt CO2/yr);co2lucNegUnintent",
61+
"Emissions|CO2|Land|Land-use Change|Regrowth|+|Secondary Forest (Mt CO2/yr);co2lucNegUnintent",
62+
"Emissions|CO2|Land|Land-use Change|Regrowth|+|Timber Plantations (Mt CO2/yr);co2lucNegUnintent",
63+
"Emissions|CO2|Land|Land-use Change|Residual|+|Positive (Mt CO2/yr);co2lucPos",
64+
"Emissions|CO2|Land|Land-use Change|Residual|+|Negative (Mt CO2/yr);co2lucNegUnintent",
65+
"Emissions|CO2|Land|Land-use Change|Soil|++|Emissions (Mt CO2/yr);co2lucPos",
66+
"Emissions|CO2|Land|Land-use Change|Soil|Cropland management|+|Withdrawals (Mt CO2/yr);co2lucNegUnintent",
67+
"Emissions|CO2|Land|Land-use Change|Soil|Land Conversion|+|Withdrawals (Mt CO2/yr);co2lucNegUnintent",
68+
"Emissions|CO2|Land|Land-use Change|Soil|Soil Carbon Management|+|Withdrawals (Mt CO2/yr);co2lucNegIntentSCM",
69+
"Emissions|CO2|Land|Land-use Change|Timber|+|Storage in HWP (Mt CO2/yr);co2lucNegIntentTimber",
70+
"Emissions|CO2|Land|Land-use Change|Timber|+|Release from HWP (Mt CO2/yr);co2lucPos"
7171
)
7272

7373
# aggregate (sum over) MAgPIE variables to REMIND entys

‎R/calcMacBaseLandUse.R‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ calcMacBaseLandUse <- function(subtype) {
3434
y <- add_dimension(y,
3535
dim = 3.3,
3636
add = "rcp",
37-
nm = c("rcp20", "rcp26", "rcp45", "none"))
37+
nm = c("rcp20", "rcp26", "rcp37", "rcp45", "none"))
3838

3939
if (subtype == "MAgPIE") {
4040
# Read emission baselines for MAC in REMIND. These data have been calcualted by external scripts, that calcualte

‎README.md‎

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

3-
R package **mrcommons**, version **1.69.0**
3+
R package **mrcommons**, version **1.69.1**
44

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

@@ -40,7 +40,7 @@ In case of questions / problems please contact Jan Philipp Dietrich <dietrich@pi
4040

4141
To cite package **mrcommons** in publications use:
4242

43-
Bodirsky B, Karstens K, Baumstark L, Weindl I, Wang X, Mishra A, Wirth S, Stevanovic M, Steinmetz N, Kreidenweis U, Rodrigues R, Popov R, Humpenoeder F, Giannousakis A, Levesque A, Klein D, Araujo E, Bleidorn E, Beier F, Oeser J, Pehl M, Leip D, Crawford M, Molina Bacca E, von Jeetze P, Martinelli E, Schreyer F, Soergel B, Sauer P, Hötten D, Hasse R, Abrahão G, Weigmann P, Dietrich J (2026). "mrcommons: MadRat commons Input Data Library." doi:10.5281/zenodo.3822009 <https://doi.org/10.5281/zenodo.3822009>, Version: 1.69.0, <https://github.com/pik-piam/mrcommons>.
43+
Bodirsky B, Karstens K, Baumstark L, Weindl I, Wang X, Mishra A, Wirth S, Stevanovic M, Steinmetz N, Kreidenweis U, Rodrigues R, Popov R, Humpenoeder F, Giannousakis A, Levesque A, Klein D, Araujo E, Bleidorn E, Beier F, Oeser J, Pehl M, Leip D, Crawford M, Molina Bacca E, von Jeetze P, Martinelli E, Schreyer F, Soergel B, Sauer P, Hötten D, Hasse R, Abrahão G, Weigmann P, Dietrich J (2026). "mrcommons: MadRat commons Input Data Library." doi:10.5281/zenodo.3822009 <https://doi.org/10.5281/zenodo.3822009>, Version: 1.69.1, <https://github.com/pik-piam/mrcommons>.
4444

4545
A BibTeX entry for LaTeX users is
4646

@@ -49,9 +49,9 @@ A BibTeX entry for LaTeX users is
4949
title = {mrcommons: MadRat commons Input Data Library},
5050
author = {Benjamin Leon Bodirsky and Kristine Karstens and Lavinia Baumstark and Isabelle Weindl and Xiaoxi Wang and Abhijeet Mishra and Stephen Wirth and Mishko Stevanovic and Nele Steinmetz and Ulrich Kreidenweis and Renato Rodrigues and Roman Popov and Florian Humpenoeder and Anastasis Giannousakis and Antoine Levesque and David Klein and Ewerton Araujo and Eva Bleidorn and Felicitas Beier and Julian Oeser and Michaja Pehl and Debbora Leip and Michael Crawford and Edna {Molina Bacca} and Patrick {von Jeetze} and Eleonora Martinelli and Felix Schreyer and Bjoern Soergel and Pascal Sauer and David Hötten and Robin Hasse and Gabriel Abrahão and Pascal Weigmann and Jan Philipp Dietrich},
5151
doi = {10.5281/zenodo.3822009},
52-
date = {2026-06-04},
52+
date = {2026-06-05},
5353
year = {2026},
5454
url = {https://github.com/pik-piam/mrcommons},
55-
note = {Version: 1.69.0},
55+
note = {Version: 1.69.1},
5656
}
5757
```

0 commit comments

Comments
 (0)