Skip to content

Commit

Permalink
small updates
Browse files Browse the repository at this point in the history
  • Loading branch information
adfarth committed Nov 26, 2024
1 parent b8a93c2 commit f09fe6e
Showing 3 changed files with 11 additions and 12 deletions.
2 changes: 1 addition & 1 deletion src/constraints/renewable_energy_constraints.jl
Original file line number Diff line number Diff line change
@@ -87,7 +87,7 @@ function add_re_elec_calcs(m,p)
# 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 #TODO: Uncomment?
# tech electric loads #TODO: Uncomment and address any double counting with AnnualHeatkWh
# + 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
17 changes: 6 additions & 11 deletions src/results/site.jl
Original file line number Diff line number Diff line change
@@ -68,16 +68,11 @@ function add_site_results(m::JuMP.AbstractModel, p::REoptInputs, d::Dict; _n="")
r["lifecycle_emissions_from_fuelburn_tonnes_PM25"] = round(value(m[:Lifecycle_Emissions_Lbs_PM25_fuelburn]*TONNE_PER_LB), digits=2)

# Simple Average Annual Emissions results at Site level (total divided by analysis period)
r["annual_emissions_tonnes_CO2"] = r["lifecycle_emissions_tonnes_CO2"] / p.s.financial.analysis_years
r["annual_emissions_tonnes_NOx"] = r["lifecycle_emissions_tonnes_NOx"] / p.s.financial.analysis_years
r["annual_emissions_tonnes_SO2"] = r["lifecycle_emissions_tonnes_SO2"] / p.s.financial.analysis_years
r["annual_emissions_tonnes_PM25"] = r["lifecycle_emissions_tonnes_PM25"] / p.s.financial.analysis_years

r["annual_emissions_from_fuelburn_tonnes_CO2"] = r["lifecycle_emissions_from_fuelburn_tonnes_CO2"] / p.s.financial.analysis_years
r["annual_emissions_from_fuelburn_tonnes_NOx"] = r["lifecycle_emissions_from_fuelburn_tonnes_NOx"] / p.s.financial.analysis_years
r["annual_emissions_from_fuelburn_tonnes_SO2"] = r["lifecycle_emissions_from_fuelburn_tonnes_SO2"] / p.s.financial.analysis_years
r["annual_emissions_from_fuelburn_tonnes_PM25"] = r["lifecycle_emissions_from_fuelburn_tonnes_PM25"] / p.s.financial.analysis_years

for em in ["CO2", "NOx", "SO2", "PM25"]
r["annual_emissions_tonnes_$(em)"] = r["lifecycle_emissions_tonnes_$(em)"] / p.s.financial.analysis_years
r["annual_emissions_from_fuelburn_tonnes_$(em)"] = r["lifecycle_emissions_from_fuelburn_tonnes_$(em)"] / p.s.financial.analysis_years
end

d["Site"] = r
end

@@ -143,6 +138,6 @@ function add_re_tot_calcs(m::JuMP.AbstractModel, p::REoptInputs)
)
end
m[:AnnualOnsiteRETotkWh] = @expression(m, m[:AnnualOnsiteREEleckWh] + AnnualREHeatkWh)
m[:AnnualTotkWh] = @expression(m, m[:AnnualEleckWh] + AnnualHeatkWh)
m[:AnnualTotkWh] = @expression(m, m[:AnnualEleckWh] + AnnualHeatkWh) # TODO: ensure no double counting once AnnaulEleckWh accounts for electric heating and cooling loads
nothing
end
4 changes: 4 additions & 0 deletions test/runtests.jl
Original file line number Diff line number Diff line change
@@ -2366,6 +2366,7 @@ else # run HiGHS tests
end

@testset "Renewable Energy from Grid" begin
# Test RE calc
inputs = JSON.parsefile("./scenarios/re_emissions_elec_only.json") # PV, Generator, ElectricStorage

s = Scenario(inputs)
@@ -2378,6 +2379,9 @@ else # run HiGHS tests
gridRE = sum((grid2load + grid2bess - (grid2bess*(1-bessloss))) .* s.electric_utility.renewable_energy_fraction_series)

@test results["ElectricUtility"]["annual_renewable_electricity_supplied_kwh"] gridRE rtol=1e-4
@test results["Site"]["onsite_and_grid_renewable_electricity_fraction_of_elec_load"] ((onsiteRE+gridRE) / results["ElectricLoad"]["annual_calculated_kwh"]) rtol=1e-4

# TODO: Add tests with heating techs (ASHP or GHP) once AnnualEleckWh is updated
end

@testset "Back pressure steam turbine" begin

0 comments on commit f09fe6e

Please sign in to comment.