diff --git a/.buildlibrary b/.buildlibrary index aa5f03c9..834f9fa7 100644 --- a/.buildlibrary +++ b/.buildlibrary @@ -1,4 +1,4 @@ -ValidationKey: '27181322' +ValidationKey: '27302340' AcceptedWarnings: - 'Warning: package ''.*'' was built under R version' - 'Warning: namespace ''.*'' is not available and has been replaced' diff --git a/.zenodo.json b/.zenodo.json index 27669311..7903a366 100644 --- a/.zenodo.json +++ b/.zenodo.json @@ -1,6 +1,6 @@ { "title": "mrremind: MadRat REMIND Input Data Package", - "version": "0.141.4", + "version": "0.142.0", "description": "
The mrremind packages contains data preprocessing for the\n REMIND model.<\/p>",
"creators": [
{
diff --git a/DESCRIPTION b/DESCRIPTION
index d59fb8ce..003634f2 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -1,8 +1,8 @@
Type: Package
Package: mrremind
Title: MadRat REMIND Input Data Package
-Version: 0.141.4
-Date: 2022-08-19
+Version: 0.142.0
+Date: 2022-08-23
Authors@R: c(
person("Lavinia", "Baumstark", , "lavinia@pik-potsdam.de", role = c("aut", "cre")),
person("Renato", "Rodrigues", role = "aut"),
diff --git a/NAMESPACE b/NAMESPACE
index b537ed4e..444d6b9e 100644
--- a/NAMESPACE
+++ b/NAMESPACE
@@ -2,6 +2,7 @@
export(calcAGEB)
export(calcBP)
+export(calcCement)
export(calcCementShare)
export(calcChemicalFeedstocksShare)
export(calcClinker_to_cement_ratio)
diff --git a/R/calcCement.R b/R/calcCement.R
new file mode 100644
index 00000000..cf8914f1
--- /dev/null
+++ b/R/calcCement.R
@@ -0,0 +1,61 @@
+#' Calculate Historic Cement Production
+#'
+#' Combines cement production data from [`readvanRuijven2016()`] and
+#' [`readUSGS(cement)`][readUSGS] into a single data set, using USGS data from
+#' 2005 on.
+#'
+#' @md
+#' @return A list with a [`magpie`][magclass::magclass] object `x` with
+#' country-level cement production in tonnes, `weight`, `unit`, `description`,
+#' and `min` fields.
+#'
+#' @author Michaja Pehl
+#'
+#' @seealso [calcOutput]
+#'
+#' @importFrom assertr verify
+#' @importFrom dplyr anti_join arrange bind_rows filter group_by select ungroup
+#' @importFrom magclass as.magpie
+#' @importFrom magrittr %>%
+#' @importFrom quitte madrat_mule
+#' @importFrom rlang .data syms
+
+#' @export
+calcCement <- function() {
+ transition_year <- 2005
+ . <- NULL
+
+ d_vanRuijvan2016 <- readSource('vanRuijven2016', convert = FALSE) %>%
+ madrat_mule()
+
+ d_USGS_cement <- readSource('USGS', 'cement', convert = FALSE) %>%
+ madrat_mule() %>%
+ group_by(!!!syms(c('iso3c', 'year'))) %>%
+ filter(max(.data$reporting.year) == .data$reporting.year) %>%
+ ungroup() %>%
+ select(-'reporting.year')
+
+ d <- d_USGS_cement %>%
+ filter(transition_year <= .data$year)
+
+ d <- bind_rows(
+ d,
+
+ d_vanRuijvan2016 %>%
+ anti_join(d, c('iso3c', 'year'))
+ ) %>%
+ group_by(!!!syms(c('iso3c', 'year'))) %>%
+ mutate(count = n()) %>%
+ verify(1 == .data$count,
+ description = 'only one data point per country/year') %>%
+ select(-'count') %>%
+ arrange(!!!syms(c('iso3c', 'year')))
+
+ return(list(x = d %>%
+ as.magpie(spatial = 1, temporal = 2, data = ncol(.)) %>%
+ toolCountryFill(verbosity = 2),
+ weight = NULL,
+ description = 'historical cement production',
+ unit = 'tonnes of cement',
+ min = 0))
+}
diff --git a/README.md b/README.md
index f7fcb036..ec5b6e96 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
# MadRat REMIND Input Data Package
-R package **mrremind**, version **0.141.4**
+R package **mrremind**, version **0.142.0**
[![CRAN status](https://www.r-pkg.org/badges/version/mrremind)](https://cran.r-project.org/package=mrremind) [![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/ui#builds)
@@ -39,7 +39,7 @@ In case of questions / problems please contact Lavinia Baumstark