Merge changes in master into nrcan_master_merge intermediate branch #1562
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Update regression and performance test results
improve logging for missing standards space type
Fixes #238 If there is no infiltration data, then space_type_apply_internal_loads would return nil instead of true. This makes sure that even if there is no infiltration, the method will return true if it ran successfully.
Fixes #109, checking hard-sized values before autosized values anywhere size checking appears in the code.
add return true to end of apply internal loads
check hard-sized values before autosized values
Add version reference for initialization summary
…into appx_debug
The building had mismatched surfaces. Divided the surface geometry and re-applied surface matching.
Appx debug
Fix/os351
the tall building methods delete some stories dynamically depending on the ratio of floor types (e.g. one floor might be retail). Deleting a space will not chance the surface adjacencies in adjacent spaces, which will still show surface adjacencies. This causes an error in the add constructions methods, which try to set plenum constructions for the ceiling if the adjacent space is a plenum. As there was no adjacent space, the get method errored out.
skylight frame setter was fixed; add version toggle and use new method
parking garage is not a supported space type
Made TBD a runtime dependency not just a development dependency.
Incorporating nrcan branch changes, udpating NRCan regression test expected results
- Add "air_loop_hvac_demand_control_ventilation_limits" method to deer.AirLoopHVAC.rb - Add minimum floor area to applicable DEER templates in ThermalZone.rb
# Conflicts: # lib/openstudio-standards/standards/deer/deer.AirLoopHVAC.rb # lib/openstudio-standards/standards/deer/deer_2003/deer_2003.ThermalZone.rb # lib/openstudio-standards/standards/deer/deer_2007/deer_2007.ThermalZone.rb # lib/openstudio-standards/standards/deer/deer_2011/deer_2011.ThermalZone.rb # lib/openstudio-standards/standards/deer/deer_2014/deer_2014.ThermalZone.rb # lib/openstudio-standards/standards/deer/deer_2015/deer_2015.ThermalZone.rb # lib/openstudio-standards/standards/deer/deer_2017/deer_2017.ThermalZone.rb # lib/openstudio-standards/standards/deer/deer_2020/deer_2020.AirLoopHVAC.rb # lib/openstudio-standards/standards/deer/deer_2020/deer_2020.ThermalZone.rb
Feature/radiant controls update
- added `require_relative` for DEER code year files, such as ThermalZone and AirLoopHVAC
revert ashrae 90.1 changes and make them comstock specific
economizer implementation changes
Update test results for OS 3.6.1
VRF outdoor unit max_net_vert_distance calculation
Deer ventilation rates
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.