pik-piam · 0UmfHxcvx5J7JoaOhFSs5mncnisTJJ6q · Oct 11, 2024 · Oct 11, 2024 · Oct 11, 2024
diff --git a/.buildlibrary b/.buildlibrary
@@ -1,4 +1,4 @@
-ValidationKey: '38731616'
+ValidationKey: '38753559'
 AcceptedWarnings:
 - 'Warning: package ''.*'' was built under R version'
 - 'Warning: namespace ''.*'' is not available and has been replaced'

diff --git a/CITATION.cff b/CITATION.cff
@@ -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: 'mrremind: MadRat REMIND Input Data Package'
-version: 0.193.6
-date-released: '2024-10-10'
+version: 0.193.7
+date-released: '2024-10-11'
 abstract: The mrremind packages contains data preprocessing for the REMIND model.
 authors:
 - family-names: Baumstark

diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,8 +1,8 @@
 Type: Package
 Package: mrremind
 Title: MadRat REMIND Input Data Package
-Version: 0.193.6
-Date: 2024-10-10
+Version: 0.193.7
+Date: 2024-10-11
 Authors@R: c(
     person("Lavinia", "Baumstark", , "[email protected]", role = c("aut", "cre")),
     person("Renato", "Rodrigues", role = "aut"),

diff --git a/R/EDGE-Industry.R b/R/EDGE-Industry.R
@@ -56,6 +56,8 @@ calcSteel_Projections <- function(subtype = 'production',
                                   save.plots = NULL,
                                   China_Production = NULL) {
 
+  "!# @monitor GDPuc::convertGDP"
+
   if (!is.null(save.plots)) {
     if (!all(isTRUE(file.info(save.plots)$isdir),
              448L == bitwAnd(file.info(save.plots)$mode, 448L))) {

diff --git a/R/UNIDO.R b/R/UNIDO.R
@@ -76,6 +76,8 @@
 #' @export
 readUNIDO <- function(subtype = 'INDSTAT2')
 {
+    "!# @monitor GDPuc::convertGDP"
+
     # define read functions for all subtypes ----
     switchboard <- list(
         `INDSTAT2` = function()
@@ -111,6 +113,8 @@ readUNIDO <- function(subtype = 'INDSTAT2')
 #' @export
 convertUNIDO <- function(x, subtype = 'INDSTAT2')
 {
+    "!# @monitor GDPuc::convertGDP"
+
     # define convert functions for all subtypes ----
     switchboard <- list(
         `INDSTAT2` = function(x)

diff --git a/R/calcBP.R b/R/calcBP.R
@@ -7,6 +7,8 @@
 #' @export
 #'
 calcBP <- function() {
+  "!# @monitor GDPuc::convertGDP"
+
   # read in emissions, capacity, generation, price ----
 
   emissions <- readSource("BP", subtype = "Emission")

diff --git a/R/calcBiomassPrices.R b/R/calcBiomassPrices.R
@@ -2,6 +2,7 @@
 #' @return Magpie object with two parameters determining linear biomass supply curve
 
 calcBiomassPrices <- function() {
+  "!# @monitor GDPuc::convertGDP"
 
   x <- readSource("MAgPIE", subtype = "supplyCurve_magpie_40")
 

diff --git a/R/calcCO2Prices.R b/R/calcCO2Prices.R
@@ -1,4 +1,5 @@
 calcCO2Prices <- function() {
+  "!# @monitor GDPuc::convertGDP"
 
   # read data
   x <- readSource("ExpertGuess", subtype = "co2prices")

diff --git a/R/calcCostsTradePeFinancial.R b/R/calcCostsTradePeFinancial.R
@@ -10,6 +10,8 @@
 #' }
 #'
 calcCostsTradePeFinancial <- function() {
+  "!# @monitor GDPuc::convertGDP"
+
   data <- readSource("ExpertGuess", subtype = "costsTradePeFinancial")
 
   data <- GDPuc::convertGDP(

diff --git a/R/calcCostsWeathering.R b/R/calcCostsWeathering.R
@@ -8,6 +8,7 @@
 #' }
 #'
 calcCostsWeathering <- function() {
+  "!# @monitor GDPuc::convertGDP"
 
   costs <- readSource("Strefler", subtype = "weathering_costs")
 

diff --git a/R/calcDiffInvestCosts.R b/R/calcDiffInvestCosts.R
@@ -9,6 +9,7 @@
 #' @author Aman Malik
 
 calcDiffInvestCosts <- function(subtype) {
+  "!# @monitor GDPuc::convertGDP"
 
   if (subtype == "Invest_Costs") {
 

diff --git a/R/calcEU_ReferenceScenario.R b/R/calcEU_ReferenceScenario.R
@@ -1,4 +1,5 @@
 calcEU_ReferenceScenario <- function() {
+  "!# @monitor GDPuc::convertGDP"
 
   euRef2016 <- readSource("EU_ReferenceScenario", subtype = "2016")
 

diff --git a/R/calcEconometricEmiParameter.R b/R/calcEconometricEmiParameter.R
@@ -14,6 +14,7 @@
 #' }
 
 calcEconometricEmiParameter <- function() {
+  "!# @monitor GDPuc::convertGDP"
 
   # calculate parameter p3
   edgar <- readSource("EDGAR", subtype = "co2") * 12 / 44 * 1e-6

diff --git a/R/calcINNOPATHS.R b/R/calcINNOPATHS.R
@@ -1,4 +1,5 @@
 calcINNOPATHS <- function() {
+  "!# @monitor GDPuc::convertGDP"
 
   x <- readSource("INNOPATHS")
 

diff --git a/R/calcIndustry_EEK.R b/R/calcIndustry_EEK.R
@@ -15,6 +15,7 @@
 
 #' @export
 calcIndustry_EEK <- function(kap) {
+  "!# @monitor GDPuc::convertGDP"
   # setup ----
   i <- log(4) / 50    # assuming 50 year lifetime of EEK
   base_year <- 2015

diff --git a/R/calcJRC_IDEES.R b/R/calcJRC_IDEES.R
@@ -16,6 +16,7 @@
 #' @importFrom stats aggregate
 
 calcJRC_IDEES <- function(subtype) {
+  "!# @monitor GDPuc::convertGDP"
 
   subtypes <- c("Industry", "Transport", "ResCom")
   if (!subtype %in% subtypes) {

diff --git a/R/calcTaxConvergence.R b/R/calcTaxConvergence.R
@@ -9,6 +9,7 @@
 #' }
 #'
 calcTaxConvergence <- function() {
+  "!# @monitor GDPuc::convertGDP"
 
   # Read tax convergence levels at specific year and final energy type
   taxConvergence <- readSource("REMIND_11Regi", subtype = "taxConvergence")

diff --git a/R/calcTaxLimits.R b/R/calcTaxLimits.R
@@ -17,6 +17,7 @@
 #' }
 #'
 calcTaxLimits <- function(subtype) {
+  "!# @monitor GDPuc::convertGDP"
 
   if (!(subtype %in% c("maxFeSubsidy", "maxPeSubsidy", "propFeSubsidy"))) {
     stop("the argument subtype must be in c('maxFeSubsidy','maxPeSubsidy', 'propFeSubsidy')")

diff --git a/R/calcTaxXport.R b/R/calcTaxXport.R
@@ -1,4 +1,5 @@
 calcTaxXport <- function() {
+  "!# @monitor GDPuc::convertGDP"
 
   x <- readSource("REMIND_11Regi", subtype = "xpres_tax")
 

diff --git a/R/convertDylanAusGasCost.R b/R/convertDylanAusGasCost.R
@@ -5,6 +5,7 @@
 #' @seealso \code{\link{readSource}}
 
 convertDylanAusGasCost <- function(x) {
+  "!# @monitor GDPuc::convertGDP"
 
   x %>%
     # Converting from constant 2015 Australian dollars to constant 2017 US$MER

diff --git a/R/convertGEA2012.R b/R/convertGEA2012.R
@@ -11,6 +11,8 @@
 #' }
 #'
 convertGEA2012 <- function(x, subtype) {
+  "!# @monitor GDPuc::convertGDP"
+
   if (subtype == "coal") {
 
     # Load mapping file for GEA regions to country level

diff --git a/R/convertIIASA_subs_taxes.R b/R/convertIIASA_subs_taxes.R
@@ -18,6 +18,7 @@
 #' }
 #'
 convertIIASA_subs_taxes <- function(x, subtype) {
+  "!# @monitor GDPuc::convertGDP"
 
   x <- toolCountryFill(x,
     verbosity = 2, fill = 0,

diff --git a/R/convertTransportSubisidies.R b/R/convertTransportSubisidies.R
@@ -9,6 +9,8 @@
 #' }
 #'
 convertTransportSubsidies <- function(x) {
+  "!# @monitor GDPuc::convertGDP"
+
   x <- toolCountryFill(x, fill = 0, verbosity = 2) # fill countries with no data
   x[is.na(x)] <- 0
 

diff --git a/R/readDylanAusGasCost.R b/R/readDylanAusGasCost.R
@@ -5,6 +5,8 @@
 #' @seealso \code{\link{readSource}}
 #'
 readDylanAusGasCost <- function() {
+  "!# @monitor GDPuc::convertGDP"
+
   # Dylan's gas extraction cost curve based on GSOO data on reserves and resources in 2015
   # (only for Eastern gas reserves, not Western Australia!!)
 

diff --git a/R/readGEA2012.R b/R/readGEA2012.R
@@ -13,6 +13,8 @@
 #' @importFrom dplyr relocate mutate
 
 readGEA2012 <- function(subtype) {
+  "!# @monitor GDPuc::convertGDP"
+
   EJ_2_TWyr <- 1 / 31.536
   ts1 <- 5
   ts2 <- 10

diff --git a/R/readIIASA_subs_taxes.R b/R/readIIASA_subs_taxes.R
@@ -17,6 +17,7 @@
 #' }
 #'
 readIIASA_subs_taxes <- function(subtype) {
+  "!# @monitor GDPuc::convertGDP"
 
   file <- "unlinked_countries_2017_03.xlsx"
 

diff --git a/R/readTransportSubsidies.R b/R/readTransportSubsidies.R
@@ -1,14 +1,16 @@
 #' Read transport subsidies data
-#' 
+#'
 #' Read-in transport subsidies csv files as magclass object
-#' 
+#'
 #' @return magpie object of the transport subsidies for BEV, FCEV and PHEV (euros/car) for private and legal entities
 #' @author Renato Rodrigues
 #' @seealso \code{\link{readSource}}
 #' @examples
 #' \dontrun{ a <- readSource(type="TransportSubsidies")
 #' }
 readTransportSubsidies <- function() {
+  "!# @monitor GDPuc::convertGDP"
+
   data <- read.csv("transportSubsidies.csv", sep = ";")
   as.magpie(data, datacol = 3)
 }
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # MadRat REMIND Input Data Package
 
-R package **mrremind**, version **0.193.6**
+R package **mrremind**, version **0.193.7**
 
 [![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/builds)
 
@@ -39,7 +39,7 @@ In case of questions / problems please contact Lavinia Baumstark <lavinia@pik-po
 
 To cite package **mrremind** in publications use:
 
-Baumstark L, Rodrigues R, Levesque A, Oeser J, Bertram C, Mouratiadou I, Malik A, Schreyer F, Soergel B, Rottoli M, Mishra A, Dirnaichner A, Pehl M, Giannousakis A, Klein D, Strefler J, Feldhaus L, Brecha R, Rauner S, Dietrich J, Bi S, Benke F, Weigmann P, Richters O, Hasse R, Fuchs S, Mandaroux R, Koch J (2024). _mrremind: MadRat REMIND Input Data Package_. R package version 0.193.6, <https://github.com/pik-piam/mrremind>.
+Baumstark L, Rodrigues R, Levesque A, Oeser J, Bertram C, Mouratiadou I, Malik A, Schreyer F, Soergel B, Rottoli M, Mishra A, Dirnaichner A, Pehl M, Giannousakis A, Klein D, Strefler J, Feldhaus L, Brecha R, Rauner S, Dietrich J, Bi S, Benke F, Weigmann P, Richters O, Hasse R, Fuchs S, Mandaroux R, Koch J (2024). _mrremind: MadRat REMIND Input Data Package_. R package version 0.193.7, <https://github.com/pik-piam/mrremind>.
 
 A BibTeX entry for LaTeX users is
 
@@ -48,7 +48,7 @@ A BibTeX entry for LaTeX users is
   title = {mrremind: MadRat REMIND Input Data Package},
   author = {Lavinia Baumstark and Renato Rodrigues and Antoine Levesque and Julian Oeser and Christoph Bertram and Ioanna Mouratiadou and Aman Malik and Felix Schreyer and Bjoern Soergel and Marianna Rottoli and Abhijeet Mishra and Alois Dirnaichner and Michaja Pehl and Anastasis Giannousakis and David Klein and Jessica Strefler and Lukas Feldhaus and Regina Brecha and Sebastian Rauner and Jan Philipp Dietrich and Stephen Bi and Falk Benke and Pascal Weigmann and Oliver Richters and Robin Hasse and Sophie Fuchs and Rahel Mandaroux and Johannes Koch},
   year = {2024},
-  note = {R package version 0.193.6},
+  note = {R package version 0.193.7},
   url = {https://github.com/pik-piam/mrremind},
 }
 ```