Merge branch 'develop' into boiler-series-fix

CHANGELOG.md

@@ -29,18 +29,17 @@ Classify the change according to the following categories:
 ### Fixed
 - When setting **thermal_production_series_mmbtu_per_hour** output in **ExistingBoiler**, sum over heating loads instead of time steps
 
-## Develop - 2024-10-11
-### Added
-- Add new **ElectricStorage** parameters **max_duration_hours** and **min_duration_hours** to bound the energy duration of battery storage
-
-## Develop degradation-cleanup
+## Develop
 ### Added
 - Battery residual value if choosing replacement strategy for degradation
+- Add new **ElectricStorage** parameters **max_duration_hours** and **min_duration_hours** to bound the energy duration of battery storage
 ### Changed
 - Revised the battery degradation model, refactoring some methods to increase model-building efficiency and reformulating indicator constraints as big-M constraints with smaller big-M's to reduce solve time.
 - Edited several documentation entries and docstrings for clarity.
 ### Removed
 - 80% scaling of battery maintenance costs when using augmentation strategy
+### Fixed 
+- Fixed conditions for which a warning is presented indicating that the wholesale benefit threshold is met. 
 
 ## v0.48.1
 ### Changed
@@ -65,6 +64,7 @@ Classify the change according to the following categories:
 - Added new file `src/core/ASHP.jl` with new technology **ASHP**, which uses electricity as input and provides heating and/or cooling as output; load balancing and technology-specific constraints have been updated and added accordingly
 - In `src/core/existing_chiller.jl`, Added new atttribute **retire_in_optimal** to the **ExistingChiller** struct
 - Financial output **initial_capital_costs_after_incentives_without_macrs** which has "net year one" CapEx after incentives except for MACRS, which helps with users defining their own "simple payback period"
+
 ### Changed
 - Improve the full test suite reporting with a verbose summary table, and update the structure to reflect long-term open-source solver usage.
 - Removed MacOS from the runner list and just run with Windows OS, since MacOS commonly freezes and gets cancelled. We have not seen Windows OS pass while other OS's fail.
@@ -81,6 +81,7 @@ Classify the change according to the following categories:
 - An issue with setup_boiler_inputs in reopt_inputs.jl.
 - Fuel costs in proforma.jl were not consistent with the optimization costs, so that was corrected so that they are only added to the offtaker cashflows and not the owner/developer cashflows for third party.
 
+
 ## v0.47.2
 ### Fixed
 - Increased the big-M bound on maximum net metering benefit to prevent artificially low export benefits.

src/results/electric_utility.jl

@@ -34,7 +34,7 @@ function add_electric_utility_results(m::JuMP.AbstractModel, p::AbstractInputs,
 
     # add a warning if the WHL benefit is the max benefit
     if :WHL in p.s.electric_tariff.export_bins
-        if sum(value.(m[Symbol("WHL_benefit"*_n)])) - 10*sum([ld*rate for (ld,rate) in zip(p.s.electric_load.loads_kw, p.s.electric_tariff.export_rates[:WHL])]) / value(m[Symbol("WHL_benefit"*_n)])  <= 1e-3
+        if abs(sum(value.(m[Symbol("WHL_benefit"*_n)])) - 10*sum([ld*rate for (ld,rate) in zip(p.s.electric_load.loads_kw, p.s.electric_tariff.export_rates[:WHL])]) / value(m[Symbol("WHL_benefit"*_n)]))  <= 1e-3
             @warn """Wholesale benefit is at the maximum allowable by the model; the problem is likely unbounded without this 
             limit in place.  Check the inputs to ensure that there are practical limits for max system sizes and that 
             the wholesale and retail electricity rates are accurate."""