change variable name

CHANGELOG.md

@@ -31,7 +31,7 @@ Classify the change according to the following categories:
 - Added the following inputs to account for the clean or renewable energy fraction of grid-purchased electricity: 
   - ElectricUtility **cambium_cef_metric** to utilize clean energy data from NREL's Cambium database
   - **renewable_energy_fraction_series** to supply a custom grid clean or renewable energy scalar or series
-  - Site **include_grid_renewable_electricity_in_min_max_constraints** - to allow user to choose whether to include grid RE in min max constraints
+  - Site **include_grid_renewable_fraction_in_RE_constraints** - to allow user to choose whether to include grid RE in min max constraints
 - Added the following outputs: 
   - ElectricUtility **annual_renewable_electricity_supplied_kwh**
   - Site **onsite_and_grid_renewable_electricity_fraction_of_elec_load**

src/constraints/renewable_energy_constraints.jl

@@ -13,12 +13,12 @@ Includes renewable energy from grid if specified by user.
 function add_re_elec_constraints(m,p)
 	if !isnothing(p.s.site.renewable_electricity_min_fraction)
 		@constraint(m, MinREElecCon, m[:AnnualOnsiteREEleckWh] + 
-			p.s.site.include_grid_renewable_electricity_in_min_max_constraints * m[:AnnualGridREEleckWh]
+			p.s.site.include_grid_renewable_fraction_in_RE_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[:AnnualOnsiteREEleckWh] + 
-			p.s.site.include_grid_renewable_electricity_in_min_max_constraints * m[:AnnualGridREEleckWh]
+			p.s.site.include_grid_renewable_fraction_in_RE_constraints * m[:AnnualGridREEleckWh]
 			<= p.s.site.renewable_electricity_max_fraction*m[:AnnualEleckWh])
 	end
 end

src/core/site.jl

@@ -17,7 +17,7 @@ Inputs related to the physical location:
     bau_grid_emissions_lb_CO2_per_year::Union{Float64, Nothing} = nothing,
     renewable_electricity_min_fraction::Real = 0.0,
     renewable_electricity_max_fraction::Union{Float64, Nothing} = nothing,
-    include_grid_renewable_electricity_in_min_max_constraints::Bool = false,
+    include_grid_renewable_fraction_in_RE_constraints::Bool = false,
     include_exported_elec_emissions_in_total::Bool = true,
     include_exported_renewable_electricity_in_total::Bool = true,
     outdoor_air_temperature_degF::Union{Nothing, Array{<:Real,1}} = nothing,
@@ -38,7 +38,7 @@ mutable struct Site
     bau_grid_emissions_lb_CO2_per_year
     renewable_electricity_min_fraction
     renewable_electricity_max_fraction
-    include_grid_renewable_electricity_in_min_max_constraints
+    include_grid_renewable_fraction_in_RE_constraints
     include_exported_elec_emissions_in_total
     include_exported_renewable_electricity_in_total
     outdoor_air_temperature_degF
@@ -56,7 +56,7 @@ mutable struct Site
         bau_grid_emissions_lb_CO2_per_year::Union{Float64, Nothing} = nothing,
         renewable_electricity_min_fraction::Union{Float64, Nothing} = nothing,
         renewable_electricity_max_fraction::Union{Float64, Nothing} = nothing,
-        include_grid_renewable_electricity_in_min_max_constraints::Bool = false,
+        include_grid_renewable_fraction_in_RE_constraints::Bool = false,
         include_exported_elec_emissions_in_total::Bool = true,
         include_exported_renewable_electricity_in_total::Bool = true,
         outdoor_air_temperature_degF::Union{Nothing, Array{<:Real,1}} = nothing,
@@ -82,7 +82,7 @@ mutable struct Site
             mg_tech_sizes_equal_grid_sizes, CO2_emissions_reduction_min_fraction, 
             CO2_emissions_reduction_max_fraction, bau_emissions_lb_CO2_per_year,
             bau_grid_emissions_lb_CO2_per_year, renewable_electricity_min_fraction,
-            renewable_electricity_max_fraction, include_grid_renewable_electricity_in_min_max_constraints, include_exported_elec_emissions_in_total,
+            renewable_electricity_max_fraction, include_grid_renewable_fraction_in_RE_constraints, include_exported_elec_emissions_in_total,
             include_exported_renewable_electricity_in_total, outdoor_air_temperature_degF, node)
     end
 end

src/results/electric_utility.jl

@@ -75,7 +75,7 @@ function add_electric_utility_results(m::JuMP.AbstractModel, p::AbstractInputs,
         r["distance_to_avert_emissions_region_meters"] = p.s.electric_utility.distance_to_avert_emissions_region_meters
         r["cambium_region"] = p.s.electric_utility.cambium_region
 
-        r["annual_renewable_electricity_supplied_kwh"] = round(value(m[:AnnualGridREEleckWh]), digits=2)
+        r["annual_renewable_electricity_supplied_kwh"] = round(value(m[:AnnualGridREEleckWh]), digits=3)
     end
 
     d["ElectricUtility"] = r