Skip to content

Commit

Permalink
rm default values from ASHP min size, performance functions
Browse files Browse the repository at this point in the history
  • Loading branch information
zolanaj committed Oct 11, 2024
1 parent f231482 commit 676dd1c
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
10 changes: 5 additions & 5 deletions src/core/ashp.jl
Original file line number Diff line number Diff line change
Expand Up @@ -444,14 +444,14 @@ function get_ashp_performance(cop_reference,
cf_reference,
reference_temps,
ambient_temp_degF,
back_up_temp_threshold_degF = 10.0
back_up_temp_threshold_degF
)
"""
function get_ashp_performance(cop_reference,
cf_reference,
reference_temps,
ambient_temp_degF,
back_up_temp_threshold_degF = 10.0
back_up_temp_threshold_degF
)
num_timesteps = length(ambient_temp_degF)
cop = zeros(num_timesteps)
Expand Down Expand Up @@ -493,9 +493,9 @@ Obtains the default minimum allowable size for ASHP system. This is calculated
"""
function get_ashp_default_min_allowable_size(heating_load::Array{<:Real,1},
heating_cf::Array{<:Real,1},
cooling_load::Array{<:Real,1} = Real[],
cooling_cf::Array{<:Real,1} = Real[],
peak_load_thermal_factor::Real = 0.5
cooling_load::Array{<:Real,1},
cooling_cf::Array{<:Real,1},
peak_load_thermal_factor::Real
)

if isempty(cooling_cf)
Expand Down
4 changes: 2 additions & 2 deletions test/runtests.jl
Original file line number Diff line number Diff line change
Expand Up @@ -118,8 +118,8 @@ else # run HiGHS tests
# min allowable size
heating_load = Array{Real}([10.0,10.0,10.0,10.0])
cooling_load = Array{Real}([10.0,10.0,10.0,10.0])
space_heating_min_allowable_size = REopt.get_ashp_default_min_allowable_size(heating_load, heating_cf, cooling_load, cooling_cf)
wh_min_allowable_size = REopt.get_ashp_default_min_allowable_size(heating_load, heating_cf)
space_heating_min_allowable_size = REopt.get_ashp_default_min_allowable_size(heating_load, heating_cf, cooling_load, cooling_cf, 0.5)
wh_min_allowable_size = REopt.get_ashp_default_min_allowable_size(heating_load, heating_cf, Real[], Real[], 0.5)
@test space_heating_min_allowable_size 9.166666666666666 atol=1e-8
@test wh_min_allowable_size 5.0 atol=1e-8
end
Expand Down

0 comments on commit 676dd1c

Please sign in to comment.