Incorporating nrcan branch changes, udpating NRCan regression test expected results #1520
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
…m lux value for each space type as per NECB
…or it in progress; Updated bundler version in openstudio-standards.gemspec
…ests to run. and only rake test:parallel_run_all_tests_locally
… 2015 in progress
Correcting Warehouse wall orientation
Including changes to use OS 3.5.1 and changes in master
…AP1980TO2010; Added units of min illuminance level to space_type_unit_definitions.txt; Added reference of min illuminance level to all space_types.json of necb
…Modified unit test for daylighting sensor control ecm and updated expected results for it
…ailstandalone, and smallhotel, due to changes in daylighting sensor control ecm
…condary school due to changes in daylighting sensor control ecm
…or controls ECM nrcan_375: modify daylighting sensor controls ECM
* replaced costing_enabled with intrinsic method to check if BTAPCosting is present * replaced costing_enabled with intrinsic method to check if BTAPCosting is present
Including changes in nrcan branch.
Variable for zone heating equipment in ECN HS12 was not properly set for DOAS
Including boiler capacity floor.
…r based on compressor type
Added thermal bridging inventory
Set name of 'Screw' chillers to 'Rotary Screw' Set default 'chiller_type' in file 'fuel_type_sets.json' to empty. In this case chiller type is set based on information in new file 'chiller_types.json'. Update standard method for setting efficiency and curves of water cooled electric chillers to deal with the situation when the chiller name doesn't have information on the chiller type. If the name doesn't have information on the chiller type then this will be set based on information from the new file 'chiller_types.json'. Modify method in class 'BTAPPRE1980' to modify name of chiller when the original name doesn't include a compressor type Update building regression tests osm files
Commenting out NRCan development gems.
Commenting out NRCan only development Gem require statements.
Including ability to not apply daylighting by setting "daylighting_type" to none.
Including ability to not apply daylighting by setting "daylighting_type" to none.
Add method for assigning performance curves and cop for chillers in ECM class
* Add json file for compressor type of air cooled chiller for ECM HS14 * Add water cooled chiller type json for NECB and update name of chiller based on compressor type * Update initial name of water-cooled chiller in ECM HS14 Set name of 'Screw' chillers to 'Rotary Screw' Set default 'chiller_type' in file 'fuel_type_sets.json' to empty. In this case chiller type is set based on information in new file 'chiller_types.json'. Update standard method for setting efficiency and curves of water cooled electric chillers to deal with the situation when the chiller name doesn't have information on the chiller type. If the name doesn't have information on the chiller type then this will be set based on information from the new file 'chiller_types.json'. Modify method in class 'BTAPPRE1980' to modify name of chiller when the original name doesn't include a compressor type Update building regression tests osm files --------- Co-authored-by: khaddad <khaddad.energy.eng@gmail.com>
…th regression test results using OS 3.5.1.
* Add json file for compressor type of air cooled chiller for ECM HS14 * Add water cooled chiller type json for NECB and update name of chiller based on compressor type * Update initial name of water-cooled chiller in ECM HS14 Set name of 'Screw' chillers to 'Rotary Screw' Set default 'chiller_type' in file 'fuel_type_sets.json' to empty. In this case chiller type is set based on information in new file 'chiller_types.json'. Update standard method for setting efficiency and curves of water cooled electric chillers to deal with the situation when the chiller name doesn't have information on the chiller type. If the name doesn't have information on the chiller type then this will be set based on information from the new file 'chiller_types.json'. Modify method in class 'BTAPPRE1980' to modify name of chiller when the original name doesn't include a compressor type Update building regression tests osm files * Enabling gems required for NRCan development. * Add NECB performance curves for air-cooled chillers Add method for assigning performance curves and cop for chillers in ECM class * Incorporating updates from nrcan branch (#1515) * Add json file for compressor type of air cooled chiller for ECM HS14 * Add water cooled chiller type json for NECB and update name of chiller based on compressor type * Update initial name of water-cooled chiller in ECM HS14 Set name of 'Screw' chillers to 'Rotary Screw' Set default 'chiller_type' in file 'fuel_type_sets.json' to empty. In this case chiller type is set based on information in new file 'chiller_types.json'. Update standard method for setting efficiency and curves of water cooled electric chillers to deal with the situation when the chiller name doesn't have information on the chiller type. If the name doesn't have information on the chiller type then this will be set based on information from the new file 'chiller_types.json'. Modify method in class 'BTAPPRE1980' to modify name of chiller when the original name doesn't include a compressor type Update building regression tests osm files --------- Co-authored-by: khaddad <khaddad.energy.eng@gmail.com> * Updating regression tests from OS 3.5.1 to reflect merge of nrcan branch and master. * Updating nrcan_os360_dev with changes to nrcan branch and updating with regression test results using OS 3.5.1. --------- Co-authored-by: khaddad <khaddad.energy.eng@gmail.com>
… in preparation for merge with master.
… in preparation for merge with master. Commenting out development gems that are not used in master.
mdahlhausen
reviewed
Jun 6, 2023
openstudio-standards.gemspec
Outdated
| @@ -47,7 +47,7 @@ Gem::Specification.new do |spec| | |||
| spec.add_development_dependency 'aes', '0.5.0' | |||
| spec.add_development_dependency 'roo', '2.7.1' | |||
| spec.add_development_dependency 'openstudio-api-stubs' | |||
| spec.add_runtime_dependency 'tbd', '~> 3' | |||
| spec.add_development_dependency 'tbd', '~> 3' | |||
There was a problem hiding this comment.
this needs to stay as a runtime dependency. I believe that means it is also available during development.
There was a problem hiding this comment.
Whoops, sorry about that. It should be fixed now.
mdahlhausen
requested changes
Jun 6, 2023
Made TBD a runtime dependency not just a development dependency.
mdahlhausen
approved these changes
Jun 7, 2023
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.