bugfix in Penn World Table unit conversion

.Rbuildignore

@@ -17,3 +17,4 @@
 ^vignettes/.lintr$
 ^doc$
 ^Meta$
+^.*CITATION.cff$

.buildlibrary

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

CITATION.cff

@@ -0,0 +1,24 @@
+cff-version: 1.2.0
+message: If you use this software, please cite it using the metadata from this file.
+type: software
+title: 'mrdrivers: Create GDP and Population Scenarios'
+version: 1.1.1
+date-released: '2023-04-03'
+abstract: Create GDP and population scenarios This package constructs the GDP and
+  population scenarios used as drivers in both the REMIND and MAgPIE models.
+authors:
+- family-names: Koch
+  given-names: Johannes
+  email: [email protected]
+- family-names: Soergel
+  given-names: Bjoern
+- family-names: Leip
+  given-names: Deborra
+- family-names: Benke
+  given-names: Falk
+- family-names: Dietrich
+  given-names: Jan Philipp
+license: LGPL (>= 3)
+url: https://pik-piam.github.io/mrdrivers
+repository-code: https://github.com/pik-piam/mrdrivers
+

DESCRIPTION

@@ -1,7 +1,7 @@
 Package: mrdrivers
 Type: Package
 Title: Create GDP and Population Scenarios
-Version: 1.1.0
+Version: 1.1.1
 Authors@R: c(person(given = "Johannes", 
                     family = "Koch", 
                     email = "[email protected]", 
@@ -49,6 +49,6 @@ Suggests:
 Encoding: UTF-8
 Roxygen: list(markdown = TRUE)
 RoxygenNote: 7.2.3
-Date: 2023-03-16
+Date: 2023-04-03
 Config/testthat/edition: 3
 VignetteBuilder: knitr

R/calcGDPPast.R

@@ -141,7 +141,7 @@ fillWithWBFromJames2019 <- function(data, unit) {
 
 calcInternalGDPPastPWT <- function(unit) {
   data <- readSource("PWT")[, , "rgdpna"]
-  data <- GDPuc::convertGDP(data, "constant 2017 Int$PPP", unit, replace_NAs = c("linear", "no_conversion"))
+  data <- GDPuc::convertGDP(data, "constant 2005 Int$PPP", unit, replace_NAs = c("linear", "no_conversion"))
   getNames(data) <- glue("gdp in {unit}")
-  list(x = data, weight = NULL, unit = "constant 2005 Int$PPP", description = "GDP from PWT")
+  list(x = data, weight = NULL, unit = unit, description = "GDP from PWT")
 }

README.md

@@ -1,6 +1,6 @@
 # Create GDP and Population Scenarios
 
-R package **mrdrivers**, version **1.1.0**
+R package **mrdrivers**, version **1.1.1**
 
 [![CRAN status](https://www.r-pkg.org/badges/version/mrdrivers)](https://cran.r-project.org/package=mrdrivers)  [![R build status](https://pik-piam.github.io/mrdrivers/workflows/check/badge.svg)](https://pik-piam.github.io/mrdrivers/actions) [![codecov](https://codecov.io/gh/mrdrivers/branch/master/graph/badge.svg)](https://app.codecov.io/gh/mrdrivers) [![r-universe](https://pik-piam.r-universe.dev/badges/mrdrivers)](https://pik-piam.r-universe.dev/builds)
 
@@ -103,7 +103,7 @@ In case of questions / problems please contact Johannes Koch <jokoch@pik-potsdam
 
 To cite package **mrdrivers** in publications use:
 
-Koch J, Soergel B, Leip D, Benke F, Dietrich J (2023). _mrdrivers: Create GDP and Population Scenarios_. R package version 1.1.0, <URL: https://pik-piam.github.io/mrdrivershttps://github.com/pik-piam/mrdrivers>.
+Koch J, Soergel B, Leip D, Benke F, Dietrich J (2023). _mrdrivers: Create GDP and Population Scenarios_. R package version 1.1.1, <URL: https://pik-piam.github.io/mrdrivershttps://github.com/pik-piam/mrdrivers>.
 
 A BibTeX entry for LaTeX users is
 
@@ -112,7 +112,7 @@ A BibTeX entry for LaTeX users is
   title = {mrdrivers: Create GDP and Population Scenarios},
   author = {Johannes Koch and Bjoern Soergel and Deborra Leip and Falk Benke and Jan Philipp Dietrich},
   year = {2023},
-  note = {R package version 1.1.0},
+  note = {R package version 1.1.1},
   url = {https://pik-piam.github.io/mrdrivers},
   url = {https://github.com/pik-piam/mrdrivers},
 }