Add Grid Renewable Energy Fraction

CHANGELOG.md

@@ -26,6 +26,17 @@ Classify the change according to the following categories:
     ### Removed
 
 
+## gridRE-dev
+### Added 
+- Added ElectricUtility inputs to account for the clean or renewable energy fraction of grid-purchased electricity: 
+  - **cambium_cef_metric** to utilize clean energy data from NREL's Cambium database
+  - **clean_energy_fraction_series** to supply a custom grid clean energy scalar or series
+- Added Site input to allow user to choose whether to include grid RE in min max constraints: **include_grid_renewable_electricity_in_min_max_constraints** 
+### Changed
+- Changed name of ElectricUtility input **cambium_metric_col** to **cambium_co2_metric**, to distinguish between the CO2 and clean energy fraction metrics
+- Changed name of ElectricUtility **cambium_emissions_region** to **cambium_region**
+- Changed name of function (also available as endpoint through REopt API) from **cambium_emissions_profile** to **cambium_profile**
+
 ## Develop
 ### Added
 - Battery residual value if choosing replacement strategy for degradation

src/constraints/renewable_energy_constraints.jl

@@ -3,6 +3,7 @@
 	add_re_elec_constraints(m,p)
 
 Function to add minimum and/or maximum renewable electricity (as percentage of load) constraints, if specified by user.
+Includes renewable energy from grid if specified by user.
 
 !!! note
     When a single outage is modeled (using outage_start_time_step), renewable electricity calculations account for operations during this outage (e.g., the critical load is used during time_steps_without_grid)
@@ -11,14 +12,17 @@ Function to add minimum and/or maximum renewable electricity (as percentage of l
 #Renewable electricity constraints
 function add_re_elec_constraints(m,p)
 	if !isnothing(p.s.site.renewable_electricity_min_fraction)
-		@constraint(m, MinREElecCon, m[:AnnualREEleckWh] >= p.s.site.renewable_electricity_min_fraction*m[:AnnualEleckWh])
+		@constraint(m, MinREElecCon, m[:AnnualOnsiteREEleckWh] + 
+			include_grid_renewable_electricity_in_min_max_constraints * m[:AnnualGridREEleckWh]
+			>= p.s.site.renewable_electricity_min_fraction*m[:AnnualEleckWh])
 	end
 	if !isnothing(p.s.site.renewable_electricity_max_fraction)
-		@constraint(m, MaxREElecCon, m[:AnnualREEleckWh] <= p.s.site.renewable_electricity_max_fraction*m[:AnnualEleckWh])
+		@constraint(m, MaxREElecCon, m[:AnnualOnsiteREEleckWh] + 
+			include_grid_renewable_electricity_in_min_max_constraints * m[:AnnualGridREEleckWh]
+			<= p.s.site.renewable_electricity_max_fraction*m[:AnnualEleckWh])
 	end
 end
 
-
 """
 	add_re_elec_calcs(m,p)
 
@@ -50,7 +54,7 @@ function add_re_elec_calcs(m,p)
 	# 	))
 	# end
 
-	m[:AnnualREEleckWh] = @expression(m,p.hours_per_time_step * (
+	m[:AnnualOnsiteREEleckWh] = @expression(m, p.hours_per_time_step * (
 			sum(p.production_factor[t,ts] * p.levelization_factor[t] * m[:dvRatedProduction][t,ts] * 
 				p.tech_renewable_energy_fraction[t] for t in p.techs.elec, ts in p.time_steps
 			) - #total RE elec generation, excl steam turbine
@@ -69,11 +73,20 @@ function add_re_elec_calcs(m,p)
     # Note: if battery ends up being allowed to discharge to grid, need to make sure only RE that is being consumed onsite is counted so battery doesn't become a back door for RE to grid.
 	# Note: calculations currently do not ascribe any renewable energy attribute to grid-purchased electricity
 
+	m[:AnnualGridREEleckWh] = @expression(m, p.hours_per_time_step * (
+			sum(m[:dvGridPurchase][ts, tier] - m[:dvGridToStorage][b, ts] * 
+				(1 - p.s.storage.attr[b].charge_efficiency * p.s.storage.attr[b].discharge_efficiency) *
+				p.s.electric_utility.clean_energy_fraction_series[ts]
+				for ts in p.time_steps, tier in 1:p.s.electric_tariff.n_energy_tiers, b in p.s.storage.types.elec
+			) # clean energy from grid, minus battery efficiency losses
+		)
+	)
+
 	m[:AnnualEleckWh] = @expression(m,p.hours_per_time_step * (
 		 	# input electric load
 			sum(p.s.electric_load.loads_kw[ts] for ts in p.time_steps_with_grid) 
 			+ sum(p.s.electric_load.critical_loads_kw[ts] for ts in p.time_steps_without_grid)
-			# tech electric loads
+			# tech electric loads #TODO: Uncomment?
 			# + sum(m[:dvCoolingProduction][t,ts] for t in p.ElectricChillers, ts in p.time_steps )/ p.ElectricChillerCOP # electric chiller elec load
 			# + sum(m[:dvCoolingProduction][t,ts] for t in p.AbsorptionChillers, ts in p.time_steps )/ p.AbsorptionChillerElecCOP # absorportion chiller elec load
 			# + sum(p.GHPElectricConsumed[g,ts] * m[:binGHP][g] for g in p.GHPOptions, ts in p.time_steps) # GHP elec load