Merge branch 'master' of https://github.com/pik-piam/remind2 into fee…

…dstocks-final

.buildlibrary

@@ -1,4 +1,4 @@
-ValidationKey: '221236920'
+ValidationKey: '221622198'
 AcceptedWarnings:
 - 'Warning: package ''.*'' was built under R version'
 - 'Warning: namespace ''.*'' is not available and has been replaced'

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: 'remind2: The REMIND R package (2nd generation)'
-version: 1.124.0
-date-released: '2023-11-22'
+version: 1.125.1
+date-released: '2023-12-07'
 abstract: Contains the REMIND-specific routines for data and model output manipulation.
 authors:
 - family-names: Rodrigues

DESCRIPTION

@@ -1,8 +1,8 @@
 Type: Package
 Package: remind2
 Title: The REMIND R package (2nd generation)
-Version: 1.124.0
-Date: 2023-11-22
+Version: 1.125.1
+Date: 2023-12-07
 Authors@R: c(
     person("Renato", "Rodrigues", , "[email protected]", role = c("aut", "cre")),
     person("Lavinia", "Baumstark", role = "aut"),

R/colorScenConf.R

@@ -28,9 +28,9 @@ colorScenConf <- function(fileList = "", remindPath = ".", expanddata = FALSE) {
                             comment.char = "", na.strings = "", dec = "."))
   }
   if (expanddata) {
-    source(file.path(remindPath, "scripts", "start", "path_gdx_list.R"), local = TRUE)
-    # overwrite readCheckScenarioConfig
-    source(file.path(remindPath, "scripts", "start", "readCheckScenarioConfig.R"), local = TRUE)
+    message("Loading R helper functions from remindmodel.") # overwrite readCheckScenarioConfig
+    remindRscripts <- list.files(file.path(remindPath, "scripts", "start"), pattern = "\\.R$", full.names = TRUE)
+    invisible(sapply(remindRscripts, source, local = TRUE))
   }
   # enable script to match default data not in gms
   try(cfg$gms[["output"]] <- paste0(cfg$output, collapse = ","))

R/compareScenConf.R

@@ -70,10 +70,9 @@ compareScenConf <- function(fileList = NULL, remindPath = "/p/projects/rd3mod/gi
                             comment.char = "#", na.strings = "", dec = "."))
   }
   if (expanddata) {
-    message("Loading path_gdx_list and readCheckScenarioConfig")
-    source(file.path(remindPath, "scripts", "start", "path_gdx_list.R"), local = TRUE)
-    # overwrite readCheckScenarioConfig
-    source(file.path(remindPath, "scripts", "start", "readCheckScenarioConfig.R"), local = TRUE)
+    message("Loading R helper functions from remindmodel.") # overwrite readCheckScenarioConfig
+    remindRscripts <- list.files(file.path(remindPath, "scripts", "start"), pattern = "\\.R$", full.names = TRUE)
+    invisible(sapply(remindRscripts, source, local = TRUE))
   }
   settings1 <- readCheckScenarioConfig(fileList[[1]], remindPath = remindPath, fillWithDefault = TRUE, testmode = TRUE)
   settings2 <- readCheckScenarioConfig(fileList[[2]], remindPath = remindPath, fillWithDefault = TRUE, testmode = TRUE)

R/reportEnergyInvestment.R

@@ -51,8 +51,8 @@ reportEnergyInvestment <- function(gdx, regionSubsetList = NULL, t = c(seq(2005,
   pebio  <- readGDX(gdx, c("peBio", "pebio"), format = "first_found")
   ttot        <- readGDX(gdx, name = "ttot", format = "first_found")
   # read variables
-  v_directteinv <- readGDX(gdx, name = c("v_costInvTeDir", "v_directteinv"), field = "l", format = "first_found")
-  v_adjustteinv <- readGDX(gdx, name = c("v_costInvTeAdj", "v_adjustteinv"), field = "l", format = "first_found")
+  v_directteinv <- readGDX(gdx, name = c("v_costInvTeDir", "vm_costInvTeDir", "v_directteinv"), field = "l", format = "first_found")
+  v_adjustteinv <- readGDX(gdx, name = c("v_costInvTeAdj", "vm_costInvTeAdj", "v_adjustteinv"), field = "l", format = "first_found")
 
   # read parameters for additional calculations:
   pm_data   <- readGDX(gdx, c("pm_data"), format = "first_found")

R/reportLCOE.R

@@ -766,7 +766,7 @@ LCOE.avg <- NULL
   ### Read marginal adjustment costs ----
 
   # Read marginal adjustment cost calculated in core/postsolve.gms
-  # It is calculated as d(v_costInvTeAdj) / d(vm_deltaCap).
+  # It is calculated as d(vm_costInvTeAdj) / d(vm_deltaCap).
   # Unit: trUSD2005/ (TW(out)/yr).
   o_margAdjCostInv <- readGDX(gdx, "o_margAdjCostInv", restore_zeros = F)
 

R/reportPrices.R

@@ -786,6 +786,22 @@ reportPrices <- function(gdx, output=NULL, regionSubsetList=NULL,
                                 "Price|Carbon|AggregatedByGrossCO2 (US$2005/t CO2)")) # AggregatedByEmiGHGGross
   }
 
+  peFos <- readGDX(gdx, "peFos") # fossil PE carriers
+  p21_tau_Import <- readGDX(gdx, name = "p21_tau_Import", react = "silent")[, t, peFos]
+  tax_import_type_21 <- readGDX(gdx, name = "tax_import_type_21", react = "silent")
+  if (! is.null(p21_tau_Import) && ! is.null(tax_import_type_21)) {
+    pm_taxCO2eqMport <- 0 * pm_taxCO2eqSum
+    if ("CO2taxmarkup" %in% tax_import_type_21) {
+      pm_taxCO2eqMport <- pm_taxCO2eqMport + dimSums(p21_tau_Import[,,"CO2taxmarkup"], dim = 3.2) * pm_taxCO2eqSum
+    }
+    if ("avCO2taxmarkup" %in% tax_import_type_21) {
+      pm_taxCO2eqMport <- pm_taxCO2eqMport + dimSums(p21_tau_Import[,, "avCO2taxmarkup"], dim = 3.2) * pmax(pm_taxCO2eqSum, magpie_expand(colMeans(pm_taxCO2eqSum), pm_taxCO2eqSum))
+    }
+    pm_taxCO2eqMport <- pm_taxCO2eqMport * 1000 * 12/44
+    # use unweighted average, because weighing according to import volumes might lead to big jumps
+    out <- mbind(out, setNames(dimSums(pm_taxCO2eqMport, dim = 3.1)/length(peFos), "Price|Carbon|Imported (US$2005/t CO2)"))
+  }
+
   #
   CaptureBal_tmp <- new.magpie(getRegions(out), getYears(out), fill = NA)
   CaptureBal_tmp[,getYears(balcapture.m),] <- balcapture.m
@@ -886,6 +902,7 @@ reportPrices <- function(gdx, output=NULL, regionSubsetList=NULL,
     "Price|Carbon|Demand|Transport (US$2005/t CO2)"                   = "FE (EJ/yr)",
     "Price|Carbon|Demand|Industry (US$2005/t CO2)"                    = "FE (EJ/yr)",
     "Price|Carbon|Supply (US$2005/t CO2)"                             = "FE (EJ/yr)",
+    "Price|Carbon|Imported (US$2005/t CO2)"                           = "FE (EJ/yr)",
 
     "Price|Carbon|AggregatedByGrossCO2 (US$2005/t CO2)"               = "Emi|GHG|Gross|Energy (Mt CO2eq/yr)",
     "Price|Carbon|Captured|AggregatedByGrossCO2 (US$2005/t CO2)"      = "Emi|GHG|Gross|Energy (Mt CO2eq/yr)",
@@ -1015,7 +1032,9 @@ reportPrices <- function(gdx, output=NULL, regionSubsetList=NULL,
   map <- data.frame(region=getRegions(out),world="GLO",stringsAsFactors=FALSE)
   tmp_GLO <- new.magpie("GLO",getYears(out),getNames(out),fill=0)
 
-  for (i2e in names(int2ext)){
+  int2ext <- int2ext[intersect(names(int2ext), getNames(out))] # select only data that exists
+
+  for (i2e in names(int2ext)) {
     tmp_GLO["GLO",,i2e] <- speed_aggregate(out[,,i2e],map,weight=output[map$region,,int2ext[i2e]])
     for(t in getYears(out)){
       if(all(output[map$region,t,int2ext[i2e]]==0)){

README.md

@@ -1,6 +1,6 @@
 # The REMIND R package (2nd generation)
 
-R package **remind2**, version **1.124.0**
+R package **remind2**, version **1.125.1**
 
 [![CRAN status](https://www.r-pkg.org/badges/version/remind2)](https://cran.r-project.org/package=remind2)  [![R build status](https://github.com/pik-piam/remind2/workflows/check/badge.svg)](https://github.com/pik-piam/remind2/actions) [![codecov](https://codecov.io/gh/pik-piam/remind2/branch/master/graph/badge.svg)](https://app.codecov.io/gh/pik-piam/remind2) [![r-universe](https://pik-piam.r-universe.dev/badges/remind2)](https://pik-piam.r-universe.dev/builds)
 
@@ -49,7 +49,7 @@ In case of questions / problems please contact Renato Rodrigues <renato.rodrigue
 
 To cite package **remind2** in publications use:
 
-Rodrigues R, Baumstark L, Benke F, Dietrich J, Dirnaichner A, Führlich P, Giannousakis A, Hasse R, Hilaire J, Klein D, Koch J, Kowalczyk K, Levesque A, Malik A, Merfort A, Merfort L, Morena-Leiva S, Pehl M, Pietzcker R, Rauner S, Richters O, Rottoli M, Schötz C, Schreyer F, Siala K, Sörgel B, Spahr M, Strefler J, Verpoort P, Weigmann P (2023). _remind2: The REMIND R package (2nd generation)_. R package version 1.124.0, <https://github.com/pik-piam/remind2>.
+Rodrigues R, Baumstark L, Benke F, Dietrich J, Dirnaichner A, Führlich P, Giannousakis A, Hasse R, Hilaire J, Klein D, Koch J, Kowalczyk K, Levesque A, Malik A, Merfort A, Merfort L, Morena-Leiva S, Pehl M, Pietzcker R, Rauner S, Richters O, Rottoli M, Schötz C, Schreyer F, Siala K, Sörgel B, Spahr M, Strefler J, Verpoort P, Weigmann P (2023). _remind2: The REMIND R package (2nd generation)_. R package version 1.125.1, <URL: https://github.com/pik-piam/remind2>.
 
 A BibTeX entry for LaTeX users is
 
@@ -58,7 +58,7 @@ A BibTeX entry for LaTeX users is
   title = {remind2: The REMIND R package (2nd generation)},
   author = {Renato Rodrigues and Lavinia Baumstark and Falk Benke and Jan Philipp Dietrich and Alois Dirnaichner and Pascal Führlich and Anastasis Giannousakis and Robin Hasse and Jérome Hilaire and David Klein and Johannes Koch and Katarzyna Kowalczyk and Antoine Levesque and Aman Malik and Anne Merfort and Leon Merfort and Simón Morena-Leiva and Michaja Pehl and Robert Pietzcker and Sebastian Rauner and Oliver Richters and Marianna Rottoli and Christof Schötz and Felix Schreyer and Kais Siala and Björn Sörgel and Mike Spahr and Jessica Strefler and Philipp Verpoort and Pascal Weigmann},
   year = {2023},
-  note = {R package version 1.124.0},
+  note = {R package version 1.125.1},
   url = {https://github.com/pik-piam/remind2},
 }
 ```