CA's carbon cap fixed.

Author: PatyHidalgo

switch_model/policies/carbon_policies_CA.py

@@ -32,8 +32,8 @@ def define_components(model):
         rule=lambda m, period: sum(
             m.DispatchEmissions[g, t, f] * m.tp_weight_in_year[t]
             for (g, t, f) in m.GEN_TP_FUELS
-            if m.tp_period[t] == period and m.zone_dbid(m.gen_load_zone[g]) <= 21 and m.zone_dbid(m.gen_load_zone[g]) >= 10),
-        doc="The system's annual emissions, in metric tonnes of CO2 per year.")
+            if m.tp_period[t] == period and (m.gen_load_zone[g] == "CA_IID" or m.gen_load_zone[g] == "CA_LADWP" or m.gen_load_zone[g] == "CA_PGE_BAY" or m.gen_load_zone[g] == "CA_PGE_CEN" or m.gen_load_zone[g] == "CA_PGE_N" or m.gen_load_zone[g] == "CA_PGE_S"  or m.gen_load_zone[g] =="CA_SCE_CEN" or m.gen_load_zone[g] == "CA_SCE_S" or m.gen_load_zone[g] ==  "CA_SCE_SE" or m.gen_load_zone[g] == "CA_SCE_VLY" or m.gen_load_zone[g] =="CA_SDGE" or m.gen_load_zone[g] =="CA_SMUD")),
+        doc="CA's annual emissions, in metric tonnes of CO2 per year.")
     model.Enforce_Carbon_Cap = Constraint(model.PERIODS,
         rule=lambda m, p: m.AnnualEmissions[p] <= m.carbon_cap_tco2_per_yr[p],
         doc=("Enforces the carbon cap for generation-related emissions."))

switch_model/wecc/get_inputs.py

@@ -488,9 +488,10 @@ def main():
 
 	# future work: join with table with carbon_cost_dollar_per_tco2
 	print '  carbon_policies.tab...'
-	db_cursor.execute(("""select period, AVG(carbon_cap_tco2_per_yr) as carbon_cap_tco2_per_yr, '.' as  carbon_cost_dollar_per_tco2
+	db_cursor.execute(("""select period, AVG(carbon_cap_tco2_per_yr) as carbon_cap_tco2_per_yr, AVG(carbon_cap_tco2_per_yr_CA) as carbon_cap_tco2_per_yr_CA,
+						'.' as  carbon_cost_dollar_per_tco2
 					from 
-					(select carbon_cap_tco2_per_yr, year, 
+					(select carbon_cap_tco2_per_yr, carbon_cap_tco2_per_yr_CA, year, 
 							(case when 
 							year >= period.start_year 
 							and year <= period.start_year + length_yrs -1 then label else 0 end) as period
@@ -501,7 +502,7 @@ def main():
 					group by period
 					order by 1;
 					""").format(id1=study_timeframe_id, id2=carbon_cap_scenario_id))
-	write_tab('carbon_policies',['PERIOD','carbon_cap_tco2_per_yr','carbon_cost_dollar_per_tco2'],db_cursor)
+	write_tab('carbon_policies',['PERIOD','carbon_cap_tco2_per_yr','carbon_cap_tco2_per_yr_CA','carbon_cost_dollar_per_tco2'],db_cursor)
 
 	########################################################
 	# RPS