Merge branch 'develop' into add-cost-constraint

Author: adfarth

CHANGELOG.md

@@ -25,6 +25,12 @@ Classify the change according to the following categories:
     ### Deprecated
     ### Removed
 
+ 
+## fix-pbi
+### Fixed
+- Fix implementation of production-based incentives
+### Added
+- Added the fields `production_incentive_per_kwh`, `production_incentive_max_benefit`, `production_incentive_years`, and `production_incentive_max_kw` to the **SteamTurbine** struct.
 
 ## v0.51.1
 ### Added
@@ -37,7 +43,7 @@ Classify the change according to the following categories:
 ### Fixed
 - Update the **REoptInputs** parameter **tech_renewable_energy_fraction** so that only electricity-producing and fuel-burning heating technologies are included (instead of all technologies).
 - Included the following in the `Financial.lifecycle_capital_costs` and `Financial.initial_capital_costs`: `m[Symbol("OffgridOtherCapexAfterDepr"*_n)] - m[Symbol("AvoidedCapexByGHP"*_n)] - m[Symbol("ResidualGHXCapCost"*_n)] - m[Symbol("AvoidedCapexByASHP"*_n)]`
- 
+
 ## v0.51.0
 ### Added 
 - Add the following inputs to account for the clean or renewable energy fraction of grid-purchased electricity: 

src/constraints/production_incentive_constraints.jl

@@ -2,7 +2,7 @@
 """
     add_prod_incent_vars_and_constraints(m, p)
 
-When pbi_techs is not empty this function is called to add the variables and constraints for modeling production based
+When techs.pbi is not empty this function is called to add the variables and constraints for modeling production based
 incentives.
 """
 function add_prod_incent_vars_and_constraints(m, p)

src/core/bau_inputs.jl

@@ -65,12 +65,12 @@ function BAUInputs(p::REoptInputs)
         cap_cost_slope[pvname] = 0.0
         tech_renewable_energy_fraction[pvname] = 1.0
         if pvname in p.techs.pbi
-            push!(pbi_techs, pvname)
+            push!(techs.pbi, pvname)
         end
         pv = get_pv_by_name(pvname, p.s.pvs)
-        fillin_techs_by_exportbin(techs_by_exportbin, pv, pv.name)
+        fillin_techs_by_exportbin(techs_by_exportbin, pv, pvname)
         if !pv.can_curtail
-            push!(techs.no_curtail, pv.name)
+            push!(techs.no_curtail, pvname)
         end
     end
 
@@ -84,7 +84,7 @@ function BAUInputs(p::REoptInputs)
         tech_renewable_energy_fraction["Generator"] = p.s.generator.fuel_renewable_energy_fraction
         fillin_techs_by_exportbin(techs_by_exportbin, p.s.generator, "Generator")
         if "Generator" in p.techs.pbi
-            push!(pbi_techs, "Generator")
+            push!(techs.pbi, "Generator")
         end
         if !p.s.generator.can_curtail
             push!(techs.no_curtail, "Generator")
@@ -201,7 +201,7 @@ function BAUInputs(p::REoptInputs)
         seg_min_size,
         seg_max_size,
         seg_yint,
-        p.pbi_pwf, 
+        p.pbi_pwf, # Same pbi dict as optimal case
         p.pbi_max_benefit, 
         p.pbi_max_kw, 
         p.pbi_benefit_per_kwh,

src/core/chp.jl

@@ -54,10 +54,10 @@ conflict_res_min_allowable_fraction_of_max = 0.25
     utility_ibi_max::Float64 = 1.0e10
     utility_rebate_per_kw::Float64 = 0.0
     utility_rebate_max::Float64 = 1.0e10
-    production_incentive_per_kwh::Float64 = 0.0
-    production_incentive_max_benefit::Float64 = 1.0e9
-    production_incentive_years::Int = 0
-    production_incentive_max_kw::Float64 = 1.0e9
+    production_incentive_per_kwh::Float64 = 0.0 # revenue from production incentive per kWh electricity produced, including curtailment
+    production_incentive_max_benefit::Float64 = 1.0e9 # maximum allowable annual revenue from production incentives
+    production_incentive_years::Int = 0 # number of year in which production incentives are paid
+    production_incentive_max_kw::Float64 = 1.0e9 # maximum allowable system size to receive production incentives
     can_net_meter::Bool = false
     can_wholesale::Bool = false
     can_export_beyond_nem_limit::Bool = false

src/core/generator.jl

@@ -33,10 +33,10 @@
     utility_ibi_max::Real = 1.0e10,
     utility_rebate_per_kw::Real = 0.0,
     utility_rebate_max::Real = 1.0e10,
-    production_incentive_per_kwh::Real = 0.0,
-    production_incentive_max_benefit::Real = 1.0e9,
-    production_incentive_years::Int = 0,
-    production_incentive_max_kw::Real = 1.0e9,
+    production_incentive_per_kwh::Float64 = 0.0 # revenue from production incentive per kWh electricity produced, including curtailment
+    production_incentive_max_benefit::Float64 = 1.0e9 # maximum allowable annual revenue from production incentives
+    production_incentive_years::Int = 0 # number of year in which production incentives are paid
+    production_incentive_max_kw::Float64 = 1.0e9 # maximum allowable system size to receive production incentives
     fuel_renewable_energy_fraction::Real = 0.0,
     emissions_factor_lb_CO2_per_gal::Real = 22.58, # CO2e
     emissions_factor_lb_NOx_per_gal::Real = 0.0775544,

src/core/pv.jl

@@ -35,10 +35,10 @@
     utility_ibi_max::Real = 1.0e10,
     utility_rebate_per_kw::Real = 0.0,
     utility_rebate_max::Real = 1.0e10,
-    production_incentive_per_kwh::Real = 0.0, # Applies to total estimated production, including curtailed energy.
-    production_incentive_max_benefit::Real = 1.0e9,
-    production_incentive_years::Int = 1,
-    production_incentive_max_kw::Real = 1.0e9,
+    production_incentive_per_kwh::Float64 = 0.0 # revenue from production incentive per kWh electricity produced, including curtailment
+    production_incentive_max_benefit::Float64 = 1.0e9 # maximum allowable annual revenue from production incentives
+    production_incentive_years::Int = 0 # number of year in which production incentives are paid
+    production_incentive_max_kw::Float64 = 1.0e9 # maximum allowable system size to receive production incentives
     can_net_meter::Bool = off_grid_flag ? false : true,
     can_wholesale::Bool = off_grid_flag ? false : true,
     can_export_beyond_nem_limit::Bool = off_grid_flag ? false : true,