Skip to content

Commit

Permalink
Merge pull request #101 from johanneskoch94/main
Browse files Browse the repository at this point in the history
Transform 2005 unit warning to note
  • Loading branch information
johanneskoch94 authored Nov 13, 2024
2 parents 6454aa5 + fe3c0f5 commit b434165
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .buildlibrary
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ValidationKey: '8076120'
ValidationKey: '8096160'
AutocreateReadme: yes
AcceptedWarnings:
- 'Warning: package ''.*'' was built under R version'
Expand Down
2 changes: 1 addition & 1 deletion CITATION.cff
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ 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: 4.0.3
version: 4.0.4
date-released: '2024-11-13'
abstract: Create GDP and population scenarios This package constructs the GDP and
population scenarios used as drivers in both the REMIND and MAgPIE models.
Expand Down
2 changes: 1 addition & 1 deletion DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Package: mrdrivers
Type: Package
Title: Create GDP and Population Scenarios
Version: 4.0.3
Version: 4.0.4
Authors@R: c(person(given = "Johannes",
family = "Koch",
email = "[email protected]",
Expand Down
4 changes: 2 additions & 2 deletions R/calcGDP.R
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ calcGDP <- function(scenario = c("SSPs", "SDPs", "SSP2EU"),
}

if (!grepl(toolGetUnitDollar(returnOnlyBase = TRUE), unit)) {
warning(glue("Shifting to non-default base-year prices, using only the US deflator for all countries, and \\
message(glue("Shifting to non-default base-year prices, using only the US deflator for all countries, and \\
neglecting any changes in PPPs or MERs. Standard conversion would not guarantee that the \\
relationships between countries (an important charateristic of the scenario design) remain the \\
same."))
Expand Down Expand Up @@ -164,7 +164,7 @@ calcGDPpc <- function(scenario = c("SSPs", "SDPs", "SSP2EU"),
}

if (!grepl(toolGetUnitDollar(returnOnlyBase = TRUE), unit)) {
warning(glue("Shifting to non-default base-year prices, using only the US deflator for all countries, and \\
message(glue("Shifting to non-default base-year prices, using only the US deflator for all countries, and \\
neglecting any changes in PPPs or MERs. Standard conversion would not guarantee that the \\
relationships between countries (an important charateristic of the scenario design) remain the \\
same."))
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Create GDP and Population Scenarios

R package **mrdrivers**, version **4.0.3**
R package **mrdrivers**, version **4.0.4**

[![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)

Expand Down Expand Up @@ -100,7 +100,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 (2024). _mrdrivers: Create GDP and Population Scenarios_. R package version 4.0.3, <https://pik-piam.github.io/mrdrivershttps://github.com/pik-piam/mrdrivers>.
Koch J, Soergel B, Leip D, Benke F, Dietrich J (2024). _mrdrivers: Create GDP and Population Scenarios_. R package version 4.0.4, <https://pik-piam.github.io/mrdrivershttps://github.com/pik-piam/mrdrivers>.

A BibTeX entry for LaTeX users is

Expand All @@ -109,7 +109,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 = {2024},
note = {R package version 4.0.3},
note = {R package version 4.0.4},
url = {https://pik-piam.github.io/mrdrivers},
url = {https://github.com/pik-piam/mrdrivers},
}
Expand Down

0 comments on commit b434165

Please sign in to comment.