Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions model/simulationtests/autosize_hvac.rb
Original file line number Diff line number Diff line change
Expand Up @@ -391,8 +391,16 @@ def make_tes_coil(model)
wwhp = OpenStudio::Model::HeatPumpWaterToWaterEquationFitCooling.new(model)
chw_loop.addSupplyBranchForComponent(wwhp)
cw_loop.addDemandBranchForComponent(wwhp)

chw_storage = OpenStudio::Model::ThermalStorageChilledWaterStratified.new(model)
chw_storage.setSetpointTemperatureSchedule(chw_temp_sch)
chw_storage.setTankRecoveryTime(4.0)
chw_storage.waterHeaterSizing.setTimeforTankRecovery(4.0)
chw_storage.autosizeSourceSideDesignFlowRate
chw_storage.autosizeNominalCoolingCapacity
chw_storage.autosizeUseSideDesignFlowRate
chw_storage.autocalculateSourceSideOutletHeight
chw_storage.autocalculateUseSideInletHeight
chw_loop.addSupplyBranchForComponent(chw_storage)
storage_loop.addDemandBranchForComponent(chw_storage)

Expand Down
19 changes: 15 additions & 4 deletions test_helpers.rb
Original file line number Diff line number Diff line change
Expand Up @@ -176,15 +176,15 @@ def get_cli_subcommand_from_env(sdk_version_str, debug: false)
$IntersectDir = File.join($RootDir, 'model/intersectiontests/')
$IntersectFile = File.join($RootDir, 'intersect.rb.erb')

if !ENV['TEST_DIR'].nil?
if ENV['TEST_DIR'].nil?
$TestDir = File.join($RootDir, 'testruns')
else
$TestDir = ENV.fetch('TEST_DIR', 'testruns')
# If it's a relative path, make it absolute
if File.expand_path($TestDir) != $TestDir
$TestDir = File.join($RootDir, $TestDir)
end
puts "Setting TestDir to #{$TestDir}"
else
$TestDir = File.join($RootDir, 'testruns')
end

$SddSimDir = File.join($RootDir, 'model/sddtests/')
Expand Down Expand Up @@ -982,7 +982,18 @@ def autosizing_test(filename, weather_file = nil, model_measures = [], energyplu
],
'OS:HeatPump:AirToWater:FuelFired:Heating' => [
'autosizedDesignTemperatureLift' # E+ is missing it
]
],
'OS:EvaporativeFluidCooler:SingleSpeed' => [
'autosizedDesignEnteringWaterTemperature' # E+ is missing it
],
'OS:EvaporativeFluidCooler:TwoSpeed' => [
'autosizedDesignEnteringWaterTemperature' # E+ is missing it
],
# TODO: temp
'OS:HeatPump:AirToWater:Heating' => 'all', # Not in test model
'OS:HeatPump:AirToWater:Cooling' => 'all', # Not in test model
'OS:HeatPump:AirToWater:Heating:SpeedData' => 'all', # Not in test model
'OS:HeatPump:AirToWater:Cooling:SpeedData' => 'all' # Not in test model
}

# Aliases for some OS onjects
Expand Down