Skip to content

Commit

Permalink
Merge pull request #397 from NREL/chp-default-bug
Browse files Browse the repository at this point in the history
Chp default bug
  • Loading branch information
hdunham authored May 22, 2024
2 parents ab53b8a + 235972b commit 80c0d62
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 2 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,10 @@ Classify the change according to the following categories:
### Deprecated
### Removed

## Develop
### Fixed
- Convert `max_electric_load_kw` to _Float64_ before passing to function `get_chp_defaults_prime_mover_size_class`

## v0.46.1
### Changed
- Updated the GHP testset .json `./test/scenarios/ghp_inputs.json` to include a nominal HotThermalStorage and ColdThermalStorage system.
Expand Down
2 changes: 1 addition & 1 deletion src/core/chp.jl
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ function CHP(d::Dict;
# For non-heating CHP, Prime Generator, defaults require electric load metrics
if !isempty(electric_load_series_kw)
avg_electric_load_kw = sum(electric_load_series_kw) / length(electric_load_series_kw)
max_electric_load_kw = maximum(electric_load_series_kw)
max_electric_load_kw = convert(Float64, maximum(electric_load_series_kw))
else
avg_electric_load_kw = nothing
max_electric_load_kw = nothing
Expand Down
2 changes: 1 addition & 1 deletion test/runtests.jl
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ elseif "CPLEX" in ARGS
end

else # run HiGHS tests

@testset "Inputs" begin
@testset "hybrid profile" begin
electric_load = REopt.ElectricLoad(;
Expand Down

0 comments on commit 80c0d62

Please sign in to comment.