explicitly monitor GDPuc::convertGDP for madrat caching

pik-piam · Oct 11, 2024 · 9378419 · 9378419
1 parent bde9e5b
commit 9378419
Show file tree

Hide file tree

Showing 20 changed files with 26 additions and 0 deletions.
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
@@ -111,6 +111,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
-Original file line number
+Diff line change
@@ Expand Up / @@ -8,6 +8,7 @@ @@
     #' }
     #'
     calcCostsWeathering <- function() {
+      "!# @monitor GDPuc::convertGDP"
       costs <- readSource("Strefler", subtype = "weathering_costs")
@@ Expand Down @@