fix bug in reportEmployment

pik-piam · Sep 23, 2024 · 9e98c8b · 9e98c8b
1 parent 4819d9d
commit 9e98c8b
Showing 1 changed file with 24 additions and 24 deletions.
diff --git a/R/reportEmployment.R b/R/reportEmployment.R
@@ -41,30 +41,30 @@ reportEmployment <- function(gdx, improvements, multiplier, subtype, shareManf,
     reportTech <- reportTechnology(gdx)
     reportTech <- collapseNames(reportTech)
     var <- c(
-     "Tech|Electricity|Coal|Pulverised Coal w/o CC|Capital Costs (U$2017/kW)",
-     "Tech|Electricity|Gas|Combined Cycle w/o CC|Capital Costs (U$2017/kW)",
-     "Tech|Electricity|Hydro|Capital Costs (U$2017/kW)",
-     "Tech|Electricity|Nuclear|Capital Costs (U$2017/kW)",
-     "Tech|Electricity|Solar|PV|Capital Costs (U$2017/kW)",
-     "Tech|Electricity|Solar|CSP|Capital Costs (U$2017/kW)",
-     "Tech|Electricity|Wind|Onshore|Capital Costs (U$2017/kW)",
-     "Tech|Electricity|Wind|Offshore|Capital Costs (U$2017/kW)",
-     "Tech|Electricity|Biomass|Combined Heat and Power w/o CC|Capital Costs (U$2017/kW)",
-     "Tech|Electricity|Storage|Battery|For PV|Capital Costs (U$2017/kW)",
-     "Tech|Electricity|Oil|DOT|Capital Costs (U$2017/kW)",
-     "Tech|Electricity|Geothermal|Capital Costs (U$2017/kW)",
-     "Tech|Electricity|Coal|Pulverised Coal w/o CC|OM Cost|fixed (U$2017/kW/yr)",
-     "Tech|Electricity|Gas|Combined Cycle w/o CC|OM Cost|fixed (U$2017/kW/yr)",
-     "Tech|Electricity|Hydro|OM Cost|fixed (U$2017/kW/yr)",
-     "Tech|Electricity|Nuclear|OM Cost|fixed (U$2017/kW/yr)",
-     "Tech|Electricity|Solar|PV|OM Cost|fixed (U$2017/kW/yr)",
-     "Tech|Electricity|Solar|CSP|OM Cost|fixed (U$2017/kW/yr)",
-     "Tech|Electricity|Wind|Onshore|OM Cost|fixed (U$2017/kW/yr)",
-     "Tech|Electricity|Wind|Offshore|OM Cost|fixed (U$2017/kW/yr)",
-     "Tech|Electricity|Biomass|Combined Heat and Power w/o CC|OM Cost|fixed (U$2017/kW/yr)",
-     "Tech|Electricity|Oil|DOT|OM Cost|fixed (U$2017/kW/yr)",
-     "Tech|Electricity|Geothermal|OM Cost|fixed (U$2017/kW/yr)",
-     "Tech|Electricity|Storage|Battery|For PV|OM Cost|fixed (U$2017/kW/yr)",
+     "Tech|Electricity|Coal|Pulverised Coal w/o CC|Capital Costs (US$2017/kW)",
+     "Tech|Electricity|Gas|Combined Cycle w/o CC|Capital Costs (US$2017/kW)",
+     "Tech|Electricity|Hydro|Capital Costs (US$2017/kW)",
+     "Tech|Electricity|Nuclear|Capital Costs (US$2017/kW)",
+     "Tech|Electricity|Solar|PV|Capital Costs (US$2017/kW)",
+     "Tech|Electricity|Solar|CSP|Capital Costs (US$2017/kW)",
+     "Tech|Electricity|Wind|Onshore|Capital Costs (US$2017/kW)",
+     "Tech|Electricity|Wind|Offshore|Capital Costs (US$2017/kW)",
+     "Tech|Electricity|Biomass|Combined Heat and Power w/o CC|Capital Costs (US$2017/kW)",
+     "Tech|Electricity|Storage|Battery|For PV|Capital Costs (US$2017/kW)",
+     "Tech|Electricity|Oil|DOT|Capital Costs (US$2017/kW)",
+     "Tech|Electricity|Geothermal|Capital Costs (US$2017/kW)",
+     "Tech|Electricity|Coal|Pulverised Coal w/o CC|OM Cost|fixed (US$2017/kW/yr)",
+     "Tech|Electricity|Gas|Combined Cycle w/o CC|OM Cost|fixed (US$2017/kW/yr)",
+     "Tech|Electricity|Hydro|OM Cost|fixed (US$2017/kW/yr)",
+     "Tech|Electricity|Nuclear|OM Cost|fixed (US$2017/kW/yr)",
+     "Tech|Electricity|Solar|PV|OM Cost|fixed (US$2017/kW/yr)",
+     "Tech|Electricity|Solar|CSP|OM Cost|fixed (US$2017/kW/yr)",
+     "Tech|Electricity|Wind|Onshore|OM Cost|fixed (US$2017/kW/yr)",
+     "Tech|Electricity|Wind|Offshore|OM Cost|fixed (US$2017/kW/yr)",
+     "Tech|Electricity|Biomass|Combined Heat and Power w/o CC|OM Cost|fixed (US$2017/kW/yr)",
+     "Tech|Electricity|Oil|DOT|OM Cost|fixed (US$2017/kW/yr)",
+     "Tech|Electricity|Geothermal|OM Cost|fixed (US$2017/kW/yr)",
+     "Tech|Electricity|Storage|Battery|For PV|OM Cost|fixed (US$2017/kW/yr)",
      NULL
     )
     # only capital costs