From 9fa7f7af7f664a05719318a2b9c496915f7b3ccc Mon Sep 17 00:00:00 2001 From: Bill Becker Date: Tue, 22 Aug 2023 14:53:26 -0600 Subject: [PATCH] Fix monthly cooling input type conversion and make monthly heating type conversions consistent with other inputs --- src/core/heating_cooling_loads.jl | 4 ++-- src/core/utils.jl | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/core/heating_cooling_loads.jl b/src/core/heating_cooling_loads.jl index aabea0b52..d032263cf 100644 --- a/src/core/heating_cooling_loads.jl +++ b/src/core/heating_cooling_loads.jl @@ -736,7 +736,7 @@ function BuiltInDomesticHotWaterLoad( annual_mmbtu *= addressable_load_fraction end if length(monthly_mmbtu) == 12 - monthly_mmbtu = convert(Vector{Real}, monthly_mmbtu) .* addressable_load_fraction + monthly_mmbtu = monthly_mmbtu .* addressable_load_fraction end built_in_load("domestic_hot_water", city, buildingtype, year, annual_mmbtu, monthly_mmbtu) end @@ -1075,7 +1075,7 @@ function BuiltInSpaceHeatingLoad( annual_mmbtu *= addressable_load_fraction end if length(monthly_mmbtu) == 12 - monthly_mmbtu = convert(Vector{Real}, monthly_mmbtu) .* addressable_load_fraction + monthly_mmbtu = monthly_mmbtu .* addressable_load_fraction end built_in_load("space_heating", city, buildingtype, year, annual_mmbtu, monthly_mmbtu) end diff --git a/src/core/utils.jl b/src/core/utils.jl index c15bec8ca..32263d895 100644 --- a/src/core/utils.jl +++ b/src/core/utils.jl @@ -183,7 +183,8 @@ function dictkeys_tosymbols(d::Dict) "emissions_factor_series_lb_SO2_per_kwh", "emissions_factor_series_lb_PM25_per_kwh", #for ERP - "pv_production_factor_series", "battery_starting_soc_series_fraction" + "pv_production_factor_series", "battery_starting_soc_series_fraction", + "monthly_mmbtu", "monthly_tonhour" ] && !isnothing(v) try v = convert(Array{Real, 1}, v)