remove Price|Carbon|Imported|Coal, |Gas, |Oil

pik-piam · Dec 5, 2023 · f7a3f18 · f7a3f18
1 parent 86109c0
commit f7a3f18
Showing 1 changed file with 0 additions and 6 deletions.
diff --git a/R/reportPrices.R b/R/reportPrices.R
@@ -798,9 +798,6 @@ reportPrices <- function(gdx, output=NULL, regionSubsetList=NULL,
       pm_taxCO2eqMport <- pm_taxCO2eqMport + dimSums(p21_tau_Import[,, "avC02taxmarkup"], dim = 3.2) * pmax(pm_taxCO2eqSum, magpie_expand(colMeans(pm_taxCO2eqSum), pm_taxCO2eqSum))
     }
     pm_taxCO2eqMport <- pm_taxCO2eqMport * 1000 * 12/44
-    out <- mbind(out, setNames(pm_taxCO2eqMport[,, "pecoal"], "Price|Carbon|Imported|Coal (US$2005/t CO2)"))
-    out <- mbind(out, setNames(pm_taxCO2eqMport[,, "pegas" ], "Price|Carbon|Imported|Gas (US$2005/t CO2)"))
-    out <- mbind(out, setNames(pm_taxCO2eqMport[,, "peoil" ], "Price|Carbon|Imported|Oil (US$2005/t CO2)"))
     # use unweighted average, because weighing according to import volumes might lead to big jumps
     out <- mbind(out, setNames(dimSums(pm_taxCO2eqMport, dim = 3.1)/3, "Price|Carbon|Imported (US$2005/t CO2)"))
   }
@@ -906,9 +903,6 @@ reportPrices <- function(gdx, output=NULL, regionSubsetList=NULL,
     "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|Imported|Coal (US$2005/t CO2)"                      = "FE (EJ/yr)",
-    "Price|Carbon|Imported|Gas (US$2005/t CO2)"                       = "FE (EJ/yr)",
-    "Price|Carbon|Imported|Oil (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)",