Merge pull request #211 from NREL/develop

Add gen HHV, ERP bug fix, add to input descriptions, fix batt_roundtrip_efficiency calculation, push! not append() array in cost_curve.jl

Author: hdunham

CHANGELOG.md

@@ -23,6 +23,16 @@ Classify the change according to the following categories:
     ### Deprecated
     ### Removed
 
+## v0.30.0
+### Added
+- `Generator` input **fuel_higher_heating_value_kwh_per_gal**, which defaults to the constant KWH_PER_GAL_DIESEL
+### Changed
+- Added more description to **production_factor_series inputs**
+### Fixed
+- Fixed spelling of degradation_fraction
+- use push! instead of append() for array in core/cost_curve.jl
+- Fixed calculation of batt_roundtrip_efficiency in outage_simulator.jl
+
 ## v0.29.0
 ### Added
 - Add `CHP` `FuelUsed` and `FuelCost` modeling/tracking for stochastic/multi-outages

Project.toml

@@ -1,7 +1,7 @@
 name = "REopt"
 uuid = "d36ad4e8-d74a-4f7a-ace1-eaea049febf6"
 authors = ["Nick Laws", "Hallie Dunham <[email protected]>", "Bill Becker <[email protected]>", "Bhavesh Rathod <[email protected]>", "Alex Zolan <[email protected]>", "Amanda Farthing <[email protected]>"]
-version = "0.29.0"
+version = "0.30.0"
 
 [deps]
 ArchGDAL = "c9ce4bd3-c3d5-55b8-8973-c0e20141b8c3"
@@ -36,5 +36,5 @@ LinDistFlow = "0.1, 0.2"
 MathOptInterface = "0.9, 0.10, 1"
 Requires = "1.3"
 Roots = "1.3, 2"
-TestEnv = "1.7"
+TestEnv = "1.7, 1.8, 1.9"
 julia = "1.4, 1.5, 1.6, 1.7, 1.8"

src/constraints/generator_constraints.jl

@@ -30,16 +30,17 @@
 function add_fuel_burn_constraints(m,p)
 	fuel_slope_gal_per_kwhe, fuel_intercept_gal_per_hr = generator_fuel_slope_and_intercept(
 		electric_efficiency_full_load=p.s.generator.electric_efficiency_full_load, 
-		electric_efficiency_half_load=p.s.generator.electric_efficiency_half_load
+		electric_efficiency_half_load=p.s.generator.electric_efficiency_half_load,
+		fuel_higher_heating_value_kwh_per_gal=p.s.generator.fuel_higher_heating_value_kwh_per_gal
 	)
   	@constraint(m, [t in p.techs.gen, ts in p.time_steps],
-		m[:dvFuelUsage][t, ts] == (fuel_slope_gal_per_kwhe * KWH_PER_GAL_DIESEL *
+		m[:dvFuelUsage][t, ts] == (fuel_slope_gal_per_kwhe * p.s.generator.fuel_higher_heating_value_kwh_per_gal *
 		p.production_factor[t, ts] * p.hours_per_time_step * m[:dvRatedProduction][t, ts]) +
-		(fuel_intercept_gal_per_hr * KWH_PER_GAL_DIESEL * p.hours_per_time_step * m[:binGenIsOnInTS][t, ts])
+		(fuel_intercept_gal_per_hr * p.s.generator.fuel_higher_heating_value_kwh_per_gal * p.hours_per_time_step * m[:binGenIsOnInTS][t, ts])
 	)
 	@constraint(m,
 		sum(m[:dvFuelUsage][t, ts] for t in p.techs.gen, ts in p.time_steps) <=
-		p.s.generator.fuel_avail_gal * KWH_PER_GAL_DIESEL
+		p.s.generator.fuel_avail_gal * p.s.generator.fuel_higher_heating_value_kwh_per_gal
 	)
 end
 

src/constraints/outage_constraints.jl

@@ -125,7 +125,8 @@ end
 function add_MG_Gen_fuel_burn_constraints(m,p)
 	fuel_slope_gal_per_kwhe, fuel_intercept_gal_per_hr = generator_fuel_slope_and_intercept(
 		electric_efficiency_full_load=p.s.generator.electric_efficiency_full_load, 
-		electric_efficiency_half_load=p.s.generator.electric_efficiency_half_load
+		electric_efficiency_half_load=p.s.generator.electric_efficiency_half_load,
+        fuel_higher_heating_value_kwh_per_gal=p.s.generator.fuel_higher_heating_value_kwh_per_gal
 	)
     # Define dvMGFuelUsed by summing over outage time_steps.
     @constraint(m, [t in p.techs.gen, s in p.s.electric_utility.scenarios, tz in p.s.electric_utility.outage_start_time_steps],

src/core/bau_inputs.jl

@@ -340,7 +340,8 @@ function bau_outage_check(critical_loads_kw::AbstractArray, pv_kw_series::Abstra
         end
         fuel_slope_gal_per_kwhe, fuel_intercept_gal_per_hr = generator_fuel_slope_and_intercept(
             electric_efficiency_full_load=gen.electric_efficiency_full_load, 
-            electric_efficiency_half_load=gen.electric_efficiency_half_load
+            electric_efficiency_half_load=gen.electric_efficiency_half_load,
+            fuel_higher_heating_value_kwh_per_gal=gen.fuel_higher_heating_value_kwh_per_gal
         )
             for (i, (load, pv)) in enumerate(zip(critical_loads_kw, pv_kw_series))
             unmet = load - pv

src/core/cost_curve.jl

@@ -47,7 +47,7 @@ end
 
 
 function insert_u_after_p_bp(xp_array_incent, yp_array_incent, region, u_xbp, u_ybp, p, p_cap, u_cap)
-    xp_array_incent[region].append(u_xbp)
+    push!(xp_array_incent[region], u_xbp)
     if p_cap == 0
         push!(yp_array_incent[region], u_ybp - (p * u_ybp + u_cap))
     else

src/core/generator.jl

@@ -40,6 +40,7 @@
     electric_efficiency_full_load::Real = 0.3233,
     electric_efficiency_half_load::Real = electric_efficiency_full_load,
     fuel_avail_gal::Real = off_grid_flag ? 1.0e9 : 660.0,
+    fuel_higher_heating_value_kwh_per_gal::Real = 40.7,
     min_turn_down_fraction::Real = off_grid_flag ? 0.15 : 0.0,
     only_runs_during_grid_outage::Bool = true,
     sells_energy_back_to_grid::Bool = false,
@@ -88,6 +89,7 @@ struct Generator <: AbstractGenerator
     electric_efficiency_full_load
     electric_efficiency_half_load
     fuel_avail_gal
+    fuel_higher_heating_value_kwh_per_gal
     min_turn_down_fraction
     only_runs_during_grid_outage
     sells_energy_back_to_grid
@@ -133,6 +135,7 @@ struct Generator <: AbstractGenerator
         electric_efficiency_full_load::Real = 0.3233,
         electric_efficiency_half_load::Real = electric_efficiency_full_load,
         fuel_avail_gal::Real = off_grid_flag ? 1.0e9 : 660.0,
+        fuel_higher_heating_value_kwh_per_gal::Real = KWH_PER_GAL_DIESEL,
         min_turn_down_fraction::Real = off_grid_flag ? 0.15 : 0.0,
         only_runs_during_grid_outage::Bool = true,
         sells_energy_back_to_grid::Bool = false,
@@ -181,6 +184,7 @@ struct Generator <: AbstractGenerator
             electric_efficiency_full_load,
             electric_efficiency_half_load,
             fuel_avail_gal,
+            fuel_higher_heating_value_kwh_per_gal,
             min_turn_down_fraction,
             only_runs_during_grid_outage,
             sells_energy_back_to_grid,

src/core/pv.jl

@@ -52,7 +52,7 @@
     acres_per_kw::Real=6e-3,
     inv_eff::Real=0.96,
     dc_ac_ratio::Real=1.2,
-    production_factor_series::Union{Nothing, Array{<:Real,1}} = nothing,
+    production_factor_series::Union{Nothing, Array{<:Real,1}} = nothing, # Optional user-defined production factors. Must be normalized to units of kW-AC/kW-DC nameplate. The series must be one year (January through December) of hourly, 30-minute, or 15-minute generation data.
     federal_itc_fraction::Real = 0.3,
     federal_rebate_per_kw::Real = 0.0,
     state_ibi_fraction::Real = 0.0,

src/core/reopt_inputs.jl

@@ -593,11 +593,12 @@ function setup_gen_inputs(s::AbstractScenario, max_sizes, min_sizes, existing_si
         push!(techs.no_curtail, "Generator")
     end
     tech_renewable_energy_fraction["Generator"] = s.generator.fuel_renewable_energy_fraction
-    tech_emissions_factors_CO2["Generator"] = s.generator.emissions_factor_lb_CO2_per_gal / KWH_PER_GAL_DIESEL  # lb/gal * gal/kWh
-    tech_emissions_factors_NOx["Generator"] = s.generator.emissions_factor_lb_NOx_per_gal / KWH_PER_GAL_DIESEL
-    tech_emissions_factors_SO2["Generator"] = s.generator.emissions_factor_lb_SO2_per_gal / KWH_PER_GAL_DIESEL
-    tech_emissions_factors_PM25["Generator"] = s.generator.emissions_factor_lb_PM25_per_gal / KWH_PER_GAL_DIESEL
-    generator_fuel_cost_per_kwh = s.generator.fuel_cost_per_gallon / KWH_PER_GAL_DIESEL
+    hhv_kwh_per_gal = s.generator.fuel_higher_heating_value_kwh_per_gal
+    tech_emissions_factors_CO2["Generator"] = s.generator.emissions_factor_lb_CO2_per_gal / hhv_kwh_per_gal  # lb/gal * gal/kWh
+    tech_emissions_factors_NOx["Generator"] = s.generator.emissions_factor_lb_NOx_per_gal / hhv_kwh_per_gal
+    tech_emissions_factors_SO2["Generator"] = s.generator.emissions_factor_lb_SO2_per_gal / hhv_kwh_per_gal
+    tech_emissions_factors_PM25["Generator"] = s.generator.emissions_factor_lb_PM25_per_gal / hhv_kwh_per_gal
+    generator_fuel_cost_per_kwh = s.generator.fuel_cost_per_gallon / hhv_kwh_per_gal
     fuel_cost_per_kwh["Generator"] = per_hour_value_to_time_series(generator_fuel_cost_per_kwh, s.settings.time_steps_per_hour, "Generator")
     return nothing
 end

src/core/utils.jl

@@ -494,7 +494,8 @@ end
 """
 generator_fuel_slope_and_intercept(;
                 electric_efficiency_full_load::Real, [kWhe/kWht]
-                electric_efficiency_half_load::Real [kWhe/kWht]
+                electric_efficiency_half_load::Real, [kWhe/kWht]
+                fuel_higher_heating_value_kwh_per_gal::Real
             )
 
 return Tuple{<:Real,<:Real} where 
@@ -503,14 +504,15 @@ return Tuple{<:Real,<:Real} where
 """
 function generator_fuel_slope_and_intercept(;
                         electric_efficiency_full_load::Real, 
-                        electric_efficiency_half_load::Real
+                        electric_efficiency_half_load::Real,
+                        fuel_higher_heating_value_kwh_per_gal::Real
                     )
     fuel_burn_full_load_kwht = 1.0 / electric_efficiency_full_load  # [kWe_rated/(kWhe/kWht)]
     fuel_burn_half_load_kwht = 0.5 / electric_efficiency_half_load  # [kWe_rated/(kWhe/kWht)]
     fuel_slope_kwht_per_kwhe = (fuel_burn_full_load_kwht - fuel_burn_half_load_kwht) / (1.0 - 0.5)  # [kWht/kWhe]
     fuel_intercept_kwht_per_hr = fuel_burn_full_load_kwht - fuel_slope_kwht_per_kwhe * 1.0  # [kWht/hr]
-    fuel_slope_gal_per_kwhe = fuel_slope_kwht_per_kwhe / KWH_PER_GAL_DIESEL # [gal/kWhe]
-    fuel_intercept_gal_per_hr = fuel_intercept_kwht_per_hr / KWH_PER_GAL_DIESEL # [gal/hr]
+    fuel_slope_gal_per_kwhe = fuel_slope_kwht_per_kwhe / fuel_higher_heating_value_kwh_per_gal # [gal/kWhe]
+    fuel_intercept_gal_per_hr = fuel_intercept_kwht_per_hr / fuel_higher_heating_value_kwh_per_gal # [gal/hr]
 
     return fuel_slope_gal_per_kwhe, fuel_intercept_gal_per_hr
 end

src/core/wind.jl

@@ -34,7 +34,7 @@
     max_kw = 1.0e9,
     installed_cost_per_kw = nothing,
     om_cost_per_kw = 35.0,
-    production_factor_series = nothing,
+    production_factor_series = nothing, # Optional user-defined production factors. Must be normalized to units of kW-AC/kW-DC nameplate. The series must be one year (January through December) of hourly, 30-minute, or 15-minute generation data.
     size_class = "",
     wind_meters_per_sec = [],
     wind_direction_degrees = [],

src/mpc/inputs.jl

@@ -164,7 +164,7 @@ end
 function setup_gen_inputs(s::MPCScenario, existing_sizes, production_factor, fuel_cost_per_kwh)
     existing_sizes["Generator"] = s.generator.size_kw
     production_factor["Generator", :] = ones(length(s.electric_load.loads_kw))
-    generator_fuel_cost_per_kwh = s.generator.fuel_cost_per_gallon / KWH_PER_GAL_DIESEL
+    generator_fuel_cost_per_kwh = s.generator.fuel_cost_per_gallon / s.generator.fuel_higher_heating_value_kwh_per_gal
     fuel_cost_per_kwh["Generator"] = per_hour_value_to_time_series(generator_fuel_cost_per_kwh, s.settings.time_steps_per_hour, "Generator")
     return nothing
 end

src/mpc/structs.jl

@@ -284,6 +284,7 @@ function MPCGenerator(;
     electric_efficiency_full_load::Real = 0.3233,
     electric_efficiency_half_load::Real = electric_efficiency_full_load,
     fuel_avail_gal::Real = 660.0,
+    fuel_higher_heating_value_kwh_per_gal::Real = KWH_PER_GAL_DIESEL,
     min_turn_down_fraction::Real = 0.0,  # TODO change this to non-zero value
     only_runs_during_grid_outage::Bool = true,
     sells_energy_back_to_grid::Bool = false,
@@ -298,6 +299,7 @@ struct MPCGenerator <: AbstractGenerator
     electric_efficiency_full_load
     electric_efficiency_half_load
     fuel_avail_gal
+    fuel_higher_heating_value_kwh_per_gal
     min_turn_down_fraction
     only_runs_during_grid_outage
     sells_energy_back_to_grid
@@ -309,6 +311,7 @@ struct MPCGenerator <: AbstractGenerator
         electric_efficiency_full_load::Real = 0.3233,
         electric_efficiency_half_load::Real = electric_efficiency_full_load,
         fuel_avail_gal::Real = 660.0,
+        fuel_higher_heating_value_kwh_per_gal::Real = KWH_PER_GAL_DIESEL,
         min_turn_down_fraction::Real = 0.0,  # TODO change this to non-zero value
         only_runs_during_grid_outage::Bool = true,
         sells_energy_back_to_grid::Bool = false,
@@ -324,6 +327,7 @@ struct MPCGenerator <: AbstractGenerator
             electric_efficiency_full_load,
             electric_efficiency_half_load,
             fuel_avail_gal,
+            fuel_higher_heating_value_kwh_per_gal,
             min_turn_down_fraction,
             only_runs_during_grid_outage,
             sells_energy_back_to_grid,

src/outagesim/backup_reliability.jl

@@ -827,6 +827,7 @@ Return a dictionary of inputs required for backup reliability calculations.
     -generator_fuel_burn_rate_per_kwh::Union{Real, Vector{<:Real}} = 0.076      Amount of fuel used per kWh generated. Fuel units should be consistent with fuel_limit and generator_fuel_intercept_per_hr.
 """
 function backup_reliability_reopt_inputs(;d::Dict, p::REoptInputs, r::Dict = Dict())::Dict
+
     r2 = dictkeys_tosymbols(r)
     zero_array = zeros(length(p.time_steps))
     r2[:critical_loads_kw] = p.s.electric_load.critical_loads_kw
@@ -962,11 +963,13 @@ Dict{Any, Any} with 11 entries:
 ```
 """
 function backup_reliability_inputs(;r::Dict)::Dict
+
     invalid_args = String[]
     r2 = dictkeys_tosymbols(r)
 
     generator_inputs = [:generator_operational_availability, :generator_failure_to_start, :generator_mean_time_to_failure, 
-                        :num_generators, :generator_size_kw, :fuel_limit, :generator_fuel_intercept_per_hr, :generator_fuel_burn_rate_per_kwh]
+                        :num_generators, :generator_size_kw, :fuel_limit, :fuel_limit_is_per_generator, 
+                        :generator_fuel_intercept_per_hr, :generator_fuel_burn_rate_per_kwh]
     for g in generator_inputs
         if haskey(r2, g) && isa(r2[g], Array) && length(r2[g]) == 1
             r2[g] = r2[g][1]
@@ -1157,10 +1160,10 @@ function fuel_use(;
     battery_charge_efficiency::Real = 0.948, 
     battery_discharge_efficiency::Real = 0.948,
     time_steps_per_hour::Real = 1,
-    kwargs...)::Tuple{Matrix{Int}, Matrix{Float64}}
+    kwargs...
+    )::Tuple{Matrix{Int}, Matrix{Float64}}
 
     t_max = length(net_critical_loads_kw)
-
     fuel_limit = convert.(Float64, fuel_limit)
     if isa(fuel_limit_is_per_generator, Bool)
         if fuel_limit_is_per_generator

src/outagesim/outage_simulator.jl

@@ -252,8 +252,8 @@ Returns a dict
 ```
 """
 function simulate_outages(d::Dict, p::REoptInputs; microgrid_only::Bool=false)
-    batt_roundtrip_efficiency = p.s.storage.attr["ElectricStorage"].charge_efficiency 
-                                p.s.storage.attr["ElectricStorage"].discharge_efficiency
+    batt_roundtrip_efficiency = (p.s.storage.attr["ElectricStorage"].charge_efficiency *
+                                p.s.storage.attr["ElectricStorage"].discharge_efficiency)
 
     # TODO handle generic PV names
     pv_kw_ac_hourly = zeros(length(p.time_steps))
@@ -293,7 +293,8 @@ function simulate_outages(d::Dict, p::REoptInputs; microgrid_only::Bool=false)
 
 	fuel_slope_gal_per_kwhe, fuel_intercept_gal_per_hr = generator_fuel_slope_and_intercept(
 		electric_efficiency_full_load=p.s.generator.electric_efficiency_full_load, 
-		electric_efficiency_half_load=p.s.generator.electric_efficiency_half_load
+		electric_efficiency_half_load=p.s.generator.electric_efficiency_half_load,
+        fuel_higher_heating_value_kwh_per_gal = p.s.generator.fuel_higher_heating_value_kwh_per_gal
 	)
 
     simulate_outages(;

src/results/financial.jl

@@ -318,10 +318,10 @@ function calculate_lcoe(p::REoptInputs, tech_results::Dict, tech::AbstractTech)
     if tech.production_incentive_max_benefit > 0
         for yr in 1:years
             if yr < tech.production_incentive_years
-                degredation_fraction = (1- degradation_fraction)^yr
+                degradation_fraction = (1- degradation_fraction)^yr
                 base_pbi = minimum([tech.production_incentive_per_kwh * 
-                    (year_one_energy_produced - existing_energy_bau) * degredation_fraction,  
-                    tech.production_incentive_max_benefit * degredation_fraction 
+                    (year_one_energy_produced - existing_energy_bau) * degradation_fraction,  
+                    tech.production_incentive_max_benefit * degradation_fraction 
                 ])
                 npv_pbi += base_pbi * (1.0/(1.0+discount_rate_fraction))^(yr+1)
             end

src/results/generator.jl

@@ -87,7 +87,7 @@ function add_generator_results(m::JuMP.AbstractModel, p::REoptInputs, d::Dict; _
 	)
 	r["electric_to_load_series_kw"] = round.(value.(generatorToLoad), digits=3)
 
-    GeneratorFuelUsed = @expression(m, sum(m[:dvFuelUsage][t, ts] for t in p.techs.gen, ts in p.time_steps) / KWH_PER_GAL_DIESEL)
+    GeneratorFuelUsed = @expression(m, sum(m[:dvFuelUsage][t, ts] for t in p.techs.gen, ts in p.time_steps) / p.s.generator.fuel_higher_heating_value_kwh_per_gal)
 	r["annual_fuel_consumption_gal"] = round(value(GeneratorFuelUsed), digits=2)
 
 	AverageGenProd = @expression(m,
@@ -137,7 +137,7 @@ function add_generator_results(m::JuMP.AbstractModel, p::MPCInputs, d::Dict; _n=
 	)
 	r["to_load_series_kw"] = round.(value.(generatorToLoad), digits=3).data
 
-    GeneratorFuelUsed = @expression(m, sum(m[:dvFuelUsage][t, ts] for t in p.techs.gen, ts in p.time_steps) / KWH_PER_GAL_DIESEL)
+    GeneratorFuelUsed = @expression(m, sum(m[:dvFuelUsage][t, ts] for t in p.techs.gen, ts in p.time_steps) / p.s.generator.fuel_higher_heating_value_kwh_per_gal)
 	r["annual_fuel_consumption_gal"] = round(value(GeneratorFuelUsed), digits=2)
 
 	Year1GenProd = @expression(m,

src/results/proforma.jl

@@ -337,14 +337,14 @@ function update_metrics(m::Metrics, p::REoptInputs, tech::AbstractTech, tech_nam
     year_one_energy = "year_one_energy_produced_kwh" in keys(results[tech_name]) ? results[tech_name]["year_one_energy_produced_kwh"] : results[tech_name]["annual_energy_produced_kwh"]
     for yr in range(0, stop=years-1)
         if yr < tech.production_incentive_years
-            degredation_fraction = :degradation_fraction in fieldnames(typeof(tech)) ? (1 - tech.degradation_fraction)^yr : 1.0
+            degradation_fraction = :degradation_fraction in fieldnames(typeof(tech)) ? (1 - tech.degradation_fraction)^yr : 1.0
             base_pbi = minimum([
-                tech.production_incentive_per_kwh * (year_one_energy - existing_energy_bau) * degredation_fraction,  
-                tech.production_incentive_max_benefit * degredation_fraction
+                tech.production_incentive_per_kwh * (year_one_energy - existing_energy_bau) * degradation_fraction,  
+                tech.production_incentive_max_benefit * degradation_fraction
             ])
             base_pbi_bau = minimum([
-                tech.production_incentive_per_kwh * get(results[tech_name], "year_one_energy_produced_kwh_bau", 0) * degredation_fraction,  
-                tech.production_incentive_max_benefit * degredation_fraction 
+                tech.production_incentive_per_kwh * get(results[tech_name], "year_one_energy_produced_kwh_bau", 0) * degradation_fraction,  
+                tech.production_incentive_max_benefit * degradation_fraction 
             ])
             push!(pbi_series, base_pbi)
             push!(pbi_series_bau, base_pbi_bau)

test/scenarios/erp_fuel_limit_inputs.json

@@ -8762,15 +8762,15 @@
         325.34919044525986,
         321.34319845422783
     ],
-    "generator_operational_availability": 0.995,
-    "generator_failure_to_start": 0.0094,
-    "generator_mean_time_to_failure": 1100.0,
-    "num_generators": 1,
-    "generator_size_kw": 157.0,
-    "fuel_limit": 5000.0,
-    "fuel_limit_is_per_generator": false,
-    "generator_fuel_burn_rate_per_kwh": 0.072265,
-    "generator_fuel_intercept_per_hr": 0.0,
+    "generator_operational_availability": [0.995],
+    "generator_failure_to_start": [0.0094],
+    "generator_mean_time_to_failure": [1100.0],
+    "num_generators": [1],
+    "generator_size_kw": [157.0],
+    "fuel_limit": [5000.0],
+    "fuel_limit_is_per_generator": [true],
+    "generator_fuel_burn_rate_per_kwh": [0.072265],
+    "generator_fuel_intercept_per_hr": [0.0],
     "pv_operational_availability": 1.0,
     "pv_size_kw": 3635.0,
     "pv_production_factor_series": [

test/scenarios/re_emissions_elec_only.json

@@ -54,6 +54,7 @@
     "installed_cost_per_kw": 600.0,
     "utility_ibi_max": 0.0,
     "fuel_avail_gal": 0.0,
+    "fuel_higher_heating_value_kwh_per_gal": 40.7,
     "min_turn_down_fraction": 0.0,
     "production_incentive_max_kw": 0.0,
     "utility_ibi_fraction": 0.0,