Skip to content

Commit

Permalink
Merge pull request #1772 from NREL/comstock_updates
Browse files Browse the repository at this point in the history
Fix CBECS HVAC method call
  • Loading branch information
mdahlhausen authored Jun 20, 2024
2 parents 1ffa562 + ffb94ea commit efc9543
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions lib/openstudio-standards/hvac/cbecs_hvac.rb
Original file line number Diff line number Diff line change
Expand Up @@ -433,11 +433,11 @@ def self.add_cbecs_hvac_system(model, standard, hvac_system_type, zones)
standard.model_add_hvac_system(model, 'PVAV PFP Boxes', ht = 'Electricity', znht = 'Electricity', cl = 'Electricity', zones)

when 'PVAV with gas heat with electric reheat', 'PVAV with gas coil heat with electric reheat'
standard.model_add_hvac_system(self, 'PVAV Reheat', ht = 'Gas', znht = 'Electricity', cl = 'Electricity', zones,
standard.model_add_hvac_system(model, 'PVAV Reheat', ht = 'Gas', znht = 'Electricity', cl = 'Electricity', zones,
air_loop_heating_type: 'Gas')

when 'PVAV with gas boiler heat with electric reheat'
standard.model_add_hvac_system(self, 'PVAV Reheat', ht = 'Gas', znht = 'Electricity', cl = 'Electricity', zones)
standard.model_add_hvac_system(model, 'PVAV Reheat', ht = 'Gas', znht = 'Electricity', cl = 'Electricity', zones)

# all residential systems do not have ventilation
when 'Residential AC with baseboard electric'
Expand Down
2 changes: 1 addition & 1 deletion lib/openstudio-standards/schedules/parametric.rb
Original file line number Diff line number Diff line change
Expand Up @@ -587,7 +587,7 @@ def self.schedule_ruleset_get_parametric_inputs(schedule_ruleset, space_load_ins
end
end

# if schedule day days used can't be mapped to single hours of operation then do not use hoo variables, otherwise would have ot split rule and alter model
# if schedule day days used can't be mapped to single hours of operation then do not use hoo variables, otherwise would have to split rule and alter model
if hoo_target_index.nil?

hoo_start = nil
Expand Down

0 comments on commit efc9543

Please sign in to comment.