From 78b04293bf219dbabb3dfb67ba83e1ea5edca205 Mon Sep 17 00:00:00 2001 From: Bill Becker Date: Mon, 23 Sep 2024 14:57:14 -0600 Subject: [PATCH] Fix units for unaddressable heating emissions --- src/results/heating_cooling_load.jl | 2 +- test/runtests.jl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/results/heating_cooling_load.jl b/src/results/heating_cooling_load.jl index c08583833..1a1d9fe19 100644 --- a/src/results/heating_cooling_load.jl +++ b/src/results/heating_cooling_load.jl @@ -95,7 +95,7 @@ function add_heating_load_results(m::JuMP.AbstractModel, p::REoptInputs, d::Dict p.s.space_heating_load.unaddressable_annual_fuel_mmbtu + p.s.process_heat_load.unaddressable_annual_fuel_mmbtu) - r["annual_emissions_from_unaddressable_heating_load_mmbtu"] = r["annual_total_unaddressable_heating_load_mmbtu"] * p.s.existing_boiler.emissions_factor_lb_CO2_per_mmbtu * TONNE_PER_LB + r["annual_emissions_from_unaddressable_heating_load_tonnes_CO2"] = r["annual_total_unaddressable_heating_load_mmbtu"] * p.s.existing_boiler.emissions_factor_lb_CO2_per_mmbtu * TONNE_PER_LB d["HeatingLoad"] = r nothing diff --git a/test/runtests.jl b/test/runtests.jl index 83abc9f6b..3a63a2a38 100644 --- a/test/runtests.jl +++ b/test/runtests.jl @@ -677,7 +677,7 @@ else # run HiGHS tests weighted_avg_addressable_fraction = (0.5 * 0.6 + 0.5 * 0.8 + 0.3 * 0.7) / (0.5 + 0.5 + 0.3) @test round(abs(addressable / total - weighted_avg_addressable_fraction), digits=3) == 0 - unaddressable_emissions = results["HeatingLoad"]["annual_emissions_from_unaddressable_heating_load_mmbtu"] + unaddressable_emissions = results["HeatingLoad"]["annual_emissions_from_unaddressable_heating_load_tonnes_CO2"] addressable_site_fuel_emissions = results["Site"]["annual_emissions_from_fuelburn_tonnes_CO2"] total_site_emissions = unaddressable_emissions + addressable_site_fuel_emissions @test round(abs(addressable_site_fuel_emissions / total_site_emissions - weighted_avg_addressable_fraction), digits=3) == 0