Skip to content

Commit 2524a2e

Browse files
committed
use pop! instead of get when retrieving include_cooling_in_chp_size from dictionary
1 parent 245d2e4 commit 2524a2e

1 file changed

Lines changed: 6 additions & 2 deletions

File tree

src/core/scenario.jl

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -473,7 +473,11 @@ function Scenario(d::Dict; flex_hvac_from_json=false)
473473
avg_cooling_load_kw = nothing
474474
absorption_chiller_cop = nothing
475475
# User can override by explicitly setting include_cooling_in_chp_size = false
476-
include_cooling_in_size = get(d["CHP"], "include_cooling_in_chp_size", haskey(d, "AbsorptionChiller"))
476+
if "include_cooling_in_chp_size" in keys(d["CHP"])
477+
include_cooling_in_size = pop!(d["CHP"], "include_cooling_in_chp_size")
478+
else
479+
include_cooling_in_size = haskey(d, "AbsorptionChiller")
480+
end
477481

478482
if max_cooling_demand_kw > 0 && include_cooling_in_size
479483
# Use already-processed cooling_load object
@@ -498,7 +502,7 @@ function Scenario(d::Dict; flex_hvac_from_json=false)
498502
sector = site.sector,
499503
federal_procurement_type = site.federal_procurement_type)
500504
else # Only if modeling CHP without heating_load and existing_boiler (for prime generator, electric-only)
501-
chp = CHP(d["CHP"],
505+
chp = CHP(d["CHP"];
502506
electric_load_series_kw = electric_load.loads_kw,
503507
avg_cooling_load_kw = avg_cooling_load_kw,
504508
absorption_chiller_cop = absorption_chiller_cop,

0 commit comments

Comments
 (0)