Skip to content

Commit

Permalink
Merge pull request #134 from johanneskoch94/update
Browse files Browse the repository at this point in the history
Update
  • Loading branch information
johanneskoch94 authored Nov 6, 2024
2 parents 46e2e7f + d9e27e4 commit e850ab9
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 14 deletions.
2 changes: 1 addition & 1 deletion .buildlibrary
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ValidationKey: '29237960'
ValidationKey: '29268213'
AcceptedWarnings:
- 'Warning: package ''.*'' was built under R version'
- 'Warning: namespace ''.*'' is not available and has been replaced'
Expand Down
4 changes: 2 additions & 2 deletions CITATION.cff
Original file line number Diff line number Diff line change
Expand Up @@ -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: 'mrcommons: MadRat commons Input Data Library'
version: 1.46.0
date-released: '2024-10-30'
version: 1.46.1
date-released: '2024-11-06'
abstract: Provides useful functions and a common structure to all the input data required
to run models like MAgPIE and REMIND of model input data.
authors:
Expand Down
6 changes: 3 additions & 3 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
Package: mrcommons
Type: Package
Title: MadRat commons Input Data Library
Version: 1.46.0
Date: 2024-10-30
Version: 1.46.1
Date: 2024-11-06
Authors@R: c(person("Benjamin Leon", "Bodirsky", email = "[email protected]", role = "aut"),
person("Kristine", "Karstens", role = "aut"),
person("Lavinia", "Baumstark", role = "aut"),
Expand Down Expand Up @@ -43,7 +43,7 @@ Depends:
GDPuc (>= 1.3.0),
magclass (>= 3.17),
madrat (>= 3.10.0),
mrdrivers (>= 1.0.0),
mrdrivers (>= 4.0.0),
mrfaocore (>= 1.0.0),
mrlandcore (>= 1.0.0),
mstools (>= 0.6.0)
Expand Down
3 changes: 1 addition & 2 deletions R/calcNutrientBudgetSewage.R
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,7 @@ calcNutrientBudgetSewage <- function(historic = TRUE) {
drecht <- drecht[, , ssps]
drecht <- collapseNames(time_interpolate(drecht, interpolated_year = findset("time"),
integrate_interpolated_years = FALSE, extrapolation_type = "constant"))
population <- collapseNames(calcOutput("Population", naming = "indicator.scenario",
PopulationFuture = "SSP", aggregate = FALSE)[, , ssps])
population <- calcOutput("Population", scenario = "SSPs", naming = "scenario", aggregate = FALSE)
}

detergent <- population * drecht[, , "det_p_pp"]
Expand Down
3 changes: 1 addition & 2 deletions R/convertGTAPv8v9.R
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,7 @@ convertGTAPv8v9 <- function(x, subtype) {
}

} else {
gdpMer <- calcOutput("GDPPast", GDPPast = "WDI-MI",
unit = "constant 2017 US$MER", aggregate = FALSE)
gdpMer <- calcOutput("GDPPast", unit = "constant 2017 US$MER", aggregate = FALSE)
gdpMer <- gdpMer[, getYears(x), , drop = TRUE]
w1 <- GDPuc::toolConvertGDP(gdpMer,
unit_in = "constant 2017 US$MER",
Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# MadRat commons Input Data Library

R package **mrcommons**, version **1.46.0**
R package **mrcommons**, version **1.46.1**

[![CRAN status](https://www.r-pkg.org/badges/version/mrcommons)](https://cran.r-project.org/package=mrcommons) [![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)

Expand Down Expand Up @@ -39,7 +39,7 @@ In case of questions / problems please contact Jan Philipp Dietrich <dietrich@pi

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

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, 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 (2024). _mrcommons: MadRat commons Input Data Library_. doi:10.5281/zenodo.3822009 <https://doi.org/10.5281/zenodo.3822009>, R package version 1.46.0, <https://github.com/pik-piam/mrcommons>.
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, 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 (2024). _mrcommons: MadRat commons Input Data Library_. doi:10.5281/zenodo.3822009 <https://doi.org/10.5281/zenodo.3822009>, R package version 1.46.1, <https://github.com/pik-piam/mrcommons>.

A BibTeX entry for LaTeX users is

Expand All @@ -48,8 +48,8 @@ A BibTeX entry for LaTeX users is
title = {mrcommons: MadRat commons Input Data Library},
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 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},
year = {2024},
note = {R package version 1.46.0},
url = {https://github.com/pik-piam/mrcommons},
note = {R package version 1.46.1},
doi = {10.5281/zenodo.3822009},
url = {https://github.com/pik-piam/mrcommons},
}
```

0 comments on commit e850ab9

Please sign in to comment.